secure erase data drive

2026-03-27 02:41:53 +00:00 · 2023-03-14 15:02:49 -06:00
1138 changed files with 57120 additions and 39918 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
-description: Create a report to help us improve StartOS
-title: "[bug]: "
+description: Create a report to help us improve embassyOS
+title: '[bug]: '
 labels: [Bug, Needs Triage]
 assignees:
  - MattDHill
@@ -10,25 +10,27 @@ body:
      label: Prerequisites
      description: Please confirm you have completed the following.
      options:
-        - label: I have searched for [existing issues](https://github.com/start9labs/start-os/issues) that already report this problem.
+        - label: I have searched for [existing issues](https://github.com/start9labs/embassy-os/issues) that already report this problem.
          required: true
  - type: input
    attributes:
-      label: Server Hardware
-      description: On what hardware are you running StartOS? Please be as detailed as possible!
-      placeholder: Pi (8GB) w/ 32GB microSD & Samsung T7 SSD
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: StartOS Version
-      description: What version of StartOS are you running?
-      placeholder: e.g. 0.3.4.3
+      label: embassyOS Version
+      description: What version of embassyOS are you running?
+      placeholder: e.g. 0.3.0
    validations:
      required: true
  - type: dropdown
    attributes:
-      label: Client OS
+      label: Device
+      description: What device are you using to connect to Embassy?
+      options:
+        - Phone/tablet
+        - Laptop/Desktop
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Device OS
      description: What operating system is your device running?
      options:
        - MacOS
@@ -43,14 +45,14 @@ body:
      required: true
  - type: input
    attributes:
-      label: Client OS Version
+      label: Device OS Version
      description: What version is your device OS?
    validations:
      required: true
  - type: dropdown
    attributes:
      label: Browser
-      description: What browser are you using to connect to your server?
+      description: What browser are you using to connect to Embassy?
      options:
        - Firefox
        - Brave
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,6 +1,6 @@
 name: 💡 Feature Request
-description: Suggest an idea for StartOS
-title: "[feat]: "
+description: Suggest an idea for embassyOS
+title: '[feat]: '
 labels: [Enhancement]
 assignees:
  - MattDHill
@@ -10,7 +10,7 @@ body:
      label: Prerequisites
      description: Please confirm you have completed the following.
      options:
-        - label: I have searched for [existing issues](https://github.com/start9labs/start-os/issues) that already suggest this feature.
+        - label: I have searched for [existing issues](https://github.com/start9labs/embassy-os/issues) that already suggest this feature.
          required: true
  - type: textarea
    attributes:
@@ -27,7 +27,7 @@ body:
  - type: textarea
    attributes:
      label: Describe Preferred Solution
-      description: How you want this feature added to StartOS?
+      description: How you want this feature added to embassyOS?
  - type: textarea
    attributes:
      label: Describe Alternatives
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -0,0 +1,29 @@
+# This folder contains GitHub Actions workflows for building the project
+
+## backend
+Runs: manually (on: workflow_dispatch) or called by product-pipeline (on: workflow_call)
+
+This workflow uses the actions and docker/setup-buildx-action@v1 to prepare the environment for aarch64 cross complilation using docker buildx.
+When execution of aarch64 containers is required the action docker/setup-qemu-action@v1 is added.
+A matrix-strategy has been used to build for both x86_64 and aarch64 platforms in parallel.
+
+### Running unittests
+
+Unittests are run using [cargo-nextest]( https://nexte.st/). First the sources are (cross-)compiled and archived. The archive is then run on the correct platform.
+
+## frontend
+Runs: manually (on: workflow_dispatch) or called by product-pipeline (on: workflow_call)
+
+This workflow builds the frontends.
+
+## product
+Runs: when a pull request targets the master or next branch and when a change to the master or next branch is made
+
+This workflow builds everything, re-using the backend and frontend workflows.
+The download and extraction order of artifacts is relevant to `make`, as it checks the file timestamps to decide which targets need to be executed.
+
+Result: eos.img
+
+## a note on uploading artifacts
+
+Artifacts are used to share data between jobs. File permissions are not maintained during artifact upload. Where file permissions are relevant, the workaround using tar has been used. See (here)[https://github.com/actions/upload-artifact#maintaining-file-permissions-and-case-sensitive-files].
--- a/.github/workflows/backend.yaml
+++ b/.github/workflows/backend.yaml
@@ -0,0 +1,233 @@
+name: Backend
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  RUST_VERSION: "1.67.1"
+  ENVIRONMENT: "dev"
+
+jobs:
+  build_libs:
+    name: Build libs
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64, aarch64]
+        include:
+          - target: x86_64
+            snapshot_command: ./build-v8-snapshot.sh
+            artifact_name: js_snapshot
+            artifact_path: libs/js_engine/src/artifacts/JS_SNAPSHOT.bin
+          - target: aarch64
+            snapshot_command: ./build-arm-v8-snapshot.sh
+            artifact_name: arm_js_snapshot
+            artifact_path: libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      if: ${{ matrix.target == 'aarch64' }}
+      
+    - name: Set up Docker Buildx        
+      uses: docker/setup-buildx-action@v2
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - name: "Install Rust"
+      run: |
+        rustup toolchain install ${{ env.RUST_VERSION }} --profile minimal --no-self-update
+        rustup default ${{ inputs.rust }}
+      shell: bash
+      if: ${{ matrix.target == 'x86_64' }}
+    
+    - uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          libs/target/
+        key: ${{ runner.os }}-cargo-libs-${{ matrix.target }}-${{ hashFiles('libs/Cargo.lock') }}
+
+    - name: Build v8 snapshot
+      run: ${{ matrix.snapshot_command }}
+      working-directory: libs
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.artifact_name }}
+        path: ${{ matrix.artifact_path }}
+
+  build_backend:
+    name: Build backend
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64, aarch64]
+        include:
+          - target: x86_64
+            snapshot_download: js_snapshot
+          - target: aarch64
+            snapshot_download: arm_js_snapshot
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    needs: build_libs
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    
+    - name: Download ${{ matrix.snapshot_download }} artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: ${{ matrix.snapshot_download }}
+        path: libs/js_engine/src/artifacts/
+        
+    - name: "Install Rust"
+      run: |
+        rustup toolchain install ${{ env.RUST_VERSION }} --profile minimal --no-self-update
+        rustup default ${{ inputs.rust }}
+      shell: bash
+      if: ${{ matrix.target == 'x86_64' }}
+    
+    - uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          backend/target/
+        key: ${{ runner.os }}-cargo-backend-${{ matrix.target }}-${{ hashFiles('backend/Cargo.lock') }}
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install libavahi-client-dev
+      if: ${{ matrix.target == 'x86_64' }}
+
+    - name: Check Git Hash
+      run: ./check-git-hash.sh
+
+    - name: Check Environment
+      run: ./check-environment.sh
+
+    - name: Build backend
+      run: make ARCH=${{ matrix.target }} backend
+
+    - name: 'Tar files to preserve file permissions'
+      run: make ARCH=${{ matrix.target }} backend-${{ matrix.target }}.tar
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: backend-${{ matrix.target }}
+        path: backend-${{ matrix.target }}.tar
+    
+    - name: Install nextest
+      uses: taiki-e/install-action@nextest
+
+    - name: Build and archive tests
+      run: cargo nextest archive --archive-file nextest-archive-${{ matrix.target }}.tar.zst --target ${{ matrix.target }}-unknown-linux-gnu
+      working-directory: backend
+      if: ${{ matrix.target == 'x86_64' }}
+
+    - name: Build and archive tests
+      run: |
+        docker run --rm \
+        -v "$HOME/.cargo/registry":/root/.cargo/registry \
+        -v "$(pwd)":/home/rust/src \
+        -P start9/rust-arm-cross:aarch64 \
+        sh -c 'cd /home/rust/src/backend &&
+          rustup install ${{ env.RUST_VERSION }} &&
+          rustup override set ${{ env.RUST_VERSION }} &&
+          rustup target add aarch64-unknown-linux-gnu &&
+          curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin &&
+          cargo nextest archive --archive-file nextest-archive-${{ matrix.target }}.tar.zst --target ${{ matrix.target }}-unknown-linux-gnu'
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - name: Reset permissions
+      run: sudo chown -R $USER target
+      working-directory: backend
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - name: Upload archive to workflow
+      uses: actions/upload-artifact@v3
+      with:
+        name: nextest-archive-${{ matrix.target }}
+        path: backend/nextest-archive-${{ matrix.target }}.tar.zst
+
+  run_tests_backend:
+    name: Test backend
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64, aarch64]
+        include:
+          - target: x86_64
+          - target: aarch64
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: build_backend
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - name: Set up Docker Buildx        
+      uses: docker/setup-buildx-action@v2
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - run: mkdir -p ~/.cargo/bin
+      if: ${{ matrix.target == 'x86_64' }}
+
+    - name: Install nextest
+      uses: taiki-e/install-action@v2
+      with:
+        tool: nextest@0.9.47
+      if: ${{ matrix.target == 'x86_64' }}
+
+    - name: Download archive
+      uses: actions/download-artifact@v3
+      with:
+        name: nextest-archive-${{ matrix.target }}
+
+    - name: Download nextest (aarch64)
+      run: wget -O nextest-aarch64.tar.gz https://get.nexte.st/0.9.47/linux-arm
+      if: ${{ matrix.target == 'aarch64' }}
+
+    - name: Run tests
+      run: |
+        ${CARGO_HOME:-~/.cargo}/bin/cargo-nextest nextest run --no-fail-fast --archive-file nextest-archive-${{ matrix.target }}.tar.zst \
+        --filter-expr 'not (test(system::test_get_temp) | test(net::tor::test) | test(system::test_get_disk_usage) | test(net::ssl::certificate_details_persist) | test(net::ssl::ca_details_persist))'
+      if: ${{ matrix.target == 'x86_64' }}
+
+    - name: Run tests
+      run: |
+        docker run --rm --platform linux/arm64/v8 \
+        -v "/home/runner/.cargo/registry":/usr/local/cargo/registry \
+        -v "$(pwd)":/home/rust/src \
+        -e CARGO_TERM_COLOR=${{ env.CARGO_TERM_COLOR }} \
+        -P ubuntu:20.04 \
+        sh -c '
+          apt-get update &&
+          apt-get install -y ca-certificates &&
+          apt-get install -y rsync &&
+          cd /home/rust/src &&
+          mkdir -p ~/.cargo/bin &&
+          tar -zxvf nextest-aarch64.tar.gz -C ${CARGO_HOME:-~/.cargo}/bin &&
+          ${CARGO_HOME:-~/.cargo}/bin/cargo-nextest nextest run --archive-file nextest-archive-${{ matrix.target }}.tar.zst \
+          --filter-expr "not (test(system::test_get_temp) | test(net::tor::test) | test(system::test_get_disk_usage) | test(net::ssl::certificate_details_persist) | test(net::ssl::ca_details_persist))"'
+      if: ${{ matrix.target == 'aarch64' }}
--- a/.github/workflows/debian.yaml
+++ b/.github/workflows/debian.yaml
@@ -0,0 +1,63 @@
+name: Debian Package
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  NODEJS_VERSION: '16.11.0'
+  ENVIRONMENT: "dev"
+
+jobs:
+  dpkg:
+    name: Build dpkg
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        repository: Start9Labs/embassy-os-deb
+
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        path: embassyos-0.3.x
+    - run: |
+        cp -r debian embassyos-0.3.x/
+        VERSION=0.3.x ./control.sh
+        cp embassyos-0.3.x/backend/embassyd.service embassyos-0.3.x/debian/embassyos.embassyd.service
+        cp embassyos-0.3.x/backend/embassy-init.service embassyos-0.3.x/debian/embassyos.embassy-init.service
+    
+    - uses: actions/setup-node@v3
+      with:
+        node-version: ${{ env.NODEJS_VERSION }}
+    
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      run: |
+        echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+    - uses: actions/cache@v3
+      id: npm-cache
+      with:
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install debmake debhelper-compat
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx        
+      uses: docker/setup-buildx-action@v2
+
+    - name: Run build
+      run: "make VERSION=0.3.x TAG=${{ github.ref_name }}"
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: deb
+        path: embassyos_0.3.x-1_amd64.deb
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -0,0 +1,46 @@
+name: Frontend
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  NODEJS_VERSION: '16.11.0'
+  ENVIRONMENT: "dev"
+
+jobs:
+  frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - uses: actions/setup-node@v3
+      with:
+        node-version: ${{ env.NODEJS_VERSION }}
+    
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      run: |
+        echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+    - uses: actions/cache@v3
+      id: npm-cache
+      with:
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Build frontends
+      run: make frontends
+
+    - name: 'Tar files to preserve file permissions'
+      run: tar -cvf frontend.tar ENVIRONMENT.txt GIT_HASH.txt VERSION.txt frontend/dist frontend/config.json
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: frontend
+        path: frontend.tar
--- a/.github/workflows/product.yaml
+++ b/.github/workflows/product.yaml
@@ -0,0 +1,129 @@
+name: Build Pipeline
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+    - master
+    - next
+  pull_request:
+    branches:
+    - master
+    - next
+
+env:
+  ENVIRONMENT: "dev"
+
+jobs:
+  compat:
+    uses: ./.github/workflows/reusable-workflow.yaml
+    with:
+      build_command: make system-images/compat/docker-images/aarch64.tar
+      artifact_name: compat.tar
+      artifact_path: system-images/compat/docker-images/aarch64.tar
+
+  utils:
+    uses: ./.github/workflows/reusable-workflow.yaml
+    with:
+      build_command: make system-images/utils/docker-images/aarch64.tar
+      artifact_name: utils.tar
+      artifact_path: system-images/utils/docker-images/aarch64.tar
+
+  binfmt:
+    uses: ./.github/workflows/reusable-workflow.yaml
+    with:
+      build_command: make system-images/binfmt/docker-images/aarch64.tar
+      artifact_name: binfmt.tar
+      artifact_path: system-images/binfmt/docker-images/aarch64.tar
+
+  backend:
+    uses: ./.github/workflows/backend.yaml
+
+  frontend:
+    uses: ./.github/workflows/frontend.yaml
+    
+  image:
+    name: Build image
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: [compat,utils,binfmt,backend,frontend]
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Download compat.tar artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: compat.tar
+        path: system-images/compat/docker-images/
+
+    - name: Download utils.tar artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: utils.tar
+        path: system-images/utils/docker-images/
+    
+    - name: Download binfmt.tar artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: binfmt.tar
+        path: system-images/binfmt/docker-images/
+
+    - name: Download js_snapshot artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: js_snapshot
+        path: libs/js_engine/src/artifacts/
+  
+    - name: Download arm_js_snapshot artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: arm_js_snapshot
+        path: libs/js_engine/src/artifacts/
+
+    - name: Download backend artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: backend-aarch64
+
+    - name: 'Extract backend'
+      run: 
+        tar -mxvf backend-aarch64.tar
+
+    - name: Download frontend artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: frontend
+
+    - name: Skip frontend build
+      run: |
+        mkdir frontend/node_modules
+        mkdir frontend/dist
+        mkdir patch-db/client/node_modules
+        mkdir patch-db/client/dist
+
+    - name: 'Extract frontend'
+      run: |
+        tar -mxvf frontend.tar frontend/config.json
+        tar -mxvf frontend.tar frontend/dist
+        tar -xvf frontend.tar GIT_HASH.txt
+        tar -xvf frontend.tar ENVIRONMENT.txt
+        tar -xvf frontend.tar VERSION.txt
+        rm frontend.tar
+
+    - name: Cache raspiOS
+      id: cache-raspios
+      uses: actions/cache@v3
+      with:
+        path: raspios.img
+        key: cache-raspios
+    
+    - name: Build image
+      run: |
+        make V=1 eos_raspberrypi-uninit.img --debug
+      
+    - uses: actions/upload-artifact@v3
+      with:
+        name: image
+        path: eos_raspberrypi-uninit.img
--- a/.github/workflows/pureos-iso.yaml
+++ b/.github/workflows/pureos-iso.yaml
@@ -0,0 +1,70 @@
+name: PureOS Based ISO
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  push:
+    branches:
+    - master
+    - next
+  pull_request:
+    branches:
+    - master
+    - next
+
+env:
+  ENVIRONMENT: "dev"
+
+jobs:
+  dpkg:
+    uses: ./.github/workflows/debian.yaml
+
+  iso:
+    name: Build iso
+    runs-on: ubuntu-22.04
+    needs: [dpkg]
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        repository: Start9Labs/eos-image-recipes
+
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        wget http://ftp.us.debian.org/debian/pool/main/d/debspawn/debspawn_0.6.1-1_all.deb
+        sha256sum ./debspawn_0.6.1-1_all.deb | grep fb8a3f588438ff9ef51e713ec1d83306db893f0aa97447565e28bbba9c6e90c6
+        sudo apt-get install -y ./debspawn_0.6.1-1_all.deb
+        wget https://repo.pureos.net/pureos/pool/main/d/debootstrap/debootstrap_1.0.125pureos1_all.deb
+        sudo apt-get install -y --allow-downgrades ./debootstrap_1.0.125pureos1_all.deb
+        wget https://repo.pureos.net/pureos/pool/main/p/pureos-archive-keyring/pureos-archive-keyring_2021.11.0_all.deb
+        sudo apt-get install -y ./pureos-archive-keyring_2021.11.0_all.deb
+
+    - name: Configure debspawn
+      run: |
+        sudo mkdir -p /etc/debspawn/
+        echo "AllowUnsafePermissions=true" | sudo tee /etc/debspawn/global.toml
+
+    - uses: actions/cache@v3
+      with:
+        path: /var/lib/debspawn
+        key: ${{ runner.os }}-debspawn-init-byzantium
+
+    - name: Make build container
+      run: "debspawn list | grep byzantium || debspawn create --with-init byzantium"
+
+    - run: "mkdir -p overlays/vendor/root"
+
+    - name: Download dpkg
+      uses: actions/download-artifact@v3
+      with:
+        name: deb
+        path: overlays/vendor/root
+
+    - name: Run build
+      run: |
+        ./run-local-build.sh --no-fakemachine byzantium none custom "" true
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: iso
+        path: results/*.iso
--- a/.github/workflows/reusable-workflow.yaml
+++ b/.github/workflows/reusable-workflow.yaml
@@ -0,0 +1,37 @@
+name: Reusable Workflow
+
+on:
+  workflow_call:
+    inputs:
+      build_command:
+        required: true
+        type: string
+      artifact_name:
+        required: true
+        type: string
+      artifact_path:
+        required: true
+        type: string
+
+env:
+  ENVIRONMENT: "dev"
+
+jobs:
+  generic_build_job:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Set up Docker Buildx        
+      uses: docker/setup-buildx-action@v2
+
+    - name: Build image
+      run: ${{ inputs.build_command }}
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.artifact_name }}
+        path: ${{ inputs.artifact_path }}
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -1,237 +0,0 @@
-name: Debian-based ISO and SquashFS
-
-on:
-  workflow_call:
-  workflow_dispatch:
-    inputs:
-      environment:
-        type: choice
-        description: Environment
-        options:
-          - NONE
-          - dev
-          - unstable
-          - dev-unstable
-          - docker
-          - dev-docker
-          - dev-unstable-docker
-      runner:
-        type: choice
-        description: Runner
-        options:
-          - standard
-          - fast
-      platform:
-        type: choice
-        description: Platform
-        options:
-          - ALL
-          - x86_64
-          - x86_64-nonfree
-          - aarch64
-          - aarch64-nonfree
-          - raspberrypi
-      deploy:
-        type: choice
-        description: Deploy
-        options:
-          - NONE
-          - alpha
-          - beta
-  push:
-    branches:
-      - master
-      - next/*
-  pull_request:
-    branches:
-      - master
-      - next/*
-
-env:
-  NODEJS_VERSION: "18.15.0"
-  ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
-
-jobs:
-  compile:
-    name: Compile Base Binaries
-    strategy:
-      fail-fast: true
-      matrix:
-        arch: >-
-          ${{
-            fromJson('{
-              "x86_64": ["x86_64"],
-              "x86_64-nonfree": ["x86_64"],
-              "aarch64": ["aarch64"],
-              "aarch64-nonfree": ["aarch64"],
-              "raspberrypi": ["aarch64"],
-              "ALL": ["x86_64", "aarch64"]
-            }')[github.event.inputs.platform || 'ALL']
-          }}
-    runs-on: ${{ fromJson('["ubuntu-22.04", "buildjet-32vcpu-ubuntu-2204"]')[github.event.inputs.runner == 'fast'] }}
-    steps:
-      - run: |
-          sudo mount -t tmpfs tmpfs .
-        if: ${{ github.event.inputs.runner == 'fast' }}
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.NODEJS_VERSION }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Make
-        run: make ARCH=${{ matrix.arch }} compiled-${{ matrix.arch }}.tar
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: compiled-${{ matrix.arch }}.tar
-          path: compiled-${{ matrix.arch }}.tar
-  image:
-    name: Build Image
-    needs: [compile]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: >-
-          ${{
-            fromJson(
-              format(
-                '[
-                  ["{0}"],
-                  ["x86_64", "x86_64-nonfree", "aarch64", "aarch64-nonfree", "raspberrypi"]
-                ]',
-                github.event.inputs.platform || 'ALL'
-              )
-            )[(github.event.inputs.platform || 'ALL') == 'ALL']
-          }}
-    runs-on: >-
-      ${{
-        fromJson(
-          format(
-            '["ubuntu-22.04", "{0}"]',
-            fromJson('{
-              "x86_64": "buildjet-8vcpu-ubuntu-2204",
-              "x86_64-nonfree": "buildjet-8vcpu-ubuntu-2204",
-              "aarch64": "buildjet-8vcpu-ubuntu-2204-arm",
-              "aarch64-nonfree": "buildjet-8vcpu-ubuntu-2204-arm",
-              "raspberrypi": "buildjet-8vcpu-ubuntu-2204-arm",
-            }')[matrix.platform]
-          )
-        )[github.event.inputs.runner == 'fast']
-      }}
-    env:
-      ARCH: >-
-        ${{
-          fromJson('{
-            "x86_64": "x86_64",
-            "x86_64-nonfree": "x86_64",
-            "aarch64": "aarch64",
-            "aarch64-nonfree": "aarch64",
-            "raspberrypi": "aarch64",
-          }')[matrix.platform]
-        }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y qemu-user-static
-          wget https://deb.debian.org/debian/pool/main/d/debspawn/debspawn_0.6.2-1_all.deb
-          sha256sum ./debspawn_0.6.2-1_all.deb | grep 37ef27458cb1e35e8bce4d4f639b06b4b3866fc0b9191ec6b9bd157afd06a817
-          sudo apt-get install -y ./debspawn_0.6.2-1_all.deb
-
-      - name: Configure debspawn
-        run: |
-          sudo mkdir -p /etc/debspawn/
-          echo "AllowUnsafePermissions=true" | sudo tee /etc/debspawn/global.toml
-          sudo mkdir -p /var/tmp/debspawn
-
-      - run: sudo mount -t tmpfs tmpfs /var/tmp/debspawn
-        if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree') }}
-
-      - name: Download compiled artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: compiled-${{ env.ARCH }}.tar
-
-      - name: Extract compiled artifacts
-        run: tar -xvf compiled-${{ env.ARCH }}.tar
-
-      - name: Prevent rebuild of compiled artifacts
-        run: |
-          mkdir -p web/dist/raw
-          PLATFORM=${{ matrix.platform }} make -t compiled-${{ env.ARCH }}.tar
-
-      - name: Run iso build
-        run: PLATFORM=${{ matrix.platform }} make iso
-        if: ${{ matrix.platform != 'raspberrypi' }}
-
-      - name: Run img build
-        run: PLATFORM=${{ matrix.platform }} make img
-        if: ${{ matrix.platform == 'raspberrypi' }}
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.platform }}.squashfs
-          path: results/*.squashfs
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.platform }}.iso
-          path: results/*.iso
-        if: ${{ matrix.platform != 'raspberrypi' }}
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.platform }}.img
-          path: results/*.img
-        if: ${{ matrix.platform == 'raspberrypi' }}
-
-      - name: Upload OTA to registry
-        run: >-
-          PLATFORM=${{ matrix.platform }} make upload-ota TARGET="${{
-            fromJson('{
-              "alpha": "alpha-registry-x.start9.com",
-              "beta": "beta-registry.start9.com",
-            }')[github.event.inputs.deploy]
-          }}" KEY="${{
-            fromJson(
-              format('{{
-                "alpha": "{0}",
-                "beta": "{1}",
-              }}', secrets.ALPHA_INDEX_KEY, secrets.BETA_INDEX_KEY)
-            )[github.event.inputs.deploy]
-          }}"
-        if: ${{ github.event.inputs.deploy != '' && github.event.inputs.deploy != 'NONE' }}
-
-  index:
-    if: ${{ github.event.inputs.deploy != '' && github.event.inputs.deploy != 'NONE' }}
-    needs: [image]
-    runs-on: ubuntu-22.04
-    steps:
-      - run: >-
-          curl "https://${{
-            fromJson('{
-              "alpha": "alpha-registry-x.start9.com",
-              "beta": "beta-registry.start9.com",
-            }')[github.event.inputs.deploy]
-          }}:8443/resync.cgi?key=${{
-            fromJson(
-              format('{{
-                "alpha": "{0}",
-                "beta": "{1}",
-              }}', secrets.ALPHA_INDEX_KEY, secrets.BETA_INDEX_KEY)
-            )[github.event.inputs.deploy]
-          }}"
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,31 +0,0 @@
-name: Automated Tests
-
-on:
-  push:
-    branches:
-      - master
-      - next/*
-  pull_request:
-    branches:
-      - master
-      - next/*
-
-env:
-  NODEJS_VERSION: "18.15.0"
-  ENVIRONMENT: dev-unstable
-
-jobs:
-  test:
-    name: Run Automated Tests
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.NODEJS_VERSION }}
-
-      - name: Build And Run Tests
-        run: make test
--- a/.gitignore
+++ b/.gitignore
@@ -16,16 +16,13 @@ deploy_web.sh
 secrets.db
 .vscode/
 /cargo-deps/**/*
-/PLATFORM.txt
 /ENVIRONMENT.txt
 /GIT_HASH.txt
 /VERSION.txt
+/embassyos-*.tar.gz
 /eos-*.tar.gz
 /*.deb
 /target
 /*.squashfs
-/results
-/dpkg-workdir
-/compiled.tar
-/compiled-*.tar
-/firmware
+/debian
+/DEBIAN
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,429 @@
+# v0.3.3
+## Highlights
+    - x86_64 architecture compatibility
+    - Kiosk mode - use your Embassy with monitor, keyboard, and mouse (available on x86 builds only, disabled on Raspberry Pi)
+    - "Updates" tab - view all service updates from all registries in one place
+    - Various UI/UX improvements
+    - Various bugfixes and optimizations
+
+## What's Changed
+    - Minor typo fixes by @kn0wmad in #1887
+    - Update build pipeline by @moerketh in #1896
+    - Feature/setup migrate by @elvece in #1841
+    - Feat/patch migration by @Blu-J in #1890
+    - make js cancellable by @dr-bonez in #1901
+    - wip: Making Injectable exec by @Blu-J in #1897
+    - Fix/debug by @Blu-J in #1909
+    - chore: Fix on the rsync not having stdout. by @Blu-J in #1911
+    - install wizard project by @MattDHill in #1893
+    - chore: Remove the duplicate loggging information that is making usele… by @Blu-J in #1912
+    - Http proxy by @redragonx in #1772
+    - fix(marketplace): loosen type in categories component by @waterplea in #1918
+    - set custom meta title by @MattDHill in #1915
+    - Feature/git hash by @dr-bonez in #1919
+    - closes #1900 by @dr-bonez in #1920
+    - feature/marketplace icons by @dr-bonez in #1921
+    - Bugfix/0.3.3 migration by @dr-bonez in #1922
+    - feat: Exposing the rsync that we have to the js by @Blu-J in #1907
+    - Feature/install wizard disk info by @dr-bonez in #1923
+    - bump shared and marketplace npm versions by @dr-bonez in #1924
+    - fix error handling when store unreachable by @dr-bonez in #1925
+    - wait for network online before launching init by @dr-bonez in #1930
+    - silence service crash notifications by @dr-bonez in #1929
+    - disable efi by @dr-bonez in #1931
+    - Tor daemon fix by @redragonx in #1934
+    - wait for url to be available before launching kiosk by @dr-bonez in #1933
+    - fix migration to support portable fatties by @dr-bonez in #1935
+    - Add guid to partition type by @MattDHill in #1932
+    - add localhost support to the http server by @redragonx in #1939
+    - refactor setup wizard by @dr-bonez in #1937
+    - feat(shared): Ticker add new component and use it in marketplace by @waterplea in #1940
+    - feat: For ota update using rsyncd by @Blu-J in #1938
+    - Feat/update progress by @MattDHill in #1944
+    - Fix/app show hidden by @MattDHill in #1948
+    - create dpkg and iso workflows by @dr-bonez in #1941
+    - changing ip addr type by @redragonx in #1950
+    - Create mountpoints first by @k0gen in #1949
+    - Hard code registry icons by @MattDHill in #1951
+    - fix: Cleanup by sending a command and kill when dropped by @Blu-J in #1945
+    - Update setup wizard styling by @elvece in #1954
+    - Feature/homepage by @elvece in #1956
+    - Fix millis by @Blu-J in #1960
+    - fix accessing dev tools by @MattDHill in #1966
+    - Update/misc UI fixes by @elvece in #1961
+    - Embassy-init typo by @redragonx in #1959
+    - feature: 0.3.2 -> 0.3.3 upgrade by @dr-bonez in #1958
+    - Fix/migrate by @Blu-J in #1962
+    - chore: Make validation reject containers by @Blu-J in #1970
+    - get pubkey and encrypt password on login by @elvece in #1965
+    - Multiple bugs and styling by @MattDHill in #1975
+    - filter out usb stick during install by @dr-bonez in #1974
+    - fix http upgrades by @dr-bonez in #1980
+    - restore interfaces before creating manager by @dr-bonez in #1982
+    - fuckit: no patch db locks by @dr-bonez in #1969
+    - fix websocket hangup error by @dr-bonez in #1981
+    - revert app show to use header and fix back button by @MattDHill in #1984
+    - Update/marketplace info by @elvece in #1983
+    - force docker image removal by @dr-bonez in #1985
+    - do not error if cannot determine live usb device by @dr-bonez in #1986
+    - remove community registry from FE defaults by @MattDHill in #1988
+    - check environment by @dr-bonez in #1990
+    - fix marketplace search and better category disabling by @MattDHill in #1991
+    - better migration progress bar by @dr-bonez in #1993
+    - bump cargo version by @dr-bonez in #1995
+    - preload icons and pause on setup complete for kiosk mode by @MattDHill in #1997
+    - use squashfs for rpi updates by @dr-bonez in #1998
+    - do not start progress at 0 before diff complete by @dr-bonez in #1999
+    - user must click continue in kiosk on success page by @MattDHill in #2001
+    - fix regex in image rip script by @dr-bonez in #2002
+    - fix bug with showing embassy drives and center error text by @MattDHill in #2006
+    - fix partition type by @dr-bonez in #2007
+    - lowercase service for alphabetic sorting by @MattDHill in #2008
+    - dont add updates cat by @MattDHill in #2009
+    - make downloaded page a full html doc by @MattDHill in #2011
+    - wait for monitor to be attached before launching firefox by @chrisguida in #2005
+    - UI fixes by @elvece in #2014
+    - fix: Stop service before by @Blu-J in #2019
+    - shield links update by @k0gen in #2018
+    - fix: Undoing the breaking introduced by trying to stopp by @Blu-J in #2023
+    - update link rename from embassy -> system by @elvece in #2027
+    - initialize embassy before restoring packages by @dr-bonez in #2029
+    - make procfs an optional dependency so sdk can build on macos by @elvece in #2028
+    - take(1) for recover select by @MattDHill in #2030
+    - take one from server info to prevent multiple reqs to registries by @MattDHill in #2032
+    - remove write lock during backup by @MattDHill in #2033
+    - fix: Ensure that during migration we make the urls have a trailing slash by @Blu-J in #2036
+    - fix: Make the restores limited # restore at a time by @Blu-J in #2037
+    - fix error and display of unknown font weight on success page by @elvece in #2038
+
+## Checksums
+```
+8602e759d3ece7cf503b9ca43e8419109f14e424617c2703b3771c8801483d7e  embassyos_amd64.deb
+b5c0d8d1af760881a1b5cf32bd7c5b1d1cf6468f6da594a1b4895a866d03a58c  embassyos_amd64.iso
+fe518453a7e1a8d8c2be43223a1a12adff054468f8082df0560e1ec50df3dbfd  embassyos_raspberrypi.img
+7b1ff0ada27b6714062aa991ec31c2d95ac4edf254cd464a4fa251905aa47ebd  embassyos_raspberrypi.tar.gz
+```
+
+# v0.3.2.1
+## What's Changed
+    - Update index.html copy and styling by @elvece in #1855
+    - increase maximum avahi entry group size by @dr-bonez in #1869
+    - bump version by @dr-bonez in #1871
+
+### Linux and Mac
+
+Download the `eos.tar.gz` file, then extract and flash the resulting eos.img to your SD Card
+Windows
+
+Download the `eos.zip` file, then extract and flash the resulting eos.img to your SD Card
+
+## SHA-256 Checksums
+```
+c4b17658910dd10c37df134d5d5fdd6478f962ba1b803d24477d563d44430f96  eos.tar.gz
+3a8b29878fe222a9d7cbf645c975b12805704b0f39c7daa46033d22380f9828c eos.zip
+dedff3eb408ea411812b8f46e6c6ed32bfbd97f61ec2b85a6be40373c0528256  eos.img
+```
+
+# v0.3.2
+## Highlights
+    - Autoscrolling for logs
+    - Improved connectivity between browser and Embassy
+    - Switch to Postgres for EOS database for better performance
+    - Multiple bug fixes and under-the-hood improvements
+    - Various UI/UX enhancements
+    - Removal of product keys
+
+Update Hash (SHA256): `d8ce908b06baee6420b45be1119e5eb9341ba8df920d1e255f94d1ffb7cc4de9`
+
+Image Hash (SHA256): `e035cd764e5ad9eb1c60e2f7bc3b9bd7248f42a91c69015c8a978a0f94b90bbb`
+
+Note: This image was uploaded as a gzipped POSIX sparse TAR file. The recommended command for unpacking it on systems that support sparse files is `tar --format=posix --sparse -zxvf eos.tar.gz`
+
+## What's Changed
+    - formatting by @dr-bonez in #1698
+    - Update README.md by @kn0wmad in #1705
+    - Update README.md by @dr-bonez in #1703
+    - feat: migrate to Angular 14 and RxJS 7 by @waterplea in #1681
+    - 0312 multiple FE by @MattDHill in #1712
+    - Fix http requests by @MattDHill in #1717
+    - Add build-essential to README.md by @chrisguida in #1716
+    - write image to sparse-aware archive format by @dr-bonez in #1709
+    - fix: Add modification to the max_user_watches by @Blu-J in #1695
+    - [Feat] follow logs by @chrisguida in #1714
+    - Update README.md by @dr-bonez in #1728
+    - fix build for patch-db client for consistency by @elvece in #1722
+    - fix cli install by @chrisguida in #1720
+    - highlight instructions if not viewed by @MattDHill in #1731
+    - Feat: HttpReader by @redragonx in #1733
+    - Bugfix/dns by @dr-bonez in #1741
+    - add x86 build and run unittests to backend pipeline by @moerketh in #1682
+    - [Fix] websocket connecting and patchDB connection monitoring by @MattDHill in #1738
+    - Set pipeline job timeouts and add ca-certificates to test container by @moerketh in #1753
+    - Disable bluetooth properly #862 by @redragonx in #1745
+    - [feat]: resumable downloads by @dr-bonez in #1746
+    - Fix/empty properties by @elvece in #1764
+    - use hostname from patchDB as default server name by @MattDHill in #1758
+    - switch to postgresql by @dr-bonez in #1763
+    - remove product key from setup flow by @MattDHill in #1750
+    - pinning cargo dep versions for CLI by @redragonx in #1775
+    - fix: Js deep dir by @Blu-J in #1784
+    - 0.3.2 final cleanup by @dr-bonez in #1782
+    - expect ui marketplace to be undefined by @MattDHill in #1787
+    - fix init to exit on failure by @dr-bonez in #1788
+    - fix search to return more accurate results by @MattDHill in #1792
+    - update backend dependencies by @dr-bonez in #1796
+    - use base64 for HTTP headers by @dr-bonez in #1795
+    - fix: Bad cert of *.local.local is now fixed to correct. by @Blu-J in #1798
+    - fix duplicate patch updates, add scroll button to setup success by @MattDHill in #1800
+    - level_slider reclaiming that precious RAM memory by @k0gen in #1799
+    - stop leaking avahi clients by @dr-bonez in #1802
+    - fix: Deep is_parent was wrong and could be escapped by @Blu-J in #1801
+    - prevent cfg str generation from running forever by @dr-bonez in #1804
+    - better RPC error message by @MattDHill in #1803
+    - Bugfix/marketplace add by @elvece in #1805
+    - fix mrketplace swtiching by @MattDHill in #1810
+    - clean up code and logs by @MattDHill in #1809
+    - fix: Minor fix that matt wanted by @Blu-J in #1808
+    - onion replace instead of adding tor repository by @k0gen in #1813
+    - bank Start as embassy hostname from the begining by @k0gen in #1814
+    - add descriptions to marketplace list page by @elvece in #1812
+    - Fix/encryption by @elvece in #1811
+    - restructure initialization by @dr-bonez in #1816
+    - update license by @MattDHill in #1819
+    - perform system rebuild after updating by @dr-bonez in #1820
+    - ignore file not found error for delete by @dr-bonez in #1822
+    - Multiple by @MattDHill in #1823
+    - Bugfix/correctly package backend job by @moerketh in #1826
+    - update patch-db by @dr-bonez in #1831
+    - give name to logs file by @MattDHill in #1833
+    - play song during update by @dr-bonez in #1832
+    - Seed patchdb UI data by @elvece in #1835
+    - update patch db and enable logging by @dr-bonez in #1837
+    - reduce patch-db log level to warn by @dr-bonez in #1840
+    - update ts matches to fix properties ordering bug by @elvece in #1843
+    - handle multiple image tags having the same hash and increase timeout by @dr-bonez in #1844
+    - retry pgloader up to 5x by @dr-bonez in #1845
+    - show connection bar right away by @MattDHill in #1849
+    - dizzy Rebranding to embassyOS by @k0gen in #1851
+    - update patch db by @MattDHill in #1852
+    - camera_flash screenshots update by @k0gen in #1853
+    - disable concurrency and delete tmpdir before retry by @dr-bonez in #1846
+
+## New Contributors
+
+	- @redragonx made their first contribution in #1733
+
+
+# v0.3.1.1
+## What's Changed
+
+    - whale2 docker stats fix by @k0gen in #1630
+    - update backend dependencies by @dr-bonez in #1637
+    - Fix/receipts health by @Blu-J in #1616
+    - return correct error on failed os download by @dr-bonez in #1636
+    - fix build by @dr-bonez in #1639
+    - Update product.yaml by @dr-bonez in #1638
+    - handle case where selected union enum is invalid after migration by @MattDHill in #1658
+    - fix: Resolve fighting with NM by @Blu-J in #1660
+    - sdk: don't allow mounts in inject actions by @chrisguida in #1653
+    - feat: Variable args by @Blu-J in #1667
+    - add readme to system-images folder by @elvece in #1665
+    - Mask chars beyond 16 by @MattDHill in #1666
+    - chore: Update to have the new version 0.3.1.1 by @Blu-J in #1668
+    - feat: Make the rename effect by @Blu-J in #1669
+    - fix migration, add logging by @dr-bonez in #1674
+    - run build checks only when relevant FE changes by @elvece in #1664
+    - trust local ca by @dr-bonez in #1670
+    - lower log level for docker deser fallback message by @dr-bonez in #1672
+    - refactor build process by @dr-bonez in #1675
+    - chore: enable strict mode by @waterplea in #1569
+    - draft releases notes for 0311 by @MattDHill in #1677
+    - add standby mode by @dr-bonez in #1671
+    - feat: atomic writing by @Blu-J in #1673
+    - allow server.update to update to current version by @dr-bonez in #1679
+    - allow falsey rpc response by @dr-bonez in #1680
+    - issue notification when individual package restore fails by @dr-bonez in #1685
+    - replace bang with question mark in html by @MattDHill in #1683
+    - only validate mounts for inject if eos >=0.3.1.1 by @dr-bonez in #1686
+    - add marketplace_url to backup metadata for service by @dr-bonez in #1688
+    - marketplace published at for service by @MattDHill in #1689
+    - sync data to fs before shutdown by @dr-bonez in #1690
+    - messaging for restart, shutdown, rebuild by @MattDHill in #1691
+    - honor shutdown from diagnostic ui by @dr-bonez in #1692
+    - ask for sudo password immediately during make by @dr-bonez in #1693
+    - sync blockdev after update by @dr-bonez in #1694
+    - set Matt as default assignee by @MattDHill in #1697
+    - NO_KEY for CI images by @dr-bonez in #1700
+    - fix typo by @dr-bonez in #1702
+
+# v0.3.1
+## What's Changed
+    - Feat bulk locking by @Blu-J in #1422
+    - Switching SSH keys to start9 user by @k0gen in #1321
+    - chore: Convert from ajv to ts-matches by @Blu-J in #1415
+    - Fix/id params by @elvece in #1414
+    - make nicer update sound by @ProofOfKeags in #1438
+    - adds product key to error message in setup flow when there is mismatch by @dr-bonez in #1436
+    - Update README.md to include yq by @cryptodread in #1385
+    - yin_yang For the peace of mind yin_yang by @k0gen in #1444
+    - Feature/update sound by @ProofOfKeags in #1439
+    - Feature/script packing by @ProofOfKeags in #1435
+    - rename ActionImplementation to PackageProcedure by @dr-bonez in #1448
+    - Chore/warning cleanse by @ProofOfKeags in #1447
+    - refactor packing to async by @ProofOfKeags in #1453
+    - Add nginx config for proxy redirect by @yzernik in #1421
+    - Proxy local frontend to remote backend by @elvece in #1452
+    - Feat/js action by @Blu-J in #1437
+    - Fix/making js work by @Blu-J in #1456
+    - fix: Dependency vs dependents by @Blu-J in #1462
+    - refactor: isolate network toast and login redirect to separate services by @waterplea in #1412
+    - Fix links in CONTRIBUTING.md, update ToC by @BBlackwo in #1463
+    - Feature/require script consistency by @ProofOfKeags in #1451
+    - Chore/version 0 3 1 0 by @Blu-J in #1475
+    - remove interactive TTY requirement from scripts by @moerketh in #1469
+    - Disable view in marketplace button when side-loaded by @BBlackwo in #1471
+    - Link to tor address on LAN setup page (#1277) by @BBlackwo in #1466
+    - UI version updates and welcome message for 0.3.1 by @elvece in #1479
+    - Update contribution and frontend readme by @BBlackwo in #1467
+    - Clean up config by @MattDHill in #1484
+    - Enable Control Groups for Docker containers by @k0gen in #1468
+    - Fix/patch db unwrap remove by @Blu-J in #1481
+    - handles spaces in working dir in make-image.sh by @moerketh in #1487
+    - UI cosmetic improvements by @MattDHill in #1486
+    - chore: fix the master by @Blu-J in #1495
+    - generate unique ca names based off of server id by @ProofOfKeags in #1500
+    - allow embassy-cli not as root by @dr-bonez in #1501
+    - fix: potential fix for the docker leaking the errors and such by @Blu-J in #1496
+    - Fix/memory leak docker by @Blu-J in #1505
+    - fixes serialization of regex pattern + description by @ProofOfKeags in #1509
+    - allow interactive TTY if available by @dr-bonez in #1508
+    - fix "missing proxy" error in embassy-cli by @dr-bonez in #1516
+    - Feat/js known errors by @Blu-J in #1514
+    - fixes a bug where nginx will crash if eos goes into diagnostic mode a… by @dr-bonez in #1506
+    - fix: restart/ uninstall sometimes didn't work by @Blu-J in #1527
+    - add "error_for_status" to static file downloads by @dr-bonez in #1532
+    - fixes #1169 by @dr-bonez in #1533
+    - disable unnecessary services by @dr-bonez in #1535
+    - chore: Update types to match embassyd by @Blu-J in #1539
+    - fix: found a unsaturaded args fix by @Blu-J in #1540
+    - chore: Update the lite types to include the union and enum by @Blu-J in #1542
+    - Feat: Make the js check for health by @Blu-J in #1543
+    - fix incorrect error message for deserialization in ValueSpecString by @dr-bonez in #1547
+    - fix dependency/dependent id issue by @dr-bonez in #1546
+    - add textarea to ValueSpecString by @dr-bonez in #1534
+    - Feat/js metadata by @Blu-J in #1548
+    - feat: uid/gid/mode added to metadata by @Blu-J in #1551
+    - Strict null checks by @waterplea in #1464
+    - fix backend builds for safe git config by @elvece in #1549
+    - update should send version not version spec by @elvece in #1559
+    - chore: Add tracing for debuging the js procedure slowness by @Blu-J in #1552
+    - Reset password through setup wizard by @MattDHill in #1490
+    - feat: Make sdk by @Blu-J in #1564
+    - fix: Missing a feature flat cfg by @Blu-J in #1563
+    - fixed sentence that didn't make sense by @BitcoinMechanic in #1565
+    - refactor(patch-db): use PatchDB class declaratively by @waterplea in #1562
+    - fix bugs with config and clean up dev options by @MattDHill in #1558
+    - fix: Make it so we only need the password on the backup by @Blu-J in #1566
+    - kill all sessions and remove ripple effect by @MattDHill in #1567
+    - adjust service marketplace button for installation source relevance by @elvece in #1571
+    - fix connection failure display monitoring and other style changes by @MattDHill in #1573
+    - add dns server to embassy-os by @dr-bonez in #1572
+    - Fix/mask generic inputs by @elvece in #1570
+    - Fix/sideload icon type by @elvece in #1577
+    - add avahi conditional compilation flags to dns by @dr-bonez in #1579
+    - selective backups and better drive selection interface by @MattDHill in #1576
+    - Feat/use modern tor by @kn0wmad in #1575
+    - update welcome notes for 031 by @MattDHill in #1580
+    - fix: Properties had a null description by @Blu-J in #1581
+    - fix backup lock ordering by @dr-bonez in #1582
+    - Bugfix/backup lock order by @dr-bonez in #1583
+    - preload redacted and visibility hidden by @MattDHill in #1584
+    - turn chevron red in config if error by @MattDHill in #1586
+    - switch to utc by @dr-bonez in #1587
+    - update patchdb for array patch fix by @elvece in #1588
+    - filter package ids when backing up by @dr-bonez in #1589
+    - add select/deselect all to backups and enum lists by @elvece in #1590
+    - fix: Stop the buffer from dropped pre-maturly by @Blu-J in #1591
+    - chore: commit the snapshots by @Blu-J in #1592
+    - nest new entries and message updates better by @MattDHill in #1595
+    - fix html parsing in logs by @elvece in #1598
+    - don't crash service if io-format is set for main by @dr-bonez in #1599
+    - strip html from colors from logs by @elvece in #1604
+    - feat: fetch effect by @Blu-J in #1605
+    - Fix/UI misc by @elvece in #1606
+    - display bottom item in backup list and refactor for cleanliness by @MattDHill in #1609
+
+# v0.3.0.3
+## What's Changed
+	- refactor: decompose app component by @waterplea in #1359
+	- Update Makefile by @kn0wmad in #1400
+	- ⬐ smarter wget by @k0gen in #1401
+	- prevent the kernel from OOMKilling embassyd by @dr-bonez in #1402
+	- attempt to heal when health check passes by @dr-bonez in #1420
+	- Feat new locking by @Blu-J in #1384
+	- version bump by @dr-bonez in #1423
+	- Update server-show.page.ts by @chrisguida in #1424
+	- Bump async from 2.6.3 to 2.6.4 in /frontend by @dependabot in #1426
+	- Update index.html by @mirkoRainer in #1419
+
+## New Contributors
+    - @dependabot made their first contribution in #1426
+    - @mirkoRainer made their first contribution in #1419
+
+# v0.3.0.2
+- Minor compatibility fixes
+  - #1392
+  - #1390
+  - #1388
+
+# v0.3.0.1
+Minor bugfixes and performance improvements
+
+# v0.3.0
+- Websockets
+	- Real-time sync
+- Patch DB
+	- Closely mirror FE and BE state. Most operating systems are connected to their GUI. Here it is served over the web. Patch DB and websockets serve to close the perceptual gap of this inherent challenge.
+- Switch kernel from Raspbian to Ubuntu
+	- 64 bit
+	- Possibility for alternative hardware
+- Merging of lifeline, agent, and appmgr into embassyd
+	- Elimination of Haskell in favor of pure Rust
+	- Unified API for interacting with the OS
+	- Easier to build from source
+- OS (quarantined from OS and service data)
+	- Kernel/boot
+	- Persistent metadata (disk guid, product key)
+	- Rootfs (the os)
+	- Reserved (for updates) - swaps with rootfs
+- Revamped OS updates
+	- Progress indicators
+	- Non-blocking
+	- Simple swap on reboot
+- Revamped setup flow
+	- Elimination of Setup App (Apple/Google dependencies gone)
+	- Setup Wizard on http://embassy.local
+- Revamped service config
+	- Dynamic, validated forms
+- Diagnostic UI
+	- Missing disk, wrong disk, corrupt disk
+- Turing complete API for actions, backup/restore, config, properties, notifications, health checks, and dependency requirements
+- Optional, arbitrary inputs for actions
+- Install, update, recover progress for apps
+- Multiple interfaces
+	- E.g. rpc, p2p, ui
+- Health checks
+	- Developer defined
+	- Internal, dependencies, and/or external
+- Full Embassy backup (diff-based)
+- External drive support/requirement
+	- Single at first
+	- Groundwork for extension and mirror drives
+- Disk encryption
+	- Random key encrypted with static value
+	- Groundwork for swapping static value with chosen password
+- Session Management
+	- List all active sessions
+	- Option to kill
+- More robust and extensive logs
+- Donations
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,119 +1,340 @@
-# Contributing to StartOS
+<!-- omit in toc -->

-This guide is for contributing to the StartOS. If you are interested in packaging a service for StartOS, visit the [service packaging guide](https://docs.start9.com/latest/developer-docs/). If you are interested in promoting, providing technical support, creating tutorials, or helping in other ways, please visit the [Start9 website](https://start9.com/contribute).
+# Contributing to Embassy OS

+First off, thanks for taking the time to contribute! ❤️

-## Collaboration
+All types of contributions are encouraged and valued. See the
+[Table of Contents](#table-of-contents) for different ways to help and details
+about how this project handles them. Please make sure to read the relevant
+section before making your contribution. It will make it a lot easier for us
+maintainers and smooth out the experience for all involved. The community looks
+forward to your contributions. 🎉

- [Matrix](https://matrix.to/#/#community-dev:matrix.start9labs.com)
- [Telegram](https://t.me/start9_labs/47471)
+> And if you like the project, but just don't have time to contribute, that's
+> fine. There are other easy ways to support the project and show your
+> appreciation, which we would also be very happy about:
+>
+> - Star the project
+> - Tweet about it
+> - Refer this project in your project's readme
+> - Mention the project at local meetups and tell your friends/colleagues
+> - Buy an [Embassy](https://start9labs.com)

-## Project Structure
+<!-- omit in toc -->

-```bash
-/
-├── assets/
-├── core/
-├── build/
-├── debian/
-├── web/
-├── image-recipe/
-├── patch-db
-└── system-images/
-```
-#### assets
-screenshots for the StartOS README
+## Table of Contents

-#### core
-An API, daemon (startd), CLI (start-cli), and SDK (start-sdk) that together provide the core functionality of StartOS.
+- [I Have a Question](#i-have-a-question)
+- [I Want To Contribute](#i-want-to-contribute)
+  - [Reporting Bugs](#reporting-bugs)
+  - [Suggesting Enhancements](#suggesting-enhancements)
+  - [Project Structure](#project-structure)
+  - [Your First Code Contribution](#your-first-code-contribution)
+    - [Setting Up Your Development Environment](#setting-up-your-development-environment)
+    - [Building The Image](#building-the-image)
+  - [Improving The Documentation](#improving-the-documentation)
+- [Styleguides](#styleguides)
+  - [Formatting](#formatting)
+  - [Atomic Commits](#atomic-commits)
+  - [Commit Messages](#commit-messages)
+  - [Pull Requests](#pull-requests)
+  - [Rebasing Changes](#rebasing-changes)
+- [Join The Discussion](#join-the-discussion)
+- [Join The Project Team](#join-the-project-team)

-#### build
-Auxiliary files and scripts to include in deployed StartOS images
+## I Have a Question

-#### debian
-Maintainer scripts for the StartOS Debian package
+> If you want to ask a question, we assume that you have read the available
+> [Documentation](https://docs.start9labs.com).

-#### web
-Web UIs served under various conditions and used to interact with StartOS APIs.
+Before you ask a question, it is best to search for existing
+[Issues](https://github.com/Start9Labs/embassy-os/issues) that might help you.
+In case you have found a suitable issue and still need clarification, you can
+write your question in this issue. It is also advisable to search the internet
+for answers first.

-#### image-recipe
-Scripts for building StartOS images
+If you then still feel the need to ask a question and need clarification, we
+recommend the following:

-#### patch-db (submodule)
-A diff based data store used to synchronize data between the web interfaces and server.
+- Open an [Issue](https://github.com/Start9Labs/embassy-os/issues/new).
+- Provide as much context as you can about what you're running into.
+- Provide project and platform versions, depending on what seems relevant.

-#### system-images
-Docker images that assist with creating backups.
+We will then take care of the issue as soon as possible.

-## Environment Setup
+<!--
+You might want to create a separate issue tag for questions and include it in this description. People should then tag their issues accordingly.
+
+Depending on how large the project is, you may want to outsource the questioning, e.g. to Stack Overflow or Gitter. You may add additional contact and information possibilities:
+- IRC
+- Slack
+- Gitter
+- Stack Overflow tag
+- Blog
+- FAQ
+- Roadmap
+- E-Mail List
+- Forum
+-->
+
+## I Want To Contribute
+
+> ### Legal Notice <!-- omit in toc -->
+>
+> When contributing to this project, you must agree that you have authored 100%
+> of the content, that you have the necessary rights to the content and that the
+> content you contribute may be provided under the project license.
+
+### Reporting Bugs
+
+<!-- omit in toc -->
+
+#### Before Submitting a Bug Report
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Therefore, we ask you to investigate carefully, collect information
+and describe the issue in detail in your report. Please complete the following
+steps in advance to help us fix any potential bug as fast as possible.
+
+- Make sure that you are using the latest version.
+- Determine if your bug is really a bug and not an error on your side e.g. using
+  incompatible environment components/versions (Make sure that you have read the
+  [documentation](https://start9.com/latest/user-manual). If you are looking for
+  support, you might want to check [this section](#i-have-a-question)).
+- To see if other users have experienced (and potentially already solved) the
+  same issue you are having, check if there is not already a bug report existing
+  for your bug or error in the
+  [bug tracker](https://github.com/Start9Labs/embassy-os/issues?q=label%3Abug).
+- Also make sure to search the internet (including Stack Overflow) to see if
+  users outside of the GitHub community have discussed the issue.
+- Collect information about the bug:
+  - Stack trace (Traceback)
+  - Client OS, Platform and Version (Windows/Linux/macOS/iOS/Android,
+    Firefox/Tor Browser/Consulate)
+  - Version of the interpreter, compiler, SDK, runtime environment, package
+    manager, depending on what seems relevant.
+  - Possibly your input and the output
+  - Can you reliably reproduce the issue? And can you also reproduce it with
+    older versions?
+
+<!-- omit in toc -->
+
+#### How Do I Submit a Good Bug Report?
+
+> You must never report security related issues, vulnerabilities or bugs to the
+> issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by
+> email to <security@start9labs.com>.
+
+<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
+
+We use GitHub issues to track bugs and errors. If you run into an issue with the
+project:
+
+- Open an [Issue](https://github.com/Start9Labs/embassy-os/issues/new/choose)
+  selecting the appropriate type.
+- Explain the behavior you would expect and the actual behavior.
+- Please provide as much context as possible and describe the _reproduction
+  steps_ that someone else can follow to recreate the issue on their own. This
+  usually includes your code. For good bug reports you should isolate the
+  problem and create a reduced test case.
+- Provide the information you collected in the previous section.
+
+Once it's filed:
+
+- The project team will label the issue accordingly.
+- A team member will try to reproduce the issue with your provided steps. If
+  there are no reproduction steps or no obvious way to reproduce the issue, the
+  team will ask you for those steps and mark the issue as `Question`. Bugs with
+  the `Question` tag will not be addressed until they are answered.
+- If the team is able to reproduce the issue, it will be marked a scoping level
+  tag, as well as possibly other tags (such as `Security`), and the issue will
+  be left to be [implemented by someone](#your-first-code-contribution).
+
+<!-- You might want to create an issue template for bugs and errors that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for Embassy
+OS, **including completely new features and minor improvements to existing
+functionality**. Following these guidelines will help maintainers and the
+community to understand your suggestion and find related suggestions.
+
+<!-- omit in toc -->
+
+#### Before Submitting an Enhancement
+
+- Make sure that you are using the latest version.
+- Read the [documentation](https://start9.com/latest/user-manual) carefully and
+  find out if the functionality is already covered, maybe by an individual
+  configuration.
+- Perform a [search](https://github.com/Start9Labs/embassy-os/issues) to see if
+  the enhancement has already been suggested. If it has, add a comment to the
+  existing issue instead of opening a new one.
+- Find out whether your idea fits with the scope and aims of the project. It's
+  up to you to make a strong case to convince the project's developers of the
+  merits of this feature. Keep in mind that we want features that will be useful
+  to the majority of our users and not just a small subset. If you're just
+  targeting a minority of users, consider writing an add-on/plugin library.
+
+<!-- omit in toc -->
+
+#### How Do I Submit a Good Enhancement Suggestion?
+
+Enhancement suggestions are tracked as
+[GitHub issues](https://github.com/Start9Labs/embassy-os/issues).
+
+- Use a **clear and descriptive title** for the issue to identify the
+  suggestion.
+- Provide a **step-by-step description of the suggested enhancement** in as many
+  details as possible.
+- **Describe the current behavior** and **explain which behavior you expected to
+  see instead** and why. At this point you can also tell which alternatives do
+  not work for you.
+- You may want to **include screenshots and animated GIFs** which help you
+  demonstrate the steps or point out the part which the suggestion is related
+  to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on
+  macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast)
+  or [this tool](https://github.com/GNOME/byzanz) on Linux.
+  <!-- this should only be included if the project has a GUI -->
+- **Explain why this enhancement would be useful** to most Embassy OS users. You
+  may also want to point out the other projects that solved it better and which
+  could serve as inspiration.
+
+<!-- You might want to create an issue template for enhancement suggestions that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->
+
+### Project Structure
+
+embassyOS is composed of the following components. Please visit the README for
+each component to understand the dependency requirements and installation
+instructions.
+
+- [`backend`](backend/README.md) (Rust) is a command line utility, daemon, and
+  software development kit that sets up and manages services and their
+  environments, provides the interface for the ui, manages system state, and
+  provides utilities for packaging services for embassyOS.
+- [`build`](build/README.md) contains scripts and necessary for deploying
+  embassyOS to a debian/raspbian system.
+- [`frontend`](frontend/README.md) (Typescript Ionic Angular) is the code that
+  is deployed to the browser to provide the user interface for embassyOS.
+  - `projects/ui` - Code for the user interface that is displayed when embassyOS
+    is running normally.
+  - `projects/setup-wizard`(frontend/README.md) - Code for the user interface
+    that is displayed during the setup and recovery process for embassyOS.
+  - `projects/diagnostic-ui` - Code for the user interface that is displayed
+    when something has gone wrong with starting up embassyOS, which provides
+    helpful debugging tools.
+- `libs` (Rust) is a set of standalone crates that were separated out of
+  `backend` for the purpose of portability
+- `patch-db` - A diff based data store that is used to synchronize data between
+  the front and backend.
+  - Notably, `patch-db` has a
+    [client](https://github.com/Start9Labs/patch-db/tree/master/client) with its
+    own dependency and installation requirements.
+- `system-images` - (Docker, Rust) A suite of utility Docker images that are
+  preloaded with embassyOS to assist with functions relating to services (eg.
+  configuration, backups, health checks).
+
+### Your First Code Contribution
+
+#### Setting Up Your Development Environment
+
+First, clone the embassyOS repository and from the project root, pull in the
+submodules for dependent libraries.

-#### Clone the StartOS repository
-```sh
-git clone https://github.com/Start9Labs/start-os.git
-cd start-os
-```
-
-#### Load the PatchDB submodule
 ```sh
+git clone https://github.com/Start9Labs/embassy-os.git
 git submodule update --init --recursive
 ```

-#### Continue to your project of interest for additional instructions:
- [`core`](core/README.md)
- [`web-interfaces`](web-interfaces/README.md)
- [`build`](build/README.md)
- [`patch-db`](https://github.com/Start9Labs/patch-db)
+Depending on which component of the ecosystem you are interested in contributing
+to, follow the installation requirements listed in that component's README
+(linked [above](#project-structure))

-## Building
-This project uses [GNU Make](https://www.gnu.org/software/make/) to build its components. To build any specific component, simply run `make <TARGET>` replacing `<TARGET>` with the name of the target you'd like to build
+#### Building The Raspberry Pi Image

-### Requirements
- [GNU Make](https://www.gnu.org/software/make/)
- [Docker](https://docs.docker.com/get-docker/)
- [NodeJS v18.15.0](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
- [sed](https://www.gnu.org/software/sed/)
- [grep](https://www.gnu.org/software/grep/)
- [awk](https://www.gnu.org/software/gawk/)
- [jq](https://jqlang.github.io/jq/)
- [gzip](https://www.gnu.org/software/gzip/)
- [brotli](https://github.com/google/brotli)
+This step is for setting up an environment in which to test your code changes if
+you do not yet have a embassyOS.

-### Environment variables
- `PLATFORM`: which platform you would like to build for. Must be one of `x86_64`, `x86_64-nonfree`, `aarch64`, `aarch64-nonfree`, `raspberrypi`
-    - NOTE: `nonfree` images are for including `nonfree` firmware packages in the built ISO
- `ENVIRONMENT`: a hyphen separated set of feature flags to enable
-    - `dev`: enables password ssh (INSECURE!) and does not compress frontends
-    - `unstable`: enables assertions that will cause errors on unexpected inconsistencies that are undesirable in production use either for performance or reliability reasons
-    - `docker`: use `docker` instead of `podman`
- `GIT_BRANCH_AS_HASH`: set to `1` to use the current git branch name as the git hash so that the project does not need to be rebuilt on each commit
+- Requirements
+  - `ext4fs` (available if running on the Linux kernel)
+  - [Docker](https://docs.docker.com/get-docker/)
+  - GNU Make
+- Building
+  - see setup instructions [here](build/README.md)
+  - run `make embassyos-raspi.img ARCH=aarch64` from the project root

-### Useful Make Targets
- `iso`: Create a full `.iso` image
-    - Only possible from Debian
-    - Not available for `PLATFORM=raspberrypi`
-    - Additional Requirements:
-        - [debspawn](https://github.com/lkhq/debspawn)
- `img`: Create a full `.img` image
-    - Only possible from Debian
-    - Only available for `PLATFORM=raspberrypi`
-    - Additional Requirements:
-        - [debspawn](https://github.com/lkhq/debspawn)
- `format`: Run automatic code formatting for the project
-    - Additional Requirements:
-        - [rust](https://rustup.rs/)
- `test`: Run automated tests for the project
-    - Additional Requirements:
-        - [rust](https://rustup.rs/)
- `update`: Deploy the current working project to a device over ssh as if through an over-the-air update
-    - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
- `reflash`: Deploy the current working project to a device over ssh as if using a live `iso` image to reflash it
-    - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
- `update-overlay`: Deploy the current working project to a device over ssh to the in-memory overlay without restarting it
-    - WARNING: changes will be reverted after the device is rebooted
-    - WARNING: changes to `init` will not take effect as the device is already initialized
-    - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
- `wormhole`: Deploy the `startbox` to a device using [magic-wormhole](https://github.com/magic-wormhole/magic-wormhole)
-    - When the build it complete will emit a command to paste into the shell of the device to upgrade it
-    - Additional Requirements:
-        - [magic-wormhole](https://github.com/magic-wormhole/magic-wormhole)
- `clean`: Delete all compiled artifacts
+### Improving The Documentation
+
+You can find the repository for Start9's documentation
+[here](https://github.com/Start9Labs/documentation). If there is something you
+would like to see added, let us know, or create an issue yourself. Welcome are
+contributions for lacking or incorrect information, broken links, requested
+additions, or general style improvements.
+
+Contributions in the form of setup guides for integrations with external
+applications are highly encouraged. If you struggled through a process and would
+like to share your steps with others, check out the docs for each
+[service](https://github.com/Start9Labs/documentation/blob/master/source/user-manuals/available-services/index.rst)
+we support. The wrapper repos contain sections for adding integration guides,
+such as this
+[one](https://github.com/Start9Labs/bitcoind-wrapper/tree/master/docs). These
+not only help out others in the community, but inform how we can create a more
+seamless and intuitive experience.
+
+## Styleguides
+
+### Formatting
+
+Each component of embassyOS contains its own style guide. Code must be formatted
+with the formatter designated for each component. These are outlined within each
+component folder's README.
+
+### Atomic Commits
+
+Commits
+[should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
+and diffs should be easy to read. Do not mix any formatting fixes or code moves
+with actual code changes.
+
+### Commit Messages
+
+If a commit touches only 1 component, prefix the message with the affected
+component. i.e. `backend: update to tokio v0.3`.
+
+### Pull Requests
+
+The body of a pull request should contain sufficient description of what the
+changes do, as well as a justification. You should include references to any
+relevant [issues](https://github.com/Start9Labs/embassy-os/issues).
+
+### Rebasing Changes
+
+When a pull request conflicts with the target branch, you may be asked to rebase
+it on top of the current target branch. The `git rebase` command will take care
+of rebuilding your commits on top of the new base.
+
+This project aims to have a clean git history, where code changes are only made
+in non-merge commits. This simplifies auditability because merge commits can be
+assumed to not contain arbitrary code changes.
+
+## Join The Discussion
+
+Current or aspiring contributors? Join our community developer
+[Matrix channel](https://matrix.to/#/#community-dev:matrix.start9labs.com).
+
+Just interested in or using the project? Join our community
+[Telegram](https://t.me/start9_labs) or
+[Matrix](https://matrix.to/#/#community:matrix.start9labs.com).
+
+## Join The Project Team
+
+Interested in becoming a part of the Start9 Labs team? Send an email to
+<jobs@start9labs.com>
+
+<!-- omit in toc -->
+
+## Attribution
+
+This guide is based on the **contributing-gen**.
+[Make your own](https://github.com/bttger/contributing-gen)!
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Start9 Labs, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,42 @@
+# START9 NON-COMMERCIAL LICENSE v1
+Version 1, 22 September 2022
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+### 1.Definitions
+
+"License" means version 1 of the Start9 Non-Commercial License.
+
+"Licensor" means the Start9 Labs, Inc, or its successor(s) in interest, or a future assignee of the copyright.
+
+"You" (or "Your") means an individual or organization exercising permissions granted by this License.
+
+"Source Code" for a work means the preferred form of the work for making modifications to it.
+
+"Object Code" means any non-source form of a work, including the machine-language output by a compiler or assembler.
+
+"Work" means any work of authorship, whether in Source or Object form, made available under this License.
+
+"Derivative Work" means any work, whether in Source or Object form, that is based on (or derived from) the Work.
+
+"Distribute" means to convey or to publish and generally has the same meaning here as under U.S. Copyright law.
+
+"Sell" means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including, without limitation, fees for hosting, consulting, or support services), a product or service whose value derives, entirely or substantially, from the functionality of the Work or Derivative Work.
+
+### 2. Grant of Rights
+
+Subject to the terms of this license, the Licensor grants you, the licensee, a non-exclusive, worldwide, royalty-free copyright license to access, audit, copy, modify, compile, run, test, distribute, or otherwise use the Software.
+
+### 3. Limitations
+
+1. The grant of rights under the License does NOT include, and the License does NOT grant You the right to Sell the Work or Derivative Work.
+2. If you Distribute the Work or Derivative Work, you expressly undertake not to remove or modify, in any manner, the copyright notices attached to the Work or displayed in any output of the Work when run, and to reproduce these notices, in an identical manner, in any distributed copies of the Work or Derivative Work together with a copy of this License.
+3. If you Distribute a Derivative Work, it must carry prominent notices stating that it has been modified from the Work, providing a relevant date.
+
+### 4. Contributions
+
+You hereby grant to Licensor a perpetual, irrevocable, worldwide, non-exclusive, royalty-free license to use and exploit any Derivative Work of which you are the author.
+
+### 5. Disclaimer
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. LICENSOR HAS NO OBLIGATION TO SUPPORT RECIPIENTS OF THE SOFTWARE.
--- a/297
+++ b/297
@@ -1,238 +1,213 @@
-PLATFORM_FILE := $(shell ./check-platform.sh)
-ENVIRONMENT_FILE := $(shell ./check-environment.sh)
-GIT_HASH_FILE := $(shell ./check-git-hash.sh)
-VERSION_FILE := $(shell ./check-version.sh)
-BASENAME := $(shell ./basename.sh)
-PLATFORM := $(shell if [ -f ./PLATFORM.txt ]; then cat ./PLATFORM.txt; else echo unknown; fi)
-ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else echo $(PLATFORM) | sed 's/-nonfree$$//g'; fi)
-IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
-BINS := core/target/$(ARCH)-unknown-linux-gnu/release/startbox core/target/aarch64-unknown-linux-musl/release/container-init core/target/x86_64-unknown-linux-musl/release/container-init
-WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard
-FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
-BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
-DEBIAN_SRC := $(shell git ls-files debian/)
-IMAGE_RECIPE_SRC := $(shell git ls-files image-recipe/)
-STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
-COMPAT_SRC := $(shell git ls-files system-images/compat/)
-UTILS_SRC := $(shell git ls-files system-images/utils/)
-BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
-CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
-WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json
-WEB_UI_SRC := $(shell git ls-files web/projects/ui)
-WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
-WEB_DIAGNOSTIC_UI_SRC := $(shell git ls-files web/projects/diagnostic-ui)
-WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
-PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
+RASPI_TARGETS := eos_raspberrypi-uninit.img eos_raspberrypi-uninit.tar.gz
+OS_ARCH := $(shell if echo $(RASPI_TARGETS) | grep -qw "$(MAKECMDGOALS)"; then echo raspberrypi; else uname -m; fi)
+ARCH := $(shell if [ "$(OS_ARCH)" = "raspberrypi" ]; then echo aarch64; else echo $(OS_ARCH); fi)
+ENVIRONMENT_FILE = $(shell ./check-environment.sh)
+GIT_HASH_FILE = $(shell ./check-git-hash.sh)
+VERSION_FILE = $(shell ./check-version.sh)
+EMBASSY_BINS := backend/target/$(ARCH)-unknown-linux-gnu/release/embassyd backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-init backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-cli backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-sdk backend/target/$(ARCH)-unknown-linux-gnu/release/avahi-alias libs/target/aarch64-unknown-linux-musl/release/embassy_container_init libs/target/x86_64-unknown-linux-musl/release/embassy_container_init
+EMBASSY_UIS := frontend/dist/ui frontend/dist/setup-wizard frontend/dist/diagnostic-ui frontend/dist/install-wizard
+BUILD_SRC := $(shell find build)
+EMBASSY_SRC := backend/embassyd.service backend/embassy-init.service $(EMBASSY_UIS) $(BUILD_SRC)
+COMPAT_SRC := $(shell find system-images/compat/ -not -path 'system-images/compat/target/*' -and -not -name *.tar -and -not -name target)
+UTILS_SRC := $(shell find system-images/utils/ -not -name *.tar)
+BINFMT_SRC := $(shell find system-images/binfmt/ -not -name *.tar)
+BACKEND_SRC := $(shell find backend/src) $(shell find backend/migrations) $(shell find patch-db/*/src) $(shell find libs/*/src) libs/*/Cargo.toml backend/Cargo.toml backend/Cargo.lock
+FRONTEND_SHARED_SRC := $(shell find frontend/projects/shared) $(shell ls -p frontend/ | grep -v / | sed 's/^/frontend\//g') frontend/package.json frontend/node_modules frontend/config.json patch-db/client/dist frontend/patchdb-ui-seed.json
+FRONTEND_UI_SRC := $(shell find frontend/projects/ui)
+FRONTEND_SETUP_WIZARD_SRC := $(shell find frontend/projects/setup-wizard)
+FRONTEND_DIAGNOSTIC_UI_SRC := $(shell find frontend/projects/diagnostic-ui)
+FRONTEND_INSTALL_WIZARD_SRC := $(shell find frontend/projects/install-wizard)
+PATCH_DB_CLIENT_SRC := $(shell find patch-db/client -not -path patch-db/client/dist)
 GZIP_BIN := $(shell which pigz || which gzip)
-TAR_BIN := $(shell which gtar || which tar)
-COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar
-ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console; fi') $(PLATFORM_FILE)
+ALL_TARGETS := $(EMBASSY_BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar $(EMBASSY_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE)

 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
 	rm = rm -rf $1
 	cp = cp -r $1 $2
-	ln = ln -sf $1 $2
 else
-	ifeq ($(SSHPASS),)
-		ssh = ssh $(REMOTE) $1
-	else 
-		ssh = sshpass -p $(SSHPASS) ssh $(REMOTE) $1
-	endif
-	mkdir = $(call ssh,'sudo mkdir -p $1')
-	rm  = $(call ssh,'sudo rm -rf $1')
-	ln = $(call ssh,'sudo ln -sf $1 $2')
+	mkdir = ssh $(REMOTE) 'mkdir -p $1'
+	rm  = ssh $(REMOTE) 'sudo rm -rf $1'
 define cp
-	$(TAR_BIN) --transform "s|^$1|x|" -czv -f- $1 | $(call ssh,"sudo tar --transform 's|^x|$2|' -xzv -f- -C /")
+	tar --transform "s|^$1|x|" -czv -f- $1 | ssh $(REMOTE) "sudo tar --transform 's|^x|$2|' -xzv -f- -C /"
 endef
 endif

 .DELETE_ON_ERROR:

-.PHONY: all metadata install clean format sdk snapshots uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole test
+.PHONY: all gzip install clean format sdk snapshots frontends ui backend reflash eos_raspberrypi.img sudo

 all: $(ALL_TARGETS)

-metadata: $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
-
 sudo:
 	sudo true

 clean:
+	rm -f 2022-01-28-raspios-bullseye-arm64-lite.zip
+	rm -f raspios.img
+	rm -f eos_raspberrypi-uninit.img
+	rm -f eos_raspberrypi-uninit.tar.gz
+	rm -f ubuntu.img
+	rm -f product_key.txt
 	rm -f system-images/**/*.tar
 	rm -rf system-images/compat/target
-	rm -rf core/target
-	rm -rf web/.angular
-	rm -f web/config.json
-	rm -rf web/node_modules
-	rm -rf web/dist
+	rm -rf backend/target
+	rm -rf frontend/.angular
+	rm -f frontend/config.json
+	rm -rf frontend/node_modules
+	rm -rf frontend/dist
+	rm -rf libs/target
 	rm -rf patch-db/client/node_modules
 	rm -rf patch-db/client/dist
 	rm -rf patch-db/target
 	rm -rf cargo-deps
-	rm -rf dpkg-workdir
-	rm -rf image-recipe/deb
-	rm -rf results
-	rm -rf build/lib/firmware
-	rm -f ENVIRONMENT.txt
-	rm -f PLATFORM.txt
-	rm -f GIT_HASH.txt
-	rm -f VERSION.txt
+	rm ENVIRONMENT.txt
+	rm GIT_HASH.txt
+	rm VERSION.txt

 format:
-	cd core && cargo +nightly fmt
-
-test: $(CORE_SRC) $(ENVIRONMENT_FILE)
-	cd core && cargo build && cargo test
+	cd backend && cargo +nightly fmt
+	cd libs && cargo +nightly fmt

 sdk:
-	cd core && ./install-sdk.sh
+	cd backend/ && ./install-sdk.sh

-deb: results/$(BASENAME).deb
+eos_raspberrypi-uninit.img: $(ALL_TARGETS) raspios.img cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep | sudo
+	! test -f eos_raspberrypi-uninit.img || rm eos_raspberrypi-uninit.img
+	./build/raspberry-pi/make-image.sh

-debian/control: build/lib/depends build/lib/conflicts
-	./debuild/control.sh
+lite-upgrade.img: raspios.img cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep $(BUILD_SRC) eos.raspberrypi.squashfs
+	! test -f lite-upgrade.img || rm lite-upgrade.img
+	./build/raspberry-pi/make-upgrade-image.sh

-results/$(BASENAME).deb: dpkg-build.sh $(DEBIAN_SRC) $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
-	PLATFORM=$(PLATFORM) ./dpkg-build.sh
-
-$(IMAGE_TYPE): results/$(BASENAME).$(IMAGE_TYPE)
-
-squashfs: results/$(BASENAME).squashfs
-
-results/$(BASENAME).$(IMAGE_TYPE) results/$(BASENAME).squashfs: $(IMAGE_RECIPE_SRC) results/$(BASENAME).deb
-	./image-recipe/run-local-build.sh "results/$(BASENAME).deb"
+eos_raspberrypi.img: raspios.img $(BUILD_SRC) eos.raspberrypi.squashfs $(VERSION_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) | sudo
+	! test -f eos_raspberrypi.img || rm eos_raspberrypi.img
+	./build/raspberry-pi/make-initialized-image.sh

 # For creating os images. DO NOT USE
 install: $(ALL_TARGETS)
 	$(call mkdir,$(DESTDIR)/usr/bin)
-	$(call cp,core/target/$(ARCH)-unknown-linux-gnu/release/startbox,$(DESTDIR)/usr/bin/startbox)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/startd)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-cli)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-sdk)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-deno)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/avahi-alias)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/embassy-cli)
-	if [ "$(PLATFORM)" = "raspberrypi" ]; then $(call cp,cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep,$(DESTDIR)/usr/bin/pi-beep); fi
-	if /bin/bash -c '[[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]'; then $(call cp,cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console,$(DESTDIR)/usr/bin/tokio-console); fi
+	$(call cp,backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-init,$(DESTDIR)/usr/bin/embassy-init)
+	$(call cp,backend/target/$(ARCH)-unknown-linux-gnu/release/embassyd,$(DESTDIR)/usr/bin/embassyd)
+	$(call cp,backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-cli,$(DESTDIR)/usr/bin/embassy-cli)
+	$(call cp,backend/target/$(ARCH)-unknown-linux-gnu/release/avahi-alias,$(DESTDIR)/usr/bin/avahi-alias)
 	
