Added the current update

started setting up the VPN status & checking for permissions
Added the base of the Menu Bar UI
2023-04-29 20:28:48 -04:00 · 2023-04-29 12:54:54 -04:00 · 2023-04-26 21:34:05 -04:00
273 changed files with 1112 additions and 18642 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -1,6 +0,0 @@
-[target.'cfg(unix)']
-runner = "sudo -E"
-
-[alias] # command aliases
-rr = "run --release"
-bb = "build --release"
--- a/.dockerignore
+++ b/.dockerignore
@ -1,5 +0,0 @@
-# Xcode
-Apple/
-
-# Rust
-target/
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,4 +1 @@
-* @conradev @malted @JettChenT @jdogcoder
-burrow/ @conradev @malted @JettChenT @jdogcoder @Muirrum
-tun/ @conradev @malted @JettChenT @jdogcoder @Muirrum
-burrow-gtk/ @conradev @malted @JettChenT @jdogcoder @davnotdev
+* @conradev
--- a/.github/actions/archive/action.yml
+++ b/.github/actions/archive/action.yml
@ -26,18 +26,18 @@ runs:
    run: |
      echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8

-      xcodebuild clean archive \
+      xcodebuild archive \
        -allowProvisioningUpdates \
        -allowProvisioningDeviceRegistration \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
-        -onlyUsePackageVersionsFromResolvedFile \
        -authenticationKeyID ${{ inputs.app-store-key-id }} \
        -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
        -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
+        -onlyUsePackageVersionsFromResolvedFile \
        -scheme '${{ inputs.scheme }}' \
        -destination '${{ inputs.destination }}' \
        -archivePath '${{ inputs.archive-path }}' \
        -resultBundlePath BuildResults.xcresult

+      ./Tools/xcresulttool-github BuildResults.xcresult
+      
      rm -rf AuthKey_${{ inputs.app-store-key-id }}.p8
--- a/.github/actions/build-for-testing/action.yml
+++ b/.github/actions/build-for-testing/action.yml
@ -18,36 +18,18 @@ inputs:
 runs:
  using: composite
  steps:
-  - name: Xcode Cache
-    uses: actions/cache@v3
-    with:
-      path: |
-        Apple/PackageCache
-        Apple/SourcePackages
-        Apple/DerivedData
-      key: ${{ runner.os }}-${{ inputs.scheme }}-${{ hashFiles('**/Package.resolved') }}
-      restore-keys: |
-        ${{ runner.os }}-${{ inputs.scheme }}-${{ hashFiles('**/Package.resolved') }}
-        ${{ runner.os }}-${{ inputs.scheme }}-
-        ${{ runner.os }}-
-  - name: Build
-    shell: bash
+  - shell: bash
    working-directory: Apple
    run: |
      echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8

-      xcodebuild build-for-testing \
+      xcodebuild clean build-for-testing \
        -allowProvisioningUpdates \
        -allowProvisioningDeviceRegistration \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
-        -onlyUsePackageVersionsFromResolvedFile \
        -authenticationKeyID ${{ inputs.app-store-key-id }} \
        -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
        -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
-        -clonedSourcePackagesDirPath SourcePackages \
-        -packageCachePath $PWD/PackageCache \
-        -derivedDataPath $PWD/DerivedData \
+        -onlyUsePackageVersionsFromResolvedFile \
        -scheme '${{ inputs.scheme }}' \
        -destination '${{ inputs.destination }}' \
        -resultBundlePath BuildResults.xcresult
--- a/.github/actions/download-profiles/action.yml
+++ b/.github/actions/download-profiles/action.yml
@ -1,30 +0,0 @@
-name: Download Provisioning Profiles
-inputs:
-  app-store-key:
-    description: App Store key in PEM PKCS#8 format
-    required: true
-  app-store-key-id:
-    description: App Store key ID
-    required: true
-  app-store-key-issuer-id:
-    description: App Store key issuer ID
-    required: true
-runs:
-  using: composite
-  steps:
-  - shell: bash
-    env:
-      FASTLANE_OPT_OUT_USAGE: 'YES'
-    run: |
-      APP_STORE_KEY=$(echo "${{ inputs.app-store-key }}" | jq -sR .)
-      cat << EOF > api-key.json
-      {
-        "key_id": "${{ inputs.app-store-key-id }}",
-        "issuer_id": "${{ inputs.app-store-key-issuer-id }}",
-        "key": $APP_STORE_KEY
-      }
-      EOF
-
-      fastlane sigh download_all --api_key_path api-key.json
-
-      rm -rf api-key.json
--- a/.github/actions/export/action.yml
+++ b/.github/actions/export/action.yml
@ -1,4 +1,4 @@
-name: Export
+name: Notarize
 inputs:
  app-store-key:
    description: App Store key in PEM PKCS#8 format
@ -12,8 +12,11 @@ inputs:
  archive-path:
    description: Xcode archive path
    required: true
-  export-options:
-    description: The export options in JSON format
+  destination:
+    description: The Xcode export destination. This can either be "export" or "upload"
+    required: true
+  method:
+    description: The Xcode export method. This can be one of app-store, validation, ad-hoc, package, enterprise, development, developer-id, or mac-application.
    required: true
  export-path:
    description: The path to export the archive to
@ -21,20 +24,19 @@ inputs:
 runs:
  using: composite
  steps:
-  - shell: bash
+  - id: notarize
+    shell: bash
    working-directory: Apple
    run: |
      echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8

-      echo '${{ inputs.export-options }}' | plutil -convert xml1 -o ExportOptions.plist -
+      echo '{"destination":"${{ inputs.destination }}","method":"${{ inputs.method }}"}' \
+        | plutil -convert xml1 -o ExportOptions.plist -

      xcodebuild \
        -exportArchive \
        -allowProvisioningUpdates \
        -allowProvisioningDeviceRegistration \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
-        -onlyUsePackageVersionsFromResolvedFile \
        -authenticationKeyID ${{ inputs.app-store-key-id }} \
        -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
        -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
--- a/.github/actions/notarize/action.yml
+++ b/.github/actions/notarize/action.yml
@ -1,25 +0,0 @@
-name: Notarize
-inputs:
-  app-store-key:
-    description: App Store key in PEM PKCS#8 format
-    required: true
-  app-store-key-id:
-    description: App Store key ID
-    required: true
-  app-store-key-issuer-id:
-    description: App Store key issuer ID
-    required: true
-runs:
-  using: composite
-  steps:
-  - id: notarize
-    shell: bash
-    working-directory: Apple
-    run: |
-      echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
-
-      ditto -c -k --keepParent Release/Burrow.app Upload.zip
-      xcrun notarytool submit --wait --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" Upload.zip
-      xcrun stapler staple Release/Burrow.app
-
-      rm -rf AuthKey_${{ inputs.app-store-key-id }}.p8 Release
--- a/.github/actions/test-without-building/action.yml
+++ b/.github/actions/test-without-building/action.yml
@ -18,6 +18,9 @@ inputs:
 runs:
  using: composite
  steps:
+  - shell: bash
+    id: vars
+    run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
  - shell: bash
    working-directory: Apple
    run: |
@ -25,10 +28,10 @@ runs:
      -scheme '${{ inputs.scheme }}' \
      -destination '${{ inputs.destination }}' \
      ${{ inputs.test-plan && '-testPlan ' }}${{ inputs.test-plan }} \
-      -resultBundlePath "${{ inputs.artifact-prefix }}.xcresult"
+      -resultBundlePath "${{ inputs.artifact-prefix }}-${{ steps.vars.outputs.sha_short }}.xcresult"
  - uses: kishikawakatsumi/xcresulttool@v1
    if: always()
    with:
-      path: Apple/${{ inputs.artifact-prefix }}.xcresult
+      path: Apple/${{ inputs.artifact-prefix }}-${{ steps.vars.outputs.sha_short }}.xcresult
      title: ${{ inputs.check-name }}
      show-passed-tests: false
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@ -1,29 +0,0 @@
-name: Build AppImage
-on:
-  push:
-    branches:  
-    - main
-  pull_request:
-    branches:
-    - "*"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-jobs:
-  appimage:
-    name: Build AppImage
-    runs-on: ubuntu-latest
-    container: docker
-    steps:
-    - uses: actions/checkout@v4
-    - name: Build AppImage
-      run: |
-        docker build -t appimage-builder . -f burrow-gtk/build-aux/Dockerfile
-        docker create --name temp appimage-builder
-        docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
-        docker rm temp
-    - uses: actions/upload-artifact@v4
-      name: Upload to GitHub
-      with:
-        name: AppImage
-        path: Burrow-x86_64.AppImage
--- a/.github/workflows/build-apple.yml
+++ b/.github/workflows/build-apple.yml
@ -1,4 +1,4 @@
-name: Build Apple Apps
+name: Apple Build
 on:
  push:
    branches:  
@ -6,40 +6,28 @@ on:
  pull_request:
    branches:
    - "*"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
 jobs:
  build:
    name: Build App (${{ matrix.platform }})
-    runs-on: macos-14
+    runs-on: macos-12
    strategy:
      fail-fast: false
      matrix:
        include:
-        - scheme: App
+        - scheme: Burrow
          destination: generic/platform=iOS
          platform: iOS
          sdk-name: iphoneos
-          rust-targets:
-          - aarch64-apple-ios
-        - scheme: App
-          destination: platform=iOS Simulator,OS=18.0,name=iPhone 15 Pro
+        - scheme: Burrow
+          destination: platform=iOS Simulator,OS=16.2,name=iPhone 14 Pro
          platform: iOS Simulator
          sdk-name: iphonesimulator
-          rust-targets:
-          - aarch64-apple-ios-sim
-          - x86_64-apple-ios
-        - scheme: App
+        - scheme: Burrow
          destination: platform=macOS
          platform: macOS
          sdk-name: macos
-          rust-targets:
-          - x86_64-apple-darwin
-          - aarch64-apple-darwin
    env:
-      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
-      PROTOC_PATH: /opt/homebrew/bin/protoc
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
    steps:
    - name: Checkout
      uses: actions/checkout@v3
@ -51,13 +39,6 @@ jobs:
      with:
        certificate: ${{ secrets.DEVELOPER_CERT }}
        password: ${{ secrets.DEVELOPER_CERT_PASSWORD }}
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        targets: ${{ join(matrix.rust-targets, ', ') }}
-    - name: Install Protobuf
-      shell: bash
-      run: brew install protobuf
    - name: Build
      id: build
      uses: ./.github/actions/build-for-testing
@ -67,7 +48,7 @@ jobs:
        app-store-key: ${{ secrets.APPSTORE_KEY }}
        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-    - name: Run Unit Tests
+    - name: Xcode Unit Test
      if: ${{ matrix.xcode-unit-test != '' }}
      continue-on-error: true
      uses: ./.github/actions/test-without-building
@ -77,7 +58,7 @@ jobs:
        test-plan: ${{ matrix.xcode-unit-test }}
        artifact-prefix: unit-tests-${{ matrix.sdk-name }}
        check-name: Xcode Unit Tests (${{ matrix.platform }})