-	$(call mkdir,$(DESTDIR)/lib/systemd/system)
-	$(call cp,core/startos/startd.service,$(DESTDIR)/lib/systemd/system/startd.service)
-
 	$(call mkdir,$(DESTDIR)/usr/lib)
-	$(call rm,$(DESTDIR)/usr/lib/startos)
-	$(call cp,build/lib,$(DESTDIR)/usr/lib/startos)
+	$(call rm,$(DESTDIR)/usr/lib/embassy)
+	$(call cp,build/lib,$(DESTDIR)/usr/lib/embassy)

-	$(call cp,PLATFORM.txt,$(DESTDIR)/usr/lib/startos/PLATFORM.txt)
-	$(call cp,ENVIRONMENT.txt,$(DESTDIR)/usr/lib/startos/ENVIRONMENT.txt)
-	$(call cp,GIT_HASH.txt,$(DESTDIR)/usr/lib/startos/GIT_HASH.txt)
-	$(call cp,VERSION.txt,$(DESTDIR)/usr/lib/startos/VERSION.txt)
+	$(call cp,ENVIRONMENT.txt,$(DESTDIR)/usr/lib/embassy/ENVIRONMENT.txt)
+	$(call cp,GIT_HASH.txt,$(DESTDIR)/usr/lib/embassy/GIT_HASH.txt)
+	$(call cp,VERSION.txt,$(DESTDIR)/usr/lib/embassy/VERSION.txt)