-    - name: Run UI Tests
+    - name: Xcode UI Test
      if: ${{ matrix.xcode-ui-test != '' }}
      continue-on-error: true
      uses: ./.github/actions/test-without-building
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@ -1,49 +0,0 @@
-name: Build Docker
-on:
-  push:
-    branches:
-    - main
-  pull_request:
-    branches:
-    - "*"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-jobs:
-  build:
-    name: Build Docker Image
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-    steps:
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-    - name: Setup BuildKit
-      uses: docker/setup-buildx-action@v2
-    - name: Authenticate
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Extract Metadata
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: ghcr.io/${{ github.repository }}
-        tags: |
-          type=sha
-          type=match,pattern=builds/(.*),group=1
-          type=raw,value=latest,enable={{is_default_branch}}
-    - name: Build and Push
-      uses: docker/build-push-action@v4
-      with:
-        platforms: ${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64'  }}
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
--- a/.github/workflows/build-flatpak.yml
+++ b/.github/workflows/build-flatpak.yml
@ -1,16 +0,0 @@
-on: workflow_dispatch
-name: Build Flatpak
-jobs:
-  flatpak:
-    name: Build Flatpak
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-45
-      options: --privileged
-    steps:
-    - uses: actions/checkout@v4
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      with:
-        bundle: Burrow.flatpak
-        manifest-path: burrow-gtk/build-aux/com.hackclub.burrow.devel.json
-        cache-key: flatpak-builder-${{ github.sha }}
--- a/.github/workflows/build-rpm.yml
+++ b/.github/workflows/build-rpm.yml
@ -1,17 +0,0 @@
-on: workflow_dispatch
-name: Build RPM
-jobs:
-  build:
-    name: Build RPM
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: Swatinem/rust-cache@v2
-    - name: Install RPM
-      run: cargo install cargo-generate-rpm
-    - name: Build RPM
-      run: |
-        cargo build --release
-        strip -s target/release/burrow
-    - name: Build RPM
-      run: cargo generate-rpm -p burrow
--- a/.github/workflows/build-rust.yml
+++ b/.github/workflows/build-rust.yml
@ -1,4 +1,4 @@
-name: Build Rust Crate
+name: Rust Build
 on:
  push:
    branches:  
@ -17,38 +17,28 @@ jobs:
          platform: Linux
          packages:
          - gcc-aarch64-linux-gnu
-          test-targets:
+          targets:
          - x86_64-unknown-linux-gnu
-          targets:
          - aarch64-unknown-linux-gnu
-        - os: macos-13
-          platform: macOS (Intel)
-          xcode: /Applications/Xcode_15.2.app
-          test-targets:
-          - x86_64-apple-darwin
-          targets:
-          - x86_64-apple-ios
-        - os: macos-14
+        - os: macos-12
          platform: macOS
-          xcode: /Applications/Xcode_16.0.app
-          test-targets:
-          - aarch64-apple-darwin
          targets:
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
          - aarch64-apple-ios
          - aarch64-apple-ios-sim
+          - x86_64-apple-ios
        - os: windows-2022
          platform: Windows
-          test-targets:
-          - x86_64-pc-windows-msvc
          targets:
+          - x86_64-pc-windows-msvc
          - aarch64-pc-windows-msvc
    runs-on: ${{ matrix.os }}
    env:
-      DEVELOPER_DIR: ${{ matrix.xcode }}/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
      CARGO_INCREMENTAL: 0
      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
      RUST_BACKTRACE: short
-      PROTOC_VERSION: 3.25.1
    steps:
    - name: Checkout
      uses: actions/checkout@v3
@ -58,28 +48,13 @@ jobs:
    - name: Install Packages
      if: matrix.os == 'ubuntu-latest'
      shell: bash
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ${{ join(matrix.packages, ' ') }}
-    - name: Configure LLVM
-      if: matrix.os == 'windows-2022'
-      shell: bash
-      run: echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
-    - name: Install protoc
-      uses: taiki-e/install-action@v2
-      with:
-        tool: protoc@${{ env.PROTOC_VERSION }}
+      run: sudo apt-get install -y ${{ join(matrix.packages, ' ') }}
    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
+      uses: dtolnay/rust-toolchain@master
      with:
        toolchain: stable
        components: rustfmt
        targets: ${{ join(matrix.targets, ', ') }}
-    - name: Setup Rust Cache
-      uses: Swatinem/rust-cache@v2
    - name: Build
      shell: bash
-      run: cargo build --verbose --workspace --all-features --target ${{ join(matrix.targets, ' --target ') }} --target ${{ join(matrix.test-targets, ' --target ') }}
-    - name: Test
-      shell: bash
-      run: cargo test --verbose --workspace --all-features --target ${{ join(matrix.test-targets, ' --target ') }}
+      run: cargo build --verbose --workspace --all-features --target ${{ join(matrix.targets, ' --target ') }}
--- a/.github/workflows/lint-git.yml
+++ b/.github/workflows/lint-git.yml
@ -8,14 +8,13 @@ jobs:
    name: Git Lint
    runs-on: ubuntu-latest
    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          fetch-depth: 0
-    - name: Install
+      - name: Install Gitlint
        shell: bash
        run: python -m pip install gitlint
-    - name: Lint
+      - name: Run Gitlint
        shell: bash
        run: gitlint --commits "${{ github.event.pull_request.base.sha }}..HEAD"
--- a/.github/workflows/lint-swift.yml
+++ b/.github/workflows/lint-swift.yml
@ -1,5 +1,8 @@
 name: Swift Lint
 on:
+  push:
+    branches:
+    - main
  pull_request:
    branches:
    - "*"
@ -11,6 +14,8 @@ jobs:
      image: ghcr.io/realm/swiftlint:latest
    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
+      with:
+        ssh-key: ${{ secrets.DEPLOY_KEY }}
    - name: Lint
-      run: swiftlint lint --strict --reporter github-actions-logging
+      run: swiftlint lint --reporter github-actions-logging
--- a/.github/workflows/release-apple.yml
+++ b/.github/workflows/release-apple.yml
@ -1,119 +1,65 @@
-name: Release (Apple)
+name: Build Apple Release
 on:
  release:
    types:
    - created
 jobs:
  build:
-    name: Build ${{ matrix.platform }} Release
-    runs-on: macos-14
-    permissions:
-      contents: write
+    name: Build ${{ matrix.configuration['platform'] }} Release
+    runs-on: macos-12
    strategy:
      fail-fast: false
      matrix:
-        include:
-        - platform: iOS
-          rust-targets:
-          - aarch64-apple-ios
-        - platform: macOS
-          rust-targets:
-          - x86_64-apple-darwin
-          - aarch64-apple-darwin
+        configuration:
+        - scheme: App (iOS)
+          destination: generic/platform=iOS
+          platform: iOS
+          method: ad-hoc
+          artifact-file: Apple/Release/Burrow.ipa
+        - scheme: App (macOS)
+          destination: generic/platform=macOS
+          platform: macOS
+          method: mac-application
+          artifact-file: Burrow.app.txz
    env:
-      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
-      PROTOC_PATH: /opt/homebrew/bin/protoc
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
-        fetch-depth: 0
+        ssh-key: ${{ secrets.DEPLOY_KEY }}
+        submodules: recursive
    - name: Import Certificate
      uses: ./.github/actions/import-cert
      with:
        certificate: ${{ secrets.DEVELOPER_CERT }}
        password: ${{ secrets.DEVELOPER_CERT_PASSWORD }}
-    - name: Download Provisioning Profiles
-      uses: ./.github/actions/download-profiles
-      with:
-        app-store-key: ${{ secrets.APPSTORE_KEY }}
-        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-    - name: Install Provisioning Profiles
-      shell: bash
-      run: |
-        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles/
-        cp -f Apple/Profiles/* ~/Library/MobileDevice/Provisioning\ Profiles/
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        targets: ${{ join(matrix.rust-targets, ', ') }}
-    - name: Install Protobuf
-      shell: bash
-      run: brew install protobuf
-    - name: Configure Version
-      id: version
-      shell: bash
-      run: echo "BUILD_NUMBER=$(Tools/version.sh)" >> $GITHUB_OUTPUT
    - name: Archive
      uses: ./.github/actions/archive
      with:
-        scheme: App
-        destination: generic/platform=${{ matrix.platform }}
+        scheme: ${{ matrix.configuration['scheme'] }}
+        destination: ${{ matrix.configuration['destination'] }}
        app-store-key: ${{ secrets.APPSTORE_KEY }}
        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
        archive-path: Burrow.xcarchive
-    - name: Export
+    - name: Export Locally
      uses: ./.github/actions/export
      with:
-        method: ${{ matrix.platform == 'macOS' && 'developer-id' || 'ad-hoc' }}
+        method: ${{ matrix.configuration['method'] }}
        destination: export
        app-store-key: ${{ secrets.APPSTORE_KEY }}
        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
        archive-path: Burrow.xcarchive
-        export-options: |
-          {"teamID":"P6PV2R9443","destination":"export","method":"developer-id","provisioningProfiles":{"com.hackclub.burrow":"Burrow Developer ID","com.hackclub.burrow.network":"Burrow Network Developer ID"},"signingCertificate":"Developer ID Application","signingStyle":"manual"}
        export-path: Release
-    - name: Notarize
-      if: ${{ matrix.platform == 'macOS' }}
-      uses: ./.github/actions/notarize
-      with:
-        app-store-key: ${{ secrets.APPSTORE_KEY }}
-        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-    - name: Compress (iOS)
-      if: ${{ matrix.platform == 'iOS' }}
+    - name: Compress
+      if: ${{ matrix.configuration['platform'] == 'macOS' }}
      shell: bash
-      run: |
-        cp Apple/Release/Burrow.ipa Burrow.ipa
-        aa archive -a lzma -b 8m -d Apple -subdir Burrow.xcarchive -o Burrow-${{ matrix.platform }}.xcarchive.aar
-        rm -rf Apple/Release
-    - name: Compress (macOS)
-      if: ${{ matrix.platform == 'macOS' }}
-      shell: bash
-      run: |
-        aa archive -a lzma -b 8m -d Apple/Release -subdir Burrow.app -o Burrow.app.aar
-        aa archive -a lzma -b 8m -d Apple -subdir Burrow.xcarchive -o Burrow-${{ matrix.platform }}.xcarchive.aar
-        rm -rf Apple/Release
-    - name: Upload to GitHub
-      uses: SierraSoftworks/gh-releases@v1.0.7
+      run: tar --options xz:compression-level=9 -C Apple/Release -cJf Burrow.app.txz ./
+    - name: Attach Artifact
+      uses: SierraSoftworks/gh-releases@v1.0.6
      with:
        token: ${{ secrets.GITHUB_TOKEN }}
-        release_tag: ${{ github.ref_name }}
-        overwrite: 'true'
-        files: |
-          ${{ matrix.platform == 'macOS' && 'Burrow.aap.aar' || 'Burrow.ipa' }}
-          Burrow-${{ matrix.platform }}.xcarchive.aar
-    - name: Upload to App Store Connect
-      if: ${{ matrix.platform == 'iOS' }}
-      uses: ./.github/actions/export
-      with:
-        app-store-key: ${{ secrets.APPSTORE_KEY }}
-        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-        archive-path: Burrow.xcarchive
-        export-options: |
-          {"method": "app-store", "destination": "upload"}
-        export-path: Release
+        overwrite: 'false'
+        files: ${{ matrix.configuration['artifact-file'] }}
--- a/.github/workflows/release-if-needed.yaml
+++ b/.github/workflows/release-if-needed.yaml
@ -1,23 +0,0 @@
-name: Create Release If Needed
-on:
-  workflow_dispatch:
-  schedule:
-  - cron: '0 10 * * *'
-concurrency:
-  group: ${{ github.workflow }}
-jobs:
-  create:
-    name: Create Release If Needed
-    runs-on: ubuntu-latest
-    env:
-      GH_TOKEN: ${{ github.token }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - shell: bash
-      run: |
-        if [[ $(Tools/version.sh status) == "dirty" ]]; then
-          gh workflow run release-now.yml
-        fi
--- a/.github/workflows/release-linux.yml
+++ b/.github/workflows/release-linux.yml
@ -1,29 +0,0 @@
-name: Release (Linux)
-on:
-  release:
-    types:
-    - created
-jobs:
-  appimage:
-    name: Build AppImage
-    runs-on: ubuntu-latest
-    container: docker
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Build AppImage
-      run: |
-        docker build -t appimage-builder . -f burrow-gtk/build-aux/Dockerfile
-        docker create --name temp appimage-builder
-        docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
-        docker rm temp
-    - name: Attach Artifacts
-      uses: SierraSoftworks/gh-releases@v1.0.7
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        release_tag: ${{ github.ref_name }}
-        overwrite: "true"
-        files: |
-          Burrow-x86_64.AppImage
--- a/.github/workflows/release-now.yml
+++ b/.github/workflows/release-now.yml
@ -1,17 +0,0 @@
-name: Create Release
-on: workflow_dispatch
-concurrency:
-  group: ${{ github.workflow }}
-jobs:
-  create:
-    env:
-      GH_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - shell: bash
-      run: Tools/version.sh increment
--- a/.gitignore
+++ b/.gitignore
@ -1,17 +1,5 @@
 # Xcode
 xcuserdata

-# Swift
-Apple/Package/.swiftpm/
-
 # Rust
 target/
-.env
-
-.DS_STORE
-.idea/
-
-tmp/
-
-*.db
-*.sock
--- a/.gitlint
+++ b/.gitlint
@ -1,5 +1,5 @@
 [general]
-ignore=body-changed-file-mention,body-is-missing
+ignore=body-changed-file-mention
 ignore-merge-commits=false
 ignore-fixup-commits=false
 ignore-squash-commits=false
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@ -1,12 +0,0 @@
-condense_wildcard_suffixes = true
-format_macro_matchers = true
-imports_layout = "HorizontalVertical"
-imports_granularity = "Crate"
-newline_style = "Unix"
-overflow_delimited_expr = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-trailing_semicolon = false
-use_field_init_shorthand = true
-use_try_shorthand = true
-struct_lit_width = 30
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@ -30,6 +30,7 @@ opt_in_rules:
 - function_default_parameter_at_end
 - ibinspectable_in_extension
 - identical_operands
+- implicitly_unwrapped_optional
 - indentation_width
 - joined_default_parameter
 - last_where
@ -45,6 +46,7 @@ opt_in_rules:
 - multiline_parameters
 - multiline_parameters_brackets
 - no_extension_access_modifier
+- no_grouping_extension
 - nslocalizedstring_key
 - nslocalizedstring_require_bundle
 - number_separator
@ -74,7 +76,9 @@ opt_in_rules:
 - sorted_first_last
 - sorted_imports
 - static_operator
+- strict_fileprivate
 - strong_iboutlet
+- switch_case_on_newline
 - test_case_accessibility
 - toggle_bool
 - trailing_closure
@ -93,5 +97,3 @@ disabled_rules:
 - force_try
 - nesting
 - todo
- trailing_comma
- switch_case_on_newline
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,6 +1,5 @@
 {
  "recommendations": [
    "rust-lang.rust-analyzer",
-    "vadimcn.vscode-lldb",
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -6,21 +6,10 @@
    "files.trimTrailingWhitespace": true,
    "editor.suggest.preview": true,
    "editor.acceptSuggestionOnEnter": "on",
+    "rust-analyzer.checkOnSave.command": "clippy",
    "rust-analyzer.restartServerOnConfigChange": true,
    "rust-analyzer.cargo.features": "all",
-  "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
    "[rust]": {
-    "editor.defaultFormatter": "rust-lang.rust-analyzer"
+        "editor.defaultFormatter": "rust-lang.rust-analyzer",
    },
-  "rust-analyzer.inlayHints.typeHints.enable": false,
-  "rust-analyzer.linkedProjects": [
-    "./burrow/Cargo.toml"
-  ],
-  "[yaml]": {
-    "editor.insertSpaces": true,
-    "editor.tabSize": 2,
-    "editor.autoIndent": "advanced",
-    "diffEditor.ignoreTrimWhitespace": false,
-    "editor.formatOnSave": false
-  }
 }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -3,7 +3,7 @@
 	"tasks": [
 		{
 			"type": "cargo",
-			"command": "clippy",
+			"command": "check",
 			"problemMatcher": [
 				"$rustc"
 			],
@ -11,13 +11,7 @@
 				"kind": "build",
 				"isDefault": true
 			},
-			"label": "rust: cargo clippy",
-			"args": [
-				"--workspace",
-				"--all-targets",
-				"--all-features",
-				"--all"
-			]
-		},
+			"label": "Check"
+		}
 	]
 }
--- a/Apple/.DS_Store
+++ b/Apple/.DS_Store
--- a/Apple/App/App-iOS.entitlements
+++ b/Apple/App/App-iOS.entitlements
@ -2,11 +2,6 @@
 <!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.developer.associated-domains</key>
-	<array>
-		<string>applinks:burrow.rs?mode=developer</string>
-		<string>webcredentials:burrow.rs?mode=developer</string>
-	</array>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
 		<string>packet-tunnel-provider</string>
--- a/Apple/App/App-macOS.entitlements
+++ b/Apple/App/App-macOS.entitlements
@ -2,11 +2,6 @@
 <!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.developer.associated-domains</key>
-	<array>
-		<string>applinks:burrow.rs?mode=developer</string>
-		<string>webcredentials:burrow.rs?mode=developer</string>
-	</array>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
 		<string>packet-tunnel-provider</string>
@ -14,6 +9,7 @@
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(APP_GROUP_IDENTIFIER)</string>
+		<string>group.ThomasStubblefield.Unifriend.onesignal</string>
 	</array>
 </dict>
 </plist>
--- a/Apple/App/AppDelegate.swift
+++ b/Apple/App/AppDelegate.swift
@ -1,53 +1,14 @@
 #if os(macOS)
 import AppKit
-import BurrowUI
-import SwiftUI
+import FluidMenuBarExtra

-@main
-@MainActor
 class AppDelegate: NSObject, NSApplicationDelegate {
-    private let quitItem: NSMenuItem = {
-        let quitItem = NSMenuItem(
-            title: "Quit Burrow",
-            action: #selector(NSApplication.terminate(_:)),
-            keyEquivalent: "q"
-        )
-        quitItem.target = NSApplication.shared
-        quitItem.keyEquivalentModifierMask = .command
-        return quitItem
-    }()
-
-    private let toggleItem: NSMenuItem = {
-        let toggleView = NSHostingView(rootView: MenuItemToggleView())
-        toggleView.frame.size = CGSize(width: 300, height: 32)
-        toggleView.autoresizingMask = [.width]
-
-        let toggleItem = NSMenuItem()
-        toggleItem.view = toggleView
-        return toggleItem
-    }()
-
-    private lazy var menu: NSMenu = {
-        let menu = NSMenu()
-        menu.items = [
-            toggleItem,
-            .separator(),
-            quitItem
-        ]
-        return menu
-    }()
-
-    private lazy var statusItem: NSStatusItem = {
-        let statusBar = NSStatusBar.system
-        let statusItem = statusBar.statusItem(withLength: NSStatusItem.squareLength)
-        if let button = statusItem.button {
-            button.image = NSImage(systemSymbolName: "network.badge.shield.half.filled", accessibilityDescription: nil)
-        }
-        return statusItem
-    }()
+    private var menuBarExtra: FluidMenuBarExtra?
    
    func applicationDidFinishLaunching(_ notification: Notification) {
-        statusItem.menu = menu
+        self.menuBarExtra = FluidMenuBarExtra(title: "Burrow", systemImage: "network.badge.shield.half.filled") {
+            ContentView()
+        }
    }
 }
 #endif
--- a/Apple/App/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/Apple/App/Assets.xcassets/AccentColor.colorset/Contents.json
--- a/Apple/App/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Apple/App/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -0,0 +1,63 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Apple/App/Assets.xcassets/Contents.json
+++ b/Apple/App/Assets.xcassets/Contents.json
--- a/Apple/UI/Assets.xcassets/WireGuardTitle.imageset/Contents.json
+++ b/Apple/UI/Assets.xcassets/WireGuardTitle.imageset/Contents.json
@ -1,7 +1,7 @@
 {
  "images" : [
    {
-      "filename" : "WireGuardTitle.svg",
+      "filename" : "hackClubLogo.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
--- a/Apple/App/Assets.xcassets/hackClubLogo.imageset/hackClubLogo.png
+++ b/Apple/App/Assets.xcassets/hackClubLogo.imageset/hackClubLogo.png
--- a/Apple/App/Burrow.xcconfig
+++ b/Apple/App/Burrow.xcconfig
@ -2,7 +2,6 @@

 PRODUCT_NAME = Burrow
 PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER)
-PRODUCT_MODULE_NAME = BurrowApp

 INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphone*] = YES
 INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphone*] = YES
@ -11,13 +10,8 @@ INFOPLIST_KEY_UIStatusBarStyle[sdk=iphone*] = UIStatusBarStyleDefault
 INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad[sdk=iphone*] = UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight
 INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone[sdk=iphone*] = UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight
 TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2
-EXCLUDED_SOURCE_FILE_NAMES = MainMenu.xib

-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] =
-INFOPLIST_KEY_LSUIElement[sdk=macosx*] = YES
-INFOPLIST_KEY_NSMainNibFile[sdk=macosx*] = MainMenu
-INFOPLIST_KEY_NSPrincipalClass[sdk=macosx*] = NSApplication
-INFOPLIST_KEY_LSApplicationCategoryType[sdk=macosx*] = public.app-category.utilities
+INFOPLIST_KEY_LSApplicationCategoryType[sdk=macos*] = public.app-category.utilities

 CODE_SIGN_ENTITLEMENTS = App/App-iOS.entitlements
-CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = App/App-macOS.entitlements
+CODE_SIGN_ENTITLEMENTS[sdk=macos*] = App/App-macOS.entitlements
--- a/Apple/App/BurrowApp.swift
+++ b/Apple/App/BurrowApp.swift
@ -1,14 +1,34 @@
-#if !os(macOS)
-import BurrowUI
-import SwiftUI
+//
+//  burrow_barApp.swift
+//  burrow-bar
+//
+//  Created by Thomas Stubblefield on 4/19/23.
+//
+
+import SwiftUI
+import NetworkExtension

-@MainActor
@main
-struct BurrowApp: App {
+struct burrowBarApp: App {
+    #if os(macOS)
+    @NSApplicationDelegateAdaptor private var appDelegate: AppDelegate
+    #endif
+
    var body: some Scene {
        WindowGroup {
-            BurrowView()
+            PermissionView()
+        }
+    }
+}
+
+struct PermissionView: View {
+    @ObservedObject
+    var configuration = NetworkConfiguration()
+    
+    
+    var body: some View {
+        VStack {
+            Text(verbatim: "Status is \(configuration.status)")
        }
    }
 }
-#endif
--- a/Apple/App/ContentView.swift
+++ b/Apple/App/ContentView.swift
@ -0,0 +1,73 @@
+import SwiftUI
+
+struct ContentView: View {
+
+    @ObservedObject var viewModel = NetworkConfiguration()
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            
+            HStack {
+                Text(verbatim: "Networks \(viewModel.model.status)")
+                    .font(.title3)
+                Spacer()
+                Image(systemName: "badge.plus.radiowaves.forward")
+                    .symbolRenderingMode(.palette)
+                    .foregroundStyle(.blue, .black)
+                    .opacity(0.4)
+                .imageScale(.large)                }
+            Divider()
+            VStack(alignment: .leading) {
+                Text("Burrows")
+                    .padding(.top, 2)
+                    .font(.subheadline.weight(.bold))
+                HStack {
+                    if (viewModel.status == .unknown) {
+                        
+                        
+                        Image("hackClubLogo")
+                            .resizable()
+                            .frame(width: 32, height: 32)
+                            .cornerRadius(100).onTapGesture {
+                                viewModel.connectToBurrow()
+                                print(viewModel.status)
+                            }
+                        
+                    } else if (viewModel.status == .loading) {
+                        ZStack {
+                            Image("hackClubLogo")
+                                .resizable()
+                                .frame(width: 32, height: 32)
+                                .cornerRadius(100)
+                                .overlay(Color.white.opacity(0.6).cornerRadius(100))
+                            
+                            ProgressView()
+                                .progressViewStyle(CircularProgressViewStyle())
+                                .scaleEffect(0.6)
+                        }
+                    }
+                    VStack(alignment: .leading) {
+                        
+                        Text("Hack Club Network")
+                            .fontWeight(.medium)
+
+
+                        Text("􁠲 Recently Validated Certificate")
+                            .font(.caption2)
+                            .foregroundColor(.blue)
+                    }.onTapGesture {
+                        print(true)
+                    }
+                }
+            }
+
+        }
+            .padding()
+    }
+}
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}
--- a/Apple/App/MainMenu.xib
+++ b/Apple/App/MainMenu.xib
@ -1,679 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23091" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23091"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
-            <connections>
-                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="BurrowApp" customModuleProvider="target"/>
-        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
-            <items>
-                <menuItem title="Burrow" id="1Xt-HY-uBw">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Burrow" systemMenu="apple" id="uQy-DD-JDr">
-                        <items>
-                            <menuItem title="About Burrow" id="5kV-Vb-QxS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
-                            <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
-                            <menuItem title="Services" id="NMo-om-nkz">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide Burrow" keyEquivalent="h" id="Olw-nP-bQN">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="Kd2-mp-pUS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit Burrow" keyEquivalent="q" id="4sb-4s-VLi">
-                                <connections>
-                                    <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="File" id="dMs-cI-mzQ">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="File" id="bib-Uj-vzu">
-                        <items>
-                            <menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="4Si-XN-c54"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="bVn-NM-KNZ"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open Recent" id="tXI-mr-wws">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
-                                    <items>
-                                        <menuItem title="Clear Menu" id="vNY-rz-j42">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="Daa-9d-B3U"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
-                            <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="HmO-Ls-i7Q"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="teZ-XB-qJY"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
-                                <connections>
-                                    <action selector="saveDocumentAs:" target="-1" id="mDf-zr-I0C"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="iJ3-Pv-kwq"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
-                            <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
-                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="Din-rz-gC5"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
-                                <connections>
-                                    <action selector="print:" target="-1" id="qaZ-4w-aoO"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Edit" id="5QF-Oa-p0T">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Edit" id="W48-6f-4Dl">
-                        <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="M6e-cu-g7V"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
-                                <connections>
-                                    <action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
-                            <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="YJe-68-I9s"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="G1f-GL-Joy"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="pa3-QI-u2k">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
-                            <menuItem title="Find" id="4EN-yA-p0u">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Find" id="1b7-l0-nxx">
-                                    <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
-                                    <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
-                                        <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Substitutions" id="9ic-FL-obx">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
-                                    <items>
-                                        <menuItem title="Show Substitutions" id="z6F-FW-3nz">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
-                                        <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" id="hQb-2v-fYv">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Dashes" id="rgM-f4-ycn">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Links" id="cwL-P1-jid">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Data Detectors" id="tRr-pd-1PS">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Text Replacement" id="HFQ-gK-NFA">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Transformations" id="2oI-Rn-ZJC">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
-                                    <items>
-                                        <menuItem title="Make Upper Case" id="vmV-6d-7jI">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Make Lower Case" id="d9M-CD-aMd">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Capitalize" id="UEZ-Bs-lqG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Speech" id="xrE-MZ-jX0">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
-                                    <items>
-                                        <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Format" id="jxT-CU-nIS">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Format" id="GEO-Iw-cKr">
-                        <items>
-                            <menuItem title="Font" id="Gi5-1S-RQB">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
-                                    <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="FYS-2b-JAY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
-                                            <connections>
-                                                <action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
-                                            <connections>
-                                                <action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
-                                        <menuItem title="Kern" id="jBQ-r6-VK2">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Kern" id="tlD-Oa-oAM">
-                                                <items>
-                                                    <menuItem title="Use Default" id="GUa-eO-cwY">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="6dk-9l-Ckg"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use None" id="cDB-IK-hbR">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="U8a-gz-Maa"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Tighten" id="46P-cB-AYj">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="hr7-Nz-8ro"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Loosen" id="ogc-rX-tC1">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="8i4-f9-FKE"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem title="Ligatures" id="o6e-r0-MWq">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
-                                                <items>
-                                                    <menuItem title="Use Default" id="agt-UL-0e3">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="7uR-wd-Dx6"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use None" id="J7y-lM-qPV">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="iX2-gA-Ilz"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Use All" id="xQD-1f-W4t">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="KcB-kA-TuK"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem title="Baseline" id="OaQ-X3-Vso">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Baseline" id="ijk-EB-dga">
-                                                <items>
-                                                    <menuItem title="Use Default" id="3Om-Ey-2VK">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="0vZ-95-Ywn"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Superscript" id="Rqc-34-cIF">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="3qV-fo-wpU"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Subscript" id="I0S-gh-46l">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="Q6W-4W-IGz"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Raise" id="2h7-ER-AoG">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="4sk-31-7Q9"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem title="Lower" id="1tx-W0-xDw">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="OF1-bc-KW4"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="mSX-Xz-DV3"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
-                                        <menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="GJO-xA-L4q"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="JfD-CL-leO"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Text" id="Fal-I4-PZk">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Text" id="d9c-me-L2H">
-                                    <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="zUv-R1-uAa"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="spX-mk-kcS"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Justify" id="J5U-5w-g23">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="ljL-7U-jND"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="r48-bG-YeY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
-                                        <menuItem title="Writing Direction" id="H1b-Si-o9J">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
-                                                <items>
-                                                    <menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem id="YGs-j5-SAR">
-                                                        <string key="title">	Default</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="qtV-5e-UBP"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="Lbh-J2-qVU">
-                                                        <string key="title">	Left to Right</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="S0X-9S-QSf"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="jFq-tB-4Kx">
-                                                        <string key="title">	Right to Left</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="5fk-qB-AqJ"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
-                                                    <menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem id="Nop-cj-93Q">
-                                                        <string key="title">	Default</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="lPI-Se-ZHp"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="BgM-ve-c93">
-                                                        <string key="title">	Left to Right</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="caW-Bv-w94"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                    <menuItem id="RB4-Sm-HuC">
-                                                        <string key="title">	Right to Left</string>
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="EXD-6r-ZUu"/>
-                                                        </connections>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
-                                        <menuItem title="Show Ruler" id="vLm-3I-IUL">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="FOx-HJ-KwY"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="71i-fW-3W2"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="cSh-wd-qM2"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="View" id="H8h-7b-M4v">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="View" id="HyV-fh-RgO">
-                        <items>
-                            <menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="BXY-wc-z0C"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="pQI-g3-MTW"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
-                            <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
-                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleSidebar:" target="-1" id="iwa-gc-5KM"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
-                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleFullScreen:" target="-1" id="dU3-MA-1Rq"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Window" id="aUF-d1-5bR">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
-                        <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="R4o-n2-Eq4">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
-                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Help" id="wpr-3q-Mcd">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
-                        <items>
-                            <menuItem title="Burrow Help" keyEquivalent="?" id="FKE-Sm-Kum">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-            </items>
-            <point key="canvasLocation" x="200" y="121"/>
-        </menu>
-    </objects>
-</document>
--- a/Apple/App/Model.swift
+++ b/Apple/App/Model.swift
@ -0,0 +1,42 @@
+//
+//  MemoryGame.swift
+//  Memorize
+//
+//  Created by Thomas Stubblefield on 3/12/23.
+//
+
+import Foundation
+
+struct Model {
+    
+    var status: Status = .unknown
+    
+    mutating func connectToBurrow() {
+        print("let's get this working")
+        status = .valid
+        print(status)
+    }
+}
+
+enum Status: CustomStringConvertible {
+    case unknown
+    case blank
+    case valid
+    case error
+    case loading
+    
+    var description: String {
+        switch self {
+        case .unknown:
+            return "Unknown"
+        case .blank:
+            return "Blank"
+        case .valid:
+            return "Valid"
+        case .loading:
+            return "Loading"
+        default:
+            return "Default"
+        }
+    }
+}
--- a/Apple/App/NetworkConfiguration.swift
+++ b/Apple/App/NetworkConfiguration.swift
@ -0,0 +1,87 @@
+import SwiftUI
+import NetworkExtension
+
+@MainActor
+class NetworkConfiguration: ObservableObject {
+    func connectToBurrow() {
+        objectWillChange.send()
+        model.connectToBurrow()
+    }
+    
+    @Published var model = Model()
+    
+    @Published
+    var status: Status = .unknown
+    
+    init() {
+        update()
+        
+
+    }
+    
+    func connectToNetwork() {
+        print(self.status)
+        self.status = .loading
+        print(self.status)
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+            let random = Int.random(in: 0...1)
+            if random == 0 {
+                self.status = .valid
+                print(self.status)
+
+            } else {
+                self.status = .error
+                print(self.status)
+
+            }
+        }
+    }
+    
+    func update() {
+        Task {
+            do {
+                let configurations = try await NETunnelProviderManager.loadAll()
+                
+                await MainActor.run {
+                    self.status = configurations.isEmpty ? .blank : .valid
+                    print(self.status)
+                    self.objectWillChange.send()
+                }
+            } catch {
+                await MainActor.run {
+                    self.status = .error
+                    self.objectWillChange.send()
+
+                }
+            }
+        }
+    }
+    
+    func request() {
+        let configuration = NETunnelProviderProtocol()
+        configuration.providerBundleIdentifier = ""
+        configuration.serverAddress = "Hack Club"
+
+        let manager = NETunnelProviderManager()
+        manager.protocolConfiguration = configuration
+        manager.localizedDescription = "Hack Club Burrow"
+        manager.saveToPreferences { error in
+            print(error)
+        }
+    }
+}
+
+extension NETunnelProviderManager {
+    static func loadAll() async throws -> [NETunnelProviderManager] {
+        try await withUnsafeThrowingContinuation { continuation in
+            NETunnelProviderManager.loadAllFromPreferences { managers, error in
+                if let error = error {
+                    continuation.resume(throwing: error)
+                } else {
+                    continuation.resume(returning: managers ?? [])
+                }
+            }
+        }
+    }
+}
--- a/Apple/Burrow.xcodeproj/project.pbxproj
+++ b/Apple/Burrow.xcodeproj/project.pbxproj
@ -7,47 +7,15 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		D00AA8972A4669BC005C8102 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00AA8962A4669BC005C8102 /* AppDelegate.swift */; };
+		43E50D6D29FA050600BD2280 /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; platformFilters = (macos, ); productRef = 43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */; };
+		43EBDB2B29FD7557005D8CFF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EBDB2A29FD754A005D8CFF /* AppDelegate.swift */; };
+		43EBDB2D29FD759E005D8CFF /* NetworkConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EBDB2C29FD759E005D8CFF /* NetworkConfiguration.swift */; };
+		43EBDB2F29FDE85F005D8CFF /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EBDB2E29FDE85F005D8CFF /* Model.swift */; };
 		D020F65829E4A697002790F6 /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D020F65729E4A697002790F6 /* PacketTunnelProvider.swift */; };
 		D020F65D29E4A697002790F6 /* BurrowNetworkExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D020F65329E4A697002790F6 /* BurrowNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D03383AD2C8E67E300F7C44E /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = D078F7E22C8DA375008A8CEC /* SwiftProtobuf */; };