-	$(call mkdir,$(DESTDIR)/usr/lib/startos/container)
-	$(call cp,core/target/aarch64-unknown-linux-musl/release/container-init,$(DESTDIR)/usr/lib/startos/container/container-init.arm64)
-	$(call cp,core/target/x86_64-unknown-linux-musl/release/container-init,$(DESTDIR)/usr/lib/startos/container/container-init.amd64)
+	$(call mkdir,$(DESTDIR)/usr/lib/embassy/container)
+	$(call cp,libs/target/aarch64-unknown-linux-musl/release/embassy_container_init,$(DESTDIR)/usr/lib/embassy/container/embassy_container_init.arm64)
+	$(call cp,libs/target/x86_64-unknown-linux-musl/release/embassy_container_init,$(DESTDIR)/usr/lib/embassy/container/embassy_container_init.amd64)

-	$(call mkdir,$(DESTDIR)/usr/lib/startos/system-images)
-	$(call cp,system-images/compat/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/compat.tar)
-	$(call cp,system-images/utils/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/utils.tar)
-	$(call cp,system-images/binfmt/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/binfmt.tar)
-	
-	$(call cp,firmware/$(PLATFORM),$(DESTDIR)/usr/lib/startos/firmware)
+	$(call mkdir,$(DESTDIR)/usr/lib/embassy/system-images)
+	$(call cp,system-images/compat/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/embassy/system-images/compat.tar)
+	$(call cp,system-images/utils/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/embassy/system-images/utils.tar)
+	$(call cp,system-images/binfmt/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/embassy/system-images/binfmt.tar)

-update-overlay: $(ALL_TARGETS)
+	$(call mkdir,$(DESTDIR)/var/www/html)
+	$(call cp,frontend/dist/diagnostic-ui,$(DESTDIR)/var/www/html/diagnostic)
+	$(call cp,frontend/dist/setup-wizard,$(DESTDIR)/var/www/html/setup)
+	$(call cp,frontend/dist/install-wizard,$(DESTDIR)/var/www/html/install)
+	$(call cp,frontend/dist/ui,$(DESTDIR)/var/www/html/main)
+	$(call cp,index.html,$(DESTDIR)/var/www/html/index.html)
+
+update-overlay:
 	@echo "\033[33m!!! THIS WILL ONLY REFLASH YOUR DEVICE IN MEMORY !!!\033[0m"
 	@echo "\033[33mALL CHANGES WILL BE REVERTED IF YOU RESTART THE DEVICE\033[0m"
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
-	@if [ "`ssh $(REMOTE) 'cat /usr/lib/startos/VERSION.txt'`" != "`cat ./VERSION.txt`" ]; then >&2 echo "StartOS requires migrations: update-overlay is unavailable." && false; fi
-	$(call ssh,"sudo systemctl stop startd")
-	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) PLATFORM=$(PLATFORM)
-	$(call ssh,"sudo systemctl start startd")
+	@if [ "`ssh $(REMOTE) 'cat /usr/lib/embassy/VERSION.txt'`" != "`cat ./VERSION.txt`" ]; then >&2 echo "Embassy requires migrations: update-overlay is unavailable." && false; fi
+	@if ssh $(REMOTE) "pidof embassy-init"; then >&2 echo "Embassy in INIT: update-overlay is unavailable." && false; fi
+	ssh $(REMOTE) "sudo systemctl stop embassyd"
+	$(MAKE) install REMOTE=$(REMOTE) OS_ARCH=$(OS_ARCH)
+	ssh $(REMOTE) "sudo systemctl start embassyd"

-wormhole: core/target/$(ARCH)-unknown-linux-gnu/release/startbox
-	@wormhole send core/target/$(ARCH)-unknown-linux-gnu/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
-
-update: $(ALL_TARGETS)
+update:
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
-	$(call ssh,"sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/")
-	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/embassy/next PLATFORM=$(PLATFORM)
-	$(call ssh,'sudo NO_SYNC=1 /media/embassy/next/usr/lib/startos/scripts/chroot-and-upgrade "apt-get install -y $(shell cat ./build/lib/depends)"')
+	ssh $(REMOTE) "sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/"
+	$(MAKE) install REMOTE=$(REMOTE) DESTDIR=/media/embassy/next OS_ARCH=$(OS_ARCH)
+	ssh $(REMOTE) "sudo touch /media/embassy/config/upgrade && sudo sync && sudo reboot"

-emulate-reflash: $(ALL_TARGETS)
+emulate-reflash:
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
-	$(call ssh,"sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/")
-	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/embassy/next PLATFORM=$(PLATFORM)
-	$(call ssh,"sudo touch /media/embassy/config/upgrade && sudo rm -f /media/embassy/config/disk.guid && sudo sync && sudo reboot")
+	ssh $(REMOTE) "sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/"
+	$(MAKE) install REMOTE=$(REMOTE) DESTDIR=/media/embassy/next OS_ARCH=$(OS_ARCH)
+	ssh $(REMOTE) "sudo touch /media/embassy/config/upgrade && sudo rm -f /media/embassy/config/disk.guid && sudo sync && sudo reboot"

-upload-ota: results/$(BASENAME).squashfs
-	TARGET=$(TARGET) KEY=$(KEY) ./upload-ota.sh
+system-images/compat/docker-images/aarch64.tar system-images/compat/docker-images/x86_64.tar: $(COMPAT_SRC)
+	cd system-images/compat && make