-		D03383AE2C8E67E300F7C44E /* NIO in Frameworks */ = {isa = PBXBuildFile; productRef = D044EE902C8DAB2000778185 /* NIO */; };
-		D03383AF2C8E67E300F7C44E /* NIOConcurrencyHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = D044EE922C8DAB2000778185 /* NIOConcurrencyHelpers */; };
-		D03383B02C8E67E300F7C44E /* NIOTransportServices in Frameworks */ = {isa = PBXBuildFile; productRef = D044EE952C8DAB2800778185 /* NIOTransportServices */; };
 		D05B9F7629E39EEC008CB1F9 /* BurrowApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05B9F7529E39EEC008CB1F9 /* BurrowApp.swift */; };
-		D09150422B9D2AF700BE3CB0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D09150412B9D2AF700BE3CB0 /* MainMenu.xib */; platformFilters = (macos, ); };
-		D0B1D1102C436152004B7823 /* AsyncAlgorithms in Frameworks */ = {isa = PBXBuildFile; productRef = D0B1D10F2C436152004B7823 /* AsyncAlgorithms */; };
-		D0BCC6092A09A03E00AD070D /* libburrow.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCC6032A09535900AD070D /* libburrow.a */; };
-		D0BF09522C8E66F6000D8DEC /* BurrowConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */; };
-		D0BF09552C8E66FD000D8DEC /* BurrowConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */; };
-		D0D4E53A2C8D996F007F820A /* BurrowCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5312C8D996F007F820A /* BurrowCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0D4E56B2C8D9C2F007F820A /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E49A2C8D921A007F820A /* Logging.swift */; };
-		D0D4E5702C8D9C62007F820A /* BurrowCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5312C8D996F007F820A /* BurrowCore.framework */; };
-		D0D4E5712C8D9C6F007F820A /* HackClub.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E49D2C8D921A007F820A /* HackClub.swift */; };
-		D0D4E5722C8D9C6F007F820A /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E49E2C8D921A007F820A /* Network.swift */; };
-		D0D4E5732C8D9C6F007F820A /* WireGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E49F2C8D921A007F820A /* WireGuard.swift */; };
-		D0D4E5742C8D9C6F007F820A /* BurrowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A22C8D921A007F820A /* BurrowView.swift */; };
-		D0D4E5752C8D9C6F007F820A /* FloatingButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A32C8D921A007F820A /* FloatingButtonStyle.swift */; };
-		D0D4E5762C8D9C6F007F820A /* MenuItemToggleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A42C8D921A007F820A /* MenuItemToggleView.swift */; };
-		D0D4E5772C8D9C6F007F820A /* NetworkCarouselView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A52C8D921A007F820A /* NetworkCarouselView.swift */; };
-		D0D4E5782C8D9C6F007F820A /* NetworkExtension+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A62C8D921A007F820A /* NetworkExtension+Async.swift */; };
-		D0D4E5792C8D9C6F007F820A /* NetworkExtensionTunnel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A72C8D921A007F820A /* NetworkExtensionTunnel.swift */; };
-		D0D4E57A2C8D9C6F007F820A /* NetworkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A82C8D921A007F820A /* NetworkView.swift */; };
-		D0D4E57B2C8D9C6F007F820A /* OAuth2.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4A92C8D921A007F820A /* OAuth2.swift */; };
-		D0D4E57C2C8D9C6F007F820A /* Tunnel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4AA2C8D921A007F820A /* Tunnel.swift */; };
-		D0D4E57D2C8D9C6F007F820A /* TunnelButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4AB2C8D921A007F820A /* TunnelButton.swift */; };
-		D0D4E57E2C8D9C6F007F820A /* TunnelStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4AC2C8D921A007F820A /* TunnelStatusView.swift */; };
-		D0D4E5892C8D9C94007F820A /* BurrowUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5582C8D9BF2007F820A /* BurrowUI.framework */; };
-		D0D4E58A2C8D9C9E007F820A /* BurrowUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5582C8D9BF2007F820A /* BurrowUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0D4E58B2C8D9CA4007F820A /* BurrowConfiguration.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0D4E5922C8D9D15007F820A /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E58F2C8D9D0A007F820A /* Constants.swift */; };
-		D0D4E5A62C8D9E65007F820A /* BurrowCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5312C8D996F007F820A /* BurrowCore.framework */; };
-		D0F4FAD32C8DC79C0068730A /* BurrowCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D4E5312C8D996F007F820A /* BurrowCore.framework */; };
-		D0F7594E2C8DAB6B00126CF3 /* GRPC in Frameworks */ = {isa = PBXBuildFile; productRef = D078F7E02C8DA375008A8CEC /* GRPC */; };
-		D0F759612C8DB24B00126CF3 /* grpc-swift-config.json in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4962C8D921A007F820A /* grpc-swift-config.json */; };
-		D0F759622C8DB24B00126CF3 /* swift-protobuf-config.json in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4972C8D921A007F820A /* swift-protobuf-config.json */; };
-		D0F7597E2C8DB30500126CF3 /* CGRPCZlib in Frameworks */ = {isa = PBXBuildFile; productRef = D0F7597D2C8DB30500126CF3 /* CGRPCZlib */; };
-		D0F7598D2C8DB3DA00126CF3 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D4E4992C8D921A007F820A /* Client.swift */; };
+		D05B9F7829E39EEC008CB1F9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05B9F7729E39EEC008CB1F9 /* ContentView.swift */; };
+		D05B9F7A29E39EED008CB1F9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D05B9F7929E39EED008CB1F9 /* Assets.xcassets */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@ -58,48 +26,6 @@
 			remoteGlobalIDString = D020F65229E4A697002790F6;
 			remoteInfo = BurrowNetworkExtension;
 		};