-build/lib/depends build/lib/conflicts: build/dpkg-deps/*
-	build/dpkg-deps/generate.sh
+system-images/utils/docker-images/aarch64.tar system-images/utils/docker-images/x86_64.tar: $(UTILS_SRC)
+	cd system-images/utils && make

-$(FIRMWARE_ROMS): build/lib/firmware.json download-firmware.sh $(PLATFORM_FILE)
-	./download-firmware.sh $(PLATFORM)
+system-images/binfmt/docker-images/aarch64.tar system-images/binfmt/docker-images/x86_64.tar: $(BINFMT_SRC)
+	cd system-images/binfmt && make

-system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC) core/Cargo.lock
-	cd system-images/compat && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
+raspios.img:
+	wget --continue https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip
+	unzip 2022-01-28-raspios-bullseye-arm64-lite.zip
+	mv 2022-01-28-raspios-bullseye-arm64-lite.img raspios.img

-system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
-	cd system-images/utils && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
+snapshots: libs/snapshot_creator/Cargo.toml
+	cd libs/  && ./build-v8-snapshot.sh
+	cd libs/  && ./build-arm-v8-snapshot.sh

-system-images/binfmt/docker-images/$(ARCH).tar: $(BINFMT_SRC)
-	cd system-images/binfmt && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
+$(EMBASSY_BINS): $(BACKEND_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) frontend/patchdb-ui-seed.json
+	cd backend && ARCH=$(ARCH) ./build-prod.sh
+	touch $(EMBASSY_BINS)

-snapshots: core/snapshot-creator/Cargo.toml
-	cd core/ && ARCH=aarch64 ./build-v8-snapshot.sh
-	cd core/ && ARCH=x86_64 ./build-v8-snapshot.sh
+frontend/node_modules: frontend/package.json
+	npm --prefix frontend ci

-$(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
-	cd core && ARCH=$(ARCH) ./build-prod.sh
-	touch $(BINS)
+frontend/dist/ui: $(FRONTEND_UI_SRC) $(FRONTEND_SHARED_SRC) $(ENVIRONMENT_FILE)
+	npm --prefix frontend run build:ui

-web/node_modules: web/package.json
-	npm --prefix web ci
+frontend/dist/setup-wizard: $(FRONTEND_SETUP_WIZARD_SRC) $(FRONTEND_SHARED_SRC) $(ENVIRONMENT_FILE)
+	npm --prefix frontend run build:setup

-web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC)
-	npm --prefix web run build:ui
+frontend/dist/diagnostic-ui: $(FRONTEND_DIAGNOSTIC_UI_SRC) $(FRONTEND_SHARED_SRC) $(ENVIRONMENT_FILE)
+	npm --prefix frontend run build:dui

-web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC)
-	npm --prefix web run build:setup
+frontend/dist/install-wizard: $(FRONTEND_INSTALL_WIZARD_SRC) $(FRONTEND_SHARED_SRC) $(ENVIRONMENT_FILE)
+	npm --prefix frontend run build:install-wiz

-web/dist/raw/diagnostic-ui: $(WEB_DIAGNOSTIC_UI_SRC) $(WEB_SHARED_SRC)
-	npm --prefix web run build:dui
+frontend/config.json: $(GIT_HASH_FILE) frontend/config-sample.json
+	jq '.useMocks = false' frontend/config-sample.json > frontend/config.json
+	jq '.packageArch = "$(ARCH)"' frontend/config.json > frontend/config.json.tmp
+	jq '.osArch = "$(OS_ARCH)"' frontend/config.json.tmp > frontend/config.json
+	rm frontend/config.json.tmp
+	npm --prefix frontend run-script build-config

-web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC)
-	npm --prefix web run build:install-wiz
-
-web/dist/static: $(WEB_UIS) $(ENVIRONMENT_FILE)
-	./compress-uis.sh
-
-web/config.json: $(GIT_HASH_FILE) web/config-sample.json
-	jq '.useMocks = false' web/config-sample.json | jq '.gitHash = "$(shell cat GIT_HASH.txt)"' > web/config.json
-
-web/patchdb-ui-seed.json: web/package.json
-	jq '."ack-welcome" = $(shell jq '.version' web/package.json)' web/patchdb-ui-seed.json > ui-seed.tmp
-	mv ui-seed.tmp web/patchdb-ui-seed.json
+frontend/patchdb-ui-seed.json: frontend/package.json
+	jq '."ack-welcome" = "$(shell yq '.version' frontend/package.json)"' frontend/patchdb-ui-seed.json > ui-seed.tmp
+	mv ui-seed.tmp frontend/patchdb-ui-seed.json

 patch-db/client/node_modules: patch-db/client/package.json
 	npm --prefix patch-db/client ci

 patch-db/client/dist: $(PATCH_DB_CLIENT_SRC) patch-db/client/node_modules
 	! test -d patch-db/client/dist || rm -rf patch-db/client/dist
-	npm --prefix web run build:deps
+	npm --prefix frontend run build:deps

 # used by github actions
-compiled-$(ARCH).tar: $(COMPILED_TARGETS) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE)
+backend-$(ARCH).tar: $(EMBASSY_BINS)
 	tar -cvf $@ $^

-# this is a convenience step to build all web uis - it is not referenced elsewhere in this file
-uis: $(WEB_UIS) 
+# this is a convenience step to build all frontends - it is not referenced elsewhere in this file
+frontends: $(EMBASSY_UIS) 

 # this is a convenience step to build the UI
-ui: web/dist/raw/ui
+ui: frontend/dist/ui
+
+# used by github actions
+backend: $(EMBASSY_BINS)
+
+cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast:
+	./build-cargo-dep.sh nc-broadcast

 cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep:
-	ARCH=aarch64 ./build-cargo-dep.sh pi-beep
-
-cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console:
-	ARCH=$(ARCH) ./build-cargo-dep.sh tokio-console
+	./build-cargo-dep.sh pi-beep
--- a/README.md
+++ b/README.md
@@ -1,82 +1,51 @@
-<div align="center">
-  <img src="web/projects/shared/assets/img/icon.png" alt="StartOS Logo" width="16%" />
-  <h1 style="margin-top: 0;">StartOS</h1>
-  <a href="https://github.com/Start9Labs/start-os/releases">
-    <img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/start9labs/start-os?logo=github">
-  </a>
-  <a href="https://github.com/Start9Labs/start-os/actions/workflows/startos-iso.yaml">
-    <img src="https://github.com/Start9Labs/start-os/actions/workflows/startos-iso.yaml/badge.svg">
-  </a>
-    <a href="https://heyapollo.com/product/startos">
-    <img alt="Static Badge" src="https://img.shields.io/badge/apollo-review%20%E2%AD%90%E2%AD%90%E2%AD%90%E2%AD%90%E2%AD%90%20-slateblue">
-  </a>
-  <a href="https://twitter.com/start9labs">
-    <img alt="X (formerly Twitter) Follow" src="https://img.shields.io/twitter/follow/start9labs">
-  </a>
-  <a href="https://matrix.to/#/#community:matrix.start9labs.com">
-    <img alt="Static Badge" src="https://img.shields.io/badge/community-matrix-yellow?logo=matrix">
-  </a>
-  <a href="https://t.me/start9_labs">
-    <img alt="Static Badge" src="https://img.shields.io/badge/community-telegram-blue?logo=telegram">
-  </a>
-  <a href="https://docs.start9.com">
-    <img alt="Static Badge" src="https://img.shields.io/badge/docs-orange?label=%F0%9F%91%A4%20support">
-  </a>
-  <a href="https://matrix.to/#/#community-dev:matrix.start9labs.com">
-    <img alt="Static Badge" src="https://img.shields.io/badge/developer-matrix-darkcyan?logo=matrix">
-  </a>
-  <a href="https://start9.com">
-    <img alt="Website" src="https://img.shields.io/website?up_message=online&down_message=offline&url=https%3A%2F%2Fstart9.com&logo=website&label=%F0%9F%8C%90%20website">
-  </a>
-</div>
-<br />
-<div align="center">
-  <h3>
-    Welcome to the era of Sovereign Computing
-  </h3>
-  <p>
-    StartOS is an open source Linux distribution optimized for running a personal server. It facilitates the discovery, installation, network configuration, service configuration, data backup, dependency management, and health monitoring of self-hosted software services.
-  </p>
-</div>
-<br />
-<p align="center">
-<img src="assets/StartOS.png" alt="StartOS" width="85%">
-</p>
-<br />
+# embassyOS
+[![version](https://img.shields.io/github/v/tag/Start9Labs/embassy-os?color=success)](https://github.com/Start9Labs/embassy-os/releases)
+[![build](https://github.com/Start9Labs/embassy-os/actions/workflows/product.yaml/badge.svg)](https://github.com/Start9Labs/embassy-os/actions/workflows/product.yaml)
+[![community](https://img.shields.io/badge/community-matrix-yellow)](https://matrix.to/#/#community:matrix.start9labs.com)
+[![community](https://img.shields.io/badge/community-telegram-informational)](https://t.me/start9_labs)
+[![support](https://img.shields.io/badge/support-docs-important)](https://docs.start9.com)
+[![developer](https://img.shields.io/badge/developer-matrix-blueviolet)](https://matrix.to/#/#community-dev:matrix.start9labs.com)
+[![website](https://img.shields.io/website?down_color=lightgrey&down_message=offline&up_color=green&up_message=online&url=https%3A%2F%2Fstart9.com)](https://start9.com)

-## Running StartOS
-> [!WARNING]
-> StartOS is in beta. It lacks features. It doesn't always work perfectly. Start9 servers are not plug and play. Using them properly requires some effort and patience. Please do not use StartOS or purchase a server if you are unable or unwilling to follow instructions and learn new concepts.
+[![mastodon](https://img.shields.io/mastodon/follow/000000001?domain=https%3A%2F%2Fmastodon.start9labs.com&label=Follow&style=social)](http://mastodon.start9labs.com)
+[![twitter](https://img.shields.io/twitter/follow/start9labs?label=Follow)](https://twitter.com/start9labs)

-### 💰 Buy a Start9 server
-This is the most convenient option. Simply [buy a server](https://store.start9.com) from Start9 and plug it in.
+### _Welcome to the era of Sovereign Computing_ ###

-### 👷 Build your own server
-This option is easier than you might imagine, and there are 4 reasons why you might prefer it:
-1. You already have hardware
-1. You want to save on shipping costs
-1. You prefer not to divulge your physical address
-1. You just like building things
+embassyOS is a browser-based, graphical operating system for a personal server. embassyOS facilitates the discovery, installation, network configuration, service configuration, data backup, dependency management, and health monitoring of self-hosted software services. It is the most advanced, secure, reliable, and user friendly personal server OS in the world.
+
+## Running embassyOS
+There are multiple ways to get your hands on embassyOS.
+
+### :moneybag: Buy an Embassy
+This is the most convenient option. Simply [buy an Embassy](https://start9.com) from Start9 and plug it in. Depending on where you live, shipping costs and import duties will vary.
+
+### :construction_worker: Build your own Embassy
+While not as convenient as buying an Embassy, this option is easier than you might imagine, and there are 4 reasons why you might prefer it:
+1. You already have your own hardware.
+1. You want to save on shipping costs.
+1. You prefer not to divulge your physical address.
+1. You just like building things.

 To pursue this option, follow one of our [DIY guides](https://start9.com/latest/diy).

-## ❤️ Contributing
-There are multiple ways to contribute: work directly on StartOS, package a service for the marketplace, or help with documentation and guides. To learn more about contributing, see [here](https://start9.com/contribute/).
+### :hammer_and_wrench: Build embassyOS from Source

-To report security issues, please email our security team - security@start9.com.
+embassyOS can be built from source, for personal use, for free.
+A detailed guide for doing so can be found [here](https://github.com/Start9Labs/embassy-os/blob/master/build/README.md).

-## 🌎 Marketplace
-There are dozens of services available for StartOS, and new ones are being added all the time. Check out the full list of available services [here](https://marketplace.start9.com/marketplace). To read more about the Marketplace ecosystem, check out this [blog post](https://blog.start9.com/start9-marketplace-strategy/)
-
-## 🖥️ User Interface Screenshots
+## :heart: Contributing
+There are multiple ways to contribute: work directly on embassyOS, package a service for the marketplace, or help with documentation and guides. To learn more about contributing, see [here](https://docs.start9.com/latest/contribute/) or [here](https://github.com/Start9Labs/embassy-os/blob/master/CONTRIBUTING.md).

+## UI Screenshots
 <p align="center">
-<img src="assets/registry.png" alt="StartOS Marketplace" width="49%">
-<img src="assets/community.png" alt="StartOS Community Registry" width="49%">
-<img src="assets/c-lightning.png" alt="StartOS NextCloud Service" width="49%">
-<img src="assets/btcpay.png" alt="StartOS BTCPay Service" width="49%">
-<img src="assets/nextcloud.png" alt="StartOS System Settings" width="49%">
-<img src="assets/system.png" alt="StartOS System Settings" width="49%">
-<img src="assets/welcome.png" alt="StartOS System Settings" width="49%">
-<img src="assets/logs.png" alt="StartOS System Settings" width="49%">
+<img src="assets/embassyOS.png" alt="embassyOS" width="85%">
+</p>
+<p align="center">
+<img src="assets/eOS-preferences.png" alt="Embassy Preferences" width="49%">
+<img src="assets/eOS-ghost.png" alt="Embassy Ghost Service" width="49%">
+</p>
+<p align="center">
+<img src="assets/eOS-synapse-health-check.png" alt="Embassy Synapse Health Checks" width="49%">
+<img src="assets/eOS-sideload.png" alt="Embassy Sideload Service" width="49%">
 </p>
--- a/assets/StartOS.png
+++ b/assets/StartOS.png
--- a/assets/btcpay.png
+++ b/assets/btcpay.png
--- a/assets/c-lightning.png
+++ b/assets/c-lightning.png
--- a/assets/community.png
+++ b/assets/community.png
--- a/assets/eOS-ghost.png
+++ b/assets/eOS-ghost.png
--- a/assets/eOS-preferences.png
+++ b/assets/eOS-preferences.png
--- a/assets/eOS-sideload.png
+++ b/assets/eOS-sideload.png
--- a/assets/eOS-synapse-health-check.png
+++ b/assets/eOS-synapse-health-check.png
--- a/assets/embassyOS.png
+++ b/assets/embassyOS.png
--- a/assets/logs.png
+++ b/assets/logs.png
--- a/assets/nextcloud.png
+++ b/assets/nextcloud.png
--- a/assets/registry.png
+++ b/assets/registry.png
--- a/assets/system.png
+++ b/assets/system.png
--- a/assets/welcome.png
+++ b/assets/welcome.png
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -7,4 +7,4 @@ secrets.db
 *.sqlite3
 .env
 .editorconfig
-proptest-regressions/**/*
+proptest-regressions/*
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -0,0 +1,174 @@
+[package]
+authors = ["Aiden McClelland <me@drbonez.dev>"]
+description = "The core of the Start9 Embassy Operating System"
+documentation = "https://docs.rs/embassy-os"
+edition = "2021"
+keywords = [
+  "self-hosted",
+  "raspberry-pi",
+  "privacy",
+  "bitcoin",
+  "full-node",
+  "lightning",
+]
+name = "embassy-os"
+readme = "README.md"
+repository = "https://github.com/Start9Labs/embassy-os"
+version = "0.3.4"
+
+[lib]
+name = "embassy"
+path = "src/lib.rs"
+
+[[bin]]
+name = "embassyd"
+path = "src/bin/embassyd.rs"
+
+[[bin]]
+name = "embassy-init"
+path = "src/bin/embassy-init.rs"
+
+[[bin]]
+name = "embassy-sdk"
+path = "src/bin/embassy-sdk.rs"
+
+[[bin]]
+name = "embassy-cli"
+path = "src/bin/embassy-cli.rs"
+
+[[bin]]
+name = "avahi-alias"
+path = "src/bin/avahi-alias.rs"
+
+[features]
+avahi = ["avahi-sys"]
+default = ["avahi", "js_engine"]
+dev = []
+unstable = ["patch-db/unstable"]
+
+[dependencies]
+aes = { version = "0.7.5", features = ["ctr"] }
+async-compression = { version = "0.3.15", features = [
+  "gzip",
+  "brotli",
+  "tokio",
+] }
+async-stream = "0.3.3"
+async-trait = "0.1.56"
+avahi-sys = { git = "https://github.com/Start9Labs/avahi-sys", version = "0.10.0", branch = "feature/dynamic-linking", features = [
+  "dynamic",
+], optional = true }
+base32 = "0.4.0"
+base64 = "0.13.0"
+base64ct = "1.5.1"
+basic-cookies = "0.1.4"
+bollard = "0.13.0"
+bytes = "1"
+chrono = { version = "0.4.19", features = ["serde"] }
+clap = "3.2.8"
+color-eyre = "0.6.1"
+cookie = "0.16.2"
+cookie_store = "0.19.0"
+current_platform = "0.2.0"
+digest = "0.10.3"
+digest-old = { package = "digest", version = "0.9.0" }
+divrem = "1.0.0"
+ed25519 = { version = "1.5.2", features = ["pkcs8", "pem", "alloc"] }
+ed25519-dalek = { version = "1.0.1", features = ["serde"] }
+emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
+  "serde",
+] }
+fd-lock-rs = "0.1.4"
+futures = "0.3.21"
+git-version = "0.3.5"
+gpt = "3.0.0"
+helpers = { path = "../libs/helpers" }
+embassy_container_init = { path = "../libs/embassy_container_init" }
+hex = "0.4.3"
+hmac = "0.12.1"
+http = "0.2.8"
+hyper = { version = "0.14.20", features = ["full"] }
+hyper-ws-listener = "0.2.0"
+imbl = "2.0.0"
+indexmap = { version = "1.9.1", features = ["serde"] }
+ipnet = { version = "2.7.1", features = ["serde"] }
+iprange = { version = "0.6.7", features = ["serde"] }
+isocountry = "0.3.2"
+itertools = "0.10.3"
+josekit = "0.8.1"
+js_engine = { path = '../libs/js_engine', optional = true }
+jsonpath_lib = "0.3.0"
+lazy_static = "1.4.0"
+libc = "0.2.126"
+log = "0.4.17"
+mbrman = "0.5.0"
+models = { version = "*", path = "../libs/models" }
+nix = "0.25.0"
+nom = "7.1.1"
+num = "0.4.0"
+num_enum = "0.5.7"
+openssh-keys = "0.5.0"
+openssl = { version = "0.10.41", features = ["vendored"] }
+patch-db = { version = "*", path = "../patch-db/patch-db", features = [
+  "trace",
+] }
+p256 = { version = "0.12.0", features = ["pem"] }
+pbkdf2 = "0.11.0"
+pin-project = "1.0.11"
+pkcs8 = { version = "0.9.0", features = ["std"] }
+prettytable-rs = "0.10.0"
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+rand = { version = "0.8.5", features = ["std"] }
+rand-old = { package = "rand", version = "0.7.3" }
+regex = "1.6.0"
+reqwest = { version = "0.11.11", features = ["stream", "json", "socks"] }
+reqwest_cookie_store = "0.5.0"
+rpassword = "7.0.0"
+rpc-toolkit = "0.2.2"
+rust-argon2 = "1.0.0"
+scopeguard = "1.1" # because avahi-sys fucks your shit up
+serde = { version = "1.0.139", features = ["derive", "rc"] }
+serde_cbor = { package = "ciborium", version = "0.2.0" }
+serde_json = "1.0.82"
+serde_toml = { package = "toml", version = "0.5.9" }
+serde_with = { version = "2.0.1", features = ["macros", "json"] }
+serde_yaml = "0.9.11"
+sha2 = "0.10.2"
+sha2-old = { package = "sha2", version = "0.9.9" }
+simple-logging = "2.0.2"
+sqlx = { version = "0.6.0", features = [
+  "chrono",
+  "offline",
+  "runtime-tokio-rustls",
+  "postgres",
+] }
+ssh-key = { version = "0.5.1", features = ["ed25519"] }
+stderrlog = "0.5.3"
+tar = "0.4.38"
+thiserror = "1.0.31"
+tokio = { version = "1.23", features = ["full"] }
+tokio-stream = { version = "0.1.11", features = ["io-util", "sync", "net"] }
+tokio-tar = { git = "https://github.com/dr-bonez/tokio-tar.git" }
+tokio-tungstenite = { version = "0.17.1", features = ["native-tls"] }
+tokio-rustls = "0.23.4"
+tokio-util = { version = "0.7.3", features = ["io"] }
+torut = "0.2.1"
+tracing = "0.1.35"
+tracing-error = "0.2.0"
+tracing-futures = "0.2.5"
+tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
+trust-dns-server = "0.22.0"
+typed-builder = "0.10.0"
+url = { version = "2.2.2", features = ["serde"] }
+uuid = { version = "1.1.2", features = ["v4"] }
+zeroize = "1.5.7"
+
+[profile.test]
+opt-level = 3
+
+[profile.dev.package.backtrace]
+opt-level = 3
+
+[profile.dev.package.sqlx-macros]
+opt-level = 3
--- a/backend/README.md
+++ b/backend/README.md
@@ -0,0 +1,42 @@
+# embassyOS Backend
+
+- Requirements:
+  - [Install Rust](https://rustup.rs)
+  - Recommended: [rust-analyzer](https://rust-analyzer.github.io/)
+  - [Docker](https://docs.docker.com/get-docker/)
+  - [Rust ARM64 Build Container](https://github.com/Start9Labs/rust-arm-builder)
+- Scripts (run withing the `./backend` directory)
+  - `build-prod.sh` - compiles a release build of the artifacts for running on
+    ARM64
+- A Linux computer or VM
+
+## Structure
+
+The embassyOS backend is broken up into 4 different binaries:
+
+- embassyd: This is the main workhorse of embassyOS - any new functionality you
+  want will likely go here
+- embassy-init: This is the component responsible for allowing you to set up
+  your device, and handles system initialization on startup
+- embassy-cli: This is a CLI tool that will allow you to issue commands to
+  embassyd and control it similarly to the UI
+- embassy-sdk: This is a CLI tool that aids in building and packaging services
+  you wish to deploy to the Embassy
+
+Finally there is a library `embassy` that supports all four of these tools.
+
+See [here](/backend/Cargo.toml) for details.
+
+## Building
+
+You can build the entire operating system image using `make` from the root of
+the embassyOS project. This will subsequently invoke the build scripts above to
+actually create the requisite binaries and put them onto the final operating
+system image.
+
+## Questions
+
+If you have questions about how various pieces of the backend system work. Open
+an issue and tag the following people
+
+- dr-bonez
--- a/backend/build-dev.sh
+++ b/backend/build-dev.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ "$0" != "./build-dev.sh" ]; then
+	>&2 echo "Must be run from backend directory"
+	exit 1
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+alias 'rust-arm64-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64'
+
+cd ..
+rust-arm64-builder sh -c "(cd backend && cargo build --locked)"
+cd backend
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
+#rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd
--- a/backend/build-portable-dev.sh
+++ b/backend/build-portable-dev.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ "$0" != "./build-portable-dev.sh" ]; then
+	>&2 echo "Must be run from backend directory"
+	exit 1
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl'
+
+cd ..
+rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features --locked)"
+cd backend
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
--- a/backend/build-portable.sh
+++ b/backend/build-portable.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ "$0" != "./build-portable.sh" ]; then
+	>&2 echo "Must be run from backend directory"
+	exit 1
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl'
+
+cd ..
+rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features --locked)"
+cd backend
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
--- a/backend/build-prod.sh
+++ b/backend/build-prod.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+if [ "$0" != "./build-prod.sh" ]; then
+	>&2 echo "Must be run from backend directory"
+	exit 1
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+alias 'rust-gnu-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P start9/rust-arm-cross:aarch64'
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+cd ..
+FLAGS=""
+if [[ "$ENVIRONMENT" =~ (^|-)unstable($|-) ]]; then
+	FLAGS="unstable,$FLAGS"
+fi
+if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then
+	FLAGS="dev,$FLAGS"
+fi
+
+set +e
+fail=
+if [[ "$FLAGS" = "" ]]; then
+	rust-gnu-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --locked  --target=$ARCH-unknown-linux-gnu)"
+	if test $? -ne 0; then 
+		fail=true
+	fi
+	for ARCH in x86_64 aarch64
+	do
+		rust-musl-builder sh -c "(git config --global --add safe.directory '*'; cd libs && cargo build --release --locked --bin embassy_container_init )"
+		if test $? -ne 0; then 
+			fail=true
+		fi
+	done
+else
+	echo "FLAGS=$FLAGS"
+	rust-gnu-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --features $FLAGS --locked --target=$ARCH-unknown-linux-gnu)"
+	if test $? -ne 0; then 
+		fail=true
+	fi
+	for ARCH in x86_64 aarch64
+	do
+		rust-musl-builder sh -c "(git config --global --add safe.directory '*'; cd libs && cargo build --release --features $FLAGS --locked --bin embassy_container_init)"
+		if test $? -ne 0; then 
+			fail=true
+		fi
+	done
+fi
+set -e
+cd backend
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
+sudo chown -R $USER ../libs/target
+
+if [ -n "$fail" ]; then
+	exit 1
+fi
+
+#rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd
--- a/core/startos/deny.toml
+++ b/core/startos/deny.toml
--- a/backend/embassy-init.service
+++ b/backend/embassy-init.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Embassy Init
+After=network-online.target
+Requires=network-online.target
+Wants=avahi-daemon.service
+
+[Service]
+Type=oneshot
+Environment=RUST_LOG=embassy_init=debug,embassy=debug,js_engine=debug,patch_db=warn
+ExecStart=/usr/bin/embassy-init
+RemainAfterExit=true
+StandardOutput=append:/var/log/embassy-init.log
+
+[Install]
+WantedBy=embassyd.service
--- a/backend/embassyd.service
+++ b/backend/embassyd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Embassy Daemon
+After=embassy-init.service
+Requires=embassy-init.service
+
+[Service]
+Type=simple
+Environment=RUST_LOG=embassyd=debug,embassy=debug,js_engine=debug,patch_db=warn
+ExecStart=/usr/bin/embassyd
+Restart=always
+RestartSec=3
+ManagedOOMPreference=avoid
+CPUAccounting=true
+CPUWeight=1000
+
+[Install]
+WantedBy=multi-user.target
--- a/backend/install-sdk.sh
+++ b/backend/install-sdk.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ "$0" != "./install-sdk.sh" ]; then
+	>&2 echo "Must be run from backend directory"
+	exit 1
+fi
+
+cargo install --bin=embassy-sdk --bin=embassy-cli --path=. --no-default-features --features=js_engine --locked
--- a/core/startos/migrations/20210629193146_Init.sql
+++ b/core/startos/migrations/20210629193146_Init.sql
--- a/core/startos/migrations/20230118185232_NetworkKeys.sql
+++ b/core/startos/migrations/20230118185232_NetworkKeys.sql
--- a/backend/rustfmt.toml
+++ b/backend/rustfmt.toml
--- a/backend/sqlx-data.json
+++ b/backend/sqlx-data.json
@@ -0,0 +1,744 @@
+{
+  "db": "PostgreSQL",
+  "1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING"
+  },
+  "21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "DELETE FROM ssh_keys WHERE fingerprint = $1"
+  },
+  "28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec": {
+    "describe": {
+      "columns": [
+        {
+          "name": "hostname",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "path",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "username",
+          "ordinal": 2,
+          "type_info": "Text"
+        },
+        {
+          "name": "password",
+          "ordinal": 3,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "SELECT hostname, path, username, password FROM cifs_shares WHERE id = $1"
+  },
+  "4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997": {
+    "describe": {
+      "columns": [
+        {
+          "name": "fingerprint",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "openssh_pubkey",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 2,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT * FROM ssh_keys WHERE fingerprint = $1"
+  },
+  "4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "logged_in",
+          "ordinal": 1,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "logged_out",
+          "ordinal": 2,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "last_active",
+          "ordinal": 3,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "user_agent",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "metadata",
+          "ordinal": 5,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        true,
+        false,
+        true,
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT * FROM session WHERE logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP"
+  },
+  "4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = $1"
+  },
+  "629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a": {
+    "describe": {
+      "columns": [
+        {
+          "name": "password",
+          "ordinal": 0,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT password FROM account"
+  },
+  "687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d": {
+    "describe": {
+      "columns": [
+        {
+          "name": "key",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT key FROM tor WHERE package = $1 AND interface = $2"
+  },
+  "6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "UPDATE session SET last_active = CURRENT_TIMESTAMP WHERE id = $1 AND logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP"
+  },
+  "770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0": {
+    "describe": {
+      "columns": [
+        {
+          "name": "key",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO UPDATE SET package = EXCLUDED.package RETURNING key"
+  },
+  "7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        },
+        {
+          "name": "package_id",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 2,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "code",
+          "ordinal": 3,
+          "type_info": "Int4"
+        },
+        {
+          "name": "level",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "title",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "message",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "data",
+          "ordinal": 7,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        true,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications WHERE id < $1 ORDER BY id DESC LIMIT $2"
+  },
+  "7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Text",
+          "Bytea",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n            INSERT INTO account (\n                id,\n                server_id,\n                hostname,\n                password,\n                network_key,\n                root_ca_key_pem,\n                root_ca_cert_pem\n            ) VALUES (\n                0, $1, $2, $3, $4, $5, $6\n            ) ON CONFLICT (id) DO UPDATE SET\n                server_id = EXCLUDED.server_id,\n                hostname = EXCLUDED.hostname,\n                password = EXCLUDED.password,\n                network_key = EXCLUDED.network_key,\n                root_ca_key_pem = EXCLUDED.root_ca_key_pem,\n                root_ca_cert_pem = EXCLUDED.root_ca_cert_pem\n            "
+  },
+  "7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "DELETE FROM tor WHERE package = $1"
+  },
+  "8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO tor (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING"
+  },
+  "94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        },
+        {
+          "name": "package_id",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 2,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "code",
+          "ordinal": 3,
+          "type_info": "Int4"
+        },
+        {
+          "name": "level",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "title",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "message",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "data",
+          "ordinal": 7,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        true,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications ORDER BY id DESC LIMIT $1"
+  },
+  "95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        },
+        {
+          "name": "hostname",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "path",
+          "ordinal": 2,
+          "type_info": "Text"
+        },
+        {
+          "name": "username",
+          "ordinal": 3,
+          "type_info": "Text"
+        },
+        {
+          "name": "password",
+          "ordinal": 4,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        true
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT id, hostname, path, username, password FROM cifs_shares"
+  },
+  "a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "DELETE FROM cifs_shares WHERE id = $1"
+  },
+  "a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e": {
+    "describe": {
+      "columns": [
+        {
+          "name": "fingerprint",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "openssh_pubkey",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 2,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT fingerprint, openssh_pubkey, created_at FROM ssh_keys"
+  },
+  "b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Text",
+          "Text",
+          "Int4"
+        ]
+      }
+    },
+    "query": "UPDATE cifs_shares SET hostname = $1, path = $2, username = $3, password = $4 WHERE id = $5"
+  },
+  "d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca": {
+    "describe": {
+      "columns": [
+        {
+          "name": "openssh_pubkey",
+          "ordinal": 0,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT openssh_pubkey FROM ssh_keys"
+  },
+  "da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Int4",
+          "Text",
+          "Text",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO notifications (package_id, code, level, title, message, data) VALUES ($1, $2, $3, $4, $5, $6)"
+  },
+  "e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "DELETE FROM notifications WHERE id = $1"
+  },
+  "e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0": {
+    "describe": {
+      "columns": [
+        {
+          "name": "tor_key",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        true
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT tor_key FROM account WHERE id = 0"
+  },
+  "e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO session (id, user_agent, metadata) VALUES ($1, $2, $3)"
+  },
+  "e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed": {
+    "describe": {
+      "columns": [
+        {
+          "name": "package",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "interface",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "key",
+          "ordinal": 2,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "tor_key?",
+          "ordinal": 3,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                SELECT\n                    network_keys.package,\n                    network_keys.interface,\n                    network_keys.key,\n                    tor.key AS \"tor_key?\"\n                FROM\n                    network_keys\n                LEFT JOIN\n                    tor\n                ON\n                    network_keys.package = tor.package\n                AND\n                    network_keys.interface = tor.interface\n                WHERE\n                    network_keys.package = $1\n            "
+  },
+  "eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "DELETE FROM notifications WHERE id < $1"
+  },
+  "ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO cifs_shares (hostname, path, username, password) VALUES ($1, $2, $3, $4) RETURNING id"
+  },
+  "f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO ssh_keys (fingerprint, openssh_pubkey, created_at) VALUES ($1, $2, $3)"
+  },
+  "f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5": {
+    "describe": {
+      "columns": [
+        {
+          "name": "network_key",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT network_key FROM account WHERE id = 0"
+  },
+  "fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        },
+        {
+          "name": "password",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "tor_key",
+          "ordinal": 2,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "server_id",
+          "ordinal": 3,
+          "type_info": "Text"
+        },
+        {
+          "name": "hostname",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "network_key",
+          "ordinal": 5,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "root_ca_key_pem",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "root_ca_cert_pem",
+          "ordinal": 7,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        true,
+        true,
+        true,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT * FROM account WHERE id = 0"
+  }
+}
--- a/core/startos/src/account.rs
+++ b/core/startos/src/account.rs
@@ -1,6 +1,5 @@
-use std::time::SystemTime;
-
-use ed25519_dalek::SecretKey;
+use ed25519_dalek::{ExpandedSecretKey, SecretKey};
+use models::ResultExt;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
 use sqlx::PgExecutor;
@@ -8,14 +7,13 @@ use sqlx::PgExecutor;
 use crate::hostname::{generate_hostname, generate_id, Hostname};
 use crate::net::keys::Key;
 use crate::net::ssl::{generate_key, make_root_cert};
-use crate::prelude::*;
-use crate::util::crypto::ed25519_expand_key;
+use crate::Error;

 fn hash_password(password: &str) -> Result<String, Error> {
    argon2::hash_encoded(
        password.as_bytes(),
        &rand::random::<[u8; 16]>()[..],
-        &argon2::Config::rfc9106_low_mem(),
+        &argon2::Config::default(),
    )
    .with_kind(crate::ErrorKind::PasswordHashGeneration)
 }
@@ -30,11 +28,11 @@ pub struct AccountInfo {
    pub root_ca_cert: X509,
 }
 impl AccountInfo {
-    pub fn new(password: &str, start_time: SystemTime) -> Result<Self, Error> {
+    pub fn new(password: &str) -> Result<Self, Error> {
        let server_id = generate_id();
        let hostname = generate_hostname();
        let root_ca_key = generate_key()?;
-        let root_ca_cert = make_root_cert(&root_ca_key, &hostname, start_time)?;
+        let root_ca_cert = make_root_cert(&root_ca_key, &hostname)?;
        Ok(Self {
            server_id,
            hostname,
@@ -53,23 +51,13 @@ impl AccountInfo {
        let server_id = r.server_id.unwrap_or_else(generate_id);
        let hostname = r.hostname.map(Hostname).unwrap_or_else(generate_hostname);
        let password = r.password;
-        let network_key = SecretKey::try_from(r.network_key).map_err(|e| {
-            Error::new(
-                eyre!("expected vec of len 32, got len {}", e.len()),
-                ErrorKind::ParseDbField,
-            )
-        })?;
+        let network_key = SecretKey::from_bytes(&r.network_key)?;
        let tor_key = if let Some(k) = &r.tor_key {
-            <[u8; 64]>::try_from(&k[..]).map_err(|_| {
-                Error::new(
-                    eyre!("expected vec of len 64, got len {}", k.len()),
-                    ErrorKind::ParseDbField,
-                )
-            })?
+            ExpandedSecretKey::from_bytes(k)?
        } else {
-            ed25519_expand_key(&network_key)
+            ExpandedSecretKey::from(&network_key)
        };
-        let key = Key::from_pair(None, network_key, tor_key);
+        let key = Key::from_pair(None, network_key.to_bytes(), tor_key.to_bytes());
        let root_ca_key = PKey::private_key_from_pem(r.root_ca_key_pem.as_bytes())?;
        let root_ca_cert = X509::from_pem(r.root_ca_cert_pem.as_bytes())?;

--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -11,7 +11,6 @@ use tracing::instrument;

 use crate::config::{Config, ConfigSpec};
 use crate::context::RpcContext;
-use crate::prelude::*;
 use crate::procedure::docker::DockerContainers;
 use crate::procedure::{PackageProcedure, ProcedureName};
 use crate::s9pk::manifest::PackageId;
@@ -57,16 +56,16 @@ pub struct Action {
    pub input_spec: ConfigSpec,
 }
 impl Action {
-    #[instrument(skip_all)]
+    #[instrument]
    pub fn validate(
        &self,
-        _container: &Option<DockerContainers>,
+        container: &Option<DockerContainers>,
        eos_version: &Version,
        volumes: &Volumes,
        image_ids: &BTreeSet<ImageId>,
    ) -> Result<(), Error> {
        self.implementation
-            .validate(eos_version, volumes, image_ids, true)
+            .validate(container, eos_version, volumes, image_ids, true)
            .with_ctx(|_| {
                (
                    crate::ErrorKind::ValidateS9pk,
@@ -75,7 +74,7 @@ impl Action {
            })
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(ctx))]
    pub async fn execute(
        &self,
        ctx: &RpcContext,
@@ -121,7 +120,7 @@ fn display_action_result(action_result: ActionResult, matches: &ArgMatches) {
 }

 #[command(about = "Executes an action", display(display_action_result))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn action(
    #[context] ctx: RpcContext,
    #[arg(rename = "id")] pkg_id: PackageId,
@@ -131,17 +130,18 @@ pub async fn action(
    #[arg(long = "format")]
    format: Option<IoFormat>,
 ) -> Result<ActionResult, Error> {
-    let manifest = ctx
-        .db
-        .peek()
+    let mut db = ctx.db.handle();
+    let manifest = crate::db::DatabaseModel::new()
+        .package_data()
+        .idx_model(&pkg_id)
+        .and_then(|p| p.installed())
+        .expect(&mut db)
        .await
-        .as_package_data()
-        .as_idx(&pkg_id)
-        .or_not_found(&pkg_id)?
-        .as_installed()
-        .or_not_found(&pkg_id)?
-        .as_manifest()
-        .de()?;
+        .with_kind(crate::ErrorKind::NotFound)?
+        .manifest()
+        .get(&mut db)
+        .await?
+        .to_owned();

    if let Some(action) = manifest.actions.0.get(&action_id) {
        action
--- a/core/startos/src/assets/adjectives.txt
+++ b/core/startos/src/assets/adjectives.txt
--- a/core/startos/src/assets/nouns.txt
+++ b/core/startos/src/assets/nouns.txt
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -5,6 +5,7 @@ use chrono::{DateTime, Utc};
 use clap::ArgMatches;
 use color_eyre::eyre::eyre;
 use josekit::jwk::Jwk;
+use patch_db::{DbHandle, LockReceipt};
 use rpc_toolkit::command;
 use rpc_toolkit::command_helpers::prelude::{RequestParts, ResponseParts};
 use rpc_toolkit::yajrc::RpcError;
@@ -16,7 +17,6 @@ use tracing::instrument;
 use crate::context::{CliContext, RpcContext};
 use crate::middleware::auth::{AsLogoutSessionId, HasLoggedOutSessions, HashSessionToken};
 use crate::middleware::encrypt::EncryptedWire;
-use crate::prelude::*;
 use crate::util::display_none;
 use crate::util::serde::{display_serializable, IoFormat};
 use crate::{ensure_code, Error, ResultExt};
@@ -84,13 +84,13 @@ fn gen_pwd() {
        argon2::hash_encoded(
            b"testing1234",
            &rand::random::<[u8; 16]>()[..],
-            &argon2::Config::rfc9106_low_mem()
+            &argon2::Config::default()
        )
        .unwrap()
    )
 }

-#[instrument(skip_all)]
+#[instrument(skip(ctx, password))]
 async fn cli_login(
    ctx: CliContext,
    password: Option<PasswordType>,
@@ -145,7 +145,7 @@ where
    display(display_none),
    metadata(authenticated = false)
 )]
-#[instrument(skip_all)]
+#[instrument(skip(ctx, password))]
 pub async fn login(
    #[context] ctx: RpcContext,
    #[request] req: &RequestParts,
@@ -160,7 +160,7 @@ pub async fn login(
 ) -> Result<(), Error> {
    let password = password.unwrap_or_default().decrypt(&ctx)?;
    let mut handle = ctx.secret_store.acquire().await?;
-    check_password_against_db(handle.as_mut(), &password).await?;
+    check_password_against_db(&mut handle, &password).await?;

    let hash_token = HashSessionToken::new();
    let user_agent = req.headers.get("user-agent").and_then(|h| h.to_str().ok());
@@ -172,7 +172,7 @@ pub async fn login(
        user_agent,
        metadata,
    )
-    .execute(handle.as_mut())
+    .execute(&mut handle)
    .await?;
    res.headers.insert(
        "set-cookie",
@@ -183,7 +183,7 @@ pub async fn login(
 }

 #[command(display(display_none), metadata(authenticated = false))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn logout(
    #[context] ctx: RpcContext,
    #[request] req: &RequestParts,
@@ -250,7 +250,7 @@ fn display_sessions(arg: SessionList, matches: &ArgMatches) {
 }

 #[command(display(display_sessions))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn list(
    #[context] ctx: RpcContext,
    #[request] req: &RequestParts,
@@ -263,7 +263,7 @@ pub async fn list(
        sessions: sqlx::query!(
            "SELECT * FROM session WHERE logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP"
        )
-        .fetch_all(ctx.secret_store.acquire().await?.as_mut())
+        .fetch_all(&mut ctx.secret_store.acquire().await?)
        .await?
        .into_iter()
        .map(|row| {
@@ -296,7 +296,7 @@ impl AsLogoutSessionId for KillSessionId {
 }

 #[command(display(display_none))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn kill(
    #[context] ctx: RpcContext,
    #[arg(parse(parse_comma_separated))] ids: Vec<String>,
@@ -305,7 +305,7 @@ pub async fn kill(
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(ctx, old_password, new_password))]
 async fn cli_reset_password(
    ctx: CliContext,
    old_password: Option<PasswordType>,
@@ -343,12 +343,33 @@ async fn cli_reset_password(
    Ok(())
 }

+pub struct SetPasswordReceipt(LockReceipt<String, ()>);
+impl SetPasswordReceipt {
+    pub async fn new<Db: DbHandle>(db: &mut Db) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        let password_hash = crate::db::DatabaseModel::new()
+            .server_info()
+            .password_hash()
+            .make_locker(patch_db::LockType::Write)
+            .add_to_keys(locks);
+        move |skeleton_key| Ok(Self(password_hash.verify(skeleton_key)?))
+    }
+}
+
 #[command(
    rename = "reset-password",
    custom_cli(cli_reset_password(async, context(CliContext))),
    display(display_none)
 )]
-#[instrument(skip_all)]
+#[instrument(skip(ctx, old_password, new_password))]
 pub async fn reset_password(
    #[context] ctx: RpcContext,
    #[arg(rename = "old-password")] old_password: Option<PasswordType>,
@@ -368,14 +389,13 @@ pub async fn reset_password(
    }
    account.set_password(&new_password)?;
    account.save(&ctx.secret_store).await?;
-    let account_password = &account.password;
-    ctx.db
-        .mutate(|d| {
-            d.as_server_info_mut()
-                .as_password_hash_mut()
-                .ser(account_password)
-        })
-        .await
+    crate::db::DatabaseModel::new()
+        .server_info()
+        .password_hash()
+        .put(&mut ctx.db.handle(), &account.password)
+        .await?;
+
+    Ok(())
 }

 #[command(
@@ -383,7 +403,7 @@ pub async fn reset_password(
    display(display_none),
    metadata(authenticated = false)
 )]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn get_pubkey(#[context] ctx: RpcContext) -> Result<Jwk, RpcError> {
    let secret = ctx.as_ref().clone();
    let pub_key = secret.to_public_key()?;
--- a/backend/src/backup/backup_bulk.rs
+++ b/backend/src/backup/backup_bulk.rs
@@ -0,0 +1,376 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::path::PathBuf;
+
+use chrono::Utc;
+use clap::ArgMatches;
+use color_eyre::eyre::eyre;
+use helpers::AtomicFile;
+use patch_db::{DbHandle, LockType, PatchDbHandle};
+use rpc_toolkit::command;
+use tokio::io::AsyncWriteExt;
+use tracing::instrument;
+
+use super::target::BackupTargetId;
+use super::PackageBackupReport;
+use crate::auth::check_password_against_db;
+use crate::backup::os::OsBackup;
+use crate::backup::{BackupReport, ServerBackupReport};
+use crate::context::RpcContext;
+use crate::db::model::BackupProgress;
+use crate::disk::mount::backup::BackupMountGuard;
+use crate::disk::mount::filesystem::ReadWrite;
+use crate::disk::mount::guard::TmpMountGuard;
+use crate::notifications::NotificationLevel;
+use crate::s9pk::manifest::PackageId;
+use crate::status::MainStatus;
+use crate::util::display_none;
+use crate::util::serde::IoFormat;
+use crate::version::VersionT;
+use crate::{Error, ErrorKind, ResultExt};
+
+fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<BTreeSet<PackageId>, Error> {
+    arg.split(',')
+        .map(|s| s.trim().parse().map_err(Error::from))
+        .collect()
+}
+
+#[command(rename = "create", display(display_none))]
+#[instrument(skip(ctx, old_password, password))]
+pub async fn backup_all(
+    #[context] ctx: RpcContext,
+    #[arg(rename = "target-id")] target_id: BackupTargetId,
+    #[arg(rename = "old-password", long = "old-password")] old_password: Option<
+        crate::auth::PasswordType,
+    >,
+    #[arg(
+        rename = "package-ids",
+        long = "package-ids",
+        parse(parse_comma_separated)
+    )]
+    package_ids: Option<BTreeSet<PackageId>>,
+    #[arg] password: crate::auth::PasswordType,
+) -> Result<(), Error> {
+    let mut db = ctx.db.handle();
+    let old_password_decrypted = old_password
+        .as_ref()
+        .unwrap_or(&password)
+        .clone()
+        .decrypt(&ctx)?;
+    let password = password.decrypt(&ctx)?;
+    check_password_against_db(&mut ctx.secret_store.acquire().await?, &password).await?;
+    let fs = target_id
+        .load(&mut ctx.secret_store.acquire().await?)
+        .await?;
+    let mut backup_guard = BackupMountGuard::mount(
+        TmpMountGuard::mount(&fs, ReadWrite).await?,
+        &old_password_decrypted,
+    )
+    .await?;
+    let all_packages = crate::db::DatabaseModel::new()
+        .package_data()
+        .get(&mut db)
+        .await?
+        .0
+        .keys()
+        .into_iter()
+        .cloned()
+        .collect();
+    let package_ids = package_ids.unwrap_or(all_packages);
+    if old_password.is_some() {
+        backup_guard.change_password(&password)?;
+    }
+    assure_backing_up(&mut db, &package_ids).await?;
+    tokio::task::spawn(async move {
+        let backup_res = perform_backup(&ctx, &mut db, backup_guard, &package_ids).await;
+        let backup_progress = crate::db::DatabaseModel::new()
+            .server_info()
+            .status_info()
+            .backup_progress();
+        backup_progress
+            .clone()
+            .lock(&mut db, LockType::Write)
+            .await
+            .expect("failed to lock server status");
+        match backup_res {
+            Ok(report) if report.iter().all(|(_, rep)| rep.error.is_none()) => ctx
+                .notification_manager
+                .notify(
+                    &mut db,
+                    None,
+                    NotificationLevel::Success,
+                    "Backup Complete".to_owned(),
+                    "Your backup has completed".to_owned(),
+                    BackupReport {
+                        server: ServerBackupReport {
+                            attempted: true,
+                            error: None,
+                        },
+                        packages: report,
+                    },
+                    None,
+                )
+                .await
+                .expect("failed to send notification"),
+            Ok(report) => ctx
+                .notification_manager
+                .notify(
+                    &mut db,
+                    None,
+                    NotificationLevel::Warning,
+                    "Backup Complete".to_owned(),
+                    "Your backup has completed, but some package(s) failed to backup".to_owned(),
+                    BackupReport {
+                        server: ServerBackupReport {
+                            attempted: true,
+                            error: None,
+                        },
+                        packages: report,
+                    },
+                    None,
+                )
+                .await
+                .expect("failed to send notification"),
+            Err(e) => {
+                tracing::error!("Backup Failed: {}", e);
+                tracing::debug!("{:?}", e);
+                ctx.notification_manager
+                    .notify(
+                        &mut db,
+                        None,
+                        NotificationLevel::Error,
+                        "Backup Failed".to_owned(),
+                        "Your backup failed to complete.".to_owned(),
+                        BackupReport {
+                            server: ServerBackupReport {
+                                attempted: true,
+                                error: Some(e.to_string()),
+                            },
+                            packages: BTreeMap::new(),
+                        },
+                        None,
+                    )
+                    .await
+                    .expect("failed to send notification");
+            }
+        }
+        backup_progress
+            .delete(&mut db)
+            .await
+            .expect("failed to change server status");
+    });
+    Ok(())
+}
+
+#[instrument(skip(db, packages))]
+async fn assure_backing_up(
+    db: &mut PatchDbHandle,
+    packages: impl IntoIterator<Item = &PackageId>,
+) -> Result<(), Error> {
+    let mut tx = db.begin().await?;
+    let mut backing_up = crate::db::DatabaseModel::new()
+        .server_info()
+        .status_info()
+        .backup_progress()
+        .get_mut(&mut tx)
+        .await?;
+
+    if backing_up
+        .iter()
+        .flat_map(|x| x.values())
+        .fold(false, |acc, x| {
+            if !x.complete {
+                return true;
+            }
+            acc
+        })
+    {
+        return Err(Error::new(
+            eyre!("Server is already backing up!"),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    }
+    *backing_up = Some(
+        packages
+            .into_iter()
+            .map(|x| (x.clone(), BackupProgress { complete: false }))
+            .collect(),
+    );
+    backing_up.save(&mut tx).await?;
+    tx.commit().await?;
+    Ok(())
+}
+
+#[instrument(skip(ctx, db, backup_guard))]
+async fn perform_backup<Db: DbHandle>(
+    ctx: &RpcContext,
+    mut db: Db,
+    mut backup_guard: BackupMountGuard<TmpMountGuard>,
+    package_ids: &BTreeSet<PackageId>,
+) -> Result<BTreeMap<PackageId, PackageBackupReport>, Error> {
+    let mut backup_report = BTreeMap::new();
+    for package_id in crate::db::DatabaseModel::new()
+        .package_data()
+        .keys(&mut db)
+        .await?
+        .into_iter()
+        .filter(|id| package_ids.contains(id))
+    {
+        let mut tx = db.begin().await?; // for lock scope
+        let installed_model = if let Some(installed_model) = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(&package_id)
+            .and_then(|m| m.installed())
+            .check(&mut tx)
+            .await?
+        {
+            installed_model
+        } else {
+            continue;
+        };
+        let main_status_model = installed_model.clone().status().main();
+
+        main_status_model.lock(&mut tx, LockType::Write).await?;
+        let (started, health) = match main_status_model.get(&mut tx).await?.into_owned() {
+            MainStatus::Starting { .. } => (Some(Utc::now()), Default::default()),
+            MainStatus::Running { started, health } => (Some(started), health.clone()),
+            MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restarting => {
+                (None, Default::default())
+            }
+            MainStatus::BackingUp { .. } => {
+                backup_report.insert(
+                    package_id,
+                    PackageBackupReport {
+                        error: Some(
+                            "Can't do backup because service is in a backing up state".to_owned(),
+                        ),
+                    },
+                );
+                continue;
+            }
+        };
+        main_status_model
+            .put(
+                &mut tx,
+                &MainStatus::BackingUp {
+                    started,
+                    health: health.clone(),
+                },
+            )
+            .await?;
+        tx.save().await?; // drop locks
+
+        let manifest = installed_model.clone().manifest().get(&mut db).await?;
+
+        ctx.managers
+            .get(&(manifest.id.clone(), manifest.version.clone()))
+            .await
+            .ok_or_else(|| {
+                Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest)
+            })?
+            .synchronize()
+            .await;
+
+        let mut tx = db.begin().await?;
+
+        installed_model.lock(&mut tx, LockType::Write).await?;
+
+        let guard = backup_guard.mount_package_backup(&package_id).await?;
+        let res = manifest
+            .backup
+            .create(
+                ctx,
+                &mut tx,
+                &package_id,
+                &manifest.title,
+                &manifest.version,
+                &manifest.interfaces,
+                &manifest.volumes,
+            )
+            .await;
+        guard.unmount().await?;
+        backup_report.insert(
+            package_id.clone(),
+            PackageBackupReport {
+                error: res.as_ref().err().map(|e| e.to_string()),
+            },
+        );
+
+        if let Ok(pkg_meta) = res {
+            installed_model
+                .last_backup()
+                .put(&mut tx, &Some(pkg_meta.timestamp))
+                .await?;
+            backup_guard
+                .metadata
+                .package_backups
+                .insert(package_id.clone(), pkg_meta);
+        }
+
+        main_status_model
+            .put(
+                &mut tx,
+                &match started {
+                    Some(started) => MainStatus::Running { started, health },
+                    None => MainStatus::Stopped,
+                },
+            )
+            .await?;
+
+        let mut backup_progress = crate::db::DatabaseModel::new()
+            .server_info()
+            .status_info()
+            .backup_progress()
+            .get_mut(&mut tx)
+            .await?;
+        if backup_progress.is_none() {
+            *backup_progress = Some(Default::default());
+        }
+        if let Some(mut backup_progress) = backup_progress
+            .as_mut()
+            .and_then(|bp| bp.get_mut(&package_id))
+        {
+            (*backup_progress).complete = true;
+        }
+        backup_progress.save(&mut tx).await?;
+        tx.save().await?;
+    }
+
+    let ui = crate::db::DatabaseModel::new()
+        .ui()
+        .get(&mut db)
+        .await?
+        .into_owned();
+
+    let mut os_backup_file = AtomicFile::new(
+        backup_guard.as_ref().join("os-backup.cbor"),
+        None::<PathBuf>,
+    )
+    .await
+    .with_kind(ErrorKind::Filesystem)?;
+    os_backup_file
+        .write_all(&IoFormat::Cbor.to_vec(&OsBackup {
+            account: ctx.account.read().await.clone(),
+            ui,
+        })?)
+        .await?;
+    os_backup_file
+        .save()
+        .await
+        .with_kind(ErrorKind::Filesystem)?;
+
+    let timestamp = Some(Utc::now());
+
+    backup_guard.unencrypted_metadata.version = crate::version::Current::new().semver().into();
+    backup_guard.unencrypted_metadata.full = true;
+    backup_guard.metadata.version = crate::version::Current::new().semver().into();
+    backup_guard.metadata.timestamp = timestamp;
+
+    backup_guard.save_and_unmount().await?;
+
+    crate::db::DatabaseModel::new()
+        .server_info()
+        .last_backup()
+        .put(&mut db, &timestamp)
+        .await?;
+    Ok(backup_report)
+}
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -1,11 +1,11 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
-use std::sync::Arc;

 use chrono::{DateTime, Utc};
 use color_eyre::eyre::eyre;
 use helpers::AtomicFile;
-use models::{ImageId, OptionExt};
+use models::ImageId;
+use patch_db::{DbHandle, HasModel};
 use reqwest::Url;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
@@ -15,11 +15,10 @@ use tracing::instrument;

 use self::target::PackageBackupInfo;
 use crate::context::RpcContext;
+use crate::dependencies::reconfigure_dependents_with_live_pointers;
 use crate::install::PKG_ARCHIVE_DIR;
-use crate::manager::manager_seed::ManagerSeed;
-use crate::net::interface::InterfaceId;
+use crate::net::interface::{InterfaceId, Interfaces};
 use crate::net::keys::Key;
-use crate::prelude::*;
 use crate::procedure::docker::DockerContainers;
 use crate::procedure::{NoOutput, PackageProcedure, ProcedureName};
 use crate::s9pk::manifest::PackageId;
@@ -48,7 +47,7 @@ pub struct ServerBackupReport {

 #[derive(Debug, Deserialize, Serialize)]
 pub struct PackageBackupReport {
-    pub error: Option<String>,
+    error: Option<String>,
 }

 #[command(subcommands(backup_bulk::backup_all, target::target))]
@@ -72,7 +71,6 @@ struct BackupMetadata {
 }

 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
 pub struct BackupActions {
    pub create: PackageProcedure,
    pub restore: PackageProcedure,
@@ -80,29 +78,34 @@ pub struct BackupActions {
 impl BackupActions {
    pub fn validate(
        &self,
-        _container: &Option<DockerContainers>,
+        container: &Option<DockerContainers>,
        eos_version: &Version,
        volumes: &Volumes,
        image_ids: &BTreeSet<ImageId>,
    ) -> Result<(), Error> {
        self.create
-            .validate(eos_version, volumes, image_ids, false)
+            .validate(container, eos_version, volumes, image_ids, false)
            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Backup Create"))?;
        self.restore
-            .validate(eos_version, volumes, image_ids, false)
+            .validate(container, eos_version, volumes, image_ids, false)
            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Backup Restore"))?;
        Ok(())
    }

-    #[instrument(skip_all)]
-    pub async fn create(&self, seed: Arc<ManagerSeed>) -> Result<PackageBackupInfo, Error> {
-        let manifest = &seed.manifest;
-        let mut volumes = seed.manifest.volumes.to_readonly();
-        let ctx = &seed.ctx;
-        let pkg_id = &manifest.id;
-        let pkg_version = &manifest.version;
+    #[instrument(skip(ctx, db))]
+    pub async fn create<Db: DbHandle>(
+        &self,
+        ctx: &RpcContext,
+        db: &mut Db,
+        pkg_id: &PackageId,
+        pkg_title: &str,
+        pkg_version: &Version,
+        interfaces: &Interfaces,
+        volumes: &Volumes,
+    ) -> Result<PackageBackupInfo, Error> {
+        let mut volumes = volumes.to_readonly();
        volumes.insert(VolumeId::Backup, Volume::Backup { readonly: false });
-        let backup_dir = backup_dir(&manifest.id);
+        let backup_dir = backup_dir(pkg_id);
        if tokio::fs::metadata(&backup_dir).await.is_err() {
            tokio::fs::create_dir_all(&backup_dir).await?
        }
@@ -119,29 +122,29 @@ impl BackupActions {
            .await?
            .map_err(|e| eyre!("{}", e.1))
            .with_kind(crate::ErrorKind::Backup)?;
-        let (network_keys, tor_keys): (Vec<_>, Vec<_>) =
-            Key::for_package(&ctx.secret_store, pkg_id)
-                .await?
-                .into_iter()
-                .filter_map(|k| {
-                    let interface = k.interface().map(|(_, i)| i)?;
-                    Some((
-                        (interface.clone(), Base64(k.as_bytes())),
-                        (interface, Base32(k.tor_key().as_bytes())),
-                    ))
-                })
-                .unzip();
-        let marketplace_url = ctx
-            .db
-            .peek()
-            .await
-            .as_package_data()
-            .as_idx(&pkg_id)
-            .or_not_found(pkg_id)?
-            .expect_as_installed()?
-            .as_installed()
-            .as_marketplace_url()
-            .de()?;
+        let (network_keys, tor_keys) = Key::for_package(&ctx.secret_store, pkg_id)
+            .await?
+            .into_iter()
+            .filter_map(|k| {
+                let interface = k.interface().map(|(_, i)| i)?;
+                Some((
+                    (interface.clone(), Base64(k.as_bytes())),
+                    (interface, Base32(k.tor_key().as_bytes())),
+                ))
+            })
+            .unzip();
+        let marketplace_url = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(pkg_id)
+            .expect(db)
+            .await?
+            .installed()
+            .expect(db)
+            .await?
+            .marketplace_url()
+            .get(db)
+            .await?
+            .into_owned();
        let tmp_path = Path::new(BACKUP_DIR)
            .join(pkg_id)
            .join(format!("{}.s9pk", pkg_id));
@@ -169,8 +172,6 @@ impl BackupActions {
        let mut outfile = AtomicFile::new(&metadata_path, None::<PathBuf>)
            .await
            .with_kind(ErrorKind::Filesystem)?;
-        let network_keys = network_keys.into_iter().collect();
-        let tor_keys = tor_keys.into_iter().collect();
        outfile
            .write_all(&IoFormat::Cbor.to_vec(&BackupMetadata {
                timestamp,
@@ -182,20 +183,22 @@ impl BackupActions {
        outfile.save().await.with_kind(ErrorKind::Filesystem)?;
        Ok(PackageBackupInfo {
            os_version: Current::new().semver().into(),
-            title: manifest.title.clone(),
+            title: pkg_title.to_owned(),
            version: pkg_version.clone(),
            timestamp,
        })
    }

-    #[instrument(skip_all)]
-    pub async fn restore(
+    #[instrument(skip(ctx, db))]
+    pub async fn restore<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        pkg_id: &PackageId,
        pkg_version: &Version,
+        interfaces: &Interfaces,
        volumes: &Volumes,
-    ) -> Result<Option<Url>, Error> {
+    ) -> Result<(), Error> {
        let mut volumes = volumes.clone();
        volumes.insert(VolumeId::Backup, Volume::Backup { readonly: true });
        self.restore
@@ -220,7 +223,32 @@ impl BackupActions {
                )
            })?,
        )?;
+        let pde = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(pkg_id)
+            .expect(db)
+            .await?
+            .installed()
+            .expect(db)
+            .await?;
+        pde.marketplace_url()
+            .put(db, &metadata.marketplace_url)
+            .await?;

-        Ok(metadata.marketplace_url)
+        let entry = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(pkg_id)
+            .expect(db)
+            .await?
+            .installed()
+            .expect(db)
+            .await?
+            .get(db)
+            .await?;
+
+        let receipts = crate::config::ConfigReceipts::new(db).await?;
+        reconfigure_dependents_with_live_pointers(ctx, db, &receipts, &entry).await?;
+
+        Ok(())
    }
 }
--- a/core/startos/src/backup/os.rs
+++ b/core/startos/src/backup/os.rs
@@ -1,13 +1,12 @@
-use openssl::pkey::PKey;
-use openssl::x509::X509;
-use patch_db::Value;
-use serde::{Deserialize, Serialize};
-
 use crate::account::AccountInfo;
 use crate::hostname::{generate_hostname, generate_id, Hostname};
 use crate::net::keys::Key;
-use crate::prelude::*;
 use crate::util::serde::Base64;
+use crate::Error;
+use openssl::pkey::PKey;
+use openssl::x509::X509;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;

 pub struct OsBackup {
    pub account: AccountInfo,
@@ -20,11 +19,11 @@ impl<'de> Deserialize<'de> for OsBackup {
    {
        let tagged = OsBackupSerDe::deserialize(deserializer)?;
        match tagged.version {
-            0 => patch_db::value::from_value::<OsBackupV0>(tagged.rest)
+            0 => serde_json::from_value::<OsBackupV0>(tagged.rest)
                .map_err(serde::de::Error::custom)?
                .project()
                .map_err(serde::de::Error::custom),
-            1 => patch_db::value::from_value::<OsBackupV1>(tagged.rest)
+            1 => serde_json::from_value::<OsBackupV1>(tagged.rest)
                .map_err(serde::de::Error::custom)?
                .project()
                .map_err(serde::de::Error::custom),
@@ -41,7 +40,7 @@ impl Serialize for OsBackup {
    {
        OsBackupSerDe {
            version: 1,
-            rest: patch_db::value::to_value(
+            rest: serde_json::to_value(
                &OsBackupV1::unproject(self).map_err(serde::ser::Error::custom)?,
            )
            .map_err(serde::ser::Error::custom)?,
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -5,9 +5,11 @@ use std::sync::Arc;
 use std::time::Duration;

 use clap::ArgMatches;
-use futures::future::BoxFuture;
-use futures::{stream, FutureExt, StreamExt};
+use color_eyre::eyre::eyre;
+use futures::{future::BoxFuture, stream};
+use futures::{FutureExt, StreamExt};
 use openssl::x509::X509;
+use patch_db::{DbHandle, PatchDbHandle};
 use rpc_toolkit::command;
 use sqlx::Connection;
 use tokio::fs::File;
@@ -19,7 +21,7 @@ use crate::backup::os::OsBackup;
 use crate::backup::BackupMetadata;
 use crate::context::rpc::RpcContextConfig;
 use crate::context::{RpcContext, SetupContext};
-use crate::db::model::{PackageDataEntry, PackageDataEntryRestoring, StaticFiles};
+use crate::db::model::{PackageDataEntry, StaticFiles};
 use crate::disk::mount::backup::{BackupMountGuard, PackageBackupMountGuard};
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::TmpMountGuard;
@@ -28,7 +30,6 @@ use crate::init::init;
 use crate::install::progress::InstallProgress;
 use crate::install::{download_install_s9pk, PKG_PUBLIC_DIR};
 use crate::notifications::NotificationLevel;
-use crate::prelude::*;
 use crate::s9pk::manifest::{Manifest, PackageId};
 use crate::s9pk::reader::S9pkReader;
 use crate::setup::SetupStatus;
@@ -36,6 +37,7 @@ use crate::util::display_none;
 use crate::util::io::dir_size;
 use crate::util::serde::IoFormat;
 use crate::volume::{backup_dir, BACKUP_DIR, PKG_VOLUME_DIR};
+use crate::{Error, ResultExt};

 fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<Vec<PackageId>, Error> {
    arg.split(',')
@@ -51,24 +53,26 @@ pub async fn restore_packages_rpc(
    #[arg(rename = "target-id")] target_id: BackupTargetId,
    #[arg] password: String,
 ) -> Result<(), Error> {
+    let mut db = ctx.db.handle();
    let fs = target_id
-        .load(ctx.secret_store.acquire().await?.as_mut())
+        .load(&mut ctx.secret_store.acquire().await?)
        .await?;
    let backup_guard =
        BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadWrite).await?, &password).await?;

-    let (backup_guard, tasks, _) = restore_packages(&ctx, backup_guard, ids).await?;
+    let (backup_guard, tasks, _) = restore_packages(&ctx, &mut db, backup_guard, ids).await?;

    tokio::spawn(async move {
        stream::iter(tasks.into_iter().map(|x| (x, ctx.clone())))
            .for_each_concurrent(5, |(res, ctx)| async move {
+                let mut db = ctx.db.handle();
                match res.await {
                    (Ok(_), _) => (),
                    (Err(err), package_id) => {
                        if let Err(err) = ctx
                            .notification_manager
                            .notify(
-                                ctx.db.clone(),
+                                &mut db,
                                Some(package_id.clone()),
                                NotificationLevel::Error,
                                "Restoration Failure".to_string(),
@@ -105,7 +109,7 @@ async fn approximate_progress(
        if tokio::fs::metadata(&dir).await.is_err() {
            *size = 0;
        } else {
-            *size = dir_size(&dir, None).await?;
+            *size = dir_size(&dir).await?;
        }
    }
    Ok(())
@@ -180,18 +184,20 @@ pub async fn recover_full_embassy(
    .await?;

    let os_backup_path = backup_guard.as_ref().join("os-backup.cbor");
-    let mut os_backup: OsBackup = IoFormat::Cbor.from_slice(
-        &tokio::fs::read(&os_backup_path)
-            .await
-            .with_ctx(|_| (ErrorKind::Filesystem, os_backup_path.display().to_string()))?,
-    )?;
+    let mut os_backup: OsBackup =
+        IoFormat::Cbor.from_slice(&tokio::fs::read(&os_backup_path).await.with_ctx(|_| {
+            (
+                crate::ErrorKind::Filesystem,
+                os_backup_path.display().to_string(),
+            )
+        })?)?;

    os_backup.account.password = argon2::hash_encoded(
        embassy_password.as_bytes(),
        &rand::random::<[u8; 16]>()[..],
-        &argon2::Config::rfc9106_low_mem(),
+        &argon2::Config::default(),
    )
-    .with_kind(ErrorKind::PasswordHashGeneration)?;
+    .with_kind(crate::ErrorKind::PasswordHashGeneration)?;

    let secret_store = ctx.secret_store().await?;

@@ -205,24 +211,27 @@ pub async fn recover_full_embassy(

    let rpc_ctx = RpcContext::init(ctx.config_path.clone(), disk_guid.clone()).await?;

-    let ids: Vec<_> = backup_guard
+    let mut db = rpc_ctx.db.handle();
+
+    let ids = backup_guard
        .metadata
        .package_backups
        .keys()
        .cloned()
        .collect();
    let (backup_guard, tasks, progress_info) =
-        restore_packages(&rpc_ctx, backup_guard, ids).await?;
+        restore_packages(&rpc_ctx, &mut db, backup_guard, ids).await?;
    let task_consumer_rpc_ctx = rpc_ctx.clone();
    tokio::select! {
        _ = async move {
            stream::iter(tasks.into_iter().map(|x| (x,  task_consumer_rpc_ctx.clone())))
                .for_each_concurrent(5, |(res, ctx)| async move {
+                    let mut db = ctx.db.handle();
                    match res.await {
                        (Ok(_), _) => (),
                        (Err(err), package_id) => {
                            if let Err(err) = ctx.notification_manager.notify(
-                                ctx.db.clone(),
+                                &mut db,
                                Some(package_id.clone()),
                                NotificationLevel::Error,
                                "Restoration Failure".to_string(), format!("Error restoring package {}: {}", package_id,err), (), None).await{
@@ -252,9 +261,9 @@ pub async fn recover_full_embassy(
    ))
 }

-#[instrument(skip(ctx, backup_guard))]
 async fn restore_packages(
    ctx: &RpcContext,
+    db: &mut PatchDbHandle,
    backup_guard: BackupMountGuard<TmpMountGuard>,
    ids: Vec<PackageId>,
 ) -> Result<
@@ -265,7 +274,7 @@ async fn restore_packages(
    ),
    Error,
 > {
-    let guards = assure_restoring(ctx, ids, &backup_guard).await?;
+    let guards = assure_restoring(ctx, db, ids, &backup_guard).await?;

    let mut progress_info = ProgressInfo::default();

@@ -273,12 +282,10 @@ async fn restore_packages(
    for (manifest, guard) in guards {
        let id = manifest.id.clone();
        let (progress, task) = restore_package(ctx.clone(), manifest, guard).await?;
-        progress_info
-            .package_installs
-            .insert(id.clone(), progress.clone());
+        progress_info.package_installs.insert(id.clone(), progress);
        progress_info
            .src_volume_size
-            .insert(id.clone(), dir_size(backup_dir(&id), None).await?);
+            .insert(id.clone(), dir_size(backup_dir(&id)).await?);
        progress_info.target_volume_size.insert(id.clone(), 0);
        let package_id = id.clone();
        tasks.push(
@@ -299,20 +306,23 @@ async fn restore_packages(
    Ok((backup_guard, tasks, progress_info))
 }

-#[instrument(skip(ctx, backup_guard))]
+#[instrument(skip(ctx, db, backup_guard))]
 async fn assure_restoring(
    ctx: &RpcContext,
+    db: &mut PatchDbHandle,
    ids: Vec<PackageId>,
    backup_guard: &BackupMountGuard<TmpMountGuard>,
 ) -> Result<Vec<(Manifest, PackageBackupMountGuard)>, Error> {
+    let mut tx = db.begin().await?;
+
    let mut guards = Vec::with_capacity(ids.len());

-    let mut insert_packages = BTreeMap::new();
-
    for id in ids {
-        let peek = ctx.db.peek().await;
-
-        let model = peek.as_package_data().as_idx(&id);
+        let mut model = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(&id)
+            .get_mut(&mut tx)
+            .await?;

        if !model.is_none() {
            return Err(Error::new(
@@ -320,15 +330,14 @@ async fn assure_restoring(
                crate::ErrorKind::InvalidRequest,
            ));
        }
+
        let guard = backup_guard.mount_package_backup(&id).await?;
        let s9pk_path = Path::new(BACKUP_DIR).join(&id).join(format!("{}.s9pk", id));
        let mut rdr = S9pkReader::open(&s9pk_path, false).await?;

        let manifest = rdr.manifest().await?;
        let version = manifest.version.clone();
-        let progress = Arc::new(InstallProgress::new(Some(
-            tokio::fs::metadata(&s9pk_path).await?.len(),
-        )));
+        let progress = InstallProgress::new(Some(tokio::fs::metadata(&s9pk_path).await?.len()));

        let public_dir_path = ctx
            .datadir
@@ -352,25 +361,18 @@ async fn assure_restoring(
        let mut dst = File::create(&icon_path).await?;
        tokio::io::copy(&mut rdr.icon().await?, &mut dst).await?;
        dst.sync_all().await?;
-        insert_packages.insert(
-            id.clone(),
-            PackageDataEntry::Restoring(PackageDataEntryRestoring {
-                install_progress: progress.clone(),
-                static_files: StaticFiles::local(&id, &version, manifest.assets.icon_type()),
-                manifest: manifest.clone(),
-            }),
-        );
+
+        *model = Some(PackageDataEntry::Restoring {
+            install_progress: progress.clone(),
+            static_files: StaticFiles::local(&id, &version, manifest.assets.icon_type()),
+            manifest: manifest.clone(),
+        });
+        model.save(&mut tx).await?;

        guards.push((manifest, guard));
    }
-    ctx.db
-        .mutate(|db| {
-            for (id, package) in insert_packages {
-                db.as_package_data_mut().insert(&id, &package)?;
-            }
-            Ok(())
-        })
-        .await?;
+
+    tx.commit().await?;
    Ok(guards)
 }

@@ -386,11 +388,13 @@ async fn restore_package<'a>(
        .join(format!("{}.s9pk", id));

    let metadata_path = Path::new(BACKUP_DIR).join(&id).join("metadata.cbor");
-    let metadata: BackupMetadata = IoFormat::Cbor.from_slice(
-        &tokio::fs::read(&metadata_path)
-            .await
-            .with_ctx(|_| (ErrorKind::Filesystem, metadata_path.display().to_string()))?,
-    )?;
+    let metadata: BackupMetadata =
+        IoFormat::Cbor.from_slice(&tokio::fs::read(&metadata_path).await.with_ctx(|_| {
+            (
+                crate::ErrorKind::Filesystem,
+                metadata_path.display().to_string(),
+            )
+        })?)?;

    let mut secrets = ctx.secret_store.acquire().await?;
    let mut secrets_tx = secrets.begin().await?;
@@ -398,59 +402,48 @@ async fn restore_package<'a>(
        let k = key.0.as_slice();
        sqlx::query!(
            "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-            id.to_string(),
-            iface.to_string(),
+            *id,
+            *iface,
            k,
        )
-        .execute(secrets_tx.as_mut()).await?;
+        .execute(&mut secrets_tx).await?;
    }
    // DEPRECATED
    for (iface, key) in metadata.tor_keys {
        let k = key.0.as_slice();
        sqlx::query!(
            "INSERT INTO tor (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-            id.to_string(),
-            iface.to_string(),
+            *id,
+            *iface,
            k,
        )
-        .execute(secrets_tx.as_mut()).await?;
+        .execute(&mut secrets_tx).await?;
    }
    secrets_tx.commit().await?;
    drop(secrets);

    let len = tokio::fs::metadata(&s9pk_path)
        .await
-        .with_ctx(|_| (ErrorKind::Filesystem, s9pk_path.display().to_string()))?
+        .with_ctx(|_| {
+            (
+                crate::ErrorKind::Filesystem,
+                s9pk_path.display().to_string(),
+            )
+        })?
        .len();
-    let file = File::open(&s9pk_path)
-        .await
-        .with_ctx(|_| (ErrorKind::Filesystem, s9pk_path.display().to_string()))?;
+    let file = File::open(&s9pk_path).await.with_ctx(|_| {
+        (
+            crate::ErrorKind::Filesystem,
+            s9pk_path.display().to_string(),
+        )
+    })?;

    let progress = InstallProgress::new(Some(len));
-    let marketplace_url = metadata.marketplace_url;

-    let progress = Arc::new(progress);
-
-    ctx.db
-        .mutate(|db| {
-            db.as_package_data_mut().insert(
-                &id,
-                &PackageDataEntry::Restoring(PackageDataEntryRestoring {
-                    install_progress: progress.clone(),
-                    static_files: StaticFiles::local(
-                        &id,
-                        &manifest.version,
-                        manifest.assets.icon_type(),
-                    ),
-                    manifest: manifest.clone(),
-                }),
-            )
-        })
-        .await?;
    Ok((
        progress.clone(),
        async move {
-            download_install_s9pk(ctx, manifest, marketplace_url, progress, file, None).await?;
+            download_install_s9pk(&ctx, &manifest, None, progress, file).await?;

            guard.unmount().await?;

--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -12,9 +12,9 @@ use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadOnly;
 use crate::disk::mount::guard::TmpMountGuard;
 use crate::disk::util::{recovery_info, EmbassyOsRecoveryInfo};
-use crate::prelude::*;
 use crate::util::display_none;
 use crate::util::serde::KeyVal;
+use crate::Error;

 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -84,7 +84,7 @@ pub async fn update(
    } else {
        return Err(Error::new(
            eyre!("Backup Target ID {} Not Found", id),
-            ErrorKind::NotFound,
+            crate::ErrorKind::NotFound,
        ));
    };
    let cifs = Cifs {
@@ -112,7 +112,7 @@ pub async fn update(
    {
        return Err(Error::new(
            eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
-            ErrorKind::NotFound,
+            crate::ErrorKind::NotFound,
        ));
    };
    Ok(KeyVal {
@@ -134,7 +134,7 @@ pub async fn remove(#[context] ctx: RpcContext, #[arg] id: BackupTargetId) -> Re
    } else {
        return Err(Error::new(
            eyre!("Backup Target ID {} Not Found", id),
-            ErrorKind::NotFound,
+            crate::ErrorKind::NotFound,
        ));
    };
    if sqlx::query!("DELETE FROM cifs_shares WHERE id = $1", id)
@@ -145,7 +145,7 @@ pub async fn remove(#[context] ctx: RpcContext, #[arg] id: BackupTargetId) -> Re
    {
        return Err(Error::new(
            eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
-            ErrorKind::NotFound,
+            crate::ErrorKind::NotFound,
        ));
    };
    Ok(())
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -11,7 +11,6 @@ use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use sqlx::{Executor, Postgres};
-use tokio::sync::Mutex;
 use tracing::instrument;

 use self::cifs::CifsBackupTarget;
@@ -22,10 +21,10 @@ use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::{FileSystem, MountType, ReadWrite};
 use crate::disk::mount::guard::TmpMountGuard;
 use crate::disk::util::PartitionInfo;
-use crate::prelude::*;
 use crate::s9pk::manifest::PackageId;
 use crate::util::serde::{deserialize_from_str, display_serializable, serialize_display};
-use crate::util::{display_none, Version};
+use crate::util::Version;
+use crate::Error;

 pub mod cifs;

@@ -43,7 +42,7 @@ pub enum BackupTarget {
    Cifs(CifsBackupTarget),
 }

-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum BackupTargetId {
    Disk { logicalname: PathBuf },
    Cifs { id: i32 },
@@ -72,14 +71,14 @@ impl std::fmt::Display for BackupTargetId {
 impl std::str::FromStr for BackupTargetId {
    type Err = Error;
    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.split_once('-') {
+        match s.split_once("-") {
            Some(("disk", logicalname)) => Ok(BackupTargetId::Disk {
                logicalname: Path::new(logicalname).to_owned(),
            }),
            Some(("cifs", id)) => Ok(BackupTargetId::Cifs { id: id.parse()? }),
            _ => Err(Error::new(
                eyre!("Invalid Backup Target ID"),
-                ErrorKind::InvalidBackupTargetId,
+                crate::ErrorKind::InvalidBackupTargetId,
            )),
        }
    }
@@ -130,7 +129,7 @@ impl FileSystem for BackupTargetFS {
    }
 }

-#[command(subcommands(cifs::cifs, list, info, mount, umount))]
+#[command(subcommands(cifs::cifs, list, info))]
 pub fn target() -> Result<(), Error> {
    Ok(())
 }
@@ -142,7 +141,7 @@ pub async fn list(
    let mut sql_handle = ctx.secret_store.acquire().await?;
    let (disks_res, cifs) = tokio::try_join!(
        crate::disk::util::list(&ctx.os_partitions),
-        cifs::list(sql_handle.as_mut()),
+        cifs::list(&mut sql_handle),
    )?;
    Ok(disks_res
        .into_iter()
@@ -213,7 +212,7 @@ fn display_backup_info(info: BackupInfo, matches: &ArgMatches) {
    ]);
    for (id, info) in info.package_backups {
        let row = row![
-            &*id,
+            id.as_str(),
            info.version.as_str(),
            info.os_version.as_str(),
            &info.timestamp.to_string(),
@@ -233,7 +232,7 @@ pub async fn info(
    let guard = BackupMountGuard::mount(
        TmpMountGuard::mount(
            &target_id
-                .load(ctx.secret_store.acquire().await?.as_mut())
+                .load(&mut ctx.secret_store.acquire().await?)
                .await?,
            ReadWrite,
        )
@@ -248,60 +247,3 @@ pub async fn info(

    Ok(res)
 }
-
-lazy_static::lazy_static! {
-    static ref USER_MOUNTS: Mutex<BTreeMap<BackupTargetId, BackupMountGuard<TmpMountGuard>>> =
-        Mutex::new(BTreeMap::new());
-}
-
-#[command]
-#[instrument(skip_all)]
-pub async fn mount(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: BackupTargetId,
-    #[arg] password: String,
-) -> Result<String, Error> {
-    let mut mounts = USER_MOUNTS.lock().await;
-
-    if let Some(existing) = mounts.get(&target_id) {
-        return Ok(existing.as_ref().display().to_string());
-    }
-
-    let guard = BackupMountGuard::mount(
-        TmpMountGuard::mount(
-            &target_id
-                .clone()
-                .load(ctx.secret_store.acquire().await?.as_mut())
-                .await?,
-            ReadWrite,
-        )
-        .await?,
-        &password,
-    )
-    .await?;
-
-    let res = guard.as_ref().display().to_string();
-
-    mounts.insert(target_id, guard);
-
-    Ok(res)
-}
-#[command(display(display_none))]
-#[instrument(skip_all)]
-pub async fn umount(
-    #[context] _ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: Option<BackupTargetId>,
-) -> Result<(), Error> {
-    let mut mounts = USER_MOUNTS.lock().await;
-    if let Some(target_id) = target_id {
-        if let Some(existing) = mounts.remove(&target_id) {
-            existing.unmount().await?;
-        }
-    } else {
-        for (_, existing) in std::mem::take(&mut *mounts) {
-            existing.unmount().await?;
-        }
-    }
-
-    Ok(())
-}
--- a/core/startos/src/bins/avahi_alias.rs
+++ b/core/startos/src/bins/avahi_alias.rs
@@ -14,7 +14,7 @@ fn log_str_error(action: &str, e: i32) {
    }
 }

-pub fn main() {
+fn main() {
    let aliases: Vec<_> = std::env::args().skip(1).collect();
    unsafe {
        let simple_poll = avahi_sys::avahi_simple_poll_new();
--- a/core/startos/src/bins/start_cli.rs
+++ b/core/startos/src/bins/start_cli.rs
@@ -1,22 +1,21 @@
 use clap::Arg;
+use embassy::context::CliContext;
+use embassy::util::logger::EmbassyLogger;
+use embassy::version::{Current, VersionT};
+use embassy::Error;
 use rpc_toolkit::run_cli;
 use rpc_toolkit::yajrc::RpcError;
 use serde_json::Value;

-use crate::context::CliContext;
-use crate::util::logger::EmbassyLogger;
-use crate::version::{Current, VersionT};
-use crate::Error;
-
 lazy_static::lazy_static! {
    static ref VERSION_STRING: String = Current::new().semver().to_string();
 }

 fn inner_main() -> Result<(), Error> {
    run_cli!({
-        command: crate::main_api,
+        command: embassy::main_api,
        app: app => app
-            .name("StartOS CLI")
+            .name("Embassy CLI")
            .version(&**VERSION_STRING)
            .arg(
                clap::Arg::with_name("config")
@@ -49,7 +48,7 @@ fn inner_main() -> Result<(), Error> {
    Ok(())
 }

-pub fn main() {
+fn main() {
    match inner_main() {
        Ok(_) => (),
        Err(e) => {
--- a/backend/src/bin/embassy-init.rs
+++ b/backend/src/bin/embassy-init.rs
@@ -0,0 +1,207 @@
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Duration;
+
+use embassy::context::rpc::RpcContextConfig;
+use embassy::context::{DiagnosticContext, InstallContext, SetupContext};
+use embassy::disk::fsck::RepairStrategy;
+use embassy::disk::main::DEFAULT_PASSWORD;
+use embassy::disk::REPAIR_DISK_PATH;
+use embassy::init::STANDBY_MODE_PATH;
+use embassy::net::web_server::WebServer;
+use embassy::shutdown::Shutdown;
+use embassy::sound::CHIME;
+use embassy::util::logger::EmbassyLogger;
+use embassy::util::Invoke;
+use embassy::{Error, ErrorKind, ResultExt, IS_RASPBERRY_PI};
+use tokio::process::Command;
+use tracing::instrument;
+
+#[instrument]
+async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<(), Error> {
+    if tokio::fs::metadata("/cdrom").await.is_ok() {
+        let ctx = InstallContext::init(cfg_path).await?;
+
+        let server = WebServer::install(([0, 0, 0, 0], 80).into(), ctx.clone()).await?;
+
+        tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
+        CHIME.play().await?;
+
+        ctx.shutdown
+            .subscribe()
+            .recv()
+            .await
+            .expect("context dropped");
+
+        server.shutdown().await;
+
+        Command::new("reboot")
+            .invoke(embassy::ErrorKind::Unknown)
+            .await?;
+    } else if tokio::fs::metadata("/media/embassy/config/disk.guid")
+        .await
+        .is_err()
+    {
+        let ctx = SetupContext::init(cfg_path).await?;
+
+        let server = WebServer::setup(([0, 0, 0, 0], 80).into(), ctx.clone()).await?;
+
+        tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
+        CHIME.play().await?;
+        ctx.shutdown
+            .subscribe()
+            .recv()
+            .await
+            .expect("context dropped");
+
+        server.shutdown().await;
+
+        tokio::task::yield_now().await;
+        if let Err(e) = Command::new("killall")
+            .arg("firefox-esr")
+            .invoke(ErrorKind::NotFound)
+            .await
+        {
+            tracing::error!("Failed to kill kiosk: {}", e);
+            tracing::debug!("{:?}", e);
+        }
+    } else {
+        let cfg = RpcContextConfig::load(cfg_path).await?;
+        let guid_string = tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+            .await?;
+        let guid = guid_string.trim();
+        let requires_reboot = embassy::disk::main::import(
+            guid,
+            cfg.datadir(),
+            if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
+                RepairStrategy::Aggressive
+            } else {
+                RepairStrategy::Preen
+            },
+            DEFAULT_PASSWORD,
+        )
+        .await?;
+        if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
+            tokio::fs::remove_file(REPAIR_DISK_PATH)
+                .await
+                .with_ctx(|_| (embassy::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
+        }
+        if requires_reboot.0 {
+            embassy::disk::main::export(guid, cfg.datadir()).await?;
+            Command::new("reboot")
+                .invoke(embassy::ErrorKind::Unknown)
+                .await?;
+        }
+        tracing::info!("Loaded Disk");
+        embassy::init::init(&cfg).await?;
+    }
+
+    Ok(())
+}
+
+async fn run_script_if_exists<P: AsRef<Path>>(path: P) {
+    let script = path.as_ref();
+    if script.exists() {
+        match Command::new("/bin/bash").arg(script).spawn() {
+            Ok(mut c) => {
+                if let Err(e) = c.wait().await {
+                    tracing::error!("Error Running {}: {}", script.display(), e);
+                    tracing::debug!("{:?}", e);
+                }
+            }
+            Err(e) => {
+                tracing::error!("Error Running {}: {}", script.display(), e);
+                tracing::debug!("{:?}", e);
+            }
+        }
+    }
+}
+
+#[instrument]
+async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error> {
+    if *IS_RASPBERRY_PI && tokio::fs::metadata(STANDBY_MODE_PATH).await.is_ok() {
+        tokio::fs::remove_file(STANDBY_MODE_PATH).await?;
+        Command::new("sync").invoke(ErrorKind::Filesystem).await?;
+        embassy::sound::SHUTDOWN.play().await?;
+        futures::future::pending::<()>().await;
+    }
+
+    embassy::sound::BEP.play().await?;
+
+    run_script_if_exists("/media/embassy/config/preinit.sh").await;
+
+    let res = if let Err(e) = setup_or_init(cfg_path.clone()).await {
+        async move {
+            tracing::error!("{}", e.source);
+            tracing::debug!("{}", e.source);
+            embassy::sound::BEETHOVEN.play().await?;
+
+            let ctx = DiagnosticContext::init(
+                cfg_path,
+                if tokio::fs::metadata("/media/embassy/config/disk.guid")
+                    .await
+                    .is_ok()
+                {
+                    Some(Arc::new(
+                        tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+                            .await?
+                            .trim()
+                            .to_owned(),
+                    ))
+                } else {
+                    None
+                },
+                e,
+            )
+            .await?;
+
+            let server = WebServer::diagnostic(([0, 0, 0, 0], 80).into(), ctx.clone()).await?;
+
+            let shutdown = ctx.shutdown.subscribe().recv().await.unwrap();
+
+            server.shutdown().await;
+
+            Ok(shutdown)
+        }
+        .await
+    } else {
+        Ok(None)
+    };
+
+    run_script_if_exists("/media/embassy/config/postinit.sh").await;
+
+    res
+}
+
+fn main() {
+    let matches = clap::App::new("embassy-init")
+        .arg(
+            clap::Arg::with_name("config")
+                .short('c')
+                .long("config")
+                .takes_value(true),
+        )
+        .get_matches();
+
+    EmbassyLogger::init();
+
+    let cfg_path = matches.value_of("config").map(|p| Path::new(p).to_owned());
+    let res = {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .expect("failed to initialize runtime");
+        rt.block_on(inner_main(cfg_path))
+    };
+
+    match res {
+        Ok(Some(shutdown)) => shutdown.execute(),
+        Ok(None) => (),
+        Err(e) => {
+            eprintln!("{}", e.source);
+            tracing::debug!("{:?}", e.source);
+            drop(e.source);
+            std::process::exit(e.kind as i32)
+        }
+    }
+}
--- a/core/startos/src/bins/start_sdk.rs
+++ b/core/startos/src/bins/start_sdk.rs
@@ -1,21 +1,20 @@
+use embassy::context::SdkContext;
+use embassy::util::logger::EmbassyLogger;
+use embassy::version::{Current, VersionT};
+use embassy::Error;
 use rpc_toolkit::run_cli;
 use rpc_toolkit::yajrc::RpcError;
 use serde_json::Value;

-use crate::context::SdkContext;
-use crate::util::logger::EmbassyLogger;
-use crate::version::{Current, VersionT};
-use crate::Error;
-
 lazy_static::lazy_static! {
    static ref VERSION_STRING: String = Current::new().semver().to_string();
 }

 fn inner_main() -> Result<(), Error> {
    run_cli!({
-        command: crate::portable_api,
+        command: embassy::portable_api,
        app: app => app
-            .name("StartOS SDK")
+            .name("Embassy SDK")
            .version(&**VERSION_STRING)
            .arg(
                clap::Arg::with_name("config")
@@ -48,7 +47,7 @@ fn inner_main() -> Result<(), Error> {
    Ok(())
 }

-pub fn main() {
+fn main() {
    match inner_main() {
        Ok(_) => (),
        Err(e) => {
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -1,22 +1,20 @@
-use std::net::{Ipv6Addr, SocketAddr};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;

 use color_eyre::eyre::eyre;
+use embassy::context::{DiagnosticContext, RpcContext};
+use embassy::net::web_server::WebServer;
+use embassy::shutdown::Shutdown;
+use embassy::system::launch_metrics_task;
+use embassy::util::logger::EmbassyLogger;
+use embassy::{Error, ErrorKind, ResultExt};
 use futures::{FutureExt, TryFutureExt};
 use tokio::signal::unix::signal;
 use tracing::instrument;

-use crate::context::{DiagnosticContext, RpcContext};
-use crate::net::web_server::WebServer;
-use crate::shutdown::Shutdown;
-use crate::system::launch_metrics_task;
-use crate::util::logger::EmbassyLogger;
-use crate::{Error, ErrorKind, ResultExt};
-
-#[instrument(skip_all)]
+#[instrument]
 async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error> {
-    let (rpc_ctx, server, shutdown) = async {
+    let (rpc_ctx, server, shutdown) = {
        let rpc_ctx = RpcContext::init(
            cfg_path,
            Arc::new(
@@ -27,12 +25,8 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
            ),
        )
        .await?;
-        crate::hostname::sync_hostname(&rpc_ctx.account.read().await.hostname).await?;
-        let server = WebServer::main(
-            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-            rpc_ctx.clone(),
-        )
-        .await?;
+        embassy::hostname::sync_hostname(&*rpc_ctx.account.read().await).await?;
+        let server = WebServer::main(([0, 0, 0, 0], 80).into(), rpc_ctx.clone()).await?;

        let mut shutdown_recv = rpc_ctx.shutdown.subscribe();

@@ -72,7 +66,7 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
            .await
        });

-        crate::sound::CHIME.play().await?;
+        embassy::sound::CHIME.play().await?;

        metrics_task
            .map_err(|e| {
@@ -91,9 +85,8 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error

        sig_handler.abort();

-        Ok::<_, Error>((rpc_ctx, server, shutdown))
-    }
-    .await?;
+        (rpc_ctx, server, shutdown)
+    };
    server.shutdown().await;
    rpc_ctx.shutdown().await?;

@@ -102,15 +95,8 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
    Ok(shutdown)
 }

-pub fn main() {
-    EmbassyLogger::init();
-
-    if !Path::new("/run/embassy/initialized").exists() {
-        super::start_init::main();
-        std::fs::write("/run/embassy/initialized", "").unwrap();
-    }
-
-    let matches = clap::App::new("startd")
+fn main() {
+    let matches = clap::App::new("embassyd")
        .arg(
            clap::Arg::with_name("config")
                .short('c')
@@ -119,6 +105,8 @@ pub fn main() {
        )
        .get_matches();

+    EmbassyLogger::init();
+
    let cfg_path = matches.value_of("config").map(|p| Path::new(p).to_owned());

    let res = {
@@ -133,7 +121,7 @@ pub fn main() {
                    async {
                        tracing::error!("{}", e.source);
                        tracing::debug!("{:?}", e.source);
-                        crate::sound::BEETHOVEN.play().await?;
+                        embassy::sound::BEETHOVEN.play().await?;
                        let ctx = DiagnosticContext::init(
                            cfg_path,
                            if tokio::fs::metadata("/media/embassy/config/disk.guid")
@@ -153,11 +141,8 @@ pub fn main() {
                        )
                        .await?;

-                        let server = WebServer::diagnostic(
-                            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-                            ctx.clone(),
-                        )
-                        .await?;
+                        let server =
+                            WebServer::diagnostic(([0, 0, 0, 0], 80).into(), ctx.clone()).await?;

                        let mut shutdown = ctx.shutdown.subscribe();

--- a/core/startos/src/config/action.rs
+++ b/core/startos/src/config/action.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};

 use color_eyre::eyre::eyre;
 use models::ImageId;
+use nix::sys::signal::Signal;
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
@@ -9,7 +10,6 @@ use tracing::instrument;
 use super::{Config, ConfigSpec};
 use crate::context::RpcContext;
 use crate::dependencies::Dependencies;
-use crate::prelude::*;
 use crate::procedure::docker::DockerContainers;
 use crate::procedure::{PackageProcedure, ProcedureName};
 use crate::s9pk::manifest::PackageId;
@@ -18,7 +18,7 @@ use crate::util::Version;
 use crate::volume::Volumes;
 use crate::{Error, ResultExt};

-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, HasModel)]
 #[serde(rename_all = "kebab-case")]
 pub struct ConfigRes {
    pub config: Option<Config>,
@@ -26,29 +26,28 @@ pub struct ConfigRes {
 }

 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
 pub struct ConfigActions {
    pub get: PackageProcedure,
    pub set: PackageProcedure,
 }
 impl ConfigActions {
-    #[instrument(skip_all)]
+    #[instrument]
    pub fn validate(
        &self,
-        _container: &Option<DockerContainers>,
+        container: &Option<DockerContainers>,
        eos_version: &Version,
        volumes: &Volumes,
        image_ids: &BTreeSet<ImageId>,
    ) -> Result<(), Error> {
        self.get
-            .validate(eos_version, volumes, image_ids, true)
+            .validate(container, eos_version, volumes, image_ids, true)
            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Config Get"))?;
        self.set
-            .validate(eos_version, volumes, image_ids, true)
+            .validate(container, eos_version, volumes, image_ids, true)
            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Config Set"))?;
        Ok(())
    }
-    #[instrument(skip_all)]
+    #[instrument(skip(ctx))]
    pub async fn get(
        &self,
        ctx: &RpcContext,
@@ -72,7 +71,7 @@ impl ConfigActions {
            })
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(ctx))]
    pub async fn set(
        &self,
        ctx: &RpcContext,
@@ -100,6 +99,7 @@ impl ConfigActions {
                })
            })?;
        Ok(SetResult {
+            signal: res.signal,
            depends_on: res
                .depends_on
                .into_iter()
@@ -112,5 +112,9 @@ impl ConfigActions {
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct SetResult {
+    #[serde(default)]
+    #[serde(deserialize_with = "crate::util::serde::deserialize_from_str_opt")]
+    #[serde(serialize_with = "crate::util::serde::serialize_display_opt")]
+    pub signal: Option<Signal>,
    pub depends_on: BTreeMap<PackageId, BTreeSet<HealthCheckId>>,
 }
--- a/backend/src/config/mod.rs
+++ b/backend/src/config/mod.rs
@@ -0,0 +1,837 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::path::PathBuf;
+use std::time::Duration;
+
+use color_eyre::eyre::eyre;
+use futures::future::{BoxFuture, FutureExt};
+use indexmap::IndexSet;
+use itertools::Itertools;
+use patch_db::{DbHandle, LockReceipt, LockTarget, LockTargetId, LockType, Verifier};
+use rand::SeedableRng;
+use regex::Regex;
+use rpc_toolkit::command;
+use serde_json::Value;
+use tracing::instrument;
+
+use crate::context::RpcContext;
+use crate::db::model::{CurrentDependencies, CurrentDependencyInfo, CurrentDependents};
+use crate::dependencies::{
+    add_dependent_to_current_dependents_lists, break_transitive, heal_all_dependents_transitive,
+    BreakTransitiveReceipts, BreakageRes, Dependencies, DependencyConfig, DependencyError,
+    DependencyErrors, DependencyReceipt, TaggedDependencyError, TryHealReceipts,
+};
+use crate::install::cleanup::{remove_from_current_dependents_lists, UpdateDependencyReceipts};
+use crate::procedure::docker::DockerContainers;
+use crate::s9pk::manifest::{Manifest, PackageId};
+use crate::util::display_none;
+use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
+use crate::Error;
+
+pub mod action;
+pub mod spec;
+pub mod util;
+
+pub use spec::{ConfigSpec, Defaultable};
+use util::NumRange;
+
+use self::action::{ConfigActions, ConfigRes};
+use self::spec::{ConfigPointerReceipts, PackagePointerSpec, ValueSpecPointer};
+
+pub type Config = serde_json::Map<String, Value>;
+pub trait TypeOf {
+    fn type_of(&self) -> &'static str;
+}
+impl TypeOf for Value {
+    fn type_of(&self) -> &'static str {
+        match self {
+            Value::Array(_) => "list",
+            Value::Bool(_) => "boolean",
+            Value::Null => "null",
+            Value::Number(_) => "number",
+            Value::Object(_) => "object",
+            Value::String(_) => "string",
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ConfigurationError {
+    #[error("Timeout Error")]
+    TimeoutError(#[from] TimeoutError),
+    #[error("No Match: {0}")]
+    NoMatch(#[from] NoMatchWithPath),
+    #[error("System Error: {0}")]
+    SystemError(Error),
+    #[error("Permission Denied: {0}")]
+    PermissionDenied(ValueSpecPointer),
+}
+impl From<ConfigurationError> for Error {
+    fn from(err: ConfigurationError) -> Self {
+        let kind = match &err {
+            ConfigurationError::SystemError(e) => e.kind,
+            _ => crate::ErrorKind::ConfigGen,
+        };
+        crate::Error::new(err, kind)
+    }
+}
+
+#[derive(Clone, Copy, Debug, thiserror::Error)]
+#[error("Timeout Error")]
+pub struct TimeoutError;
+
+#[derive(Clone, Debug, thiserror::Error)]
+pub struct NoMatchWithPath {
+    pub path: Vec<String>,
+    pub error: MatchError,
+}
+impl NoMatchWithPath {
+    pub fn new(error: MatchError) -> Self {
+        NoMatchWithPath {
+            path: Vec::new(),
+            error,
+        }
+    }
+    pub fn prepend(mut self, seg: String) -> Self {
+        self.path.push(seg);
+        self
+    }
+}
+impl std::fmt::Display for NoMatchWithPath {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}: {}", self.path.iter().rev().join("."), self.error)
+    }
+}
+impl From<NoMatchWithPath> for Error {
+    fn from(e: NoMatchWithPath) -> Self {
+        ConfigurationError::from(e).into()
+    }
+}
+
+#[derive(Clone, Debug, thiserror::Error)]
+pub enum MatchError {
+    #[error("String {0:?} Does Not Match Pattern {1}")]
+    Pattern(String, Regex),
+    #[error("String {0:?} Is Not In Enum {1:?}")]
+    Enum(String, IndexSet<String>),
+    #[error("Field Is Not Nullable")]
+    NotNullable,
+    #[error("Length Mismatch: expected {0}, actual: {1}")]
+    LengthMismatch(NumRange<usize>, usize),
+    #[error("Invalid Type: expected {0}, actual: {1}")]
+    InvalidType(&'static str, &'static str),
+    #[error("Number Out Of Range: expected {0}, actual: {1}")]
+    OutOfRange(NumRange<f64>, f64),
+    #[error("Number Is Not Integral: {0}")]
+    NonIntegral(f64),
+    #[error("Variant {0:?} Is Not In Union {1:?}")]
+    Union(String, IndexSet<String>),
+    #[error("Variant Is Missing Tag {0:?}")]
+    MissingTag(String),
+    #[error("Property {0:?} Of Variant {1:?} Conflicts With Union Tag")]
+    PropertyMatchesUnionTag(String, String),
+    #[error("Name of Property {0:?} Conflicts With Map Tag Name")]
+    PropertyNameMatchesMapTag(String),
+    #[error("Pointer Is Invalid: {0}")]
+    InvalidPointer(spec::ValueSpecPointer),
+    #[error("Object Key Is Invalid: {0}")]
+    InvalidKey(String),
+    #[error("Value In List Is Not Unique")]
+    ListUniquenessViolation,
+}
+
+#[command(rename = "config-spec", cli_only, blocking, display(display_none))]
+pub fn verify_spec(#[arg] path: PathBuf) -> Result<(), Error> {
+    let mut file = std::fs::File::open(&path)?;
+    let format = match path.extension().and_then(|s| s.to_str()) {
+        Some("yaml") | Some("yml") => IoFormat::Yaml,
+        Some("json") => IoFormat::Json,
+        Some("toml") => IoFormat::Toml,
+        Some("cbor") => IoFormat::Cbor,
+        _ => {
+            return Err(Error::new(
+                eyre!("Unknown file format. Expected one of yaml, json, toml, cbor."),
+                crate::ErrorKind::Deserialization,
+            ));
+        }
+    };
+    let _: ConfigSpec = format.from_reader(&mut file)?;
+
+    Ok(())
+}
+
+#[command(subcommands(get, set))]
+pub fn config(#[arg] id: PackageId) -> Result<PackageId, Error> {
+    Ok(id)
+}
+
+pub struct ConfigGetReceipts {
+    manifest_volumes: LockReceipt<crate::volume::Volumes, ()>,
+    manifest_version: LockReceipt<crate::util::Version, ()>,
+    manifest_config: LockReceipt<Option<ConfigActions>, ()>,
+}
+
+impl ConfigGetReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle, id: &PackageId) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks, id);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<LockTargetId>,
+        id: &PackageId,
+    ) -> impl FnOnce(&Verifier) -> Result<Self, Error> {
+        let manifest_version = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.manifest().version())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        let manifest_volumes = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.manifest().volumes())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        let manifest_config = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.manifest().config())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                manifest_volumes: manifest_volumes.verify(skeleton_key)?,
+                manifest_version: manifest_version.verify(skeleton_key)?,
+                manifest_config: manifest_config.verify(skeleton_key)?,
+            })
+        }
+    }
+}
+
+#[command(display(display_serializable))]
+#[instrument(skip(ctx))]
+pub async fn get(
+    #[context] ctx: RpcContext,
+    #[parent_data] id: PackageId,
+    #[allow(unused_variables)]
+    #[arg(long = "format")]
+    format: Option<IoFormat>,
+) -> Result<ConfigRes, Error> {
+    let mut db = ctx.db.handle();
+    let receipts = ConfigGetReceipts::new(&mut db, &id).await?;
+    let action = receipts
+        .manifest_config
+        .get(&mut db)
+        .await?
+        .ok_or_else(|| Error::new(eyre!("{} has no config", id), crate::ErrorKind::NotFound))?;
+
+    let volumes = receipts.manifest_volumes.get(&mut db).await?;
+    let version = receipts.manifest_version.get(&mut db).await?;
+    action.get(&ctx, &id, &version, &volumes).await
+}
+
+#[command(
+    subcommands(self(set_impl(async, context(RpcContext))), set_dry),
+    display(display_none),
+    metadata(sync_db = true)
+)]
+#[instrument]
+pub fn set(
+    #[parent_data] id: PackageId,
+    #[allow(unused_variables)]
+    #[arg(long = "format")]
+    format: Option<IoFormat>,
+    #[arg(long = "timeout")] timeout: Option<crate::util::serde::Duration>,
+    #[arg(stdin, parse(parse_stdin_deserializable))] config: Option<Config>,
+) -> Result<(PackageId, Option<Config>, Option<Duration>), Error> {
+    Ok((id, config, timeout.map(|d| *d)))
+}
+
+/// So, the new locking finds all the possible locks and lifts them up into a bundle of locks.
+/// Then this bundle will be passed down into the functions that will need to touch the db, and
+/// instead of doing the locks down in the system, we have already done the locks and can
+/// do the operation on the db.
+/// An UnlockedLock has two types, the type of setting and getting from the db, and the second type
+/// is the keys that we need to insert on getting/setting because we have included wild cards into the paths.
+pub struct ConfigReceipts {
+    pub dependency_receipt: DependencyReceipt,
+    pub config_receipts: ConfigPointerReceipts,
+    pub update_dependency_receipts: UpdateDependencyReceipts,
+    pub try_heal_receipts: TryHealReceipts,
+    pub break_transitive_receipts: BreakTransitiveReceipts,
+    configured: LockReceipt<bool, String>,
+    config_actions: LockReceipt<ConfigActions, String>,
+    dependencies: LockReceipt<Dependencies, String>,
+    volumes: LockReceipt<crate::volume::Volumes, String>,
+    version: LockReceipt<crate::util::Version, String>,
+    manifest: LockReceipt<Manifest, String>,
+    system_pointers: LockReceipt<Vec<spec::SystemPointerSpec>, String>,
+    pub current_dependents: LockReceipt<CurrentDependents, String>,
+    pub current_dependencies: LockReceipt<CurrentDependencies, String>,
+    dependency_errors: LockReceipt<DependencyErrors, String>,
+    manifest_dependencies_config: LockReceipt<DependencyConfig, (String, String)>,
+    docker_containers: LockReceipt<DockerContainers, String>,
+}
+
+impl ConfigReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(locks: &mut Vec<LockTargetId>) -> impl FnOnce(&Verifier) -> Result<Self, Error> {
+        let dependency_receipt = DependencyReceipt::setup(locks);
+        let config_receipts = ConfigPointerReceipts::setup(locks);
+        let update_dependency_receipts = UpdateDependencyReceipts::setup(locks);
+        let break_transitive_receipts = BreakTransitiveReceipts::setup(locks);
+        let try_heal_receipts = TryHealReceipts::setup(locks);
+
+        let configured: LockTarget<bool, String> = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.status().configured())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        let config_actions = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .and_then(|x| x.manifest().config())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+
+        let dependencies = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest().dependencies())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+
+        let volumes = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest().volumes())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+
+        let version = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest().version())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+
+        let manifest = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+
+        let system_pointers = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.system_pointers())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        let current_dependents = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.current_dependents())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        let current_dependencies = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.current_dependencies())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        let dependency_errors = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.status().dependency_errors())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        let manifest_dependencies_config = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .and_then(|x| x.manifest().dependencies().star().config())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        let docker_containers = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .and_then(|x| x.manifest().containers())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+
+        move |skeleton_key| {
+            Ok(Self {
+                dependency_receipt: dependency_receipt(skeleton_key)?,
+                config_receipts: config_receipts(skeleton_key)?,
+                try_heal_receipts: try_heal_receipts(skeleton_key)?,
+                break_transitive_receipts: break_transitive_receipts(skeleton_key)?,
+                update_dependency_receipts: update_dependency_receipts(skeleton_key)?,
+                configured: configured.verify(skeleton_key)?,
+                config_actions: config_actions.verify(skeleton_key)?,
+                dependencies: dependencies.verify(skeleton_key)?,
+                volumes: volumes.verify(skeleton_key)?,
+                version: version.verify(skeleton_key)?,
+                manifest: manifest.verify(skeleton_key)?,
+                system_pointers: system_pointers.verify(skeleton_key)?,
+                current_dependents: current_dependents.verify(skeleton_key)?,
+                current_dependencies: current_dependencies.verify(skeleton_key)?,
+                dependency_errors: dependency_errors.verify(skeleton_key)?,
+                manifest_dependencies_config: manifest_dependencies_config.verify(skeleton_key)?,
+                docker_containers: docker_containers.verify(skeleton_key)?,
+            })
+        }
+    }
+}
+
+#[command(rename = "dry", display(display_serializable))]
+#[instrument(skip(ctx))]
+pub async fn set_dry(
+    #[context] ctx: RpcContext,
+    #[parent_data] (id, config, timeout): (PackageId, Option<Config>, Option<Duration>),
+) -> Result<BreakageRes, Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+    let mut breakages = BTreeMap::new();
+    let locks = ConfigReceipts::new(&mut tx).await?;
+    configure(
+        &ctx,
+        &mut tx,
+        &id,
+        config,
+        &timeout,
+        true,
+        &mut BTreeMap::new(),
+        &mut breakages,
+        &locks,
+    )
+    .await?;
+
+    locks.configured.set(&mut tx, true, &id).await?;
+    tx.abort().await?;
+    Ok(BreakageRes(breakages))
+}
+
+#[instrument(skip(ctx))]
+pub async fn set_impl(
+    ctx: RpcContext,
+    (id, config, timeout): (PackageId, Option<Config>, Option<Duration>),
+) -> Result<(), Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+    let mut breakages = BTreeMap::new();
+    let locks = ConfigReceipts::new(&mut tx).await?;
+    configure(
+        &ctx,
+        &mut tx,
+        &id,
+        config,
+        &timeout,
+        false,
+        &mut BTreeMap::new(),
+        &mut breakages,
+        &locks,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(())
+}
+
+#[instrument(skip(ctx, db, receipts))]
+pub async fn configure<'a, Db: DbHandle>(
+    ctx: &RpcContext,
+    db: &'a mut Db,
+    id: &PackageId,
+    config: Option<Config>,
+    timeout: &Option<Duration>,
+    dry_run: bool,
+    overrides: &mut BTreeMap<PackageId, Config>,
+    breakages: &mut BTreeMap<PackageId, TaggedDependencyError>,
+    receipts: &ConfigReceipts,
+) -> Result<(), Error> {
+    configure_rec(
+        ctx, db, id, config, timeout, dry_run, overrides, breakages, receipts,
+    )
+    .await?;
+    receipts.configured.set(db, true, &id).await?;
+    Ok(())
+}
+
+#[instrument(skip(ctx, db, receipts))]
+pub fn configure_rec<'a, Db: DbHandle>(
+    ctx: &'a RpcContext,
+    db: &'a mut Db,
+    id: &'a PackageId,
+    config: Option<Config>,
+    timeout: &'a Option<Duration>,
+    dry_run: bool,
+    overrides: &'a mut BTreeMap<PackageId, Config>,
+    breakages: &'a mut BTreeMap<PackageId, TaggedDependencyError>,
+    receipts: &'a ConfigReceipts,
+) -> BoxFuture<'a, Result<(), Error>> {
+    async move {
+        // fetch data from db
+        let action = receipts
+            .config_actions
+            .get(db, id)
+            .await?
+            .ok_or_else(not_found)?;
+        let dependencies = receipts
+            .dependencies
+            .get(db, id)
+            .await?
+            .ok_or_else(not_found)?;
+        let volumes = receipts.volumes.get(db, id).await?.ok_or_else(not_found)?;
+        let is_needs_config = !receipts
+            .configured
+            .get(db, id)
+            .await?
+            .ok_or_else(not_found)?;
+        let version = receipts.version.get(db, id).await?.ok_or_else(not_found)?;
+
+        // get current config and current spec
+        let ConfigRes {
+            config: old_config,
+            spec,
+        } = action.get(ctx, id, &version, &volumes).await?;
+
+        // determine new config to use
+        let mut config = if let Some(config) = config.or_else(|| old_config.clone()) {
+            config
+        } else {
+            spec.gen(&mut rand::rngs::StdRng::from_entropy(), timeout)?
+        };
+
+        let manifest = receipts.manifest.get(db, id).await?.ok_or_else(not_found)?;
+
+        spec.validate(&manifest)?;
+        spec.matches(&config)?; // check that new config matches spec
+        spec.update(
+            ctx,
+            db,
+            &manifest,
+            &*overrides,
+            &mut config,
+            &receipts.config_receipts,
+        )
+        .await?; // dereference pointers in the new config
+
+        // create backreferences to pointers
+        let mut sys = receipts
+            .system_pointers
+            .get(db, &id)
+            .await?
+            .ok_or_else(not_found)?;
+        sys.truncate(0);
+        let mut current_dependencies: CurrentDependencies = CurrentDependencies(
+            dependencies
+                .0
+                .iter()
+                .filter_map(|(id, info)| {
+                    if info.requirement.required() {
+                        Some((id.clone(), CurrentDependencyInfo::default()))
+                    } else {
+                        None
+                    }
+                })
+                .collect(),
+        );
+        for ptr in spec.pointers(&config)? {
+            match ptr {
+                ValueSpecPointer::Package(pkg_ptr) => {
+                    if let Some(current_dependency) =
+                        current_dependencies.0.get_mut(pkg_ptr.package_id())
+                    {
+                        current_dependency.pointers.push(pkg_ptr);
+                    } else {
+                        current_dependencies.0.insert(
+                            pkg_ptr.package_id().to_owned(),
+                            CurrentDependencyInfo {
+                                pointers: vec![pkg_ptr],
+                                health_checks: BTreeSet::new(),
+                            },
+                        );
+                    }
+                }
+                ValueSpecPointer::System(s) => sys.push(s),
+            }
+        }
+        receipts.system_pointers.set(db, sys, &id).await?;
+
+        let signal = if !dry_run {
+            // run config action
+            let res = action
+                .set(ctx, id, &version, &dependencies, &volumes, &config)
+                .await?;
+
+            // track dependencies with no pointers
+            for (package_id, health_checks) in res.depends_on.into_iter() {
+                if let Some(current_dependency) = current_dependencies.0.get_mut(&package_id) {
+                    current_dependency.health_checks.extend(health_checks);
+                } else {
+                    current_dependencies.0.insert(
+                        package_id,
+                        CurrentDependencyInfo {
+                            pointers: Vec::new(),
+                            health_checks,
+                        },
+                    );
+                }
+            }
+
+            // track dependency health checks
+            current_dependencies = current_dependencies.map(|x| {
+                x.into_iter()
+                    .filter(|(dep_id, _)| {
+                        if dep_id != id && !manifest.dependencies.0.contains_key(dep_id) {
+                            tracing::warn!("Illegal dependency specified: {}", dep_id);
+                            false
+                        } else {
+                            true
+                        }
+                    })
+                    .collect()
+            });
+            res.signal
+        } else {
+            None
+        };
+
+        // update dependencies
+        let prev_current_dependencies = receipts
+            .current_dependencies
+            .get(db, &id)
+            .await?
+            .unwrap_or_default();
+        remove_from_current_dependents_lists(
+            db,
+            id,
+            &prev_current_dependencies,
+            &receipts.current_dependents,
+        )
+        .await?; // remove previous
+        add_dependent_to_current_dependents_lists(
+            db,
+            id,
+            &current_dependencies,
+            &receipts.current_dependents,
+        )
+        .await?; // add new
+        current_dependencies.0.remove(id);
+        receipts
+            .current_dependencies
+            .set(db, current_dependencies.clone(), &id)
+            .await?;
+
+        let errs = receipts
+            .dependency_errors
+            .get(db, &id)
+            .await?
+            .ok_or_else(not_found)?;
+        tracing::warn!("Dependency Errors: {:?}", errs);
+        let errs = DependencyErrors::init(
+            ctx,
+            db,
+            &manifest,
+            &current_dependencies,
+            &receipts.dependency_receipt.try_heal,
+        )
+        .await?;
+        receipts.dependency_errors.set(db, errs, &id).await?;
+
+        // cache current config for dependents
+        overrides.insert(id.clone(), config.clone());
+
+        // handle dependents
+        let dependents = receipts
+            .current_dependents
+            .get(db, id)
+            .await?
+            .ok_or_else(not_found)?;
+        let prev = if is_needs_config { None } else { old_config }
+            .map(Value::Object)
+            .unwrap_or_default();
+        let next = Value::Object(config.clone());
+        for (dependent, dep_info) in dependents.0.iter().filter(|(dep_id, _)| dep_id != &id) {
+            let dependent_container = receipts.docker_containers.get(db, &dependent).await?;
+            let dependent_container = &dependent_container;
+            // check if config passes dependent check
+            if let Some(cfg) = receipts
+                .manifest_dependencies_config
+                .get(db, (&dependent, &id))
+                .await?
+            {
+                let manifest = receipts
+                    .manifest
+                    .get(db, &dependent)
+                    .await?
+                    .ok_or_else(not_found)?;
+                if let Err(error) = cfg
+                    .check(
+                        ctx,
+                        dependent_container,
+                        dependent,
+                        &manifest.version,
+                        &manifest.volumes,
+                        id,
+                        &config,
+                    )
+                    .await?
+                {
+                    let dep_err = DependencyError::ConfigUnsatisfied { error };
+                    break_transitive(
+                        db,
+                        dependent,
+                        id,
+                        dep_err,
+                        breakages,
+                        &receipts.break_transitive_receipts,
+                    )
+                    .await?;
+                }
+
+                // handle backreferences
+                for ptr in &dep_info.pointers {
+                    if let PackagePointerSpec::Config(cfg_ptr) = ptr {
+                        if cfg_ptr.select(&next) != cfg_ptr.select(&prev) {
+                            if let Err(e) = configure_rec(
+                                ctx, db, dependent, None, timeout, dry_run, overrides, breakages,
+                                receipts,
+                            )
+                            .await
+                            {
+                                if e.kind == crate::ErrorKind::ConfigRulesViolation {
+                                    break_transitive(
+                                        db,
+                                        dependent,
+                                        id,
+                                        DependencyError::ConfigUnsatisfied {
+                                            error: format!("{}", e),
+                                        },
+                                        breakages,
+                                        &receipts.break_transitive_receipts,
+                                    )
+                                    .await?;
+                                } else {
+                                    return Err(e);
+                                }
+                            }
+                        }
+                    }
+                }
+                heal_all_dependents_transitive(ctx, db, id, &receipts.dependency_receipt).await?;
+            }
+        }
+
+        if let Some(signal) = signal {
+            match ctx.managers.get(&(id.clone(), version.clone())).await {
+                None => {
+                    // in theory this should never happen, which indicates this function should be moved behind the
+                    // Manager interface
+                    return Err(Error::new(
+                        eyre!("Manager Not Found for package being configured"),
+                        crate::ErrorKind::Incoherent,
+                    ));
+                }
+                Some(m) => {
+                    m.signal(&signal).await?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+    .boxed()
+}
+#[instrument]
+pub fn not_found() -> Error {
+    Error::new(eyre!("Could not find"), crate::ErrorKind::Incoherent)
+}
+
+/// We want to have a double check that the paths are what we expect them to be.
+/// Found that earlier the paths where not what we expected them to be.
+#[tokio::test]
+async fn ensure_creation_of_config_paths_makes_sense() {
+    let mut fake = patch_db::test_utils::NoOpDb();
+    let config_locks = ConfigReceipts::new(&mut fake).await.unwrap();
+    assert_eq!(
+        &format!("{}", config_locks.configured.lock.glob),
+        "/package-data/*/installed/status/configured"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.config_actions.lock.glob),
+        "/package-data/*/installed/manifest/config"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.dependencies.lock.glob),
+        "/package-data/*/installed/manifest/dependencies"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.volumes.lock.glob),
+        "/package-data/*/installed/manifest/volumes"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.version.lock.glob),
+        "/package-data/*/installed/manifest/version"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.volumes.lock.glob),
+        "/package-data/*/installed/manifest/volumes"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.manifest.lock.glob),
+        "/package-data/*/installed/manifest"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.manifest.lock.glob),
+        "/package-data/*/installed/manifest"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.system_pointers.lock.glob),
+        "/package-data/*/installed/system-pointers"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.current_dependents.lock.glob),
+        "/package-data/*/installed/current-dependents"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.dependency_errors.lock.glob),
+        "/package-data/*/installed/status/dependency-errors"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.manifest_dependencies_config.lock.glob),
+        "/package-data/*/installed/manifest/dependencies/*/config"
+    );
+    assert_eq!(
+        &format!("{}", config_locks.system_pointers.lock.glob),
+        "/package-data/*/installed/system-pointers"
+    );
+}
--- a/core/startos/src/config/spec.rs
+++ b/core/startos/src/config/spec.rs
@@ -1,4 +1,4 @@
-use std::borrow::Cow;
+use std::borrow::{Borrow, Cow};
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt;
 use std::fmt::Debug;