-		D0BF09502C8E66F1000D8DEC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E55A2C8D9BF4007F820A;
-			remoteInfo = Configuration;
-		};
-		D0BF09532C8E66FA000D8DEC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E55A2C8D9BF4007F820A;
-			remoteInfo = Configuration;
-		};
-		D0D4E56E2C8D9C5D007F820A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E5302C8D996F007F820A;
-			remoteInfo = Core;
-		};
-		D0D4E57F2C8D9C78007F820A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E5302C8D996F007F820A;
-			remoteInfo = Core;
-		};
-		D0D4E5872C8D9C88007F820A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E5502C8D9BF2007F820A;
-			remoteInfo = UI;
-		};
-		D0F4FAD12C8DC7960068730A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D05B9F6A29E39EEC008CB1F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0D4E5302C8D996F007F820A;
-			remoteInfo = Core;
-		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXCopyFilesBuildPhase section */
@ -114,28 +40,16 @@
 			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0D4E53F2C8D996F007F820A /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0D4E58B2C8D9CA4007F820A /* BurrowConfiguration.framework in Embed Frameworks */,
-				D0D4E58A2C8D9C9E007F820A /* BurrowUI.framework in Embed Frameworks */,
-				D0D4E53A2C8D996F007F820A /* BurrowCore.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		D00117422B30348D00D87C25 /* Configuration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Configuration.xcconfig; sourceTree = "<group>"; };
-		D00AA8962A4669BC005C8102 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		43EBDB2A29FD754A005D8CFF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		43EBDB2C29FD759E005D8CFF /* NetworkConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkConfiguration.swift; sourceTree = "<group>"; };
+		43EBDB2E29FDE85F005D8CFF /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
 		D020F63D29E4A1FF002790F6 /* Identity.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Identity.xcconfig; sourceTree = "<group>"; };
 		D020F64029E4A1FF002790F6 /* Compiler.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Compiler.xcconfig; sourceTree = "<group>"; };
 		D020F64229E4A1FF002790F6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		D020F64929E4A34B002790F6 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = "<group>"; };
+		D020F64929E4A34B002790F6 /* Burrow.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Burrow.xcconfig; sourceTree = "<group>"; };
 		D020F64A29E4A452002790F6 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = "<group>"; };
 		D020F65329E4A697002790F6 /* BurrowNetworkExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = BurrowNetworkExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		D020F65729E4A697002790F6 /* PacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketTunnelProvider.swift; sourceTree = "<group>"; };
@ -146,43 +60,10 @@
 		D020F66729E4A95D002790F6 /* NetworkExtension-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NetworkExtension-iOS.entitlements"; sourceTree = "<group>"; };
 		D020F66829E4AA74002790F6 /* App-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "App-iOS.entitlements"; sourceTree = "<group>"; };
 		D020F66929E4AA74002790F6 /* App-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "App-macOS.entitlements"; sourceTree = "<group>"; };
-		D04A3E1D2BAF465F0043EC85 /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
 		D05B9F7229E39EEC008CB1F9 /* Burrow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Burrow.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D05B9F7529E39EEC008CB1F9 /* BurrowApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BurrowApp.swift; sourceTree = "<group>"; };
-		D09150412B9D2AF700BE3CB0 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
-		D0B98FBF29FD8072004E7149 /* build-rust.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "build-rust.sh"; sourceTree = "<group>"; };
-		D0B98FD829FDDB6F004E7149 /* libburrow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libburrow.h; sourceTree = "<group>"; };
-		D0B98FDC29FDDDCF004E7149 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
-		D0BCC6032A09535900AD070D /* libburrow.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libburrow.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0BF09582C8E6789000D8DEC /* UI.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UI.xcconfig; sourceTree = "<group>"; };
-		D0D4E4952C8D921A007F820A /* burrow.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = burrow.proto; sourceTree = "<group>"; };
-		D0D4E4962C8D921A007F820A /* grpc-swift-config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "grpc-swift-config.json"; sourceTree = "<group>"; };
-		D0D4E4972C8D921A007F820A /* swift-protobuf-config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "swift-protobuf-config.json"; sourceTree = "<group>"; };
-		D0D4E4992C8D921A007F820A /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		D0D4E49A2C8D921A007F820A /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
-		D0D4E49D2C8D921A007F820A /* HackClub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HackClub.swift; sourceTree = "<group>"; };
-		D0D4E49E2C8D921A007F820A /* Network.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
-		D0D4E49F2C8D921A007F820A /* WireGuard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuard.swift; sourceTree = "<group>"; };
-		D0D4E4A12C8D921A007F820A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		D0D4E4A22C8D921A007F820A /* BurrowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BurrowView.swift; sourceTree = "<group>"; };
-		D0D4E4A32C8D921A007F820A /* FloatingButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingButtonStyle.swift; sourceTree = "<group>"; };
-		D0D4E4A42C8D921A007F820A /* MenuItemToggleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuItemToggleView.swift; sourceTree = "<group>"; };
-		D0D4E4A52C8D921A007F820A /* NetworkCarouselView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkCarouselView.swift; sourceTree = "<group>"; };
-		D0D4E4A62C8D921A007F820A /* NetworkExtension+Async.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NetworkExtension+Async.swift"; sourceTree = "<group>"; };
-		D0D4E4A72C8D921A007F820A /* NetworkExtensionTunnel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkExtensionTunnel.swift; sourceTree = "<group>"; };
-		D0D4E4A82C8D921A007F820A /* NetworkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkView.swift; sourceTree = "<group>"; };
-		D0D4E4A92C8D921A007F820A /* OAuth2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2.swift; sourceTree = "<group>"; };
-		D0D4E4AA2C8D921A007F820A /* Tunnel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tunnel.swift; sourceTree = "<group>"; };
-		D0D4E4AB2C8D921A007F820A /* TunnelButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelButton.swift; sourceTree = "<group>"; };
-		D0D4E4AC2C8D921A007F820A /* TunnelStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelStatusView.swift; sourceTree = "<group>"; };
-		D0D4E4F62C8D932D007F820A /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		D0D4E4F72C8D941D007F820A /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = "<group>"; };
-		D0D4E5312C8D996F007F820A /* BurrowCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BurrowCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0D4E5582C8D9BF2007F820A /* BurrowUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BurrowUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BurrowConfiguration.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0D4E58E2C8D9D0A007F820A /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
-		D0D4E58F2C8D9D0A007F820A /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
-		D0D4E5902C8D9D0A007F820A /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
+		D05B9F7729E39EEC008CB1F9 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		D05B9F7929E39EED008CB1F9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -190,10 +71,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D0BF09522C8E66F6000D8DEC /* BurrowConfiguration.framework in Frameworks */,
-				D0D4E5A62C8D9E65007F820A /* BurrowCore.framework in Frameworks */,
-				D0BCC6092A09A03E00AD070D /* libburrow.a in Frameworks */,
-				D0B1D1102C436152004B7823 /* AsyncAlgorithms in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -201,56 +78,21 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D0BF09552C8E66FD000D8DEC /* BurrowConfiguration.framework in Frameworks */,
-				D0F4FAD32C8DC79C0068730A /* BurrowCore.framework in Frameworks */,
-				D0D4E5892C8D9C94007F820A /* BurrowUI.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D078F7CF2C8DA213008A8CEC /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D03383B02C8E67E300F7C44E /* NIOTransportServices in Frameworks */,
-				D03383AF2C8E67E300F7C44E /* NIOConcurrencyHelpers in Frameworks */,
-				D03383AE2C8E67E300F7C44E /* NIO in Frameworks */,
-				D03383AD2C8E67E300F7C44E /* SwiftProtobuf in Frameworks */,
-				D0F7594E2C8DAB6B00126CF3 /* GRPC in Frameworks */,
-				D0F7597E2C8DB30500126CF3 /* CGRPCZlib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0D4E5532C8D9BF2007F820A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0D4E5702C8D9C62007F820A /* BurrowCore.framework in Frameworks */,
+				43E50D6D29FA050600BD2280 /* FluidMenuBarExtra in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		D00117432B30372900D87C25 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		D020F63C29E4A1FF002790F6 /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
 				D020F63D29E4A1FF002790F6 /* Identity.xcconfig */,
 				D020F64A29E4A452002790F6 /* App.xcconfig */,
 				D020F66329E4A703002790F6 /* Extension.xcconfig */,
-				D0D4E4F72C8D941D007F820A /* Framework.xcconfig */,
 				D020F64029E4A1FF002790F6 /* Compiler.xcconfig */,
-				D0D4E4F62C8D932D007F820A /* Debug.xcconfig */,
-				D04A3E1D2BAF465F0043EC85 /* Version.xcconfig */,
 				D020F64229E4A1FF002790F6 /* Info.plist */,
-				D0D4E5912C8D9D0A007F820A /* Constants */,
-				D00117422B30348D00D87C25 /* Configuration.xcconfig */,
 			);
 			path = Configuration;
 			sourceTree = "<group>";
@ -263,7 +105,6 @@
 				D020F66729E4A95D002790F6 /* NetworkExtension-iOS.entitlements */,
 				D020F66629E4A95D002790F6 /* NetworkExtension-macOS.entitlements */,
 				D020F66229E4A6E5002790F6 /* NetworkExtension.xcconfig */,
-				D0B98FD729FDDB57004E7149 /* libburrow */,
 			);
 			path = NetworkExtension;
 			sourceTree = "<group>";
@ -273,11 +114,8 @@
 			children = (
 				D05B9F7429E39EEC008CB1F9 /* App */,
 				D020F65629E4A697002790F6 /* NetworkExtension */,
-				D0D4E49C2C8D921A007F820A /* Core */,
-				D0D4E4AD2C8D921A007F820A /* UI */,
 				D020F63C29E4A1FF002790F6 /* Configuration */,
 				D05B9F7329E39EEC008CB1F9 /* Products */,
-				D00117432B30372900D87C25 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@ -286,10 +124,6 @@
 			children = (
 				D05B9F7229E39EEC008CB1F9 /* Burrow.app */,
 				D020F65329E4A697002790F6 /* BurrowNetworkExtension.appex */,
-				D0BCC6032A09535900AD070D /* libburrow.a */,
-				D0D4E5312C8D996F007F820A /* BurrowCore.framework */,
-				D0D4E5582C8D9BF2007F820A /* BurrowUI.framework */,
-				D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@ -298,86 +132,18 @@
 			isa = PBXGroup;
 			children = (
 				D05B9F7529E39EEC008CB1F9 /* BurrowApp.swift */,
-				D00AA8962A4669BC005C8102 /* AppDelegate.swift */,
-				D09150412B9D2AF700BE3CB0 /* MainMenu.xib */,
+				43EBDB2A29FD754A005D8CFF /* AppDelegate.swift */,
+				D05B9F7729E39EEC008CB1F9 /* ContentView.swift */,
+				43EBDB2C29FD759E005D8CFF /* NetworkConfiguration.swift */,
+				43EBDB2E29FDE85F005D8CFF /* Model.swift */,
+				D05B9F7929E39EED008CB1F9 /* Assets.xcassets */,
 				D020F66829E4AA74002790F6 /* App-iOS.entitlements */,
 				D020F66929E4AA74002790F6 /* App-macOS.entitlements */,
-				D020F64929E4A34B002790F6 /* App.xcconfig */,
+				D020F64929E4A34B002790F6 /* Burrow.xcconfig */,
 			);
 			path = App;
 			sourceTree = "<group>";
 		};
-		D0B98FD729FDDB57004E7149 /* libburrow */ = {
-			isa = PBXGroup;
-			children = (
-				D0B98FBF29FD8072004E7149 /* build-rust.sh */,
-				D0B98FDC29FDDDCF004E7149 /* module.modulemap */,
-				D0B98FD829FDDB6F004E7149 /* libburrow.h */,
-			);
-			path = libburrow;
-			sourceTree = "<group>";
-		};
-		D0D4E4982C8D921A007F820A /* Client */ = {
-			isa = PBXGroup;
-			children = (
-				D0D4E4952C8D921A007F820A /* burrow.proto */,
-				D0D4E4962C8D921A007F820A /* grpc-swift-config.json */,
-				D0D4E4972C8D921A007F820A /* swift-protobuf-config.json */,
-			);
-			path = Client;
-			sourceTree = "<group>";
-		};
-		D0D4E49C2C8D921A007F820A /* Core */ = {
-			isa = PBXGroup;
-			children = (
-				D0D4E49A2C8D921A007F820A /* Logging.swift */,
-				D0D4E4992C8D921A007F820A /* Client.swift */,
-				D0D4E4982C8D921A007F820A /* Client */,
-			);
-			path = Core;
-			sourceTree = "<group>";
-		};
-		D0D4E4A02C8D921A007F820A /* Networks */ = {
-			isa = PBXGroup;
-			children = (
-				D0D4E49D2C8D921A007F820A /* HackClub.swift */,
-				D0D4E49E2C8D921A007F820A /* Network.swift */,
-				D0D4E49F2C8D921A007F820A /* WireGuard.swift */,
-			);
-			path = Networks;
-			sourceTree = "<group>";
-		};
-		D0D4E4AD2C8D921A007F820A /* UI */ = {
-			isa = PBXGroup;
-			children = (
-				D0D4E4A22C8D921A007F820A /* BurrowView.swift */,
-				D0D4E4A02C8D921A007F820A /* Networks */,
-				D0D4E4A32C8D921A007F820A /* FloatingButtonStyle.swift */,
-				D0D4E4A42C8D921A007F820A /* MenuItemToggleView.swift */,
-				D0D4E4A52C8D921A007F820A /* NetworkCarouselView.swift */,
-				D0D4E4A62C8D921A007F820A /* NetworkExtension+Async.swift */,
-				D0D4E4A72C8D921A007F820A /* NetworkExtensionTunnel.swift */,
-				D0D4E4A82C8D921A007F820A /* NetworkView.swift */,
-				D0D4E4A92C8D921A007F820A /* OAuth2.swift */,
-				D0D4E4AA2C8D921A007F820A /* Tunnel.swift */,
-				D0D4E4AB2C8D921A007F820A /* TunnelButton.swift */,
-				D0D4E4AC2C8D921A007F820A /* TunnelStatusView.swift */,
-				D0D4E4A12C8D921A007F820A /* Assets.xcassets */,
-				D0BF09582C8E6789000D8DEC /* UI.xcconfig */,
-			);
-			path = UI;
-			sourceTree = "<group>";
-		};
-		D0D4E5912C8D9D0A007F820A /* Constants */ = {
-			isa = PBXGroup;
-			children = (
-				D0D4E58E2C8D9D0A007F820A /* Constants.h */,
-				D0D4E58F2C8D9D0A007F820A /* Constants.swift */,
-				D0D4E5902C8D9D0A007F820A /* module.modulemap */,
-			);
-			path = Constants;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@ -385,109 +151,41 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D020F65E29E4A697002790F6 /* Build configuration list for PBXNativeTarget "NetworkExtension" */;
 			buildPhases = (
-				D0BCC60B2A09A0C100AD070D /* Compile Rust */,
 				D020F64F29E4A697002790F6 /* Sources */,
 				D020F65029E4A697002790F6 /* Frameworks */,
+				D020F65129E4A697002790F6 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				D0BF09512C8E66F1000D8DEC /* PBXTargetDependency */,
-				D0D4E5802C8D9C78007F820A /* PBXTargetDependency */,
 			);
 			name = NetworkExtension;
 			productName = BurrowNetworkExtension;
 			productReference = D020F65329E4A697002790F6 /* BurrowNetworkExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
-		D05B9F7129E39EEC008CB1F9 /* App */ = {
+		D05B9F7129E39EEC008CB1F9 /* Burrow */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D05B9F8129E39EED008CB1F9 /* Build configuration list for PBXNativeTarget "App" */;
+			buildConfigurationList = D05B9F8129E39EED008CB1F9 /* Build configuration list for PBXNativeTarget "Burrow" */;
 			buildPhases = (
 				D05B9F6E29E39EEC008CB1F9 /* Sources */,
 				D05B9F6F29E39EEC008CB1F9 /* Frameworks */,
 				D05B9F7029E39EEC008CB1F9 /* Resources */,
-				D0D4E53F2C8D996F007F820A /* Embed Frameworks */,
 				D020F66129E4A697002790F6 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				D0BF09542C8E66FA000D8DEC /* PBXTargetDependency */,
-				D0F4FAD22C8DC7960068730A /* PBXTargetDependency */,
-				D0D4E5882C8D9C88007F820A /* PBXTargetDependency */,
 				D020F65C29E4A697002790F6 /* PBXTargetDependency */,
 			);
-			name = App;
+			name = Burrow;
+			packageProductDependencies = (
+				43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */,
+			);
 			productName = Burrow;
 			productReference = D05B9F7229E39EEC008CB1F9 /* Burrow.app */;
 			productType = "com.apple.product-type.application";
 		};
-		D0D4E5302C8D996F007F820A /* Core */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0D4E53C2C8D996F007F820A /* Build configuration list for PBXNativeTarget "Core" */;
-			buildPhases = (
-				D0D4E52D2C8D996F007F820A /* Sources */,
-				D078F7CF2C8DA213008A8CEC /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0F7598A2C8DB34200126CF3 /* PBXTargetDependency */,
-				D0F7595E2C8DB24400126CF3 /* PBXTargetDependency */,
-				D0F759602C8DB24400126CF3 /* PBXTargetDependency */,
-			);
-			name = Core;
-			packageProductDependencies = (
-				D078F7E02C8DA375008A8CEC /* GRPC */,
-				D078F7E22C8DA375008A8CEC /* SwiftProtobuf */,
-				D044EE902C8DAB2000778185 /* NIO */,
-				D044EE922C8DAB2000778185 /* NIOConcurrencyHelpers */,
-				D044EE952C8DAB2800778185 /* NIOTransportServices */,
-				D0F7597D2C8DB30500126CF3 /* CGRPCZlib */,
-			);
-			productName = Core;
-			productReference = D0D4E5312C8D996F007F820A /* BurrowCore.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		D0D4E5502C8D9BF2007F820A /* UI */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0D4E5552C8D9BF2007F820A /* Build configuration list for PBXNativeTarget "UI" */;
-			buildPhases = (
-				D0D4E5522C8D9BF2007F820A /* Sources */,
-				D0D4E5532C8D9BF2007F820A /* Frameworks */,
-				D0D4E5542C8D9BF2007F820A /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0D4E56F2C8D9C5D007F820A /* PBXTargetDependency */,
-			);
-			name = UI;
-			packageProductDependencies = (
-			);
-			productName = Core;
-			productReference = D0D4E5582C8D9BF2007F820A /* BurrowUI.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		D0D4E55A2C8D9BF4007F820A /* Configuration */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0D4E55F2C8D9BF4007F820A /* Build configuration list for PBXNativeTarget "Configuration" */;
-			buildPhases = (
-				D0F759912C8DB49E00126CF3 /* Configure Version */,
-				D0D4E55C2C8D9BF4007F820A /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Configuration;
-			packageProductDependencies = (
-			);
-			productName = Core;
-			productReference = D0D4E5622C8D9BF4007F820A /* BurrowConfiguration.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@ -495,8 +193,8 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastSwiftUpdateCheck = 1600;
-				LastUpgradeCheck = 1520;
+				LastSwiftUpdateCheck = 1430;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					D020F65229E4A697002790F6 = {
 						CreatedOnToolsVersion = 14.3;
@ -504,9 +202,6 @@
 					D05B9F7129E39EEC008CB1F9 = {
 						CreatedOnToolsVersion = 14.3;
 					};
-					D0D4E5302C8D996F007F820A = {
-						CreatedOnToolsVersion = 16.0;
-					};
 				};
 			};
 			buildConfigurationList = D05B9F6D29E39EEC008CB1F9 /* Build configuration list for PBXProject "Burrow" */;
@ -519,88 +214,36 @@
 			);
 			mainGroup = D05B9F6929E39EEC008CB1F9;
 			packageReferences = (
-				D0B1D10E2C436152004B7823 /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
-				D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */,
-				D0D4E4852C8D8F29007F820A /* XCRemoteSwiftPackageReference "swift-protobuf" */,
-				D044EE8F2C8DAB2000778185 /* XCRemoteSwiftPackageReference "swift-nio" */,
-				D044EE942C8DAB2800778185 /* XCRemoteSwiftPackageReference "swift-nio-transport-services" */,
+				43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */,
 			);
 			productRefGroup = D05B9F7329E39EEC008CB1F9 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				D05B9F7129E39EEC008CB1F9 /* App */,
+				D05B9F7129E39EEC008CB1F9 /* Burrow */,
 				D020F65229E4A697002790F6 /* NetworkExtension */,
-				D0D4E5502C8D9BF2007F820A /* UI */,
-				D0D4E5302C8D996F007F820A /* Core */,
-				D0D4E55A2C8D9BF4007F820A /* Configuration */,
 			);
 		};
 /* End PBXProject section */

 /* Begin PBXResourcesBuildPhase section */