@@ -9,16 +9,15 @@ use std::sync::Arc;
 use std::time::Duration;

 use async_trait::async_trait;
-use imbl::Vector;
-use imbl_value::InternedString;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use jsonpath_lib::Compiled as CompiledJsonPath;
-use patch_db::value::{Number, Value};
+use patch_db::{DbHandle, LockReceipt, LockType};
 use rand::{CryptoRng, Rng};
 use regex::Regex;
 use serde::de::{MapAccess, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_json::{Number, Value};
 use sqlx::PgPool;

 use super::util::{self, CharSet, NumRange, UniqueBy, STATIC_NULL};
@@ -27,8 +26,8 @@ use crate::config::ConfigurationError;
 use crate::context::RpcContext;
 use crate::net::interface::InterfaceId;
 use crate::net::keys::Key;
-use crate::prelude::*;
 use crate::s9pk::manifest::{Manifest, PackageId};
+use crate::Error;

 // Config Value Specifications
 #[async_trait]
@@ -40,12 +39,14 @@ pub trait ValueSpec {
    // since not all inVariant can be checked by the type
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath>;
    // update is to fill in values for environment pointers recursively
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError>;
    // returns all pointers that are live in the provided config
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath>;
@@ -105,7 +106,7 @@ where
        rng: &mut R,
        timeout: &Option<Duration>,
    ) -> Result<Value, Self::Error> {
-        self.gen_with(self.default_spec(), rng, timeout)
+        self.gen_with(self.default_spec().borrow(), rng, timeout)
    }
 }