+		D020F65129E4A697002790F6 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		D05B9F7029E39EEC008CB1F9 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D09150422B9D2AF700BE3CB0 /* MainMenu.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0D4E5542C8D9BF2007F820A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
+				D05B9F7A29E39EED008CB1F9 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */

-/* Begin PBXShellScriptBuildPhase section */
-		D0BCC60B2A09A0C100AD070D /* Compile Rust */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Compile Rust";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/NetworkExtension/libburrow/build-rust.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D0F759912C8DB49E00126CF3 /* Configure Version */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(PROJECT_DIR)/../Tools/version.sh",
-				"$(PROJECT_DIR)/../.git",
-			);
-			name = "Configure Version";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(PROJECT_DIR)/Configuration/Version.xcconfig",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"$PROJECT_DIR/../Tools/version.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		D020F64F29E4A697002790F6 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@ -614,48 +257,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D00AA8972A4669BC005C8102 /* AppDelegate.swift in Sources */,
+				43EBDB2F29FDE85F005D8CFF /* Model.swift in Sources */,
+				43EBDB2B29FD7557005D8CFF /* AppDelegate.swift in Sources */,
+				D05B9F7829E39EEC008CB1F9 /* ContentView.swift in Sources */,
 				D05B9F7629E39EEC008CB1F9 /* BurrowApp.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0D4E52D2C8D996F007F820A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0F759612C8DB24B00126CF3 /* grpc-swift-config.json in Sources */,
-				D0F759622C8DB24B00126CF3 /* swift-protobuf-config.json in Sources */,
-				D0F7598D2C8DB3DA00126CF3 /* Client.swift in Sources */,
-				D0D4E56B2C8D9C2F007F820A /* Logging.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0D4E5522C8D9BF2007F820A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0D4E5712C8D9C6F007F820A /* HackClub.swift in Sources */,
-				D0D4E5722C8D9C6F007F820A /* Network.swift in Sources */,
-				D0D4E5732C8D9C6F007F820A /* WireGuard.swift in Sources */,
-				D0D4E5742C8D9C6F007F820A /* BurrowView.swift in Sources */,
-				D0D4E5752C8D9C6F007F820A /* FloatingButtonStyle.swift in Sources */,
-				D0D4E5762C8D9C6F007F820A /* MenuItemToggleView.swift in Sources */,
-				D0D4E5772C8D9C6F007F820A /* NetworkCarouselView.swift in Sources */,
-				D0D4E5782C8D9C6F007F820A /* NetworkExtension+Async.swift in Sources */,
-				D0D4E5792C8D9C6F007F820A /* NetworkExtensionTunnel.swift in Sources */,
-				D0D4E57A2C8D9C6F007F820A /* NetworkView.swift in Sources */,
-				D0D4E57B2C8D9C6F007F820A /* OAuth2.swift in Sources */,
-				D0D4E57C2C8D9C6F007F820A /* Tunnel.swift in Sources */,
-				D0D4E57D2C8D9C6F007F820A /* TunnelButton.swift in Sources */,
-				D0D4E57E2C8D9C6F007F820A /* TunnelStatusView.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0D4E55C2C8D9BF4007F820A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0D4E5922C8D9D15007F820A /* Constants.swift in Sources */,
+				43EBDB2D29FD759E005D8CFF /* NetworkConfiguration.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -667,48 +273,6 @@
 			target = D020F65229E4A697002790F6 /* NetworkExtension */;
 			targetProxy = D020F65B29E4A697002790F6 /* PBXContainerItemProxy */;
 		};
-		D0BF09512C8E66F1000D8DEC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E55A2C8D9BF4007F820A /* Configuration */;
-			targetProxy = D0BF09502C8E66F1000D8DEC /* PBXContainerItemProxy */;
-		};
-		D0BF09542C8E66FA000D8DEC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E55A2C8D9BF4007F820A /* Configuration */;
-			targetProxy = D0BF09532C8E66FA000D8DEC /* PBXContainerItemProxy */;
-		};
-		D0D4E56F2C8D9C5D007F820A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E5302C8D996F007F820A /* Core */;
-			targetProxy = D0D4E56E2C8D9C5D007F820A /* PBXContainerItemProxy */;
-		};
-		D0D4E5802C8D9C78007F820A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E5302C8D996F007F820A /* Core */;
-			targetProxy = D0D4E57F2C8D9C78007F820A /* PBXContainerItemProxy */;
-		};
-		D0D4E5882C8D9C88007F820A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E5502C8D9BF2007F820A /* UI */;
-			targetProxy = D0D4E5872C8D9C88007F820A /* PBXContainerItemProxy */;
-		};
-		D0F4FAD22C8DC7960068730A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0D4E5302C8D996F007F820A /* Core */;
-			targetProxy = D0F4FAD12C8DC7960068730A /* PBXContainerItemProxy */;
-		};
-		D0F7595E2C8DB24400126CF3 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = D0F7595D2C8DB24400126CF3 /* GRPCSwiftPlugin */;
-		};
-		D0F759602C8DB24400126CF3 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = D0F7595F2C8DB24400126CF3 /* SwiftProtobufPlugin */;
-		};
-		D0F7598A2C8DB34200126CF3 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = D0F759892C8DB34200126CF3 /* GRPC */;
-		};
 /* End PBXTargetDependency section */

 /* Begin XCBuildConfiguration section */
@ -716,6 +280,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D020F66229E4A6E5002790F6 /* NetworkExtension.xcconfig */;
 			buildSettings = {
+				DEVELOPMENT_TEAM = 2H4LMN3ZLG;
 			};
 			name = Debug;
 		};
@ -723,6 +288,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D020F66229E4A6E5002790F6 /* NetworkExtension.xcconfig */;
 			buildSettings = {
+				DEVELOPMENT_TEAM = 2H4LMN3ZLG;
 			};
 			name = Release;
 		};
@ -742,57 +308,19 @@
 		};
 		D05B9F8229E39EED008CB1F9 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D020F64929E4A34B002790F6 /* App.xcconfig */;
+			baseConfigurationReference = D020F64929E4A34B002790F6 /* Burrow.xcconfig */;
 			buildSettings = {
+				DEVELOPMENT_TEAM = 2H4LMN3ZLG;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
 		D05B9F8329E39EED008CB1F9 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D020F64929E4A34B002790F6 /* App.xcconfig */;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		D0D4E53D2C8D996F007F820A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D4E4F72C8D941D007F820A /* Framework.xcconfig */;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		D0D4E53E2C8D996F007F820A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D4E4F72C8D941D007F820A /* Framework.xcconfig */;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		D0D4E5562C8D9BF2007F820A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0BF09582C8E6789000D8DEC /* UI.xcconfig */;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		D0D4E5572C8D9BF2007F820A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0BF09582C8E6789000D8DEC /* UI.xcconfig */;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		D0D4E5602C8D9BF4007F820A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D00117422B30348D00D87C25 /* Configuration.xcconfig */;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		D0D4E5612C8D9BF4007F820A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D00117422B30348D00D87C25 /* Configuration.xcconfig */;
+			baseConfigurationReference = D020F64929E4A34B002790F6 /* Burrow.xcconfig */;
 			buildSettings = {
+				DEVELOPMENT_TEAM = 2H4LMN3ZLG;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};
@ -817,7 +345,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D05B9F8129E39EED008CB1F9 /* Build configuration list for PBXNativeTarget "App" */ = {
+		D05B9F8129E39EED008CB1F9 /* Build configuration list for PBXNativeTarget "Burrow" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D05B9F8229E39EED008CB1F9 /* Debug */,
@ -826,128 +354,24 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D0D4E53C2C8D996F007F820A /* Build configuration list for PBXNativeTarget "Core" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0D4E53D2C8D996F007F820A /* Debug */,
-				D0D4E53E2C8D996F007F820A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		D0D4E5552C8D9BF2007F820A /* Build configuration list for PBXNativeTarget "UI" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0D4E5562C8D9BF2007F820A /* Debug */,
-				D0D4E5572C8D9BF2007F820A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		D0D4E55F2C8D9BF4007F820A /* Build configuration list for PBXNativeTarget "Configuration" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0D4E5602C8D9BF4007F820A /* Debug */,
-				D0D4E5612C8D9BF4007F820A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */

 /* Begin XCRemoteSwiftPackageReference section */
-		D044EE8F2C8DAB2000778185 /* XCRemoteSwiftPackageReference "swift-nio" */ = {
+		43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-nio.git";
+			repositoryURL = "https://github.com/lfroms/fluid-menu-bar-extra.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 2.72.0;
-			};
-		};
-		D044EE942C8DAB2800778185 /* XCRemoteSwiftPackageReference "swift-nio-transport-services" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-nio-transport-services.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.21.0;
-			};
-		};
-		D0B1D10E2C436152004B7823 /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.1;
-			};
-		};
-		D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/grpc/grpc-swift.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.23.0;
-			};
-		};
-		D0D4E4852C8D8F29007F820A /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-protobuf.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.28.1;
+				branch = main;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

 /* Begin XCSwiftPackageProductDependency section */
-		D044EE902C8DAB2000778185 /* NIO */ = {
+		43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = D044EE8F2C8DAB2000778185 /* XCRemoteSwiftPackageReference "swift-nio" */;
-			productName = NIO;
-		};
-		D044EE922C8DAB2000778185 /* NIOConcurrencyHelpers */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D044EE8F2C8DAB2000778185 /* XCRemoteSwiftPackageReference "swift-nio" */;
-			productName = NIOConcurrencyHelpers;
-		};
-		D044EE952C8DAB2800778185 /* NIOTransportServices */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D044EE942C8DAB2800778185 /* XCRemoteSwiftPackageReference "swift-nio-transport-services" */;
-			productName = NIOTransportServices;
-		};
-		D078F7E02C8DA375008A8CEC /* GRPC */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */;
-			productName = GRPC;
-		};
-		D078F7E22C8DA375008A8CEC /* SwiftProtobuf */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4852C8D8F29007F820A /* XCRemoteSwiftPackageReference "swift-protobuf" */;
-			productName = SwiftProtobuf;
-		};
-		D0B1D10F2C436152004B7823 /* AsyncAlgorithms */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0B1D10E2C436152004B7823 /* XCRemoteSwiftPackageReference "swift-async-algorithms" */;
-			productName = AsyncAlgorithms;
-		};
-		D0F7595D2C8DB24400126CF3 /* GRPCSwiftPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */;
-			productName = "plugin:GRPCSwiftPlugin";
-		};
-		D0F7595F2C8DB24400126CF3 /* SwiftProtobufPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4852C8D8F29007F820A /* XCRemoteSwiftPackageReference "swift-protobuf" */;
-			productName = "plugin:SwiftProtobufPlugin";
-		};
-		D0F7597D2C8DB30500126CF3 /* CGRPCZlib */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */;
-			productName = CGRPCZlib;
-		};
-		D0F759892C8DB34200126CF3 /* GRPC */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D0D4E4822C8D8EF6007F820A /* XCRemoteSwiftPackageReference "grpc-swift" */;
-			productName = GRPC;
+			package = 43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */;
+			productName = FluidMenuBarExtra;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};
--- a/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -1,8 +0,0 @@
-<?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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
--- a/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@ -1,123 +1,14 @@
 {
-  "originHash" : "fa512b990383b7e309c5854a5279817052294a8191a6d3c55c49cfb38e88c0c3",
  "pins" : [
    {
-      "identity" : "grpc-swift",
+      "identity" : "fluid-menu-bar-extra",
      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/grpc/grpc-swift.git",
+      "location" : "https://github.com/lfroms/fluid-menu-bar-extra.git",
      "state" : {
-        "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1",
-        "version" : "1.23.0"
-      }
-    },
-    {
-      "identity" : "swift-async-algorithms",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-async-algorithms.git",
-      "state" : {
-        "revision" : "6ae9a051f76b81cc668305ceed5b0e0a7fd93d20",
-        "version" : "1.0.1"
-      }
-    },
-    {
-      "identity" : "swift-atomics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-atomics.git",
-      "state" : {
-        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
-        "version" : "1.2.0"
-      }
-    },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
-        "version" : "1.1.3"
-      }
-    },
-    {
-      "identity" : "swift-http-types",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-http-types",
-      "state" : {
-        "revision" : "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
-        "version" : "1.3.0"
-      }
-    },
-    {
-      "identity" : "swift-log",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log.git",
-      "state" : {
-        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
-        "version" : "1.6.1"
-      }
-    },
-    {
-      "identity" : "swift-nio",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio.git",
-      "state" : {
-        "revision" : "9746cf80e29edfef2a39924a66731249223f42a3",
-        "version" : "2.72.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-extras",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-extras.git",
-      "state" : {
-        "revision" : "d1ead62745cc3269e482f1c51f27608057174379",
-        "version" : "1.24.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-http2",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-http2.git",
-      "state" : {
-        "revision" : "b5f7062b60e4add1e8c343ba4eb8da2e324b3a94",
-        "version" : "1.34.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-ssl",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-ssl.git",
-      "state" : {
-        "revision" : "7b84abbdcef69cc3be6573ac12440220789dcd69",
-        "version" : "2.27.2"
-      }
-    },
-    {
-      "identity" : "swift-nio-transport-services",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-transport-services.git",
-      "state" : {
-        "revision" : "38ac8221dd20674682148d6451367f89c2652980",
-        "version" : "1.21.0"
-      }
-    },
-    {
-      "identity" : "swift-protobuf",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
-      "state" : {
-        "revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5",
-        "version" : "1.28.1"
-      }
-    },
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
-        "version" : "1.3.2"
+        "branch" : "main",
+        "revision" : "b8d41bc1c2609c3943c47d00fb539de38f90b817"
      }
    }
  ],
-  "version" : 3
+  "version" : 2
 }
--- a/Apple/Burrow.xcodeproj/xcshareddata/xcschemes/App.xcscheme
+++ b/Apple/Burrow.xcodeproj/xcshareddata/xcschemes/App.xcscheme
@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-               BuildableName = "Burrow.app"
-               BlueprintName = "App"
-               ReferencedContainer = "container:Burrow.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-            BuildableName = "Burrow.app"
-            BlueprintName = "App"
-            ReferencedContainer = "container:Burrow.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-            BuildableName = "Burrow.app"
-            BlueprintName = "App"
-            ReferencedContainer = "container:Burrow.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/Apple/Burrow.xcodeproj/xcshareddata/xcschemes/NetworkExtension.xcscheme
+++ b/Apple/Burrow.xcodeproj/xcshareddata/xcschemes/NetworkExtension.xcscheme
@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D020F65229E4A697002790F6"
-               BuildableName = "BurrowNetworkExtension.appex"
-               BlueprintName = "NetworkExtension"
-               ReferencedContainer = "container:Burrow.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-               BuildableName = "Burrow.app"
-               BlueprintName = "App"
-               ReferencedContainer = "container:Burrow.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "0"
-      askForAppToLaunch = "Yes"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-            BuildableName = "Burrow.app"
-            BlueprintName = "App"
-            ReferencedContainer = "container:Burrow.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D05B9F7129E39EEC008CB1F9"
-            BuildableName = "Burrow.app"
-            BlueprintName = "App"
-            ReferencedContainer = "container:Burrow.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/Apple/Configuration/App.xcconfig
+++ b/Apple/Configuration/App.xcconfig
@ -1,8 +1,10 @@
-LD_EXPORT_SYMBOLS = NO
+
 SKIP_INSTALL = NO

-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks

 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
+
+ENABLE_PREVIEWS = YES
--- a/Apple/Configuration/Compiler.xcconfig
+++ b/Apple/Configuration/Compiler.xcconfig
@ -1,44 +1,61 @@
 #include "Identity.xcconfig"
-#include "Debug.xcconfig"
-#include "Version.xcconfig"

 SDKROOT = auto
 ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES

 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx
-SWIFT_VERSION = 6.0
-IPHONEOS_DEPLOYMENT_TARGET = 17.0
-MACOSX_DEPLOYMENT_TARGET = 14.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.0
+MACOSX_DEPLOYMENT_TARGET = 12.0
 SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO
 SUPPORTS_MACCATALYST = NO

+ALWAYS_SEARCH_USER_PATHS = NO
 PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
 PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).$(PRODUCT_NAME)
+CURRENT_PROJECT_VERSION = 1
 MARKETING_VERSION = 0.1

 SKIP_INSTALL = YES

 CODE_SIGN_IDENTITY = Apple Development

-GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = Configuration/Info.plist
-INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023-2024 Hack Club
+GENERATE_INFOPLIST_FILE = YES
+INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 Hack Club
 INFOPLIST_KEY_CFBundleDisplayName = Burrow

-ENABLE_APP_SANDBOX[sdk=macosx*] = YES
-
 ENABLE_BITCODE = NO
-ALWAYS_SEARCH_USER_PATHS = NO
+
+ENABLE_APP_SANDBOX[sdk=macosx*] = YES
+ENABLE_HARDENED_RUNTIME[sdk=macosx*] = YES
 COMBINE_HIDPI_IMAGES = YES
-EAGER_LINKING = YES
+COPY_PHASE_STRIP = NO
+
 FUSE_BUILD_SCRIPT_PHASES = YES
-SWIFT_EMIT_LOC_STRINGS = YES
-LOCALIZATION_PREFERS_STRING_CATALOGS = YES
-ENABLE_DEBUG_DYLIB = NO

 APP_GROUP_IDENTIFIER = group.$(APP_BUNDLE_IDENTIFIER)
 APP_GROUP_IDENTIFIER[sdk=macosx*] = $(DEVELOPMENT_TEAM).$(APP_BUNDLE_IDENTIFIER)
-NETWORK_EXTENSION_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).network

-// https://github.com/grpc/grpc-swift/issues/683#issuecomment-1130118953
-OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CNIOAtomics.modulemap -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CNIODarwin.modulemap -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CGRPCZlib.modulemap
+// Swift
+SWIFT_VERSION = 5.0
+SWIFT_EMIT_LOC_STRINGS = YES
+
+// Release
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+SWIFT_REFLECTION_METADATA_LEVEL = none
+SWIFT_COMPILATION_MODE = wholemodule
+SWIFT_OPTIMIZATION_LEVEL = -Osize
+LLVM_LTO = YES
+DEAD_CODE_STRIPPING = YES
+VALIDATE_PRODUCT = YES
+
+// Debug
+ONLY_ACTIVE_ARCH[config=Debug] = YES
+DEBUG_INFORMATION_FORMAT[config=Debug] = dwarf
+ENABLE_TESTABILITY[config=Debug] = YES
+SWIFT_OPTIMIZATION_LEVEL[config=Debug] = -Onone
+SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG
+SWIFT_COMPILATION_MODE[config=Debug] = singlefile
+LLVM_LTO[config=Debug] = NO
+DEAD_CODE_STRIPPING[config=Debug] = NO
+VALIDATE_PRODUCT[config=Debug] = NO
--- a/Apple/Configuration/Configuration.xcconfig
+++ b/Apple/Configuration/Configuration.xcconfig
@ -1,4 +0,0 @@
-#include "Framework.xcconfig"
-
-SWIFT_INCLUDE_PATHS = $(PROJECT_DIR)/Configuration/Constants
-GCC_PREPROCESSOR_DEFINITIONS = APP_BUNDLE_IDENTIFIER=$(APP_BUNDLE_IDENTIFIER) APP_GROUP_IDENTIFIER=$(APP_GROUP_IDENTIFIER) NETWORK_EXTENSION_BUNDLE_IDENTIFIER=$(NETWORK_EXTENSION_BUNDLE_IDENTIFIER)
--- a/Apple/Configuration/Constants/Constants.h
+++ b/Apple/Configuration/Constants/Constants.h
@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define MACRO_STRING_(m) #m
-#define MACRO_STRING(m) @MACRO_STRING_(m)
-
-NS_ASSUME_NONNULL_BEGIN
-
-static NSString * const AppBundleIdentifier = MACRO_STRING(APP_BUNDLE_IDENTIFIER);
-static NSString * const AppGroupIdentifier = MACRO_STRING(APP_GROUP_IDENTIFIER);
-static NSString * const NetworkExtensionBundleIdentifier = MACRO_STRING(NETWORK_EXTENSION_BUNDLE_IDENTIFIER);
-
-NS_ASSUME_NONNULL_END
--- a/Apple/Configuration/Constants/Constants.swift
+++ b/Apple/Configuration/Constants/Constants.swift
@ -1,38 +0,0 @@
-@_implementationOnly import CConstants
-import OSLog
-
-public enum Constants {
-    enum Error: Swift.Error {
-        case invalidAppGroupIdentifier
-    }
-
-    public static let bundleIdentifier = AppBundleIdentifier
-    public static let appGroupIdentifier = AppGroupIdentifier
-    public static let networkExtensionBundleIdentifier = NetworkExtensionBundleIdentifier
-
-    public static var socketURL: URL {
-        get throws {
-            try groupContainerURL.appending(component: "burrow.sock", directoryHint: .notDirectory)
-        }
-    }
-    public static var databaseURL: URL {
-        get throws {
-            try groupContainerURL.appending(component: "burrow.db", directoryHint: .notDirectory)
-        }
-    }
-
-    private static var groupContainerURL: URL {
-        get throws { try _groupContainerURL.get() }
-    }
-    private static let _groupContainerURL: Result<URL, Error> = {
-        switch FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) {
-        case .some(let url): .success(url)
-        case .none: .failure(.invalidAppGroupIdentifier)
-        }
-    }()
-}
-
-extension Logger {
-    @_dynamicReplacement(for: subsystem)
-    public static var subsystem: String { Constants.bundleIdentifier }
-}
--- a/Apple/Configuration/Constants/module.modulemap
+++ b/Apple/Configuration/Constants/module.modulemap
@ -1,4 +0,0 @@
-module CConstants {
-    header "Constants.h"
-    export *
-}
--- a/Apple/Configuration/Debug.xcconfig
+++ b/Apple/Configuration/Debug.xcconfig
@ -1,26 +0,0 @@
-// Release
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-SWIFT_COMPILATION_MODE = wholemodule
-SWIFT_OPTIMIZATION_LEVEL = -Osize
-LLVM_LTO = YES
-DEAD_CODE_STRIPPING = YES
-STRIP_INSTALLED_PRODUCT = YES
-STRIP_SWIFT_SYMBOLS = YES
-COPY_PHASE_STRIP = NO
-VALIDATE_PRODUCT = YES
-ENABLE_MODULE_VERIFIER = YES
-
-// Debug
-ONLY_ACTIVE_ARCH[config=Debug] = YES
-DEBUG_INFORMATION_FORMAT[config=Debug] = dwarf
-ENABLE_TESTABILITY[config=Debug] = YES
-GCC_PREPROCESSOR_DEFINITIONS[config=Debug] = DEBUG=1 $(inherited)
-SWIFT_OPTIMIZATION_LEVEL[config=Debug] = -Onone
-SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG
-SWIFT_COMPILATION_MODE[config=Debug] = singlefile
-LLVM_LTO[config=Debug] = NO
-DEAD_CODE_STRIPPING[config=Debug] = NO
-VALIDATE_PRODUCT[config=Debug] = NO
-STRIP_INSTALLED_PRODUCT[config=Debug] = NO
-STRIP_SWIFT_SYMBOLS[config=Debug] = NO
-ENABLE_MODULE_VERIFIER[config=Debug] = NO
--- a/Apple/Configuration/Extension.xcconfig
+++ b/Apple/Configuration/Extension.xcconfig
@ -1,6 +1,2 @@
-LD_EXPORT_SYMBOLS = NO
-
-OTHER_SWIFT_FLAGS = $(inherited) -Xfrontend -disable-autolink-framework -Xfrontend UIKit -Xfrontend -disable-autolink-framework -Xfrontend AppKit -Xfrontend -disable-autolink-framework -Xfrontend SwiftUI
-
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=macos*] = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
--- a/Apple/Configuration/Framework.xcconfig
+++ b/Apple/Configuration/Framework.xcconfig
@ -1,14 +0,0 @@
-PRODUCT_NAME = Burrow$(TARGET_NAME:c99extidentifier)
-PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).$(TARGET_NAME:c99extidentifier)
-APPLICATION_EXTENSION_API_ONLY = YES
-SWIFT_INSTALL_OBJC_HEADER = NO
-SWIFT_SKIP_AUTOLINKING_FRAMEWORKS = YES
-SWIFT_SKIP_AUTOLINKING_LIBRARIES = YES
-
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
-LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks
-
-DYLIB_INSTALL_NAME_BASE = @rpath
-DYLIB_COMPATIBILITY_VERSION = 1
-DYLIB_CURRENT_VERSION = 1
-VERSIONING_SYSTEM =
--- a/Apple/Configuration/Identity.xcconfig
+++ b/Apple/Configuration/Identity.xcconfig
@ -1,2 +1,2 @@
-DEVELOPMENT_TEAM = P6PV2R9443
-APP_BUNDLE_IDENTIFIER = com.hackclub.burrow
+DEVELOPMENT_TEAM = 2H4LMN3ZLG
+APP_BUNDLE_IDENTIFIER = com.ThomasStubblefield.burrow
--- a/Apple/Configuration/Version.xcconfig
+++ b/Apple/Configuration/Version.xcconfig
--- a/Apple/Core/Client.swift
+++ b/Apple/Core/Client.swift
@ -1,32 +0,0 @@
-import GRPC
-import NIOTransportServices
-
-public typealias TunnelClient = Burrow_TunnelAsyncClient
-public typealias NetworksClient = Burrow_NetworksAsyncClient
-
-public protocol Client {
-    init(channel: GRPCChannel)
-}
-
-extension Client {
-    public static func unix(socketURL: URL) -> Self {
-        let group = NIOTSEventLoopGroup()
-        let configuration = ClientConnection.Configuration.default(
-            target: .unixDomainSocket(socketURL.path),
-            eventLoopGroup: group
-        )
-        return Self(channel: ClientConnection(configuration: configuration))
-    }
-}
-
-extension TunnelClient: Client {
-    public init(channel: any GRPCChannel) {
-        self.init(channel: channel, defaultCallOptions: .init(), interceptors: .none)
-    }
-}
-
-extension NetworksClient: Client {
-    public init(channel: any GRPCChannel) {
-        self.init(channel: channel, defaultCallOptions: .init(), interceptors: .none)
-    }
-}
--- a/Apple/Core/Client/burrow.proto
+++ b/Apple/Core/Client/burrow.proto
@ -1 +0,0 @@
-../../../proto/burrow.proto
--- a/Apple/Core/Client/grpc-swift-config.json
+++ b/Apple/Core/Client/grpc-swift-config.json
@ -1,11 +0,0 @@
-{
-  "invocations": [
-    {
-      "protoFiles": [
-        "burrow.proto",
-      ],
-      "server": false,
-      "visibility": "public"
-    }
-  ]
-}
--- a/Apple/Core/Client/swift-protobuf-config.json
+++ b/Apple/Core/Client/swift-protobuf-config.json
@ -1,10 +0,0 @@
-{
-  "invocations": [
-    {
-      "protoFiles": [
-        "burrow.proto",
-      ],
-      "visibility": "public"
-    }
-  ]
-}
--- a/Apple/Core/Logging.swift
+++ b/Apple/Core/Logging.swift
@ -1,19 +0,0 @@
-import os
-@_exported import OSLog
-
-extension Logger {
-    private static let loggers: OSAllocatedUnfairLock<[String: Logger]> = OSAllocatedUnfairLock(initialState: [:])
-
-    public dynamic static var subsystem: String { "com.hackclub.burrow" }
-
-    public static func logger(for type: Any.Type) -> Logger {
-        let category = String(describing: type)
-        let logger = loggers.withLock { loggers in
-            if let logger = loggers[category] { return logger }
-            let logger = Logger(subsystem: subsystem, category: category)
-            loggers[category] = logger
-            return logger
-        }
-        return logger
-    }
-}
--- a/Apple/NetworkExtension/Info.plist
+++ b/Apple/NetworkExtension/Info.plist
@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>$(INFOPLIST_KEY_CFBundleDisplayName)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
--- a/Apple/NetworkExtension/NetworkExtension-iOS.entitlements
+++ b/Apple/NetworkExtension/NetworkExtension-iOS.entitlements
@ -2,10 +2,6 @@
 <!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.developer.networking.networkextension</key>