@@ -155,15 +156,17 @@ where
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        self.inner.validate(manifest)
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        self.inner
-            .update(ctx, manifest, config_overrides, value)
+            .update(ctx, db, manifest, config_overrides, value, receipts)
            .await
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -198,15 +201,17 @@ where
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        self.inner.validate(manifest)
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        self.inner
-            .update(ctx, manifest, config_overrides, value)
+            .update(ctx, db, manifest, config_overrides, value, receipts)
            .await
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -274,15 +279,17 @@ where
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        self.inner.validate(manifest)
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        self.inner
-            .update(ctx, manifest, config_overrides, value)
+            .update(ctx, db, manifest, config_overrides, value, receipts)
            .await
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -387,22 +394,48 @@ impl ValueSpec for ValueSpecAny {
            ValueSpecAny::Pointer(a) => a.validate(manifest),
        }
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        match self {
-            ValueSpecAny::Boolean(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Enum(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::List(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Number(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Object(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::String(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Union(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Pointer(a) => a.update(ctx, manifest, config_overrides, value).await,
+            ValueSpecAny::Boolean(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::Enum(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::List(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::Number(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::Object(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::String(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::Union(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecAny::Pointer(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
        }
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -480,12 +513,14 @@ impl ValueSpec for ValueSpecBoolean {
    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        _ctx: &RpcContext,
+        _db: &mut Db,
        _manifest: &Manifest,
        _config_overrides: &BTreeMap<PackageId, Config>,
        _value: &mut Value,
+        _receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        Ok(())
    }
@@ -549,7 +584,7 @@ impl ValueSpec for ValueSpecEnum {
    fn matches(&self, val: &Value) -> Result<(), NoMatchWithPath> {
        match val {
            Value::String(b) => {
-                if self.values.contains(&**b) {
+                if self.values.contains(b) {
                    Ok(())
                } else {
                    Err(NoMatchWithPath::new(MatchError::Enum(
@@ -568,12 +603,14 @@ impl ValueSpec for ValueSpecEnum {
    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        _ctx: &RpcContext,
+        _db: &mut Db,
        _manifest: &Manifest,
        _config_overrides: &BTreeMap<PackageId, Config>,
        _value: &mut Value,
+        _receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        Ok(())
    }
@@ -591,7 +628,7 @@ impl ValueSpec for ValueSpecEnum {
    }
 }
 impl DefaultableWith for ValueSpecEnum {
-    type DefaultSpec = Arc<String>;
+    type DefaultSpec = String;
    type Error = crate::util::Never;

    fn gen_with<R: Rng + CryptoRng + Sync + Send + Send>(
@@ -629,13 +666,13 @@ where
                        .map(|(i, v)| {
                            self.spec
                                .matches(v)
-                                .map_err(|e| e.prepend(InternedString::from_display(&i)))?;
+                                .map_err(|e| e.prepend(format!("{}", i)))?;
                            if l.iter()
                                .enumerate()
                                .any(|(i2, v2)| i != i2 && self.spec.eq(v, v2))
                            {
                                Err(NoMatchWithPath::new(MatchError::ListUniquenessViolation)
-                                    .prepend(InternedString::from_display(&i)))
+                                    .prepend(format!("{}", i)))
                            } else {
                                Ok(())
                            }
@@ -653,19 +690,25 @@ where
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        self.spec.validate(manifest)
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        if let Value::Array(ref mut ls) = value {
-            for (i, val) in ls.iter_mut().enumerate() {
-                match self.spec.update(ctx, manifest, config_overrides, val).await {
-                    Err(ConfigurationError::NoMatch(e)) => Err(ConfigurationError::NoMatch(
-                        e.prepend(InternedString::from_display(&i)),
-                    )),
+            for (i, val) in ls.into_iter().enumerate() {
+                match self
+                    .spec
+                    .update(ctx, db, manifest, config_overrides, val, receipts)
+                    .await
+                {
+                    Err(ConfigurationError::NoMatch(e)) => {
+                        Err(ConfigurationError::NoMatch(e.prepend(format!("{}", i))))
+                    }
                    a => a,
                }?;
            }
@@ -712,9 +755,9 @@ where
        rng: &mut R,
        timeout: &Option<Duration>,
    ) -> Result<Value, Self::Error> {
-        let mut res = Vector::new();
+        let mut res = Vec::new();
        for spec_member in spec.iter() {
-            res.push_back(self.spec.gen_with(spec_member, rng, timeout)?);
+            res.push(self.spec.gen_with(spec_member, rng, timeout)?);
        }
        Ok(Value::Array(res))
    }
@@ -755,19 +798,36 @@ impl ValueSpec for ValueSpecList {
            ValueSpecList::Union(a) => a.validate(manifest),
        }
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        match self {
-            ValueSpecList::Enum(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Number(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Object(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::String(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Union(a) => a.update(ctx, manifest, config_overrides, value).await,
+            ValueSpecList::Enum(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecList::Number(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecList::Object(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecList::String(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecList::Union(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
        }
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -825,7 +885,7 @@ impl Defaultable for ValueSpecList {
                )
                    .contains(&ret.len())
                {
-                    ret.push_back(
+                    ret.push(
                        a.inner
                            .inner
                            .spec
@@ -881,12 +941,14 @@ impl ValueSpec for ValueSpecNumber {
    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        _ctx: &RpcContext,
+        _db: &mut Db,
        _manifest: &Manifest,
        _config_overrides: &BTreeMap<PackageId, Config>,
        _value: &mut Value,
+        _receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        Ok(())
    }
@@ -943,15 +1005,19 @@ impl ValueSpec for ValueSpecObject {
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        self.spec.validate(manifest)
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        if let Value::Object(o) = value {
-            self.spec.update(ctx, manifest, config_overrides, o).await
+            self.spec
+                .update(ctx, db, manifest, config_overrides, o, receipts)
+                .await
        } else {
            Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
                MatchError::InvalidType("object", value.type_of()),
@@ -1008,11 +1074,11 @@ impl Defaultable for ValueSpecObject {
 }

 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct ConfigSpec(pub IndexMap<InternedString, ValueSpecAny>);
+pub struct ConfigSpec(pub IndexMap<String, ValueSpecAny>);
 impl ConfigSpec {
    pub fn matches(&self, value: &Config) -> Result<(), NoMatchWithPath> {
        for (key, val) in self.0.iter() {
-            if let Some(v) = value.get(&**key) {
+            if let Some(v) = value.get(key) {
                val.matches(v).map_err(|e| e.prepend(key.clone()))?;
            } else {
                val.matches(&Value::Null)
@@ -1042,21 +1108,27 @@ impl ConfigSpec {
        Ok(())
    }

-    pub async fn update(
+    pub async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        cfg: &mut Config,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        for (k, vs) in self.0.iter() {
            match cfg.get_mut(k) {
                None => {
                    let mut v = Value::Null;
-                    vs.update(ctx, manifest, config_overrides, &mut v).await?;
+                    vs.update(ctx, db, manifest, config_overrides, &mut v, receipts)
+                        .await?;
                    cfg.insert(k.clone(), v);
                }
-                Some(v) => match vs.update(ctx, manifest, config_overrides, v).await {
+                Some(v) => match vs
+                    .update(ctx, db, manifest, config_overrides, v, receipts)
+                    .await
+                {
                    Err(ConfigurationError::NoMatch(e)) => {
                        Err(ConfigurationError::NoMatch(e.prepend(k.clone())))
                    }
@@ -1175,7 +1247,7 @@ impl<'de> Deserialize<'de> for ValueSpecString {
                })
            }
        }
-        const FIELDS: &[&str] = &[
+        const FIELDS: &'static [&'static str] = &[
            "pattern",
            "pattern-description",
            "textarea",
@@ -1196,7 +1268,7 @@ impl ValueSpec for ValueSpecString {
                        Ok(())
                    } else {
                        Err(NoMatchWithPath::new(MatchError::Pattern(
-                            s.clone(),
+                            s.to_owned(),
                            pattern.pattern.clone(),
                        )))
                    }
@@ -1214,12 +1286,14 @@ impl ValueSpec for ValueSpecString {
    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        _ctx: &RpcContext,
+        _db: &mut Db,
        _manifest: &Manifest,
        _config_overrides: &BTreeMap<PackageId, Config>,
        _value: &mut Value,
+        _receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        Ok(())
    }
@@ -1278,11 +1352,11 @@ pub enum DefaultString {
    Entropy(Entropy),
 }
 impl DefaultString {
-    pub fn gen<R: Rng + CryptoRng + Sync + Send>(&self, rng: &mut R) -> Arc<String> {
-        Arc::new(match self {
+    pub fn gen<R: Rng + CryptoRng + Sync + Send>(&self, rng: &mut R) -> String {
+        match self {
            DefaultString::Literal(s) => s.clone(),
            DefaultString::Entropy(e) => e.gen(rng),
-        })
+        }
    }
 }

@@ -1306,7 +1380,7 @@ impl Entropy {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct UnionTag {
-    pub id: InternedString,
+    pub id: String,
    pub name: String,
    pub description: Option<String>,
    pub variant_names: BTreeMap<String, String>,
@@ -1327,7 +1401,7 @@ impl<'de> serde::de::Deserialize<'de> for ValueSpecUnion {
        #[serde(rename_all = "kebab-case")]
        #[serde(untagged)]
        pub enum _UnionTag {
-            Old(InternedString),
+            Old(String),
            New(UnionTag),
        }
        #[derive(Deserialize)]
@@ -1345,7 +1419,7 @@ impl<'de> serde::de::Deserialize<'de> for ValueSpecUnion {
            tag: match u.tag {
                _UnionTag::Old(id) => UnionTag {
                    id: id.clone(),
-                    name: id.to_string(),
+                    name: id,
                    description: None,
                    variant_names: u
                        .variants
@@ -1387,10 +1461,10 @@ impl ValueSpec for ValueSpecUnion {
    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
        match value {
            Value::Object(o) => {
-                if let Some(Value::String(ref tag)) = o.get(&*self.tag.id) {
-                    if let Some(obj_spec) = self.variants.get(&**tag) {
+                if let Some(Value::String(ref tag)) = o.get(&self.tag.id) {
+                    if let Some(obj_spec) = self.variants.get(tag) {
                        let mut without_tag = o.clone();
-                        without_tag.remove(&*self.tag.id);
+                        without_tag.remove(&self.tag.id);
                        obj_spec.matches(&without_tag)
                    } else {
                        Err(NoMatchWithPath::new(MatchError::Union(
@@ -1413,7 +1487,7 @@ impl ValueSpec for ValueSpecUnion {
    }
    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        for (name, variant) in &self.variants {
-            if variant.0.get(&*self.tag.id).is_some() {
+            if variant.0.get(&self.tag.id).is_some() {
                return Err(NoMatchWithPath::new(MatchError::PropertyMatchesUnionTag(
                    self.tag.id.clone(),
                    name.clone(),
@@ -1423,23 +1497,28 @@ impl ValueSpec for ValueSpecUnion {
        }
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
+            match o.get(&self.tag.id) {
                None => Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
                    MatchError::MissingTag(self.tag.id.clone()),
                ))),
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
+                Some(Value::String(tag)) => match self.variants.get(tag) {
                    None => Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
                        MatchError::Union(tag.clone(), self.variants.keys().cloned().collect()),
                    ))),
-                    Some(spec) => spec.update(ctx, manifest, config_overrides, o).await,
+                    Some(spec) => {
+                        spec.update(ctx, db, manifest, config_overrides, o, receipts)
+                            .await
+                    }
                },
                Some(other) => Err(ConfigurationError::NoMatch(
                    NoMatchWithPath::new(MatchError::InvalidType("string", other.type_of()))
@@ -1454,11 +1533,11 @@ impl ValueSpec for ValueSpecUnion {
    }
    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
+            match o.get(&self.tag.id) {
                None => Err(NoMatchWithPath::new(MatchError::MissingTag(
                    self.tag.id.clone(),
                ))),
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
+                Some(Value::String(tag)) => match self.variants.get(tag) {
                    None => Err(NoMatchWithPath::new(MatchError::Union(
                        tag.clone(),
                        self.variants.keys().cloned().collect(),
@@ -1480,8 +1559,8 @@ impl ValueSpec for ValueSpecUnion {
    }
    fn requires(&self, id: &PackageId, value: &Value) -> bool {
        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
+            match o.get(&self.tag.id) {
+                Some(Value::String(tag)) => match self.variants.get(tag) {
                    None => false,
                    Some(spec) => spec.requires(id, o),
                },
@@ -1499,7 +1578,7 @@ impl ValueSpec for ValueSpecUnion {
    }
 }
 impl DefaultableWith for ValueSpecUnion {
-    type DefaultSpec = Arc<String>;
+    type DefaultSpec = String;
    type Error = ConfigurationError;

    fn gen_with<R: Rng + CryptoRng + Sync + Send>(
@@ -1508,7 +1587,7 @@ impl DefaultableWith for ValueSpecUnion {
        rng: &mut R,
        timeout: &Option<Duration>,
    ) -> Result<Value, Self::Error> {
-        let variant = if let Some(v) = self.variants.get(&**spec) {
+        let variant = if let Some(v) = self.variants.get(spec) {
            v
        } else {
            return Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
@@ -1564,16 +1643,24 @@ impl ValueSpec for ValueSpecPointer {
            ValueSpecPointer::System(a) => a.validate(manifest),
        }
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
        match self {
-            ValueSpecPointer::Package(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecPointer::System(a) => a.update(ctx, manifest, config_overrides, value).await,
+            ValueSpecPointer::Package(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
+            ValueSpecPointer::System(a) => {
+                a.update(ctx, db, manifest, config_overrides, value, receipts)
+                    .await
+            }
        }
    }
    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -1610,17 +1697,23 @@ impl PackagePointerSpec {
            PackagePointerSpec::Config(ConfigPointer { package_id, .. }) => package_id,
        }
    }
-    async fn deref(
+    async fn deref<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<Value, ConfigurationError> {
        match &self {
            PackagePointerSpec::TorKey(key) => key.deref(&manifest.id, &ctx.secret_store).await,
-            PackagePointerSpec::TorAddress(tor) => tor.deref(ctx).await,
-            PackagePointerSpec::LanAddress(lan) => lan.deref(ctx).await,
-            PackagePointerSpec::Config(cfg) => cfg.deref(ctx, config_overrides).await,
+            PackagePointerSpec::TorAddress(tor) => {
+                tor.deref(db, &receipts.interface_addresses_receipt).await
+            }
+            PackagePointerSpec::LanAddress(lan) => {
+                lan.deref(db, &receipts.interface_addresses_receipt).await
+            }
+            PackagePointerSpec::Config(cfg) => cfg.deref(ctx, db, config_overrides, receipts).await,
        }
    }
 }
@@ -1661,14 +1754,18 @@ impl ValueSpec for PackagePointerSpec {
            _ => Ok(()),
        }
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        manifest: &Manifest,
        config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
-        *value = self.deref(ctx, manifest, config_overrides).await?;
+        *value = self
+            .deref(ctx, db, manifest, config_overrides, receipts)
+            .await?;
        Ok(())
    }
    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
@@ -1691,19 +1788,18 @@ pub struct TorAddressPointer {
    interface: InterfaceId,
 }
 impl TorAddressPointer {
-    async fn deref(&self, ctx: &RpcContext) -> Result<Value, ConfigurationError> {
-        let addr = ctx
-            .db
-            .peek()
+    async fn deref<Db: DbHandle>(
+        &self,
+        db: &mut Db,
+        receipt: &InterfaceAddressesReceipt,
+    ) -> Result<Value, ConfigurationError> {
+        let addr = receipt
+            .interface_addresses
+            .get(db, (&self.package_id, &self.interface))
            .await
-            .as_package_data()
-            .as_idx(&self.package_id)
-            .and_then(|pde| pde.as_installed())
-            .and_then(|i| i.as_interface_addresses().as_idx(&self.interface))
-            .and_then(|a| a.as_tor_address().de().transpose())
-            .transpose()
-            .map_err(|e| ConfigurationError::SystemError(e))?;
-        Ok(addr.map(Arc::new).map(Value::String).unwrap_or(Value::Null))
+            .map_err(|e| ConfigurationError::SystemError(Error::from(e)))?
+            .and_then(|addresses| addresses.tor_address);
+        Ok(addr.to_owned().map(Value::String).unwrap_or(Value::Null))
    }
 }
 impl fmt::Display for TorAddressPointer {
@@ -1717,6 +1813,39 @@ impl fmt::Display for TorAddressPointer {
    }
 }

+pub struct InterfaceAddressesReceipt {
+    interface_addresses: LockReceipt<crate::db::model::InterfaceAddresses, (String, String)>,
+}
+
+impl InterfaceAddressesReceipt {
+    pub async fn new<'a>(db: &'a mut impl DbHandle) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        // let cleanup_receipts = CleanupFailedReceipts::setup(locks);
+
+        let interface_addresses = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.interface_addresses().star())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                // cleanup_receipts: cleanup_receipts(skeleton_key)?,
+                interface_addresses: interface_addresses.verify(skeleton_key)?,
+            })
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct LanAddressPointer {
@@ -1733,26 +1862,73 @@ impl fmt::Display for LanAddressPointer {
    }
 }
 impl LanAddressPointer {
-    async fn deref(&self, ctx: &RpcContext) -> Result<Value, ConfigurationError> {
-        let addr = ctx
-            .db
-            .peek()
+    async fn deref<Db: DbHandle>(
+        &self,
+        db: &mut Db,
+        receipts: &InterfaceAddressesReceipt,
+    ) -> Result<Value, ConfigurationError> {
+        let addr = receipts
+            .interface_addresses
+            .get(db, (&self.package_id, &self.interface))
            .await
-            .as_package_data()
-            .as_idx(&self.package_id)
-            .and_then(|pde| pde.as_installed())
-            .and_then(|i| i.as_interface_addresses().as_idx(&self.interface))
-            .and_then(|a| a.as_lan_address().de().transpose())
-            .transpose()
-            .map_err(|e| ConfigurationError::SystemError(e))?;
-        Ok(addr
-            .to_owned()
-            .map(Arc::new)
-            .map(Value::String)
-            .unwrap_or(Value::Null))
+            .ok()
+            .flatten()
+            .and_then(|x| x.lan_address);
+        Ok(addr.to_owned().map(Value::String).unwrap_or(Value::Null))
    }
 }

+pub struct ConfigPointerReceipts {
+    interface_addresses_receipt: InterfaceAddressesReceipt,
+    manifest_volumes: LockReceipt<crate::volume::Volumes, String>,
+    manifest_version: LockReceipt<crate::util::Version, String>,
+    config_actions: LockReceipt<super::action::ConfigActions, String>,
+}
+
+impl ConfigPointerReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        let interface_addresses_receipt = InterfaceAddressesReceipt::setup(locks);
+
+        let manifest_volumes = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest().volumes())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        let manifest_version = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .map(|x| x.manifest().version())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        let config_actions = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .installed()
+            .and_then(|x| x.manifest().config())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                interface_addresses_receipt: interface_addresses_receipt(skeleton_key)?,
+                manifest_volumes: manifest_volumes.verify(skeleton_key)?,
+                config_actions: config_actions.verify(skeleton_key)?,
+                manifest_version: manifest_version.verify(skeleton_key)?,
+            })
+        }
+    }
+}
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct ConfigPointer {
@@ -1764,34 +1940,25 @@ impl ConfigPointer {
    pub fn select(&self, val: &Value) -> Value {
        self.selector.select(self.multi, val)
    }
-    async fn deref(
+    async fn deref<Db: DbHandle>(
        &self,
        ctx: &RpcContext,
+        db: &mut Db,
        config_overrides: &BTreeMap<PackageId, Config>,
+        receipts: &ConfigPointerReceipts,
    ) -> Result<Value, ConfigurationError> {
        if let Some(cfg) = config_overrides.get(&self.package_id) {
            Ok(self.select(&Value::Object(cfg.clone())))
        } else {
            let id = &self.package_id;
-            let db = ctx.db.peek().await;
-            let manifest = db.as_package_data().as_idx(id).map(|pde| pde.as_manifest());
-            let cfg_actions = manifest.and_then(|m| m.as_config().transpose_ref());
-            if let (Some(manifest), Some(cfg_actions)) = (manifest, cfg_actions) {
+            let version = receipts.manifest_version.get(db, id).await.ok().flatten();
+            let cfg_actions = receipts.config_actions.get(db, id).await.ok().flatten();
+            let volumes = receipts.manifest_volumes.get(db, id).await.ok().flatten();
+            if let (Some(version), Some(cfg_actions), Some(volumes)) =
+                (&version, &cfg_actions, &volumes)
+            {
                let cfg_res = cfg_actions
-                    .de()
-                    .map_err(|e| ConfigurationError::SystemError(e))?
-                    .get(
-                        ctx,
-                        &self.package_id,
-                        &manifest
-                            .as_version()
-                            .de()
-                            .map_err(|e| ConfigurationError::SystemError(e))?,
-                        &manifest
-                            .as_volumes()
-                            .de()
-                            .map_err(|e| ConfigurationError::SystemError(e))?,
-                    )
+                    .get(ctx, &self.package_id, version, volumes)
                    .await
                    .map_err(|e| ConfigurationError::SystemError(e))?;
                if let Some(cfg) = cfg_res.config {
@@ -1823,7 +1990,7 @@ pub struct ConfigSelector {
 }
 impl ConfigSelector {
    fn select(&self, multi: bool, val: &Value) -> Value {
-        let selected = self.compiled.select(&val).ok().unwrap_or_else(Vector::new);
+        let selected = self.compiled.select(&val).ok().unwrap_or_else(Vec::new);
        if multi {
            Value::Array(selected.into_iter().cloned().collect())
        } else {
@@ -1894,19 +2061,18 @@ impl TorKeyPointer {
            ));
        }
        let key = Key::for_interface(
-            secrets
+            &mut secrets
                .acquire()
                .await
-                .map_err(|e| ConfigurationError::SystemError(e.into()))?
-                .as_mut(),
+                .map_err(|e| ConfigurationError::SystemError(e.into()))?,
            Some((self.package_id.clone(), self.interface.clone())),
        )
        .await
        .map_err(ConfigurationError::SystemError)?;
-        Ok(Value::String(Arc::new(base32::encode(
+        Ok(Value::String(base32::encode(
            base32::Alphabet::RFC4648 { padding: false },
            &key.tor_key().as_bytes(),
-        ))))
+        )))
    }
 }
 impl fmt::Display for TorKeyPointer {
@@ -1926,7 +2092,7 @@ impl fmt::Display for SystemPointerSpec {
    }
 }
 impl SystemPointerSpec {
-    async fn deref(&self, _ctx: &RpcContext) -> Result<Value, ConfigurationError> {
+    async fn deref<Db: DbHandle>(&self, _db: &mut Db) -> Result<Value, ConfigurationError> {
        #[allow(unreachable_code)]
        Ok(match *self {})
    }
@@ -1949,14 +2115,17 @@ impl ValueSpec for SystemPointerSpec {
    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
        Ok(())
    }
-    async fn update(
+    async fn update<Db: DbHandle>(
        &self,
-        ctx: &RpcContext,
+        _ctx: &RpcContext,
+        db: &mut Db,
        _manifest: &Manifest,
        _config_overrides: &BTreeMap<PackageId, Config>,
        value: &mut Value,
+
+        _receipts: &ConfigPointerReceipts,
    ) -> Result<(), ConfigurationError> {
-        *value = self.deref(ctx).await?;
+        *value = self.deref(db).await?;
        Ok(())
    }
    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
--- a/core/startos/src/config/util.rs
+++ b/core/startos/src/config/util.rs
@@ -1,9 +1,9 @@
 use std::borrow::Cow;
 use std::ops::{Bound, RangeBounds, RangeInclusive};

-use patch_db::Value;
 use rand::distributions::Distribution;
 use rand::Rng;
+use serde_json::Value;

 use super::Config;

@@ -321,7 +321,7 @@ impl UniqueBy {
        match self {
            UniqueBy::Any(any) => any.iter().any(|u| u.eq(lhs, rhs)),
            UniqueBy::All(all) => all.iter().all(|u| u.eq(lhs, rhs)),
-            UniqueBy::Exactly(key) => lhs.get(&**key) == rhs.get(&**key),
+            UniqueBy::Exactly(key) => lhs.get(key) == rhs.get(key),
            UniqueBy::NotUnique => false,
        }
    }
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -6,7 +6,8 @@ use std::sync::Arc;

 use clap::ArgMatches;
 use color_eyre::eyre::eyre;
-use cookie_store::{CookieStore, RawCookie};
+use cookie::Cookie;
+use cookie_store::CookieStore;
 use josekit::jwk::Jwk;
 use reqwest::Proxy;
 use reqwest_cookie_store::CookieStoreMutex;
@@ -16,11 +17,12 @@ use rpc_toolkit::Context;
 use serde::Deserialize;
 use tracing::instrument;

-use super::setup::CURRENT_SECRET;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::util::config::{load_config_from_paths, local_config_path};
 use crate::ResultExt;

+use super::setup::CURRENT_SECRET;
+
 #[derive(Debug, Default, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct CliContextConfig {
@@ -52,8 +54,7 @@ impl Drop for CliContextSeed {
            true,
        )
        .unwrap();
-        let mut store = self.cookie_store.lock().unwrap();
-        store.remove("localhost", "", "local");
+        let store = self.cookie_store.lock().unwrap();
        store.save_json(&mut *writer).unwrap();
        writer.sync_all().unwrap();
        std::fs::rename(tmp, &self.cookie_path).unwrap();
@@ -67,7 +68,7 @@ const DEFAULT_PORT: u16 = 5959;
 pub struct CliContext(Arc<CliContextSeed>);
 impl CliContext {
    /// BLOCKING
-    #[instrument(skip_all)]
+    #[instrument(skip(matches))]
    pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
        let local_config_path = local_config_path();
        let base: CliContextConfig = load_config_from_paths(
@@ -100,25 +101,19 @@ impl CliContext {
                .unwrap_or(Path::new("/"))
                .join(".cookies.json")
        });
-        let cookie_store = Arc::new(CookieStoreMutex::new({
-            let mut store = if cookie_path.exists() {
-                CookieStore::load_json(BufReader::new(File::open(&cookie_path)?))
-                    .map_err(|e| eyre!("{}", e))
-                    .with_kind(crate::ErrorKind::Deserialization)?
-            } else {
-                CookieStore::default()
-            };
+        let cookie_store = Arc::new(CookieStoreMutex::new(if cookie_path.exists() {
+            let mut store = CookieStore::load_json(BufReader::new(File::open(&cookie_path)?))
+                .map_err(|e| eyre!("{}", e))
+                .with_kind(crate::ErrorKind::Deserialization)?;
            if let Ok(local) = std::fs::read_to_string(LOCAL_AUTH_COOKIE_PATH) {
                store
-                    .insert_raw(
-                        &RawCookie::new("local", local),
-                        &"http://localhost".parse()?,
-                    )
+                    .insert_raw(&Cookie::new("local", local), &"http://localhost".parse()?)
                    .with_kind(crate::ErrorKind::Network)?;
            }
            store
+        } else {
+            CookieStore::default()
        }));
-
        Ok(CliContext(Arc::new(CliContextSeed {
            base_url: url.clone(),
            rpc_url: {
--- a/core/startos/src/context/diagnostic.rs
+++ b/core/startos/src/context/diagnostic.rs
@@ -18,7 +18,7 @@ pub struct DiagnosticContextConfig {
    pub datadir: Option<PathBuf>,
 }
 impl DiagnosticContextConfig {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
        tokio::task::spawn_blocking(move || {
            load_config_from_paths(
@@ -52,7 +52,7 @@ pub struct DiagnosticContextSeed {
 #[derive(Clone)]
 pub struct DiagnosticContext(Arc<DiagnosticContextSeed>);
 impl DiagnosticContext {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn init<P: AsRef<Path> + Send + 'static>(
        path: Option<P>,
        disk_guid: Option<Arc<String>>,
--- a/core/startos/src/context/install.rs
+++ b/core/startos/src/context/install.rs
@@ -15,7 +15,7 @@ use crate::Error;
 #[serde(rename_all = "kebab-case")]
 pub struct InstallContextConfig {}
 impl InstallContextConfig {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
        tokio::task::spawn_blocking(move || {
            load_config_from_paths(
@@ -38,7 +38,7 @@ pub struct InstallContextSeed {
 #[derive(Clone)]
 pub struct InstallContext(Arc<InstallContextSeed>);
 impl InstallContext {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn init<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
        let _cfg = InstallContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?;
        let (shutdown, _) = tokio::sync::broadcast::channel(1);
--- a/core/startos/src/context/mod.rs
+++ b/core/startos/src/context/mod.rs
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -6,41 +6,38 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;

+use bollard::Docker;
 use helpers::to_tmp_path;
 use josekit::jwk::Jwk;
 use patch_db::json_ptr::JsonPointer;
-use patch_db::PatchDb;
-use reqwest::{Client, Proxy, Url};
+use patch_db::{DbHandle, LockReceipt, LockType, PatchDb};
+use reqwest::Url;
 use rpc_toolkit::Context;
 use serde::Deserialize;
 use sqlx::postgres::PgConnectOptions;
 use sqlx::PgPool;
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
-use tokio::time::Instant;
 use tracing::instrument;

-use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
 use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation};
-use crate::db::model::{CurrentDependents, Database, PackageDataEntryMatchModelRef};
-use crate::db::prelude::PatchDbExt;
-use crate::dependencies::compute_dependency_config_errs;
+use crate::db::model::{Database, InstalledPackageDataEntry, PackageDataEntry};
 use crate::disk::OsPartitionInfo;
-use crate::init::{check_time_is_synchronized, init_postgres};
-use crate::install::cleanup::{cleanup_failed, uninstall};
+use crate::init::{init_postgres, pgloader};
+use crate::install::cleanup::{cleanup_failed, uninstall, CleanupFailedReceipts};
 use crate::manager::ManagerMap;
 use crate::middleware::auth::HashSessionToken;
 use crate::net::net_controller::NetController;
-use crate::net::ssl::{root_ca_start_time, SslManager};
+use crate::net::ssl::SslManager;
 use crate::net::wifi::WpaCli;
 use crate::notifications::NotificationManager;
 use crate::shutdown::Shutdown;
-use crate::status::MainStatus;
-use crate::system::get_mem_info;
+use crate::status::{MainStatus, Status};
 use crate::util::config::load_config_from_paths;
-use crate::util::lshw::{lshw, LshwDevice};
 use crate::{Error, ErrorKind, ResultExt};

+use super::setup::CURRENT_SECRET;
+
 #[derive(Debug, Default, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct RpcContextConfig {
@@ -89,7 +86,7 @@ impl RpcContextConfig {
        }
        Ok(db)
    }
-    #[instrument(skip_all)]
+    #[instrument]
    pub async fn secret_store(&self) -> Result<PgPool, Error> {
        init_postgres(self.datadir()).await?;
        let secret_store =
@@ -99,6 +96,15 @@ impl RpcContextConfig {
            .run(&secret_store)
            .await
            .with_kind(crate::ErrorKind::Database)?;
+        let old_db_path = self.datadir().join("main/secrets.db");
+        if tokio::fs::metadata(&old_db_path).await.is_ok() {
+            pgloader(
+                &old_db_path,
+                self.migration_batch_rows.unwrap_or(25000),
+                self.migration_prefetch_rows.unwrap_or(100_000),
+            )
+            .await?;
+        }
        Ok(secret_store)
    }
 }
@@ -113,6 +119,7 @@ pub struct RpcContextSeed {
    pub db: PatchDb,
    pub secret_store: PgPool,
    pub account: RwLock<AccountInfo>,
+    pub docker: Docker,
    pub net_controller: Arc<NetController>,
    pub managers: ManagerMap,
    pub metrics_cache: RwLock<Option<crate::system::Metrics>>,
@@ -123,21 +130,51 @@ pub struct RpcContextSeed {
    pub rpc_stream_continuations: Mutex<BTreeMap<RequestGuid, RpcContinuation>>,
    pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
    pub current_secret: Arc<Jwk>,
-    pub client: Client,
-    pub hardware: Hardware,
-    pub start_time: Instant,
 }

-pub struct Hardware {
-    pub devices: Vec<LshwDevice>,
-    pub ram: u64,
+pub struct RpcCleanReceipts {
+    cleanup_receipts: CleanupFailedReceipts,
+    packages: LockReceipt<crate::db::model::AllPackageData, ()>,
+    package: LockReceipt<crate::db::model::PackageDataEntry, String>,
+}
+
+impl RpcCleanReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        let cleanup_receipts = CleanupFailedReceipts::setup(locks);
+
+        let packages = crate::db::DatabaseModel::new()
+            .package_data()
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        let package = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                cleanup_receipts: cleanup_receipts(skeleton_key)?,
+                packages: packages.verify(skeleton_key)?,
+                package: package.verify(skeleton_key)?,
+            })
+        }
+    }
 }

 #[derive(Clone)]
 pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
-    #[instrument(skip_all)]
-    pub async fn init<P: AsRef<Path> + Send + Sync + 'static>(
+    #[instrument(skip(cfg_path))]
+    pub async fn init<P: AsRef<Path> + Send + 'static>(
        cfg_path: Option<P>,
        disk_guid: Arc<String>,
    ) -> Result<Self, Error> {
@@ -153,15 +190,18 @@ impl RpcContext {
        let account = AccountInfo::load(&secret_store).await?;
        let db = base.db(&account).await?;
        tracing::info!("Opened PatchDB");
+        let mut docker = Docker::connect_with_unix_defaults()?;
+        docker.set_timeout(Duration::from_secs(600));
+        tracing::info!("Connected to Docker");
        let net_controller = Arc::new(
            NetController::init(
                base.tor_control
                    .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
-                tor_proxy,
                base.dns_bind
-                    .as_deref()
+                    .as_ref()
+                    .map(|v| v.as_slice())
                    .unwrap_or(&[SocketAddr::from(([127, 0, 0, 1], 53))]),
-                SslManager::new(&account, root_ca_start_time().await?)?,
+                SslManager::new(&account)?,
                &account.hostname,
                &account.key,
            )
@@ -169,25 +209,9 @@ impl RpcContext {
        );
        tracing::info!("Initialized Net Controller");
        let managers = ManagerMap::default();
-        let metrics_cache = RwLock::<Option<crate::system::Metrics>>::new(None);
+        let metrics_cache = RwLock::new(None);
        let notification_manager = NotificationManager::new(secret_store.clone());
        tracing::info!("Initialized Notification Manager");
-        let tor_proxy_url = format!("socks5h://{tor_proxy}");
-        let devices = lshw().await?;
-        let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
-
-        if !db.peek().await.as_server_info().as_ntp_synced().de()? {
-            let db = db.clone();
-            tokio::spawn(async move {
-                while !check_time_is_synchronized().await.unwrap() {
-                    tokio::time::sleep(Duration::from_secs(30)).await;
-                }
-                db.mutate(|v| v.as_server_info_mut().as_ntp_synced_mut().ser(&true))
-                    .await
-                    .unwrap()
-            });
-        }
-
        let seed = Arc::new(RpcContextSeed {
            is_closed: AtomicBool::new(false),
            datadir: base.datadir().to_path_buf(),
@@ -198,6 +222,7 @@ impl RpcContext {
            db,
            secret_store,
            account: RwLock::new(account),
+            docker,
            net_controller,
            managers,
            metrics_cache,
@@ -219,27 +244,23 @@ impl RpcContext {
                    )
                })?,
            ),
-            client: Client::builder()
-                .proxy(Proxy::custom(move |url| {
-                    if url.host_str().map_or(false, |h| h.ends_with(".onion")) {
-                        Some(tor_proxy_url.clone())
-                    } else {
-                        None
-                    }
-                }))
-                .build()
-                .with_kind(crate::ErrorKind::ParseUrl)?,
-            hardware: Hardware { devices, ram },
-            start_time: Instant::now(),
        });

-        let res = Self(seed.clone());
-        res.cleanup_and_initialize().await?;
+        let res = Self(seed);
+        res.cleanup().await?;
        tracing::info!("Cleaned up transient states");
+        res.managers
+            .init(
+                &res,
+                &mut res.db.handle(),
+                &mut res.secret_store.acquire().await?,
+            )
+            .await?;
+        tracing::info!("Initialized Package Managers");
        Ok(res)
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn shutdown(self) -> Result<(), Error> {
        self.managers.empty().await?;
        self.secret_store.close().await;
@@ -250,153 +271,84 @@ impl RpcContext {
    }

    #[instrument(skip(self))]
-    pub async fn cleanup_and_initialize(&self) -> Result<(), Error> {
-        self.db
-            .mutate(|f| {
-                let mut current_dependents = f
-                    .as_package_data()
-                    .keys()?
-                    .into_iter()
-                    .map(|k| (k.clone(), BTreeMap::new()))
-                    .collect::<BTreeMap<_, _>>();
-                for (package_id, package) in f.as_package_data_mut().as_entries_mut()? {
-                    for (k, v) in package
-                        .as_installed_mut()
-                        .into_iter()
-                        .flat_map(|i| i.clone().into_current_dependencies().into_entries())
-                        .flatten()
-                    {
-                        let mut entry: BTreeMap<_, _> =
-                            current_dependents.remove(&k).unwrap_or_default();
-                        entry.insert(package_id.clone(), v.de()?);
-                        current_dependents.insert(k, entry);
+    pub async fn cleanup(&self) -> Result<(), Error> {
+        let mut db = self.db.handle();
+        let receipts = RpcCleanReceipts::new(&mut db).await?;
+        for (package_id, package) in receipts.packages.get(&mut db).await?.0 {
+            if let Err(e) = async {
+                match package {
+                    PackageDataEntry::Installing { .. }
+                    | PackageDataEntry::Restoring { .. }
+                    | PackageDataEntry::Updating { .. } => {
+                        cleanup_failed(self, &mut db, &package_id, &receipts.cleanup_receipts)
+                            .await?;
                    }
-                }
-                for (package_id, current_dependents) in current_dependents {
-                    if let Some(deps) = f
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.expect_as_installed_mut().ok())
-                        .map(|i| i.as_installed_mut().as_current_dependents_mut())
-                    {
-                        deps.ser(&CurrentDependents(current_dependents))?;
-                    } else if let Some(deps) = f
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.expect_as_removing_mut().ok())
-                        .map(|i| i.as_removing_mut().as_current_dependents_mut())
-                    {
-                        deps.ser(&CurrentDependents(current_dependents))?;
-                    }
-                }
-                Ok(())
-            })
-            .await?;
-
-        let peek = self.db.peek().await;
-
-        for (package_id, package) in peek.as_package_data().as_entries()?.into_iter() {
-            let action = match package.as_match() {
-                PackageDataEntryMatchModelRef::Installing(_)
-                | PackageDataEntryMatchModelRef::Restoring(_)
-                | PackageDataEntryMatchModelRef::Updating(_) => {
-                    cleanup_failed(self, &package_id).await
-                }
-                PackageDataEntryMatchModelRef::Removing(_) => {
-                    uninstall(
-                        self,
-                        self.secret_store.acquire().await?.as_mut(),
-                        &package_id,
-                    )
-                    .await
-                }
-                PackageDataEntryMatchModelRef::Installed(m) => {
-                    let version = m.as_manifest().as_version().clone().de()?;
-                    let volumes = m.as_manifest().as_volumes().de()?;
-                    for (volume_id, volume_info) in &*volumes {
-                        let tmp_path = to_tmp_path(volume_info.path_for(
-                            &self.datadir,
+                    PackageDataEntry::Removing { .. } => {
+                        uninstall(
+                            self,
+                            &mut db,
+                            &mut self.secret_store.acquire().await?,
                            &package_id,
-                            &version,
-                            volume_id,
-                        ))
-                        .with_kind(ErrorKind::Filesystem)?;
-                        if tokio::fs::metadata(&tmp_path).await.is_ok() {
-                            tokio::fs::remove_dir_all(&tmp_path).await?;
-                        }
+                        )
+                        .await?;
+                    }
+                    PackageDataEntry::Installed {
+                        installed,
+                        static_files,
+                        manifest,
+                    } => {
+                        for (volume_id, volume_info) in &*manifest.volumes {
+                            let tmp_path = to_tmp_path(volume_info.path_for(
+                                &self.datadir,
+                                &package_id,
+                                &manifest.version,
+                                &volume_id,
+                            ))
+                            .with_kind(ErrorKind::Filesystem)?;
+                            if tokio::fs::metadata(&tmp_path).await.is_ok() {
+                                tokio::fs::remove_dir_all(&tmp_path).await?;
+                            }
+                        }
+                        let status = installed.status;
+                        let main = match status.main {
+                            MainStatus::BackingUp { started, .. } => {
+                                if let Some(_) = started {
+                                    MainStatus::Starting { restarting: false }
+                                } else {
+                                    MainStatus::Stopped
+                                }
+                            }
+                            MainStatus::Running { .. } => {
+                                MainStatus::Starting { restarting: false }
+                            }
+                            a => a.clone(),
+                        };
+                        let new_package = PackageDataEntry::Installed {
+                            installed: InstalledPackageDataEntry {
+                                status: Status { main, ..status },
+                                ..installed
+                            },
+                            static_files,
+                            manifest,
+                        };
+                        receipts
+                            .package
+                            .set(&mut db, new_package, &package_id)
+                            .await?;
                    }
-                    Ok(())
                }
-                _ => continue,
-            };
-            if let Err(e) = action {
+                Ok::<_, Error>(())
+            }
+            .await
+            {
                tracing::error!("Failed to clean up package {}: {}", package_id, e);
                tracing::debug!("{:?}", e);
            }
        }
-        let peek = self
-            .db
-            .mutate(|v| {
-                for (_, pde) in v.as_package_data_mut().as_entries_mut()? {
-                    let status = pde
-                        .expect_as_installed_mut()?
-                        .as_installed_mut()
-                        .as_status_mut()
-                        .as_main_mut();
-                    let running = status.clone().de()?.running();
-                    status.ser(&if running {
-                        MainStatus::Starting
-                    } else {
-                        MainStatus::Stopped
-                    })?;
-                }
-                Ok(v.clone())
-            })
-            .await?;
-        self.managers.init(self.clone(), peek.clone()).await?;
-        tracing::info!("Initialized Package Managers");
-
-        let mut all_dependency_config_errs = BTreeMap::new();
-        for (package_id, package) in peek.as_package_data().as_entries()?.into_iter() {
-            let package = package.clone();
-            if let Some(current_dependencies) = package
-                .as_installed()
-                .and_then(|x| x.as_current_dependencies().de().ok())
-            {
-                let manifest = package.as_manifest().de()?;
-                all_dependency_config_errs.insert(
-                    package_id.clone(),
-                    compute_dependency_config_errs(
-                        self,
-                        &peek,
-                        &manifest,
-                        &current_dependencies,
-                        &Default::default(),
-                    )
-                    .await?,
-                );
-            }
-        }
-        self.db
-            .mutate(|v| {
-                for (package_id, errs) in all_dependency_config_errs {
-                    if let Some(config_errors) = v
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.as_installed_mut())
-                        .map(|i| i.as_status_mut().as_dependency_config_errors_mut())
-                    {
-                        config_errors.ser(&errs)?;
-                    }
-                }
-                Ok(())
-            })
-            .await?;
-
        Ok(())
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn clean_continuations(&self) {
        let mut continuations = self.rpc_stream_continuations.lock().await;
        let mut to_remove = Vec::new();
@@ -410,7 +362,7 @@ impl RpcContext {
        }
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self, handler))]
    pub async fn add_continuation(&self, guid: RequestGuid, handler: RpcContinuation) {
        self.clean_continuations().await;
        self.rpc_stream_continuations
@@ -450,7 +402,7 @@ impl RpcContext {
 }
 impl AsRef<Jwk> for RpcContext {
    fn as_ref(&self) -> &Jwk {
-        &CURRENT_SECRET
+        &*CURRENT_SECRET
    }
 }
 impl Context for RpcContext {}
@@ -464,7 +416,7 @@ impl Deref for RpcContext {
                tracing_error::SpanTrace::capture()
            );
        }
-        &self.0
+        &*self.0
    }
 }
 impl Drop for RpcContext {
--- a/core/startos/src/context/sdk.rs
+++ b/core/startos/src/context/sdk.rs
@@ -7,8 +7,8 @@ use rpc_toolkit::Context;
 use serde::Deserialize;
 use tracing::instrument;

-use crate::prelude::*;
 use crate::util::config::{load_config_from_paths, local_config_path};
+use crate::{Error, ResultExt};

 #[derive(Debug, Default, Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -25,7 +25,7 @@ pub struct SdkContextSeed {
 pub struct SdkContext(Arc<SdkContextSeed>);
 impl SdkContext {
    /// BLOCKING
-    #[instrument(skip_all)]
+    #[instrument(skip(matches))]
    pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
        let local_config_path = local_config_path();
        let base: SdkContextConfig = load_config_from_paths(
@@ -49,22 +49,22 @@ impl SdkContext {
        })))
    }
    /// BLOCKING
-    #[instrument(skip_all)]
-    pub fn developer_key(&self) -> Result<ed25519_dalek::SigningKey, Error> {
+    #[instrument]
+    pub fn developer_key(&self) -> Result<ed25519_dalek::Keypair, Error> {
        if !self.developer_key_path.exists() {
-            return Err(Error::new(eyre!("Developer Key does not exist! Please run `start-sdk init` before running this command."), crate::ErrorKind::Uninitialized));
+            return Err(Error::new(eyre!("Developer Key does not exist! Please run `embassy-sdk init` before running this command."), crate::ErrorKind::Uninitialized));
        }
        let pair = <ed25519::KeypairBytes as ed25519::pkcs8::DecodePrivateKey>::from_pkcs8_pem(
            &std::fs::read_to_string(&self.developer_key_path)?,
        )
        .with_kind(crate::ErrorKind::Pem)?;
-        let secret = ed25519_dalek::SecretKey::try_from(&pair.secret_key[..]).map_err(|_| {
-            Error::new(
-                eyre!("pkcs8 key is of incorrect length"),
-                ErrorKind::OpenSsl,
-            )
-        })?;
-        Ok(secret.into())
+        let secret = ed25519_dalek::SecretKey::from_bytes(&pair.secret_key[..])?;
+        let public = if let Some(public) = pair.public_key {
+            ed25519_dalek::PublicKey::from_bytes(&public[..])?
+        } else {
+            (&secret).into()
+        };
+        Ok(ed25519_dalek::Keypair { secret, public })
    }
 }
 impl std::ops::Deref for SdkContext {
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -17,7 +17,7 @@ use tracing::instrument;
 use crate::account::AccountInfo;
 use crate::db::model::Database;
 use crate::disk::OsPartitionInfo;
-use crate::init::init_postgres;
+use crate::init::{init_postgres, pgloader};
 use crate::setup::SetupStatus;
 use crate::util::config::load_config_from_paths;
 use crate::{Error, ResultExt};
@@ -45,11 +45,9 @@ pub struct SetupContextConfig {
    pub migration_batch_rows: Option<usize>,
    pub migration_prefetch_rows: Option<usize>,
    pub datadir: Option<PathBuf>,
-    #[serde(default)]
-    pub disable_encryption: bool,
 }
 impl SetupContextConfig {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
        tokio::task::spawn_blocking(move || {
            load_config_from_paths(
@@ -77,7 +75,6 @@ pub struct SetupContextSeed {
    pub config_path: Option<PathBuf>,
    pub migration_batch_rows: usize,
    pub migration_prefetch_rows: usize,
-    pub disable_encryption: bool,
    pub shutdown: Sender<()>,
    pub datadir: PathBuf,
    pub selected_v2_drive: RwLock<Option<PathBuf>>,
@@ -95,7 +92,7 @@ impl AsRef<Jwk> for SetupContextSeed {
 #[derive(Clone)]
 pub struct SetupContext(Arc<SetupContextSeed>);
 impl SetupContext {
-    #[instrument(skip_all)]
+    #[instrument(skip(path))]
    pub async fn init<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
        let cfg = SetupContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?;
        let (shutdown, _) = tokio::sync::broadcast::channel(1);
@@ -105,7 +102,6 @@ impl SetupContext {
            config_path: path.as_ref().map(|p| p.as_ref().to_owned()),
            migration_batch_rows: cfg.migration_batch_rows.unwrap_or(25000),
            migration_prefetch_rows: cfg.migration_prefetch_rows.unwrap_or(100_000),
-            disable_encryption: cfg.disable_encryption,
            shutdown,
            datadir,
            selected_v2_drive: RwLock::new(None),
@@ -114,7 +110,7 @@ impl SetupContext {
            setup_result: RwLock::new(None),
        })))
    }
-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn db(&self, account: &AccountInfo) -> Result<PatchDb, Error> {
        let db_path = self.datadir.join("main").join("embassy.db");
        let db = PatchDb::open(&db_path)
@@ -126,7 +122,7 @@ impl SetupContext {
        }
        Ok(db)
    }
-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn secret_store(&self) -> Result<PgPool, Error> {
        init_postgres(&self.datadir).await?;
        let secret_store =
@@ -136,6 +132,15 @@ impl SetupContext {
            .run(&secret_store)
            .await
            .with_kind(crate::ErrorKind::Database)?;
+        let old_db_path = self.datadir.join("main/secrets.db");
+        if tokio::fs::metadata(&old_db_path).await.is_ok() {
+            pgloader(
+                &old_db_path,
+                self.migration_batch_rows,
+                self.migration_prefetch_rows,
+            )
+            .await?;
+        }
        Ok(secret_store)
    }
 }
--- a/backend/src/control.rs
+++ b/backend/src/control.rs
@@ -0,0 +1,208 @@
+use std::collections::BTreeMap;
+
+use color_eyre::eyre::eyre;
+use patch_db::{DbHandle, LockReceipt, LockType};
+use rpc_toolkit::command;
+use tracing::instrument;
+
+use crate::context::RpcContext;
+use crate::dependencies::{
+    break_all_dependents_transitive, heal_all_dependents_transitive, BreakageRes, DependencyError,
+    DependencyReceipt, TaggedDependencyError,
+};
+use crate::s9pk::manifest::PackageId;
+use crate::status::MainStatus;
+use crate::util::display_none;
+use crate::util::serde::display_serializable;
+use crate::Error;
+
+#[derive(Clone)]
+pub struct StartReceipts {
+    dependency_receipt: DependencyReceipt,
+    status: LockReceipt<MainStatus, ()>,
+    version: LockReceipt<crate::util::Version, ()>,
+}
+
+impl StartReceipts {
+    pub async fn new(db: &mut impl DbHandle, id: &PackageId) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks, id);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+        id: &PackageId,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        let dependency_receipt = DependencyReceipt::setup(locks);
+        let status = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.status().main())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        let version = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.manifest().version())
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                dependency_receipt: dependency_receipt(skeleton_key)?,
+                status: status.verify(skeleton_key)?,
+                version: version.verify(skeleton_key)?,
+            })
+        }
+    }
+}
+
+#[command(display(display_none), metadata(sync_db = true))]
+#[instrument(skip(ctx))]
+pub async fn start(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<(), Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+    let receipts = StartReceipts::new(&mut tx, &id).await?;
+    let version = receipts.version.get(&mut tx).await?;
+    receipts
+        .status
+        .set(&mut tx, MainStatus::Starting { restarting: false })
+        .await?;
+    heal_all_dependents_transitive(&ctx, &mut tx, &id, &receipts.dependency_receipt).await?;
+
+    tx.commit().await?;
+    drop(receipts);
+
+    ctx.managers
+        .get(&(id, version))
+        .await
+        .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
+        .synchronize()
+        .await;
+
+    Ok(())
+}
+#[derive(Clone)]
+pub struct StopReceipts {
+    breaks: crate::dependencies::BreakTransitiveReceipts,
+    status: LockReceipt<MainStatus, ()>,
+}
+
+impl StopReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle, id: &PackageId) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks, id);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<patch_db::LockTargetId>,
+        id: &PackageId,
+    ) -> impl FnOnce(&patch_db::Verifier) -> Result<Self, Error> {
+        let breaks = crate::dependencies::BreakTransitiveReceipts::setup(locks);
+        let status = crate::db::DatabaseModel::new()
+            .package_data()
+            .idx_model(id)
+            .and_then(|x| x.installed())
+            .map(|x| x.status().main())
+            .make_locker(LockType::Write)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                breaks: breaks(skeleton_key)?,
+                status: status.verify(skeleton_key)?,
+            })
+        }
+    }
+}
+
+#[instrument(skip(db))]
+pub async fn stop_common<Db: DbHandle>(
+    db: &mut Db,
+    id: &PackageId,
+    breakages: &mut BTreeMap<PackageId, TaggedDependencyError>,
+) -> Result<MainStatus, Error> {
+    let mut tx = db.begin().await?;
+    let receipts = StopReceipts::new(&mut tx, id).await?;
+    let last_status = receipts.status.get(&mut tx).await?;
+    receipts.status.set(&mut tx, MainStatus::Stopping).await?;
+
+    tx.save().await?;
+    break_all_dependents_transitive(
+        db,
+        id,
+        DependencyError::NotRunning,
+        breakages,
+        &receipts.breaks,
+    )
+    .await?;
+
+    Ok(last_status)
+}
+
+#[command(
+    subcommands(self(stop_impl(async)), stop_dry),
+    display(display_none),
+    metadata(sync_db = true)
+)]
+pub fn stop(#[arg] id: PackageId) -> Result<PackageId, Error> {
+    Ok(id)
+}
+
+#[command(rename = "dry", display(display_serializable))]
+#[instrument(skip(ctx))]
+pub async fn stop_dry(
+    #[context] ctx: RpcContext,
+    #[parent_data] id: PackageId,
+) -> Result<BreakageRes, Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+
+    let mut breakages = BTreeMap::new();
+    stop_common(&mut tx, &id, &mut breakages).await?;
+
+    tx.abort().await?;
+
+    Ok(BreakageRes(breakages))
+}
+
+#[instrument(skip(ctx))]
+pub async fn stop_impl(ctx: RpcContext, id: PackageId) -> Result<MainStatus, Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+
+    let last_statuts = stop_common(&mut tx, &id, &mut BTreeMap::new()).await?;
+
+    tx.commit().await?;
+
+    Ok(last_statuts)
+}
+
+#[command(display(display_none), metadata(sync_db = true))]
+pub async fn restart(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<(), Error> {
+    let mut db = ctx.db.handle();
+    let mut tx = db.begin().await?;
+
+    let mut status = crate::db::DatabaseModel::new()
+        .package_data()
+        .idx_model(&id)
+        .and_then(|pde| pde.installed())
+        .map(|i| i.status().main())
+        .get_mut(&mut tx)
+        .await?;
+    if !matches!(&*status, Some(MainStatus::Running { .. })) {
+        return Err(Error::new(
+            eyre!("{} is not running", id),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    }
+    *status = Some(MainStatus::Restarting);
+    status.save(&mut tx).await?;
+    tx.commit().await?;
+
+    Ok(())
+}
--- a/core/startos/src/core/mod.rs
+++ b/core/startos/src/core/mod.rs
--- a/core/startos/src/core/rpc_continuations.rs
+++ b/core/startos/src/core/rpc_continuations.rs
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -1,9 +1,7 @@
 pub mod model;
 pub mod package;
-pub mod prelude;

 use std::future::Future;
-use std::path::PathBuf;
 use std::sync::Arc;

 use futures::{FutureExt, SinkExt, StreamExt};
@@ -23,13 +21,13 @@ use tokio_tungstenite::tungstenite::Message;
 use tokio_tungstenite::WebSocketStream;
 use tracing::instrument;

-use crate::context::{CliContext, RpcContext};
+pub use self::model::DatabaseModel;
+use crate::context::RpcContext;
 use crate::middleware::auth::{HasValidSession, HashSessionToken};
-use crate::prelude::*;
-use crate::util::display_none;
 use crate::util::serde::{display_serializable, IoFormat};
+use crate::{Error, ResultExt};

-#[instrument(skip_all)]
+#[instrument(skip(ctx, session, ws_fut))]
 async fn ws_handler<
    WSFut: Future<Output = Result<Result<WebSocketStream<Upgraded>, HyperError>, JoinError>>,
 >(
@@ -37,11 +35,11 @@ async fn ws_handler<
    session: Option<(HasValidSession, HashSessionToken)>,
    ws_fut: WSFut,
 ) -> Result<(), Error> {
-    let (dump, sub) = ctx.db.dump_and_sub().await;
+    let (dump, sub) = ctx.db.dump_and_sub().await?;
    let mut stream = ws_fut
        .await
-        .with_kind(ErrorKind::Network)?
-        .with_kind(ErrorKind::Unknown)?;
+        .with_kind(crate::ErrorKind::Network)?
+        .with_kind(crate::ErrorKind::Unknown)?;

    if let Some((session, token)) = session {
        let kill = subscribe_to_session_kill(&ctx, token).await;
@@ -55,7 +53,7 @@ async fn ws_handler<
                reason: "UNAUTHORIZED".into(),
            }))
            .await
-            .with_kind(ErrorKind::Network)?;
+            .with_kind(crate::ErrorKind::Network)?;
    }

    Ok(())
@@ -75,15 +73,13 @@ async fn subscribe_to_session_kill(
    recv
 }

-#[instrument(skip_all)]
+#[instrument(skip(_has_valid_authentication, kill, sub, stream))]
 async fn deal_with_messages(
    _has_valid_authentication: HasValidSession,
    mut kill: oneshot::Receiver<()>,
    mut sub: patch_db::Subscriber,
    mut stream: WebSocketStream<Upgraded>,
 ) -> Result<(), Error> {
-    let mut timer = tokio::time::interval(tokio::time::Duration::from_secs(5));
-
    loop {
        futures::select! {
            _ = (&mut kill).fuse() => {
@@ -94,18 +90,18 @@ async fn deal_with_messages(
                        reason: "UNAUTHORIZED".into(),
                    }))
                    .await
-                    .with_kind(ErrorKind::Network)?;
+                    .with_kind(crate::ErrorKind::Network)?;
                return Ok(())
            }
            new_rev = sub.recv().fuse() => {
                let rev = new_rev.expect("UNREACHABLE: patch-db is dropped");
                stream
-                    .send(Message::Text(serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?))
+                    .send(Message::Text(serde_json::to_string(&rev).with_kind(crate::ErrorKind::Serialization)?))
                    .await
-                    .with_kind(ErrorKind::Network)?;
+                    .with_kind(crate::ErrorKind::Network)?;
            }
            message = stream.next().fuse() => {
-                let message = message.transpose().with_kind(ErrorKind::Network)?;
+                let message = message.transpose().with_kind(crate::ErrorKind::Network)?;
                match message {
                    None => {
                        tracing::info!("Closing WebSocket: Stream Finished");
@@ -114,13 +110,6 @@ async fn deal_with_messages(
                    _ => (),
                }
            }
-            // This is trying to give a health checks to the home to keep the ui alive.
-            _ = timer.tick().fuse() => {
-                stream
-                    .send(Message::Ping(vec![]))
-                    .await
-                    .with_kind(crate::ErrorKind::Network)?;
-            }
        }
    }
 }
@@ -132,10 +121,10 @@ async fn send_dump(
 ) -> Result<(), Error> {
    stream
        .send(Message::Text(
-            serde_json::to_string(&dump).with_kind(ErrorKind::Serialization)?,
+            serde_json::to_string(&dump).with_kind(crate::ErrorKind::Serialization)?,
        ))
        .await
-        .with_kind(ErrorKind::Network)?;
+        .with_kind(crate::ErrorKind::Network)?;
    Ok(())
 }

@@ -150,7 +139,7 @@ pub async fn subscribe(ctx: RpcContext, req: Request<Body>) -> Result<Response<B
    {
        Ok(a) => Some(a),
        Err(e) => {
-            if e.kind != ErrorKind::Authorization {
+            if e.kind != crate::ErrorKind::Authorization {
                tracing::error!("Error Authenticating Websocket: {}", e);
                tracing::debug!("{:?}", e);
            }
@@ -158,7 +147,7 @@ pub async fn subscribe(ctx: RpcContext, req: Request<Body>) -> Result<Response<B
        }
    };
    let req = Request::from_parts(parts, body);
-    let (res, ws_fut) = hyper_ws_listener::create_ws(req).with_kind(ErrorKind::Network)?;
+    let (res, ws_fut) = hyper_ws_listener::create_ws(req).with_kind(crate::ErrorKind::Network)?;
    if let Some(ws_fut) = ws_fut {
        tokio::task::spawn(async move {
            match ws_handler(ctx, session, ws_fut).await {
@@ -174,7 +163,7 @@ pub async fn subscribe(ctx: RpcContext, req: Request<Body>) -> Result<Response<B
    Ok(res)
 }

-#[command(subcommands(dump, put, apply))]
+#[command(subcommands(revisions, dump, put))]
 pub fn db() -> Result<(), RpcError> {
    Ok(())
 }
@@ -186,164 +175,28 @@ pub enum RevisionsRes {
    Dump(Dump),
 }

-#[instrument(skip_all)]
-async fn cli_dump(
-    ctx: CliContext,
-    _format: Option<IoFormat>,
-    path: Option<PathBuf>,
-) -> Result<Dump, RpcError> {
-    let dump = if let Some(path) = path {
-        PatchDb::open(path).await?.dump().await
-    } else {
-        rpc_toolkit::command_helpers::call_remote(
-            ctx,
-            "db.dump",
-            serde_json::json!({}),
-            std::marker::PhantomData::<Dump>,
-        )
-        .await?
-        .result?
-    };
-
-    Ok(dump)
+#[command(display(display_serializable))]
+pub async fn revisions(
+    #[context] ctx: RpcContext,
+    #[arg] since: u64,
+    #[allow(unused_variables)]
+    #[arg(long = "format")]
+    format: Option<IoFormat>,
+) -> Result<RevisionsRes, Error> {
+    Ok(match ctx.db.sync(since).await? {
+        Ok(revs) => RevisionsRes::Revisions(revs),
+        Err(dump) => RevisionsRes::Dump(dump),
+    })
 }

-#[command(
-    custom_cli(cli_dump(async, context(CliContext))),
-    display(display_serializable)
-)]
+#[command(display(display_serializable))]
 pub async fn dump(
    #[context] ctx: RpcContext,
    #[allow(unused_variables)]
    #[arg(long = "format")]
    format: Option<IoFormat>,
-    #[allow(unused_variables)]
-    #[arg]
-    path: Option<PathBuf>,
 ) -> Result<Dump, Error> {
-    Ok(ctx.db.dump().await)
-}
-
-fn apply_expr(input: jaq_core::Val, expr: &str) -> Result<jaq_core::Val, Error> {
-    let (expr, errs) = jaq_core::parse::parse(expr, jaq_core::parse::main());
-
-    let Some(expr) = expr else {
-        return Err(Error::new(
-            eyre!("Failed to parse expression: {:?}", errs),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    let mut errs = Vec::new();
-
-    let mut defs = jaq_core::Definitions::core();
-    for def in jaq_std::std() {
-        defs.insert(def, &mut errs);
-    }
-
-    let filter = defs.finish(expr, Vec::new(), &mut errs);
-
-    if !errs.is_empty() {
-        return Err(Error::new(
-            eyre!("Failed to compile expression: {:?}", errs),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    let inputs = jaq_core::RcIter::new(std::iter::empty());
-    let mut res_iter = filter.run(jaq_core::Ctx::new([], &inputs), input);
-
-    let Some(res) = res_iter
-        .next()
-        .transpose()
-        .map_err(|e| eyre!("{e}"))
-        .with_kind(crate::ErrorKind::Deserialization)?
-    else {
-        return Err(Error::new(
-            eyre!("expr returned no results"),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    if res_iter.next().is_some() {
-        return Err(Error::new(
-            eyre!("expr returned too many results"),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    }
-
-    Ok(res)
-}
-
-#[instrument(skip_all)]
-async fn cli_apply(ctx: CliContext, expr: String, path: Option<PathBuf>) -> Result<(), RpcError> {
-    if let Some(path) = path {
-        PatchDb::open(path)
-            .await?
-            .mutate(|db| {
-                let res = apply_expr(
-                    serde_json::to_value(patch_db::Value::from(db.clone()))
-                        .with_kind(ErrorKind::Deserialization)?
-                        .into(),
-                    &expr,
-                )?;
-
-                db.ser(
-                    &serde_json::from_value::<model::Database>(res.clone().into()).with_ctx(
-                        |_| {
-                            (
-                                crate::ErrorKind::Deserialization,
-                                "result does not match database model",
-                            )
-                        },
-                    )?,
-                )
-            })
-            .await?;
-    } else {
-        rpc_toolkit::command_helpers::call_remote(
-            ctx,
-            "db.apply",
-            serde_json::json!({ "expr": expr }),
-            std::marker::PhantomData::<()>,
-        )
-        .await?
-        .result?;
-    }
-
-    Ok(())
-}
-
-#[command(
-    custom_cli(cli_apply(async, context(CliContext))),
-    display(display_none)
-)]
-pub async fn apply(
-    #[context] ctx: RpcContext,
-    #[arg] expr: String,
-    #[allow(unused_variables)]
-    #[arg]
-    path: Option<PathBuf>,
-) -> Result<(), Error> {
-    ctx.db
-        .mutate(|db| {
-            let res = apply_expr(
-                serde_json::to_value(patch_db::Value::from(db.clone()))
-                    .with_kind(ErrorKind::Deserialization)?
-                    .into(),
-                &expr,
-            )?;
-
-            db.ser(
-                &serde_json::from_value::<model::Database>(res.clone().into()).with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Deserialization,
-                        "result does not match database model",
-                    )
-                })?,
-            )
-        })
-        .await
+    Ok(ctx.db.dump().await?)
 }

 #[command(subcommands(ui))]
@@ -352,7 +205,7 @@ pub fn put() -> Result<(), RpcError> {
 }

 #[command(display(display_serializable))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub async fn ui(
    #[context] ctx: RpcContext,
    #[arg] pointer: JsonPointer,
@@ -363,7 +216,7 @@ pub async fn ui(
 ) -> Result<(), Error> {
    let ptr = "/ui"
        .parse::<JsonPointer>()
-        .with_kind(ErrorKind::Database)?
+        .with_kind(crate::ErrorKind::Database)?
        + &pointer;
    ctx.db.put(&ptr, &value).await?;
    Ok(())
--- a/backend/src/db/model.rs
+++ b/backend/src/db/model.rs
@@ -0,0 +1,421 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::net::{Ipv4Addr, Ipv6Addr};
+use std::sync::Arc;
+
+use chrono::{DateTime, Utc};
+use emver::VersionRange;
+use ipnet::{Ipv4Net, Ipv6Net};
+use isocountry::CountryCode;
+use itertools::Itertools;
+use openssl::hash::MessageDigest;
+use patch_db::json_ptr::JsonPointer;
+use patch_db::{HasModel, Map, MapModel, OptionModel};
+use reqwest::Url;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use ssh_key::public::Ed25519PublicKey;
+
+use crate::account::AccountInfo;
+use crate::config::spec::{PackagePointerSpec, SystemPointerSpec};
+use crate::install::progress::InstallProgress;
+use crate::net::interface::InterfaceId;
+use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
+use crate::s9pk::manifest::{Manifest, ManifestModel, PackageId};
+use crate::status::health_check::HealthCheckId;
+use crate::status::Status;
+use crate::util::Version;
+use crate::version::{Current, VersionT};
+use crate::Error;
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct Database {
+    #[model]
+    pub server_info: ServerInfo,
+    #[model]
+    pub package_data: AllPackageData,
+    pub ui: Value,
+}
+impl Database {
+    pub fn init(account: &AccountInfo) -> Self {
+        let lan_address = account.hostname.lan_address().parse().unwrap();
+        // TODO
+        Database {
+            server_info: ServerInfo {
+                id: account.server_id.clone(),
+                version: Current::new().semver().into(),
+                hostname: Some(account.hostname.no_dot_host_name()),
+                last_backup: None,
+                last_wifi_region: None,
+                eos_version_compat: Current::new().compat().clone(),
+                lan_address,
+                tor_address: format!("http://{}", account.key.tor_address())
+                    .parse()
+                    .unwrap(),
+                ip_info: BTreeMap::new(),
+                status_info: ServerStatus {
+                    backup_progress: None,
+                    updated: false,
+                    update_progress: None,
+                },
+                wifi: WifiInfo {
+                    ssids: Vec::new(),
+                    connected: None,
+                    selected: None,
+                },
+                unread_notification_count: 0,
+                connection_addresses: ConnectionAddresses {
+                    tor: Vec::new(),
+                    clearnet: Vec::new(),
+                },
+                password_hash: account.password.clone(),
+                pubkey: ssh_key::PublicKey::from(Ed25519PublicKey::from(&account.key.ssh_key()))
+                    .to_openssh()
+                    .unwrap(),
+                ca_fingerprint: account
+                    .root_ca_cert
+                    .digest(MessageDigest::sha256())
+                    .unwrap()
+                    .iter()
+                    .map(|x| format!("{x:X}"))
+                    .join(":"),
+                system_start_time: Utc::now().to_rfc3339(),
+            },
+            package_data: AllPackageData::default(),
+            ui: serde_json::from_str(include_str!("../../../frontend/patchdb-ui-seed.json"))
+                .unwrap(),
+        }
+    }
+}
+impl DatabaseModel {
+    pub fn new() -> Self {
+        Self::from(JsonPointer::default())
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct ServerInfo {
+    pub id: String,
+    pub hostname: Option<String>,
+    pub version: Version,
+    pub last_backup: Option<DateTime<Utc>>,
+    /// Used in the wifi to determine the region to set the system to
+    pub last_wifi_region: Option<CountryCode>,
+    pub eos_version_compat: VersionRange,
+    pub lan_address: Url,
+    pub tor_address: Url,
+    #[model]
+    pub ip_info: BTreeMap<String, IpInfo>,
+    #[model]
+    #[serde(default)]
+    pub status_info: ServerStatus,
+    pub wifi: WifiInfo,
+    pub unread_notification_count: u64,
+    pub connection_addresses: ConnectionAddresses,
+    pub password_hash: String,
+    pub pubkey: String,
+    pub ca_fingerprint: String,
+    pub system_start_time: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct IpInfo {
+    pub ipv4_range: Option<Ipv4Net>,
+    pub ipv4: Option<Ipv4Addr>,
+    pub ipv6_range: Option<Ipv6Net>,
+    pub ipv6: Option<Ipv6Addr>,
+}
+impl IpInfo {
+    pub async fn for_interface(iface: &str) -> Result<Self, Error> {
+        let (ipv4, ipv4_range) = get_iface_ipv4_addr(iface).await?.unzip();
+        let (ipv6, ipv6_range) = get_iface_ipv6_addr(iface).await?.unzip();
+        Ok(Self {
+            ipv4_range,
+            ipv4,
+            ipv6_range,
+            ipv6,
+        })
+    }
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+pub struct BackupProgress {
+    pub complete: bool,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct ServerStatus {
+    #[model]
+    pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
+    pub updated: bool,
+    #[model]
+    pub update_progress: Option<UpdateProgress>,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct UpdateProgress {
+    pub size: Option<u64>,
+    pub downloaded: u64,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct WifiInfo {
+    pub ssids: Vec<String>,
+    pub selected: Option<String>,
+    pub connected: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ServerSpecs {
+    pub cpu: String,
+    pub disk: String,
+    pub memory: String,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ConnectionAddresses {
+    pub tor: Vec<String>,
+    pub clearnet: Vec<String>,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
+impl Map for AllPackageData {
+    type Key = PackageId;
+    type Value = PackageDataEntry;
+    fn get(&self, key: &Self::Key) -> Option<&Self::Value> {
+        self.0.get(key)
+    }
+}
+impl HasModel for AllPackageData {
+    type Model = MapModel<Self>;
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct StaticFiles {
+    license: String,
+    instructions: String,
+    icon: String,
+}
+impl StaticFiles {
+    pub fn local(id: &PackageId, version: &Version, icon_type: &str) -> Self {
+        StaticFiles {
+            license: format!("/public/package-data/{}/{}/LICENSE.md", id, version),
+            instructions: format!("/public/package-data/{}/{}/INSTRUCTIONS.md", id, version),
+            icon: format!("/public/package-data/{}/{}/icon.{}", id, version, icon_type),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(tag = "state")]
+#[serde(rename_all = "kebab-case")]
+pub enum PackageDataEntry {
+    #[serde(rename_all = "kebab-case")]
+    Installing {
+        static_files: StaticFiles,
+        manifest: Manifest,
+        install_progress: Arc<InstallProgress>,
+    },
+    #[serde(rename_all = "kebab-case")]
+    Updating {
+        static_files: StaticFiles,
+        manifest: Manifest,
+        installed: InstalledPackageDataEntry,
+        install_progress: Arc<InstallProgress>,
+    },
+    #[serde(rename_all = "kebab-case")]
+    Restoring {
+        static_files: StaticFiles,
+        manifest: Manifest,
+        install_progress: Arc<InstallProgress>,
+    },
+    #[serde(rename_all = "kebab-case")]
+    Removing {
+        static_files: StaticFiles,
+        manifest: Manifest,
+        removing: InstalledPackageDataEntry,
+    },
+    #[serde(rename_all = "kebab-case")]
+    Installed {
+        static_files: StaticFiles,
+        manifest: Manifest,
+        installed: InstalledPackageDataEntry,
+    },
+}
+impl PackageDataEntry {
+    pub fn installed(&self) -> Option<&InstalledPackageDataEntry> {
+        match self {
+            Self::Installing { .. } | Self::Restoring { .. } | Self::Removing { .. } => None,
+            Self::Updating { installed, .. } | Self::Installed { installed, .. } => Some(installed),
+        }
+    }
+    pub fn installed_mut(&mut self) -> Option<&mut InstalledPackageDataEntry> {
+        match self {
+            Self::Installing { .. } | Self::Restoring { .. } | Self::Removing { .. } => None,
+            Self::Updating { installed, .. } | Self::Installed { installed, .. } => Some(installed),
+        }
+    }
+    pub fn into_installed(self) -> Option<InstalledPackageDataEntry> {
+        match self {
+            Self::Installing { .. } | Self::Restoring { .. } | Self::Removing { .. } => None,
+            Self::Updating { installed, .. } | Self::Installed { installed, .. } => Some(installed),
+        }
+    }
+    pub fn manifest(self) -> Manifest {
+        match self {
+            PackageDataEntry::Installing { manifest, .. } => manifest,
+            PackageDataEntry::Updating { manifest, .. } => manifest,
+            PackageDataEntry::Restoring { manifest, .. } => manifest,
+            PackageDataEntry::Removing { manifest, .. } => manifest,
+            PackageDataEntry::Installed { manifest, .. } => manifest,
+        }
+    }
+    pub fn manifest_borrow(&self) -> &Manifest {
+        match self {
+            PackageDataEntry::Installing { manifest, .. } => manifest,
+            PackageDataEntry::Updating { manifest, .. } => manifest,
+            PackageDataEntry::Restoring { manifest, .. } => manifest,
+            PackageDataEntry::Removing { manifest, .. } => manifest,
+            PackageDataEntry::Installed { manifest, .. } => manifest,
+        }
+    }
+}
+impl PackageDataEntryModel {
+    pub fn installed(self) -> OptionModel<InstalledPackageDataEntry> {
+        self.0.child("installed").into()
+    }
+    pub fn removing(self) -> OptionModel<InstalledPackageDataEntry> {
+        self.0.child("removing").into()
+    }
+    pub fn install_progress(self) -> OptionModel<InstallProgress> {
+        self.0.child("install-progress").into()
+    }
+    pub fn manifest(self) -> ManifestModel {
+        self.0.child("manifest").into()
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct InstalledPackageDataEntry {
+    #[model]
+    pub status: Status,
+    pub marketplace_url: Option<Url>,
+    #[serde(default)]
+    #[serde(with = "crate::util::serde::ed25519_pubkey")]
+    pub developer_key: ed25519_dalek::PublicKey,
+    #[model]
+    pub manifest: Manifest,
+    pub last_backup: Option<DateTime<Utc>>,
+    #[model]
+    pub system_pointers: Vec<SystemPointerSpec>,
+    #[model]
+    pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
+    #[model]
+    pub current_dependents: CurrentDependents,
+    #[model]
+    pub current_dependencies: CurrentDependencies,
+    #[model]
+    pub interface_addresses: InterfaceAddressMap,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct CurrentDependents(pub BTreeMap<PackageId, CurrentDependencyInfo>);
+impl CurrentDependents {
+    pub fn map(
+        mut self,
+        transform: impl Fn(
+            BTreeMap<PackageId, CurrentDependencyInfo>,
+        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
+    ) -> Self {
+        self.0 = transform(self.0);
+        self
+    }
+}
+impl Map for CurrentDependents {
+    type Key = PackageId;
+    type Value = CurrentDependencyInfo;
+    fn get(&self, key: &Self::Key) -> Option<&Self::Value> {
+        self.0.get(key)
+    }
+}
+impl HasModel for CurrentDependents {
+    type Model = MapModel<Self>;
+}
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
+impl CurrentDependencies {
+    pub fn map(
+        mut self,
+        transform: impl Fn(
+            BTreeMap<PackageId, CurrentDependencyInfo>,
+        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
+    ) -> Self {
+        self.0 = transform(self.0);
+        self
+    }
+}
+impl Map for CurrentDependencies {
+    type Key = PackageId;
+    type Value = CurrentDependencyInfo;
+    fn get(&self, key: &Self::Key) -> Option<&Self::Value> {
+        self.0.get(key)
+    }
+}
+impl HasModel for CurrentDependencies {
+    type Model = MapModel<Self>;
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct StaticDependencyInfo {
+    pub manifest: Option<Manifest>,
+    pub icon: String,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct CurrentDependencyInfo {
+    pub pointers: Vec<PackagePointerSpec>,
+    pub health_checks: BTreeSet<HealthCheckId>,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct InterfaceAddressMap(pub BTreeMap<InterfaceId, InterfaceAddresses>);
+impl Map for InterfaceAddressMap {
+    type Key = InterfaceId;
+    type Value = InterfaceAddresses;
+    fn get(&self, key: &Self::Key) -> Option<&Self::Value> {
+        self.0.get(key)
+    }
+}
+impl HasModel for InterfaceAddressMap {
+    type Model = MapModel<Self>;
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct InterfaceAddresses {
+    #[model]
+    pub tor_address: Option<String>,
+    #[model]
+    pub lan_address: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+pub struct RecoveredPackageInfo {
+    pub title: String,
+    pub icon: String,
+    pub version: Version,
+}
--- a/backend/src/db/package.rs
+++ b/backend/src/db/package.rs
@@ -0,0 +1,75 @@
+use patch_db::{DbHandle, LockReceipt, LockTargetId, LockType, Verifier};
+
+use crate::s9pk::manifest::{Manifest, PackageId};
+use crate::Error;
+
+pub struct PackageReceipts {
+    package_data: LockReceipt<super::model::AllPackageData, ()>,
+}
+
+impl PackageReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(locks: &mut Vec<LockTargetId>) -> impl FnOnce(&Verifier) -> Result<Self, Error> {
+        let package_data = crate::db::DatabaseModel::new()
+            .package_data()
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                package_data: package_data.verify(&skeleton_key)?,
+            })
+        }
+    }
+}
+
+pub async fn get_packages<Db: DbHandle>(
+    db: &mut Db,
+    receipts: &PackageReceipts,
+) -> Result<Vec<PackageId>, Error> {
+    let packages = receipts.package_data.get(db).await?;
+    Ok(packages.0.keys().cloned().collect())
+}
+
+pub struct ManifestReceipts {
+    manifest: LockReceipt<Manifest, String>,
+}
+
+impl ManifestReceipts {
+    pub async fn new<'a>(db: &'a mut impl DbHandle, id: &PackageId) -> Result<Self, Error> {
+        let mut locks = Vec::new();
+
+        let setup = Self::setup(&mut locks, id);
+        Ok(setup(&db.lock_all(locks).await?)?)
+    }
+
+    pub fn setup(
+        locks: &mut Vec<LockTargetId>,
+        _id: &PackageId,
+    ) -> impl FnOnce(&Verifier) -> Result<Self, Error> {
+        let manifest = crate::db::DatabaseModel::new()
+            .package_data()
+            .star()
+            .manifest()
+            .make_locker(LockType::Read)
+            .add_to_keys(locks);
+        move |skeleton_key| {
+            Ok(Self {
+                manifest: manifest.verify(&skeleton_key)?,
+            })
+        }
+    }
+}
+
+pub async fn get_manifest<Db: DbHandle>(
+    db: &mut Db,
+    pkg: &PackageId,
+    receipts: &ManifestReceipts,
+) -> Result<Option<Manifest>, Error> {
+    Ok(receipts.manifest.get(db, pkg).await?)
+}
--- a/backend/src/dependencies.rs
+++ b/backend/src/dependencies.rs
--- a/core/startos/src/developer/mod.rs
+++ b/core/startos/src/developer/mod.rs
@@ -3,8 +3,7 @@ use std::io::Write;
 use std::path::Path;

 use ed25519::pkcs8::EncodePrivateKey;
-use ed25519::PublicKeyBytes;
-use ed25519_dalek::{SigningKey, VerifyingKey};
+use ed25519_dalek::Keypair;
 use rpc_toolkit::command;
 use tracing::instrument;

@@ -13,7 +12,7 @@ use crate::util::display_none;
 use crate::{Error, ResultExt};

 #[command(cli_only, blocking, display(display_none))]
-#[instrument(skip_all)]
+#[instrument(skip(ctx))]
 pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> {
    if !ctx.developer_key_path.exists() {
        let parent = ctx.developer_key_path.parent().unwrap_or(Path::new("/"));
@@ -22,11 +21,11 @@ pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> {
                .with_ctx(|_| (crate::ErrorKind::Filesystem, parent.display().to_string()))?;
        }
        tracing::info!("Generating new developer key...");
-        let secret = SigningKey::generate(&mut rand::thread_rng());
+        let keypair = Keypair::generate(&mut rand_old::thread_rng());
        tracing::info!("Writing key to {}", ctx.developer_key_path.display());
        let keypair_bytes = ed25519::KeypairBytes {
-            secret_key: secret.to_bytes(),
-            public_key: Some(PublicKeyBytes(VerifyingKey::from(&secret).to_bytes())),
+            secret_key: keypair.secret.to_bytes(),
+            public_key: Some(keypair.public.to_bytes()),
        };
        let mut dev_key_file = File::create(&ctx.developer_key_path)?;
        dev_key_file.write_all(
@@ -36,15 +35,6 @@ pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> {
                .as_bytes(),
        )?;
        dev_key_file.sync_all()?;
-        println!(
-            "New developer key generated at {}",
-            ctx.developer_key_path.display()
-        );
-    } else {
-        println!(
-            "Developer key already exists at {}",
-            ctx.developer_key_path.display()
-        );
    }
    Ok(())
 }
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -12,6 +12,8 @@ use crate::shutdown::Shutdown;
 use crate::util::display_none;
 use crate::Error;

+pub const SYSTEMD_UNIT: &'static str = "embassy-init";
+
 #[command(subcommands(error, logs, exit, restart, forget_disk, disk, rebuild))]
 pub fn diagnostic() -> Result<(), Error> {
    Ok(())
@@ -28,7 +30,7 @@ pub async fn logs(
    #[arg] cursor: Option<String>,
    #[arg] before: bool,
 ) -> Result<LogResponse, Error> {
-    Ok(fetch_logs(LogSource::System, limit, cursor, before).await?)
+    Ok(fetch_logs(LogSource::Service(SYSTEMD_UNIT), limit, cursor, before).await?)
 }

 #[command(display(display_none))]
@@ -41,10 +43,8 @@ pub fn exit(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
 pub fn restart(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
    ctx.shutdown
        .send(Some(Shutdown {
-            export_args: ctx
-                .disk_guid
-                .clone()
-                .map(|guid| (guid, ctx.datadir.clone())),
+            datadir: ctx.datadir.clone(),
+            disk_guid: ctx.disk_guid.clone(),
            restart: true,
        }))
        .expect("receiver dropped");
--- a/core/startos/src/disk/fsck/ext4.rs
+++ b/core/startos/src/disk/fsck/ext4.rs
@@ -7,10 +7,35 @@ use futures::FutureExt;
 use tokio::process::Command;
 use tracing::instrument;

-use crate::disk::fsck::RequiresReboot;
 use crate::Error;

-#[instrument(skip_all)]
+#[derive(Debug, Clone, Copy)]
+#[must_use]
+pub struct RequiresReboot(pub bool);
+impl std::ops::BitOrAssign for RequiresReboot {
+    fn bitor_assign(&mut self, rhs: Self) {
+        self.0 |= rhs.0
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum RepairStrategy {
+    Preen,
+    Aggressive,
+}
+impl RepairStrategy {
+    pub async fn e2fsck(
+        &self,
+        logicalname: impl AsRef<Path> + std::fmt::Debug,
+    ) -> Result<RequiresReboot, Error> {
+        match self {
+            RepairStrategy::Preen => e2fsck_preen(logicalname).await,
+            RepairStrategy::Aggressive => e2fsck_aggressive(logicalname).await,
+        }
+    }
+}
+
+#[instrument]
 pub async fn e2fsck_preen(
    logicalname: impl AsRef<Path> + std::fmt::Debug,
 ) -> Result<RequiresReboot, Error> {
@@ -34,7 +59,7 @@ fn backup_existing_undo_file<'a>(path: &'a Path) -> BoxFuture<'a, Result<(), Err
    .boxed()
 }

-#[instrument(skip_all)]
+#[instrument]
 pub async fn e2fsck_aggressive(
    logicalname: impl AsRef<Path> + std::fmt::Debug,
 ) -> Result<RequiresReboot, Error> {
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -13,32 +13,31 @@ use crate::disk::mount::util::unmount;
 use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};

-pub const PASSWORD_PATH: &'static str = "/run/embassy/password";
+pub const PASSWORD_PATH: &'static str = "/etc/embassy/password";
 pub const DEFAULT_PASSWORD: &'static str = "password";
 pub const MAIN_FS_SIZE: FsSize = FsSize::Gigabytes(8);

-#[instrument(skip_all)]
+#[instrument(skip(disks, datadir, password))]
 pub async fn create<I, P>(
    disks: &I,
    pvscan: &BTreeMap<PathBuf, Option<String>>,
    datadir: impl AsRef<Path>,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<String, Error>
 where
    for<'a> &'a I: IntoIterator<Item = &'a P>,
    P: AsRef<Path>,
 {
-    let guid = create_pool(disks, pvscan, password.is_some()).await?;
+    let guid = create_pool(disks, pvscan).await?;
    create_all_fs(&guid, &datadir, password).await?;
    export(&guid, datadir).await?;
    Ok(guid)
 }

-#[instrument(skip_all)]
+#[instrument(skip(disks))]
 pub async fn create_pool<I, P>(
    disks: &I,
    pvscan: &BTreeMap<PathBuf, Option<String>>,
-    encrypted: bool,
 ) -> Result<String, Error>
 where
    for<'a> &'a I: IntoIterator<Item = &'a P>,
@@ -63,16 +62,13 @@ where
            .invoke(crate::ErrorKind::DiskManagement)
            .await?;
    }
-    let mut guid = format!(
+    let guid = format!(
        "EMBASSY_{}",
        base32::encode(
            base32::Alphabet::RFC4648 { padding: false },
            &rand::random::<[u8; 32]>(),
        )
    );
-    if !encrypted {
-        guid += "_UNENC";
-    }
    let mut cmd = Command::new("vgcreate");
    cmd.arg("-y").arg(&guid);
    for disk in disks {
@@ -88,14 +84,17 @@ pub enum FsSize {
    FreePercentage(usize),
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir, password))]
 pub async fn create_fs<P: AsRef<Path>>(
    guid: &str,
    datadir: P,
    name: &str,
    size: FsSize,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<(), Error> {
+    tokio::fs::write(PASSWORD_PATH, password)
+        .await
+        .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
    let mut cmd = Command::new("lvcreate");
    match size {
        FsSize::Gigabytes(a) => cmd.arg("-L").arg(format!("{}G", a)),
@@ -107,50 +106,44 @@ pub async fn create_fs<P: AsRef<Path>>(
        .arg(guid)
        .invoke(crate::ErrorKind::DiskManagement)
        .await?;
-    let mut blockdev_path = Path::new("/dev").join(guid).join(name);
-    if let Some(password) = password {
-        if let Some(parent) = Path::new(PASSWORD_PATH).parent() {
-            tokio::fs::create_dir_all(parent).await?;
-        }
-        tokio::fs::write(PASSWORD_PATH, password)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
-        Command::new("cryptsetup")
-            .arg("-q")
-            .arg("luksFormat")
-            .arg(format!("--key-file={}", PASSWORD_PATH))
-            .arg(format!("--keyfile-size={}", password.len()))
-            .arg(&blockdev_path)
-            .invoke(crate::ErrorKind::DiskManagement)
-            .await?;
-        Command::new("cryptsetup")
-            .arg("-q")
-            .arg("luksOpen")
-            .arg("--allow-discards")
-            .arg(format!("--key-file={}", PASSWORD_PATH))
-            .arg(format!("--keyfile-size={}", password.len()))
-            .arg(&blockdev_path)
-            .arg(format!("{}_{}", guid, name))
-            .invoke(crate::ErrorKind::DiskManagement)
-            .await?;
-        tokio::fs::remove_file(PASSWORD_PATH)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
-        blockdev_path = Path::new("/dev/mapper").join(format!("{}_{}", guid, name));
-    }
-    Command::new("mkfs.btrfs")
-        .arg(&blockdev_path)
+    Command::new("cryptsetup")
+        .arg("-q")
+        .arg("luksFormat")
+        .arg(format!("--key-file={}", PASSWORD_PATH))
+        .arg(format!("--keyfile-size={}", password.len()))
+        .arg(Path::new("/dev").join(guid).join(name))
        .invoke(crate::ErrorKind::DiskManagement)
        .await?;
-    mount(&blockdev_path, datadir.as_ref().join(name), ReadWrite).await?;
+    Command::new("cryptsetup")
+        .arg("-q")
+        .arg("luksOpen")
+        .arg(format!("--key-file={}", PASSWORD_PATH))
+        .arg(format!("--keyfile-size={}", password.len()))
+        .arg(Path::new("/dev").join(guid).join(name))
+        .arg(format!("{}_{}", guid, name))
+        .invoke(crate::ErrorKind::DiskManagement)
+        .await?;
+    Command::new("mkfs.ext4")
+        .arg(Path::new("/dev/mapper").join(format!("{}_{}", guid, name)))
+        .invoke(crate::ErrorKind::DiskManagement)
+        .await?;
+    mount(
+        Path::new("/dev/mapper").join(format!("{}_{}", guid, name)),
+        datadir.as_ref().join(name),
+        ReadWrite,
+    )
+    .await?;
+    tokio::fs::remove_file(PASSWORD_PATH)
+        .await
+        .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir, password))]
 pub async fn create_all_fs<P: AsRef<Path>>(
    guid: &str,
    datadir: P,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<(), Error> {
    create_fs(guid, &datadir, "main", MAIN_FS_SIZE, password).await?;
    create_fs(
@@ -164,22 +157,20 @@ pub async fn create_all_fs<P: AsRef<Path>>(
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir))]
 pub async fn unmount_fs<P: AsRef<Path>>(guid: &str, datadir: P, name: &str) -> Result<(), Error> {
    unmount(datadir.as_ref().join(name)).await?;
-    if !guid.ends_with("_UNENC") {
-        Command::new("cryptsetup")
-            .arg("-q")
-            .arg("luksClose")
-            .arg(format!("{}_{}", guid, name))
-            .invoke(crate::ErrorKind::DiskManagement)
-            .await?;
-    }
+    Command::new("cryptsetup")
+        .arg("-q")
+        .arg("luksClose")
+        .arg(format!("{}_{}", guid, name))
+        .invoke(crate::ErrorKind::DiskManagement)
+        .await?;

    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir))]
 pub async fn unmount_all_fs<P: AsRef<Path>>(guid: &str, datadir: P) -> Result<(), Error> {
    unmount_fs(guid, &datadir, "main").await?;
    unmount_fs(guid, &datadir, "package-data").await?;
@@ -190,7 +181,7 @@ pub async fn unmount_all_fs<P: AsRef<Path>>(guid: &str, datadir: P) -> Result<()
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir))]
 pub async fn export<P: AsRef<Path>>(guid: &str, datadir: P) -> Result<(), Error> {
    Command::new("sync").invoke(ErrorKind::Filesystem).await?;
    unmount_all_fs(guid, datadir).await?;
@@ -206,12 +197,12 @@ pub async fn export<P: AsRef<Path>>(guid: &str, datadir: P) -> Result<(), Error>
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir, password))]
 pub async fn import<P: AsRef<Path>>(
    guid: &str,
    datadir: P,
    repair: RepairStrategy,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<RequiresReboot, Error> {
    let scan = pvscan().await?;
    if scan
@@ -222,7 +213,7 @@ pub async fn import<P: AsRef<Path>>(
        .is_none()
    {
        return Err(Error::new(
-            eyre!("StartOS disk not found."),
+            eyre!("Embassy disk not found."),
            crate::ErrorKind::DiskNotAvailable,
        ));
    }
@@ -232,7 +223,7 @@ pub async fn import<P: AsRef<Path>>(
        .any(|id| id == guid)
    {
        return Err(Error::new(
-            eyre!("A StartOS disk was found, but it is not the correct disk for this device."),
+            eyre!("An Embassy disk was found, but it is not the correct disk for this device."),
            crate::ErrorKind::IncorrectDisk,
        ));
    }
@@ -263,72 +254,43 @@ pub async fn import<P: AsRef<Path>>(
    mount_all_fs(guid, datadir, repair, password).await
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir, password))]
 pub async fn mount_fs<P: AsRef<Path>>(
    guid: &str,
    datadir: P,
    name: &str,
    repair: RepairStrategy,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<RequiresReboot, Error> {
-    let orig_path = Path::new("/dev").join(guid).join(name);
-    let mut blockdev_path = orig_path.clone();
-    let full_name = format!("{}_{}", guid, name);
-    if !guid.ends_with("_UNENC") {
-        let password = password.unwrap_or(DEFAULT_PASSWORD);
-        if let Some(parent) = Path::new(PASSWORD_PATH).parent() {
-            tokio::fs::create_dir_all(parent).await?;
-        }
-        tokio::fs::write(PASSWORD_PATH, password)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
-        Command::new("cryptsetup")
-            .arg("-q")
-            .arg("luksOpen")
-            .arg(format!("--key-file={}", PASSWORD_PATH))
-            .arg(format!("--keyfile-size={}", password.len()))
-            .arg(&blockdev_path)
-            .arg(&full_name)
-            .invoke(crate::ErrorKind::DiskManagement)
-            .await?;
-        tokio::fs::remove_file(PASSWORD_PATH)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
-        blockdev_path = Path::new("/dev/mapper").join(&full_name);
-    }
-    let reboot = repair.fsck(&blockdev_path).await?;
+    tokio::fs::write(PASSWORD_PATH, password)
+        .await
+        .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;
+    Command::new("cryptsetup")
+        .arg("-q")
+        .arg("luksOpen")
+        .arg(format!("--key-file={}", PASSWORD_PATH))
+        .arg(format!("--keyfile-size={}", password.len()))
+        .arg(Path::new("/dev").join(guid).join(name))
+        .arg(format!("{}_{}", guid, name))
+        .invoke(crate::ErrorKind::DiskManagement)
+        .await?;
+    let mapper_path = Path::new("/dev/mapper").join(format!("{}_{}", guid, name));
+    let reboot = repair.e2fsck(&mapper_path).await?;
+    mount(&mapper_path, datadir.as_ref().join(name), ReadWrite).await?;

-    if !guid.ends_with("_UNENC") {
-        // Backup LUKS header if e2fsck succeeded
-        let luks_folder = Path::new("/media/embassy/config/luks");
-        tokio::fs::create_dir_all(luks_folder).await?;
-        let tmp_luks_bak = luks_folder.join(format!(".{full_name}.luks.bak.tmp"));
-        if tokio::fs::metadata(&tmp_luks_bak).await.is_ok() {
-            tokio::fs::remove_file(&tmp_luks_bak).await?;
-        }
-        let luks_bak = luks_folder.join(format!("{full_name}.luks.bak"));
-        Command::new("cryptsetup")
-            .arg("-q")
-            .arg("luksHeaderBackup")
-            .arg("--header-backup-file")
-            .arg(&tmp_luks_bak)
-            .arg(&orig_path)
-            .invoke(crate::ErrorKind::DiskManagement)
-            .await?;
-        tokio::fs::rename(&tmp_luks_bak, &luks_bak).await?;
-    }
-
-    mount(&blockdev_path, datadir.as_ref().join(name), ReadWrite).await?;
+    tokio::fs::remove_file(PASSWORD_PATH)
+        .await
+        .with_ctx(|_| (crate::ErrorKind::Filesystem, PASSWORD_PATH))?;

    Ok(reboot)
 }

-#[instrument(skip_all)]
+#[instrument(skip(datadir, password))]
 pub async fn mount_all_fs<P: AsRef<Path>>(
    guid: &str,
    datadir: P,
    repair: RepairStrategy,
-    password: Option<&str>,
+    password: &str,
 ) -> Result<RequiresReboot, Error> {
    let mut reboot = RequiresReboot(false);
    reboot |= mount_fs(guid, &datadir, "main", repair, password).await?;
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -22,7 +22,6 @@ pub const REPAIR_DISK_PATH: &str = "/media/embassy/config/repair-disk";
 #[serde(rename_all = "kebab-case")]
 pub struct OsPartitionInfo {
    pub efi: Option<PathBuf>,
-    pub bios: Option<PathBuf>,
    pub boot: PathBuf,
    pub root: PathBuf,
 }
@@ -32,11 +31,6 @@ impl OsPartitionInfo {
            .as_ref()
            .map(|p| p == logicalname.as_ref())
            .unwrap_or(false)
-            || self
-                .bios
-                .as_ref()
-                .map(|p| p == logicalname.as_ref())
-                .unwrap_or(false)
            || &*self.boot == logicalname.as_ref()
            || &*self.root == logicalname.as_ref()
    }
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -35,7 +35,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
        }
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(password))]
    pub async fn mount(backup_disk_mount_guard: G, password: &str) -> Result<Self, Error> {
        let backup_disk_path = backup_disk_mount_guard.as_ref();
        let unencrypted_metadata_path =
@@ -84,7 +84,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
                argon2::hash_encoded(
                    password.as_bytes(),
                    &rand::random::<[u8; 16]>()[..],
-                    &argon2::Config::rfc9106_low_mem(),
+                    &argon2::Config::default(),
                )
                .with_kind(crate::ErrorKind::PasswordHashGeneration)?,
            );
@@ -134,7 +134,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
            argon2::hash_encoded(
                new_password.as_bytes(),
                &rand::random::<[u8; 16]>()[..],
-                &argon2::Config::rfc9106_low_mem(),
+                &argon2::Config::default(),
            )
            .with_kind(crate::ErrorKind::PasswordHashGeneration)?,
        );
@@ -145,7 +145,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
        Ok(())
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn mount_package_backup(
        &self,
        id: &PackageId,
@@ -159,7 +159,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
        })
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn save(&self) -> Result<(), Error> {
        let metadata_path = self.as_ref().join("metadata.cbor");
        let backup_disk_path = self.backup_disk_path();
@@ -180,7 +180,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
        Ok(())
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn unmount(mut self) -> Result<(), Error> {
        if let Some(guard) = self.encrypted_guard.take() {
            guard.unmount().await?;
@@ -191,7 +191,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
        Ok(())
    }

-    #[instrument(skip_all)]
+    #[instrument(skip(self))]
    pub async fn save_and_unmount(self) -> Result<(), Error> {
        self.save().await?;
        self.unmount().await?;
--- a/core/startos/src/disk/mount/filesystem/bind.rs
+++ b/core/startos/src/disk/mount/filesystem/bind.rs
--- a/core/startos/src/disk/mount/filesystem/block_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/block_dev.rs
--- a/core/startos/src/disk/mount/filesystem/cifs.rs
+++ b/core/startos/src/disk/mount/filesystem/cifs.rs
@@ -16,9 +16,7 @@ use crate::util::Invoke;
 use crate::Error;

 async fn resolve_hostname(hostname: &str) -> Result<IpAddr, Error> {
-    if let Ok(addr) = hostname.parse() {
-        return Ok(addr);
-    }
+    #[cfg(feature = "avahi")]
    if hostname.ends_with(".local") {
        return Ok(IpAddr::V4(crate::net::mdns::resolve_mdns(hostname).await?));
    }
@@ -35,7 +33,7 @@ async fn resolve_hostname(hostname: &str) -> Result<IpAddr, Error> {
    .parse()?)
 }

-#[instrument(skip_all)]
+#[instrument(skip(path, password, mountpoint))]
 pub async fn mount_cifs(
    hostname: &str,
    path: impl AsRef<Path>,
--- a/core/startos/src/disk/mount/filesystem/ecryptfs.rs
+++ b/core/startos/src/disk/mount/filesystem/ecryptfs.rs
@@ -2,12 +2,13 @@ use std::os::unix::ffi::OsStrExt;
 use std::path::Path;

 use async_trait::async_trait;
+use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use sha2::Sha256;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};

 use super::{FileSystem, MountType};
-use crate::util::Invoke;
 use crate::{Error, ResultExt};

 pub async fn mount_ecryptfs<P0: AsRef<Path>, P1: AsRef<Path>>(
@@ -16,7 +17,7 @@ pub async fn mount_ecryptfs<P0: AsRef<Path>, P1: AsRef<Path>>(
    key: &str,
 ) -> Result<(), Error> {
    tokio::fs::create_dir_all(dst.as_ref()).await?;
-    tokio::process::Command::new("mount")
+    let mut ecryptfs = tokio::process::Command::new("mount")
        .arg("-t")
        .arg("ecryptfs")
        .arg(src.as_ref())
@@ -24,9 +25,22 @@ pub async fn mount_ecryptfs<P0: AsRef<Path>, P1: AsRef<Path>>(
        .arg("-o")
        // for more information `man ecryptfs` 
        .arg(format!("key=passphrase:passphrase_passwd={},ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,no_sig_cache", key))
-        .input(Some(&mut std::io::Cursor::new(b"\n")))
-        .invoke(crate::ErrorKind::Filesystem).await?;
-    Ok(())
+        .stdin(std::process::Stdio::piped())
+        .stderr(std::process::Stdio::piped())
+        .spawn()?;
+    let mut stdin = ecryptfs.stdin.take().unwrap();
+    let mut stderr = ecryptfs.stderr.take().unwrap();
+    stdin.write_all(b"\n").await?;
+    stdin.flush().await?;
+    stdin.shutdown().await?;
+    drop(stdin);
+    let mut err = String::new();
+    stderr.read_to_string(&mut err).await?;
+    if !ecryptfs.wait().await?.success() {
+        Err(Error::new(eyre!("{}", err), crate::ErrorKind::Filesystem))
+    } else {
+        Ok(())
+    }
 }

 pub struct EcryptFS<EncryptedDir: AsRef<Path>, Key: AsRef<str>> {
--- a/core/startos/src/disk/mount/filesystem/efivarfs.rs
+++ b/core/startos/src/disk/mount/filesystem/efivarfs.rs
@@ -1,3 +1,4 @@
+use std::os::unix::ffi::OsStrExt;
 use std::path::Path;

 use async_trait::async_trait;
@@ -7,7 +8,7 @@ use sha2::Sha256;

 use super::{FileSystem, MountType, ReadOnly};
 use crate::util::Invoke;
-use crate::Error;
+use crate::{Error, ResultExt};

 pub struct EfiVarFs;
 #[async_trait]
--- a/core/startos/src/disk/mount/filesystem/httpdirfs.rs
+++ b/core/startos/src/disk/mount/filesystem/httpdirfs.rs
--- a/core/startos/src/disk/mount/filesystem/label.rs
+++ b/core/startos/src/disk/mount/filesystem/label.rs
--- a/core/startos/src/disk/mount/filesystem/mod.rs
+++ b/core/startos/src/disk/mount/filesystem/mod.rs
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -95,7 +95,7 @@ pub struct TmpMountGuard {
 }
 impl TmpMountGuard {
    /// DRAGONS: if you try to mount something as ro and rw at the same time, the ro mount will be upgraded to rw.
-    #[instrument(skip_all)]
+    #[instrument(skip(filesystem))]
    pub async fn mount(filesystem: &impl FileSystem, mount_type: MountType) -> Result<Self, Error> {
        let mountpoint = tmp_mountpoint(filesystem).await?;
        let mut tmp_mounts = TMP_MOUNTS.lock().await;
--- a/core/startos/src/disk/mount/mod.rs
+++ b/core/startos/src/disk/mount/mod.rs
--- a/core/startos/src/disk/mount/util.rs
+++ b/core/startos/src/disk/mount/util.rs
@@ -3,9 +3,9 @@ use std::path::Path;
 use tracing::instrument;

 use crate::util::Invoke;
-use crate::Error;
+use crate::{Error, ResultExt};

-#[instrument(skip_all)]
+#[instrument(skip(src, dst))]
 pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
    src: P0,
    dst: P1,
@@ -40,7 +40,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
    Ok(())
 }

-#[instrument(skip_all)]
+#[instrument(skip(mountpoint))]
 pub async fn unmount<P: AsRef<Path>>(mountpoint: P) -> Result<(), Error> {
    tracing::debug!("Unmounting {}.", mountpoint.as_ref().display());
    tokio::process::Command::new("umount")
--- a/Show More
+++ b/Show More