-	<array>
-		<string>packet-tunnel-provider</string>
-	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(APP_GROUP_IDENTIFIER)</string>
--- a/Apple/NetworkExtension/NetworkExtension-macOS.entitlements
+++ b/Apple/NetworkExtension/NetworkExtension-macOS.entitlements
@ -2,19 +2,9 @@
 <!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.developer.networking.networkextension</key>
-	<array>
-		<string>packet-tunnel-provider</string>
-	</array>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
 </dict>
 </plist>
--- a/Apple/NetworkExtension/NetworkExtension.xcconfig
+++ b/Apple/NetworkExtension/NetworkExtension.xcconfig
@ -1,11 +1,8 @@
 #include "../Configuration/Extension.xcconfig"

 PRODUCT_NAME = BurrowNetworkExtension
-PRODUCT_BUNDLE_IDENTIFIER = $(NETWORK_EXTENSION_BUNDLE_IDENTIFIER)
-
+PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).network
 INFOPLIST_FILE = NetworkExtension/Info.plist

 CODE_SIGN_ENTITLEMENTS = NetworkExtension/NetworkExtension-iOS.entitlements
-CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = NetworkExtension/NetworkExtension-macOS.entitlements
-
-SWIFT_INCLUDE_PATHS = $(inherited) $(PROJECT_DIR)/NetworkExtension
+CODE_SIGN_ENTITLEMENTS[sdk=macos*] = NetworkExtension/NetworkExtension-macOS.entitlements
--- a/Apple/NetworkExtension/PacketTunnelProvider.swift
+++ b/Apple/NetworkExtension/PacketTunnelProvider.swift
@ -1,74 +1,29 @@
-import AsyncAlgorithms
-import BurrowConfiguration
-import BurrowCore
-import libburrow
 import NetworkExtension
-import os

 class PacketTunnelProvider: NEPacketTunnelProvider {
-    enum Error: Swift.Error {
-        case missingTunnelConfiguration
+
+    override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
+        // Add code here to start the process of connecting the tunnel.
    }
    
-    private let logger = Logger.logger(for: PacketTunnelProvider.self)
-
-    private var client: TunnelClient {
-        get throws { try _client.get() }
-    }
-    private let _client: Result<TunnelClient, Swift.Error> = Result {
-        try TunnelClient.unix(socketURL: Constants.socketURL)
+    override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+        // Add code here to start the process of stopping the tunnel.
+        completionHandler()
    }
    
-    override init() {
-        do {
-            libburrow.spawnInProcess(
-                socketPath: try Constants.socketURL.path(percentEncoded: false),
-                databasePath: try Constants.databaseURL.path(percentEncoded: false)
-            )
-        } catch {
-            logger.error("Failed to spawn networking thread: \(error)")
+    override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)?) {
+        // Add code here to handle the message.
+        if let handler = completionHandler {
+            handler(messageData)
        }
    }
    
-    override func startTunnel(options: [String: NSObject]? = nil) async throws {
-        do {
-            let configuration = try await Array(client.tunnelConfiguration(.init()).prefix(1)).first
-            guard let settings = configuration?.settings else {
-                throw Error.missingTunnelConfiguration
-            }
-            try await setTunnelNetworkSettings(settings)
-            _ = try await client.tunnelStart(.init())
-            logger.log("Started tunnel with network settings: \(settings)")
-        } catch {
-            logger.error("Failed to start tunnel: \(error)")
-            throw error
-        }
+    override func sleep(completionHandler: @escaping () -> Void) {
+        // Add code here to get ready to sleep.
+        completionHandler()
    }
    
-    override func stopTunnel(with reason: NEProviderStopReason) async {
-        do {
-            _ = try await client.tunnelStop(.init())
-            logger.log("Stopped client")
-        } catch {
-            logger.error("Failed to stop tunnel: \(error)")
-        }
-    }
-}
-
-extension Burrow_TunnelConfigurationResponse {
-    fileprivate var settings: NEPacketTunnelNetworkSettings {
-        let ipv6Addresses = addresses.filter { IPv6Address($0) != nil }
-
-        let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
-        settings.mtu = NSNumber(value: mtu)
-        settings.ipv4Settings = NEIPv4Settings(
-            addresses: addresses.filter { IPv4Address($0) != nil },
-            subnetMasks: ["255.255.255.0"]
-        )
-        settings.ipv6Settings = NEIPv6Settings(
-            addresses: ipv6Addresses,
-            networkPrefixLengths: ipv6Addresses.map { _ in 64 }
-        )
-        return settings
+    override func wake() {
+        // Add code here to wake up.
    }
 }
--- a/Apple/NetworkExtension/libburrow/build-rust.sh
+++ b/Apple/NetworkExtension/libburrow/build-rust.sh
@ -1,83 +0,0 @@
-#!/bin/bash
-
-# This is a build script. It is run by Xcode as a build step.
-# The type of build is described in various environment variables set by Xcode.
-
-export PATH="${PATH}:${HOME}/.cargo/bin:/opt/homebrew/bin:/usr/local/bin:/etc/profiles/per-user/${USER}/bin"
-
-if ! [[ -x "$(command -v cargo)" ]]; then
-    echo 'error: Unable to find cargo'
-    exit 127
-fi
-
-set -e
-
-# Change directories relative to the location of this script
-cd -- "$(dirname -- "${BASH_SOURCE[0]}")"/../../../burrow
-
-RUST_TARGETS=()
-
-# Match the PLATFORM_NAME (iphoneos) and ARCHS (arm64) to a set of RUST_TARGETS (aarch64-apple-ios)
-IFS=' ' read -a BURROW_ARCHS <<< "${ARCHS[@]}"
-for ARCH in "${BURROW_ARCHS[@]}"; do
-    case $PLATFORM_NAME in
-        iphonesimulator)
-            case $ARCH in
-                arm64) RUST_TARGETS+=("aarch64-apple-ios-sim") ;;
-                x86_64) RUST_TARGETS+=("x86_64-apple-ios") ;;
-                *) echo "error: Unknown $PLATFORM_NAME arch, $ARCH"; exit 1 ;;
-            esac
-            ;;
-        iphoneos)
-            case $ARCH in
-                arm64) RUST_TARGETS+=("aarch64-apple-ios") ;;
-                *) echo "error: Unknown $PLATFORM_NAME arch, $ARCH"; exit 1 ;;
-            esac
-            ;;
-        macos*)
-            case $ARCH in
-                arm64) RUST_TARGETS+=("aarch64-apple-darwin") ;;
-                x86_64) RUST_TARGETS+=("x86_64-apple-darwin") ;;
-                *) echo "error: Unknown $PLATFORM_NAME arch, $ARCH"; exit 1 ;;
-            esac
-            ;;
-        *) echo "error: Unsupported platform $PLATFORM_NAME"; exit 1 ;;
-    esac
-done
-
-# Pass all RUST_TARGETS in a single invocation
-CARGO_ARGS=()
-for TARGET in "${RUST_TARGETS[@]}"; do
-    CARGO_ARGS+=("--target")
-    CARGO_ARGS+=("$TARGET")
-done
-
-CARGO_ARGS+=("--lib")
-
-# Pass the configuration (Debug or Release) through to cargo
-if [[ $SWIFT_ACTIVE_COMPILATION_CONDITIONS == *DEBUG* ]]; then
-    CARGO_TARGET_SUBDIR="debug"
-else
-    CARGO_ARGS+=("--release")
-    CARGO_TARGET_SUBDIR="release"
-fi
-
-if [[ -x "$(command -v rustup)" ]]; then
-    CARGO_PATH="$(dirname $(rustup which cargo)):/usr/bin"
-else
-    CARGO_PATH="$(dirname $(readlink -f $(which cargo))):/usr/bin"
-fi
-
-PROTOC=$(readlink -f $(which protoc))
-CARGO_PATH="$(dirname $PROTOC):$CARGO_PATH"
-
-# Run cargo without the various environment variables set by Xcode.
-# Those variables can confuse cargo and the build scripts it runs.
-env -i PATH="$CARGO_PATH" PROTOC="$PROTOC" CARGO_TARGET_DIR="${CONFIGURATION_TEMP_DIR}/target" IPHONEOS_DEPLOYMENT_TARGET="$IPHONEOS_DEPLOYMENT_TARGET" MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" cargo build "${CARGO_ARGS[@]}"
-
-mkdir -p "${BUILT_PRODUCTS_DIR}"
-
-# Use `lipo` to merge the architectures together into BUILT_PRODUCTS_DIR
-/usr/bin/xcrun --sdk $PLATFORM_NAME lipo \
-    -create $(printf "${CONFIGURATION_TEMP_DIR}/target/%q/${CARGO_TARGET_SUBDIR}/libburrow.a " "${RUST_TARGETS[@]}") \
-    -output "${BUILT_PRODUCTS_DIR}/libburrow.a"
--- a/Apple/NetworkExtension/libburrow/libburrow.h
+++ b/Apple/NetworkExtension/libburrow/libburrow.h
@ -1,2 +0,0 @@
-__attribute__((__swift_name__("spawnInProcess(socketPath:databasePath:)")))
-extern void spawn_in_process(const char * __nullable socket_path, const char * __nullable db_path);
--- a/Apple/NetworkExtension/libburrow/module.modulemap
+++ b/Apple/NetworkExtension/libburrow/module.modulemap
@ -1,4 +0,0 @@
-module libburrow {
-    header "libburrow.h"
-    export *
-}
--- a/Apple/Profiles/Burrow_Developer_ID.provisionprofile
+++ b/Apple/Profiles/Burrow_Developer_ID.provisionprofile
--- a/Apple/Profiles/Burrow_Network_Developer_ID.provisionprofile
+++ b/Apple/Profiles/Burrow_Network_Developer_ID.provisionprofile
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/100.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/100.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/1024.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/1024.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/114.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/114.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/120.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/120.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/128.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/128.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/144.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/144.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/152.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/152.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/16.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/16.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/167.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/167.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/172.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/172.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/180.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/180.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/196.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/196.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/20.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/20.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/216.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/216.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/256.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/256.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/29.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/29.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/32.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/32.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/40.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/40.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/48.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/48.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/50.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/50.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/512.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/512.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/55.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/55.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/57.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/57.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/58.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/58.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/60.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/60.png
--- a/Apple/UI/Assets.xcassets/AppIcon.appiconset/64.png
+++ b/Apple/UI/Assets.xcassets/AppIcon.appiconset/64.png
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
SerenityUX	55c0957511	Added the current update	2023-04-29 20:28:48 -04:00
SerenityUX	42590eaf00	started setting up the VPN status & checking for permissions	2023-04-29 12:54:54 -04:00
SerenityUX	5ae3d37243	Added the base of the Menu Bar UI	2023-04-26 21:34:05 -04:00