diff --git a/.gitignore b/.gitignore
index 19f747b6..e1c9c94a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,172 +66,7 @@ flamegraph.svg
 perf.data
 perf.data.old
 
-##############################################################################
-### Python
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-## Custom for veilid-python
-veilid-python/demo/.demokeys
+###################################
 
 .vscode/
 .idea/
diff --git a/Cargo.lock b/Cargo.lock
index 715bbcef..44fd7150 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,25 +41,25 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if 1.0.0",
  "getrandom",
  "once_cell",
- "version_check 0.9.4",
+ "version_check",
  "zerocopy",
 ]
 
@@ -140,12 +140,11 @@ dependencies = [
 
 [[package]]
 name = "ansi-parser"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcb2392079bf27198570d6af79ecbd9ec7d8f16d3ec6b60933922fdb66287127"
+version = "0.9.0"
+source = "git+https://gitlab.com/davidbittner/ansi-parser.git#80b28ea6c42fc6ee7c9974aaa8059ae244032365"
 dependencies = [
  "heapless",
- "nom 4.2.3",
+ "nom",
 ]
 
 [[package]]
@@ -159,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -173,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -207,15 +206,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arboard"
-version = "3.3.0"
+version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08"
+checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58"
 dependencies = [
  "clipboard-win",
  "core-graphics",
@@ -226,15 +225,15 @@ dependencies = [
  "objc_id",
  "parking_lot 0.12.1",
  "thiserror",
- "winapi",
+ "windows-sys 0.48.0",
  "x11rb",
 ]
 
 [[package]]
 name = "argon2"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
 dependencies = [
  "base64ct",
  "blake2",
@@ -289,13 +288,13 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener 4.0.3",
- "event-listener-strategy",
+ "event-listener 5.2.0",
+ "event-listener-strategy 0.5.0",
  "futures-core",
  "pin-project-lite",
 ]
@@ -310,7 +309,7 @@ dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.0.1",
- "futures-lite 2.2.0",
+ "futures-lite 2.3.0",
  "slab",
 ]
 
@@ -320,12 +319,12 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel 2.1.1",
+ "async-channel 2.2.0",
  "async-executor",
- "async-io 2.3.0",
+ "async-io 2.3.2",
  "async-lock 3.3.0",
  "blocking",
- "futures-lite 2.2.0",
+ "futures-lite 2.3.0",
  "once_cell",
 ]
 
@@ -351,18 +350,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744"
+checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
 dependencies = [
  "async-lock 3.3.0",
  "cfg-if 1.0.0",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.2.0",
+ "futures-lite 2.3.0",
  "parking",
- "polling 3.3.2",
- "rustix 0.38.30",
+ "polling 3.5.0",
+ "rustix 0.38.31",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -384,7 +383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
  "event-listener 4.0.3",
- "event-listener-strategy",
+ "event-listener-strategy 0.4.0",
  "pin-project-lite",
 ]
 
@@ -401,7 +400,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -411,13 +410,13 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
- "async-io 2.3.0",
+ "async-io 2.3.2",
  "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if 1.0.0",
  "futures-core",
  "futures-io",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -453,17 +452,17 @@ dependencies = [
 
 [[package]]
 name = "async-std-resolver"
-version = "0.23.2"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0928198152da571a19145031360f34fc7569ef2dc387681565f330c811a5ba9b"
+checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb"
 dependencies = [
  "async-std",
  "async-trait",
  "futures-io",
  "futures-util",
+ "hickory-resolver",
  "pin-utils",
- "socket2 0.5.5",
- "trust-dns-resolver",
+ "socket2 0.5.6",
 ]
 
 [[package]]
@@ -485,7 +484,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -496,13 +495,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -699,6 +698,9 @@ name = "bitflags"
 version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "blake2"
@@ -711,9 +713,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -730,7 +732,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -779,12 +781,12 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel 2.1.1",
+ "async-channel 2.2.0",
  "async-lock 3.3.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.2.0",
+ "futures-lite 2.3.0",
  "piper",
  "tracing",
 ]
@@ -800,15 +802,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
 
 [[package]]
 name = "byteorder"
@@ -842,12 +844,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cesu8"
@@ -861,7 +860,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -876,6 +875,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -902,16 +907,16 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -962,9 +967,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -972,44 +977,42 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.10.0",
+ "strsim 0.11.0",
  "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "clipboard-win"
-version = "4.5.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
+checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee"
 dependencies = [
  "error-code",
- "str-buf",
- "winapi",
 ]
 
 [[package]]
@@ -1023,9 +1026,9 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "eyre",
@@ -1074,16 +1077,49 @@ dependencies = [
  "async-trait",
  "json5",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "pathdiff",
- "ron",
- "rust-ini",
+ "ron 0.7.1",
+ "rust-ini 0.18.0",
  "serde",
  "serde_json",
  "toml 0.5.11",
  "yaml-rust",
 ]
 
+[[package]]
+name = "config"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be"
+dependencies = [
+ "async-trait",
+ "convert_case",
+ "json5",
+ "lazy_static",
+ "nom",
+ "pathdiff",
+ "ron 0.8.1",
+ "rust-ini 0.19.0",
+ "serde",
+ "serde_json",
+ "toml 0.8.11",
+ "yaml-rust",
+]
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "console-api"
 version = "0.6.0"
@@ -1137,12 +1173,41 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1161,9 +1226,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -1194,18 +1259,37 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1218,12 +1302,13 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crossterm"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "crossterm_winapi",
+ "futures-core",
  "libc",
  "mio",
  "parking_lot 0.12.1",
@@ -1241,6 +1326,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1264,30 +1355,30 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
+checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c"
 dependencies = [
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "ctrlc"
-version = "3.4.2"
+version = "3.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b"
+checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
 dependencies = [
- "nix 0.27.1",
+ "nix 0.28.0",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "cursive"
 version = "0.20.0"
-source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
+source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "async-std",
  "cfg-if 1.0.0",
  "crossbeam-channel",
@@ -1305,11 +1396,9 @@ dependencies = [
 [[package]]
 name = "cursive-macros"
 version = "0.1.0"
-source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
+source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -1328,9 +1417,9 @@ dependencies = [
 [[package]]
 name = "cursive_core"
 version = "0.3.7"
-source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
+source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "ansi-parser",
  "async-std",
  "crossbeam-channel",
@@ -1341,11 +1430,12 @@ dependencies = [
  "log",
  "num",
  "owning_ref",
+ "parking_lot 0.12.1",
  "serde_json",
  "serde_yaml",
  "time",
  "tokio",
- "toml 0.7.8",
+ "toml 0.8.11",
  "unicode-segmentation",
  "unicode-width",
  "xi-unicode",
@@ -1354,17 +1444,16 @@ dependencies = [
 [[package]]
 name = "cursive_table_view"
 version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8935dd87d19c54b7506b245bc988a7b4e65b1058e1d0d64c0ad9b3188e48060"
+source = "git+https://gitlab.com/veilid/cursive-table-view.git#5311a8aa0527b4619f7070b28a8418432c6918da"
 dependencies = [
  "cursive_core",
 ]
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
@@ -1385,7 +1474,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1409,12 +1498,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
 dependencies = [
- "darling_core 0.20.3",
- "darling_macro 0.20.3",
+ "darling_core 0.20.8",
+ "darling_macro 0.20.8",
 ]
 
 [[package]]
@@ -1433,15 +1522,15 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1457,13 +1546,13 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
- "darling_core 0.20.3",
+ "darling_core 0.20.8",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1563,10 +1652,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
 
 [[package]]
-name = "dyn-clone"
-version = "1.0.16"
+name = "dlv-list"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ed25519"
@@ -1580,9 +1678,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
@@ -1596,9 +1694,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "embedded-io"
@@ -1606,16 +1704,22 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060"
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "enum-as-inner"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1635,7 +1739,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1675,10 +1779,10 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
 dependencies = [
- "darling 0.20.3",
+ "darling 0.20.8",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1722,13 +1826,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "2.3.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
+checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
 
 [[package]]
 name = "event-listener"
@@ -1758,6 +1858,17 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "event-listener-strategy"
 version = "0.4.0"
@@ -1769,10 +1880,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "eyre"
-version = "0.6.11"
+name = "event-listener-strategy"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
+checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
+dependencies = [
+ "event-listener 5.2.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1826,9 +1947,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
 
 [[package]]
 name = "filetime"
@@ -1896,18 +2017,30 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foreign-types"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
+ "foreign-types-macros",
  "foreign-types-shared",
 ]
 
 [[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
+name = "foreign-types-macros"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.53",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
 [[package]]
 name = "form_urlencoded"
@@ -1924,7 +2057,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
 dependencies = [
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -1993,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
  "fastrand 2.0.1",
  "futures-core",
@@ -2012,7 +2145,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2029,9 +2162,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
  "gloo-timers",
  "send_wrapper 0.4.0",
@@ -2086,17 +2219,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
 name = "gethostname"
-version = "0.3.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
 dependencies = [
  "libc",
- "winapi",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2195,9 +2328,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
 dependencies = [
  "bytes",
  "fnv",
@@ -2205,7 +2338,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -2214,9 +2347,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
 
 [[package]]
 name = "hash32"
@@ -2233,7 +2366,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -2242,7 +2375,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
 ]
 
 [[package]]
@@ -2251,7 +2384,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -2273,18 +2406,18 @@ dependencies = [
  "base64 0.21.7",
  "byteorder",
  "flate2",
- "nom 7.1.3",
+ "nom",
  "num-traits",
 ]
 
 [[package]]
 name = "heapless"
-version = "0.5.6"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
+checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422"
 dependencies = [
  "as-slice",
- "generic-array 0.13.3",
+ "generic-array 0.14.7",
  "hash32",
  "stable_deref_trait",
 ]
@@ -2295,6 +2428,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -2306,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -2403,9 +2542,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -2458,7 +2597,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tower-service",
  "tracing",
@@ -2479,9 +2618,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2538,9 +2677,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.8"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2574,9 +2713,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2606,7 +2745,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.4",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -2617,7 +2756,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -2649,9 +2788,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -2692,9 +2831,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2816,9 +2955,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libc-print"
@@ -2831,12 +2970,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if 1.0.0",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -2863,9 +3002,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.14"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050"
+checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
 dependencies = [
  "cc",
  "libc",
@@ -2903,9 +3042,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "value-bag",
 ]
@@ -2979,15 +3118,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memory_units"
 version = "0.4.0"
@@ -3008,9 +3138,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -3018,9 +3148,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
@@ -3154,9 +3284,9 @@ dependencies = [
 
 [[package]]
 name = "netlink-proto"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3"
+checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21"
 dependencies = [
  "bytes",
  "futures",
@@ -3191,7 +3321,7 @@ dependencies = [
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "memoffset 0.6.5",
+ "memoffset",
 ]
 
 [[package]]
@@ -3203,7 +3333,6 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "libc",
- "memoffset 0.7.1",
 ]
 
 [[package]]
@@ -3218,13 +3347,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "nom"
-version = "4.2.3"
+name = "nix"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "memchr",
- "version_check 0.1.5",
+ "bitflags 2.4.2",
+ "cfg-if 1.0.0",
+ "cfg_aliases",
+ "libc",
 ]
 
 [[package]]
@@ -3283,28 +3414,33 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "num-conv"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -3325,9 +3461,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -3338,7 +3474,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.4",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -3365,9 +3501,9 @@ dependencies = [
 
 [[package]]
 name = "num_threads"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 dependencies = [
  "libc",
 ]
@@ -3418,9 +3554,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "opentelemetry"
@@ -3538,10 +3674,20 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
 dependencies = [
- "dlv-list",
+ "dlv-list 0.3.0",
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "ordered-multimap"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+dependencies = [
+ "dlv-list 0.5.2",
+ "hashbrown 0.13.2",
+]
+
 [[package]]
 name = "oslog"
 version = "0.2.0"
@@ -3679,9 +3825,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.6"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06"
+checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8"
 dependencies = [
  "memchr",
  "thiserror",
@@ -3690,9 +3836,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.6"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde"
+checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3700,22 +3846,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.6"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"
+checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.6"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d"
+checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293"
 dependencies = [
  "once_cell",
  "pest",
@@ -3734,22 +3880,22 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3787,9 +3933,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "platforms"
@@ -3799,9 +3945,9 @@ checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
 [[package]]
 name = "png"
-version = "0.17.11"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3828,14 +3974,14 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.3.2"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41"
+checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9"
 dependencies = [
  "cfg-if 1.0.0",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -3879,14 +4025,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3934,7 +4080,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3999,12 +4145,12 @@ dependencies = [
 
 [[package]]
 name = "range-set-blaze"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7bf6195484b9c084e59358ac571e65e273b8278f7fed60fcee62159cd4f9e86"
+checksum = "8421b5d459262eabbe49048d362897ff3e3830b44eac6cfe341d6acb2f0f13d2"
 dependencies = [
  "gen_ops",
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "num-integer",
  "num-traits",
 ]
@@ -4015,6 +4161,26 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
+[[package]]
+name = "rayon"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -4046,13 +4212,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
+ "regex-automata 0.4.6",
  "regex-syntax 0.8.2",
 ]
 
@@ -4067,9 +4233,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4100,16 +4266,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if 1.0.0",
  "getrandom",
  "libc",
  "spin",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4123,6 +4290,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ron"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+dependencies = [
+ "base64 0.21.7",
+ "bitflags 2.4.2",
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "rpassword"
 version = "7.3.1"
@@ -4184,7 +4363,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
 dependencies = [
  "cfg-if 1.0.0",
- "ordered-multimap",
+ "ordered-multimap 0.4.3",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ordered-multimap 0.6.0",
 ]
 
 [[package]]
@@ -4224,9 +4413,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -4273,10 +4462,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
-name = "ryu"
-version = "1.0.16"
+name = "rustyline-async"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "8b6eb06391513b2184f0a5405c11a4a0a5302e8be442f4c5c35267187c2b37d5"
+dependencies = [
+ "crossterm",
+ "futures-channel",
+ "futures-util",
+ "pin-project",
+ "thingbuf",
+ "thiserror",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "same-file"
@@ -4378,9 +4583,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "send_wrapper"
@@ -4399,9 +4604,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.195"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -4428,9 +4633,9 @@ dependencies = [
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
 dependencies = [
  "js-sys",
  "serde",
@@ -4458,13 +4663,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.195"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -4486,14 +4691,14 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -4508,7 +4713,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -4522,11 +4727,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.30"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
+checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "itoa",
  "ryu",
  "serde",
@@ -4555,7 +4760,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -4610,9 +4815,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
@@ -4673,9 +4878,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "simplelog"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
 dependencies = [
  "log",
  "termcolor",
@@ -4719,12 +4924,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4770,12 +4975,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -4788,6 +4987,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -4807,9 +5012,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4824,23 +5029,24 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.30.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
  "libc",
  "ntapi",
  "once_cell",
- "winapi",
+ "rayon",
+ "windows 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -4851,7 +5057,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -4865,30 +5071,40 @@ dependencies = [
 ]
 
 [[package]]
-name = "thiserror"
-version = "1.0.56"
+name = "thingbuf"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "4706f1bfb859af03f099ada2de3cea3e515843c2d3e93b7893f16d94a37f9415"
+dependencies = [
+ "parking_lot 0.12.1",
+ "pin-project",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if 1.0.0",
  "once_cell",
@@ -4907,13 +5123,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.31"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
@@ -4929,13 +5146,23 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -4953,9 +5180,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4965,7 +5192,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -4989,14 +5216,14 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5029,14 +5256,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.7",
 ]
 
 [[package]]
@@ -5054,11 +5281,22 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
+dependencies = [
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.5",
 ]
 
 [[package]]
@@ -5180,7 +5418,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -5307,50 +5545,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.4.0",
- "ipnet",
- "once_cell",
- "rand",
- "smallvec",
- "thiserror",
- "tinyvec",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
-dependencies = [
- "cfg-if 1.0.0",
- "futures-util",
- "ipconfig",
- "lru-cache",
- "once_cell",
- "parking_lot 0.12.1",
- "rand",
- "resolv-conf",
- "smallvec",
- "thiserror",
- "tracing",
- "trust-dns-proto",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -5380,7 +5574,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals 0.28.0",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -5428,18 +5622,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -5465,9 +5659,9 @@ dependencies = [
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "untrusted"
@@ -5512,9 +5706,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503"
+checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d"
 
 [[package]]
 name = "vcpkg"
@@ -5557,9 +5751,12 @@ dependencies = [
 
 [[package]]
 name = "veilid-bugsalot"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3"
+checksum = "2836acd414bd560c55c906a636c3bca7f080a8fc21802f18616d6be380819ddc"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "veilid-cli"
@@ -5570,8 +5767,9 @@ dependencies = [
  "async-tungstenite",
  "cfg-if 1.0.0",
  "chrono",
- "clap 4.4.18",
- "config",
+ "clap 4.5.3",
+ "config 0.14.0",
+ "console",
  "crossbeam-channel",
  "cursive",
  "cursive_buffered_backend",
@@ -5588,6 +5786,7 @@ dependencies = [
  "lru",
  "owning_ref",
  "parking_lot 0.12.1",
+ "rustyline-async",
  "serde",
  "serde_derive",
  "serial_test",
@@ -5618,7 +5817,7 @@ dependencies = [
  "chacha20",
  "chacha20poly1305",
  "chrono",
- "config",
+ "config 0.13.4",
  "console_error_panic_hook",
  "curve25519-dalek",
  "data-encoding",
@@ -5660,16 +5859,17 @@ dependencies = [
  "send_wrapper 0.6.0",
  "serde",
  "serde-big-array",
- "serde-wasm-bindgen 0.6.3",
+ "serde-wasm-bindgen 0.6.5",
  "serde_bytes",
  "serde_json",
  "serial_test",
  "sha2 0.10.8",
  "shell-words",
  "simplelog",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "static_assertions",
  "stop-token",
+ "sysinfo",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -5693,10 +5893,10 @@ dependencies = [
  "weak-table",
  "web-sys",
  "webpki",
- "webpki-roots 0.25.3",
+ "webpki-roots 0.25.4",
  "wee_alloc",
  "winapi",
- "windows",
+ "windows 0.51.1",
  "windows-permissions",
  "ws_stream_wasm",
  "x25519-dalek",
@@ -5767,9 +5967,9 @@ dependencies = [
  "async-std",
  "backtrace",
  "cfg-if 1.0.0",
- "clap 4.4.18",
+ "clap 4.5.3",
  "color-eyre",
- "config",
+ "config 0.14.0",
  "console-subscriber",
  "ctrlc",
  "daemonize",
@@ -5779,7 +5979,7 @@ dependencies = [
  "hostname",
  "json",
  "lazy_static",
- "nix 0.27.1",
+ "nix 0.28.0",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry-semantic-conventions",
@@ -5881,7 +6081,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "send_wrapper 0.6.0",
  "serde",
- "serde-wasm-bindgen 0.6.3",
+ "serde-wasm-bindgen 0.6.5",
  "serde_bytes",
  "serde_json",
  "tracing",
@@ -5895,12 +6095,6 @@ dependencies = [
  "wee_alloc",
 ]
 
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -5915,9 +6109,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -5940,9 +6134,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.90"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -5952,24 +6146,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.90"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.40"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -5979,9 +6173,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.90"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5989,28 +6183,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.90"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.90"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.40"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139bd73305d50e1c1c4333210c0db43d989395b64a237bd35c10ef3832a7f70c"
+checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -6022,13 +6216,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.40"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70072aebfe5da66d2716002c729a14e4aec4da0e23cc2ea66323dac541c93928"
+checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -6050,9 +6244,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
 
 [[package]]
 name = "web-sys"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6079,9 +6273,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.3"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "wee_alloc"
@@ -6097,9 +6291,9 @@ dependencies = [
 
 [[package]]
 name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wg"
@@ -6121,7 +6315,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.30",
+ "rustix 0.38.31",
 ]
 
 [[package]]
@@ -6155,15 +6349,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -6180,6 +6365,16 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core 0.52.0",
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.51.1"
@@ -6195,7 +6390,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -6243,7 +6438,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -6278,17 +6473,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -6305,9 +6500,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6323,9 +6518,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6341,9 +6536,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6359,9 +6554,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6377,9 +6572,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6395,9 +6590,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6413,15 +6608,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
-version = "0.5.34"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]
@@ -6457,31 +6661,26 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
 dependencies = [
  "gethostname",
- "nix 0.26.4",
- "winapi",
- "winapi-wsapoll",
+ "rustix 0.38.31",
  "x11rb-protocol",
 ]
 
 [[package]]
 name = "x11rb-protocol"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
-dependencies = [
- "nix 0.26.4",
-]
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
  "rand_core",
@@ -6571,7 +6770,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -6591,7 +6790,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
diff --git a/doc/config/veilid-bootstrap-config b/doc/config/veilid-bootstrap-config
index dd24ebce..ffd201c5 100644
--- a/doc/config/veilid-bootstrap-config
+++ b/doc/config/veilid-bootstrap-config
@@ -17,7 +17,7 @@ logging:
     enabled: false
 core:
   capabilities:
-    disable: ['TUNL','SGNL','RLAY','DIAL','DHTV','APPM','ROUT']
+    disable: ['TUNL','SGNL','RLAY','DIAL','DHTV','DHTW','APPM','ROUT']
   network:
     upnp: false
     dht:
diff --git a/doc/config/veilid-dev-bootstrap-config b/doc/config/veilid-dev-bootstrap-config
index 936effb3..2e819ac9 100644
--- a/doc/config/veilid-dev-bootstrap-config
+++ b/doc/config/veilid-dev-bootstrap-config
@@ -22,7 +22,7 @@ logging:
     enabled: false
 core:
   capabilities:
-    disable: ['TUNL','SGNL','RLAY','DIAL','DHTV','APPM']
+    disable: ['TUNL','SGNL','RLAY','DIAL','DHTV','DHTW','APPM']
   network:
     upnp: false
     dht:
diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml
index 7cb24732..2750b13e 100644
--- a/veilid-cli/Cargo.toml
+++ b/veilid-cli/Cargo.toml
@@ -38,7 +38,7 @@ cursive = { git = "https://gitlab.com/veilid/cursive.git", default-features = fa
 cursive_buffered_backend = { git = "https://gitlab.com/veilid/cursive-buffered-backend.git" }
 # cursive-multiplex = "0.6.0"
 # cursive_tree_view = "0.6.0"
-cursive_table_view = "0.14.0"
+cursive_table_view = { git = "https://gitlab.com/veilid/cursive-table-view.git" }
 arboard = "3.3.0"
 # cursive-tabs = "0.5.0"
 clap = { version = "4", features = ["derive"] }
@@ -50,12 +50,12 @@ serde_derive = "^1"
 parking_lot = "^0"
 cfg-if = "^1"
 config = { version = "^0", features = ["yaml"] }
-bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
+bugsalot = { package = "veilid-bugsalot", version = "0.2.0" }
 flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] }
 thiserror = "^1"
 crossbeam-channel = "^0"
 hex = "^0"
-veilid-tools = { version = "0.2.5", path = "../veilid-tools", default-features = false}
+veilid-tools = { version = "0.2.5", path = "../veilid-tools", default-features = false }
 
 json = "^0"
 stop-token = { version = "^0", default-features = false }
@@ -67,6 +67,8 @@ chrono = "0.4.31"
 owning_ref = "0.4.1"
 unicode-width = "0.1.11"
 lru = "0.10.1"
+rustyline-async = "0.4.2"
+console = "0.15.8"
 
 [dev-dependencies]
 serial_test = "^2"
diff --git a/veilid-cli/src/client_api_connection.rs b/veilid-cli/src/client_api_connection.rs
index d507f5ee..ef185a2a 100644
--- a/veilid-cli/src/client_api_connection.rs
+++ b/veilid-cli/src/client_api_connection.rs
@@ -80,7 +80,7 @@ impl ClientApiConnection {
     async fn process_veilid_update(&self, update: json::JsonValue) {
         let comproc = self.inner.lock().comproc.clone();
         let Some(kind) = update["kind"].as_str() else {
-            comproc.log_message(Level::Error, format!("missing update kind: {}", update));
+            comproc.log_message(Level::Error, &format!("missing update kind: {}", update));
             return;
         };
         match kind {
@@ -110,7 +110,7 @@ impl ClientApiConnection {
                 comproc.update_value_change(&update);
             }
             _ => {
-                comproc.log_message(Level::Error, format!("unknown update kind: {}", update));
+                comproc.log_message(Level::Error, &format!("unknown update kind: {}", update));
             }
         }
     }
@@ -395,6 +395,27 @@ impl ClientApiConnection {
         Ok(())
     }
 
+    pub async fn server_change_log_ignore(
+        &self,
+        layer: String,
+        log_ignore: String,
+    ) -> Result<(), String> {
+        trace!("ClientApiConnection::change_log_ignore");
+        let mut req = json::JsonValue::new_object();
+        req["op"] = "Control".into();
+        req["args"] = json::JsonValue::new_array();
+        req["args"].push("ChangeLogIgnore").unwrap();
+        req["args"].push(layer).unwrap();
+        req["args"].push(log_ignore).unwrap();
+        let Some(resp) = self.perform_request(req).await else {
+            return Err("Cancelled".to_owned());
+        };
+        if resp.has_key("error") {
+            return Err(resp["error"].to_string());
+        }
+        Ok(())
+    }
+
     // Start Client API connection
     pub async fn ipc_connect(&self, ipc_path: PathBuf) -> Result<(), String> {
         trace!("ClientApiConnection::ipc_connect");
diff --git a/veilid-cli/src/command_processor.rs b/veilid-cli/src/command_processor.rs
index 0438367d..7eb7c847 100644
--- a/veilid-cli/src/command_processor.rs
+++ b/veilid-cli/src/command_processor.rs
@@ -41,7 +41,7 @@ impl ConnectionState {
 }
 
 struct CommandProcessorInner {
-    ui_sender: UISender,
+    ui_sender: Box<dyn UISender>,
     capi: Option<ClientApiConnection>,
     reconnect: bool,
     finished: bool,
@@ -60,7 +60,7 @@ pub struct CommandProcessor {
 }
 
 impl CommandProcessor {
-    pub fn new(ui_sender: UISender, settings: &Settings) -> Self {
+    pub fn new(ui_sender: Box<dyn UISender>, settings: &Settings) -> Self {
         Self {
             inner: Arc::new(Mutex::new(CommandProcessorInner {
                 ui_sender,
@@ -86,8 +86,8 @@ impl CommandProcessor {
     fn inner_mut(&self) -> MutexGuard<CommandProcessorInner> {
         self.inner.lock()
     }
-    fn ui_sender(&self) -> UISender {
-        self.inner.lock().ui_sender.clone()
+    fn ui_sender(&self) -> Box<dyn UISender> {
+        self.inner.lock().ui_sender.clone_uisender()
     }
     fn capi(&self) -> ClientApiConnection {
         self.inner.lock().capi.as_ref().unwrap().clone()
@@ -126,7 +126,7 @@ impl CommandProcessor {
 
             ui.add_node_event(
                 Level::Info,
-                format!(
+                &format!(
                     r#"Client Commands:
     exit/quit                           exit the client
     disconnect                          disconnect the client from the Veilid node 
@@ -136,6 +136,9 @@ impl CommandProcessor {
                                             all, terminal, system, api, file, otlp
                                         levels include:
                                             error, warn, info, debug, trace
+    change_log_ignore <layer> <changes> change the log target ignore list for a tracing layer
+                                        targets to add to the ignore list can be separated by a comma.
+                                        to remove a target from the ignore list, prepend it with a minus.
     enable [flag]                       set a flag
     disable [flag]                      unset a flag
                                         valid flags in include:
@@ -190,11 +193,11 @@ Server Debug Commands:
         spawn_detached_local(async move {
             match capi.server_debug(command_line).await {
                 Ok(output) => {
-                    ui.add_node_event(Level::Info, output);
+                    ui.add_node_event(Level::Info, &output);
                     ui.send_callback(callback);
                 }
                 Err(e) => {
-                    ui.add_node_event(Level::Error, e.to_string());
+                    ui.add_node_event(Level::Error, &e);
                     ui.send_callback(callback);
                 }
             }
@@ -215,20 +218,59 @@ Server Debug Commands:
             let log_level = match convert_loglevel(&rest.unwrap_or_default()) {
                 Ok(v) => v,
                 Err(e) => {
-                    ui.add_node_event(Level::Error, format!("Failed to change log level: {}", e));
+                    ui.add_node_event(Level::Error, &format!("Failed to change log level: {}", e));
                     ui.send_callback(callback);
                     return;
                 }
             };
 
-            match capi.server_change_log_level(layer, log_level).await {
+            match capi.server_change_log_level(layer, log_level.clone()).await {
                 Ok(()) => {
-                    ui.display_string_dialog("Success", "Log level changed", callback);
+                    ui.display_string_dialog(
+                        "Log level changed",
+                        &format!("Log level set to '{}'", log_level),
+                        callback,
+                    );
                 }
                 Err(e) => {
                     ui.display_string_dialog(
                         "Server command 'change_log_level' failed",
-                        e.to_string(),
+                        &e,
+                        callback,
+                    );
+                }
+            }
+        });
+        Ok(())
+    }
+
+    pub fn cmd_change_log_ignore(
+        &self,
+        rest: Option<String>,
+        callback: UICallback,
+    ) -> Result<(), String> {
+        trace!("CommandProcessor::cmd_change_log_ignore");
+        let capi = self.capi();
+        let ui = self.ui_sender();
+        spawn_detached_local(async move {
+            let (layer, rest) = Self::word_split(&rest.unwrap_or_default());
+            let log_ignore = rest.unwrap_or_default();
+
+            match capi
+                .server_change_log_ignore(layer, log_ignore.clone())
+                .await
+            {
+                Ok(()) => {
+                    ui.display_string_dialog(
+                        "Log ignore changed",
+                        &format!("Log ignore changed '{}'", log_ignore),
+                        callback,
+                    );
+                }
+                Err(e) => {
+                    ui.display_string_dialog(
+                        "Server command 'change_log_ignore' failed",
+                        &e,
                         callback,
                     );
                 }
@@ -247,11 +289,11 @@ Server Debug Commands:
             match flag.as_str() {
                 "app_messages" => {
                     this.inner.lock().enable_app_messages = true;
-                    ui.add_node_event(Level::Info, format!("flag enabled: {}", flag));
+                    ui.add_node_event(Level::Info, &format!("flag enabled: {}", flag));
                     ui.send_callback(callback);
                 }
                 _ => {
-                    ui.add_node_event(Level::Error, format!("unknown flag: {}", flag));
+                    ui.add_node_event(Level::Error, &format!("unknown flag: {}", flag));
                     ui.send_callback(callback);
                 }
             }
@@ -269,11 +311,11 @@ Server Debug Commands:
             match flag.as_str() {
                 "app_messages" => {
                     this.inner.lock().enable_app_messages = false;
-                    ui.add_node_event(Level::Info, format!("flag disabled: {}", flag));
+                    ui.add_node_event(Level::Info, &format!("flag disabled: {}", flag));
                     ui.send_callback(callback);
                 }
                 _ => {
-                    ui.add_node_event(Level::Error, format!("unknown flag: {}", flag));
+                    ui.add_node_event(Level::Error, &format!("unknown flag: {}", flag));
                     ui.send_callback(callback);
                 }
             }
@@ -291,6 +333,7 @@ Server Debug Commands:
             "disconnect" => self.cmd_disconnect(callback),
             "shutdown" => self.cmd_shutdown(callback),
             "change_log_level" => self.cmd_change_log_level(rest, callback),
+            "change_log_ignore" => self.cmd_change_log_ignore(rest, callback),
             "enable" => self.cmd_enable(rest, callback),
             "disable" => self.cmd_disable(rest, callback),
             _ => self.cmd_debug(command_line.to_owned(), callback),
@@ -413,13 +456,13 @@ Server Debug Commands:
     // calls into ui
     ////////////////////////////////////////////
 
-    pub fn log_message(&self, log_level: Level, message: String) {
-        self.inner().ui_sender.add_node_event(log_level, message);
+    pub fn log_message(&self, log_level: Level, message: &str) {
+        self.inner().ui_sender.add_log_event(log_level, message);
     }
 
     pub fn update_attachment(&self, attachment: &json::JsonValue) {
         self.inner_mut().ui_sender.set_attachment_state(
-            attachment["state"].as_str().unwrap_or_default().to_owned(),
+            attachment["state"].as_str().unwrap_or_default(),
             attachment["public_internet_ready"]
                 .as_bool()
                 .unwrap_or_default(),
@@ -458,7 +501,7 @@ Server Debug Commands:
             ));
         }
         if !out.is_empty() {
-            self.inner().ui_sender.add_node_event(Level::Info, out);
+            self.inner().ui_sender.add_node_event(Level::Info, &out);
         }
     }
     pub fn update_value_change(&self, value_change: &json::JsonValue) {
@@ -475,15 +518,15 @@ Server Debug Commands:
             datastr,
             if truncated { "..." } else { "" }
         );
-        self.inner().ui_sender.add_node_event(Level::Info, out);
+        self.inner().ui_sender.add_node_event(Level::Info, &out);
     }
 
     pub fn update_log(&self, log: &json::JsonValue) {
         let log_level =
             Level::from_str(log["log_level"].as_str().unwrap_or("error")).unwrap_or(Level::Error);
-        self.inner().ui_sender.add_node_event(
+        self.inner().ui_sender.add_log_event(
             log_level,
-            format!(
+            &format!(
                 "{}: {}{}",
                 log["log_level"].as_str().unwrap_or("???"),
                 log["message"].as_str().unwrap_or("???"),
@@ -530,7 +573,7 @@ Server Debug Commands:
 
         self.inner().ui_sender.add_node_event(
             Level::Info,
-            format!(
+            &format!(
                 "AppMessage ({:?}): {}{}",
                 msg["sender"],
                 strmsg,
@@ -570,7 +613,7 @@ Server Debug Commands:
 
         self.inner().ui_sender.add_node_event(
             Level::Info,
-            format!(
+            &format!(
                 "AppCall ({:?}) id = {:016x} : {}{}",
                 call["sender"],
                 id,
diff --git a/veilid-cli/src/cursive_ui.rs b/veilid-cli/src/cursive_ui.rs
new file mode 100644
index 00000000..7ce43094
--- /dev/null
+++ b/veilid-cli/src/cursive_ui.rs
@@ -0,0 +1,1448 @@
+use crate::command_processor::*;
+use crate::peers_table_view::*;
+use crate::settings::Settings;
+use crate::tools::*;
+use crate::ui::*;
+use crossbeam_channel::Sender;
+use cursive::align::*;
+use cursive::event::*;
+use cursive::theme::*;
+use cursive::traits::*;
+use cursive::utils::markup::ansi;
+use cursive::utils::markup::StyledString;
+use cursive::view::SizeConstraint;
+use cursive::views::*;
+use cursive::Cursive;
+use cursive::CursiveRunnable;
+use flexi_logger::writers::LogWriter;
+use flexi_logger::DeferredNow;
+// use cursive_multiplex::*;
+use crate::cached_text_view::*;
+use chrono::{Datelike, Timelike};
+use std::collections::{HashMap, VecDeque};
+use std::io::Write;
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::time::{SystemTime, UNIX_EPOCH};
+use thiserror::Error;
+//////////////////////////////////////////////////////////////
+///
+struct Dirty<T>
+where
+    T: PartialEq,
+{
+    value: T,
+    dirty: bool,
+}
+
+impl<T> Dirty<T>
+where
+    T: PartialEq,
+{
+    pub fn new(value: T) -> Self {
+        Self { value, dirty: true }
+    }
+    pub fn set(&mut self, value: T) {
+        self.dirty = self.value != value;
+        self.value = value;
+    }
+    pub fn get(&self) -> &T {
+        &self.value
+    }
+    // pub fn get_mut(&mut self) -> &mut T {
+    //     &mut self.value
+    // }
+    pub fn take_dirty(&mut self) -> bool {
+        let is_dirty = self.dirty;
+        self.dirty = false;
+        is_dirty
+    }
+}
+
+pub type NodeEventsPanel = Panel<NamedView<ScrollView<NamedView<CachedTextView>>>>;
+
+static START_TIME: AtomicU64 = AtomicU64::new(0);
+
+pub type CursiveUICallback = Box<dyn Fn(&mut Cursive) + Send + Sync>;
+
+struct UIState {
+    attachment_state: Dirty<String>,
+    public_internet_ready: Dirty<bool>,
+    local_network_ready: Dirty<bool>,
+    network_started: Dirty<bool>,
+    network_down_up: Dirty<(f32, f32)>,
+    connection_state: Dirty<ConnectionState>,
+    peers_state: Dirty<Vec<json::JsonValue>>,
+    node_id: Dirty<String>,
+}
+
+impl UIState {
+    pub fn new() -> Self {
+        Self {
+            attachment_state: Dirty::new("Detached".to_owned()),
+            public_internet_ready: Dirty::new(false),
+            local_network_ready: Dirty::new(false),
+            network_started: Dirty::new(false),
+            network_down_up: Dirty::new((0.0, 0.0)),
+            connection_state: Dirty::new(ConnectionState::Disconnected),
+            peers_state: Dirty::new(Vec::new()),
+            node_id: Dirty::new("".to_owned()),
+        }
+    }
+}
+
+//#[derive(Error, Debug)]
+//#[error("???")]
+//struct UIError;
+
+pub struct CursiveUIInner {
+    ui_state: UIState,
+    log_colors: HashMap<Level, cursive::theme::Color>,
+    cmdproc: Option<CommandProcessor>,
+    cmd_history: VecDeque<String>,
+    cmd_history_position: usize,
+    cmd_history_max_size: usize,
+    connection_dialog_state: Option<ConnectionState>,
+}
+
+pub struct CursiveUI {
+    siv: CursiveRunnable,
+    inner: Arc<Mutex<CursiveUIInner>>,
+}
+
+#[derive(Error, Debug)]
+pub enum DumbError {
+    // #[error("{0}")]
+    // Message(String),
+}
+
+impl CursiveUI {
+    /////////////////////////////////////////////////////////////////////////////////////
+    // Private functions
+    fn command_processor(s: &mut Cursive) -> CommandProcessor {
+        let inner = Self::inner(s);
+        inner.cmdproc.as_ref().unwrap().clone()
+    }
+
+    fn inner(s: &mut Cursive) -> MutexGuard<'_, CursiveUIInner> {
+        s.user_data::<Arc<Mutex<CursiveUIInner>>>().unwrap().lock()
+    }
+    fn inner_mut(s: &mut Cursive) -> MutexGuard<'_, CursiveUIInner> {
+        s.user_data::<Arc<Mutex<CursiveUIInner>>>().unwrap().lock()
+    }
+
+    fn setup_colors(siv: &mut CursiveRunnable, inner: &mut CursiveUIInner, settings: &Settings) {
+        // Make colors
+        let mut theme = cursive::theme::load_default();
+        theme.shadow = settings.interface.theme.shadow;
+        theme.borders = BorderStyle::from(&settings.interface.theme.borders);
+        theme.palette.set_color(
+            "background",
+            Color::parse(settings.interface.theme.colors.background.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "shadow",
+            Color::parse(settings.interface.theme.colors.shadow.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "view",
+            Color::parse(settings.interface.theme.colors.view.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "primary",
+            Color::parse(settings.interface.theme.colors.primary.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "secondary",
+            Color::parse(settings.interface.theme.colors.secondary.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "tertiary",
+            Color::parse(settings.interface.theme.colors.tertiary.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "title_primary",
+            Color::parse(settings.interface.theme.colors.title_primary.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "title_secondary",
+            Color::parse(settings.interface.theme.colors.title_secondary.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "highlight",
+            Color::parse(settings.interface.theme.colors.highlight.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "highlight_inactive",
+            Color::parse(settings.interface.theme.colors.highlight_inactive.as_str()).unwrap(),
+        );
+        theme.palette.set_color(
+            "highlight_text",
+            Color::parse(settings.interface.theme.colors.highlight_text.as_str()).unwrap(),
+        );
+        siv.set_theme(theme);
+
+        // Make log colors
+        let mut colors = HashMap::<Level, cursive::theme::Color>::new();
+        colors.insert(
+            Level::Trace,
+            Color::parse(settings.interface.theme.log_colors.trace.as_str()).unwrap(),
+        );
+        colors.insert(
+            Level::Debug,
+            Color::parse(settings.interface.theme.log_colors.debug.as_str()).unwrap(),
+        );
+        colors.insert(
+            Level::Info,
+            Color::parse(settings.interface.theme.log_colors.info.as_str()).unwrap(),
+        );
+        colors.insert(
+            Level::Warn,
+            Color::parse(settings.interface.theme.log_colors.warn.as_str()).unwrap(),
+        );
+        colors.insert(
+            Level::Error,
+            Color::parse(settings.interface.theme.log_colors.error.as_str()).unwrap(),
+        );
+        inner.log_colors = colors;
+    }
+    fn setup_quit_handler(siv: &mut Cursive) {
+        siv.clear_global_callbacks(cursive::event::Event::CtrlChar('c'));
+
+        siv.set_on_pre_event(
+            cursive::event::Event::CtrlChar('c'),
+            CursiveUI::quit_handler,
+        );
+        siv.set_global_callback(
+            cursive::event::Event::Key(Key::Esc),
+            CursiveUI::quit_handler,
+        );
+    }
+
+    fn setup_clear_handler(siv: &mut Cursive) {
+        siv.clear_global_callbacks(cursive::event::Event::CtrlChar('k'));
+        siv.set_on_pre_event(
+            cursive::event::Event::CtrlChar('k'),
+            CursiveUI::clear_handler,
+        );
+    }
+
+    fn quit_handler(siv: &mut Cursive) {
+        siv.add_layer(
+            Dialog::text("Do you want to exit?")
+                .button("Yes", |s| s.quit())
+                .button("No", |s| {
+                    s.pop_layer();
+                    CursiveUI::setup_quit_handler(s);
+                }),
+        );
+        siv.set_on_pre_event(cursive::event::Event::CtrlChar('c'), |s| {
+            s.quit();
+        });
+        siv.set_global_callback(cursive::event::Event::Key(Key::Esc), |s| {
+            s.pop_layer();
+            CursiveUI::setup_quit_handler(s);
+        });
+    }
+    fn clear_handler(siv: &mut Cursive) {
+        Self::node_events_view(siv).set_content([]);
+        CursiveUI::update_cb(siv);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Selectors
+
+    // fn main_layout(s: &mut Cursive) -> ViewRef<LinearLayout> {
+    //     s.find_name("main-layout").unwrap()
+    // }
+    fn node_events_panel(s: &mut Cursive) -> ViewRef<NodeEventsPanel> {
+        s.find_name("node-events-panel").unwrap()
+    }
+    fn node_events_view(s: &mut Cursive) -> ViewRef<CachedTextView> {
+        s.find_name("node-events-view").unwrap()
+    }
+    fn node_events_scroll_view(s: &mut Cursive) -> ViewRef<ScrollView<NamedView<CachedTextView>>> {
+        s.find_name("node-events-scroll-view").unwrap()
+    }
+    fn command_line(s: &mut Cursive) -> ViewRef<EditView> {
+        s.find_name("command-line").unwrap()
+    }
+    fn button_attach(s: &mut Cursive) -> ViewRef<Button> {
+        s.find_name("button-attach").unwrap()
+    }
+    fn status_bar(s: &mut Cursive) -> ViewRef<TextView> {
+        s.find_name("status-bar").unwrap()
+    }
+    fn peers(s: &mut Cursive) -> ViewRef<PeersTableView> {
+        s.find_name("peers").unwrap()
+    }
+    fn ipc_path(s: &mut Cursive) -> ViewRef<EditView> {
+        s.find_name("ipc-path").unwrap()
+    }
+    fn ipc_path_radio(s: &mut Cursive) -> ViewRef<RadioButton<u32>> {
+        s.find_name("ipc-path-radio").unwrap()
+    }
+    fn connecting_text(s: &mut Cursive) -> ViewRef<TextView> {
+        s.find_name("connecting-text").unwrap()
+    }
+    fn network_address(s: &mut Cursive) -> ViewRef<EditView> {
+        s.find_name("network-address").unwrap()
+    }
+    fn network_address_radio(s: &mut Cursive) -> ViewRef<RadioButton<u32>> {
+        s.find_name("network-address-radio").unwrap()
+    }
+    fn connection_dialog(s: &mut Cursive) -> ViewRef<Dialog> {
+        s.find_name("connection-dialog").unwrap()
+    }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
+    fn push_styled_line(s: &mut Cursive, styled_string: StyledString) {
+        let mut ctv = CursiveUI::node_events_view(s);
+        ctv.append_line(styled_string)
+    }
+
+    fn push_ansi_lines(s: &mut Cursive, mut starting_style: Style, lines: String) {
+        let mut ctv = CursiveUI::node_events_view(s);
+
+        let mut sslines: Vec<StyledString> = vec![];
+        for line in lines.lines() {
+            let (spanned_string, end_style) = ansi::parse_with_starting_style(starting_style, line);
+            sslines.push(spanned_string);
+            starting_style = end_style;
+        }
+
+        ctv.append_lines(sslines.into_iter());
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
+    fn render_attachment_state(inner: &mut CursiveUIInner) -> String {
+        let att = match inner.ui_state.attachment_state.get().as_str() {
+            "Detached" => "[----]",
+            "Attaching" => "[/   ]",
+            "AttachedWeak" => "[|   ]",
+            "AttachedGood" => "[||  ]",
+            "AttachedStrong" => "[||| ]",
+            "FullyAttached" => "[||||]",
+            "OverAttached" => "[++++]",
+            "Detaching" => "[////]",
+            _ => "[????]",
+        };
+        let pi = if *inner.ui_state.public_internet_ready.get() {
+            "+P"
+        } else {
+            "-p"
+        };
+        let ln = if *inner.ui_state.local_network_ready.get() {
+            "+L"
+        } else {
+            "-l"
+        };
+        format!("{}{}{}", att, pi, ln)
+    }
+    fn render_network_status(inner: &mut CursiveUIInner) -> String {
+        match inner.ui_state.network_started.get() {
+            false => "Down: ----KB/s Up: ----KB/s".to_owned(),
+            true => {
+                let (d, u) = inner.ui_state.network_down_up.get();
+                format!("Down: {:.2}KB/s Up: {:.2}KB/s", d, u)
+            }
+        }
+    }
+    fn render_button_attach<'a>(inner: &mut CursiveUIInner) -> (&'a str, bool) {
+        if let ConnectionState::ConnectedTCP(_, _) = inner.ui_state.connection_state.get() {
+            match inner.ui_state.attachment_state.get().as_str() {
+                "Detached" => ("Attach", true),
+                "Attaching" => ("Detach", true),
+                "AttachedWeak" => ("Detach", true),
+                "AttachedGood" => ("Detach", true),
+                "AttachedStrong" => ("Detach", true),
+                "FullyAttached" => ("Detach", true),
+                "OverAttached" => ("Detach", true),
+                "Detaching" => ("Detach", false),
+                _ => ("???", false),
+            }
+        } else {
+            (" ---- ", false)
+        }
+    }
+
+    fn on_command_line_edit(s: &mut Cursive, text: &str, _pos: usize) {
+        let mut inner = Self::inner_mut(s);
+
+        // save edited command to newest history slot
+        let hlen = inner.cmd_history.len();
+        inner.cmd_history_position = hlen - 1;
+        inner.cmd_history[hlen - 1] = text.to_owned();
+    }
+
+    fn enable_command_ui(s: &mut Cursive, enabled: bool) {
+        Self::command_line(s).set_enabled(enabled);
+        Self::button_attach(s).set_enabled(enabled);
+    }
+
+    fn display_string_dialog_cb(
+        s: &mut Cursive,
+        title: String,
+        contents: String,
+        close_cb: Option<CursiveUICallback>,
+    ) {
+        // Creates a dialog around some text with a single button
+        let close_cb = Arc::new(close_cb);
+        let close_cb2 = close_cb.clone();
+        s.add_layer(
+            Dialog::around(TextView::new(contents).scrollable())
+                .title(title)
+                .button("Close", move |s| {
+                    s.pop_layer();
+                    if let Some(close_cb) = close_cb.as_ref() {
+                        close_cb(s);
+                    }
+                }),
+        );
+        s.set_global_callback(cursive::event::Event::Key(Key::Esc), move |s| {
+            s.set_global_callback(
+                cursive::event::Event::Key(Key::Esc),
+                CursiveUI::quit_handler,
+            );
+            s.pop_layer();
+            if let Some(close_cb2) = close_cb2.as_ref() {
+                close_cb2(s);
+            }
+        });
+    }
+
+    fn run_command(s: &mut Cursive, text: &str) -> Result<(), String> {
+        // disable ui
+        Self::enable_command_ui(s, false);
+
+        // run command
+        s.set_global_callback(cursive::event::Event::Key(Key::Esc), |s| {
+            let cmdproc = Self::command_processor(s);
+            cmdproc.cancel_command();
+        });
+
+        let cmdproc = Self::command_processor(s);
+        cmdproc.run_command(
+            text,
+            UICallback::Cursive(Box::new(|s: &mut Cursive| {
+                s.set_global_callback(
+                    cursive::event::Event::Key(Key::Esc),
+                    CursiveUI::quit_handler,
+                );
+                Self::enable_command_ui(s, true);
+            })),
+        )
+    }
+
+    fn on_command_line_entered(s: &mut Cursive, text: &str) {
+        if text.trim().is_empty() {
+            return;
+        }
+        // run command
+        CursiveUI::push_ansi_lines(
+            s,
+            ColorStyle::primary().into(),
+            format!("{}> {}\n", CursiveUI::cli_ts(Self::get_start_time()), text),
+        );
+        match Self::run_command(s, text) {
+            Ok(_) => {}
+            Err(e) => {
+                let color = *Self::inner_mut(s).log_colors.get(&Level::Error).unwrap();
+                CursiveUI::push_ansi_lines(
+                    s,
+                    color.into(),
+                    format!(
+                        " {} Error: {}",
+                        CursiveUI::cli_ts(Self::get_start_time()),
+                        e
+                    ),
+                );
+            }
+        }
+        // save to history unless it's a duplicate
+        {
+            let mut inner = Self::inner_mut(s);
+
+            let hlen = inner.cmd_history.len();
+            inner.cmd_history[hlen - 1] = text.to_owned();
+
+            if hlen >= 2 && inner.cmd_history[hlen - 1] == inner.cmd_history[hlen - 2] {
+                inner.cmd_history[hlen - 1] = "".to_string();
+            } else {
+                if hlen == inner.cmd_history_max_size {
+                    inner.cmd_history.pop_front();
+                }
+                inner.cmd_history.push_back("".to_string());
+            }
+            let hlen = inner.cmd_history.len();
+            inner.cmd_history_position = hlen - 1;
+        }
+
+        // Clear the edit field
+        let mut cmdline = Self::command_line(s);
+        cmdline.set_content("");
+    }
+
+    fn on_command_line_history(s: &mut Cursive, dir: bool) {
+        let mut cmdline = Self::command_line(s);
+        let mut inner = Self::inner_mut(s);
+        // if at top of buffer or end of buffer, ignore
+        if (!dir && inner.cmd_history_position == 0)
+            || (dir && inner.cmd_history_position == (inner.cmd_history.len() - 1))
+        {
+            return;
+        }
+
+        // move the history position
+        if dir {
+            inner.cmd_history_position += 1;
+        } else {
+            inner.cmd_history_position -= 1;
+        }
+
+        // replace text with current line
+        let hlen = inner.cmd_history_position;
+        cmdline.set_content(inner.cmd_history[hlen].as_str());
+    }
+
+    fn on_button_attach_pressed(s: &mut Cursive) {
+        let action: Option<bool> = match Self::inner_mut(s).ui_state.attachment_state.get().as_str()
+        {
+            "Detached" => Some(true),
+            "Attaching" => Some(false),
+            "AttachedWeak" => Some(false),
+            "AttachedGood" => Some(false),
+            "AttachedStrong" => Some(false),
+            "FullyAttached" => Some(false),
+            "OverAttached" => Some(false),
+            "Detaching" => None,
+            _ => None,
+        };
+        let cmdproc = Self::command_processor(s);
+        if let Some(a) = action {
+            if a {
+                cmdproc.attach();
+            } else {
+                cmdproc.detach();
+            }
+        }
+    }
+
+    fn refresh_button_attach(s: &mut Cursive) {
+        let mut button_attach = CursiveUI::button_attach(s);
+        let mut inner = Self::inner_mut(s);
+
+        let (button_text, button_enable) = CursiveUI::render_button_attach(&mut inner);
+
+        button_attach.set_label(button_text);
+        button_attach.set_enabled(button_enable);
+    }
+
+    fn submit_ipc_path(s: &mut Cursive) {
+        let edit = Self::ipc_path(s);
+        let addr = (*edit.get_content()).clone();
+        let ipc_path = match addr.parse::<PathBuf>() {
+            Ok(sa) => sa,
+            Err(_) => {
+                s.add_layer(Dialog::text("Invalid IPC path").button("Close", |s| {
+                    s.pop_layer();
+                }));
+                return;
+            }
+        };
+        Self::command_processor(s).set_ipc_path(Some(ipc_path));
+        Self::command_processor(s).set_network_address(None);
+        Self::command_processor(s).start_connection();
+    }
+
+    fn submit_network_address(s: &mut Cursive) {
+        let edit = Self::network_address(s);
+        let addr = (*edit.get_content()).clone();
+        let sa = match addr.parse::<std::net::SocketAddr>() {
+            Ok(sa) => sa,
+            Err(_) => {
+                s.add_layer(
+                    Dialog::text("Invalid network address").button("Close", |s| {
+                        s.pop_layer();
+                    }),
+                );
+                return;
+            }
+        };
+        Self::command_processor(s).set_ipc_path(None);
+        Self::command_processor(s).set_network_address(Some(sa));
+        Self::command_processor(s).start_connection();
+    }
+
+    fn copy_to_clipboard_osc52<S: AsRef<str>>(s: &mut Cursive, text: S) {
+        // OSC52 clipboard copy for terminals
+        if std::io::stdout()
+            .write_all(
+                format!(
+                    "\x1B]52;c;{}\x07",
+                    data_encoding::BASE64.encode(text.as_ref().as_bytes()),
+                )
+                .as_bytes(),
+            )
+            .is_ok()
+            && std::io::stdout().flush().is_ok()
+        {
+            let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
+            CursiveUI::push_ansi_lines(
+                s,
+                color.into(),
+                format!(
+                    ">> {} Copied: {}",
+                    CursiveUI::cli_ts(Self::get_start_time()),
+                    text.as_ref()
+                ),
+            );
+        }
+    }
+
+    fn copy_to_clipboard<S: AsRef<str>>(s: &mut Cursive, text: S) {
+        if let Ok(mut clipboard) = arboard::Clipboard::new() {
+            // X11/Wayland/other system copy
+            if clipboard.set_text(text.as_ref()).is_ok() {
+                let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
+                CursiveUI::push_ansi_lines(
+                    s,
+                    color.into(),
+                    format!(
+                        ">> {} Copied: {}",
+                        CursiveUI::cli_ts(Self::get_start_time()),
+                        text.as_ref()
+                    ),
+                );
+            } else {
+                let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap();
+                CursiveUI::push_ansi_lines(
+                    s,
+                    color.into(),
+                    format!(
+                        ">> {} Could not copy to clipboard",
+                        CursiveUI::cli_ts(Self::get_start_time())
+                    ),
+                );
+            }
+        } else {
+            Self::copy_to_clipboard_osc52(s, text)
+        }
+    }
+
+    fn on_submit_peers_table_view(s: &mut Cursive, _row: Option<usize>, index: Option<usize>) {
+        if let Some(index) = index {
+            let peers_table_view = CursiveUI::peers(s);
+            let node_id = peers_table_view
+                .borrow_item(index)
+                .map(|j| j["node_ids"][0].to_string());
+            if let Some(node_id) = node_id {
+                Self::copy_to_clipboard(s, node_id);
+            }
+        }
+    }
+
+    fn on_focus_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
+        ptv.set_height(SizeConstraint::Full);
+        EventResult::Ignored
+    }
+
+    fn on_focus_lost_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
+        ptv.set_height(SizeConstraint::AtLeast(8));
+        EventResult::Ignored
+    }
+
+    fn draw_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool {
+        let is_ipc = Self::command_processor(s).get_ipc_path().is_some();
+        let mut inner = Self::inner_mut(s);
+
+        let mut connection_type_group: RadioGroup<u32> = RadioGroup::new().on_change(|s, v| {
+            if *v == 0 {
+                Self::ipc_path(s).enable();
+                Self::network_address(s).disable();
+            } else if *v == 1 {
+                Self::ipc_path(s).disable();
+                Self::network_address(s).enable();
+            }
+        });
+
+        let mut show: bool = false;
+        let mut hide: bool = false;
+        let mut connecting: bool = false;
+        match state {
+            ConnectionState::Disconnected => {
+                if inner.connection_dialog_state.is_none()
+                    || inner
+                        .connection_dialog_state
+                        .as_ref()
+                        .unwrap()
+                        .is_connected()
+                {
+                    show = true;
+                } else if inner
+                    .connection_dialog_state
+                    .as_ref()
+                    .unwrap()
+                    .is_retrying()
+                {
+                    hide = true;
+                    show = true
+                }
+            }
+            ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {
+                if inner.connection_dialog_state.is_some()
+                    && !inner
+                        .connection_dialog_state
+                        .as_ref()
+                        .unwrap()
+                        .is_connected()
+                {
+                    hide = true;
+                }
+            }
+            ConnectionState::RetryingTCP(_, _) | ConnectionState::RetryingIPC(_, _) => {
+                if inner.connection_dialog_state.is_none()
+                    || inner
+                        .connection_dialog_state
+                        .as_ref()
+                        .unwrap()
+                        .is_connected()
+                {
+                    show = true;
+                } else if inner
+                    .connection_dialog_state
+                    .as_ref()
+                    .unwrap()
+                    .is_disconnected()
+                {
+                    hide = true;
+                    show = true;
+                }
+                connecting = true;
+            }
+        }
+        inner.connection_dialog_state = Some(state);
+        drop(inner);
+        if hide {
+            s.pop_layer();
+            s.pop_layer();
+        }
+        if show {
+            s.add_fullscreen_layer(Layer::with_color(
+                ResizedView::with_full_screen(DummyView {}),
+                ColorStyle::new(PaletteColor::Background, PaletteColor::Background),
+            ));
+
+            s.add_layer(
+                Dialog::around(if connecting {
+                    LinearLayout::vertical()
+                        .child(TextView::new(" "))
+                        .child(
+                            TextView::new(if is_ipc {
+                                "Connecting to IPC:"
+                            } else {
+                                "Connecting to TCP:"
+                            })
+                            .min_width(40),
+                        )
+                        .child(TextView::new("").with_name("connecting-text"))
+                } else {
+                    LinearLayout::vertical()
+                        .child(TextView::new(" "))
+                        .child(
+                            if is_ipc {
+                                connection_type_group.button(0, "IPC Path").selected()
+                            } else {
+                                connection_type_group.button(0, "IPC Path")
+                            }
+                            .with_name("ipc-path-radio"),
+                        )
+                        .child(
+                            EditView::new()
+                                .with_enabled(is_ipc)
+                                .on_submit(|s, _| Self::submit_ipc_path(s))
+                                .with_name("ipc-path")
+                                .fixed_height(1)
+                                .min_width(40),
+                        )
+                        .child(TextView::new(" "))
+                        .child(
+                            if is_ipc {
+                                connection_type_group.button(1, "Network Address")
+                            } else {
+                                connection_type_group
+                                    .button(1, "Network Address")
+                                    .selected()
+                            }
+                            .with_name("network-address-radio"),
+                        )
+                        .child(
+                            EditView::new()
+                                .with_enabled(!is_ipc)
+                                .on_submit(|s, _| Self::submit_network_address(s))
+                                .with_name("network-address")
+                                .fixed_height(1)
+                                .min_width(40),
+                        )
+                        .child(TextView::new(" "))
+                })
+                .title(if connecting {
+                    "Connecting to server..."
+                } else {
+                    "Connect to server"
+                })
+                .with_name("connection-dialog"),
+            );
+
+            return true;
+        }
+
+        false
+    }
+
+    fn refresh_connection_dialog(s: &mut Cursive) {
+        let new_state = Self::inner(s).ui_state.connection_state.get().clone();
+
+        if !Self::draw_connection_dialog(s, new_state.clone()) {
+            return;
+        }
+
+        match new_state {
+            ConnectionState::Disconnected => {
+                Self::ipc_path_radio(s).set_enabled(true);
+                Self::network_address_radio(s).set_enabled(true);
+
+                let (network_address, network_address_enabled) =
+                    match Self::command_processor(s).get_network_address() {
+                        None => ("".to_owned(), false),
+                        Some(addr) => (addr.to_string(), true),
+                    };
+                let mut edit = Self::network_address(s);
+                edit.set_content(network_address);
+                edit.set_enabled(network_address_enabled);
+
+                let (ipc_path, ipc_path_enabled) = match Self::command_processor(s).get_ipc_path() {
+                    None => ("".to_owned(), false),
+                    Some(ipc_path) => (ipc_path.to_string_lossy().to_string(), true),
+                };
+                let mut edit = Self::ipc_path(s);
+                edit.set_content(ipc_path);
+                edit.set_enabled(ipc_path_enabled);
+
+                let mut dlg = Self::connection_dialog(s);
+                dlg.add_button("Connect", |s| {
+                    if Self::ipc_path_radio(s).is_selected() {
+                        Self::submit_ipc_path(s);
+                    } else {
+                        Self::submit_network_address(s);
+                    }
+                });
+            }
+            ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {}
+            ConnectionState::RetryingTCP(addr, _) => {
+                let mut text = Self::connecting_text(s);
+                text.set_content(addr.to_string());
+
+                let mut dlg = Self::connection_dialog(s);
+                dlg.add_button("Cancel", |s| {
+                    Self::command_processor(s).cancel_reconnect();
+                });
+            }
+            ConnectionState::RetryingIPC(ipc_path, _) => {
+                let mut text = Self::connecting_text(s);
+                text.set_content(ipc_path.to_string_lossy().to_string());
+
+                let mut dlg = Self::connection_dialog(s);
+                dlg.add_button("Cancel", |s| {
+                    Self::command_processor(s).cancel_reconnect();
+                });
+            }
+        }
+    }
+
+    fn refresh_main_titlebar(s: &mut Cursive) {
+        let mut main_window = CursiveUI::node_events_panel(s);
+        let inner = Self::inner_mut(s);
+        main_window.set_title(format!("Node: {}", inner.ui_state.node_id.get()));
+    }
+
+    fn refresh_statusbar(s: &mut Cursive) {
+        let mut statusbar = CursiveUI::status_bar(s);
+
+        let mut inner = Self::inner_mut(s);
+
+        let mut status = StyledString::new();
+
+        let mut enable_status_fields = false;
+
+        match inner.ui_state.connection_state.get() {
+            ConnectionState::Disconnected => {
+                status.append_styled(
+                    "Disconnected ".to_string(),
+                    ColorStyle::highlight_inactive(),
+                );
+                status.append_styled("|", ColorStyle::highlight_inactive());
+            }
+            ConnectionState::RetryingTCP(addr, _) => {
+                status.append_styled(
+                    format!("Reconnecting to {} ", addr),
+                    ColorStyle::highlight_inactive(),
+                );
+                status.append_styled("|", ColorStyle::highlight_inactive());
+            }
+            ConnectionState::RetryingIPC(path, _) => {
+                status.append_styled(
+                    format!(
+                        "Reconnecting to IPC#{} ",
+                        path.file_name()
+                            .unwrap_or_default()
+                            .to_string_lossy()
+                            .into_owned()
+                    ),
+                    ColorStyle::highlight_inactive(),
+                );
+                status.append_styled("|", ColorStyle::highlight_inactive());
+            }
+            ConnectionState::ConnectedTCP(addr, _) => {
+                status.append_styled(
+                    format!("Connected to {} ", addr),
+                    ColorStyle::highlight_inactive(),
+                );
+                enable_status_fields = true;
+            }
+            ConnectionState::ConnectedIPC(path, _) => {
+                status.append_styled(
+                    format!(
+                        "Connected to IPC#{} ",
+                        path.file_name()
+                            .unwrap_or_default()
+                            .to_string_lossy()
+                            .into_owned()
+                    ),
+                    ColorStyle::highlight_inactive(),
+                );
+                enable_status_fields = true;
+            }
+        }
+        if enable_status_fields {
+            status.append_styled("|", ColorStyle::highlight_inactive());
+            // Add attachment state
+            status.append_styled(
+                format!(" {} ", CursiveUI::render_attachment_state(&mut inner)),
+                ColorStyle::highlight_inactive(),
+            );
+            status.append_styled("|", ColorStyle::highlight_inactive());
+            // Add bandwidth status
+            status.append_styled(
+                format!(" {} ", CursiveUI::render_network_status(&mut inner)),
+                ColorStyle::highlight_inactive(),
+            );
+            status.append_styled("|", ColorStyle::highlight_inactive());
+            // Add tunnel status
+            status.append_styled(" No Tunnels ", ColorStyle::highlight_inactive());
+            status.append_styled("|", ColorStyle::highlight_inactive());
+        };
+
+        statusbar.set_content(status);
+    }
+
+    fn refresh_peers(s: &mut Cursive) {
+        let mut peers = CursiveUI::peers(s);
+        let inner = Self::inner_mut(s);
+        let sel_item = peers.item();
+        let sel_item_text = peers
+            .item()
+            .map(|x| peers.borrow_items()[x]["node_ids"][0].clone());
+
+        peers.set_items_stable(inner.ui_state.peers_state.get().clone());
+
+        let mut selected = false;
+        if let Some(sel_item_text) = sel_item_text {
+            // First select by name
+            for n in 0..peers.borrow_items().len() {
+                if peers.borrow_items()[n]["node_ids"][0] == sel_item_text {
+                    peers.set_selected_item(n);
+                    selected = true;
+                }
+            }
+        }
+        if !selected {
+            if let Some(sel_item) = sel_item {
+                peers.set_selected_item(sel_item);
+            }
+        }
+    }
+
+    fn update_cb(s: &mut Cursive) {
+        let mut inner = Self::inner_mut(s);
+
+        let mut refresh_statusbar = false;
+        let mut refresh_button_attach = false;
+        let mut refresh_connection_dialog = false;
+        let mut refresh_peers = false;
+        let mut refresh_main_titlebar = false;
+        if inner.ui_state.attachment_state.take_dirty() {
+            refresh_statusbar = true;
+            refresh_button_attach = true;
+            refresh_peers = true;
+        }
+        if inner.ui_state.network_started.take_dirty() {
+            refresh_statusbar = true;
+        }
+        if inner.ui_state.network_down_up.take_dirty() {
+            refresh_statusbar = true;
+        }
+        if inner.ui_state.connection_state.take_dirty() {
+            refresh_statusbar = true;
+            refresh_button_attach = true;
+            refresh_connection_dialog = true;
+            refresh_peers = true;
+        }
+        if inner.ui_state.peers_state.take_dirty() {
+            refresh_peers = true;
+        }
+        if inner.ui_state.node_id.take_dirty() {
+            refresh_main_titlebar = true;
+        }
+
+        drop(inner);
+
+        if refresh_statusbar {
+            Self::refresh_statusbar(s);
+        }
+        if refresh_button_attach {
+            Self::refresh_button_attach(s);
+        }
+        if refresh_connection_dialog {
+            Self::refresh_connection_dialog(s);
+        }
+        if refresh_peers {
+            Self::refresh_peers(s);
+        }
+        if refresh_main_titlebar {
+            Self::refresh_main_titlebar(s);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Public functions
+
+    #[allow(clippy::format_in_format_args)]
+    pub fn cli_ts(ts: u64) -> String {
+        let now = chrono::DateTime::<chrono::Utc>::from(SystemTime::now());
+        let date = chrono::DateTime::<chrono::Utc>::from(UNIX_EPOCH + Duration::from_micros(ts));
+
+        let show_year = now.year() != date.year();
+        let show_month = show_year || now.month() != date.month();
+        let show_date = show_month || now.day() != date.day();
+
+        if show_year || show_month || show_date {
+            CursiveUI::set_start_time();
+        }
+        format!(
+            "{}{}",
+            if show_year || show_month || show_date {
+                format!(
+                    "Day changed: {:04}/{:02}/{:02} \n",
+                    now.year(),
+                    now.month(),
+                    now.day()
+                )
+            } else {
+                "".to_owned()
+            },
+            format!("{:02}:{:02}:{:02}", now.hour(), now.minute(), now.second())
+        )
+    }
+
+    pub fn set_start_time() {
+        START_TIME.store(get_timestamp(), Ordering::Relaxed)
+    }
+
+    pub fn get_start_time() -> u64 {
+        START_TIME.load(Ordering::Relaxed)
+    }
+
+    fn make_node_events_panel(
+        node_log_scrollback: usize,
+    ) -> ResizedView<NamedView<NodeEventsPanel>> {
+        Panel::new(
+            CachedTextView::new([], node_log_scrollback, Some(node_log_scrollback))
+                .with_name("node-events-view")
+                .scrollable()
+                .scroll_strategy(cursive::view::ScrollStrategy::StickToBottom)
+                .on_scroll(|s, _r| {
+                    let mut sv = CursiveUI::node_events_scroll_view(s);
+                    if sv.is_at_bottom() {
+                        sv.set_scroll_strategy(cursive::view::ScrollStrategy::StickToBottom);
+                    }
+                })
+                .with_name("node-events-scroll-view"),
+        )
+        .title_position(HAlign::Left)
+        .title("Node Events")
+        .with_name("node-events-panel")
+        .full_screen()
+    }
+
+    pub fn new(settings: &Settings) -> (Self, CursiveUISender) {
+        CursiveUI::set_start_time();
+        // Instantiate the cursive runnable
+        let runnable = CursiveRunnable::new(
+            || -> Result<Box<dyn cursive::backend::Backend>, Box<DumbError>> {
+                let backend = cursive::backends::crossterm::Backend::init().unwrap();
+                let buffered_backend = cursive_buffered_backend::BufferedBackend::new(backend);
+                Ok(Box::new(buffered_backend))
+            },
+        );
+
+        // Make the callback mechanism easily reachable
+        let cb_sink = runnable.cb_sink().clone();
+
+        // Create the UI object
+        let mut this = Self {
+            siv: runnable,
+            inner: Arc::new(Mutex::new(CursiveUIInner {
+                ui_state: UIState::new(),
+                log_colors: Default::default(),
+                cmdproc: None,
+                cmd_history: {
+                    let mut vd = VecDeque::new();
+                    vd.push_back("".to_string());
+                    vd
+                },
+                cmd_history_position: 0,
+                cmd_history_max_size: settings.interface.command_line.history_size,
+                connection_dialog_state: None,
+            })),
+        };
+
+        let ui_sender = CursiveUISender {
+            inner: this.inner.clone(),
+            cb_sink,
+            colors: default_log_colors(),
+        };
+
+        let mut inner = this.inner.lock();
+
+        // Make the inner object accessible in callbacks easily
+        this.siv.set_user_data(this.inner.clone());
+
+        // Create layouts
+        let node_events_view = Self::make_node_events_panel(settings.interface.node_log.scrollback);
+        let mut peers_table_view = PeersTableView::new()
+            .column(PeerTableColumn::NodeId, "Node Id", |c| c.width(48))
+            .column(PeerTableColumn::Address, "Address", |c| c)
+            .column(PeerTableColumn::LatencyAvg, "Ping", |c| c.width(8))
+            .column(PeerTableColumn::TransferDownAvg, "Down", |c| c.width(8))
+            .column(PeerTableColumn::TransferUpAvg, "Up", |c| c.width(8));
+        peers_table_view.set_on_submit(CursiveUI::on_submit_peers_table_view);
+        let peers_table_view = FocusTracker::new(ResizedView::new(
+            SizeConstraint::Full,
+            SizeConstraint::AtLeast(8),
+            peers_table_view.with_name("peers"),
+        ))
+        .on_focus(CursiveUI::on_focus_peers_table_view)
+        .on_focus_lost(CursiveUI::on_focus_lost_peers_table_view);
+
+        // attempt at using Mux. Mux has bugs, like resizing problems.
+        // let mut mux = Mux::new();
+        // let node_node_events_view = mux
+        //     .add_below(node_events_view, mux.root().build().unwrap())
+        //     .unwrap();
+        // let node_peers_table_view = mux
+        //     .add_below(peers_table_view, node_node_events_view)
+        //     .unwrap();
+        // mux.set_container_split_ratio(node_peers_table_view, 0.75)
+        //     .unwrap();
+        // let mut mainlayout = LinearLayout::vertical();
+        // mainlayout.add_child(mux);
+
+        // Back to fixed layout
+        let mut mainlayout = LinearLayout::vertical();
+        mainlayout.add_child(node_events_view);
+        mainlayout.add_child(peers_table_view);
+        // ^^^ fixed layout
+
+        let mut command = StyledString::new();
+        command.append_styled("Command> ", ColorStyle::title_primary());
+        //
+        mainlayout.add_child(
+            LinearLayout::horizontal()
+                .child(TextView::new(command))
+                .child(
+                    EditView::new()
+                        .on_submit(CursiveUI::on_command_line_entered)
+                        .on_edit(CursiveUI::on_command_line_edit)
+                        .on_up_down(CursiveUI::on_command_line_history)
+                        .style(ColorStyle::new(
+                            PaletteColor::Background,
+                            PaletteColor::Secondary,
+                        ))
+                        .with_name("command-line")
+                        .full_screen()
+                        .fixed_height(1),
+                )
+                .child(
+                    Button::new("Attach", |s| {
+                        CursiveUI::on_button_attach_pressed(s);
+                    })
+                    .with_name("button-attach"),
+                ),
+        );
+        let mut version = StyledString::new();
+        version.append_styled(
+            concat!(" | veilid-cli v", env!("CARGO_PKG_VERSION")),
+            ColorStyle::highlight_inactive(),
+        );
+
+        mainlayout.add_child(
+            LinearLayout::horizontal()
+                .color(Some(ColorStyle::highlight_inactive()))
+                .child(
+                    TextView::new("")
+                        .with_name("status-bar")
+                        .full_screen()
+                        .fixed_height(1),
+                )
+                .child(TextView::new(version)),
+        );
+
+        this.siv
+            .add_fullscreen_layer(mainlayout.with_name("main-layout"));
+
+        CursiveUI::setup_colors(&mut this.siv, &mut inner, settings);
+        CursiveUI::setup_quit_handler(&mut this.siv);
+        CursiveUI::setup_clear_handler(&mut this.siv);
+
+        drop(inner);
+
+        (this, ui_sender)
+    }
+}
+
+impl UI for CursiveUI {
+    fn set_command_processor(&mut self, cmdproc: CommandProcessor) {
+        let mut inner = self.inner.lock();
+        inner.cmdproc = Some(cmdproc);
+    }
+    // Note: Cursive is not re-entrant, can't borrow_mut self.siv again after this
+    fn run_async<'a>(&'a mut self) -> Pin<Box<dyn core::future::Future<Output = ()> + 'a>> {
+        Box::pin(async {
+            self.siv.run_async().await;
+        })
+    }
+}
+
+type CallbackSink = Box<dyn FnOnce(&mut Cursive) + 'static + Send>;
+
+/// Default log colors
+fn default_log_colors() -> HashMap<Level, Color> {
+    let mut colors = HashMap::<Level, Color>::new();
+    colors.insert(Level::Trace, Color::Dark(BaseColor::Green));
+    colors.insert(Level::Debug, Color::Dark(BaseColor::Cyan));
+    colors.insert(Level::Info, Color::Dark(BaseColor::Blue));
+    colors.insert(Level::Warn, Color::Dark(BaseColor::Yellow));
+    colors.insert(Level::Error, Color::Dark(BaseColor::Red));
+    colors
+}
+
+#[derive(Clone)]
+pub struct CursiveUISender {
+    inner: Arc<Mutex<CursiveUIInner>>,
+    cb_sink: Sender<CallbackSink>,
+    colors: HashMap<Level, Color>,
+}
+impl UISender for CursiveUISender {
+    fn clone_uisender(&self) -> Box<dyn UISender> {
+        Box::new(self.clone())
+    }
+    fn as_logwriter(&self) -> Option<Box<dyn LogWriter>> {
+        Some(Box::new(self.clone()) as Box<dyn LogWriter>)
+    }
+
+    fn display_string_dialog(&self, title: &str, text: &str, close_cb: UICallback) {
+        let title = title.to_string();
+        let text = text.to_string();
+        let _ = self.cb_sink.send(Box::new(move |s| {
+            CursiveUI::display_string_dialog_cb(
+                s,
+                title,
+                text,
+                if let UICallback::Cursive(close_cb) = close_cb {
+                    Some(close_cb)
+                } else {
+                    None
+                },
+            )
+        }));
+    }
+
+    fn quit(&self) {
+        let _ = self.cb_sink.send(Box::new(|s| {
+            s.quit();
+        }));
+    }
+
+    fn send_callback(&self, callback: UICallback) {
+        if let UICallback::Cursive(callback) = callback {
+            let _ = self.cb_sink.send(Box::new(move |s| callback(s)));
+        }
+    }
+    fn set_attachment_state(
+        &mut self,
+        state: &str,
+        public_internet_ready: bool,
+        local_network_ready: bool,
+    ) {
+        {
+            let mut inner = self.inner.lock();
+            inner.ui_state.attachment_state.set(state.to_string());
+            inner
+                .ui_state
+                .public_internet_ready
+                .set(public_internet_ready);
+            inner.ui_state.local_network_ready.set(local_network_ready);
+        }
+
+        let _ = self.cb_sink.send(Box::new(CursiveUI::update_cb));
+    }
+    fn set_network_status(
+        &mut self,
+        started: bool,
+        bps_down: u64,
+        bps_up: u64,
+        mut peers: Vec<json::JsonValue>,
+    ) {
+        {
+            let mut inner = self.inner.lock();
+            inner.ui_state.network_started.set(started);
+            inner.ui_state.network_down_up.set((
+                ((bps_down as f64) / 1000.0f64) as f32,
+                ((bps_up as f64) / 1000.0f64) as f32,
+            ));
+            peers.sort_by(|a, b| {
+                a["node_ids"][0]
+                    .to_string()
+                    .cmp(&b["node_ids"][0].to_string())
+            });
+            inner.ui_state.peers_state.set(peers);
+        }
+        let _ = self.cb_sink.send(Box::new(CursiveUI::update_cb));
+    }
+    fn set_config(&mut self, config: &json::JsonValue) {
+        let mut inner = self.inner.lock();
+
+        let node_ids = &config["network"]["routing_table"]["node_id"];
+
+        let mut node_id_str = String::new();
+        for l in 0..node_ids.len() {
+            let nid = &node_ids[l];
+            if !node_id_str.is_empty() {
+                node_id_str.push(' ');
+            }
+            node_id_str.push_str(nid.to_string().as_ref());
+        }
+
+        inner.ui_state.node_id.set(node_id_str);
+    }
+    fn set_connection_state(&mut self, state: ConnectionState) {
+        {
+            let mut inner = self.inner.lock();
+            inner.ui_state.connection_state.set(state);
+        }
+        let _ = self.cb_sink.send(Box::new(CursiveUI::update_cb));
+    }
+
+    fn add_node_event(&self, log_color: Level, event: &str) {
+        let color = {
+            let inner = self.inner.lock();
+            *inner.log_colors.get(&log_color).unwrap()
+        };
+
+        let _ = self.push_styled_lines(
+            color.into(),
+            format!(
+                "{}: {}\n",
+                CursiveUI::cli_ts(CursiveUI::get_start_time()),
+                event
+            ),
+        );
+    }
+    fn add_log_event(&self, log_color: Level, event: &str) {
+        let color = {
+            let inner = self.inner.lock();
+            *inner.log_colors.get(&log_color).unwrap()
+        };
+
+        let _ = self.push_styled_lines(
+            color.into(),
+            format!(
+                "{}: {}\n",
+                CursiveUI::cli_ts(CursiveUI::get_start_time()),
+                event
+            ),
+        );
+    }
+
+}
+impl CursiveUISender {
+    pub fn push_styled(&self, styled_string: StyledString) -> std::io::Result<()> {
+        let res = self.cb_sink.send(Box::new(move |s| {
+            CursiveUI::push_styled_line(s, styled_string);
+        }));
+        if res.is_err() {
+            return Err(std::io::Error::from(std::io::ErrorKind::BrokenPipe));
+        }
+        Ok(())
+    }
+
+    pub fn push_styled_lines(&self, starting_style: Style, lines: String) -> std::io::Result<()> {
+        let res = self.cb_sink.send(Box::new(move |s| {
+            CursiveUI::push_ansi_lines(s, starting_style, lines);
+        }));
+        if res.is_err() {
+            return Err(std::io::Error::from(std::io::ErrorKind::BrokenPipe));
+        }
+        Ok(())
+    }
+}
+impl LogWriter for CursiveUISender {
+    fn write(&self, _now: &mut DeferredNow, record: &Record) -> std::io::Result<()> {
+        let color = *self.colors.get(&record.level()).unwrap();
+
+        let args = format!("{}", &record.args());
+
+        let mut line = StyledString::new();
+        let mut indent = 0;
+        let levstr = format!("{}: ", record.level());
+        indent += levstr.len();
+        line.append_styled(levstr, color);
+        let filestr = format!(
+            "{}:{} ",
+            record.file().unwrap_or("(unnamed)"),
+            record.line().unwrap_or(0),
+        );
+        indent += filestr.len();
+        line.append_plain(filestr);
+
+        for argline in args.lines() {
+            line.append_styled(argline, color);
+            line.append_plain("\n");
+            self.push_styled(line)?;
+            line = StyledString::new();
+            line.append_plain(" ".repeat(indent));
+        }
+        Ok(())
+    }
+
+    fn flush(&self) -> std::io::Result<()> {
+        // we are not buffering
+        Ok(())
+    }
+
+    fn max_log_level(&self) -> log::LevelFilter {
+        log::LevelFilter::max()
+    }
+}
diff --git a/veilid-cli/src/interactive_ui.rs b/veilid-cli/src/interactive_ui.rs
new file mode 100644
index 00000000..c6c17bcf
--- /dev/null
+++ b/veilid-cli/src/interactive_ui.rs
@@ -0,0 +1,350 @@
+use std::io::Write;
+
+use crate::command_processor::*;
+use crate::cursive_ui::CursiveUI;
+use crate::settings::*;
+use crate::tools::*;
+use crate::ui::*;
+
+use console::{style, Term};
+use flexi_logger::writers::LogWriter;
+use rustyline_async::SharedWriter;
+use rustyline_async::{Readline, ReadlineError, ReadlineEvent};
+use stop_token::future::FutureExt as StopTokenFutureExt;
+use stop_token::*;
+
+pub type InteractiveUICallback = Box<dyn FnMut() + Send>;
+
+pub struct InteractiveUIInner {
+    cmdproc: Option<CommandProcessor>,
+    stdout: Option<SharedWriter>,
+    error: Option<String>,
+    done: Option<StopSource>,
+    connection_state_receiver: flume::Receiver<ConnectionState>,
+    log_enabled: bool,
+    enable_color: bool,
+}
+
+#[derive(Clone)]
+pub struct InteractiveUI {
+    inner: Arc<Mutex<InteractiveUIInner>>,
+}
+
+impl InteractiveUI {
+    pub fn new(_settings: &Settings) -> (Self, InteractiveUISender) {
+        let (cssender, csreceiver) = flume::unbounded::<ConnectionState>();
+
+        let term = Term::stdout();
+        let enable_color = console::colors_enabled() && term.features().colors_supported();
+
+        // Create the UI object
+        let this = Self {
+            inner: Arc::new(Mutex::new(InteractiveUIInner {
+                cmdproc: None,
+                stdout: None,
+                error: None,
+                done: Some(StopSource::new()),
+                connection_state_receiver: csreceiver,
+                log_enabled: false,
+                enable_color,
+            })),
+        };
+
+        let ui_sender = InteractiveUISender {
+            inner: this.inner.clone(),
+            connection_state_sender: cssender,
+        };
+
+        (this, ui_sender)
+    }
+
+    pub async fn command_loop(&self) {
+        let (mut readline, mut stdout) =
+            match Readline::new("> ".to_owned()).map_err(|e| e.to_string()) {
+                Ok(v) => v,
+                Err(e) => {
+                    println!("Error: {:?}", e);
+                    return;
+                }
+            };
+
+        let (connection_state_receiver, done) = {
+            let inner = self.inner.lock();
+            (
+                inner.connection_state_receiver.clone(),
+                inner.done.as_ref().unwrap().token(),
+            )
+        };
+
+        self.inner.lock().stdout = Some(stdout.clone());
+
+        CursiveUI::set_start_time();
+
+        // Wait for connection to be established
+        loop {
+            match connection_state_receiver.recv_async().await {
+                Ok(ConnectionState::ConnectedTCP(_, _))
+                | Ok(ConnectionState::ConnectedIPC(_, _)) => {
+                    break;
+                }
+                Ok(ConnectionState::RetryingTCP(_, _)) | Ok(ConnectionState::RetryingIPC(_, _)) => {
+                }
+                Ok(ConnectionState::Disconnected) => {}
+                Err(e) => {
+                    eprintln!("Error: {:?}", e);
+                    self.inner.lock().done.take();
+                    break;
+                }
+            }
+        }
+
+        loop {
+            if let Some(e) = self.inner.lock().error.clone() {
+                println!("Error: {:?}", e);
+                break;
+            }
+            match readline.readline().timeout_at(done.clone()).await {
+                Ok(Ok(ReadlineEvent::Line(line))) => {
+                    let line = line.trim();
+                    if line == "clear" {
+                        if let Err(e) = readline.clear() {
+                            println!("Error: {:?}", e);
+                        }
+                    } else if line == "log error" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api error",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = true;
+                        }
+                    } else if line == "log warn" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api warn",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = true;
+                        }
+                    } else if line == "log info" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api info",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = true;
+                        }
+                    } else if line == "log debug" || line == "log" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api debug",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = true;
+                        }
+                    } else if line == "log trace" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api trace",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = true;
+                        }
+                    } else if line == "log off" {
+                        let opt_cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = opt_cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                "change_log_level api off",
+                                UICallback::Interactive(Box::new(|| {})),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                            }
+                            self.inner.lock().log_enabled = false;
+                        }
+                    } else if !line.is_empty() {
+                        readline.add_history_entry(line.to_string());
+                        let cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = &cmdproc {
+                            if let Err(e) = cmdproc.run_command(
+                                line,
+                                UICallback::Interactive(Box::new({
+                                    //let mut stdout = stdout.clone();
+                                    move || {
+                                        // if let Err(e) = writeln!(stdout) {
+                                        //     println!("Error: {:?}", e);
+                                        // }
+                                    }
+                                })),
+                            ) {
+                                if let Err(e) = writeln!(stdout, "Error: {}", e) {
+                                    println!("Error: {:?}", e);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                Ok(Ok(ReadlineEvent::Interrupted)) => {
+                    break;
+                }
+                Ok(Ok(ReadlineEvent::Eof)) => {
+                    break;
+                }
+                Ok(Err(ReadlineError::Closed)) => {}
+                Ok(Err(ReadlineError::IO(e))) => {
+                    println!("IO Error: {:?}", e);
+                    break;
+                }
+                Err(_) => {
+                    break;
+                }
+            }
+        }
+        let _ = readline.flush();
+    }
+}
+
+impl UI for InteractiveUI {
+    fn set_command_processor(&mut self, cmdproc: CommandProcessor) {
+        let mut inner = self.inner.lock();
+        inner.cmdproc = Some(cmdproc);
+    }
+    fn run_async(&mut self) -> Pin<Box<dyn core::future::Future<Output = ()>>> {
+        let this = self.clone();
+        Box::pin(async move {
+            this.command_loop().await;
+        })
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[derive(Clone)]
+pub struct InteractiveUISender {
+    inner: Arc<Mutex<InteractiveUIInner>>,
+    connection_state_sender: flume::Sender<ConnectionState>,
+}
+
+impl UISender for InteractiveUISender {
+    fn clone_uisender(&self) -> Box<dyn UISender> {
+        Box::new(InteractiveUISender {
+            inner: self.inner.clone(),
+            connection_state_sender: self.connection_state_sender.clone(),
+        })
+    }
+    fn as_logwriter(&self) -> Option<Box<dyn LogWriter>> {
+        None
+    }
+
+    fn display_string_dialog(&self, title: &str, text: &str, close_cb: UICallback) {
+        let Some(mut stdout) = self.inner.lock().stdout.clone() else {
+            return;
+        };
+        if let Err(e) = writeln!(stdout, "{}: {}", title, text) {
+            self.inner.lock().error = Some(e.to_string());
+        }
+        if let UICallback::Interactive(mut close_cb) = close_cb {
+            close_cb()
+        }
+    }
+
+    fn quit(&self) {
+        self.inner.lock().done.take();
+    }
+
+    fn send_callback(&self, callback: UICallback) {
+        if let UICallback::Interactive(mut callback) = callback {
+            callback();
+        }
+    }
+    fn set_attachment_state(
+        &mut self,
+        _state: &str,
+        _public_internet_ready: bool,
+        _local_network_ready: bool,
+    ) {
+        //
+    }
+    fn set_network_status(
+        &mut self,
+        _started: bool,
+        _bps_down: u64,
+        _bps_up: u64,
+        mut _peers: Vec<json::JsonValue>,
+    ) {
+        //
+    }
+    fn set_config(&mut self, _config: &json::JsonValue) {
+        //
+    }
+    fn set_connection_state(&mut self, state: ConnectionState) {
+        if let Err(e) = self.connection_state_sender.send(state) {
+            eprintln!("Error: {:?}", e);
+            self.inner.lock().done.take();
+        }
+    }
+
+    fn add_node_event(&self, _log_color: Level, event: &str) {
+        let Some(mut stdout) = self.inner.lock().stdout.clone() else {
+            return;
+        };
+        if let Err(e) = writeln!(stdout, "{}", event) {
+            self.inner.lock().error = Some(e.to_string());
+        }
+    }
+    fn add_log_event(&self, log_color: Level, event: &str) {
+        let (enable_color, mut stdout) = {
+            let inner = self.inner.lock();
+            if !inner.log_enabled {
+                return;
+            }
+            let Some(stdout) = inner.stdout.clone() else {
+                return;
+            };
+
+            (inner.enable_color, stdout)
+        };
+
+        let log_line = format!(
+            "{}: {}",
+            CursiveUI::cli_ts(CursiveUI::get_start_time()),
+            event
+        );
+        if enable_color {
+            let log_line = match log_color {
+                Level::Error => style(log_line).red().bright().to_string(),
+                Level::Warn => style(log_line).yellow().bright().to_string(),
+                Level::Info => log_line,
+                Level::Debug => style(log_line).green().bright().to_string(),
+                Level::Trace => style(log_line).blue().bright().to_string(),
+            };
+            if let Err(e) = writeln!(stdout, "{}", log_line) {
+                eprintln!("Error: {:?}", e);
+                self.inner.lock().done.take();
+            }
+        } else {
+            println!("{}", log_line);
+        }
+    }
+}
diff --git a/veilid-cli/src/io_read_write_ui.rs b/veilid-cli/src/io_read_write_ui.rs
new file mode 100644
index 00000000..83addc84
--- /dev/null
+++ b/veilid-cli/src/io_read_write_ui.rs
@@ -0,0 +1,268 @@
+use crate::command_processor::*;
+use crate::settings::*;
+use crate::tools::*;
+use crate::ui::*;
+
+use futures::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader, BufWriter};
+use stop_token::future::FutureExt as StopTokenFutureExt;
+use stop_token::*;
+use veilid_tools::AsyncMutex;
+
+use flexi_logger::writers::LogWriter;
+
+static FINISHED_LINE: &str = "\x7F ===FINISHED=== \x7F";
+
+pub type IOReadWriteUICallback = Box<dyn FnMut() + Send>;
+
+pub struct IOReadWriteUIInner<R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> {
+    cmdproc: Option<CommandProcessor>,
+    in_io: Arc<AsyncMutex<BufReader<R>>>,
+    out_io: Arc<AsyncMutex<BufWriter<W>>>,
+    out_receiver: flume::Receiver<String>,
+    out_sender: flume::Sender<String>,
+    done: Option<StopSource>,
+    connection_state_receiver: flume::Receiver<ConnectionState>,
+}
+
+pub struct IOReadWriteUI<R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> {
+    inner: Arc<Mutex<IOReadWriteUIInner<R, W>>>,
+}
+impl<R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> Clone for IOReadWriteUI<R, W> {
+    fn clone(&self) -> Self {
+        IOReadWriteUI {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+impl<R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> IOReadWriteUI<R, W> {
+    pub fn new(_settings: &Settings, in_io: R, out_io: W) -> (Self, IOReadWriteUISender<R, W>) {
+        // Create the UI object
+        let (sender, receiver) = flume::unbounded::<String>();
+        let (cssender, csreceiver) = flume::unbounded::<ConnectionState>();
+        let this = Self {
+            inner: Arc::new(Mutex::new(IOReadWriteUIInner {
+                cmdproc: None,
+                in_io: Arc::new(AsyncMutex::new(BufReader::new(in_io))),
+                out_io: Arc::new(AsyncMutex::new(BufWriter::new(out_io))),
+                out_receiver: receiver,
+                out_sender: sender.clone(),
+                connection_state_receiver: csreceiver,
+                done: Some(StopSource::new()),
+            })),
+        };
+
+        let ui_sender = IOReadWriteUISender {
+            inner: this.inner.clone(),
+            out_sender: sender,
+            connection_state_sender: cssender,
+        };
+
+        (this, ui_sender)
+    }
+
+    pub async fn output_loop(&self) {
+        let out_receiver = self.inner.lock().out_receiver.clone();
+        let out_io = self.inner.lock().out_io.clone();
+
+        let mut out = out_io.lock().await;
+        let done = self.inner.lock().done.as_ref().unwrap().token();
+
+        while let Ok(Ok(line)) = out_receiver.recv_async().timeout_at(done.clone()).await {
+            if line == FINISHED_LINE {
+                break;
+            }
+            let line = format!("{}\n", line);
+            if let Err(e) = out.write_all(line.as_bytes()).await {
+                eprintln!("Error: {:?}", e);
+                break;
+            }
+            if let Err(e) = out.flush().await {
+                eprintln!("Error: {:?}", e);
+                break;
+            }
+        }
+    }
+
+    pub async fn command_loop(&self) {
+        let (in_io, out_sender, connection_state_receiver, done) = {
+            let inner = self.inner.lock();
+            (
+                inner.in_io.clone(),
+                inner.out_sender.clone(),
+                inner.connection_state_receiver.clone(),
+                inner.done.as_ref().unwrap().token(),
+            )
+        };
+        let mut in_io = in_io.lock().await;
+
+        let (exec_sender, exec_receiver) = flume::bounded(1);
+
+        // Wait for connection to be established
+        loop {
+            match connection_state_receiver.recv_async().await {
+                Ok(ConnectionState::ConnectedTCP(_, _))
+                | Ok(ConnectionState::ConnectedIPC(_, _)) => {
+                    break;
+                }
+                Ok(ConnectionState::RetryingTCP(_, _)) | Ok(ConnectionState::RetryingIPC(_, _)) => {
+                }
+                Ok(ConnectionState::Disconnected) => {}
+                Err(e) => {
+                    eprintln!("Error: {:?}", e);
+                    self.inner.lock().done.take();
+                    break;
+                }
+            }
+        }
+
+        // Process the input
+        loop {
+            let mut line = String::new();
+            match in_io.read_line(&mut line).timeout_at(done.clone()).await {
+                Ok(Ok(bytes)) => {
+                    if bytes == 0 {
+                        // Clean exit after everything else is sent
+                        if let Err(e) = out_sender.send(FINISHED_LINE.to_string()) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                        break;
+                    }
+                    let line = line.trim();
+                    if !line.is_empty() {
+                        let cmdproc = self.inner.lock().cmdproc.clone();
+                        if let Some(cmdproc) = &cmdproc {
+                            // Run command
+                            if let Err(e) = cmdproc.run_command(
+                                line,
+                                UICallback::IOReadWrite(Box::new({
+                                    let exec_sender = exec_sender.clone();
+                                    move || {
+                                        // Let the next command execute
+                                        if let Err(e) = exec_sender.send(()) {
+                                            eprintln!("Error: {:?}", e);
+                                        }
+                                    }
+                                })),
+                            ) {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                                break;
+                            }
+                            // Wait until command is done executing before running the next line
+                            if let Err(e) = exec_receiver.recv_async().await {
+                                eprintln!("Error: {:?}", e);
+                                self.inner.lock().done.take();
+                                break;
+                            }
+                        }
+                    }
+                }
+                Ok(Err(e)) => {
+                    eprintln!("IO Error: {:?}", e);
+                    self.inner.lock().done.take();
+                    break;
+                }
+                Err(_) => {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+impl<R: AsyncRead + Unpin + Send + 'static, W: AsyncWrite + Unpin + Send + 'static> UI
+    for IOReadWriteUI<R, W>
+{
+    fn set_command_processor(&mut self, cmdproc: CommandProcessor) {
+        let mut inner = self.inner.lock();
+        inner.cmdproc = Some(cmdproc);
+    }
+    fn run_async(&mut self) -> Pin<Box<dyn core::future::Future<Output = ()>>> {
+        let this = self.clone();
+        Box::pin(async move {
+            let out_fut = this.output_loop();
+            let cmd_fut = this.command_loop();
+            futures::join!(out_fut, cmd_fut);
+        })
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[derive(Clone)]
+pub struct IOReadWriteUISender<R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> {
+    inner: Arc<Mutex<IOReadWriteUIInner<R, W>>>,
+    out_sender: flume::Sender<String>,
+    connection_state_sender: flume::Sender<ConnectionState>,
+}
+
+impl<R: AsyncRead + Unpin + Send + 'static, W: AsyncWrite + Unpin + Send + 'static> UISender
+    for IOReadWriteUISender<R, W>
+{
+    fn clone_uisender(&self) -> Box<dyn UISender> {
+        Box::new(IOReadWriteUISender {
+            inner: self.inner.clone(),
+            out_sender: self.out_sender.clone(),
+            connection_state_sender: self.connection_state_sender.clone(),
+        })
+    }
+    fn as_logwriter(&self) -> Option<Box<dyn LogWriter>> {
+        None
+    }
+
+    fn display_string_dialog(&self, title: &str, text: &str, close_cb: UICallback) {
+        if let Err(e) = self.out_sender.send(format!("{}: {}", title, text)) {
+            eprintln!("Error: {:?}", e);
+            self.inner.lock().done.take();
+        }
+        if let UICallback::IOReadWrite(mut close_cb) = close_cb {
+            close_cb()
+        }
+    }
+
+    fn quit(&self) {
+        self.inner.lock().done.take();
+    }
+
+    fn send_callback(&self, callback: UICallback) {
+        if let UICallback::IOReadWrite(mut callback) = callback {
+            callback();
+        }
+    }
+    fn set_attachment_state(
+        &mut self,
+        _state: &str,
+        _public_internet_ready: bool,
+        _local_network_ready: bool,
+    ) {
+        //
+    }
+    fn set_network_status(
+        &mut self,
+        _started: bool,
+        _bps_down: u64,
+        _bps_up: u64,
+        mut _peers: Vec<json::JsonValue>,
+    ) {
+        //
+    }
+    fn set_config(&mut self, _config: &json::JsonValue) {
+        //
+    }
+    fn set_connection_state(&mut self, state: ConnectionState) {
+        if let Err(e) = self.connection_state_sender.send(state) {
+            eprintln!("Error: {:?}", e);
+            self.inner.lock().done.take();
+        }
+    }
+
+    fn add_node_event(&self, _log_color: Level, event: &str) {
+        if let Err(e) = self.out_sender.send(format!("{}\n", event)) {
+            eprintln!("Error: {:?}", e);
+            self.inner.lock().done.take();
+        }
+    }
+    fn add_log_event(&self, _log_color: Level, _event: &str) {}
+}
diff --git a/veilid-cli/src/log_viewer_ui.rs b/veilid-cli/src/log_viewer_ui.rs
new file mode 100644
index 00000000..bf02f451
--- /dev/null
+++ b/veilid-cli/src/log_viewer_ui.rs
@@ -0,0 +1,274 @@
+use crate::command_processor::*;
+use crate::cursive_ui::CursiveUI;
+use crate::settings::*;
+use crate::tools::*;
+use crate::ui::*;
+
+use console::{style, Term};
+use flexi_logger::writers::LogWriter;
+use stop_token::future::FutureExt as StopTokenFutureExt;
+use stop_token::*;
+
+pub type LogViewerUICallback = Box<dyn FnMut() + Send>;
+
+pub struct LogViewerUIInner {
+    cmdproc: Option<CommandProcessor>,
+    done: Option<StopSource>,
+    term: Term,
+    connection_state_receiver: flume::Receiver<ConnectionState>,
+}
+
+#[derive(Clone)]
+pub struct LogViewerUI {
+    inner: Arc<Mutex<LogViewerUIInner>>,
+}
+
+impl LogViewerUI {
+    pub fn new(_settings: &Settings) -> (Self, LogViewerUISender) {
+        let (cssender, csreceiver) = flume::unbounded::<ConnectionState>();
+
+        let term = Term::stdout();
+        let enable_color = console::colors_enabled() && term.features().colors_supported();
+
+        // Create the UI object
+        let this = Self {
+            inner: Arc::new(Mutex::new(LogViewerUIInner {
+                cmdproc: None,
+                done: Some(StopSource::new()),
+                term: term.clone(),
+                connection_state_receiver: csreceiver,
+            })),
+        };
+
+        let ui_sender = LogViewerUISender {
+            inner: this.inner.clone(),
+            connection_state_sender: cssender,
+            term,
+            enable_color,
+        };
+
+        (this, ui_sender)
+    }
+
+    pub async fn command_loop(&self) {
+        let (connection_state_receiver, term, done) = {
+            let inner = self.inner.lock();
+            (
+                inner.connection_state_receiver.clone(),
+                inner.term.clone(),
+                inner.done.as_ref().unwrap().token(),
+            )
+        };
+
+        CursiveUI::set_start_time();
+
+        // Wait for connection to be established
+        loop {
+            match connection_state_receiver.recv_async().await {
+                Ok(ConnectionState::ConnectedTCP(_, _))
+                | Ok(ConnectionState::ConnectedIPC(_, _)) => {
+                    break;
+                }
+                Ok(ConnectionState::RetryingTCP(_, _)) | Ok(ConnectionState::RetryingIPC(_, _)) => {
+                }
+                Ok(ConnectionState::Disconnected) => {}
+                Err(e) => {
+                    eprintln!("Error: {:?}", e);
+                    self.inner.lock().done.take();
+                    break;
+                }
+            }
+        }
+
+        let cmdproc = self.inner.lock().cmdproc.clone().unwrap();
+
+        if !term.features().is_attended() {
+            done.await;
+        } else {
+            while let Ok(Ok(c)) = blocking_wrapper(
+                {
+                    let term = term.clone();
+                    move || term.read_char()
+                },
+                Err(std::io::Error::other("failed")),
+            )
+            .timeout_at(done.clone())
+            .await
+            {
+                match c {
+                    'q' | 'Q' => {
+                        self.inner.lock().done.take();
+                        break;
+                    }
+                    'e' | 'E' => {
+                        if let Err(e) = cmdproc.run_command(
+                            "change_log_level api error",
+                            UICallback::LogViewer(Box::new(|| {})),
+                        ) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                    }
+                    'w' | 'W' => {
+                        if let Err(e) = cmdproc.run_command(
+                            "change_log_level api warn",
+                            UICallback::LogViewer(Box::new(|| {})),
+                        ) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                    }
+                    'i' | 'I' => {
+                        if let Err(e) = cmdproc.run_command(
+                            "change_log_level api info",
+                            UICallback::LogViewer(Box::new(|| {})),
+                        ) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                    }
+                    'd' | 'D' => {
+                        if let Err(e) = cmdproc.run_command(
+                            "change_log_level api debug",
+                            UICallback::LogViewer(Box::new(|| {})),
+                        ) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                    }
+                    't' | 'T' => {
+                        if let Err(e) = cmdproc.run_command(
+                            "change_log_level api trace",
+                            UICallback::LogViewer(Box::new(|| {})),
+                        ) {
+                            eprintln!("Error: {:?}", e);
+                            self.inner.lock().done.take();
+                        }
+                    }
+                    'h' | 'H' => {
+                        println!(
+                            r"Help:
+    h - This help
+    e - Change log level to 'error'
+    w - Change log level to 'warn'
+    i - Change log level to 'info'
+    d - Change log level to 'debug'
+    t - Change log level to 'trace'
+    q - Quit
+"
+                        );
+                    }
+                    _ => {
+                        // ignore
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl UI for LogViewerUI {
+    fn set_command_processor(&mut self, cmdproc: CommandProcessor) {
+        let mut inner = self.inner.lock();
+        inner.cmdproc = Some(cmdproc);
+    }
+    fn run_async(&mut self) -> Pin<Box<dyn core::future::Future<Output = ()>>> {
+        let this = self.clone();
+        Box::pin(async move {
+            this.command_loop().await;
+        })
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[derive(Clone)]
+pub struct LogViewerUISender {
+    inner: Arc<Mutex<LogViewerUIInner>>,
+    connection_state_sender: flume::Sender<ConnectionState>,
+    term: Term,
+    enable_color: bool,
+}
+
+impl UISender for LogViewerUISender {
+    fn clone_uisender(&self) -> Box<dyn UISender> {
+        Box::new(LogViewerUISender {
+            inner: self.inner.clone(),
+            connection_state_sender: self.connection_state_sender.clone(),
+            term: self.term.clone(),
+            enable_color: self.enable_color,
+        })
+    }
+    fn as_logwriter(&self) -> Option<Box<dyn LogWriter>> {
+        None
+    }
+
+    fn display_string_dialog(&self, title: &str, text: &str, close_cb: UICallback) {
+        println!("{}: {}", title, text);
+        if let UICallback::Interactive(mut close_cb) = close_cb {
+            close_cb()
+        }
+    }
+
+    fn quit(&self) {
+        self.inner.lock().done.take();
+    }
+
+    fn send_callback(&self, callback: UICallback) {
+        if let UICallback::Interactive(mut callback) = callback {
+            callback();
+        }
+    }
+    fn set_attachment_state(
+        &mut self,
+        _state: &str,
+        _public_internet_ready: bool,
+        _local_network_ready: bool,
+    ) {
+        //
+    }
+    fn set_network_status(
+        &mut self,
+        _started: bool,
+        _bps_down: u64,
+        _bps_up: u64,
+        mut _peers: Vec<json::JsonValue>,
+    ) {
+        //
+    }
+    fn set_config(&mut self, _config: &json::JsonValue) {
+        //
+    }
+    fn set_connection_state(&mut self, state: ConnectionState) {
+        if let Err(e) = self.connection_state_sender.send(state) {
+            eprintln!("Error: {:?}", e);
+            self.inner.lock().done.take();
+        }
+    }
+
+    fn add_node_event(&self, _log_color: Level, event: &str) {
+        println!("{}", event);
+    }
+    fn add_log_event(&self, log_color: Level, event: &str) {
+        let log_line = format!(
+            "{}: {}",
+            CursiveUI::cli_ts(CursiveUI::get_start_time()),
+            event
+        );
+        if self.enable_color {
+            let log_line = match log_color {
+                Level::Error => style(log_line).red().bright().to_string(),
+                Level::Warn => style(log_line).yellow().bright().to_string(),
+                Level::Info => log_line,
+                Level::Debug => style(log_line).green().bright().to_string(),
+                Level::Trace => style(log_line).blue().bright().to_string(),
+            };
+            if let Err(e) = self.term.write_line(&log_line) {
+                eprintln!("Error: {:?}", e);
+                self.inner.lock().done.take();
+            }
+        } else {
+            println!("{}", log_line);
+        }
+    }
+}
diff --git a/veilid-cli/src/main.rs b/veilid-cli/src/main.rs
index e1c5a8e3..f3b0e5c4 100644
--- a/veilid-cli/src/main.rs
+++ b/veilid-cli/src/main.rs
@@ -3,14 +3,19 @@
 #![deny(unused_must_use)]
 #![recursion_limit = "256"]
 
-use crate::{settings::NamedSocketAddrs, tools::*};
+use crate::{settings::NamedSocketAddrs, tools::*, ui::*};
 
 use clap::{Parser, ValueEnum};
 use flexi_logger::*;
 use std::path::PathBuf;
+
 mod cached_text_view;
 mod client_api_connection;
 mod command_processor;
+mod cursive_ui;
+mod interactive_ui;
+mod io_read_write_ui;
+mod log_viewer_ui;
 mod peers_table_view;
 mod settings;
 mod tools;
@@ -31,7 +36,7 @@ struct CmdlineArgs {
     #[arg(long, short = 'p')]
     ipc_path: Option<PathBuf>,
     /// Subnode index to use when connecting
-    #[arg(long, short = 'i', default_value = "0")]
+    #[arg(long, default_value = "0")]
     subnode_index: usize,
     /// Address to connect to
     #[arg(long, short = 'a')]
@@ -45,183 +50,286 @@ struct CmdlineArgs {
     /// log level
     #[arg(value_enum)]
     log_level: Option<LogLevel>,
+    /// interactive
+    #[arg(long, short = 'i', group = "execution_mode")]
+    interactive: bool,
+    /// evaluate
+    #[arg(long, short = 'e', group = "execution_mode")]
+    evaluate: Option<String>,
+    /// show log only
+    #[arg(long, short = 'l', group = "execution_mode")]
+    log: bool,
+    /// read commands from file
+    #[arg(
+        long,
+        short = 'f',
+        group = "execution_mode",
+        value_name = "COMMAND_FILE"
+    )]
+    command_file: Option<PathBuf>,
 }
 
 fn main() -> Result<(), String> {
-    // Get command line options
-    let default_config_path = settings::Settings::get_default_config_path();
-    let args = CmdlineArgs::parse();
+    // Start async
+    block_on(async move {
+        // Get command line options
+        let default_config_path = settings::Settings::get_default_config_path();
+        let args = CmdlineArgs::parse();
 
-    if args.wait_for_debug {
-        use bugsalot::debugger;
-        debugger::wait_until_attached(None).expect("state() not implemented on this platform");
-    }
-
-    // Attempt to load configuration
-    let settings_path = args.config_file.unwrap_or(default_config_path);
-    let settings_path = if settings_path.exists() {
-        Some(settings_path.into_os_string())
-    } else {
-        None
-    };
-
-    let mut settings = settings::Settings::new(settings_path.as_deref())
-        .map_err(|e| format!("configuration is invalid: {}", e))?;
-
-    // Set config from command line
-    if let Some(LogLevel::Debug) = args.log_level {
-        settings.logging.level = settings::LogLevel::Debug;
-        settings.logging.terminal.enabled = true;
-    }
-    if let Some(LogLevel::Trace) = args.log_level {
-        settings.logging.level = settings::LogLevel::Trace;
-        settings.logging.terminal.enabled = true;
-    }
-
-    // Create UI object
-    let (mut sivui, uisender) = ui::UI::new(settings.interface.node_log.scrollback, &settings);
-
-    // Set up loggers
-    {
-        let mut specbuilder = LogSpecBuilder::new();
-        specbuilder.default(settings::convert_loglevel(settings.logging.level));
-        specbuilder.module("cursive", LevelFilter::Off);
-        specbuilder.module("cursive_core", LevelFilter::Off);
-        specbuilder.module("cursive_buffered_backend", LevelFilter::Off);
-        specbuilder.module("tokio_util", LevelFilter::Off);
-        specbuilder.module("mio", LevelFilter::Off);
-        specbuilder.module("async_std", LevelFilter::Off);
-        specbuilder.module("async_io", LevelFilter::Off);
-        specbuilder.module("polling", LevelFilter::Off);
-
-        let logger = Logger::with(specbuilder.build());
-
-        if settings.logging.terminal.enabled {
-            if settings.logging.file.enabled {
-                std::fs::create_dir_all(settings.logging.file.directory.clone())
-                    .map_err(map_to_string)?;
-                logger
-                    .log_to_file_and_writer(
-                        FileSpec::default()
-                            .directory(settings.logging.file.directory.clone())
-                            .suppress_timestamp(),
-                        Box::new(uisender.clone()),
-                    )
-                    .start()
-                    .expect("failed to initialize logger!");
-            } else {
-                logger
-                    .log_to_writer(Box::new(uisender.clone()))
-                    .start()
-                    .expect("failed to initialize logger!");
-            }
-        } else if settings.logging.file.enabled {
-            std::fs::create_dir_all(settings.logging.file.directory.clone())
-                .map_err(map_to_string)?;
-            logger
-                .log_to_file(
-                    FileSpec::default()
-                        .directory(settings.logging.file.directory.clone())
-                        .suppress_timestamp(),
-                )
-                .start()
-                .expect("failed to initialize logger!");
+        if args.wait_for_debug {
+            use bugsalot::debugger;
+            debugger::wait_until_attached(None).expect("state() not implemented on this platform");
         }
-    }
 
-    // Get client address
-    let enable_ipc = (settings.enable_ipc && args.address.is_none()) || args.ipc_path.is_some();
-    let mut enable_network =
-        (settings.enable_network && args.ipc_path.is_none()) || args.address.is_some();
-
-    // Determine IPC path to try
-    let mut client_api_ipc_path = None;
-    if enable_ipc {
-        cfg_if::cfg_if! {
-            if #[cfg(windows)] {
-                if let Some(ipc_path) = args.ipc_path.or(settings.ipc_path.clone()) {
-                    if is_ipc_socket_path(&ipc_path) {
-                        // try direct path
-                        enable_network = false;
-                        client_api_ipc_path = Some(ipc_path);
-                    } else {
-                        // try subnode index inside path
-                        let ipc_path = ipc_path.join(args.subnode_index.to_string());
-                        if is_ipc_socket_path(&ipc_path) {
-                            // subnode indexed path exists
-                            enable_network = false;
-                            client_api_ipc_path = Some(ipc_path);
-                        }
-                    }
-                }
-            } else {
-                if let Some(ipc_path) = args.ipc_path.or(settings.ipc_path.clone()) {
-                    if is_ipc_socket_path(&ipc_path) {
-                        // try direct path
-                        enable_network = false;
-                        client_api_ipc_path = Some(ipc_path);
-                    } else if ipc_path.exists() && ipc_path.is_dir() {
-                        // try subnode index inside path
-                        let ipc_path = ipc_path.join(args.subnode_index.to_string());
-                        if is_ipc_socket_path(&ipc_path) {
-                            // subnode indexed path exists
-                            enable_network = false;
-                            client_api_ipc_path = Some(ipc_path);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    let mut client_api_network_addresses = None;
-    if enable_network {
-        let args_address = if let Some(args_address) = args.address {
-            match NamedSocketAddrs::try_from(args_address) {
-                Ok(v) => Some(v),
-                Err(e) => {
-                    return Err(format!("Invalid server address: {}", e));
-                }
-            }
+        // Attempt to load configuration
+        let settings_path = args.config_file.unwrap_or(default_config_path);
+        let settings_path = if settings_path.exists() {
+            Some(settings_path.into_os_string())
         } else {
             None
         };
-        if let Some(address_arg) = args_address.or(settings.address.clone()) {
-            client_api_network_addresses = Some(address_arg.addrs);
-        } else if let Some(address) = settings.address.clone() {
-            client_api_network_addresses = Some(address.addrs.clone());
+
+        let mut settings = settings::Settings::new(settings_path.as_deref())
+            .map_err(|e| format!("configuration is invalid: {}", e))?;
+
+        // Set config from command line
+        if let Some(LogLevel::Debug) = args.log_level {
+            settings.logging.level = settings::LogLevel::Debug;
+            settings.logging.terminal.enabled = true;
+        }
+        if let Some(LogLevel::Trace) = args.log_level {
+            settings.logging.level = settings::LogLevel::Trace;
+            settings.logging.terminal.enabled = true;
         }
-    }
 
-    // Create command processor
-    debug!("Creating Command Processor ");
-    let comproc = command_processor::CommandProcessor::new(uisender, &settings);
-    sivui.set_command_processor(comproc.clone());
+        // If we are running in interactive mode disable some things
+        let mut enable_cursive = true;
+        if args.interactive || args.log || args.command_file.is_some() || args.evaluate.is_some() {
+            settings.logging.terminal.enabled = false;
+            enable_cursive = false;
+        }
 
-    // Create client api client side
-    info!("Starting API connection");
-    let capi = client_api_connection::ClientApiConnection::new(comproc.clone());
+        // Create UI object
+        let (mut ui, uisender) = if enable_cursive {
+            let (ui, uisender) = cursive_ui::CursiveUI::new(&settings);
+            (
+                Box::new(ui) as Box<dyn UI>,
+                Box::new(uisender) as Box<dyn UISender>,
+            )
+        } else if args.interactive {
+            let (ui, uisender) = interactive_ui::InteractiveUI::new(&settings);
+            (
+                Box::new(ui) as Box<dyn UI>,
+                Box::new(uisender) as Box<dyn UISender>,
+            )
+        } else if let Some(command_file) = args.command_file {
+            cfg_if! {
+                if #[cfg(feature="rt-async-std")] {
+                    let (in_obj, out_obj) =
+                        if command_file.to_string_lossy() == "-" {
+                            (Box::pin(async_std::io::stdin()) as Pin<Box<dyn futures::AsyncRead + Send>>, async_std::io::stdout())
+                        } else {
+                            let f = match async_std::fs::File::open(command_file).await {
+                                Ok(v) => v,
+                                Err(e) => {
+                                    return Err(e.to_string());
+                                }
+                            };
+                            (Box::pin(f) as Pin<Box<dyn futures::AsyncRead + Send>>, async_std::io::stdout())
+                        };
+                } else if #[cfg(feature="rt-tokio")] {
+                    use tokio_util::compat::{TokioAsyncWriteCompatExt, TokioAsyncReadCompatExt};
+                    let (in_obj, out_obj) =
+                        if command_file.to_string_lossy() == "-" {
+                            (Box::pin(tokio::io::stdin().compat()) as Pin<Box<dyn futures::AsyncRead + Send>>, tokio::io::stdout().compat_write())
+                        } else {
+                            let f = match tokio::fs::File::open(command_file).await {
+                                Ok(v) => v,
+                                Err(e) => {
+                                    return Err(e.to_string());
+                                }
+                            };
+                            (Box::pin(f.compat()) as Pin<Box<dyn futures::AsyncRead + Send>>, tokio::io::stdout().compat_write())
+                        };
+                } else {
+                    compile_error!("needs executor implementation")
+                }
+            }
 
-    // Save client api in command processor
-    comproc.set_client_api_connection(capi.clone());
+            let (ui, uisender) = io_read_write_ui::IOReadWriteUI::new(&settings, in_obj, out_obj);
+            (
+                Box::new(ui) as Box<dyn UI>,
+                Box::new(uisender) as Box<dyn UISender>,
+            )
+        } else if let Some(evaluate) = args.evaluate {
+            cfg_if! {
+                if #[cfg(feature="rt-async-std")] {
+                    let in_str = format!("{}\n", evaluate);
+                    let (in_obj, out_obj) = (futures::io::Cursor::new(in_str), async_std::io::stdout());
+                } else if #[cfg(feature="rt-tokio")] {
+                    use tokio_util::compat::{TokioAsyncWriteCompatExt};
+                    let in_str = format!("{}\n", evaluate);
+                    let (in_obj, out_obj) = (futures::io::Cursor::new(in_str), tokio::io::stdout().compat_write());
+                } else {
+                    compile_error!("needs executor implementation")
+                }
+            }
 
-    // Keep a connection to the server
-    if let Some(client_api_ipc_path) = client_api_ipc_path {
-        comproc.set_ipc_path(Some(client_api_ipc_path));
-    } else if let Some(client_api_network_address) = client_api_network_addresses {
-        let network_addr = client_api_network_address.first().cloned();
-        comproc.set_network_address(network_addr);
-    } else {
-        return Err("veilid-server could not be reached".to_owned());
-    }
+            let (ui, uisender) = io_read_write_ui::IOReadWriteUI::new(&settings, in_obj, out_obj);
+            (
+                Box::new(ui) as Box<dyn UI>,
+                Box::new(uisender) as Box<dyn UISender>,
+            )
+        } else if args.log {
+            let (ui, uisender) = log_viewer_ui::LogViewerUI::new(&settings);
+            (
+                Box::new(ui) as Box<dyn UI>,
+                Box::new(uisender) as Box<dyn UISender>,
+            )
+        } else {
+            panic!("unknown ui mode");
+        };
 
-    let comproc2 = comproc.clone();
-    let connection_future = comproc.connection_manager();
+        // Set up loggers
+        {
+            let mut specbuilder = LogSpecBuilder::new();
+            specbuilder.default(settings::convert_loglevel(settings.logging.level));
+            specbuilder.module("cursive", LevelFilter::Off);
+            specbuilder.module("cursive_core", LevelFilter::Off);
+            specbuilder.module("cursive_buffered_backend", LevelFilter::Off);
+            specbuilder.module("tokio_util", LevelFilter::Off);
+            specbuilder.module("mio", LevelFilter::Off);
+            specbuilder.module("async_std", LevelFilter::Off);
+            specbuilder.module("async_io", LevelFilter::Off);
+            specbuilder.module("polling", LevelFilter::Off);
+
+            let logger = Logger::with(specbuilder.build());
+
+            if settings.logging.terminal.enabled {
+                if settings.logging.file.enabled {
+                    std::fs::create_dir_all(settings.logging.file.directory.clone())
+                        .map_err(map_to_string)?;
+                    logger
+                        .log_to_file_and_writer(
+                            FileSpec::default()
+                                .directory(settings.logging.file.directory.clone())
+                                .suppress_timestamp(),
+                            uisender.as_logwriter().unwrap(),
+                        )
+                        .start()
+                        .expect("failed to initialize logger!");
+                } else {
+                    logger
+                        .log_to_writer(uisender.as_logwriter().unwrap())
+                        .start()
+                        .expect("failed to initialize logger!");
+                }
+            } else if settings.logging.file.enabled {
+                std::fs::create_dir_all(settings.logging.file.directory.clone())
+                    .map_err(map_to_string)?;
+                logger
+                    .log_to_file(
+                        FileSpec::default()
+                            .directory(settings.logging.file.directory.clone())
+                            .suppress_timestamp(),
+                    )
+                    .start()
+                    .expect("failed to initialize logger!");
+            }
+        }
+
+        // Get client address
+        let enable_ipc = (settings.enable_ipc && args.address.is_none()) || args.ipc_path.is_some();
+        let mut enable_network =
+            (settings.enable_network && args.ipc_path.is_none()) || args.address.is_some();
+
+        // Determine IPC path to try
+        let mut client_api_ipc_path = None;
+        if enable_ipc {
+            cfg_if::cfg_if! {
+                if #[cfg(windows)] {
+                    if let Some(ipc_path) = args.ipc_path.or(settings.ipc_path.clone()) {
+                        if is_ipc_socket_path(&ipc_path) {
+                            // try direct path
+                            enable_network = false;
+                            client_api_ipc_path = Some(ipc_path);
+                        } else {
+                            // try subnode index inside path
+                            let ipc_path = ipc_path.join(args.subnode_index.to_string());
+                            if is_ipc_socket_path(&ipc_path) {
+                                // subnode indexed path exists
+                                enable_network = false;
+                                client_api_ipc_path = Some(ipc_path);
+                            }
+                        }
+                    }
+                } else {
+                    if let Some(ipc_path) = args.ipc_path.or(settings.ipc_path.clone()) {
+                        if is_ipc_socket_path(&ipc_path) {
+                            // try direct path
+                            enable_network = false;
+                            client_api_ipc_path = Some(ipc_path);
+                        } else if ipc_path.exists() && ipc_path.is_dir() {
+                            // try subnode index inside path
+                            let ipc_path = ipc_path.join(args.subnode_index.to_string());
+                            if is_ipc_socket_path(&ipc_path) {
+                                // subnode indexed path exists
+                                enable_network = false;
+                                client_api_ipc_path = Some(ipc_path);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        let mut client_api_network_addresses = None;
+        if enable_network {
+            let args_address = if let Some(args_address) = args.address {
+                match NamedSocketAddrs::try_from(args_address) {
+                    Ok(v) => Some(v),
+                    Err(e) => {
+                        return Err(format!("Invalid server address: {}", e));
+                    }
+                }
+            } else {
+                None
+            };
+            if let Some(address_arg) = args_address.or(settings.address.clone()) {
+                client_api_network_addresses = Some(address_arg.addrs);
+            } else if let Some(address) = settings.address.clone() {
+                client_api_network_addresses = Some(address.addrs.clone());
+            }
+        }
+
+        // Create command processor
+        debug!("Creating Command Processor ");
+        let comproc = command_processor::CommandProcessor::new(uisender, &settings);
+
+        ui.set_command_processor(comproc.clone());
+
+        // Create client api client side
+        info!("Starting API connection");
+        let capi = client_api_connection::ClientApiConnection::new(comproc.clone());
+
+        // Save client api in command processor
+        comproc.set_client_api_connection(capi.clone());
+
+        // Keep a connection to the server
+        if let Some(client_api_ipc_path) = client_api_ipc_path {
+            comproc.set_ipc_path(Some(client_api_ipc_path));
+        } else if let Some(client_api_network_address) = client_api_network_addresses {
+            let network_addr = client_api_network_address.first().cloned();
+            comproc.set_network_address(network_addr);
+        } else {
+            return Err("veilid-server could not be reached".to_owned());
+        }
+
+        let comproc2 = comproc.clone();
+        let connection_future = comproc.connection_manager();
 
-    // Start async
-    block_on(async move {
         // Start UI
         let ui_future = async move {
-            sivui.run_async().await;
+            ui.run_async().await;
 
             // When UI quits, close connection and command processor cleanly
             comproc2.quit();
@@ -240,7 +348,6 @@ fn main() -> Result<(), String> {
                 compile_error!("needs executor implementation")
             }
         }
-    });
-
-    Ok(())
+        Ok(())
+    })
 }
diff --git a/veilid-cli/src/ui.rs b/veilid-cli/src/ui.rs
index 95b6fb53..8ca14085 100644
--- a/veilid-cli/src/ui.rs
+++ b/veilid-cli/src/ui.rs
@@ -1,1389 +1,46 @@
 use crate::command_processor::*;
-use crate::peers_table_view::*;
-use crate::settings::Settings;
+use crate::cursive_ui::CursiveUICallback;
+use crate::interactive_ui::InteractiveUICallback;
+use crate::io_read_write_ui::IOReadWriteUICallback;
+use crate::log_viewer_ui::LogViewerUICallback;
 use crate::tools::*;
-use crossbeam_channel::Sender;
-use cursive::align::*;
-use cursive::event::*;
-use cursive::theme::*;
-use cursive::traits::*;
-use cursive::utils::markup::ansi;
-use cursive::utils::markup::StyledString;
-use cursive::view::SizeConstraint;
-use cursive::views::*;
-use cursive::Cursive;
-use cursive::CursiveRunnable;
 use flexi_logger::writers::LogWriter;
-use flexi_logger::DeferredNow;
-// use cursive_multiplex::*;
-use crate::cached_text_view::*;
-use chrono::{Datelike, Timelike};
-use std::collections::{HashMap, VecDeque};
-use std::io::Write;
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::time::{SystemTime, UNIX_EPOCH};
-use thiserror::Error;
+use log::Level;
 
-//////////////////////////////////////////////////////////////
-///
-struct Dirty<T>
-where
-    T: PartialEq,
-{
-    value: T,
-    dirty: bool,
+pub enum UICallback {
+    Cursive(CursiveUICallback),
+    Interactive(InteractiveUICallback),
+    IOReadWrite(IOReadWriteUICallback),
+    LogViewer(LogViewerUICallback),
 }
 
-impl<T> Dirty<T>
-where
-    T: PartialEq,
-{
-    pub fn new(value: T) -> Self {
-        Self { value, dirty: true }
-    }
-    pub fn set(&mut self, value: T) {
-        self.dirty = self.value != value;
-        self.value = value;
-    }
-    pub fn get(&self) -> &T {
-        &self.value
-    }
-    // pub fn get_mut(&mut self) -> &mut T {
-    //     &mut self.value
-    // }
-    pub fn take_dirty(&mut self) -> bool {
-        let is_dirty = self.dirty;
-        self.dirty = false;
-        is_dirty
-    }
-}
-
-pub type UICallback = Box<dyn Fn(&mut Cursive) + Send>;
-pub type NodeEventsPanel = Panel<NamedView<ScrollView<NamedView<CachedTextView>>>>;
-
-static START_TIME: AtomicU64 = AtomicU64::new(0);
-
-struct UIState {
-    attachment_state: Dirty<String>,
-    public_internet_ready: Dirty<bool>,
-    local_network_ready: Dirty<bool>,
-    network_started: Dirty<bool>,
-    network_down_up: Dirty<(f32, f32)>,
-    connection_state: Dirty<ConnectionState>,
-    peers_state: Dirty<Vec<json::JsonValue>>,
-    node_id: Dirty<String>,
-}
-
-impl UIState {
-    pub fn new() -> Self {
-        Self {
-            attachment_state: Dirty::new("Detached".to_owned()),
-            public_internet_ready: Dirty::new(false),
-            local_network_ready: Dirty::new(false),
-            network_started: Dirty::new(false),
-            network_down_up: Dirty::new((0.0, 0.0)),
-            connection_state: Dirty::new(ConnectionState::Disconnected),
-            peers_state: Dirty::new(Vec::new()),
-            node_id: Dirty::new("".to_owned()),
-        }
-    }
-}
-
-//#[derive(Error, Debug)]
-//#[error("???")]
-//struct UIError;
-
-pub struct UIInner {
-    ui_state: UIState,
-    log_colors: HashMap<Level, cursive::theme::Color>,
-    cmdproc: Option<CommandProcessor>,
-    cmd_history: VecDeque<String>,
-    cmd_history_position: usize,
-    cmd_history_max_size: usize,
-    connection_dialog_state: Option<ConnectionState>,
-}
-
-pub struct UI {
-    siv: CursiveRunnable,
-    inner: Arc<Mutex<UIInner>>,
-}
-
-#[derive(Error, Debug)]
-pub enum DumbError {
-    // #[error("{0}")]
-    // Message(String),
-}
-
-impl UI {
-    /////////////////////////////////////////////////////////////////////////////////////
-    // Private functions
-    fn command_processor(s: &mut Cursive) -> CommandProcessor {
-        let inner = Self::inner(s);
-        inner.cmdproc.as_ref().unwrap().clone()
-    }
-
-    fn inner(s: &mut Cursive) -> MutexGuard<'_, UIInner> {
-        s.user_data::<Arc<Mutex<UIInner>>>().unwrap().lock()
-    }
-    fn inner_mut(s: &mut Cursive) -> MutexGuard<'_, UIInner> {
-        s.user_data::<Arc<Mutex<UIInner>>>().unwrap().lock()
-    }
-
-    fn setup_colors(siv: &mut CursiveRunnable, inner: &mut UIInner, settings: &Settings) {
-        // Make colors
-        let mut theme = cursive::theme::load_default();
-        theme.shadow = settings.interface.theme.shadow;
-        theme.borders = BorderStyle::from(&settings.interface.theme.borders);
-        theme.palette.set_color(
-            "background",
-            Color::parse(settings.interface.theme.colors.background.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "shadow",
-            Color::parse(settings.interface.theme.colors.shadow.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "view",
-            Color::parse(settings.interface.theme.colors.view.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "primary",
-            Color::parse(settings.interface.theme.colors.primary.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "secondary",
-            Color::parse(settings.interface.theme.colors.secondary.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "tertiary",
-            Color::parse(settings.interface.theme.colors.tertiary.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "title_primary",
-            Color::parse(settings.interface.theme.colors.title_primary.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "title_secondary",
-            Color::parse(settings.interface.theme.colors.title_secondary.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "highlight",
-            Color::parse(settings.interface.theme.colors.highlight.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "highlight_inactive",
-            Color::parse(settings.interface.theme.colors.highlight_inactive.as_str()).unwrap(),
-        );
-        theme.palette.set_color(
-            "highlight_text",
-            Color::parse(settings.interface.theme.colors.highlight_text.as_str()).unwrap(),
-        );
-        siv.set_theme(theme);
-
-        // Make log colors
-        let mut colors = HashMap::<Level, cursive::theme::Color>::new();
-        colors.insert(
-            Level::Trace,
-            Color::parse(settings.interface.theme.log_colors.trace.as_str()).unwrap(),
-        );
-        colors.insert(
-            Level::Debug,
-            Color::parse(settings.interface.theme.log_colors.debug.as_str()).unwrap(),
-        );
-        colors.insert(
-            Level::Info,
-            Color::parse(settings.interface.theme.log_colors.info.as_str()).unwrap(),
-        );
-        colors.insert(
-            Level::Warn,
-            Color::parse(settings.interface.theme.log_colors.warn.as_str()).unwrap(),
-        );
-        colors.insert(
-            Level::Error,
-            Color::parse(settings.interface.theme.log_colors.error.as_str()).unwrap(),
-        );
-        inner.log_colors = colors;
-    }
-    fn setup_quit_handler(siv: &mut Cursive) {
-        siv.clear_global_callbacks(cursive::event::Event::CtrlChar('c'));
-
-        siv.set_on_pre_event(cursive::event::Event::CtrlChar('c'), UI::quit_handler);
-        siv.set_global_callback(cursive::event::Event::Key(Key::Esc), UI::quit_handler);
-    }
-
-    fn setup_clear_handler(siv: &mut Cursive) {
-        siv.clear_global_callbacks(cursive::event::Event::CtrlChar('k'));
-        siv.set_on_pre_event(cursive::event::Event::CtrlChar('k'), UI::clear_handler);
-    }
-
-    fn quit_handler(siv: &mut Cursive) {
-        siv.add_layer(
-            Dialog::text("Do you want to exit?")
-                .button("Yes", |s| s.quit())
-                .button("No", |s| {
-                    s.pop_layer();
-                    UI::setup_quit_handler(s);
-                }),
-        );
-        siv.set_on_pre_event(cursive::event::Event::CtrlChar('c'), |s| {
-            s.quit();
-        });
-        siv.set_global_callback(cursive::event::Event::Key(Key::Esc), |s| {
-            s.pop_layer();
-            UI::setup_quit_handler(s);
-        });
-    }
-    fn clear_handler(siv: &mut Cursive) {
-        Self::node_events_view(siv).set_content([]);
-        UI::update_cb(siv);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Selectors
-
-    // fn main_layout(s: &mut Cursive) -> ViewRef<LinearLayout> {
-    //     s.find_name("main-layout").unwrap()
-    // }
-    fn node_events_panel(s: &mut Cursive) -> ViewRef<NodeEventsPanel> {
-        s.find_name("node-events-panel").unwrap()
-    }
-    fn node_events_view(s: &mut Cursive) -> ViewRef<CachedTextView> {
-        s.find_name("node-events-view").unwrap()
-    }
-    fn node_events_scroll_view(s: &mut Cursive) -> ViewRef<ScrollView<NamedView<CachedTextView>>> {
-        s.find_name("node-events-scroll-view").unwrap()
-    }
-    fn command_line(s: &mut Cursive) -> ViewRef<EditView> {
-        s.find_name("command-line").unwrap()
-    }
-    fn button_attach(s: &mut Cursive) -> ViewRef<Button> {
-        s.find_name("button-attach").unwrap()
-    }
-    fn status_bar(s: &mut Cursive) -> ViewRef<TextView> {
-        s.find_name("status-bar").unwrap()
-    }
-    fn peers(s: &mut Cursive) -> ViewRef<PeersTableView> {
-        s.find_name("peers").unwrap()
-    }
-    fn ipc_path(s: &mut Cursive) -> ViewRef<EditView> {
-        s.find_name("ipc-path").unwrap()
-    }
-    fn ipc_path_radio(s: &mut Cursive) -> ViewRef<RadioButton<u32>> {
-        s.find_name("ipc-path-radio").unwrap()
-    }
-    fn connecting_text(s: &mut Cursive) -> ViewRef<TextView> {
-        s.find_name("connecting-text").unwrap()
-    }
-    fn network_address(s: &mut Cursive) -> ViewRef<EditView> {
-        s.find_name("network-address").unwrap()
-    }
-    fn network_address_radio(s: &mut Cursive) -> ViewRef<RadioButton<u32>> {
-        s.find_name("network-address-radio").unwrap()
-    }
-    fn connection_dialog(s: &mut Cursive) -> ViewRef<Dialog> {
-        s.find_name("connection-dialog").unwrap()
-    }
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-
-    fn push_styled_line(s: &mut Cursive, styled_string: StyledString) {
-        let mut ctv = UI::node_events_view(s);
-        ctv.append_line(styled_string)
-    }
-
-    fn push_ansi_lines(s: &mut Cursive, mut starting_style: Style, lines: String) {
-        let mut ctv = UI::node_events_view(s);
-
-        let mut sslines: Vec<StyledString> = vec![];
-        for line in lines.lines() {
-            let (spanned_string, end_style) = ansi::parse_with_starting_style(starting_style, line);
-            sslines.push(spanned_string);
-            starting_style = end_style;
-        }
-
-        ctv.append_lines(sslines.into_iter());
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-
-    fn render_attachment_state(inner: &mut UIInner) -> String {
-        let att = match inner.ui_state.attachment_state.get().as_str() {
-            "Detached" => "[----]",
-            "Attaching" => "[/   ]",
-            "AttachedWeak" => "[|   ]",
-            "AttachedGood" => "[||  ]",
-            "AttachedStrong" => "[||| ]",
-            "FullyAttached" => "[||||]",
-            "OverAttached" => "[++++]",
-            "Detaching" => "[////]",
-            _ => "[????]",
-        };
-        let pi = if *inner.ui_state.public_internet_ready.get() {
-            "+P"
-        } else {
-            "-p"
-        };
-        let ln = if *inner.ui_state.local_network_ready.get() {
-            "+L"
-        } else {
-            "-l"
-        };
-        format!("{}{}{}", att, pi, ln)
-    }
-    fn render_network_status(inner: &mut UIInner) -> String {
-        match inner.ui_state.network_started.get() {
-            false => "Down: ----KB/s Up: ----KB/s".to_owned(),
-            true => {
-                let (d, u) = inner.ui_state.network_down_up.get();
-                format!("Down: {:.2}KB/s Up: {:.2}KB/s", d, u)
-            }
-        }
-    }
-    fn render_button_attach<'a>(inner: &mut UIInner) -> (&'a str, bool) {
-        if let ConnectionState::ConnectedTCP(_, _) = inner.ui_state.connection_state.get() {
-            match inner.ui_state.attachment_state.get().as_str() {
-                "Detached" => ("Attach", true),
-                "Attaching" => ("Detach", true),
-                "AttachedWeak" => ("Detach", true),
-                "AttachedGood" => ("Detach", true),
-                "AttachedStrong" => ("Detach", true),
-                "FullyAttached" => ("Detach", true),
-                "OverAttached" => ("Detach", true),
-                "Detaching" => ("Detach", false),
-                _ => ("???", false),
-            }
-        } else {
-            (" ---- ", false)
-        }
-    }
-
-    fn on_command_line_edit(s: &mut Cursive, text: &str, _pos: usize) {
-        let mut inner = Self::inner_mut(s);
-
-        // save edited command to newest history slot
-        let hlen = inner.cmd_history.len();
-        inner.cmd_history_position = hlen - 1;
-        inner.cmd_history[hlen - 1] = text.to_owned();
-    }
-
-    fn enable_command_ui(s: &mut Cursive, enabled: bool) {
-        Self::command_line(s).set_enabled(enabled);
-        Self::button_attach(s).set_enabled(enabled);
-    }
-
-    fn display_string_dialog_cb(
-        s: &mut Cursive,
-        title: String,
-        contents: String,
-        close_cb: UICallback,
-    ) {
-        // Creates a dialog around some text with a single button
-        let close_cb = Rc::new(close_cb);
-        let close_cb2 = close_cb.clone();
-        s.add_layer(
-            Dialog::around(TextView::new(contents).scrollable())
-                .title(title)
-                .button("Close", move |s| {
-                    s.pop_layer();
-                    close_cb(s);
-                }),
-        );
-        s.set_global_callback(cursive::event::Event::Key(Key::Esc), move |s| {
-            s.set_global_callback(cursive::event::Event::Key(Key::Esc), UI::quit_handler);
-            s.pop_layer();
-            close_cb2(s);
-        });
-    }
-
-    fn run_command(s: &mut Cursive, text: &str) -> Result<(), String> {
-        // disable ui
-        Self::enable_command_ui(s, false);
-
-        // run command
-        s.set_global_callback(cursive::event::Event::Key(Key::Esc), |s| {
-            let cmdproc = Self::command_processor(s);
-            cmdproc.cancel_command();
-        });
-
-        let cmdproc = Self::command_processor(s);
-        cmdproc.run_command(
-            text,
-            Box::new(|s| {
-                s.set_global_callback(cursive::event::Event::Key(Key::Esc), UI::quit_handler);
-                Self::enable_command_ui(s, true);
-            }),
-        )
-    }
-
-    fn on_command_line_entered(s: &mut Cursive, text: &str) {
-        if text.trim().is_empty() {
-            return;
-        }
-        // run command
-        UI::push_ansi_lines(
-            s,
-            ColorStyle::primary().into(),
-            format!("{}> {}\n", UI::cli_ts(Self::get_start_time()), text),
-        );
-        match Self::run_command(s, text) {
-            Ok(_) => {}
-            Err(e) => {
-                let color = *Self::inner_mut(s).log_colors.get(&Level::Error).unwrap();
-                UI::push_ansi_lines(
-                    s,
-                    color.into(),
-                    format!(" {} Error: {}", UI::cli_ts(Self::get_start_time()), e),
-                );
-            }
-        }
-        // save to history unless it's a duplicate
-        {
-            let mut inner = Self::inner_mut(s);
-
-            let hlen = inner.cmd_history.len();
-            inner.cmd_history[hlen - 1] = text.to_owned();
-
-            if hlen >= 2 && inner.cmd_history[hlen - 1] == inner.cmd_history[hlen - 2] {
-                inner.cmd_history[hlen - 1] = "".to_string();
-            } else {
-                if hlen == inner.cmd_history_max_size {
-                    inner.cmd_history.pop_front();
-                }
-                inner.cmd_history.push_back("".to_string());
-            }
-            let hlen = inner.cmd_history.len();
-            inner.cmd_history_position = hlen - 1;
-        }
-
-        // Clear the edit field
-        let mut cmdline = Self::command_line(s);
-        cmdline.set_content("");
-    }
-
-    fn on_command_line_history(s: &mut Cursive, dir: bool) {
-        let mut cmdline = Self::command_line(s);
-        let mut inner = Self::inner_mut(s);
-        // if at top of buffer or end of buffer, ignore
-        if (!dir && inner.cmd_history_position == 0)
-            || (dir && inner.cmd_history_position == (inner.cmd_history.len() - 1))
-        {
-            return;
-        }
-
-        // move the history position
-        if dir {
-            inner.cmd_history_position += 1;
-        } else {
-            inner.cmd_history_position -= 1;
-        }
-
-        // replace text with current line
-        let hlen = inner.cmd_history_position;
-        cmdline.set_content(inner.cmd_history[hlen].as_str());
-    }
-
-    fn on_button_attach_pressed(s: &mut Cursive) {
-        let action: Option<bool> = match Self::inner_mut(s).ui_state.attachment_state.get().as_str()
-        {
-            "Detached" => Some(true),
-            "Attaching" => Some(false),
-            "AttachedWeak" => Some(false),
-            "AttachedGood" => Some(false),
-            "AttachedStrong" => Some(false),
-            "FullyAttached" => Some(false),
-            "OverAttached" => Some(false),
-            "Detaching" => None,
-            _ => None,
-        };
-        let cmdproc = Self::command_processor(s);
-        if let Some(a) = action {
-            if a {
-                cmdproc.attach();
-            } else {
-                cmdproc.detach();
-            }
-        }
-    }
-
-    fn refresh_button_attach(s: &mut Cursive) {
-        let mut button_attach = UI::button_attach(s);
-        let mut inner = Self::inner_mut(s);
-
-        let (button_text, button_enable) = UI::render_button_attach(&mut inner);
-
-        button_attach.set_label(button_text);
-        button_attach.set_enabled(button_enable);
-    }
-
-    fn submit_ipc_path(s: &mut Cursive) {
-        let edit = Self::ipc_path(s);
-        let addr = (*edit.get_content()).clone();
-        let ipc_path = match addr.parse::<PathBuf>() {
-            Ok(sa) => sa,
-            Err(_) => {
-                s.add_layer(Dialog::text("Invalid IPC path").button("Close", |s| {
-                    s.pop_layer();
-                }));
-                return;
-            }
-        };
-        Self::command_processor(s).set_ipc_path(Some(ipc_path));
-        Self::command_processor(s).set_network_address(None);
-        Self::command_processor(s).start_connection();
-    }
-
-    fn submit_network_address(s: &mut Cursive) {
-        let edit = Self::network_address(s);
-        let addr = (*edit.get_content()).clone();
-        let sa = match addr.parse::<std::net::SocketAddr>() {
-            Ok(sa) => sa,
-            Err(_) => {
-                s.add_layer(
-                    Dialog::text("Invalid network address").button("Close", |s| {
-                        s.pop_layer();
-                    }),
-                );
-                return;
-            }
-        };
-        Self::command_processor(s).set_ipc_path(None);
-        Self::command_processor(s).set_network_address(Some(sa));
-        Self::command_processor(s).start_connection();
-    }
-
-    fn copy_to_clipboard_osc52<S: AsRef<str>>(s: &mut Cursive, text: S) {
-        // OSC52 clipboard copy for terminals
-        if std::io::stdout()
-            .write_all(
-                format!(
-                    "\x1B]52;c;{}\x07",
-                    data_encoding::BASE64.encode(text.as_ref().as_bytes()),
-                )
-                .as_bytes(),
-            )
-            .is_ok()
-            && std::io::stdout().flush().is_ok()
-        {
-            let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
-            UI::push_ansi_lines(
-                s,
-                color.into(),
-                format!(
-                    ">> {} Copied: {}",
-                    UI::cli_ts(Self::get_start_time()),
-                    text.as_ref()
-                ),
-            );
-        }
-    }
-
-    fn copy_to_clipboard<S: AsRef<str>>(s: &mut Cursive, text: S) {
-        if let Ok(mut clipboard) = arboard::Clipboard::new() {
-            // X11/Wayland/other system copy
-            if clipboard.set_text(text.as_ref()).is_ok() {
-                let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
-                UI::push_ansi_lines(
-                    s,
-                    color.into(),
-                    format!(
-                        ">> {} Copied: {}",
-                        UI::cli_ts(Self::get_start_time()),
-                        text.as_ref()
-                    ),
-                );
-            } else {
-                let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap();
-                UI::push_ansi_lines(
-                    s,
-                    color.into(),
-                    format!(
-                        ">> {} Could not copy to clipboard",
-                        UI::cli_ts(Self::get_start_time())
-                    ),
-                );
-            }
-        } else {
-            Self::copy_to_clipboard_osc52(s, text)
-        }
-    }
-
-    fn on_submit_peers_table_view(s: &mut Cursive, _row: usize, index: usize) {
-        let peers_table_view = UI::peers(s);
-        let node_id = peers_table_view
-            .borrow_item(index)
-            .map(|j| j["node_ids"][0].to_string());
-        if let Some(node_id) = node_id {
-            Self::copy_to_clipboard(s, node_id);
-        }
-    }
-
-    fn on_focus_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
-        ptv.set_height(SizeConstraint::Full);
-        EventResult::Ignored
-    }
-
-    fn on_focus_lost_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
-        ptv.set_height(SizeConstraint::AtLeast(8));
-        EventResult::Ignored
-    }
-
-    fn draw_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool {
-        let is_ipc = Self::command_processor(s).get_ipc_path().is_some();
-        let mut inner = Self::inner_mut(s);
-
-        let mut connection_type_group: RadioGroup<u32> = RadioGroup::new().on_change(|s, v| {
-            if *v == 0 {
-                Self::ipc_path(s).enable();
-                Self::network_address(s).disable();
-            } else if *v == 1 {
-                Self::ipc_path(s).disable();
-                Self::network_address(s).enable();
-            }
-        });
-
-        let mut show: bool = false;
-        let mut hide: bool = false;
-        let mut connecting: bool = false;
-        match state {
-            ConnectionState::Disconnected => {
-                if inner.connection_dialog_state.is_none()
-                    || inner
-                        .connection_dialog_state
-                        .as_ref()
-                        .unwrap()
-                        .is_connected()
-                {
-                    show = true;
-                } else if inner
-                    .connection_dialog_state
-                    .as_ref()
-                    .unwrap()
-                    .is_retrying()
-                {
-                    hide = true;
-                    show = true
-                }
-            }
-            ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {
-                if inner.connection_dialog_state.is_some()
-                    && !inner
-                        .connection_dialog_state
-                        .as_ref()
-                        .unwrap()
-                        .is_connected()
-                {
-                    hide = true;
-                }
-            }
-            ConnectionState::RetryingTCP(_, _) | ConnectionState::RetryingIPC(_, _) => {
-                if inner.connection_dialog_state.is_none()
-                    || inner
-                        .connection_dialog_state
-                        .as_ref()
-                        .unwrap()
-                        .is_connected()
-                {
-                    show = true;
-                } else if inner
-                    .connection_dialog_state
-                    .as_ref()
-                    .unwrap()
-                    .is_disconnected()
-                {
-                    hide = true;
-                    show = true;
-                }
-                connecting = true;
-            }
-        }
-        inner.connection_dialog_state = Some(state);
-        drop(inner);
-        if hide {
-            s.pop_layer();
-            s.pop_layer();
-        }
-        if show {
-            s.add_fullscreen_layer(Layer::with_color(
-                ResizedView::with_full_screen(DummyView {}),
-                ColorStyle::new(PaletteColor::Background, PaletteColor::Background),
-            ));
-
-            s.add_layer(
-                Dialog::around(if connecting {
-                    LinearLayout::vertical()
-                        .child(TextView::new(" "))
-                        .child(
-                            TextView::new(if is_ipc {
-                                "Connecting to IPC:"
-                            } else {
-                                "Connecting to TCP:"
-                            })
-                            .min_width(40),
-                        )
-                        .child(TextView::new("").with_name("connecting-text"))
-                } else {
-                    LinearLayout::vertical()
-                        .child(TextView::new(" "))
-                        .child(
-                            if is_ipc {
-                                connection_type_group.button(0, "IPC Path").selected()
-                            } else {
-                                connection_type_group.button(0, "IPC Path")
-                            }
-                            .with_name("ipc-path-radio"),
-                        )
-                        .child(
-                            EditView::new()
-                                .with_enabled(is_ipc)
-                                .on_submit(|s, _| Self::submit_ipc_path(s))
-                                .with_name("ipc-path")
-                                .fixed_height(1)
-                                .min_width(40),
-                        )
-                        .child(TextView::new(" "))
-                        .child(
-                            if is_ipc {
-                                connection_type_group.button(1, "Network Address")
-                            } else {
-                                connection_type_group
-                                    .button(1, "Network Address")
-                                    .selected()
-                            }
-                            .with_name("network-address-radio"),
-                        )
-                        .child(
-                            EditView::new()
-                                .with_enabled(!is_ipc)
-                                .on_submit(|s, _| Self::submit_network_address(s))
-                                .with_name("network-address")
-                                .fixed_height(1)
-                                .min_width(40),
-                        )
-                        .child(TextView::new(" "))
-                })
-                .title(if connecting {
-                    "Connecting to server..."
-                } else {
-                    "Connect to server"
-                })
-                .with_name("connection-dialog"),
-            );
-
-            return true;
-        }
-
-        false
-    }
-
-    fn refresh_connection_dialog(s: &mut Cursive) {
-        let new_state = Self::inner(s).ui_state.connection_state.get().clone();
-
-        if !Self::draw_connection_dialog(s, new_state.clone()) {
-            return;
-        }
-
-        match new_state {
-            ConnectionState::Disconnected => {
-                Self::ipc_path_radio(s).set_enabled(true);
-                Self::network_address_radio(s).set_enabled(true);
-
-                let (network_address, network_address_enabled) =
-                    match Self::command_processor(s).get_network_address() {
-                        None => ("".to_owned(), false),
-                        Some(addr) => (addr.to_string(), true),
-                    };
-                let mut edit = Self::network_address(s);
-                edit.set_content(network_address);
-                edit.set_enabled(network_address_enabled);
-
-                let (ipc_path, ipc_path_enabled) = match Self::command_processor(s).get_ipc_path() {
-                    None => ("".to_owned(), false),
-                    Some(ipc_path) => (ipc_path.to_string_lossy().to_string(), true),
-                };
-                let mut edit = Self::ipc_path(s);
-                edit.set_content(ipc_path);
-                edit.set_enabled(ipc_path_enabled);
-
-                let mut dlg = Self::connection_dialog(s);
-                dlg.add_button("Connect", |s| {
-                    if Self::ipc_path_radio(s).is_selected() {
-                        Self::submit_ipc_path(s);
-                    } else {
-                        Self::submit_network_address(s);
-                    }
-                });
-            }
-            ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {}
-            ConnectionState::RetryingTCP(addr, _) => {
-                let mut text = Self::connecting_text(s);
-                text.set_content(addr.to_string());
-
-                let mut dlg = Self::connection_dialog(s);
-                dlg.add_button("Cancel", |s| {
-                    Self::command_processor(s).cancel_reconnect();
-                });
-            }
-            ConnectionState::RetryingIPC(ipc_path, _) => {
-                let mut text = Self::connecting_text(s);
-                text.set_content(ipc_path.to_string_lossy().to_string());
-
-                let mut dlg = Self::connection_dialog(s);
-                dlg.add_button("Cancel", |s| {
-                    Self::command_processor(s).cancel_reconnect();
-                });
-            }
-        }
-    }
-
-    fn refresh_main_titlebar(s: &mut Cursive) {
-        let mut main_window = UI::node_events_panel(s);
-        let inner = Self::inner_mut(s);
-        main_window.set_title(format!("Node: {}", inner.ui_state.node_id.get()));
-    }
-
-    fn refresh_statusbar(s: &mut Cursive) {
-        let mut statusbar = UI::status_bar(s);
-
-        let mut inner = Self::inner_mut(s);
-
-        let mut status = StyledString::new();
-
-        let mut enable_status_fields = false;
-
-        match inner.ui_state.connection_state.get() {
-            ConnectionState::Disconnected => {
-                status.append_styled(
-                    "Disconnected ".to_string(),
-                    ColorStyle::highlight_inactive(),
-                );
-                status.append_styled("|", ColorStyle::highlight_inactive());
-            }
-            ConnectionState::RetryingTCP(addr, _) => {
-                status.append_styled(
-                    format!("Reconnecting to {} ", addr),
-                    ColorStyle::highlight_inactive(),
-                );
-                status.append_styled("|", ColorStyle::highlight_inactive());
-            }
-            ConnectionState::RetryingIPC(path, _) => {
-                status.append_styled(
-                    format!(
-                        "Reconnecting to IPC#{} ",
-                        path.file_name()
-                            .unwrap_or_default()
-                            .to_string_lossy()
-                            .into_owned()
-                    ),
-                    ColorStyle::highlight_inactive(),
-                );
-                status.append_styled("|", ColorStyle::highlight_inactive());
-            }
-            ConnectionState::ConnectedTCP(addr, _) => {
-                status.append_styled(
-                    format!("Connected to {} ", addr),
-                    ColorStyle::highlight_inactive(),
-                );
-                enable_status_fields = true;
-            }
-            ConnectionState::ConnectedIPC(path, _) => {
-                status.append_styled(
-                    format!(
-                        "Connected to IPC#{} ",
-                        path.file_name()
-                            .unwrap_or_default()
-                            .to_string_lossy()
-                            .into_owned()
-                    ),
-                    ColorStyle::highlight_inactive(),
-                );
-                enable_status_fields = true;
-            }
-        }
-        if enable_status_fields {
-            status.append_styled("|", ColorStyle::highlight_inactive());
-            // Add attachment state
-            status.append_styled(
-                format!(" {} ", UI::render_attachment_state(&mut inner)),
-                ColorStyle::highlight_inactive(),
-            );
-            status.append_styled("|", ColorStyle::highlight_inactive());
-            // Add bandwidth status
-            status.append_styled(
-                format!(" {} ", UI::render_network_status(&mut inner)),
-                ColorStyle::highlight_inactive(),
-            );
-            status.append_styled("|", ColorStyle::highlight_inactive());
-            // Add tunnel status
-            status.append_styled(" No Tunnels ", ColorStyle::highlight_inactive());
-            status.append_styled("|", ColorStyle::highlight_inactive());
-        };
-
-        statusbar.set_content(status);
-    }
-
-    fn refresh_peers(s: &mut Cursive) {
-        let mut peers = UI::peers(s);
-        let inner = Self::inner_mut(s);
-        let sel_item = peers.item();
-        let sel_item_text = peers
-            .item()
-            .map(|x| peers.borrow_items()[x]["node_ids"][0].clone());
-
-        peers.set_items_stable(inner.ui_state.peers_state.get().clone());
-
-        let mut selected = false;
-        if let Some(sel_item_text) = sel_item_text {
-            // First select by name
-            for n in 0..peers.borrow_items().len() {
-                if peers.borrow_items()[n]["node_ids"][0] == sel_item_text {
-                    peers.set_selected_item(n);
-                    selected = true;
-                }
-            }
-        }
-        if !selected {
-            if let Some(sel_item) = sel_item {
-                peers.set_selected_item(sel_item);
-            }
-        }
-    }
-
-    fn update_cb(s: &mut Cursive) {
-        let mut inner = Self::inner_mut(s);
-
-        let mut refresh_statusbar = false;
-        let mut refresh_button_attach = false;
-        let mut refresh_connection_dialog = false;
-        let mut refresh_peers = false;
-        let mut refresh_main_titlebar = false;
-        if inner.ui_state.attachment_state.take_dirty() {
-            refresh_statusbar = true;
-            refresh_button_attach = true;
-            refresh_peers = true;
-        }
-        if inner.ui_state.network_started.take_dirty() {
-            refresh_statusbar = true;
-        }
-        if inner.ui_state.network_down_up.take_dirty() {
-            refresh_statusbar = true;
-        }
-        if inner.ui_state.connection_state.take_dirty() {
-            refresh_statusbar = true;
-            refresh_button_attach = true;
-            refresh_connection_dialog = true;
-            refresh_peers = true;
-        }
-        if inner.ui_state.peers_state.take_dirty() {
-            refresh_peers = true;
-        }
-        if inner.ui_state.node_id.take_dirty() {
-            refresh_main_titlebar = true;
-        }
-
-        drop(inner);
-
-        if refresh_statusbar {
-            Self::refresh_statusbar(s);
-        }
-        if refresh_button_attach {
-            Self::refresh_button_attach(s);
-        }
-        if refresh_connection_dialog {
-            Self::refresh_connection_dialog(s);
-        }
-        if refresh_peers {
-            Self::refresh_peers(s);
-        }
-        if refresh_main_titlebar {
-            Self::refresh_main_titlebar(s);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Public functions
-
-    #[allow(clippy::format_in_format_args)]
-    pub fn cli_ts(ts: u64) -> String {
-        let now = chrono::DateTime::<chrono::Utc>::from(SystemTime::now());
-        let date = chrono::DateTime::<chrono::Utc>::from(UNIX_EPOCH + Duration::from_micros(ts));
-
-        let show_year = now.year() != date.year();
-        let show_month = show_year || now.month() != date.month();
-        let show_date = show_month || now.day() != date.day();
-
-        if show_year || show_month || show_date {
-            UI::set_start_time();
-        }
-        format!(
-            "{}{}",
-            if show_year || show_month || show_date {
-                format!(
-                    "Day changed: {:04}/{:02}/{:02} \n",
-                    now.year(),
-                    now.month(),
-                    now.day()
-                )
-            } else {
-                "".to_owned()
-            },
-            format!("{:02}:{:02}:{:02}", now.hour(), now.minute(), now.second())
-        )
-    }
-
-    pub fn set_start_time() {
-        START_TIME.store(get_timestamp(), Ordering::Relaxed)
-    }
-
-    pub fn get_start_time() -> u64 {
-        START_TIME.load(Ordering::Relaxed)
-    }
-
-    fn make_node_events_panel(
-        node_log_scrollback: usize,
-    ) -> ResizedView<NamedView<NodeEventsPanel>> {
-        Panel::new(
-            CachedTextView::new([], node_log_scrollback, Some(node_log_scrollback))
-                .with_name("node-events-view")
-                .scrollable()
-                .scroll_strategy(cursive::view::ScrollStrategy::StickToBottom)
-                .on_scroll(|s, _r| {
-                    let mut sv = UI::node_events_scroll_view(s);
-                    if sv.is_at_bottom() {
-                        sv.set_scroll_strategy(cursive::view::ScrollStrategy::StickToBottom);
-                    }
-                })
-                .with_name("node-events-scroll-view"),
-        )
-        .title_position(HAlign::Left)
-        .title("Node Events")
-        .with_name("node-events-panel")
-        .full_screen()
-    }
-
-    pub fn new(node_log_scrollback: usize, settings: &Settings) -> (Self, UISender) {
-        UI::set_start_time();
-        // Instantiate the cursive runnable
-        let runnable = CursiveRunnable::new(
-            || -> Result<Box<dyn cursive::backend::Backend>, Box<DumbError>> {
-                let backend = cursive::backends::crossterm::Backend::init().unwrap();
-                let buffered_backend = cursive_buffered_backend::BufferedBackend::new(backend);
-                Ok(Box::new(buffered_backend))
-            },
-        );
-
-        // Make the callback mechanism easily reachable
-        let cb_sink = runnable.cb_sink().clone();
-
-        // Create the UI object
-        let mut this = Self {
-            siv: runnable,
-            inner: Arc::new(Mutex::new(UIInner {
-                ui_state: UIState::new(),
-                log_colors: Default::default(),
-                cmdproc: None,
-                cmd_history: {
-                    let mut vd = VecDeque::new();
-                    vd.push_back("".to_string());
-                    vd
-                },
-                cmd_history_position: 0,
-                cmd_history_max_size: settings.interface.command_line.history_size,
-                connection_dialog_state: None,
-            })),
-        };
-
-        let ui_sender = UISender {
-            inner: this.inner.clone(),
-            cb_sink,
-            colors: default_log_colors(),
-        };
-
-        let mut inner = this.inner.lock();
-
-        // Make the inner object accessible in callbacks easily
-        this.siv.set_user_data(this.inner.clone());
-
-        // Create layouts
-        let node_events_view = Self::make_node_events_panel(node_log_scrollback);
-        let mut peers_table_view = PeersTableView::new()
-            .column(PeerTableColumn::NodeId, "Node Id", |c| c.width(48))
-            .column(PeerTableColumn::Address, "Address", |c| c)
-            .column(PeerTableColumn::LatencyAvg, "Ping", |c| c.width(8))
-            .column(PeerTableColumn::TransferDownAvg, "Down", |c| c.width(8))
-            .column(PeerTableColumn::TransferUpAvg, "Up", |c| c.width(8));
-        peers_table_view.set_on_submit(UI::on_submit_peers_table_view);
-        let peers_table_view = FocusTracker::new(ResizedView::new(
-            SizeConstraint::Full,
-            SizeConstraint::AtLeast(8),
-            peers_table_view.with_name("peers"),
-        ))
-        .on_focus(UI::on_focus_peers_table_view)
-        .on_focus_lost(UI::on_focus_lost_peers_table_view);
-
-        // attempt at using Mux. Mux has bugs, like resizing problems.
-        // let mut mux = Mux::new();
-        // let node_node_events_view = mux
-        //     .add_below(node_events_view, mux.root().build().unwrap())
-        //     .unwrap();
-        // let node_peers_table_view = mux
-        //     .add_below(peers_table_view, node_node_events_view)
-        //     .unwrap();
-        // mux.set_container_split_ratio(node_peers_table_view, 0.75)
-        //     .unwrap();
-        // let mut mainlayout = LinearLayout::vertical();
-        // mainlayout.add_child(mux);
-
-        // Back to fixed layout
-        let mut mainlayout = LinearLayout::vertical();
-        mainlayout.add_child(node_events_view);
-        mainlayout.add_child(peers_table_view);
-        // ^^^ fixed layout
-
-        let mut command = StyledString::new();
-        command.append_styled("Command> ", ColorStyle::title_primary());
-        //
-        mainlayout.add_child(
-            LinearLayout::horizontal()
-                .child(TextView::new(command))
-                .child(
-                    EditView::new()
-                        .on_submit(UI::on_command_line_entered)
-                        .on_edit(UI::on_command_line_edit)
-                        .on_up_down(UI::on_command_line_history)
-                        .style(ColorStyle::new(
-                            PaletteColor::Background,
-                            PaletteColor::Secondary,
-                        ))
-                        .with_name("command-line")
-                        .full_screen()
-                        .fixed_height(1),
-                )
-                .child(
-                    Button::new("Attach", |s| {
-                        UI::on_button_attach_pressed(s);
-                    })
-                    .with_name("button-attach"),
-                ),
-        );
-        let mut version = StyledString::new();
-        version.append_styled(
-            concat!(" | veilid-cli v", env!("CARGO_PKG_VERSION")),
-            ColorStyle::highlight_inactive(),
-        );
-
-        mainlayout.add_child(
-            LinearLayout::horizontal()
-                .color(Some(ColorStyle::highlight_inactive()))
-                .child(
-                    TextView::new("")
-                        .with_name("status-bar")
-                        .full_screen()
-                        .fixed_height(1),
-                )
-                .child(TextView::new(version)),
-        );
-
-        this.siv
-            .add_fullscreen_layer(mainlayout.with_name("main-layout"));
-
-        UI::setup_colors(&mut this.siv, &mut inner, settings);
-        UI::setup_quit_handler(&mut this.siv);
-        UI::setup_clear_handler(&mut this.siv);
-
-        drop(inner);
-
-        (this, ui_sender)
-    }
-
-    pub fn set_command_processor(&mut self, cmdproc: CommandProcessor) {
-        let mut inner = self.inner.lock();
-        inner.cmdproc = Some(cmdproc);
-    }
-
-    // Note: Cursive is not re-entrant, can't borrow_mut self.siv again after this
-    pub async fn run_async(&mut self) {
-        self.siv.run_async().await;
-    }
-    // pub fn run(&mut self) {
-    //      self.siv.run();
-    // }
-}
-
-type CallbackSink = Box<dyn FnOnce(&mut Cursive) + 'static + Send>;
-
-/// Default log colors
-fn default_log_colors() -> HashMap<Level, Color> {
-    let mut colors = HashMap::<Level, Color>::new();
-    colors.insert(Level::Trace, Color::Dark(BaseColor::Green));
-    colors.insert(Level::Debug, Color::Dark(BaseColor::Cyan));
-    colors.insert(Level::Info, Color::Dark(BaseColor::Blue));
-    colors.insert(Level::Warn, Color::Dark(BaseColor::Yellow));
-    colors.insert(Level::Error, Color::Dark(BaseColor::Red));
-    colors
-}
-
-#[derive(Clone)]
-pub struct UISender {
-    inner: Arc<Mutex<UIInner>>,
-    cb_sink: Sender<CallbackSink>,
-    colors: HashMap<Level, Color>,
-}
-
-impl UISender {
-    pub fn display_string_dialog<T: ToString, S: ToString>(
-        &self,
-        title: T,
-        text: S,
-        close_cb: UICallback,
-    ) {
-        let title = title.to_string();
-        let text = text.to_string();
-        let _ = self.cb_sink.send(Box::new(move |s| {
-            UI::display_string_dialog_cb(s, title, text, close_cb)
-        }));
-    }
-
-    pub fn quit(&self) {
-        let _ = self.cb_sink.send(Box::new(|s| {
-            s.quit();
-        }));
-    }
-
-    pub fn send_callback(&self, callback: UICallback) {
-        let _ = self.cb_sink.send(Box::new(move |s| callback(s)));
-    }
-    pub fn set_attachment_state(
+pub trait UISender: Send {
+    fn clone_uisender(&self) -> Box<dyn UISender>;
+    fn as_logwriter(&self) -> Option<Box<dyn LogWriter>>;
+
+    fn display_string_dialog(&self, title: &str, text: &str, close_cb: UICallback);
+    fn quit(&self);
+    fn send_callback(&self, callback: UICallback);
+    fn set_attachment_state(
         &mut self,
-        state: String,
+        state: &str,
         public_internet_ready: bool,
         local_network_ready: bool,
-    ) {
-        {
-            let mut inner = self.inner.lock();
-            inner.ui_state.attachment_state.set(state);
-            inner
-                .ui_state
-                .public_internet_ready
-                .set(public_internet_ready);
-            inner.ui_state.local_network_ready.set(local_network_ready);
-        }
-
-        let _ = self.cb_sink.send(Box::new(UI::update_cb));
-    }
-    pub fn set_network_status(
+    );
+    fn set_network_status(
         &mut self,
         started: bool,
         bps_down: u64,
         bps_up: u64,
-        mut peers: Vec<json::JsonValue>,
-    ) {
-        {
-            let mut inner = self.inner.lock();
-            inner.ui_state.network_started.set(started);
-            inner.ui_state.network_down_up.set((
-                ((bps_down as f64) / 1000.0f64) as f32,
-                ((bps_up as f64) / 1000.0f64) as f32,
-            ));
-            peers.sort_by(|a, b| {
-                a["node_ids"][0]
-                    .to_string()
-                    .cmp(&b["node_ids"][0].to_string())
-            });
-            inner.ui_state.peers_state.set(peers);
-        }
-        let _ = self.cb_sink.send(Box::new(UI::update_cb));
-    }
-    pub fn set_config(&mut self, config: &json::JsonValue) {
-        let mut inner = self.inner.lock();
-
-        let node_ids = &config["network"]["routing_table"]["node_id"];
-
-        let mut node_id_str = String::new();
-        for l in 0..node_ids.len() {
-            let nid = &node_ids[l];
-            if !node_id_str.is_empty() {
-                node_id_str.push(' ');
-            }
-            node_id_str.push_str(nid.to_string().as_ref());
-        }
-
-        inner.ui_state.node_id.set(node_id_str);
-    }
-    pub fn set_connection_state(&mut self, state: ConnectionState) {
-        {
-            let mut inner = self.inner.lock();
-            inner.ui_state.connection_state.set(state);
-        }
-        let _ = self.cb_sink.send(Box::new(UI::update_cb));
-    }
-
-    pub fn add_node_event(&self, log_color: Level, event: String) {
-        let color = {
-            let inner = self.inner.lock();
-            *inner.log_colors.get(&log_color).unwrap()
-        };
-
-        let _ = self.push_styled_lines(
-            color.into(),
-            format!("{}: {}\n", UI::cli_ts(UI::get_start_time()), event),
-        );
-    }
-
-    pub fn push_styled(&self, styled_string: StyledString) -> std::io::Result<()> {
-        let res = self.cb_sink.send(Box::new(move |s| {
-            UI::push_styled_line(s, styled_string);
-        }));
-        if res.is_err() {
-            return Err(std::io::Error::from(std::io::ErrorKind::BrokenPipe));
-        }
-        Ok(())
-    }
-
-    pub fn push_styled_lines(&self, starting_style: Style, lines: String) -> std::io::Result<()> {
-        let res = self.cb_sink.send(Box::new(move |s| {
-            UI::push_ansi_lines(s, starting_style, lines);
-        }));
-        if res.is_err() {
-            return Err(std::io::Error::from(std::io::ErrorKind::BrokenPipe));
-        }
-        Ok(())
-    }
+        peers: Vec<json::JsonValue>,
+    );
+    fn set_config(&mut self, config: &json::JsonValue);
+    fn set_connection_state(&mut self, state: ConnectionState);
+    fn add_node_event(&self, log_color: Level, event: &str);
+    fn add_log_event(&self, log_color: Level, event: &str);
 }
-impl LogWriter for UISender {
-    fn write(&self, _now: &mut DeferredNow, record: &Record) -> std::io::Result<()> {
-        let color = *self.colors.get(&record.level()).unwrap();
 
-        let args = format!("{}", &record.args());
-
-        let mut line = StyledString::new();
-        let mut indent = 0;
-        let levstr = format!("{}: ", record.level());
-        indent += levstr.len();
-        line.append_styled(levstr, color);
-        let filestr = format!(
-            "{}:{} ",
-            record.file().unwrap_or("(unnamed)"),
-            record.line().unwrap_or(0),
-        );
-        indent += filestr.len();
-        line.append_plain(filestr);
-
-        for argline in args.lines() {
-            line.append_styled(argline, color);
-            line.append_plain("\n");
-            self.push_styled(line)?;
-            line = StyledString::new();
-            line.append_plain(" ".repeat(indent));
-        }
-        Ok(())
-    }
-
-    fn flush(&self) -> std::io::Result<()> {
-        // we are not buffering
-        Ok(())
-    }
-
-    fn max_log_level(&self) -> log::LevelFilter {
-        log::LevelFilter::max()
-    }
+pub trait UI {
+    fn set_command_processor(&mut self, cmdproc: CommandProcessor);
+    fn run_async<'a>(&'a mut self) -> Pin<Box<dyn core::future::Future<Output = ()> + 'a>>;
 }
diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml
index 639bb6f2..ea24b5c7 100644
--- a/veilid-core/Cargo.toml
+++ b/veilid-core/Cargo.toml
@@ -47,12 +47,10 @@ enable-crypto-none = []
 # Debugging and testing features
 verbose-tracing = []
 tracking = []
-debug-dht = []
 crypto-test = ["enable-crypto-vld0", "enable-crypto-none"]
 crypto-test-none = ["enable-crypto-none"]
 veilid_core_android_tests = ["dep:paranoid-android"]
 veilid_core_ios_tests = ["dep:tracing-oslog"]
-network-result-extra = ["veilid-tools/network-result-extra"]
 
 ### DEPENDENCIES
 
@@ -122,7 +120,7 @@ chacha20 = "0.9.1"
 argon2 = "0.5.2"
 
 # Network
-async-std-resolver = { version = "0.23.2", optional = true }
+async-std-resolver = { version = "0.24.0", optional = true }
 hickory-resolver = { version = "0.24.0", optional = true }
 
 # Serialization
@@ -144,13 +142,14 @@ lz4_flex = { version = "0.11.1", default-features = false, features = [
 
 # Tools
 config = { version = "0.13.4", features = ["yaml"] }
-bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
+bugsalot = { package = "veilid-bugsalot", version = "0.2.0" }
 chrono = "0.4.31"
 libc = "0.2.151"
 nix = "0.27.1"
 
 # System
 async-std = { version = "1.12.0", features = ["unstable"], optional = true }
+sysinfo = { version = "^0.30.6" }
 tokio = { version = "1.35.0", features = ["full"], optional = true }
 tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
 tokio-stream = { version = "0.1.14", features = ["net"], optional = true }
diff --git a/veilid-core/build.rs b/veilid-core/build.rs
index acf2e05f..f5459307 100644
--- a/veilid-core/build.rs
+++ b/veilid-core/build.rs
@@ -81,11 +81,7 @@ fn append_hash<P: AsRef<Path>, Q: AsRef<Path>>(input_path: P, output_path: Q) {
     let output_path = output_path.as_ref();
     let lines = std::io::BufReader::new(std::fs::File::open(input_path).unwrap()).lines();
     let h = calculate_hash(lines);
-    let mut out_file = OpenOptions::new()
-        .write(true)
-        .append(true)
-        .open(output_path)
-        .unwrap();
+    let mut out_file = OpenOptions::new().append(true).open(output_path).unwrap();
     writeln!(out_file, "\n//BUILDHASH:{}", hex::encode(h)).unwrap();
 }
 
diff --git a/veilid-core/proto/veilid.capnp b/veilid-core/proto/veilid.capnp
index 6202a29e..9ea6dea3 100644
--- a/veilid-core/proto/veilid.capnp
+++ b/veilid-core/proto/veilid.capnp
@@ -346,30 +346,46 @@ struct OperationSetValueQ @0xbac06191ff8bdbc5 {
 }
 
 struct OperationSetValueA @0x9378d0732dc95be2 {
-    set                     @0  :Bool;                  # true if the set was close enough to be set
+    set                     @0  :Bool;                  # true if the set was accepted
     value                   @1  :SignedValueData;       # optional: the current value at the key if the set seq number was lower or equal to what was there before
     peers                   @2  :List(PeerInfo);        # returned 'closer peer' information on either success or failure
 }
 
 struct OperationWatchValueQ @0xf9a5a6c547b9b228 {
     key                     @0  :TypedKey;              # key for value to watch
-    subkeys                 @1  :List(SubkeyRange);     # subkey range to watch (up to 512 subranges), if empty, watch everything
+    subkeys                 @1  :List(SubkeyRange);     # subkey range to watch (up to 512 subranges), if empty this implies 0..=UINT32_MAX
     expiration              @2  :UInt64;                # requested timestamp when this watch will expire in usec since epoch (can be return less, 0 for max)
     count                   @3  :UInt32;                # requested number of changes to watch for (0 = cancel, 1 = single shot, 2+ = counter, UINT32_MAX = continuous)
-    watcher                 @4  :PublicKey;             # optional: the watcher performing the watch, can be the owner or a schema member
-    signature               @5  :Signature;             # optional: signature of the watcher, must be one of the schema members or the key owner. signature covers: key, subkeys, expiration, count
+    watchId                 @4  :UInt64;                # if 0, request a new watch. if >0, existing watch id 
+    watcher                 @5  :PublicKey;             # the watcher performing the watch, can be the owner or a schema member, or a generated anonymous watch keypair
+    signature               @6  :Signature;             # signature of the watcher, signature covers: key, subkeys, expiration, count, watchId
 }
 
 struct OperationWatchValueA @0xa726cab7064ba893 {
-    expiration              @0  :UInt64;                # timestamp when this watch will expire in usec since epoch (0 if watch was rejected). if watch is being cancelled (with count = 0), this will be the non-zero former expiration time.
-    peers                   @1  :List(PeerInfo);        # returned list of other nodes to ask that could propagate watches
+    accepted                @0  :Bool;                  # true if the watch was close enough to be accepted
+    expiration              @1  :UInt64;                # timestamp when this watch will expire in usec since epoch (0 if watch was cancelled/dropped)
+    peers                   @2  :List(PeerInfo);        # returned list of other nodes to ask that could propagate watches
+    watchId                 @3  :UInt64;                # (0 = id not allocated if rejecting new watch) random id for watch instance on this node
+}
+
+struct OperationInspectValueQ @0xdef712d2fd16f55a {
+    key                     @0  :TypedKey;              # DHT Key = Hash(ownerKeyKind) of: [ ownerKeyValue, schema ]
+    subkeys                 @1  :List(SubkeyRange);     # subkey range to inspect (up to 512 total subkeys), if empty this implies 0..=511
+    wantDescriptor          @2  :Bool;                  # whether or not to include the descriptor for the key
+}
+
+struct OperationInspectValueA @0xb8b57faf960ee102 {
+    seqs                    @0  :List(ValueSeqNum);     # the list of subkey value sequence numbers in ascending order for each subkey in the requested range. if a subkey has not been written to, it is given a value of UINT32_MAX. these are not signed, and may be immediately out of date, and must be verified by a GetValueQ request.
+    peers                   @1  :List(PeerInfo);        # returned 'closer peer' information on either success or failure
+    descriptor              @2  :SignedValueDescriptor; # optional: the descriptor if requested if the value is also returned
 }
 
 struct OperationValueChanged @0xd1c59ebdd8cc1bf6 {
     key                     @0  :TypedKey;              # key for value that changed
-    subkeys                 @1  :List(SubkeyRange);     # subkey range that changed (up to 512 ranges at a time)
+    subkeys                 @1  :List(SubkeyRange);     # subkey range that changed (up to 512 ranges at a time, if empty this is a watch expiration notice)
     count                   @2  :UInt32;                # remaining changes left (0 means watch has expired)
-    value                   @3  :SignedValueData;       # first value that changed (the rest can be gotten with getvalue)
+    watchId                 @3  :UInt64;                # watch id this value change came from
+    value                   @4  :SignedValueData;       # first value that changed (the rest can be gotten with getvalue)
 }
 
 struct OperationSupplyBlockQ @0xadbf4c542d749971 {
@@ -483,15 +499,17 @@ struct Question @0xd8510bc33492ef70 {
         getValueQ           @5  :OperationGetValueQ;
         setValueQ           @6  :OperationSetValueQ;
         watchValueQ         @7  :OperationWatchValueQ;
+        inspectValueQ       @8  :OperationInspectValueQ;
+
         # #[cfg(feature="unstable-blockstore")]
-        # supplyBlockQ        @8  :OperationSupplyBlockQ;
-        # findBlockQ          @9  :OperationFindBlockQ;
+        # supplyBlockQ        @9  :OperationSupplyBlockQ;
+        # findBlockQ          @10  :OperationFindBlockQ;
         
         # Tunnel operations
         # #[cfg(feature="unstable-tunnels")]
-        # startTunnelQ        @10 :OperationStartTunnelQ;
-        # completeTunnelQ     @11 :OperationCompleteTunnelQ;
-        # cancelTunnelQ       @12 :OperationCancelTunnelQ; 
+        # startTunnelQ        @11 :OperationStartTunnelQ;
+        # completeTunnelQ     @12 :OperationCompleteTunnelQ;
+        # cancelTunnelQ       @13 :OperationCancelTunnelQ; 
     }
 }
 
@@ -522,16 +540,17 @@ struct Answer @0xacacb8b6988c1058 {
         getValueA           @3  :OperationGetValueA;
         setValueA           @4  :OperationSetValueA;
         watchValueA         @5  :OperationWatchValueA;
+        inspectValueA       @6  :OperationInspectValueA;
 
         # #[cfg(feature="unstable-blockstore")]
-        #supplyBlockA        @6  :OperationSupplyBlockA; 
-        #findBlockA          @7  :OperationFindBlockA;
+        #supplyBlockA        @7  :OperationSupplyBlockA; 
+        #findBlockA          @8  :OperationFindBlockA;
     
         # Tunnel operations
         # #[cfg(feature="unstable-tunnels")]
-        # startTunnelA        @8  :OperationStartTunnelA;
-        # completeTunnelA     @9  :OperationCompleteTunnelA;
-        # cancelTunnelA       @10  :OperationCancelTunnelA;
+        # startTunnelA        @9  :OperationStartTunnelA;
+        # completeTunnelA     @10  :OperationCompleteTunnelA;
+        # cancelTunnelA       @11  :OperationCancelTunnelA;
     }
 }
 
diff --git a/veilid-core/proto/veilid_capnp.rs b/veilid-core/proto/veilid_capnp.rs
index ec7837ac..64ed7421 100644
--- a/veilid-core/proto/veilid_capnp.rs
+++ b/veilid-core/proto/veilid_capnp.rs
@@ -13822,6 +13822,10 @@ pub mod operation_watch_value_q {
       self.reader.get_data_field::<u32>(2)
     }
     #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.reader.get_data_field::<u64>(2)
+    }
+    #[inline]
     pub fn get_watcher(self) -> ::capnp::Result<crate::veilid_capnp::key256::Reader<'a>> {
       ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(2), ::core::option::Option::None)
     }
@@ -13841,7 +13845,7 @@ pub mod operation_watch_value_q {
 
   pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> }
   impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,>  {
-    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 2, pointers: 4 };
+    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 3, pointers: 4 };
   }
   impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,>  {
     const TYPE_ID: u64 = _private::TYPE_ID;
@@ -13940,6 +13944,14 @@ pub mod operation_watch_value_q {
       self.builder.set_data_field::<u32>(2, value);
     }
     #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.builder.get_data_field::<u64>(2)
+    }
+    #[inline]
+    pub fn set_watch_id(&mut self, value: u64)  {
+      self.builder.set_data_field::<u64>(2, value);
+    }
+    #[inline]
     pub fn get_watcher(self) -> ::capnp::Result<crate::veilid_capnp::key256::Builder<'a>> {
       ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(2), ::core::option::Option::None)
     }
@@ -13991,17 +14003,17 @@ pub mod operation_watch_value_q {
     }
   }
   mod _private {
-    pub static ENCODED_NODE: [::capnp::Word; 115] = [
+    pub static ENCODED_NODE: [::capnp::Word; 130] = [
       ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
       ::capnp::word(40, 178, 185, 71, 197, 166, 165, 249),
-      ::capnp::word(19, 0, 0, 0, 1, 0, 2, 0),
+      ::capnp::word(19, 0, 0, 0, 1, 0, 3, 0),
       ::capnp::word(2, 171, 52, 55, 3, 232, 252, 143),
       ::capnp::word(4, 0, 7, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(21, 0, 0, 0, 66, 1, 0, 0),
       ::capnp::word(37, 0, 0, 0, 7, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(33, 0, 0, 0, 87, 1, 0, 0),
+      ::capnp::word(33, 0, 0, 0, 143, 1, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
@@ -14010,49 +14022,56 @@ pub mod operation_watch_value_q {
       ::capnp::word(116, 105, 111, 110, 87, 97, 116, 99),
       ::capnp::word(104, 86, 97, 108, 117, 101, 81, 0),
       ::capnp::word(0, 0, 0, 0, 1, 0, 1, 0),
-      ::capnp::word(24, 0, 0, 0, 3, 0, 4, 0),
+      ::capnp::word(28, 0, 0, 0, 3, 0, 4, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(153, 0, 0, 0, 34, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(148, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(160, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
-      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(157, 0, 0, 0, 66, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(152, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(180, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(177, 0, 0, 0, 90, 0, 0, 0),
+      ::capnp::word(181, 0, 0, 0, 34, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(176, 0, 0, 0, 3, 0, 1, 0),
       ::capnp::word(188, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(185, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(180, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(208, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(205, 0, 0, 0, 90, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(204, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(216, 0, 0, 0, 2, 0, 1, 0),
       ::capnp::word(3, 0, 0, 0, 2, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(185, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(213, 0, 0, 0, 50, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(180, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(192, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(208, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(220, 0, 0, 0, 2, 0, 1, 0),
       ::capnp::word(4, 0, 0, 0, 2, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 4, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(189, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(217, 0, 0, 0, 66, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(184, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(196, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(5, 0, 0, 0, 3, 0, 0, 0),
+      ::capnp::word(212, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(224, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(5, 0, 0, 0, 2, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 5, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(193, 0, 0, 0, 82, 0, 0, 0),
+      ::capnp::word(221, 0, 0, 0, 66, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(192, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(204, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(216, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(228, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(6, 0, 0, 0, 3, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 6, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(225, 0, 0, 0, 82, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(224, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(236, 0, 0, 0, 2, 0, 1, 0),
       ::capnp::word(107, 101, 121, 0, 0, 0, 0, 0),
       ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(41, 27, 230, 241, 169, 103, 213, 226),
@@ -14090,6 +14109,14 @@ pub mod operation_watch_value_q {
       ::capnp::word(8, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(119, 97, 116, 99, 104, 73, 100, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(119, 97, 116, 99, 104, 101, 114, 0),
       ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(13, 169, 246, 134, 50, 78, 228, 221),
@@ -14114,8 +14141,9 @@ pub mod operation_watch_value_q {
         1 => <::capnp::struct_list::Owned<crate::veilid_capnp::subkey_range::Owned> as ::capnp::introspect::Introspect>::introspect(),
         2 => <u64 as ::capnp::introspect::Introspect>::introspect(),
         3 => <u32 as ::capnp::introspect::Introspect>::introspect(),
-        4 => <crate::veilid_capnp::key256::Owned as ::capnp::introspect::Introspect>::introspect(),
-        5 => <crate::veilid_capnp::signature512::Owned as ::capnp::introspect::Introspect>::introspect(),
+        4 => <u64 as ::capnp::introspect::Introspect>::introspect(),
+        5 => <crate::veilid_capnp::key256::Owned as ::capnp::introspect::Introspect>::introspect(),
+        6 => <crate::veilid_capnp::signature512::Owned as ::capnp::introspect::Introspect>::introspect(),
         _ => panic!("invalid field index {}", index),
       }
     }
@@ -14127,7 +14155,7 @@ pub mod operation_watch_value_q {
       nonunion_members: NONUNION_MEMBERS,
       members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
     };
-    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3,4,5];
+    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3,4,5,6];
     pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[];
     pub const TYPE_ID: u64 = 0xf9a5_a6c5_47b9_b228;
   }
@@ -14195,8 +14223,12 @@ pub mod operation_watch_value_a {
       self.reader.total_size()
     }
     #[inline]
+    pub fn get_accepted(self) -> bool {
+      self.reader.get_bool_field(0)
+    }
+    #[inline]
     pub fn get_expiration(self) -> u64 {
-      self.reader.get_data_field::<u64>(0)
+      self.reader.get_data_field::<u64>(1)
     }
     #[inline]
     pub fn get_peers(self) -> ::capnp::Result<::capnp::struct_list::Reader<'a,crate::veilid_capnp::peer_info::Owned>> {
@@ -14206,11 +14238,15 @@ pub mod operation_watch_value_a {
     pub fn has_peers(&self) -> bool {
       !self.reader.get_pointer_field(0).is_null()
     }
+    #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.reader.get_data_field::<u64>(2)
+    }
   }
 
   pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> }
   impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,>  {
-    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 1, pointers: 1 };
+    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 3, pointers: 1 };
   }
   impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,>  {
     const TYPE_ID: u64 = _private::TYPE_ID;
@@ -14261,12 +14297,20 @@ pub mod operation_watch_value_a {
       self.builder.as_reader().total_size()
     }
     #[inline]
+    pub fn get_accepted(self) -> bool {
+      self.builder.get_bool_field(0)
+    }
+    #[inline]
+    pub fn set_accepted(&mut self, value: bool)  {
+      self.builder.set_bool_field(0, value);
+    }
+    #[inline]
     pub fn get_expiration(self) -> u64 {
-      self.builder.get_data_field::<u64>(0)
+      self.builder.get_data_field::<u64>(1)
     }
     #[inline]
     pub fn set_expiration(&mut self, value: u64)  {
-      self.builder.set_data_field::<u64>(0, value);
+      self.builder.set_data_field::<u64>(1, value);
     }
     #[inline]
     pub fn get_peers(self) -> ::capnp::Result<::capnp::struct_list::Builder<'a,crate::veilid_capnp::peer_info::Owned>> {
@@ -14284,6 +14328,14 @@ pub mod operation_watch_value_a {
     pub fn has_peers(&self) -> bool {
       !self.builder.is_pointer_field_null(0)
     }
+    #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.builder.get_data_field::<u64>(2)
+    }
+    #[inline]
+    pub fn set_watch_id(&mut self, value: u64)  {
+      self.builder.set_data_field::<u64>(2, value);
+    }
   }
 
   pub struct Pipeline { _typeless: ::capnp::any_pointer::Pipeline }
@@ -14295,17 +14347,17 @@ pub mod operation_watch_value_a {
   impl Pipeline  {
   }
   mod _private {
-    pub static ENCODED_NODE: [::capnp::Word; 54] = [
+    pub static ENCODED_NODE: [::capnp::Word; 85] = [
       ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
       ::capnp::word(147, 168, 75, 6, 183, 202, 38, 167),
-      ::capnp::word(19, 0, 0, 0, 1, 0, 1, 0),
+      ::capnp::word(19, 0, 0, 0, 1, 0, 3, 0),
       ::capnp::word(2, 171, 52, 55, 3, 232, 252, 143),
       ::capnp::word(1, 0, 7, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(21, 0, 0, 0, 66, 1, 0, 0),
       ::capnp::word(37, 0, 0, 0, 7, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(33, 0, 0, 0, 119, 0, 0, 0),
+      ::capnp::word(33, 0, 0, 0, 231, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
@@ -14314,21 +14366,44 @@ pub mod operation_watch_value_a {
       ::capnp::word(116, 105, 111, 110, 87, 97, 116, 99),
       ::capnp::word(104, 86, 97, 108, 117, 101, 65, 0),
       ::capnp::word(0, 0, 0, 0, 1, 0, 1, 0),
-      ::capnp::word(8, 0, 0, 0, 3, 0, 4, 0),
+      ::capnp::word(16, 0, 0, 0, 3, 0, 4, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(41, 0, 0, 0, 90, 0, 0, 0),
+      ::capnp::word(97, 0, 0, 0, 74, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(40, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(52, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(96, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(108, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(49, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(105, 0, 0, 0, 90, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(104, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(116, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(113, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(108, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(136, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(3, 0, 0, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(133, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(128, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(140, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(97, 99, 99, 101, 112, 116, 101, 100),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(44, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(72, 0, 0, 0, 2, 0, 1, 0),
       ::capnp::word(101, 120, 112, 105, 114, 97, 116, 105),
       ::capnp::word(111, 110, 0, 0, 0, 0, 0, 0),
       ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
@@ -14350,11 +14425,21 @@ pub mod operation_watch_value_a {
       ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(119, 97, 116, 99, 104, 73, 100, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
     ];
     pub fn get_field_types(index: u16) -> ::capnp::introspect::Type {
       match index {
-        0 => <u64 as ::capnp::introspect::Introspect>::introspect(),
-        1 => <::capnp::struct_list::Owned<crate::veilid_capnp::peer_info::Owned> as ::capnp::introspect::Introspect>::introspect(),
+        0 => <bool as ::capnp::introspect::Introspect>::introspect(),
+        1 => <u64 as ::capnp::introspect::Introspect>::introspect(),
+        2 => <::capnp::struct_list::Owned<crate::veilid_capnp::peer_info::Owned> as ::capnp::introspect::Introspect>::introspect(),
+        3 => <u64 as ::capnp::introspect::Introspect>::introspect(),
         _ => panic!("invalid field index {}", index),
       }
     }
@@ -14366,12 +14451,594 @@ pub mod operation_watch_value_a {
       nonunion_members: NONUNION_MEMBERS,
       members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
     };
-    pub static NONUNION_MEMBERS : &[u16] = &[0,1];
+    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3];
     pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[];
     pub const TYPE_ID: u64 = 0xa726_cab7_064b_a893;
   }
 }
 
+pub mod operation_inspect_value_q {
+  #[derive(Copy, Clone)]
+  pub struct Owned(());
+  impl ::capnp::introspect::Introspect for Owned { fn introspect() -> ::capnp::introspect::Type { ::capnp::introspect::TypeVariant::Struct(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types, annotation_types: _private::get_annotation_types }).into() } }
+  impl ::capnp::traits::Owned for Owned { type Reader<'a> = Reader<'a>; type Builder<'a> = Builder<'a>; }
+  impl ::capnp::traits::OwnedStruct for Owned { type Reader<'a> = Reader<'a>; type Builder<'a> = Builder<'a>; }
+  impl ::capnp::traits::Pipelined for Owned { type Pipeline = Pipeline; }
+
+  pub struct Reader<'a> { reader: ::capnp::private::layout::StructReader<'a> }
+  impl <'a,> ::core::marker::Copy for Reader<'a,>  {}
+  impl <'a,> ::core::clone::Clone for Reader<'a,>  {
+    fn clone(&self) -> Self { *self }
+  }
+
+  impl <'a,> ::capnp::traits::HasTypeId for Reader<'a,>  {
+    const TYPE_ID: u64 = _private::TYPE_ID;
+  }
+  impl <'a,> ::core::convert::From<::capnp::private::layout::StructReader<'a>> for Reader<'a,>  {
+    fn from(reader: ::capnp::private::layout::StructReader<'a>) -> Self {
+      Self { reader,  }
+    }
+  }
+
+  impl <'a,> ::core::convert::From<Reader<'a,>> for ::capnp::dynamic_value::Reader<'a>  {
+    fn from(reader: Reader<'a,>) -> Self {
+      Self::Struct(::capnp::dynamic_struct::Reader::new(reader.reader, ::capnp::schema::StructSchema::new(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types::<>, annotation_types: _private::get_annotation_types::<>})))
+    }
+  }
+
+  impl <'a,> ::core::fmt::Debug for Reader<'a,>  {
+    fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::result::Result<(), ::core::fmt::Error> {
+      core::fmt::Debug::fmt(&::core::convert::Into::<::capnp::dynamic_value::Reader<'_>>::into(*self), f)
+    }
+  }
+
+  impl <'a,> ::capnp::traits::FromPointerReader<'a> for Reader<'a,>  {
+    fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>, default: ::core::option::Option<&'a [::capnp::Word]>) -> ::capnp::Result<Self> {
+      ::core::result::Result::Ok(reader.get_struct(default)?.into())
+    }
+  }
+
+  impl <'a,> ::capnp::traits::IntoInternalStructReader<'a> for Reader<'a,>  {
+    fn into_internal_struct_reader(self) -> ::capnp::private::layout::StructReader<'a> {
+      self.reader
+    }
+  }
+
+  impl <'a,> ::capnp::traits::Imbue<'a> for Reader<'a,>  {
+    fn imbue(&mut self, cap_table: &'a ::capnp::private::layout::CapTable) {
+      self.reader.imbue(::capnp::private::layout::CapTableReader::Plain(cap_table))
+    }
+  }
+
+  impl <'a,> Reader<'a,>  {
+    pub fn reborrow(&self) -> Reader<'_,> {
+      Self { .. *self }
+    }
+
+    pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> {
+      self.reader.total_size()
+    }
+    #[inline]
+    pub fn get_key(self) -> ::capnp::Result<crate::veilid_capnp::typed_key::Reader<'a>> {
+      ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn has_key(&self) -> bool {
+      !self.reader.get_pointer_field(0).is_null()
+    }
+    #[inline]
+    pub fn get_subkeys(self) -> ::capnp::Result<::capnp::struct_list::Reader<'a,crate::veilid_capnp::subkey_range::Owned>> {
+      ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(1), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn has_subkeys(&self) -> bool {
+      !self.reader.get_pointer_field(1).is_null()
+    }
+    #[inline]
+    pub fn get_want_descriptor(self) -> bool {
+      self.reader.get_bool_field(0)
+    }
+  }
+
+  pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> }
+  impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,>  {
+    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 1, pointers: 2 };
+  }
+  impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,>  {
+    const TYPE_ID: u64 = _private::TYPE_ID;
+  }
+  impl <'a,> ::core::convert::From<::capnp::private::layout::StructBuilder<'a>> for Builder<'a,>  {
+    fn from(builder: ::capnp::private::layout::StructBuilder<'a>) -> Self {
+      Self { builder,  }
+    }
+  }
+
+  impl <'a,> ::core::convert::From<Builder<'a,>> for ::capnp::dynamic_value::Builder<'a>  {
+    fn from(builder: Builder<'a,>) -> Self {
+      Self::Struct(::capnp::dynamic_struct::Builder::new(builder.builder, ::capnp::schema::StructSchema::new(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types::<>, annotation_types: _private::get_annotation_types::<>})))
+    }
+  }
+
+  impl <'a,> ::capnp::traits::ImbueMut<'a> for Builder<'a,>  {
+    fn imbue_mut(&mut self, cap_table: &'a mut ::capnp::private::layout::CapTable) {
+      self.builder.imbue(::capnp::private::layout::CapTableBuilder::Plain(cap_table))
+    }
+  }
+
+  impl <'a,> ::capnp::traits::FromPointerBuilder<'a> for Builder<'a,>  {
+    fn init_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, _size: u32) -> Self {
+      builder.init_struct(<Self as ::capnp::traits::HasStructSize>::STRUCT_SIZE).into()
+    }
+    fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, default: ::core::option::Option<&'a [::capnp::Word]>) -> ::capnp::Result<Self> {
+      ::core::result::Result::Ok(builder.get_struct(<Self as ::capnp::traits::HasStructSize>::STRUCT_SIZE, default)?.into())
+    }
+  }
+
+  impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,>  {
+    fn set_pointer_builder(mut pointer: ::capnp::private::layout::PointerBuilder<'_>, value: Self, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
+  }
+
+  impl <'a,> Builder<'a,>  {
+    pub fn into_reader(self) -> Reader<'a,> {
+      self.builder.into_reader().into()
+    }
+    pub fn reborrow(&mut self) -> Builder<'_,> {
+      Builder { builder: self.builder.reborrow() }
+    }
+    pub fn reborrow_as_reader(&self) -> Reader<'_,> {
+      self.builder.as_reader().into()
+    }
+
+    pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> {
+      self.builder.as_reader().total_size()
+    }
+    #[inline]
+    pub fn get_key(self) -> ::capnp::Result<crate::veilid_capnp::typed_key::Builder<'a>> {
+      ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn set_key(&mut self, value: crate::veilid_capnp::typed_key::Reader<'_>) -> ::capnp::Result<()> {
+      ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(0), value, false)
+    }
+    #[inline]
+    pub fn init_key(self, ) -> crate::veilid_capnp::typed_key::Builder<'a> {
+      ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(0), 0)
+    }
+    #[inline]
+    pub fn has_key(&self) -> bool {
+      !self.builder.is_pointer_field_null(0)
+    }
+    #[inline]
+    pub fn get_subkeys(self) -> ::capnp::Result<::capnp::struct_list::Builder<'a,crate::veilid_capnp::subkey_range::Owned>> {
+      ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(1), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn set_subkeys(&mut self, value: ::capnp::struct_list::Reader<'_,crate::veilid_capnp::subkey_range::Owned>) -> ::capnp::Result<()> {
+      ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(1), value, false)
+    }
+    #[inline]
+    pub fn init_subkeys(self, size: u32) -> ::capnp::struct_list::Builder<'a,crate::veilid_capnp::subkey_range::Owned> {
+      ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(1), size)
+    }
+    #[inline]
+    pub fn has_subkeys(&self) -> bool {
+      !self.builder.is_pointer_field_null(1)
+    }
+    #[inline]
+    pub fn get_want_descriptor(self) -> bool {
+      self.builder.get_bool_field(0)
+    }
+    #[inline]
+    pub fn set_want_descriptor(&mut self, value: bool)  {
+      self.builder.set_bool_field(0, value);
+    }
+  }
+
+  pub struct Pipeline { _typeless: ::capnp::any_pointer::Pipeline }
+  impl ::capnp::capability::FromTypelessPipeline for Pipeline {
+    fn new(typeless: ::capnp::any_pointer::Pipeline) -> Self {
+      Self { _typeless: typeless,  }
+    }
+  }
+  impl Pipeline  {
+    pub fn get_key(&self) -> crate::veilid_capnp::typed_key::Pipeline {
+      ::capnp::capability::FromTypelessPipeline::new(self._typeless.get_pointer_field(0))
+    }
+  }
+  mod _private {
+    pub static ENCODED_NODE: [::capnp::Word; 70] = [
+      ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
+      ::capnp::word(90, 245, 22, 253, 210, 18, 247, 222),
+      ::capnp::word(19, 0, 0, 0, 1, 0, 1, 0),
+      ::capnp::word(2, 171, 52, 55, 3, 232, 252, 143),
+      ::capnp::word(2, 0, 7, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(21, 0, 0, 0, 82, 1, 0, 0),
+      ::capnp::word(41, 0, 0, 0, 7, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(37, 0, 0, 0, 175, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
+      ::capnp::word(105, 108, 105, 100, 46, 99, 97, 112),
+      ::capnp::word(110, 112, 58, 79, 112, 101, 114, 97),
+      ::capnp::word(116, 105, 111, 110, 73, 110, 115, 112),
+      ::capnp::word(101, 99, 116, 86, 97, 108, 117, 101),
+      ::capnp::word(81, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 1, 0, 1, 0),
+      ::capnp::word(12, 0, 0, 0, 3, 0, 4, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(69, 0, 0, 0, 34, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(64, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(76, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(73, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(68, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(96, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(93, 0, 0, 0, 122, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(92, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(104, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(107, 101, 121, 0, 0, 0, 0, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(41, 27, 230, 241, 169, 103, 213, 226),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(115, 117, 98, 107, 101, 121, 115, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(28, 23, 208, 164, 192, 218, 146, 245),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(119, 97, 110, 116, 68, 101, 115, 99),
+      ::capnp::word(114, 105, 112, 116, 111, 114, 0, 0),
+      ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+    ];
+    pub fn get_field_types(index: u16) -> ::capnp::introspect::Type {
+      match index {
+        0 => <crate::veilid_capnp::typed_key::Owned as ::capnp::introspect::Introspect>::introspect(),
+        1 => <::capnp::struct_list::Owned<crate::veilid_capnp::subkey_range::Owned> as ::capnp::introspect::Introspect>::introspect(),
+        2 => <bool as ::capnp::introspect::Introspect>::introspect(),
+        _ => panic!("invalid field index {}", index),
+      }
+    }
+    pub fn get_annotation_types(child_index: Option<u16>, index: u32) -> ::capnp::introspect::Type {
+      panic!("invalid annotation indices ({:?}, {}) ", child_index, index)
+    }
+    pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = ::capnp::introspect::RawStructSchema {
+      encoded_node: &ENCODED_NODE,
+      nonunion_members: NONUNION_MEMBERS,
+      members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
+    };
+    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2];
+    pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[];
+    pub const TYPE_ID: u64 = 0xdef7_12d2_fd16_f55a;
+  }
+}
+
+pub mod operation_inspect_value_a {
+  #[derive(Copy, Clone)]
+  pub struct Owned(());
+  impl ::capnp::introspect::Introspect for Owned { fn introspect() -> ::capnp::introspect::Type { ::capnp::introspect::TypeVariant::Struct(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types, annotation_types: _private::get_annotation_types }).into() } }
+  impl ::capnp::traits::Owned for Owned { type Reader<'a> = Reader<'a>; type Builder<'a> = Builder<'a>; }
+  impl ::capnp::traits::OwnedStruct for Owned { type Reader<'a> = Reader<'a>; type Builder<'a> = Builder<'a>; }
+  impl ::capnp::traits::Pipelined for Owned { type Pipeline = Pipeline; }
+
+  pub struct Reader<'a> { reader: ::capnp::private::layout::StructReader<'a> }
+  impl <'a,> ::core::marker::Copy for Reader<'a,>  {}
+  impl <'a,> ::core::clone::Clone for Reader<'a,>  {
+    fn clone(&self) -> Self { *self }
+  }
+
+  impl <'a,> ::capnp::traits::HasTypeId for Reader<'a,>  {
+    const TYPE_ID: u64 = _private::TYPE_ID;
+  }
+  impl <'a,> ::core::convert::From<::capnp::private::layout::StructReader<'a>> for Reader<'a,>  {
+    fn from(reader: ::capnp::private::layout::StructReader<'a>) -> Self {
+      Self { reader,  }
+    }
+  }
+
+  impl <'a,> ::core::convert::From<Reader<'a,>> for ::capnp::dynamic_value::Reader<'a>  {
+    fn from(reader: Reader<'a,>) -> Self {
+      Self::Struct(::capnp::dynamic_struct::Reader::new(reader.reader, ::capnp::schema::StructSchema::new(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types::<>, annotation_types: _private::get_annotation_types::<>})))
+    }
+  }
+
+  impl <'a,> ::core::fmt::Debug for Reader<'a,>  {
+    fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::result::Result<(), ::core::fmt::Error> {
+      core::fmt::Debug::fmt(&::core::convert::Into::<::capnp::dynamic_value::Reader<'_>>::into(*self), f)
+    }
+  }
+
+  impl <'a,> ::capnp::traits::FromPointerReader<'a> for Reader<'a,>  {
+    fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>, default: ::core::option::Option<&'a [::capnp::Word]>) -> ::capnp::Result<Self> {
+      ::core::result::Result::Ok(reader.get_struct(default)?.into())
+    }
+  }
+
+  impl <'a,> ::capnp::traits::IntoInternalStructReader<'a> for Reader<'a,>  {
+    fn into_internal_struct_reader(self) -> ::capnp::private::layout::StructReader<'a> {
+      self.reader
+    }
+  }
+
+  impl <'a,> ::capnp::traits::Imbue<'a> for Reader<'a,>  {
+    fn imbue(&mut self, cap_table: &'a ::capnp::private::layout::CapTable) {
+      self.reader.imbue(::capnp::private::layout::CapTableReader::Plain(cap_table))
+    }
+  }
+
+  impl <'a,> Reader<'a,>  {
+    pub fn reborrow(&self) -> Reader<'_,> {
+      Self { .. *self }
+    }
+
+    pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> {
+      self.reader.total_size()
+    }
+    #[inline]
+    pub fn get_seqs(self) -> ::capnp::Result<::capnp::primitive_list::Reader<'a,u32>> {
+      ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn has_seqs(&self) -> bool {
+      !self.reader.get_pointer_field(0).is_null()
+    }
+    #[inline]
+    pub fn get_peers(self) -> ::capnp::Result<::capnp::struct_list::Reader<'a,crate::veilid_capnp::peer_info::Owned>> {
+      ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(1), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn has_peers(&self) -> bool {
+      !self.reader.get_pointer_field(1).is_null()
+    }
+    #[inline]
+    pub fn get_descriptor(self) -> ::capnp::Result<crate::veilid_capnp::signed_value_descriptor::Reader<'a>> {
+      ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(2), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn has_descriptor(&self) -> bool {
+      !self.reader.get_pointer_field(2).is_null()
+    }
+  }
+
+  pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> }
+  impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,>  {
+    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 0, pointers: 3 };
+  }
+  impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,>  {
+    const TYPE_ID: u64 = _private::TYPE_ID;
+  }
+  impl <'a,> ::core::convert::From<::capnp::private::layout::StructBuilder<'a>> for Builder<'a,>  {
+    fn from(builder: ::capnp::private::layout::StructBuilder<'a>) -> Self {
+      Self { builder,  }
+    }
+  }
+
+  impl <'a,> ::core::convert::From<Builder<'a,>> for ::capnp::dynamic_value::Builder<'a>  {
+    fn from(builder: Builder<'a,>) -> Self {
+      Self::Struct(::capnp::dynamic_struct::Builder::new(builder.builder, ::capnp::schema::StructSchema::new(::capnp::introspect::RawBrandedStructSchema { generic: &_private::RAW_SCHEMA, field_types: _private::get_field_types::<>, annotation_types: _private::get_annotation_types::<>})))
+    }
+  }
+
+  impl <'a,> ::capnp::traits::ImbueMut<'a> for Builder<'a,>  {
+    fn imbue_mut(&mut self, cap_table: &'a mut ::capnp::private::layout::CapTable) {
+      self.builder.imbue(::capnp::private::layout::CapTableBuilder::Plain(cap_table))
+    }
+  }
+
+  impl <'a,> ::capnp::traits::FromPointerBuilder<'a> for Builder<'a,>  {
+    fn init_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, _size: u32) -> Self {
+      builder.init_struct(<Self as ::capnp::traits::HasStructSize>::STRUCT_SIZE).into()
+    }
+    fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, default: ::core::option::Option<&'a [::capnp::Word]>) -> ::capnp::Result<Self> {
+      ::core::result::Result::Ok(builder.get_struct(<Self as ::capnp::traits::HasStructSize>::STRUCT_SIZE, default)?.into())
+    }
+  }
+
+  impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,>  {
+    fn set_pointer_builder(mut pointer: ::capnp::private::layout::PointerBuilder<'_>, value: Self, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
+  }
+
+  impl <'a,> Builder<'a,>  {
+    pub fn into_reader(self) -> Reader<'a,> {
+      self.builder.into_reader().into()
+    }
+    pub fn reborrow(&mut self) -> Builder<'_,> {
+      Builder { builder: self.builder.reborrow() }
+    }
+    pub fn reborrow_as_reader(&self) -> Reader<'_,> {
+      self.builder.as_reader().into()
+    }
+
+    pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> {
+      self.builder.as_reader().total_size()
+    }
+    #[inline]
+    pub fn get_seqs(self) -> ::capnp::Result<::capnp::primitive_list::Builder<'a,u32>> {
+      ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn set_seqs(&mut self, value: ::capnp::primitive_list::Reader<'_,u32>) -> ::capnp::Result<()> {
+      ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(0), value, false)
+    }
+    #[inline]
+    pub fn init_seqs(self, size: u32) -> ::capnp::primitive_list::Builder<'a,u32> {
+      ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(0), size)
+    }
+    #[inline]
+    pub fn has_seqs(&self) -> bool {
+      !self.builder.is_pointer_field_null(0)
+    }
+    #[inline]
+    pub fn get_peers(self) -> ::capnp::Result<::capnp::struct_list::Builder<'a,crate::veilid_capnp::peer_info::Owned>> {
+      ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(1), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn set_peers(&mut self, value: ::capnp::struct_list::Reader<'_,crate::veilid_capnp::peer_info::Owned>) -> ::capnp::Result<()> {
+      ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(1), value, false)
+    }
+    #[inline]
+    pub fn init_peers(self, size: u32) -> ::capnp::struct_list::Builder<'a,crate::veilid_capnp::peer_info::Owned> {
+      ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(1), size)
+    }
+    #[inline]
+    pub fn has_peers(&self) -> bool {
+      !self.builder.is_pointer_field_null(1)
+    }
+    #[inline]
+    pub fn get_descriptor(self) -> ::capnp::Result<crate::veilid_capnp::signed_value_descriptor::Builder<'a>> {
+      ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(2), ::core::option::Option::None)
+    }
+    #[inline]
+    pub fn set_descriptor(&mut self, value: crate::veilid_capnp::signed_value_descriptor::Reader<'_>) -> ::capnp::Result<()> {
+      ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(2), value, false)
+    }
+    #[inline]
+    pub fn init_descriptor(self, ) -> crate::veilid_capnp::signed_value_descriptor::Builder<'a> {
+      ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(2), 0)
+    }
+    #[inline]
+    pub fn has_descriptor(&self) -> bool {
+      !self.builder.is_pointer_field_null(2)
+    }
+  }
+
+  pub struct Pipeline { _typeless: ::capnp::any_pointer::Pipeline }
+  impl ::capnp::capability::FromTypelessPipeline for Pipeline {
+    fn new(typeless: ::capnp::any_pointer::Pipeline) -> Self {
+      Self { _typeless: typeless,  }
+    }
+  }
+  impl Pipeline  {
+    pub fn get_descriptor(&self) -> crate::veilid_capnp::signed_value_descriptor::Pipeline {
+      ::capnp::capability::FromTypelessPipeline::new(self._typeless.get_pointer_field(2))
+    }
+  }
+  mod _private {
+    pub static ENCODED_NODE: [::capnp::Word; 74] = [
+      ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
+      ::capnp::word(2, 225, 14, 150, 175, 127, 181, 184),
+      ::capnp::word(19, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(2, 171, 52, 55, 3, 232, 252, 143),
+      ::capnp::word(3, 0, 7, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(21, 0, 0, 0, 82, 1, 0, 0),
+      ::capnp::word(41, 0, 0, 0, 7, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(37, 0, 0, 0, 175, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
+      ::capnp::word(105, 108, 105, 100, 46, 99, 97, 112),
+      ::capnp::word(110, 112, 58, 79, 112, 101, 114, 97),
+      ::capnp::word(116, 105, 111, 110, 73, 110, 115, 112),
+      ::capnp::word(101, 99, 116, 86, 97, 108, 117, 101),
+      ::capnp::word(65, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 1, 0, 1, 0),
+      ::capnp::word(12, 0, 0, 0, 3, 0, 4, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(69, 0, 0, 0, 42, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(64, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(92, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(89, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(84, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(112, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(2, 0, 0, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(109, 0, 0, 0, 90, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(108, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(120, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(115, 101, 113, 115, 0, 0, 0, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(8, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(112, 101, 101, 114, 115, 0, 0, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(203, 75, 60, 93, 45, 114, 45, 254),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(14, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(100, 101, 115, 99, 114, 105, 112, 116),
+      ::capnp::word(111, 114, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(231, 176, 225, 249, 211, 28, 145, 231),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+    ];
+    pub fn get_field_types(index: u16) -> ::capnp::introspect::Type {
+      match index {
+        0 => <::capnp::primitive_list::Owned<u32> as ::capnp::introspect::Introspect>::introspect(),
+        1 => <::capnp::struct_list::Owned<crate::veilid_capnp::peer_info::Owned> as ::capnp::introspect::Introspect>::introspect(),
+        2 => <crate::veilid_capnp::signed_value_descriptor::Owned as ::capnp::introspect::Introspect>::introspect(),
+        _ => panic!("invalid field index {}", index),
+      }
+    }
+    pub fn get_annotation_types(child_index: Option<u16>, index: u32) -> ::capnp::introspect::Type {
+      panic!("invalid annotation indices ({:?}, {}) ", child_index, index)
+    }
+    pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = ::capnp::introspect::RawStructSchema {
+      encoded_node: &ENCODED_NODE,
+      nonunion_members: NONUNION_MEMBERS,
+      members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
+    };
+    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2];
+    pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[];
+    pub const TYPE_ID: u64 = 0xb8b5_7faf_960e_e102;
+  }
+}
+
 pub mod operation_value_changed {
   #[derive(Copy, Clone)]
   pub struct Owned(());
@@ -14454,6 +15121,10 @@ pub mod operation_value_changed {
       self.reader.get_data_field::<u32>(0)
     }
     #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.reader.get_data_field::<u64>(1)
+    }
+    #[inline]
     pub fn get_value(self) -> ::capnp::Result<crate::veilid_capnp::signed_value_data::Reader<'a>> {
       ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(2), ::core::option::Option::None)
     }
@@ -14465,7 +15136,7 @@ pub mod operation_value_changed {
 
   pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> }
   impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,>  {
-    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 1, pointers: 3 };
+    const STRUCT_SIZE: ::capnp::private::layout::StructSize = ::capnp::private::layout::StructSize { data: 2, pointers: 3 };
   }
   impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,>  {
     const TYPE_ID: u64 = _private::TYPE_ID;
@@ -14556,6 +15227,14 @@ pub mod operation_value_changed {
       self.builder.set_data_field::<u32>(0, value);
     }
     #[inline]
+    pub fn get_watch_id(self) -> u64 {
+      self.builder.get_data_field::<u64>(1)
+    }
+    #[inline]
+    pub fn set_watch_id(&mut self, value: u64)  {
+      self.builder.set_data_field::<u64>(1, value);
+    }
+    #[inline]
     pub fn get_value(self) -> ::capnp::Result<crate::veilid_capnp::signed_value_data::Builder<'a>> {
       ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(2), ::core::option::Option::None)
     }
@@ -14588,17 +15267,17 @@ pub mod operation_value_changed {
     }
   }
   mod _private {
-    pub static ENCODED_NODE: [::capnp::Word; 84] = [
+    pub static ENCODED_NODE: [::capnp::Word; 99] = [
       ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
       ::capnp::word(246, 27, 204, 216, 189, 158, 197, 209),
-      ::capnp::word(19, 0, 0, 0, 1, 0, 1, 0),
+      ::capnp::word(19, 0, 0, 0, 1, 0, 2, 0),
       ::capnp::word(2, 171, 52, 55, 3, 232, 252, 143),
       ::capnp::word(3, 0, 7, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(21, 0, 0, 0, 74, 1, 0, 0),
       ::capnp::word(41, 0, 0, 0, 7, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(37, 0, 0, 0, 231, 0, 0, 0),
+      ::capnp::word(37, 0, 0, 0, 31, 1, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
@@ -14608,35 +15287,42 @@ pub mod operation_value_changed {
       ::capnp::word(101, 67, 104, 97, 110, 103, 101, 100),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 1, 0, 1, 0),
-      ::capnp::word(16, 0, 0, 0, 3, 0, 4, 0),
+      ::capnp::word(20, 0, 0, 0, 3, 0, 4, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(97, 0, 0, 0, 34, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(92, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(104, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
-      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(101, 0, 0, 0, 66, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(96, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(124, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(121, 0, 0, 0, 50, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(116, 0, 0, 0, 3, 0, 1, 0),
-      ::capnp::word(128, 0, 0, 0, 2, 0, 1, 0),
-      ::capnp::word(3, 0, 0, 0, 2, 0, 0, 0),
-      ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
-      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-      ::capnp::word(125, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(125, 0, 0, 0, 34, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(120, 0, 0, 0, 3, 0, 1, 0),
       ::capnp::word(132, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(1, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(129, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(124, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(152, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(2, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(149, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(144, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(156, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(3, 0, 0, 0, 1, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(153, 0, 0, 0, 66, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(148, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(160, 0, 0, 0, 2, 0, 1, 0),
+      ::capnp::word(4, 0, 0, 0, 2, 0, 0, 0),
+      ::capnp::word(0, 0, 1, 0, 4, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(157, 0, 0, 0, 50, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(152, 0, 0, 0, 3, 0, 1, 0),
+      ::capnp::word(164, 0, 0, 0, 2, 0, 1, 0),
       ::capnp::word(107, 101, 121, 0, 0, 0, 0, 0),
       ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(41, 27, 230, 241, 169, 103, 213, 226),
@@ -14665,6 +15351,14 @@ pub mod operation_value_changed {
       ::capnp::word(8, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(119, 97, 116, 99, 104, 73, 100, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(9, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+      ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(118, 97, 108, 117, 101, 0, 0, 0),
       ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
       ::capnp::word(61, 42, 159, 22, 111, 65, 183, 180),
@@ -14679,7 +15373,8 @@ pub mod operation_value_changed {
         0 => <crate::veilid_capnp::typed_key::Owned as ::capnp::introspect::Introspect>::introspect(),
         1 => <::capnp::struct_list::Owned<crate::veilid_capnp::subkey_range::Owned> as ::capnp::introspect::Introspect>::introspect(),
         2 => <u32 as ::capnp::introspect::Introspect>::introspect(),
-        3 => <crate::veilid_capnp::signed_value_data::Owned as ::capnp::introspect::Introspect>::introspect(),
+        3 => <u64 as ::capnp::introspect::Introspect>::introspect(),
+        4 => <crate::veilid_capnp::signed_value_data::Owned as ::capnp::introspect::Introspect>::introspect(),
         _ => panic!("invalid field index {}", index),
       }
     }
@@ -14691,7 +15386,7 @@ pub mod operation_value_changed {
       nonunion_members: NONUNION_MEMBERS,
       members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
     };
-    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3];
+    pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3,4];
     pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[];
     pub const TYPE_ID: u64 = 0xd1c5_9ebd_d8cc_1bf6;
   }
@@ -18882,7 +19577,7 @@ pub mod question {
   }
 
   pub mod detail {
-    pub use self::Which::{StatusQ,FindNodeQ,AppCallQ,GetValueQ,SetValueQ,WatchValueQ};
+    pub use self::Which::{StatusQ,FindNodeQ,AppCallQ,GetValueQ,SetValueQ,WatchValueQ,InspectValueQ};
 
     #[derive(Copy, Clone)]
     pub struct Owned(());
@@ -18975,6 +19670,11 @@ pub mod question {
         !self.reader.get_pointer_field(1).is_null()
       }
       #[inline]
+      pub fn has_inspect_value_q(&self) -> bool {
+        if self.reader.get_data_field::<u16>(1) != 6 { return false; }
+        !self.reader.get_pointer_field(1).is_null()
+      }
+      #[inline]
       pub fn which(self) -> ::core::result::Result<WhichReader<'a,>, ::capnp::NotInSchema> {
         match self.reader.get_data_field::<u16>(1) {
           0 => {
@@ -19007,6 +19707,11 @@ pub mod question {
               ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(1), ::core::option::Option::None)
             ))
           }
+          6 => {
+            ::core::result::Result::Ok(InspectValueQ(
+              ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(1), ::core::option::Option::None)
+            ))
+          }
           x => ::core::result::Result::Err(::capnp::NotInSchema(x))
         }
       }
@@ -19155,6 +19860,21 @@ pub mod question {
         !self.builder.is_pointer_field_null(1)
       }
       #[inline]
+      pub fn set_inspect_value_q(&mut self, value: crate::veilid_capnp::operation_inspect_value_q::Reader<'_>) -> ::capnp::Result<()> {
+        self.builder.set_data_field::<u16>(1, 6);
+        ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(1), value, false)
+      }
+      #[inline]
+      pub fn init_inspect_value_q(self, ) -> crate::veilid_capnp::operation_inspect_value_q::Builder<'a> {
+        self.builder.set_data_field::<u16>(1, 6);
+        ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(1), 0)
+      }
+      #[inline]
+      pub fn has_inspect_value_q(&self) -> bool {
+        if self.builder.get_data_field::<u16>(1) != 6 { return false; }
+        !self.builder.is_pointer_field_null(1)
+      }
+      #[inline]
       pub fn which(self) -> ::core::result::Result<WhichBuilder<'a,>, ::capnp::NotInSchema> {
         match self.builder.get_data_field::<u16>(1) {
           0 => {
@@ -19187,6 +19907,11 @@ pub mod question {
               ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(1), ::core::option::Option::None)
             ))
           }
+          6 => {
+            ::core::result::Result::Ok(InspectValueQ(
+              ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(1), ::core::option::Option::None)
+            ))
+          }
           x => ::core::result::Result::Err(::capnp::NotInSchema(x))
         }
       }
@@ -19201,17 +19926,17 @@ pub mod question {
     impl Pipeline  {
     }
     mod _private {
-      pub static ENCODED_NODE: [::capnp::Word; 113] = [
+      pub static ENCODED_NODE: [::capnp::Word; 129] = [
         ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
         ::capnp::word(178, 131, 145, 42, 21, 110, 131, 223),
         ::capnp::word(28, 0, 0, 0, 1, 0, 1, 0),
         ::capnp::word(112, 239, 146, 52, 195, 11, 81, 216),
-        ::capnp::word(2, 0, 7, 0, 1, 0, 6, 0),
+        ::capnp::word(2, 0, 7, 0, 1, 0, 7, 0),
         ::capnp::word(1, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(21, 0, 0, 0, 26, 1, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(29, 0, 0, 0, 87, 1, 0, 0),
+        ::capnp::word(29, 0, 0, 0, 143, 1, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
@@ -19219,49 +19944,56 @@ pub mod question {
         ::capnp::word(110, 112, 58, 81, 117, 101, 115, 116),
         ::capnp::word(105, 111, 110, 46, 100, 101, 116, 97),
         ::capnp::word(105, 108, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(24, 0, 0, 0, 3, 0, 4, 0),
+        ::capnp::word(28, 0, 0, 0, 3, 0, 4, 0),
         ::capnp::word(0, 0, 255, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(153, 0, 0, 0, 66, 0, 0, 0),
+        ::capnp::word(181, 0, 0, 0, 66, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(148, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(160, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(176, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(188, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(1, 0, 254, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(157, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(185, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(156, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(168, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(184, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(196, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(2, 0, 253, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 4, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(165, 0, 0, 0, 74, 0, 0, 0),
+        ::capnp::word(193, 0, 0, 0, 74, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(164, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(176, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(192, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(204, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(3, 0, 252, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 5, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(173, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(201, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(172, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(184, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(200, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(212, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(4, 0, 251, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 6, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(181, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(209, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(180, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(192, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(208, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(220, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(5, 0, 250, 255, 1, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 7, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(189, 0, 0, 0, 98, 0, 0, 0),
+        ::capnp::word(217, 0, 0, 0, 98, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(188, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(200, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(216, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(228, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(6, 0, 249, 255, 1, 0, 0, 0),
+        ::capnp::word(0, 0, 1, 0, 8, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(225, 0, 0, 0, 114, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(224, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(236, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(115, 116, 97, 116, 117, 115, 81, 0),
         ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(74, 136, 13, 167, 206, 128, 93, 134),
@@ -19315,6 +20047,15 @@ pub mod question {
         ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(105, 110, 115, 112, 101, 99, 116, 86),
+        ::capnp::word(97, 108, 117, 101, 81, 0, 0, 0),
+        ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(90, 245, 22, 253, 210, 18, 247, 222),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ];
       pub fn get_field_types(index: u16) -> ::capnp::introspect::Type {
         match index {
@@ -19324,6 +20065,7 @@ pub mod question {
           3 => <crate::veilid_capnp::operation_get_value_q::Owned as ::capnp::introspect::Introspect>::introspect(),
           4 => <crate::veilid_capnp::operation_set_value_q::Owned as ::capnp::introspect::Introspect>::introspect(),
           5 => <crate::veilid_capnp::operation_watch_value_q::Owned as ::capnp::introspect::Introspect>::introspect(),
+          6 => <crate::veilid_capnp::operation_inspect_value_q::Owned as ::capnp::introspect::Introspect>::introspect(),
           _ => panic!("invalid field index {}", index),
         }
       }
@@ -19336,19 +20078,20 @@ pub mod question {
         members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
       };
       pub static NONUNION_MEMBERS : &[u16] = &[];
-      pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[0,1,2,3,4,5];
+      pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[0,1,2,3,4,5,6];
       pub const TYPE_ID: u64 = 0xdf83_6e15_2a91_83b2;
     }
-    pub enum Which<A0,A1,A2,A3,A4,A5> {
+    pub enum Which<A0,A1,A2,A3,A4,A5,A6> {
       StatusQ(A0),
       FindNodeQ(A1),
       AppCallQ(A2),
       GetValueQ(A3),
       SetValueQ(A4),
       WatchValueQ(A5),
+      InspectValueQ(A6),
     }
-    pub type WhichReader<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_q::Reader<'a>>>;
-    pub type WhichBuilder<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_q::Builder<'a>>>;
+    pub type WhichReader<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_q::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_inspect_value_q::Reader<'a>>>;
+    pub type WhichBuilder<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_q::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_inspect_value_q::Builder<'a>>>;
   }
 }
 
@@ -20204,7 +20947,7 @@ pub mod answer {
   }
 
   pub mod detail {
-    pub use self::Which::{StatusA,FindNodeA,AppCallA,GetValueA,SetValueA,WatchValueA};
+    pub use self::Which::{StatusA,FindNodeA,AppCallA,GetValueA,SetValueA,WatchValueA,InspectValueA};
 
     #[derive(Copy, Clone)]
     pub struct Owned(());
@@ -20297,6 +21040,11 @@ pub mod answer {
         !self.reader.get_pointer_field(0).is_null()
       }
       #[inline]
+      pub fn has_inspect_value_a(&self) -> bool {
+        if self.reader.get_data_field::<u16>(0) != 6 { return false; }
+        !self.reader.get_pointer_field(0).is_null()
+      }
+      #[inline]
       pub fn which(self) -> ::core::result::Result<WhichReader<'a,>, ::capnp::NotInSchema> {
         match self.reader.get_data_field::<u16>(0) {
           0 => {
@@ -20329,6 +21077,11 @@ pub mod answer {
               ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None)
             ))
           }
+          6 => {
+            ::core::result::Result::Ok(InspectValueA(
+              ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None)
+            ))
+          }
           x => ::core::result::Result::Err(::capnp::NotInSchema(x))
         }
       }
@@ -20477,6 +21230,21 @@ pub mod answer {
         !self.builder.is_pointer_field_null(0)
       }
       #[inline]
+      pub fn set_inspect_value_a(&mut self, value: crate::veilid_capnp::operation_inspect_value_a::Reader<'_>) -> ::capnp::Result<()> {
+        self.builder.set_data_field::<u16>(0, 6);
+        ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.reborrow().get_pointer_field(0), value, false)
+      }
+      #[inline]
+      pub fn init_inspect_value_a(self, ) -> crate::veilid_capnp::operation_inspect_value_a::Builder<'a> {
+        self.builder.set_data_field::<u16>(0, 6);
+        ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(0), 0)
+      }
+      #[inline]
+      pub fn has_inspect_value_a(&self) -> bool {
+        if self.builder.get_data_field::<u16>(0) != 6 { return false; }
+        !self.builder.is_pointer_field_null(0)
+      }
+      #[inline]
       pub fn which(self) -> ::core::result::Result<WhichBuilder<'a,>, ::capnp::NotInSchema> {
         match self.builder.get_data_field::<u16>(0) {
           0 => {
@@ -20509,6 +21277,11 @@ pub mod answer {
               ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None)
             ))
           }
+          6 => {
+            ::core::result::Result::Ok(InspectValueA(
+              ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None)
+            ))
+          }
           x => ::core::result::Result::Err(::capnp::NotInSchema(x))
         }
       }
@@ -20523,17 +21296,17 @@ pub mod answer {
     impl Pipeline  {
     }
     mod _private {
-      pub static ENCODED_NODE: [::capnp::Word; 113] = [
+      pub static ENCODED_NODE: [::capnp::Word; 129] = [
         ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
         ::capnp::word(181, 242, 159, 40, 61, 141, 102, 244),
         ::capnp::word(26, 0, 0, 0, 1, 0, 1, 0),
         ::capnp::word(88, 16, 140, 152, 182, 184, 172, 172),
-        ::capnp::word(1, 0, 7, 0, 1, 0, 6, 0),
+        ::capnp::word(1, 0, 7, 0, 1, 0, 7, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(21, 0, 0, 0, 10, 1, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(29, 0, 0, 0, 87, 1, 0, 0),
+        ::capnp::word(29, 0, 0, 0, 143, 1, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(112, 114, 111, 116, 111, 47, 118, 101),
@@ -20541,49 +21314,56 @@ pub mod answer {
         ::capnp::word(110, 112, 58, 65, 110, 115, 119, 101),
         ::capnp::word(114, 46, 100, 101, 116, 97, 105, 108),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(24, 0, 0, 0, 3, 0, 4, 0),
+        ::capnp::word(28, 0, 0, 0, 3, 0, 4, 0),
         ::capnp::word(0, 0, 255, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(153, 0, 0, 0, 66, 0, 0, 0),
+        ::capnp::word(181, 0, 0, 0, 66, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(148, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(160, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(176, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(188, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(1, 0, 254, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 1, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(157, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(185, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(156, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(168, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(184, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(196, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(2, 0, 253, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 2, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(165, 0, 0, 0, 74, 0, 0, 0),
+        ::capnp::word(193, 0, 0, 0, 74, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(164, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(176, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(192, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(204, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(3, 0, 252, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 3, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(173, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(201, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(172, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(184, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(200, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(212, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(4, 0, 251, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 4, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(181, 0, 0, 0, 82, 0, 0, 0),
+        ::capnp::word(209, 0, 0, 0, 82, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(180, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(192, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(208, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(220, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(5, 0, 250, 255, 0, 0, 0, 0),
         ::capnp::word(0, 0, 1, 0, 5, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(189, 0, 0, 0, 98, 0, 0, 0),
+        ::capnp::word(217, 0, 0, 0, 98, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-        ::capnp::word(188, 0, 0, 0, 3, 0, 1, 0),
-        ::capnp::word(200, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(216, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(228, 0, 0, 0, 2, 0, 1, 0),
+        ::capnp::word(6, 0, 249, 255, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 1, 0, 6, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(225, 0, 0, 0, 114, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(224, 0, 0, 0, 3, 0, 1, 0),
+        ::capnp::word(236, 0, 0, 0, 2, 0, 1, 0),
         ::capnp::word(115, 116, 97, 116, 117, 115, 65, 0),
         ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(85, 42, 129, 250, 7, 244, 6, 179),
@@ -20637,6 +21417,15 @@ pub mod answer {
         ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
         ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(105, 110, 115, 112, 101, 99, 116, 86),
+        ::capnp::word(97, 108, 117, 101, 65, 0, 0, 0),
+        ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(2, 225, 14, 150, 175, 127, 181, 184),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(16, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
+        ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
       ];
       pub fn get_field_types(index: u16) -> ::capnp::introspect::Type {
         match index {
@@ -20646,6 +21435,7 @@ pub mod answer {
           3 => <crate::veilid_capnp::operation_get_value_a::Owned as ::capnp::introspect::Introspect>::introspect(),
           4 => <crate::veilid_capnp::operation_set_value_a::Owned as ::capnp::introspect::Introspect>::introspect(),
           5 => <crate::veilid_capnp::operation_watch_value_a::Owned as ::capnp::introspect::Introspect>::introspect(),
+          6 => <crate::veilid_capnp::operation_inspect_value_a::Owned as ::capnp::introspect::Introspect>::introspect(),
           _ => panic!("invalid field index {}", index),
         }
       }
@@ -20658,19 +21448,20 @@ pub mod answer {
         members_by_discriminant: MEMBERS_BY_DISCRIMINANT,
       };
       pub static NONUNION_MEMBERS : &[u16] = &[];
-      pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[0,1,2,3,4,5];
+      pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[0,1,2,3,4,5,6];
       pub const TYPE_ID: u64 = 0xf466_8d3d_289f_f2b5;
     }
-    pub enum Which<A0,A1,A2,A3,A4,A5> {
+    pub enum Which<A0,A1,A2,A3,A4,A5,A6> {
       StatusA(A0),
       FindNodeA(A1),
       AppCallA(A2),
       GetValueA(A3),
       SetValueA(A4),
       WatchValueA(A5),
+      InspectValueA(A6),
     }
-    pub type WhichReader<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_a::Reader<'a>>>;
-    pub type WhichBuilder<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_a::Builder<'a>>>;
+    pub type WhichReader<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_a::Reader<'a>>,::capnp::Result<crate::veilid_capnp::operation_inspect_value_a::Reader<'a>>>;
+    pub type WhichBuilder<'a,> = Which<::capnp::Result<crate::veilid_capnp::operation_status_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_find_node_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_app_call_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_get_value_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_set_value_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_watch_value_a::Builder<'a>>,::capnp::Result<crate::veilid_capnp::operation_inspect_value_a::Builder<'a>>>;
   }
 }
 
@@ -21293,4 +22084,4 @@ pub mod operation {
   }
 }
 
-//BUILDHASH:ab4fd70d40c9e543f799ce326dd41c61c7ea78132fb53f164156073d9786a9f6
+//BUILDHASH:6df0786a4485a9d0c25c177959fe1b2070c2a98884d20267eb70e129be95f2b0
diff --git a/veilid-core/src/attachment_manager.rs b/veilid-core/src/attachment_manager.rs
index feb0ee69..aebb6749 100644
--- a/veilid-core/src/attachment_manager.rs
+++ b/veilid-core/src/attachment_manager.rs
@@ -179,7 +179,14 @@ impl AttachmentManager {
     fn update_attaching_detaching_state(&self, state: AttachmentState) {
         let update_callback = {
             let mut inner = self.inner.lock();
+
+            // Clear routing table health so when we start measuring it we start from scratch
+            inner.last_routing_table_health = None;
+
+            // Set attachment state directly
             inner.last_attachment_state = state;
+
+            // Set timestamps
             if state == AttachmentState::Attaching {
                 inner.attach_ts = Some(get_aligned_timestamp());
             } else if state == AttachmentState::Detached {
@@ -189,9 +196,12 @@ impl AttachmentManager {
             } else {
                 unreachable!("don't use this for attached states, use update_attachment()");
             }
+
+            // Get callback
             inner.update_callback.clone()
         };
 
+        // Send update
         if let Some(update_callback) = update_callback {
             update_callback(VeilidUpdate::Attachment(Box::new(VeilidStateAttachment {
                 state,
@@ -203,7 +213,7 @@ impl AttachmentManager {
 
     #[instrument(level = "debug", skip(self))]
     async fn attachment_maintainer(self) {
-        debug!("attachment starting");
+        log_net!(debug "attachment starting");
         self.update_attaching_detaching_state(AttachmentState::Attaching);
 
         let netman = self.network_manager();
@@ -217,7 +227,7 @@ impl AttachmentManager {
                 break;
             }
 
-            debug!("started maintaining peers");
+            log_net!(debug "started maintaining peers");
             while self.inner.lock().maintain_peers {
                 // tick network manager
                 if let Err(err) = netman.tick().await {
@@ -241,32 +251,31 @@ impl AttachmentManager {
                 // sleep should be at the end in case maintain_peers changes state
                 sleep(1000).await;
             }
-            debug!("stopped maintaining peers");
+            log_net!(debug "stopped maintaining peers");
 
             if !restart {
                 self.update_attaching_detaching_state(AttachmentState::Detaching);
-                debug!("attachment stopping");
+                log_net!(debug "attachment stopping");
             }
 
-            debug!("stopping network");
+            log_net!(debug "stopping network");
             netman.shutdown().await;
 
             if !restart {
                 break;
             }
 
-            debug!("completely restarting attachment");
+            log_net!(debug "completely restarting attachment");
             // chill out for a second first, give network stack time to settle out
             sleep(1000).await;
         }
 
         self.update_attaching_detaching_state(AttachmentState::Detached);
-        debug!("attachment stopped");
+        log_net!(debug "attachment stopped");
     }
 
     #[instrument(level = "debug", skip_all, err)]
     pub async fn init(&self, update_callback: UpdateCallback) -> EyreResult<()> {
-        trace!("init");
         {
             let mut inner = self.inner.lock();
             inner.update_callback = Some(update_callback.clone());
diff --git a/veilid-core/src/core_context.rs b/veilid-core/src/core_context.rs
index 1dc4dc22..86fb90f3 100644
--- a/veilid-core/src/core_context.rs
+++ b/veilid-core/src/core_context.rs
@@ -1,6 +1,6 @@
-use crate::api_tracing_layer::*;
 use crate::attachment_manager::*;
 use crate::crypto::Crypto;
+use crate::logging::*;
 use crate::storage_manager::*;
 use crate::veilid_api::*;
 use crate::veilid_config::*;
@@ -70,7 +70,6 @@ impl ServicesContext {
         ApiTracingLayer::init(self.update_callback.clone()).await;
 
         // Set up protected store
-        trace!("init protected store");
         let protected_store = ProtectedStore::new(self.config.clone());
         if let Err(e) = protected_store.init().await {
             error!("failed to init protected store: {}", e);
@@ -80,7 +79,6 @@ impl ServicesContext {
         self.protected_store = Some(protected_store.clone());
 
         // Set up tablestore and crypto system
-        trace!("create table store and crypto system");
         let table_store = TableStore::new(self.config.clone(), protected_store.clone());
         let crypto = Crypto::new(self.config.clone(), table_store.clone());
         table_store.set_crypto(crypto.clone());
@@ -88,7 +86,6 @@ impl ServicesContext {
         // Initialize table store first, so crypto code can load caches
         // Tablestore can use crypto during init, just not any cached operations or things
         // that require flushing back to the tablestore
-        trace!("init table store");
         if let Err(e) = table_store.init().await {
             error!("failed to init table store: {}", e);
             self.shutdown().await;
@@ -97,7 +94,6 @@ impl ServicesContext {
         self.table_store = Some(table_store.clone());
 
         // Set up crypto
-        trace!("init crypto");
         if let Err(e) = crypto.init().await {
             error!("failed to init crypto: {}", e);
             self.shutdown().await;
@@ -108,7 +104,6 @@ impl ServicesContext {
         // Set up block store
         #[cfg(feature = "unstable-blockstore")]
         {
-            trace!("init block store");
             let block_store = BlockStore::new(self.config.clone());
             if let Err(e) = block_store.init().await {
                 error!("failed to init block store: {}", e);
@@ -119,7 +114,6 @@ impl ServicesContext {
         }
 
         // Set up storage manager
-        trace!("init storage manager");
         let update_callback = self.update_callback.clone();
 
         let storage_manager = StorageManager::new(
@@ -137,7 +131,6 @@ impl ServicesContext {
         self.storage_manager = Some(storage_manager.clone());
 
         // Set up attachment manager
-        trace!("init attachment manager");
         let update_callback = self.update_callback.clone();
         let attachment_manager = AttachmentManager::new(
             self.config.clone(),
@@ -163,28 +156,22 @@ impl ServicesContext {
         info!("Veilid API shutting down");
 
         if let Some(attachment_manager) = &mut self.attachment_manager {
-            trace!("terminate attachment manager");
             attachment_manager.terminate().await;
         }
         if let Some(storage_manager) = &mut self.storage_manager {
-            trace!("terminate storage manager");
             storage_manager.terminate().await;
         }
         #[cfg(feature = "unstable-blockstore")]
         if let Some(block_store) = &mut self.block_store {
-            trace!("terminate block store");
             block_store.terminate().await;
         }
         if let Some(crypto) = &mut self.crypto {
-            trace!("terminate crypto");
             crypto.terminate().await;
         }
         if let Some(table_store) = &mut self.table_store {
-            trace!("terminate table store");
             table_store.terminate().await;
         }
         if let Some(protected_store) = &mut self.protected_store {
-            trace!("terminate protected store");
             protected_store.terminate().await;
         }
 
@@ -220,7 +207,6 @@ impl VeilidCoreContext {
         config_callback: ConfigCallback,
     ) -> VeilidAPIResult<VeilidCoreContext> {
         // Set up config from callback
-        trace!("setup config with callback");
         let mut config = VeilidConfig::new();
         config.setup(config_callback, update_callback.clone())?;
 
@@ -233,20 +219,17 @@ impl VeilidCoreContext {
         config_json: String,
     ) -> VeilidAPIResult<VeilidCoreContext> {
         // Set up config from json
-        trace!("setup config with json");
         let mut config = VeilidConfig::new();
         config.setup_from_json(config_json, update_callback.clone())?;
         Self::new_common(update_callback, config).await
     }
 
-
     #[instrument(err, skip_all)]
     async fn new_with_config(
         update_callback: UpdateCallback,
         config_inner: VeilidConfigInner,
     ) -> VeilidAPIResult<VeilidCoreContext> {
         // Set up config from json
-        trace!("setup config with json");
         let mut config = VeilidConfig::new();
         config.setup_from_config(config_inner, update_callback.clone())?;
         Self::new_common(update_callback, config).await
diff --git a/veilid-core/src/crypto/crypto_system.rs b/veilid-core/src/crypto/crypto_system.rs
index c2a65695..f0bae8de 100644
--- a/veilid-core/src/crypto/crypto_system.rs
+++ b/veilid-core/src/crypto/crypto_system.rs
@@ -1,5 +1,7 @@
 use super::*;
 
+const VEILID_DOMAIN_API: &[u8] = b"VEILID_API";
+
 pub trait CryptoSystem {
     // Accessors
     fn kind(&self) -> CryptoKind;
@@ -17,6 +19,15 @@ pub trait CryptoSystem {
     fn random_nonce(&self) -> Nonce;
     fn random_shared_secret(&self) -> SharedSecret;
     fn compute_dh(&self, key: &PublicKey, secret: &SecretKey) -> VeilidAPIResult<SharedSecret>;
+    fn generate_shared_secret(
+        &self,
+        key: &PublicKey,
+        secret: &SecretKey,
+        domain: &[u8],
+    ) -> VeilidAPIResult<SharedSecret> {
+        let dh = self.compute_dh(key, secret)?;
+        Ok(self.generate_hash(&[&dh.bytes, domain, VEILID_DOMAIN_API].concat()))
+    }
     fn generate_keypair(&self) -> KeyPair;
     fn generate_hash(&self, data: &[u8]) -> HashDigest;
     fn generate_hash_reader(&self, reader: &mut dyn std::io::Read) -> VeilidAPIResult<HashDigest>;
diff --git a/veilid-core/src/crypto/mod.rs b/veilid-core/src/crypto/mod.rs
index e424eb46..8be06b81 100644
--- a/veilid-core/src/crypto/mod.rs
+++ b/veilid-core/src/crypto/mod.rs
@@ -128,8 +128,8 @@ impl Crypto {
         self.unlocked_inner.config.clone()
     }
 
+    #[instrument(skip_all, err)]
     pub async fn init(&self) -> EyreResult<()> {
-        trace!("Crypto::init");
         let table_store = self.unlocked_inner.table_store.clone();
         // Init node id from config
         if let Err(e) = self
@@ -190,7 +190,6 @@ impl Crypto {
     }
 
     pub async fn flush(&self) -> EyreResult<()> {
-        //trace!("Crypto::flush");
         let cache_bytes = {
             let inner = self.inner.lock();
             cache_to_bytes(&inner.dh_cache)
@@ -206,15 +205,14 @@ impl Crypto {
     }
 
     pub async fn terminate(&self) {
-        trace!("Crypto::terminate");
         let flush_future = self.inner.lock().flush_future.take();
         if let Some(f) = flush_future {
             f.await;
         }
-        trace!("starting termination flush");
+        log_crypto!("starting termination flush");
         match self.flush().await {
             Ok(_) => {
-                trace!("finished termination flush");
+                log_crypto!("finished termination flush");
             }
             Err(e) => {
                 error!("failed termination flush: {}", e);
diff --git a/veilid-core/src/intf/native/protected_store.rs b/veilid-core/src/intf/native/protected_store.rs
index 06851411..09abba70 100644
--- a/veilid-core/src/intf/native/protected_store.rs
+++ b/veilid-core/src/intf/native/protected_store.rs
@@ -33,7 +33,7 @@ impl ProtectedStore {
             if let Err(e) = self.remove_user_secret(kpsk).await {
                 error!("failed to delete '{}': {}", kpsk, e);
             } else {
-                debug!("deleted table '{}'", kpsk);
+                log_pstore!(debug "deleted table '{}'", kpsk);
             }
         }
         Ok(())
diff --git a/veilid-core/src/intf/wasm/protected_store.rs b/veilid-core/src/intf/wasm/protected_store.rs
index 84216ad0..563eeeb9 100644
--- a/veilid-core/src/intf/wasm/protected_store.rs
+++ b/veilid-core/src/intf/wasm/protected_store.rs
@@ -19,7 +19,7 @@ impl ProtectedStore {
             if let Err(e) = self.remove_user_secret(kpsk).await {
                 error!("failed to delete '{}': {}", kpsk, e);
             } else {
-                debug!("deleted table '{}'", kpsk);
+                log_pstore!(debug "deleted table '{}'", kpsk);
             }
         }
         Ok(())
diff --git a/veilid-core/src/lib.rs b/veilid-core/src/lib.rs
index 9cf19d6c..d929988c 100644
--- a/veilid-core/src/lib.rs
+++ b/veilid-core/src/lib.rs
@@ -44,11 +44,11 @@ cfg_if::cfg_if! {
 #[macro_use]
 extern crate alloc;
 
-mod api_tracing_layer;
 mod attachment_manager;
 mod core_context;
 mod crypto;
 mod intf;
+mod logging;
 mod network_manager;
 mod routing_table;
 mod rpc_processor;
@@ -56,14 +56,12 @@ mod storage_manager;
 mod table_store;
 mod veilid_api;
 mod veilid_config;
-mod veilid_layer_filter;
 mod wasm_helpers;
 
-pub use self::api_tracing_layer::ApiTracingLayer;
-pub use self::core_context::{api_startup, api_startup_json, api_startup_config, UpdateCallback};
+pub use self::core_context::{api_startup, api_startup_config, api_startup_json, UpdateCallback};
+pub use self::logging::{ApiTracingLayer, VeilidLayerFilter};
 pub use self::veilid_api::*;
 pub use self::veilid_config::*;
-pub use self::veilid_layer_filter::*;
 pub use veilid_tools as tools;
 
 /// The on-the-wire serialization format for Veilid RPC
@@ -88,10 +86,15 @@ pub fn veilid_version() -> (u32, u32, u32) {
     )
 }
 
+/// Return the default veilid config as a json object
+pub fn default_veilid_config() -> String {
+    serialize_json(VeilidConfigInner::default())
+}
+
 #[cfg(target_os = "android")]
 pub use intf::android::veilid_core_setup_android;
 
-pub static DEFAULT_LOG_IGNORE_LIST: [&str; 23] = [
+pub static DEFAULT_LOG_IGNORE_LIST: [&str; 26] = [
     "mio",
     "h2",
     "hyper",
@@ -110,11 +113,14 @@ pub static DEFAULT_LOG_IGNORE_LIST: [&str; 23] = [
     "tungstenite",
     "netlink_proto",
     "netlink_sys",
-    "trust_dns_resolver",
-    "trust_dns_proto",
+    "hickory_resolver",
+    "hickory_proto",
     "attohttpc",
     "ws_stream_wasm",
     "keyvaluedb_web",
+    "veilid_api",
+    "network_result",
+    "dht",
 ];
 
 use cfg_if::*;
diff --git a/veilid-core/src/api_tracing_layer.rs b/veilid-core/src/logging/api_tracing_layer.rs
similarity index 71%
rename from veilid-core/src/api_tracing_layer.rs
rename to veilid-core/src/logging/api_tracing_layer.rs
index 44b9b67a..a774748c 100644
--- a/veilid-core/src/api_tracing_layer.rs
+++ b/veilid-core/src/logging/api_tracing_layer.rs
@@ -47,6 +47,19 @@ impl ApiTracingLayer {
     }
 }
 
+fn simplify_file(file: &str) -> String {
+    let path = std::path::Path::new(file);
+    let path_component_count = path.iter().count();
+    if path.ends_with("mod.rs") && path_component_count >= 2 {
+        let outpath: std::path::PathBuf = path.iter().skip(path_component_count - 2).collect();
+        outpath.to_string_lossy().to_string()
+    } else if let Some(filename) = path.file_name() {
+        filename.to_string_lossy().to_string()
+    } else {
+        file.to_string()
+    }
+}
+
 impl<S: Subscriber + for<'a> registry::LookupSpan<'a>> Layer<S> for ApiTracingLayer {
     fn on_new_span(
         &self,
@@ -86,15 +99,39 @@ impl<S: Subscriber + for<'a> registry::LookupSpan<'a>> Layer<S> for ApiTracingLa
             let mut recorder = StringRecorder::new();
             event.record(&mut recorder);
             let meta = event.metadata();
-            let level = meta.level();
-            let log_level = VeilidLogLevel::from_tracing_level(*level);
+            let level = *meta.level();
+            let target = meta.target();
+            let log_level = VeilidLogLevel::from_tracing_level(level);
 
-            let origin = meta
-                .file()
-                .and_then(|file| meta.line().map(|ln| format!("{}:{}", file, ln)))
-                .unwrap_or_default();
+            let origin = match level {
+                Level::ERROR | Level::WARN => meta
+                    .file()
+                    .and_then(|file| {
+                        meta.line()
+                            .map(|ln| format!("{}:{}", simplify_file(file), ln))
+                    })
+                    .unwrap_or_default(),
+                Level::INFO => "".to_owned(),
+                Level::DEBUG | Level::TRACE => meta
+                    .file()
+                    .and_then(|file| {
+                        meta.line().map(|ln| {
+                            format!(
+                                "{}{}:{}",
+                                if target.is_empty() {
+                                    "".to_owned()
+                                } else {
+                                    format!("[{}]", target)
+                                },
+                                simplify_file(file),
+                                ln
+                            )
+                        })
+                    })
+                    .unwrap_or_default(),
+            };
 
-            let message = format!("{} {}", origin, recorder);
+            let message = format!("{}{}", origin, recorder).trim().to_owned();
 
             let backtrace = if log_level <= VeilidLogLevel::Error {
                 let bt = backtrace::Backtrace::new();
diff --git a/veilid-tools/src/log_thru.rs b/veilid-core/src/logging/mod.rs
similarity index 53%
rename from veilid-tools/src/log_thru.rs
rename to veilid-core/src/logging/mod.rs
index 9988e7d5..734cd9b7 100644
--- a/veilid-tools/src/log_thru.rs
+++ b/veilid-core/src/logging/mod.rs
@@ -1,12 +1,10 @@
-// LogThru
-// Pass errors through and log them simultaneously via map_err()
-// Also contains common log facilities (net, rpc, rtab, stor, pstore, crypto, etc )
+mod api_tracing_layer;
+mod veilid_layer_filter;
 
 use super::*;
 
-pub fn map_to_string<X: ToString>(arg: X) -> String {
-    arg.to_string()
-}
+pub use api_tracing_layer::*;
+pub use veilid_layer_filter::*;
 
 #[macro_export]
 macro_rules! fn_string {
@@ -51,6 +49,78 @@ macro_rules! log_net {
     }
 }
 
+#[macro_export]
+macro_rules! log_client_api {
+    (error $text:expr) => {error!(
+        target: "client_api",
+        "{}",
+        $text,
+    )};
+    (error $fmt:literal, $($arg:expr),+) => {
+        error!(target:"client_api", $fmt, $($arg),+);
+    };
+    (warn $text:expr) => {warn!(
+        target: "client_api",
+        "{}",
+        $text,
+    )};
+    (warn $fmt:literal, $($arg:expr),+) => {
+        warn!(target:"client_api", $fmt, $($arg),+);
+    };
+    (debug $text:expr) => {debug!(
+        target: "client_api",
+        "{}",
+        $text,
+    )};
+    (debug $fmt:literal, $($arg:expr),+) => {
+        debug!(target:"client_api", $fmt, $($arg),+);
+    };
+    ($text:expr) => {trace!(
+        target: "client_api",
+        "{}",
+        $text,
+    )};
+    ($fmt:literal, $($arg:expr),+) => {
+        trace!(target:"client_api", $fmt, $($arg),+);
+    }
+}
+
+#[macro_export]
+macro_rules! log_network_result {
+    (error $text:expr) => {error!(
+        target: "network_result",
+        "{}",
+        $text,
+    )};
+    (error $fmt:literal, $($arg:expr),+) => {
+        error!(target: "network_result", $fmt, $($arg),+);
+    };
+    (warn $text:expr) => {warn!(
+        target: "network_result",
+        "{}",
+        $text,
+    )};
+    (warn $fmt:literal, $($arg:expr),+) => {
+        warn!(target:"network_result", $fmt, $($arg),+);
+    };
+    (debug $text:expr) => {debug!(
+        target: "network_result",
+        "{}",
+        $text,
+    )};
+    (debug $fmt:literal, $($arg:expr),+) => {
+        debug!(target:"network_result", $fmt, $($arg),+);
+    };
+    ($text:expr) => {trace!(
+        target: "network_result",
+        "{}",
+        $text,
+    )};
+    ($fmt:literal, $($arg:expr),+) => {
+        trace!(target:"network_result", $fmt, $($arg),+);
+    }
+}
+
 #[macro_export]
 macro_rules! log_rpc {
     (error $text:expr) => { error!(
@@ -69,7 +139,7 @@ macro_rules! log_rpc {
     (warn $fmt:literal, $($arg:expr),+) => {
         warn!(target:"rpc", $fmt, $($arg),+);
     };
-    (debug $text:expr) => { error!(
+    (debug $text:expr) => { debug!(
         target: "rpc",
         "{}",
         $text,
@@ -87,6 +157,42 @@ macro_rules! log_rpc {
     }
 }
 
+#[macro_export]
+macro_rules! log_dht {
+    (error $text:expr) => { error!(
+        target: "dht",
+        "{}",
+        $text,
+    )};
+    (error $fmt:literal, $($arg:expr),+) => {
+        error!(target:"dht", $fmt, $($arg),+);
+    };
+    (warn $text:expr) => { warn!(
+        target: "dht",
+        "{}",
+        $text,
+    )};
+    (warn $fmt:literal, $($arg:expr),+) => {
+        warn!(target:"dht", $fmt, $($arg),+);
+    };
+    (debug $text:expr) => { debug!(
+        target: "dht",
+        "{}",
+        $text,
+    )};
+    (debug $fmt:literal, $($arg:expr),+) => {
+        debug!(target:"dht", $fmt, $($arg),+);
+    };
+    ($text:expr) => {trace!(
+        target: "dht",
+        "{}",
+        $text,
+    )};
+    ($fmt:literal, $($arg:expr),+) => {
+        trace!(target:"dht", $fmt, $($arg),+);
+    }
+}
+
 #[macro_export]
 macro_rules! log_rtab {
     (error $text:expr) => { error!(
@@ -195,6 +301,42 @@ macro_rules! log_pstore {
     }
 }
 
+#[macro_export]
+macro_rules! log_tstore {
+    (error $text:expr) => { error!(
+        target: "tstore",
+        "{}",
+        $text,
+    )};
+    (error $fmt:literal, $($arg:expr),+) => {
+        error!(target:"tstore", $fmt, $($arg),+);
+    };
+    (warn $text:expr) => { warn!(
+        target: "tstore",
+        "{}",
+        $text,
+    )};
+    (warn $fmt:literal, $($arg:expr),+) => {
+        warn!(target:"tstore", $fmt, $($arg),+);
+    };
+    (debug $text:expr) => { debug!(
+        target: "tstore",
+        "{}",
+        $text,
+    )};
+    (debug $fmt:literal, $($arg:expr),+) => {
+        debug!(target:"tstore", $fmt, $($arg),+);
+    };
+    ($text:expr) => {trace!(
+        target: "tstore",
+        "{}",
+        $text,
+    )};
+    ($fmt:literal, $($arg:expr),+) => {
+        trace!(target:"tstore", $fmt, $($arg),+);
+    }
+}
+
 #[macro_export]
 macro_rules! log_crypto {
     (error $text:expr) => { error!(
@@ -222,188 +364,3 @@ macro_rules! log_crypto {
         trace!(target:"crypto", $fmt, $($arg),+);
     }
 }
-
-#[macro_export]
-macro_rules! logthru_net {
-    ($($level:ident)?) => {
-        logthru!($($level)? "net")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "net", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "net", $fmt, $($arg),+)
-    }
-}
-#[macro_export]
-macro_rules! logthru_rpc {
-    ($($level:ident)?) => {
-        logthru!($($level)? "rpc")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "rpc", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "rpc", $fmt, $($arg),+)
-    }
-}
-#[macro_export]
-macro_rules! logthru_rtab {
-    ($($level:ident)?) => {
-        logthru!($($level)? "rtab")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "rtab", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "rtab", $fmt, $($arg),+)
-    }
-}
-#[macro_export]
-macro_rules! logthru_stor {
-    ($($level:ident)?) => {
-        logthru!($($level)? "stor")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "stor", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "stor", $fmt, $($arg),+)
-    }
-}
-#[macro_export]
-macro_rules! logthru_pstore {
-    ($($level:ident)?) => {
-        logthru!($($level)? "pstore")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "pstore", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "pstore", $fmt, $($arg),+)
-    }
-}
-#[macro_export]
-macro_rules! logthru_crypto {
-    ($($level:ident)?) => {
-        logthru!($($level)? "crypto")
-    };
-    ($($level:ident)? $text:literal) => {
-        logthru!($($level)? "crypto", $text)
-    };
-    ($($level:ident)? $fmt:literal, $($arg:expr),+) => {
-        logthru!($($level)? "crypto", $fmt, $($arg),+)
-    }
-}
-
-#[macro_export]
-macro_rules! logthru {
-    // error
-    (error $target:literal) => (|e__| {
-        error!(
-            target: $target,
-            "[{:?}]",
-            e__,
-        );
-        e__
-    });
-    (error $target:literal, $text:literal) => (|e__| {
-        error!(
-            target: $target,
-            "[{:?}] {}",
-            e__,
-            $text
-        );
-        e__
-    });
-    (error $target:literal, $fmt:literal, $($arg:expr),+) => (|e__| {
-        error!(
-            target: $target,
-            concat!("[{:?}] ", $fmt),
-            e__,
-            $($arg),+
-        );
-        e__
-    });
-    // warn
-    (warn $target:literal) => (|e__| {
-        warn!(
-            target: $target,
-            "[{:?}]",
-            e__,
-        );
-        e__
-    });
-    (warn $target:literal, $text:literal) => (|e__| {
-        warn!(
-            target: $target,
-            "[{:?}] {}",
-            e__,
-            $text
-        );
-        e__
-    });
-    (warn $target:literal, $fmt:literal, $($arg:expr),+) => (|e__| {
-        warn!(
-            target: $target,
-            concat!("[{:?}] ", $fmt),
-            e__,
-            $($arg),+
-        );
-        e__
-    });
-    // debug
-    (debug $target:literal) => (|e__| {
-        debug!(
-            target: $target,
-            "[{:?}]",
-            e__,
-        );
-        e__
-    });
-    (debug $target:literal, $text:literal) => (|e__| {
-        debug!(
-            target: $target,
-            "[{:?}] {}",
-            e__,
-            $text
-        );
-        e__
-    });
-    (debug $target:literal, $fmt:literal, $($arg:expr),+) => (|e__| {
-        debug!(
-            target: $target,
-            concat!("[{:?}] ", $fmt),
-            e__,
-            $($arg),+
-        );
-        e__
-    });
-    // trace
-    ($target:literal) => (|e__| {
-        trace!(
-            target: $target,
-            "[{:?}]",
-            e__,
-        );
-        e__
-    });
-    ($target:literal, $text:literal) => (|e__| {
-        trace!(
-            target: $target,
-            "[{:?}] {}",
-            e__,
-            $text
-        );
-        e__
-    });
-    ($target:literal, $fmt:literal, $($arg:expr),+) => (|e__| {
-        trace!(
-            target: $target,
-            concat!("[{:?}] ", $fmt),
-            e__,
-            $($arg),+
-        );
-        e__
-    })
-}
diff --git a/veilid-core/src/veilid_layer_filter.rs b/veilid-core/src/logging/veilid_layer_filter.rs
similarity index 81%
rename from veilid-core/src/veilid_layer_filter.rs
rename to veilid-core/src/logging/veilid_layer_filter.rs
index 73e02a85..27305e68 100644
--- a/veilid-core/src/veilid_layer_filter.rs
+++ b/veilid-core/src/logging/veilid_layer_filter.rs
@@ -16,13 +16,25 @@ pub struct VeilidLayerFilter {
 impl VeilidLayerFilter {
     pub fn new(
         max_level: VeilidConfigLogLevel,
-        ignore_list: Option<Vec<String>>,
+        ignore_log_targets: &[String],
     ) -> VeilidLayerFilter {
+        let mut ignore_list = DEFAULT_LOG_IGNORE_LIST.map(|x| x.to_owned()).to_vec();
+        for igedit in ignore_log_targets {
+            if let Some(rest) = igedit.strip_prefix('-') {
+                for i in 0..ignore_list.len() {
+                    if ignore_list[i] == rest {
+                        ignore_list.remove(i);
+                        break;
+                    }
+                }
+            } else {
+                ignore_list.push(igedit.clone());
+            }
+        }
         Self {
             inner: Arc::new(RwLock::new(VeilidLayerFilterInner {
                 max_level: max_level.to_tracing_level_filter(),
-                ignore_list: ignore_list
-                    .unwrap_or_else(|| DEFAULT_LOG_IGNORE_LIST.map(|x| x.to_owned()).to_vec()),
+                ignore_list,
             })),
         }
     }
diff --git a/veilid-core/src/network_manager/connection_manager.rs b/veilid-core/src/network_manager/connection_manager.rs
index cb1b1808..f487b786 100644
--- a/veilid-core/src/network_manager/connection_manager.rs
+++ b/veilid-core/src/network_manager/connection_manager.rs
@@ -115,7 +115,7 @@ impl ConnectionManager {
     }
 
     pub async fn startup(&self) {
-        trace!("startup connection manager");
+        log_net!(debug "startup connection manager");
         let mut inner = self.arc.inner.lock();
         if inner.is_some() {
             panic!("shouldn't start connection manager twice without shutting it down first");
@@ -135,7 +135,7 @@ impl ConnectionManager {
     }
 
     pub async fn shutdown(&self) {
-        debug!("starting connection manager shutdown");
+        log_net!(debug "starting connection manager shutdown");
         // Remove the inner from the lock
         let mut inner = {
             let mut inner_lock = self.arc.inner.lock();
@@ -148,16 +148,16 @@ impl ConnectionManager {
         };
 
         // Stop all the connections and the async processor
-        debug!("stopping async processor task");
+        log_net!(debug "stopping async processor task");
         drop(inner.stop_source.take());
         let async_processor_jh = inner.async_processor_jh.take().unwrap();
         // wait for the async processor to stop
-        debug!("waiting for async processor to stop");
+        log_net!(debug "waiting for async processor to stop");
         async_processor_jh.await;
         // Wait for the connections to complete
-        debug!("waiting for connection handlers to complete");
+        log_net!(debug "waiting for connection handlers to complete");
         self.arc.connection_table.join().await;
-        debug!("finished connection manager shutdown");
+        log_net!(debug "finished connection manager shutdown");
     }
 
     // Internal routine to see if we should keep this connection
diff --git a/veilid-core/src/network_manager/connection_table.rs b/veilid-core/src/network_manager/connection_table.rs
index f934f4ce..3b2b7173 100644
--- a/veilid-core/src/network_manager/connection_table.rs
+++ b/veilid-core/src/network_manager/connection_table.rs
@@ -99,7 +99,7 @@ impl ConnectionTable {
             let unord = FuturesUnordered::new();
             for table in &mut inner.conn_by_id {
                 for (_, mut v) in table.drain() {
-                    trace!("connection table join: {:?}", v);
+                    log_net!("connection table join: {:?}", v);
                     v.close();
                     unord.push(v);
                 }
diff --git a/veilid-core/src/network_manager/mod.rs b/veilid-core/src/network_manager/mod.rs
index 9415512a..3ee0996a 100644
--- a/veilid-core/src/network_manager/mod.rs
+++ b/veilid-core/src/network_manager/mod.rs
@@ -227,7 +227,7 @@ impl NetworkManager {
                     Some(
                         bcs.derive_shared_secret(
                             network_key_password.as_bytes(),
-                            network_key_password.as_bytes(),
+                            &bcs.generate_hash(network_key_password.as_bytes()).bytes,
                         )
                         .expect("failed to derive network key"),
                     )
@@ -363,9 +363,8 @@ impl NetworkManager {
 
     #[instrument(level = "debug", skip_all, err)]
     pub async fn internal_startup(&self) -> EyreResult<()> {
-        trace!("NetworkManager::internal_startup begin");
         if self.unlocked_inner.components.read().is_some() {
-            debug!("NetworkManager::internal_startup already started");
+            log_net!(debug "NetworkManager::internal_startup already started");
             return Ok(());
         }
 
@@ -402,7 +401,7 @@ impl NetworkManager {
         rpc_processor.startup().await?;
         receipt_manager.startup().await?;
 
-        trace!("NetworkManager::internal_startup end");
+        log_net!("NetworkManager::internal_startup end");
 
         Ok(())
     }
@@ -422,13 +421,13 @@ impl NetworkManager {
 
     #[instrument(level = "debug", skip_all)]
     pub async fn shutdown(&self) {
-        debug!("starting network manager shutdown");
+        log_net!(debug "starting network manager shutdown");
 
         // Cancel all tasks
         self.cancel_tasks().await;
 
         // Shutdown network components if they started up
-        debug!("shutting down network components");
+        log_net!(debug "shutting down network components");
 
         let components = self.unlocked_inner.components.read().clone();
         if let Some(components) = components {
@@ -441,16 +440,16 @@ impl NetworkManager {
         }
 
         // reset the state
-        debug!("resetting network manager state");
+        log_net!(debug "resetting network manager state");
         {
             *self.inner.lock() = NetworkManager::new_inner();
         }
 
         // send update
-        debug!("sending network state update to api clients");
+        log_net!(debug "sending network state update to api clients");
         self.send_network_update();
 
-        debug!("finished network manager shutdown");
+        log_net!(debug "finished network manager shutdown");
     }
 
     pub fn update_client_allowlist(&self, client: TypedKey) {
@@ -493,7 +492,7 @@ impl NetworkManager {
             .unwrap_or_default()
         {
             let (k, v) = inner.client_allowlist.remove_lru().unwrap();
-            trace!(key=?k, value=?v, "purge_client_allowlist: remove_lru")
+            trace!(target: "net", key=?k, value=?v, "purge_client_allowlist: remove_lru")
         }
     }
 
diff --git a/veilid-core/src/network_manager/native/discovery_context.rs b/veilid-core/src/network_manager/native/discovery_context.rs
index b2713a3b..728022ae 100644
--- a/veilid-core/src/network_manager/native/discovery_context.rs
+++ b/veilid-core/src/network_manager/native/discovery_context.rs
@@ -310,14 +310,16 @@ impl DiscoveryContext {
 
         // ask the node to send us a dial info validation receipt
 
-        rpc_processor
+        match rpc_processor
             .rpc_call_validate_dial_info(node_ref.clone(), dial_info, redirect)
             .await
-            .map_err(logthru_net!(
-                "failed to send validate_dial_info to {:?}",
-                node_ref
-            ))
-            .unwrap_or(false)
+        {
+            Err(e) => {
+                log_net!("failed to send validate_dial_info to {:?}: {}", node_ref, e);
+                false
+            }
+            Ok(v) => v,
+        }
     }
 
     #[instrument(level = "trace", skip(self), ret)]
diff --git a/veilid-core/src/network_manager/native/mod.rs b/veilid-core/src/network_manager/native/mod.rs
index a6f171e6..6573ed79 100644
--- a/veilid-core/src/network_manager/native/mod.rs
+++ b/veilid-core/src/network_manager/native/mod.rs
@@ -279,22 +279,22 @@ impl Network {
     fn load_server_config(&self) -> io::Result<ServerConfig> {
         let c = self.config.get();
         //
-        trace!(
+        log_net!(
             "loading certificate from {}",
             c.network.tls.certificate_path
         );
         let certs = Self::load_certs(&PathBuf::from(&c.network.tls.certificate_path))?;
-        trace!("loaded {} certificates", certs.len());
+        log_net!("loaded {} certificates", certs.len());
         if certs.is_empty() {
             return Err(io::Error::new(io::ErrorKind::InvalidInput, format!("Certificates at {} could not be loaded.\nEnsure it is in PEM format, beginning with '-----BEGIN CERTIFICATE-----'",c.network.tls.certificate_path)));
         }
         //
-        trace!(
+        log_net!(
             "loading private key from {}",
             c.network.tls.private_key_path
         );
         let mut keys = Self::load_keys(&PathBuf::from(&c.network.tls.private_key_path))?;
-        trace!("loaded {} keys", keys.len());
+        log_net!("loaded {} keys", keys.len());
         if keys.is_empty() {
             return Err(io::Error::new(io::ErrorKind::InvalidInput, format!("Private key at {} could not be loaded.\nEnsure it is unencrypted and in RSA or PKCS8 format, beginning with '-----BEGIN RSA PRIVATE KEY-----' or '-----BEGIN PRIVATE KEY-----'",c.network.tls.private_key_path)));
         }
@@ -710,7 +710,7 @@ impl Network {
         self.unlocked_inner
             .interfaces
             .with_interfaces(|interfaces| {
-                debug!("interfaces: {:#?}", interfaces);
+                log_net!(debug "interfaces: {:#?}", interfaces);
 
                 for intf in interfaces.values() {
                     // Skip networks that we should never encounter
@@ -915,12 +915,12 @@ impl Network {
 
     #[instrument(level = "debug", skip_all)]
     pub async fn shutdown(&self) {
-        debug!("starting low level network shutdown");
+        log_net!(debug "starting low level network shutdown");
 
         let routing_table = self.routing_table();
 
         // Stop all tasks
-        debug!("stopping update network class task");
+        log_net!(debug "stopping update network class task");
         if let Err(e) = self.unlocked_inner.update_network_class_task.stop().await {
             error!("update_network_class_task not cancelled: {}", e);
         }
@@ -930,17 +930,17 @@ impl Network {
             let mut inner = self.inner.lock();
             // take the join handles out
             for h in inner.join_handles.drain(..) {
-                trace!("joining: {:?}", h);
+                log_net!("joining: {:?}", h);
                 unord.push(h);
             }
             // Drop the stop
             drop(inner.stop_source.take());
         }
-        debug!("stopping {} low level network tasks", unord.len());
+        log_net!(debug "stopping {} low level network tasks", unord.len());
         // Wait for everything to stop
         while unord.next().await.is_some() {}
 
-        debug!("clearing dial info");
+        log_net!(debug "clearing dial info");
 
         routing_table
             .edit_routing_domain(RoutingDomain::PublicInternet)
@@ -961,7 +961,7 @@ impl Network {
         // Reset state including network class
         *self.inner.lock() = Self::new_inner();
 
-        debug!("finished low level network shutdown");
+        log_net!(debug "finished low level network shutdown");
     }
 
     //////////////////////////////////////////
diff --git a/veilid-core/src/network_manager/native/network_tcp.rs b/veilid-core/src/network_manager/native/network_tcp.rs
index 774c600a..ee2477ab 100644
--- a/veilid-core/src/network_manager/native/network_tcp.rs
+++ b/veilid-core/src/network_manager/native/network_tcp.rs
@@ -268,7 +268,7 @@ impl Network {
             }
         }
 
-        debug!("spawn_socket_listener: binding successful to {}", addr);
+        log_net!(debug "spawn_socket_listener: binding successful to {}", addr);
 
         // Create protocol handler records
         let listener_state = Arc::new(RwLock::new(ListenerState::new()));
diff --git a/veilid-core/src/network_manager/native/network_udp.rs b/veilid-core/src/network_manager/native/network_udp.rs
index 9f015ed3..32e251b9 100644
--- a/veilid-core/src/network_manager/native/network_udp.rs
+++ b/veilid-core/src/network_manager/native/network_udp.rs
@@ -15,16 +15,16 @@ impl Network {
                 task_count = 1;
             }
         }
-        trace!("task_count: {}", task_count);
+        log_net!("task_count: {}", task_count);
         for _ in 0..task_count {
-            trace!("Spawning UDP listener task");
+            log_net!("Spawning UDP listener task");
 
             ////////////////////////////////////////////////////////////
             // Run thread task to process stream of messages
             let this = self.clone();
 
             let jh = spawn(async move {
-                trace!("UDP listener task spawned");
+                log_net!("UDP listener task spawned");
 
                 // Collect all our protocol handlers into a vector
                 let mut protocol_handlers: Vec<RawUdpProtocolHandler> = this
@@ -103,7 +103,7 @@ impl Network {
                     }
                 }
 
-                trace!("UDP listener task stopped");
+                log_net!("UDP listener task stopped");
             });
             ////////////////////////////////////////////////////////////
 
diff --git a/veilid-core/src/network_manager/native/protocol/sockets.rs b/veilid-core/src/network_manager/native/protocol/sockets.rs
index b015d6a9..e345a8ce 100644
--- a/veilid-core/src/network_manager/native/protocol/sockets.rs
+++ b/veilid-core/src/network_manager/native/protocol/sockets.rs
@@ -1,233 +1,246 @@
-use crate::*;
-use async_io::Async;
-use std::io;
-
-cfg_if! {
-    if #[cfg(feature="rt-async-std")] {
-        pub use async_std::net::{TcpStream, TcpListener, Shutdown, UdpSocket};
-    } else if #[cfg(feature="rt-tokio")] {
-        pub use tokio::net::{TcpStream, TcpListener, UdpSocket};
-        pub use tokio_util::compat::*;
-    } else {
-        compile_error!("needs executor implementation")
-    }
-}
-
-use socket2::{Domain, Protocol, SockAddr, Socket, Type};
-
-cfg_if! {
-    if #[cfg(windows)] {
-        use winapi::shared::ws2def::{ SOL_SOCKET, SO_EXCLUSIVEADDRUSE};
-        use winapi::um::winsock2::{SOCKET_ERROR, setsockopt};
-        use winapi::ctypes::c_int;
-        use std::os::windows::io::AsRawSocket;
-
-        fn set_exclusiveaddruse(socket: &Socket) -> io::Result<()> {
-            unsafe {
-                let optval:c_int = 1;
-                if setsockopt(socket.as_raw_socket().try_into().unwrap(), SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (&optval as *const c_int).cast(),
-                    std::mem::size_of::<c_int>() as c_int) == SOCKET_ERROR {
-                    return Err(io::Error::last_os_error());
-                }
-                Ok(())
-            }
-        }
-    }
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_unbound_shared_udp_socket(domain: Domain) -> io::Result<Socket> {
-    let socket = Socket::new(domain, Type::DGRAM, Some(Protocol::UDP))?;
-    if domain == Domain::IPV6 {
-        socket.set_only_v6(true)?;
-    }
-    socket.set_reuse_address(true)?;
-
-    cfg_if! {
-        if #[cfg(unix)] {
-            socket.set_reuse_port(true)?;
-        }
-    }
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_bound_shared_udp_socket(local_address: SocketAddr) -> io::Result<Socket> {
-    let domain = Domain::for_address(local_address);
-    let socket = new_unbound_shared_udp_socket(domain)?;
-    let socket2_addr = SockAddr::from(local_address);
-    socket.bind(&socket2_addr)?;
-
-    log_net!("created bound shared udp socket on {:?}", &local_address);
-
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_bound_first_udp_socket(local_address: SocketAddr) -> io::Result<Socket> {
-    let domain = Domain::for_address(local_address);
-    let socket = Socket::new(domain, Type::DGRAM, Some(Protocol::UDP))?;
-    if domain == Domain::IPV6 {
-        socket.set_only_v6(true)?;
-    }
-    // Bind the socket -first- before turning on 'reuse address' this way it will
-    // fail if the port is already taken
-    let socket2_addr = SockAddr::from(local_address);
-
-    // On windows, do SO_EXCLUSIVEADDRUSE before the bind to ensure the port is fully available
-    cfg_if! {
-        if #[cfg(windows)] {
-            set_exclusiveaddruse(&socket)?;
-        }
-    }
-
-    socket.bind(&socket2_addr)?;
-
-    // Set 'reuse address' so future binds to this port will succeed
-    // This does not work on Windows, where reuse options can not be set after the bind
-    cfg_if! {
-        if #[cfg(unix)] {
-            socket
-                .set_reuse_address(true)?;
-            socket.set_reuse_port(true)?;
-        }
-    }
-    log_net!("created bound first udp socket on {:?}", &local_address);
-
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_unbound_tcp_socket(domain: Domain) -> io::Result<Socket> {
-    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
-    if let Err(e) = socket.set_nodelay(true) {
-        log_net!(error "Couldn't set TCP nodelay: {}", e);
-    }
-    if domain == Domain::IPV6 {
-        socket.set_only_v6(true)?;
-    }
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_unbound_shared_tcp_socket(domain: Domain) -> io::Result<Socket> {
-    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
-    // if let Err(e) = socket.set_linger(Some(core::time::Duration::from_secs(0))) {
-    //     log_net!(error "Couldn't set TCP linger: {}", e);
-    // }
-    if let Err(e) = socket.set_nodelay(true) {
-        log_net!(error "Couldn't set TCP nodelay: {}", e);
-    }
-    if domain == Domain::IPV6 {
-        socket.set_only_v6(true)?;
-    }
-    socket.set_reuse_address(true)?;
-    cfg_if! {
-        if #[cfg(unix)] {
-            socket.set_reuse_port(true)?;
-        }
-    }
-
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_bound_shared_tcp_socket(local_address: SocketAddr) -> io::Result<Socket> {
-    let domain = Domain::for_address(local_address);
-    let socket = new_unbound_shared_tcp_socket(domain)?;
-    let socket2_addr = SockAddr::from(local_address);
-    socket.bind(&socket2_addr)?;
-
-    log_net!("created bound shared tcp socket on {:?}", &local_address);
-
-    Ok(socket)
-}
-
-#[instrument(level = "trace", ret)]
-pub fn new_bound_first_tcp_socket(local_address: SocketAddr) -> io::Result<Socket> {
-    let domain = Domain::for_address(local_address);
-
-    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
-    // if let Err(e) = socket.set_linger(Some(core::time::Duration::from_secs(0))) {
-    //     log_net!(error "Couldn't set TCP linger: {}", e);
-    // }
-    if let Err(e) = socket.set_nodelay(true) {
-        log_net!(error "Couldn't set TCP nodelay: {}", e);
-    }
-    if domain == Domain::IPV6 {
-        socket.set_only_v6(true)?;
-    }
-
-    // On windows, do SO_EXCLUSIVEADDRUSE before the bind to ensure the port is fully available
-    cfg_if! {
-        if #[cfg(windows)] {
-            set_exclusiveaddruse(&socket)?;
-        }
-    }
-
-    // Bind the socket -first- before turning on 'reuse address' this way it will
-    // fail if the port is already taken
-    let socket2_addr = SockAddr::from(local_address);
-    socket.bind(&socket2_addr)?;
-
-    // Set 'reuse address' so future binds to this port will succeed
-    // This does not work on Windows, where reuse options can not be set after the bind
-    cfg_if! {
-        if #[cfg(unix)] {
-        socket
-            .set_reuse_address(true)?;
-        socket.set_reuse_port(true)?;
-        }
-    }
-    log_net!("created bound first tcp socket on {:?}", &local_address);
-
-    Ok(socket)
-}
-
-// Non-blocking connect is tricky when you want to start with a prepared socket
-// Errors should not be logged as they are valid conditions for this function
-#[instrument(level = "trace", ret)]
-pub async fn nonblocking_connect(
-    socket: Socket,
-    addr: SocketAddr,
-    timeout_ms: u32,
-) -> io::Result<TimeoutOr<TcpStream>> {
-    // Set for non blocking connect
-    socket.set_nonblocking(true)?;
-
-    // Make socket2 SockAddr
-    let socket2_addr = socket2::SockAddr::from(addr);
-
-    // Connect to the remote address
-    match socket.connect(&socket2_addr) {
-        Ok(()) => Ok(()),
-        #[cfg(unix)]
-        Err(err) if err.raw_os_error() == Some(libc::EINPROGRESS) => Ok(()),
-        Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => Ok(()),
-        Err(e) => Err(e),
-    }?;
-    let async_stream = Async::new(std::net::TcpStream::from(socket))?;
-
-    // The stream becomes writable when connected
-    timeout_or_try!(timeout(timeout_ms, async_stream.writable())
-        .await
-        .into_timeout_or()
-        .into_result()?);
-
-    // Check low level error
-    let async_stream = match async_stream.get_ref().take_error()? {
-        None => Ok(async_stream),
-        Some(err) => Err(err),
-    }?;
-
-    // Convert back to inner and then return async version
-    cfg_if! {
-        if #[cfg(feature="rt-async-std")] {
-            Ok(TimeoutOr::value(TcpStream::from(async_stream.into_inner()?)))
-        } else if #[cfg(feature="rt-tokio")] {
-            Ok(TimeoutOr::value(TcpStream::from_std(async_stream.into_inner()?)?))
-        } else {
-            compile_error!("needs executor implementation")
-        }
-    }
-}
+use crate::*;
+use async_io::Async;
+use std::io;
+
+cfg_if! {
+    if #[cfg(feature="rt-async-std")] {
+        pub use async_std::net::{TcpStream, TcpListener, UdpSocket};
+    } else if #[cfg(feature="rt-tokio")] {
+        pub use tokio::net::{TcpStream, TcpListener, UdpSocket};
+        pub use tokio_util::compat::*;
+    } else {
+        compile_error!("needs executor implementation")
+    }
+}
+
+use socket2::{Domain, Protocol, SockAddr, Socket, Type};
+
+cfg_if! {
+    if #[cfg(windows)] {
+        use winapi::shared::ws2def::{ SOL_SOCKET, SO_EXCLUSIVEADDRUSE};
+        use winapi::um::winsock2::{SOCKET_ERROR, setsockopt};
+        use winapi::ctypes::c_int;
+        use std::os::windows::io::AsRawSocket;
+
+        fn set_exclusiveaddruse(socket: &Socket) -> io::Result<()> {
+            unsafe {
+                let optval:c_int = 1;
+                if setsockopt(socket.as_raw_socket().try_into().unwrap(), SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (&optval as *const c_int).cast(),
+                    std::mem::size_of::<c_int>() as c_int) == SOCKET_ERROR {
+                    return Err(io::Error::last_os_error());
+                }
+                Ok(())
+            }
+        }
+    }
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_unbound_shared_udp_socket(domain: Domain) -> io::Result<Socket> {
+    let socket = Socket::new(domain, Type::DGRAM, Some(Protocol::UDP))?;
+    if domain == Domain::IPV6 {
+        socket.set_only_v6(true)?;
+    }
+    socket.set_reuse_address(true)?;
+
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket.set_reuse_port(true)?;
+        }
+    }
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_bound_shared_udp_socket(local_address: SocketAddr) -> io::Result<Socket> {
+    let domain = Domain::for_address(local_address);
+    let socket = new_unbound_shared_udp_socket(domain)?;
+    let socket2_addr = SockAddr::from(local_address);
+    socket.bind(&socket2_addr)?;
+
+    log_net!("created bound shared udp socket on {:?}", &local_address);
+
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_bound_first_udp_socket(local_address: SocketAddr) -> io::Result<Socket> {
+    let domain = Domain::for_address(local_address);
+    let socket = Socket::new(domain, Type::DGRAM, Some(Protocol::UDP))?;
+    if domain == Domain::IPV6 {
+        socket.set_only_v6(true)?;
+    }
+    // Bind the socket -first- before turning on 'reuse address' this way it will
+    // fail if the port is already taken
+    let socket2_addr = SockAddr::from(local_address);
+
+    // On windows, do SO_EXCLUSIVEADDRUSE before the bind to ensure the port is fully available
+    cfg_if! {
+        if #[cfg(windows)] {
+            set_exclusiveaddruse(&socket)?;
+        }
+    }
+
+    // Bind the socket -first- without turning on SO_REUSEPORT this way it will
+    // fail if the port is already taken
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket
+                .set_reuse_address(true)?;
+        }
+    }
+
+    socket.bind(&socket2_addr)?;
+
+    // Set 'reuse address' so future binds to this port will succeed
+    // This does not work on Windows, where reuse options can not be set after the bind
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket.set_reuse_port(true)?;
+        }
+    }
+    log_net!("created bound first udp socket on {:?}", &local_address);
+
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_unbound_tcp_socket(domain: Domain) -> io::Result<Socket> {
+    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
+    if let Err(e) = socket.set_nodelay(true) {
+        log_net!(error "Couldn't set TCP nodelay: {}", e);
+    }
+    if domain == Domain::IPV6 {
+        socket.set_only_v6(true)?;
+    }
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_unbound_shared_tcp_socket(domain: Domain) -> io::Result<Socket> {
+    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
+    // if let Err(e) = socket.set_linger(Some(core::time::Duration::from_secs(0))) {
+    //     log_net!(error "Couldn't set TCP linger: {}", e);
+    // }
+    if let Err(e) = socket.set_nodelay(true) {
+        log_net!(error "Couldn't set TCP nodelay: {}", e);
+    }
+    if domain == Domain::IPV6 {
+        socket.set_only_v6(true)?;
+    }
+    socket.set_reuse_address(true)?;
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket.set_reuse_port(true)?;
+        }
+    }
+
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_bound_shared_tcp_socket(local_address: SocketAddr) -> io::Result<Socket> {
+    let domain = Domain::for_address(local_address);
+    let socket = new_unbound_shared_tcp_socket(domain)?;
+    let socket2_addr = SockAddr::from(local_address);
+    socket.bind(&socket2_addr)?;
+
+    log_net!("created bound shared tcp socket on {:?}", &local_address);
+
+    Ok(socket)
+}
+
+#[instrument(level = "trace", ret)]
+pub fn new_bound_first_tcp_socket(local_address: SocketAddr) -> io::Result<Socket> {
+    let domain = Domain::for_address(local_address);
+
+    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
+    // if let Err(e) = socket.set_linger(Some(core::time::Duration::from_secs(0))) {
+    //     log_net!(error "Couldn't set TCP linger: {}", e);
+    // }
+    if let Err(e) = socket.set_nodelay(true) {
+        log_net!(error "Couldn't set TCP nodelay: {}", e);
+    }
+    if domain == Domain::IPV6 {
+        socket.set_only_v6(true)?;
+    }
+
+    // On windows, do SO_EXCLUSIVEADDRUSE before the bind to ensure the port is fully available
+    cfg_if! {
+        if #[cfg(windows)] {
+            set_exclusiveaddruse(&socket)?;
+        }
+    }
+
+    // Bind the socket -first- without turning on SO_REUSEPORT this way it will
+    // fail if the port is already taken
+    let socket2_addr = SockAddr::from(local_address);
+
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket
+                .set_reuse_address(true)?;
+        }
+    }
+
+    socket.bind(&socket2_addr)?;
+
+    // Set 'reuse address' so future binds to this port will succeed
+    // This does not work on Windows, where reuse options can not be set after the bind
+    cfg_if! {
+        if #[cfg(unix)] {
+            socket.set_reuse_port(true)?;
+        }
+    }
+    log_net!("created bound first tcp socket on {:?}", &local_address);
+
+    Ok(socket)
+}
+
+// Non-blocking connect is tricky when you want to start with a prepared socket
+// Errors should not be logged as they are valid conditions for this function
+#[instrument(level = "trace", ret)]
+pub async fn nonblocking_connect(
+    socket: Socket,
+    addr: SocketAddr,
+    timeout_ms: u32,
+) -> io::Result<TimeoutOr<TcpStream>> {
+    // Set for non blocking connect
+    socket.set_nonblocking(true)?;
+
+    // Make socket2 SockAddr
+    let socket2_addr = socket2::SockAddr::from(addr);
+
+    // Connect to the remote address
+    match socket.connect(&socket2_addr) {
+        Ok(()) => Ok(()),
+        #[cfg(unix)]
+        Err(err) if err.raw_os_error() == Some(libc::EINPROGRESS) => Ok(()),
+        Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => Ok(()),
+        Err(e) => Err(e),
+    }?;
+    let async_stream = Async::new(std::net::TcpStream::from(socket))?;
+
+    // The stream becomes writable when connected
+    timeout_or_try!(timeout(timeout_ms, async_stream.writable())
+        .await
+        .into_timeout_or()
+        .into_result()?);
+
+    // Check low level error
+    let async_stream = match async_stream.get_ref().take_error()? {
+        None => Ok(async_stream),
+        Some(err) => Err(err),
+    }?;
+
+    // Convert back to inner and then return async version
+    cfg_if! {
+        if #[cfg(feature="rt-async-std")] {
+            Ok(TimeoutOr::value(TcpStream::from(async_stream.into_inner()?)))
+        } else if #[cfg(feature="rt-tokio")] {
+            Ok(TimeoutOr::value(TcpStream::from_std(async_stream.into_inner()?)?))
+        } else {
+            compile_error!("needs executor implementation")
+        }
+    }
+}
diff --git a/veilid-core/src/network_manager/native/protocol/udp.rs b/veilid-core/src/network_manager/native/protocol/udp.rs
index 0a955046..ad54aa49 100644
--- a/veilid-core/src/network_manager/native/protocol/udp.rs
+++ b/veilid-core/src/network_manager/native/protocol/udp.rs
@@ -39,9 +39,8 @@ impl RawUdpProtocolHandler {
                 NetworkResult::Value(None) => {
                     continue;
                 }
-                #[cfg(feature = "network-result-extra")]
                 nres => {
-                    log_network_result!(
+                    log_network_result!(debug
                         "UDP::recv_message insert_frame failed: {:?} <= size={} remote_addr={}",
                         nres,
                         size,
@@ -49,10 +48,6 @@ impl RawUdpProtocolHandler {
                     );
                     continue;
                 }
-                #[cfg(not(feature = "network-result-extra"))]
-                _ => {
-                    continue;
-                }
             };
 
             // Check length of reassembled message (same for all protocols)
diff --git a/veilid-core/src/network_manager/native/start_protocols.rs b/veilid-core/src/network_manager/native/start_protocols.rs
index 4844da54..d73d4928 100644
--- a/veilid-core/src/network_manager/native/start_protocols.rs
+++ b/veilid-core/src/network_manager/native/start_protocols.rs
@@ -280,7 +280,7 @@ impl Network {
         editor_public_internet: &mut RoutingDomainEditor,
         editor_local_network: &mut RoutingDomainEditor,
     ) -> EyreResult<()> {
-        trace!("starting udp listeners");
+        log_net!("starting udp listeners");
         let routing_table = self.routing_table();
         let (listen_address, public_address, detect_address_changes) = {
             let c = self.config.get();
@@ -312,7 +312,7 @@ impl Network {
         let local_dial_info_list = self.create_udp_inbound_sockets(ip_addrs, udp_port).await?;
         let mut static_public = false;
 
-        trace!("UDP: listener started on {:#?}", local_dial_info_list);
+        log_net!("UDP: listener started on {:#?}", local_dial_info_list);
 
         // Register local dial info
         for di in &local_dial_info_list {
@@ -383,7 +383,7 @@ impl Network {
         editor_public_internet: &mut RoutingDomainEditor,
         editor_local_network: &mut RoutingDomainEditor,
     ) -> EyreResult<()> {
-        trace!("starting ws listeners");
+        log_net!("starting ws listeners");
         let routing_table = self.routing_table();
         let (listen_address, url, path, detect_address_changes) = {
             let c = self.config.get();
@@ -415,7 +415,7 @@ impl Network {
                 Box::new(|c, t| Box::new(WebsocketProtocolHandler::new(c, t))),
             )
             .await?;
-        trace!("WS: listener started on {:#?}", socket_addresses);
+        log_net!("WS: listener started on {:#?}", socket_addresses);
 
         let mut static_public = false;
         let mut registered_addresses: HashSet<IpAddr> = HashSet::new();
@@ -493,7 +493,7 @@ impl Network {
         editor_public_internet: &mut RoutingDomainEditor,
         editor_local_network: &mut RoutingDomainEditor,
     ) -> EyreResult<()> {
-        trace!("starting wss listeners");
+        log_net!("starting wss listeners");
 
         let (listen_address, url, detect_address_changes) = {
             let c = self.config.get();
@@ -524,7 +524,7 @@ impl Network {
                 Box::new(|c, t| Box::new(WebsocketProtocolHandler::new(c, t))),
             )
             .await?;
-        trace!("WSS: listener started on {:#?}", socket_addresses);
+        log_net!("WSS: listener started on {:#?}", socket_addresses);
 
         // NOTE: No interface dial info for WSS, as there is no way to connect to a local dialinfo via TLS
         // If the hostname is specified, it is the public dialinfo via the URL. If no hostname
@@ -586,7 +586,7 @@ impl Network {
         editor_public_internet: &mut RoutingDomainEditor,
         editor_local_network: &mut RoutingDomainEditor,
     ) -> EyreResult<()> {
-        trace!("starting tcp listeners");
+        log_net!("starting tcp listeners");
 
         let routing_table = self.routing_table();
         let (listen_address, public_address, detect_address_changes) = {
@@ -618,7 +618,7 @@ impl Network {
                 Box::new(|c, _| Box::new(RawTcpProtocolHandler::new(c))),
             )
             .await?;
-        trace!("TCP: listener started on {:#?}", socket_addresses);
+        log_net!("TCP: listener started on {:#?}", socket_addresses);
 
         let mut static_public = false;
         let mut registered_addresses: HashSet<IpAddr> = HashSet::new();
diff --git a/veilid-core/src/network_manager/receipt_manager.rs b/veilid-core/src/network_manager/receipt_manager.rs
index 09f456c6..f1a3f619 100644
--- a/veilid-core/src/network_manager/receipt_manager.rs
+++ b/veilid-core/src/network_manager/receipt_manager.rs
@@ -185,9 +185,9 @@ impl ReceiptManager {
     }
 
     pub async fn startup(&self) -> EyreResult<()> {
-        trace!("startup receipt manager");
-        // Retrieve config
+        log_net!(debug "startup receipt manager");
 
+        // Retrieve config
         {
             // let config = self.core().config();
             // let c = config.get();
@@ -296,7 +296,7 @@ impl ReceiptManager {
     }
 
     pub async fn shutdown(&self) {
-        debug!("starting receipt manager shutdown");
+        log_net!(debug "starting receipt manager shutdown");
         let network_manager = self.network_manager();
 
         // Stop all tasks
@@ -308,13 +308,13 @@ impl ReceiptManager {
         };
 
         // Wait for everything to stop
-        debug!("waiting for timeout task to stop");
+        log_net!(debug "waiting for timeout task to stop");
         if timeout_task.join().await.is_err() {
             panic!("joining timeout task failed");
         }
 
         *self.inner.lock() = Self::new_inner(network_manager);
-        debug!("finished receipt manager shutdown");
+        log_net!(debug "finished receipt manager shutdown");
     }
 
     #[allow(dead_code)]
diff --git a/veilid-core/src/network_manager/send_data.rs b/veilid-core/src/network_manager/send_data.rs
index cc3d492f..fab8f3d1 100644
--- a/veilid-core/src/network_manager/send_data.rs
+++ b/veilid-core/src/network_manager/send_data.rs
@@ -11,47 +11,56 @@ impl NetworkManager {
     ///
     /// Sending to a node requires determining a NetworkClass compatible contact method 
     /// between the source and destination node
-    pub(crate) fn send_data(
+    pub(crate) async fn send_data(
         &self,
         destination_node_ref: NodeRef,
         data: Vec<u8>,
+    ) -> EyreResult<NetworkResult<SendDataMethod>> {
+        // First try to send data to the last flow we've seen this peer on
+        let data = if let Some(flow) = destination_node_ref.last_flow() {
+            match self
+                .net()
+                .send_data_to_existing_flow(flow, data)
+                .await?
+            {
+                SendDataToExistingFlowResult::Sent(unique_flow) => {
+                    // Update timestamp for this last flow since we just sent to it
+                    destination_node_ref
+                        .set_last_flow(unique_flow.flow, get_aligned_timestamp());
+
+                    return Ok(NetworkResult::value(SendDataMethod {
+                        opt_relayed_contact_method: None,
+                        contact_method: NodeContactMethod::Existing,
+                        unique_flow,
+                    }));
+                }
+                SendDataToExistingFlowResult::NotSent(data) => {
+                    // Couldn't send data to existing flow
+                    // so pass the data back out
+                    data
+                }
+            }
+        } else {
+            // No last connection
+            data
+        };
+
+        // No existing connection was found or usable, so we proceed to see how to make a new one
+        
+        // Get the best way to contact this node
+        let possibly_relayed_contact_method = self.get_node_contact_method(destination_node_ref.clone())?;
+
+        self.try_possibly_relayed_contact_method(possibly_relayed_contact_method, destination_node_ref, data).await
+    }
+
+    pub(crate) fn try_possibly_relayed_contact_method(&self, 
+        possibly_relayed_contact_method: NodeContactMethod,
+        destination_node_ref: NodeRef,
+        data: Vec<u8>,
     ) -> SendPinBoxFuture<EyreResult<NetworkResult<SendDataMethod>>> {
         let this = self.clone();
         Box::pin(
             async move {
-                // First try to send data to the last flow we've seen this peer on
-                let data = if let Some(flow) = destination_node_ref.last_flow() {
-                    match this
-                        .net()
-                        .send_data_to_existing_flow(flow, data)
-                        .await?
-                    {
-                        SendDataToExistingFlowResult::Sent(unique_flow) => {
-                            // Update timestamp for this last flow since we just sent to it
-                            destination_node_ref
-                                .set_last_flow(unique_flow.flow, get_aligned_timestamp());
-
-                            return Ok(NetworkResult::value(SendDataMethod {
-                                opt_relayed_contact_method: None,
-                                contact_method: NodeContactMethod::Existing,
-                                unique_flow,
-                            }));
-                        }
-                        SendDataToExistingFlowResult::NotSent(data) => {
-                            // Couldn't send data to existing flow
-                            // so pass the data back out
-                            data
-                        }
-                    }
-                } else {
-                    // No last connection
-                    data
-                };
-
-                // No existing connection was found or usable, so we proceed to see how to make a new one
-                
-                // Get the best way to contact this node
-                let possibly_relayed_contact_method = this.get_node_contact_method(destination_node_ref.clone())?;
 
                 // If we need to relay, do it
                 let (contact_method, target_node_ref, opt_relayed_contact_method) = match possibly_relayed_contact_method.clone() {
@@ -64,7 +73,7 @@ impl NetworkManager {
                 };
                 
                 #[cfg(feature = "verbose-tracing")]
-                debug!(
+                log_net!(debug 
                     "ContactMethod: {:?} for {:?}",
                     contact_method, destination_node_ref
                 );
@@ -96,16 +105,28 @@ impl NetworkManager {
                         )
                     }
                     NodeContactMethod::SignalReverse(relay_nr, target_node_ref) => {
-                        network_result_try!(
-                            this.send_data_ncm_signal_reverse(relay_nr, target_node_ref, data)
-                                .await?
-                        )
+                        let nres = 
+                            this.send_data_ncm_signal_reverse(relay_nr.clone(), target_node_ref.clone(), data.clone())
+                                .await?;
+                        if matches!(nres, NetworkResult::Timeout) {
+                            // Failed to holepunch, fallback to inbound relay
+                            log_network_result!(debug "Reverse connection failed to {}, falling back to inbound relay via {}", target_node_ref, relay_nr);
+                            network_result_try!(this.try_possibly_relayed_contact_method(NodeContactMethod::InboundRelay(relay_nr), destination_node_ref, data).await?)
+                        } else {
+                            network_result_try!(nres)
+                        }
                     }
                     NodeContactMethod::SignalHolePunch(relay_nr, target_node_ref) => {
-                        network_result_try!(
-                            this.send_data_ncm_signal_hole_punch(relay_nr, target_node_ref, data)
-                                .await?
-                        )
+                        let nres = 
+                            this.send_data_ncm_signal_hole_punch(relay_nr.clone(), target_node_ref.clone(), data.clone())
+                                .await?;
+                        if matches!(nres, NetworkResult::Timeout) {
+                            // Failed to holepunch, fallback to inbound relay
+                            log_network_result!(debug "Hole punch failed to {}, falling back to inbound relay via {}", target_node_ref, relay_nr);
+                            network_result_try!(this.try_possibly_relayed_contact_method(NodeContactMethod::InboundRelay(relay_nr), destination_node_ref, data).await?)
+                        } else {
+                            network_result_try!(nres)
+                        }
                     }
                     NodeContactMethod::Existing => {
                         network_result_try!(
@@ -304,7 +325,7 @@ impl NetworkManager {
         // First try to send data to the last socket we've seen this peer on
         let data = if let Some(flow) = node_ref.last_flow() {
             #[cfg(feature = "verbose-tracing")]
-            debug!(
+            log_net!(debug 
                 "ExistingConnection: {:?} for {:?}",
                 flow, node_ref
             );
diff --git a/veilid-core/src/network_manager/tasks/mod.rs b/veilid-core/src/network_manager/tasks/mod.rs
index fbcbc6d3..ebd47699 100644
--- a/veilid-core/src/network_manager/tasks/mod.rs
+++ b/veilid-core/src/network_manager/tasks/mod.rs
@@ -85,12 +85,12 @@ impl NetworkManager {
     }
 
     pub(crate) async fn cancel_tasks(&self) {
-        debug!("stopping rolling transfers task");
+        log_net!(debug "stopping rolling transfers task");
         if let Err(e) = self.unlocked_inner.rolling_transfers_task.stop().await {
             warn!("rolling_transfers_task not stopped: {}", e);
         }
 
-        debug!("stopping routing table tasks");
+        log_net!(debug "stopping routing table tasks");
         let routing_table = self.routing_table();
         routing_table.cancel_tasks().await;
 
diff --git a/veilid-core/src/network_manager/tasks/public_address_check.rs b/veilid-core/src/network_manager/tasks/public_address_check.rs
index faa6b69a..07fb7547 100644
--- a/veilid-core/src/network_manager/tasks/public_address_check.rs
+++ b/veilid-core/src/network_manager/tasks/public_address_check.rs
@@ -46,8 +46,7 @@ impl NetworkManager {
         flow: Flow,                    // the flow used
         reporting_peer: NodeRef,       // the peer's noderef reporting the socket address
     ) {
-        #[cfg(feature = "network-result-extra")]
-        debug!("report_global_socket_address\nsocket_address: {:#?}\nflow: {:#?}\nreporting_peer: {:#?}", socket_address, flow, reporting_peer);
+        log_network_result!("report_global_socket_address\nsocket_address: {:#?}\nflow: {:#?}\nreporting_peer: {:#?}", socket_address, flow, reporting_peer);
 
         // Ignore these reports if we are currently detecting public dial info
         let net = self.net();
@@ -172,8 +171,7 @@ impl NetworkManager {
                         .unwrap_or(false)
                 {
                     // Record the origin of the inconsistency
-                    #[cfg(feature = "network-result-extra")]
-                    debug!("inconsistency added from {:?}: reported {:?} with current_addresses = {:?}", reporting_ip_block, a, current_addresses);
+                    log_network_result!(debug "inconsistency added from {:?}: reported {:?} with current_addresses = {:?}", reporting_ip_block, a, current_addresses);
 
                     inconsistencies.push(*reporting_ip_block);
                 }
@@ -214,7 +212,7 @@ impl NetworkManager {
 
             // // debug code
             // if inconsistent {
-            //     trace!("public_address_check_cache: {:#?}\ncurrent_addresses: {:#?}\ninconsistencies: {}", inner
+            //     log_net!("public_address_check_cache: {:#?}\ncurrent_addresses: {:#?}\ninconsistencies: {}", inner
             //                 .public_address_check_cache, current_addresses, inconsistencies);
             // }
 
diff --git a/veilid-core/src/network_manager/types/address.rs b/veilid-core/src/network_manager/types/address.rs
index abd1702f..df660960 100644
--- a/veilid-core/src/network_manager/types/address.rs
+++ b/veilid-core/src/network_manager/types/address.rs
@@ -50,6 +50,7 @@ impl Address {
             Address::IPV4(v4) => {
                 ipv4addr_is_private(v4)
                     || ipv4addr_is_link_local(v4)
+                    || ipv4addr_is_shared(v4)
                     || ipv4addr_is_ietf_protocol_assignment(v4)
             }
             Address::IPV6(v6) => {
diff --git a/veilid-core/src/network_manager/wasm/mod.rs b/veilid-core/src/network_manager/wasm/mod.rs
index d648be90..b1383532 100644
--- a/veilid-core/src/network_manager/wasm/mod.rs
+++ b/veilid-core/src/network_manager/wasm/mod.rs
@@ -334,6 +334,7 @@ impl Network {
     /////////////////////////////////////////////////////////////////
 
     pub async fn startup(&self) -> EyreResult<()> {
+        log_net!(debug "starting network");
         // get protocol config
         let protocol_config = {
             let c = self.config.get();
@@ -396,6 +397,7 @@ impl Network {
         editor_public_internet.commit(true).await;
 
         self.inner.lock().network_started = true;
+        log_net!(debug "network started");
         Ok(())
     }
 
@@ -412,7 +414,7 @@ impl Network {
     }
 
     pub async fn shutdown(&self) {
-        trace!("stopping network");
+        log_net!(debug "stopping network");
 
         // Reset state
         let routing_table = self.routing_table();
@@ -429,7 +431,7 @@ impl Network {
         // Cancels all async background tasks by dropping join handles
         *self.inner.lock() = Self::new_inner();
 
-        trace!("network stopped");
+        log_net!(debug "network stopped");
     }
 
     pub fn get_preferred_local_address(&self, _dial_info: &DialInfo) -> Option<SocketAddr> {
diff --git a/veilid-core/src/routing_table/bucket_entry.rs b/veilid-core/src/routing_table/bucket_entry.rs
index eba6a8cf..b85d858e 100644
--- a/veilid-core/src/routing_table/bucket_entry.rs
+++ b/veilid-core/src/routing_table/bucket_entry.rs
@@ -932,10 +932,10 @@ impl Drop for BucketEntry {
         if self.ref_count.load(Ordering::Acquire) != 0 {
             #[cfg(feature = "tracking")]
             {
-                println!("NodeRef Tracking");
+                info!("NodeRef Tracking");
                 for (id, bt) in &mut self.node_ref_tracks {
                     bt.resolve();
-                    println!("Id: {}\n----------------\n{:#?}", id, bt);
+                    info!("Id: {}\n----------------\n{:#?}", id, bt);
                 }
             }
 
diff --git a/veilid-core/src/routing_table/mod.rs b/veilid-core/src/routing_table/mod.rs
index 10574d80..301fc3df 100644
--- a/veilid-core/src/routing_table/mod.rs
+++ b/veilid-core/src/routing_table/mod.rs
@@ -247,7 +247,7 @@ impl RoutingTable {
 
     /// Called to initialize the routing table after it is created
     pub async fn init(&self) -> EyreResult<()> {
-        debug!("starting routing table init");
+        log_rtab!(debug "starting routing table init");
 
         // Set up routing buckets
         {
@@ -256,7 +256,7 @@ impl RoutingTable {
         }
 
         // Load bucket entries from table db if possible
-        debug!("loading routing table entries");
+        log_rtab!(debug "loading routing table entries");
         if let Err(e) = self.load_buckets().await {
             log_rtab!(debug "Error loading buckets from storage: {:#?}. Resetting.", e);
             let mut inner = self.inner.write();
@@ -264,7 +264,7 @@ impl RoutingTable {
         }
 
         // Set up routespecstore
-        debug!("starting route spec store init");
+        log_rtab!(debug "starting route spec store init");
         let route_spec_store = match RouteSpecStore::load(self.clone()).await {
             Ok(v) => v,
             Err(e) => {
@@ -272,7 +272,7 @@ impl RoutingTable {
                 RouteSpecStore::new(self.clone())
             }
         };
-        debug!("finished route spec store init");
+        log_rtab!(debug "finished route spec store init");
 
         {
             let mut inner = self.inner.write();
@@ -285,13 +285,13 @@ impl RoutingTable {
             .set_routing_table(Some(self.clone()))
             .await;
 
-        debug!("finished routing table init");
+        log_rtab!(debug "finished routing table init");
         Ok(())
     }
 
     /// Called to shut down the routing table
     pub async fn terminate(&self) {
-        debug!("starting routing table terminate");
+        log_rtab!(debug "starting routing table terminate");
 
         // Stop storage manager from using us
         self.network_manager
@@ -303,12 +303,12 @@ impl RoutingTable {
         self.cancel_tasks().await;
 
         // Load bucket entries from table db if possible
-        debug!("saving routing table entries");
+        log_rtab!(debug "saving routing table entries");
         if let Err(e) = self.save_buckets().await {
             error!("failed to save routing table entries: {}", e);
         }
 
-        debug!("saving route spec store");
+        log_rtab!(debug "saving route spec store");
         let rss = {
             let mut inner = self.inner.write();
             inner.route_spec_store.take()
@@ -318,12 +318,12 @@ impl RoutingTable {
                 error!("couldn't save route spec store: {}", e);
             }
         }
-        debug!("shutting down routing table");
+        log_rtab!(debug "shutting down routing table");
 
         let mut inner = self.inner.write();
         *inner = RoutingTableInner::new(self.unlocked_inner.clone());
 
-        debug!("finished routing table terminate");
+        log_rtab!(debug "finished routing table terminate");
     }
 
     /// Serialize the routing table.
@@ -390,6 +390,15 @@ impl RoutingTable {
             for b in &c.network.routing_table.bootstrap {
                 cache_validity_key.append(&mut b.as_bytes().to_vec());
             }
+            cache_validity_key.append(
+                &mut c
+                    .network
+                    .network_key_password
+                    .clone()
+                    .unwrap_or_default()
+                    .as_bytes()
+                    .to_vec(),
+            );
         };
 
         // Deserialize bucket map and all entries from the table store
@@ -870,7 +879,15 @@ impl RoutingTable {
                     // does it have some dial info we need?
                     let filter = |n: &NodeInfo| {
                         let mut keep = false;
+                        // Bootstraps must have -only- inbound capable network class
+                        if !matches!(n.network_class(), NetworkClass::InboundCapable) {
+                            return false;
+                        }
                         for did in n.dial_info_detail_list() {
+                            // Bootstraps must have -only- direct dial info
+                            if !matches!(did.class, DialInfoClass::Direct) {
+                                return false;
+                            }
                             if matches!(did.dial_info.address_type(), AddressType::IPV4) {
                                 for (n, protocol_type) in protocol_types.iter().enumerate() {
                                     if nodes_proto_v4[n] < max_per_type
diff --git a/veilid-core/src/routing_table/route_spec_store/mod.rs b/veilid-core/src/routing_table/route_spec_store/mod.rs
index 81b58933..d051122e 100644
--- a/veilid-core/src/routing_table/route_spec_store/mod.rs
+++ b/veilid-core/src/routing_table/route_spec_store/mod.rs
@@ -849,8 +849,7 @@ impl RouteSpecStore {
         // Get all valid routes, allow routes that need testing
         // but definitely prefer routes that have been recently tested
         for (id, rssd) in inner.content.iter_details() {
-            if rssd.get_stability() >= stability
-                && rssd.is_sequencing_match(sequencing)
+            if rssd.is_sequencing_match(sequencing)
                 && rssd.hop_count() >= min_hop_count
                 && rssd.hop_count() <= max_hop_count
                 && rssd.get_directions().is_superset(directions)
@@ -864,6 +863,7 @@ impl RouteSpecStore {
 
         // Sort the routes by preference
         routes.sort_by(|a, b| {
+            // Prefer routes that don't need testing
             let a_needs_testing = a.1.get_stats().needs_testing(cur_ts);
             let b_needs_testing = b.1.get_stats().needs_testing(cur_ts);
             if !a_needs_testing && b_needs_testing {
@@ -872,6 +872,18 @@ impl RouteSpecStore {
             if !b_needs_testing && a_needs_testing {
                 return cmp::Ordering::Greater;
             }
+
+            // Prefer routes that meet the stability selection
+            let a_meets_stability = a.1.get_stability() >= stability;
+            let b_meets_stability = b.1.get_stability() >= stability;
+            if a_meets_stability && !b_meets_stability {
+                return cmp::Ordering::Less;
+            }
+            if b_meets_stability && !a_meets_stability {
+                return cmp::Ordering::Greater;
+            }
+
+            // Prefer faster routes
             let a_latency = a.1.get_stats().latency_stats().average;
             let b_latency = b.1.get_stats().latency_stats().average;
 
@@ -903,10 +915,14 @@ impl RouteSpecStore {
         F: FnMut(&RouteId, &RemotePrivateRouteInfo) -> Option<R>,
     {
         let inner = self.inner.lock();
-        let mut out = Vec::with_capacity(inner.cache.get_remote_private_route_count());
-        for info in inner.cache.iter_remote_private_routes() {
-            if let Some(x) = filter(info.0, info.1) {
-                out.push(x);
+        let cur_ts = get_aligned_timestamp();
+        let remote_route_ids = inner.cache.get_remote_private_route_ids(cur_ts);
+        let mut out = Vec::with_capacity(remote_route_ids.len());
+        for id in remote_route_ids {
+            if let Some(rpri) = inner.cache.peek_remote_private_route(cur_ts, &id) {
+                if let Some(x) = filter(&id, rpri) {
+                    out.push(x);
+                }
             }
         }
         out
@@ -916,7 +932,7 @@ impl RouteSpecStore {
     pub fn debug_route(&self, id: &RouteId) -> Option<String> {
         let inner = &mut *self.inner.lock();
         let cur_ts = get_aligned_timestamp();
-        if let Some(rpri) = inner.cache.peek_remote_private_route_mut(cur_ts, id) {
+        if let Some(rpri) = inner.cache.peek_remote_private_route(cur_ts, id) {
             return Some(format!("{:#?}", rpri));
         }
         if let Some(rssd) = inner.content.get_detail(id) {
@@ -1001,7 +1017,7 @@ impl RouteSpecStore {
                 first_hop.set_sequencing(sequencing);
 
                 // Return the compiled safety route
-                //println!("compile_safety_route profile (stub): {} us", (get_timestamp() - profile_start_ts));
+                //info!("compile_safety_route profile (stub): {} us", (get_timestamp() - profile_start_ts));
                 return Ok(CompiledRoute {
                     safety_route: SafetyRoute::new_stub(
                         routing_table.node_id(crypto_kind),
@@ -1073,7 +1089,7 @@ impl RouteSpecStore {
                     first_hop,
                 };
                 // Return compiled route
-                //println!("compile_safety_route profile (cached): {} us", (get_timestamp() - profile_start_ts));
+                //info!("compile_safety_route profile (cached): {} us", (get_timestamp() - profile_start_ts));
                 return Ok(compiled_route);
             }
         }
@@ -1192,7 +1208,7 @@ impl RouteSpecStore {
         };
 
         // Return compiled route
-        //println!("compile_safety_route profile (uncached): {} us", (get_timestamp() - profile_start_ts));
+        //info!("compile_safety_route profile (uncached): {} us", (get_timestamp() - profile_start_ts));
         Ok(compiled_route)
     }
 
@@ -1575,7 +1591,7 @@ impl RouteSpecStore {
     /// Check to see if this remote (not ours) private route has seen our current node info yet
     /// This happens when you communicate with a private route without a safety route
     pub fn has_remote_private_route_seen_our_node_info(&self, key: &PublicKey) -> bool {
-        let inner = &mut *self.inner.lock();
+        let inner = &*self.inner.lock();
 
         // Check for local route. If this is not a remote private route,
         // we may be running a test and using our own local route as the destination private route.
@@ -1586,7 +1602,7 @@ impl RouteSpecStore {
 
         if let Some(rrid) = inner.cache.get_remote_private_route_id_by_key(key) {
             let cur_ts = get_aligned_timestamp();
-            if let Some(rpri) = inner.cache.peek_remote_private_route_mut(cur_ts, &rrid) {
+            if let Some(rpri) = inner.cache.peek_remote_private_route(cur_ts, &rrid) {
                 let our_node_info_ts = self
                     .unlocked_inner
                     .routing_table
@@ -1634,7 +1650,7 @@ impl RouteSpecStore {
     }
 
     /// Get the route statistics for any route we know about, local or remote
-    pub fn with_route_stats<F, R>(&self, cur_ts: Timestamp, key: &PublicKey, f: F) -> Option<R>
+    pub fn with_route_stats_mut<F, R>(&self, cur_ts: Timestamp, key: &PublicKey, f: F) -> Option<R>
     where
         F: FnOnce(&mut RouteStats) -> R,
     {
diff --git a/veilid-core/src/routing_table/route_spec_store/remote_private_route_info.rs b/veilid-core/src/routing_table/route_spec_store/remote_private_route_info.rs
index 2174daa8..6246595b 100644
--- a/veilid-core/src/routing_table/route_spec_store/remote_private_route_info.rs
+++ b/veilid-core/src/routing_table/route_spec_store/remote_private_route_info.rs
@@ -45,7 +45,7 @@ impl RemotePrivateRouteInfo {
         &mut self.stats
     }
 
-    pub fn has_seen_our_node_info_ts(&mut self, our_node_info_ts: Timestamp) -> bool {
+    pub fn has_seen_our_node_info_ts(&self, our_node_info_ts: Timestamp) -> bool {
         self.last_seen_our_node_info_ts == our_node_info_ts
     }
     pub fn set_last_seen_our_node_info_ts(&mut self, last_seen_our_node_info_ts: Timestamp) {
diff --git a/veilid-core/src/routing_table/route_spec_store/route_spec_store_cache.rs b/veilid-core/src/routing_table/route_spec_store/route_spec_store_cache.rs
index 673ce6d3..35db90a7 100644
--- a/veilid-core/src/routing_table/route_spec_store/route_spec_store_cache.rs
+++ b/veilid-core/src/routing_table/route_spec_store/route_spec_store_cache.rs
@@ -173,16 +173,18 @@ impl RouteSpecStoreCache {
         id
     }
 
-    /// get count of remote private routes in cache
-    pub fn get_remote_private_route_count(&self) -> usize {
-        self.remote_private_route_set_cache.len()
-    }
-
     /// iterate all of the remote private routes we have in the cache
-    pub fn iter_remote_private_routes(
-        &self,
-    ) -> hashlink::linked_hash_map::Iter<RouteId, RemotePrivateRouteInfo> {
-        self.remote_private_route_set_cache.iter()
+    pub fn get_remote_private_route_ids(&self, cur_ts: Timestamp) -> Vec<RouteId> {
+        self.remote_private_route_set_cache
+            .iter()
+            .filter_map(|(id, rpri)| {
+                if !rpri.did_expire(cur_ts) {
+                    Some(*id)
+                } else {
+                    None
+                }
+            })
+            .collect()
     }
 
     /// remote private route cache accessor
@@ -217,6 +219,21 @@ impl RouteSpecStoreCache {
         None
     }
 
+    /// remote private route cache accessor without lru action
+    /// will not LRU entries but may expire entries and not return them if they are stale
+    pub fn peek_remote_private_route(
+        &self,
+        cur_ts: Timestamp,
+        id: &RouteId,
+    ) -> Option<&RemotePrivateRouteInfo> {
+        if let Some(rpri) = self.remote_private_route_set_cache.peek(id) {
+            if !rpri.did_expire(cur_ts) {
+                return Some(rpri);
+            }
+        }
+        None
+    }
+
     /// mutable remote private route cache accessor without lru action
     /// will not LRU entries but may expire entries and not return them if they are stale
     pub fn peek_remote_private_route_mut(
diff --git a/veilid-core/src/routing_table/routing_table_inner.rs b/veilid-core/src/routing_table/routing_table_inner.rs
index 1af08ccf..80c6ad1d 100644
--- a/veilid-core/src/routing_table/routing_table_inner.rs
+++ b/veilid-core/src/routing_table/routing_table_inner.rs
@@ -888,11 +888,16 @@ impl RoutingTableInner {
             }
         }
 
+        // Public internet routing domain is ready for app use,
+        // when we have proper dialinfo/networkclass
         let public_internet_ready = !matches!(
             self.get_network_class(RoutingDomain::PublicInternet)
                 .unwrap_or_default(),
             NetworkClass::Invalid
         );
+
+        // Local internet routing domain is ready for app use
+        // when we have proper dialinfo/networkclass
         let local_network_ready = !matches!(
             self.get_network_class(RoutingDomain::LocalNetwork)
                 .unwrap_or_default(),
diff --git a/veilid-core/src/routing_table/tasks/bootstrap.rs b/veilid-core/src/routing_table/tasks/bootstrap.rs
index 1cb9f43e..5d1f750b 100644
--- a/veilid-core/src/routing_table/tasks/bootstrap.rs
+++ b/veilid-core/src/routing_table/tasks/bootstrap.rs
@@ -4,6 +4,7 @@ use futures_util::stream::{FuturesUnordered, StreamExt};
 use stop_token::future::FutureExt as StopFutureExt;
 
 pub const BOOTSTRAP_TXT_VERSION_0: u8 = 0;
+pub const MIN_BOOTSTRAP_PEERS: usize = 4;
 
 #[derive(Clone, Debug)]
 pub struct BootstrapRecord {
@@ -285,8 +286,7 @@ impl RoutingTable {
                     {
                         Ok(NodeContactMethod::Direct(v)) => v,
                         Ok(v) => {
-                            log_rtab!(warn "invalid contact method for bootstrap, restarting network: {:?}", v);
-                            routing_table.network_manager().restart_network();
+                            log_rtab!(warn "invalid contact method for bootstrap, ignoring peer: {:?}", v);
                             return;
                         }
                         Err(e) => {
@@ -345,7 +345,7 @@ impl RoutingTable {
             // Do we need to bootstrap this crypto kind?
             let eckey = (RoutingDomain::PublicInternet, crypto_kind);
             let cnt = entry_count.get(&eckey).copied().unwrap_or_default();
-            if cnt == 0 {
+            if cnt < MIN_BOOTSTRAP_PEERS {
                 crypto_kinds.push(crypto_kind);
             }
         }
diff --git a/veilid-core/src/routing_table/tasks/mod.rs b/veilid-core/src/routing_table/tasks/mod.rs
index a61e5194..3ca6ce22 100644
--- a/veilid-core/src/routing_table/tasks/mod.rs
+++ b/veilid-core/src/routing_table/tasks/mod.rs
@@ -194,31 +194,31 @@ impl RoutingTable {
 
     pub(crate) async fn cancel_tasks(&self) {
         // Cancel all tasks being ticked
-        debug!("stopping rolling transfers task");
+        log_rtab!(debug "stopping rolling transfers task");
         if let Err(e) = self.unlocked_inner.rolling_transfers_task.stop().await {
             error!("rolling_transfers_task not stopped: {}", e);
         }
-        debug!("stopping kick buckets task");
+        log_rtab!(debug "stopping kick buckets task");
         if let Err(e) = self.unlocked_inner.kick_buckets_task.stop().await {
             error!("kick_buckets_task not stopped: {}", e);
         }
-        debug!("stopping bootstrap task");
+        log_rtab!(debug "stopping bootstrap task");
         if let Err(e) = self.unlocked_inner.bootstrap_task.stop().await {
             error!("bootstrap_task not stopped: {}", e);
         }
-        debug!("stopping peer minimum refresh task");
+        log_rtab!(debug "stopping peer minimum refresh task");
         if let Err(e) = self.unlocked_inner.peer_minimum_refresh_task.stop().await {
             error!("peer_minimum_refresh_task not stopped: {}", e);
         }
-        debug!("stopping ping_validator task");
+        log_rtab!(debug "stopping ping_validator task");
         if let Err(e) = self.unlocked_inner.ping_validator_task.stop().await {
             error!("ping_validator_task not stopped: {}", e);
         }
-        debug!("stopping relay management task");
+        log_rtab!(debug "stopping relay management task");
         if let Err(e) = self.unlocked_inner.relay_management_task.stop().await {
             warn!("relay_management_task not stopped: {}", e);
         }
-        debug!("stopping private route management task");
+        log_rtab!(debug "stopping private route management task");
         if let Err(e) = self
             .unlocked_inner
             .private_route_management_task
diff --git a/veilid-core/src/routing_table/tasks/ping_validator.rs b/veilid-core/src/routing_table/tasks/ping_validator.rs
index ff88b2d7..65e37cbd 100644
--- a/veilid-core/src/routing_table/tasks/ping_validator.rs
+++ b/veilid-core/src/routing_table/tasks/ping_validator.rs
@@ -105,9 +105,6 @@ impl RoutingTable {
         for relay_nr_filtered in relay_noderefs {
             let rpc = rpc.clone();
 
-            #[cfg(feature = "network-result-extra")]
-            log_rtab!(debug "--> Keepalive ping to {:?}", relay_nr_filtered);
-            #[cfg(not(feature = "network-result-extra"))]
             log_rtab!("--> Keepalive ping to {:?}", relay_nr_filtered);
 
             futurequeue.push_back(
diff --git a/veilid-core/src/routing_table/tasks/relay_management.rs b/veilid-core/src/routing_table/tasks/relay_management.rs
index b5b0bb02..2cab4218 100644
--- a/veilid-core/src/routing_table/tasks/relay_management.rs
+++ b/veilid-core/src/routing_table/tasks/relay_management.rs
@@ -23,13 +23,13 @@ impl RoutingTable {
                 let state = relay_node.state(cur_ts);
                 // Relay node is dead or no longer needed
                 if matches!(state, BucketEntryState::Dead) {
-                    debug!("Relay node died, dropping relay {}", relay_node);
+                    log_rtab!(debug "Relay node died, dropping relay {}", relay_node);
                     editor.clear_relay_node();
                     false
                 }
                 // Relay node no longer can relay
                 else if relay_node.operate(|_rti, e| !relay_node_filter(e)) {
-                    debug!(
+                    log_rtab!(debug
                         "Relay node can no longer relay, dropping relay {}",
                         relay_node
                     );
@@ -38,7 +38,7 @@ impl RoutingTable {
                 }
                 // Relay node is no longer required
                 else if !own_node_info.requires_relay() {
-                    debug!(
+                    log_rtab!(debug
                         "Relay node no longer required, dropping relay {}",
                         relay_node
                     );
@@ -47,7 +47,7 @@ impl RoutingTable {
                 }
                 // Should not have relay for invalid network class
                 else if !self.has_valid_network_class(RoutingDomain::PublicInternet) {
-                    debug!(
+                    log_rtab!(debug
                         "Invalid network class does not get a relay, dropping relay {}",
                         relay_node
                     );
@@ -75,7 +75,7 @@ impl RoutingTable {
                         false,
                     ) {
                         Ok(nr) => {
-                            debug!("Outbound relay node selected: {}", nr);
+                            log_rtab!(debug "Outbound relay node selected: {}", nr);
                             editor.set_relay_node(nr);
                             got_outbound_relay = true;
                         }
@@ -84,13 +84,13 @@ impl RoutingTable {
                         }
                     }
                 } else {
-                    debug!("Outbound relay desired but not available");
+                    log_rtab!(debug "Outbound relay desired but not available");
                 }
             }
             if !got_outbound_relay {
                 // Find a node in our routing table that is an acceptable inbound relay
                 if let Some(nr) = self.find_inbound_relay(RoutingDomain::PublicInternet, cur_ts) {
-                    debug!("Inbound relay node selected: {}", nr);
+                    log_rtab!(debug "Inbound relay node selected: {}", nr);
                     editor.set_relay_node(nr);
                 }
             }
diff --git a/veilid-core/src/rpc_processor/coders/mod.rs b/veilid-core/src/rpc_processor/coders/mod.rs
index 5b9c43b6..3778d953 100644
--- a/veilid-core/src/rpc_processor/coders/mod.rs
+++ b/veilid-core/src/rpc_processor/coders/mod.rs
@@ -27,6 +27,7 @@ mod tunnel;
 mod typed_key;
 mod typed_signature;
 
+pub(crate) use operations::MAX_INSPECT_VALUE_A_SEQS_LEN;
 pub(in crate::rpc_processor) use operations::*;
 
 pub(crate) use address::*;
@@ -60,9 +61,11 @@ pub use typed_signature::*;
 use super::*;
 
 #[derive(Debug, Clone)]
+#[allow(clippy::enum_variant_names)]
 pub(in crate::rpc_processor) enum QuestionContext {
     GetValue(ValidateGetValueContext),
     SetValue(ValidateSetValueContext),
+    InspectValue(ValidateInspectValueContext),
 }
 
 #[derive(Clone)]
diff --git a/veilid-core/src/rpc_processor/coders/operations/answer.rs b/veilid-core/src/rpc_processor/coders/operations/answer.rs
index c340adc5..257efba6 100644
--- a/veilid-core/src/rpc_processor/coders/operations/answer.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/answer.rs
@@ -12,6 +12,7 @@ impl RPCAnswer {
     pub fn validate(&mut self, validate_context: &RPCValidateContext) -> Result<(), RPCError> {
         self.detail.validate(validate_context)
     }
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         self.detail.desc()
     }
@@ -37,6 +38,7 @@ pub(in crate::rpc_processor) enum RPCAnswerDetail {
     GetValueA(Box<RPCOperationGetValueA>),
     SetValueA(Box<RPCOperationSetValueA>),
     WatchValueA(Box<RPCOperationWatchValueA>),
+    InspectValueA(Box<RPCOperationInspectValueA>),
     #[cfg(feature = "unstable-blockstore")]
     SupplyBlockA(Box<RPCOperationSupplyBlockA>),
     #[cfg(feature = "unstable-blockstore")]
@@ -50,6 +52,7 @@ pub(in crate::rpc_processor) enum RPCAnswerDetail {
 }
 
 impl RPCAnswerDetail {
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         match self {
             RPCAnswerDetail::StatusA(_) => "StatusA",
@@ -58,6 +61,7 @@ impl RPCAnswerDetail {
             RPCAnswerDetail::GetValueA(_) => "GetValueA",
             RPCAnswerDetail::SetValueA(_) => "SetValueA",
             RPCAnswerDetail::WatchValueA(_) => "WatchValueA",
+            RPCAnswerDetail::InspectValueA(_) => "InspectValueA",
             #[cfg(feature = "unstable-blockstore")]
             RPCAnswerDetail::SupplyBlockA(_) => "SupplyBlockA",
             #[cfg(feature = "unstable-blockstore")]
@@ -78,6 +82,7 @@ impl RPCAnswerDetail {
             RPCAnswerDetail::GetValueA(r) => r.validate(validate_context),
             RPCAnswerDetail::SetValueA(r) => r.validate(validate_context),
             RPCAnswerDetail::WatchValueA(r) => r.validate(validate_context),
+            RPCAnswerDetail::InspectValueA(r) => r.validate(validate_context),
             #[cfg(feature = "unstable-blockstore")]
             RPCAnswerDetail::SupplyBlockA(r) => r.validate(validate_context),
             #[cfg(feature = "unstable-blockstore")]
@@ -125,6 +130,11 @@ impl RPCAnswerDetail {
                 let out = RPCOperationWatchValueA::decode(&op_reader)?;
                 RPCAnswerDetail::WatchValueA(Box::new(out))
             }
+            veilid_capnp::answer::detail::InspectValueA(r) => {
+                let op_reader = r.map_err(RPCError::protocol)?;
+                let out = RPCOperationInspectValueA::decode(&op_reader)?;
+                RPCAnswerDetail::InspectValueA(Box::new(out))
+            }
             #[cfg(feature = "unstable-blockstore")]
             veilid_capnp::answer::detail::SupplyBlockA(r) => {
                 let op_reader = r.map_err(RPCError::protocol)?;
@@ -171,6 +181,9 @@ impl RPCAnswerDetail {
             RPCAnswerDetail::WatchValueA(d) => {
                 d.encode(&mut builder.reborrow().init_watch_value_a())
             }
+            RPCAnswerDetail::InspectValueA(d) => {
+                d.encode(&mut builder.reborrow().init_inspect_value_a())
+            }
             #[cfg(feature = "unstable-blockstore")]
             RPCAnswerDetail::SupplyBlockA(d) => {
                 d.encode(&mut builder.reborrow().init_supply_block_a())
diff --git a/veilid-core/src/rpc_processor/coders/operations/mod.rs b/veilid-core/src/rpc_processor/coders/operations/mod.rs
index c73628d1..dfeab022 100644
--- a/veilid-core/src/rpc_processor/coders/operations/mod.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/mod.rs
@@ -4,6 +4,7 @@ mod operation_app_call;
 mod operation_app_message;
 mod operation_find_node;
 mod operation_get_value;
+mod operation_inspect_value;
 mod operation_return_receipt;
 mod operation_route;
 mod operation_set_value;
@@ -35,6 +36,7 @@ pub(in crate::rpc_processor) use operation_app_call::*;
 pub(in crate::rpc_processor) use operation_app_message::*;
 pub(in crate::rpc_processor) use operation_find_node::*;
 pub(in crate::rpc_processor) use operation_get_value::*;
+pub(in crate::rpc_processor) use operation_inspect_value::*;
 pub(in crate::rpc_processor) use operation_return_receipt::*;
 pub(in crate::rpc_processor) use operation_route::*;
 pub(in crate::rpc_processor) use operation_set_value::*;
@@ -60,3 +62,5 @@ pub(in crate::rpc_processor) use operation_complete_tunnel::*;
 pub(in crate::rpc_processor) use operation_start_tunnel::*;
 
 use super::*;
+
+pub(crate) use operation_inspect_value::MAX_INSPECT_VALUE_A_SEQS_LEN;
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation.rs b/veilid-core/src/rpc_processor/coders/operations/operation.rs
index d73ddfd8..9e070ef1 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation.rs
@@ -8,6 +8,7 @@ pub(in crate::rpc_processor) enum RPCOperationKind {
 }
 
 impl RPCOperationKind {
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         match self {
             RPCOperationKind::Question(q) => q.desc(),
@@ -105,6 +106,7 @@ impl RPCOperation {
                 .validate(validate_context.crypto.clone())
                 .map_err(RPCError::protocol)?;
         }
+
         // Validate operation kind
         self.kind.validate(validate_context)
     }
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_app_call.rs b/veilid-core/src/rpc_processor/coders/operations/operation_app_call.rs
index 9f8d5262..55c435d3 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_app_call.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_app_call.rs
@@ -45,6 +45,8 @@ impl RPCOperationAppCallQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationAppCallA {
     message: Vec<u8>,
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_cancel_tunnel.rs b/veilid-core/src/rpc_processor/coders/operations/operation_cancel_tunnel.rs
index e69997db..41c34248 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_cancel_tunnel.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_cancel_tunnel.rs
@@ -38,6 +38,8 @@ impl RPCOperationCancelTunnelQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[cfg(feature = "unstable-tunnels")]
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) enum RPCOperationCancelTunnelA {
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_complete_tunnel.rs b/veilid-core/src/rpc_processor/coders/operations/operation_complete_tunnel.rs
index 0a429877..36a4b695 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_complete_tunnel.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_complete_tunnel.rs
@@ -75,6 +75,8 @@ impl RPCOperationCompleteTunnelQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[cfg(feature = "unstable-tunnels")]
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) enum RPCOperationCompleteTunnelA {
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_find_block.rs b/veilid-core/src/rpc_processor/coders/operations/operation_find_block.rs
index 73a2c705..1fe48924 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_find_block.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_find_block.rs
@@ -44,6 +44,8 @@ impl RPCOperationFindBlockQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationFindBlockA {
     data: Vec<u8>,
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_find_node.rs b/veilid-core/src/rpc_processor/coders/operations/operation_find_node.rs
index a0d414f6..26efcc98 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_find_node.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_find_node.rs
@@ -73,6 +73,8 @@ impl RPCOperationFindNodeQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationFindNodeA {
     peers: Vec<PeerInfo>,
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_get_value.rs b/veilid-core/src/rpc_processor/coders/operations/operation_get_value.rs
index e9af8d5c..f56a3a42 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_get_value.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_get_value.rs
@@ -75,6 +75,8 @@ impl RPCOperationGetValueQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationGetValueA {
     value: Option<SignedValueData>,
@@ -109,30 +111,36 @@ impl RPCOperationGetValueA {
             panic!("Wrong context type for GetValueA");
         };
 
-        if let Some(value) = &self.value {
-            // Get descriptor to validate with
-            let descriptor = if let Some(descriptor) = &self.descriptor {
-                if let Some(last_descriptor) = &get_value_context.last_descriptor {
-                    if descriptor.cmp_no_sig(last_descriptor) != cmp::Ordering::Equal {
-                        return Err(RPCError::protocol(
-                            "getvalue descriptor does not match last descriptor",
-                        ));
-                    }
-                }
-                descriptor
-            } else {
-                let Some(descriptor) = &get_value_context.last_descriptor else {
-                    return Err(RPCError::protocol(
-                        "no last descriptor, requires a descriptor",
-                    ));
-                };
-                descriptor
-            };
+        // Validate descriptor
+        if let Some(descriptor) = &self.descriptor {
             // Ensure the descriptor itself validates
             descriptor
                 .validate(get_value_context.vcrypto.clone())
                 .map_err(RPCError::protocol)?;
 
+            // Ensure descriptor matches last one
+            if let Some(last_descriptor) = &get_value_context.last_descriptor {
+                if descriptor.cmp_no_sig(last_descriptor) != cmp::Ordering::Equal {
+                    return Err(RPCError::protocol(
+                        "GetValue descriptor does not match last descriptor",
+                    ));
+                }
+            }
+        }
+
+        // Ensure the value validates
+        if let Some(value) = &self.value {
+            // Get descriptor to validate with
+            let Some(descriptor) = self
+                .descriptor
+                .as_ref()
+                .or(get_value_context.last_descriptor.as_ref())
+            else {
+                return Err(RPCError::protocol(
+                    "no last descriptor, requires a descriptor",
+                ));
+            };
+
             // And the signed value data
             value
                 .validate(
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_inspect_value.rs b/veilid-core/src/rpc_processor/coders/operations/operation_inspect_value.rs
new file mode 100644
index 00000000..197943e9
--- /dev/null
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_inspect_value.rs
@@ -0,0 +1,288 @@
+use super::*;
+use crate::storage_manager::SignedValueDescriptor;
+
+const MAX_INSPECT_VALUE_Q_SUBKEY_RANGES_LEN: usize = 512;
+pub(crate) const MAX_INSPECT_VALUE_A_SEQS_LEN: usize = 512;
+const MAX_INSPECT_VALUE_A_PEERS_LEN: usize = 20;
+
+#[derive(Clone)]
+pub(in crate::rpc_processor) struct ValidateInspectValueContext {
+    pub last_descriptor: Option<SignedValueDescriptor>,
+    pub subkeys: ValueSubkeyRangeSet,
+    pub vcrypto: CryptoSystemVersion,
+}
+
+impl fmt::Debug for ValidateInspectValueContext {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ValidateInspectValueContext")
+            .field("last_descriptor", &self.last_descriptor)
+            .field("vcrypto", &self.vcrypto.kind().to_string())
+            .finish()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub(in crate::rpc_processor) struct RPCOperationInspectValueQ {
+    key: TypedKey,
+    subkeys: ValueSubkeyRangeSet,
+    want_descriptor: bool,
+}
+
+impl RPCOperationInspectValueQ {
+    pub fn new(
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        want_descriptor: bool,
+    ) -> Result<Self, RPCError> {
+        Ok(Self {
+            key,
+            subkeys,
+            want_descriptor,
+        })
+    }
+    pub fn validate(&mut self, _validate_context: &RPCValidateContext) -> Result<(), RPCError> {
+        Ok(())
+    }
+
+    // pub fn key(&self) -> &TypedKey {
+    //     &self.key
+    // }
+    // pub fn subkeys(&self) -> &ValueSubkeyRangeSet {
+    //     &self.subkeys
+    // }
+    // pub fn want_descriptor(&self) -> bool {
+    //     self.want_descriptor
+    // }
+    pub fn destructure(self) -> (TypedKey, ValueSubkeyRangeSet, bool) {
+        (self.key, self.subkeys, self.want_descriptor)
+    }
+
+    pub fn decode(
+        reader: &veilid_capnp::operation_inspect_value_q::Reader,
+    ) -> Result<Self, RPCError> {
+        let k_reader = reader.reborrow().get_key().map_err(RPCError::protocol)?;
+        let key = decode_typed_key(&k_reader)?;
+        let sk_reader = reader.get_subkeys().map_err(RPCError::protocol)?;
+        // Maximum number of ranges that can hold the maximum number of subkeys is one subkey per range
+        if sk_reader.len() as usize > MAX_INSPECT_VALUE_Q_SUBKEY_RANGES_LEN {
+            return Err(RPCError::protocol("InspectValueQ too many subkey ranges"));
+        }
+        let mut subkeys = ValueSubkeyRangeSet::new();
+        for skr in sk_reader.iter() {
+            let vskr = (skr.get_start(), skr.get_end());
+            if vskr.0 > vskr.1 {
+                return Err(RPCError::protocol("invalid subkey range"));
+            }
+            if let Some(lvskr) = subkeys.last() {
+                if lvskr >= vskr.0 {
+                    return Err(RPCError::protocol(
+                        "subkey range out of order or not merged",
+                    ));
+                }
+            }
+            subkeys.ranges_insert(vskr.0..=vskr.1);
+        }
+
+        let want_descriptor = reader.reborrow().get_want_descriptor();
+        Ok(Self {
+            key,
+            subkeys,
+            want_descriptor,
+        })
+    }
+    pub fn encode(
+        &self,
+        builder: &mut veilid_capnp::operation_inspect_value_q::Builder,
+    ) -> Result<(), RPCError> {
+        let mut k_builder = builder.reborrow().init_key();
+        encode_typed_key(&self.key, &mut k_builder);
+
+        let mut sk_builder = builder.reborrow().init_subkeys(
+            self.subkeys
+                .ranges_len()
+                .try_into()
+                .map_err(RPCError::map_internal("invalid subkey range list length"))?,
+        );
+        for (i, skr) in self.subkeys.ranges().enumerate() {
+            let mut skr_builder = sk_builder.reborrow().get(i as u32);
+            skr_builder.set_start(*skr.start());
+            skr_builder.set_end(*skr.end());
+        }
+        builder.set_want_descriptor(self.want_descriptor);
+        Ok(())
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, Clone)]
+pub(in crate::rpc_processor) struct RPCOperationInspectValueA {
+    seqs: Vec<ValueSeqNum>,
+    peers: Vec<PeerInfo>,
+    descriptor: Option<SignedValueDescriptor>,
+}
+
+impl RPCOperationInspectValueA {
+    pub fn new(
+        seqs: Vec<ValueSeqNum>,
+        peers: Vec<PeerInfo>,
+        descriptor: Option<SignedValueDescriptor>,
+    ) -> Result<Self, RPCError> {
+        if seqs.len() > MAX_INSPECT_VALUE_A_SEQS_LEN {
+            return Err(RPCError::protocol(
+                "encoded InspectValueA seqs length too long",
+            ));
+        }
+        if peers.len() > MAX_INSPECT_VALUE_A_PEERS_LEN {
+            return Err(RPCError::protocol(
+                "encoded InspectValueA peers length too long",
+            ));
+        }
+        Ok(Self {
+            seqs,
+            peers,
+            descriptor,
+        })
+    }
+
+    pub fn validate(&mut self, validate_context: &RPCValidateContext) -> Result<(), RPCError> {
+        let question_context = validate_context
+            .question_context
+            .as_ref()
+            .expect("InspectValueA requires question context");
+        let QuestionContext::InspectValue(inspect_value_context) = question_context else {
+            panic!("Wrong context type for InspectValueA");
+        };
+
+        // Ensure seqs returned does not exceeed subkeys requested
+        #[allow(clippy::unnecessary_cast)]
+        if self.seqs.len() as u64 > inspect_value_context.subkeys.len() as u64 {
+            return Err(RPCError::protocol(format!(
+                "InspectValue seqs length is greater than subkeys requested: {} > {}",
+                self.seqs.len(),
+                inspect_value_context.subkeys.len()
+            )));
+        }
+
+        // Validate descriptor
+        if let Some(descriptor) = &self.descriptor {
+            // Ensure the descriptor itself validates
+            descriptor
+                .validate(inspect_value_context.vcrypto.clone())
+                .map_err(RPCError::protocol)?;
+
+            // Ensure descriptor matches last one
+            if let Some(last_descriptor) = &inspect_value_context.last_descriptor {
+                if descriptor.cmp_no_sig(last_descriptor) != cmp::Ordering::Equal {
+                    return Err(RPCError::protocol(
+                        "InspectValue descriptor does not match last descriptor",
+                    ));
+                }
+            }
+        }
+
+        PeerInfo::validate_vec(&mut self.peers, validate_context.crypto.clone());
+        Ok(())
+    }
+
+    // pub fn seqs(&self) -> &[ValueSeqNum] {
+    //     &self.seqs
+    // }
+    // pub fn peers(&self) -> &[PeerInfo] {
+    //     &self.peers
+    // }
+    // pub fn descriptor(&self) -> Option<&SignedValueDescriptor> {
+    //     self.descriptor.as_ref()
+    // }
+    pub fn destructure(
+        self,
+    ) -> (
+        Vec<ValueSeqNum>,
+        Vec<PeerInfo>,
+        Option<SignedValueDescriptor>,
+    ) {
+        (self.seqs, self.peers, self.descriptor)
+    }
+
+    pub fn decode(
+        reader: &veilid_capnp::operation_inspect_value_a::Reader,
+    ) -> Result<Self, RPCError> {
+        let seqs = if reader.has_seqs() {
+            let seqs_reader = reader.get_seqs().map_err(RPCError::protocol)?;
+            if seqs_reader.len() as usize > MAX_INSPECT_VALUE_A_SEQS_LEN {
+                return Err(RPCError::protocol(
+                    "decoded InspectValueA seqs length too long",
+                ));
+            }
+            let Some(seqs) = seqs_reader.as_slice().map(|s| s.to_vec()) else {
+                return Err(RPCError::protocol("invalid decoded InspectValueA seqs"));
+            };
+            seqs
+        } else {
+            return Err(RPCError::protocol("missing decoded InspectValueA seqs"));
+        };
+
+        let peers_reader = reader.get_peers().map_err(RPCError::protocol)?;
+        if peers_reader.len() as usize > MAX_INSPECT_VALUE_A_PEERS_LEN {
+            return Err(RPCError::protocol(
+                "decoded InspectValueA peers length too long",
+            ));
+        }
+        let mut peers = Vec::<PeerInfo>::with_capacity(
+            peers_reader
+                .len()
+                .try_into()
+                .map_err(RPCError::map_internal("too many peers"))?,
+        );
+        for p in peers_reader.iter() {
+            let peer_info = decode_peer_info(&p)?;
+            peers.push(peer_info);
+        }
+
+        let descriptor = if reader.has_descriptor() {
+            let d_reader = reader.get_descriptor().map_err(RPCError::protocol)?;
+            let descriptor = decode_signed_value_descriptor(&d_reader)?;
+            Some(descriptor)
+        } else {
+            None
+        };
+
+        Ok(Self {
+            seqs,
+            peers,
+            descriptor,
+        })
+    }
+    pub fn encode(
+        &self,
+        builder: &mut veilid_capnp::operation_inspect_value_a::Builder,
+    ) -> Result<(), RPCError> {
+        let mut seqs_builder = builder.reborrow().init_seqs(
+            self.seqs
+                .len()
+                .try_into()
+                .map_err(RPCError::map_internal("invalid seqs list length"))?,
+        );
+        for (i, seq) in self.seqs.iter().enumerate() {
+            seqs_builder.set(i as u32, *seq);
+        }
+
+        let mut peers_builder = builder.reborrow().init_peers(
+            self.peers
+                .len()
+                .try_into()
+                .map_err(RPCError::map_internal("invalid peers list length"))?,
+        );
+        for (i, peer) in self.peers.iter().enumerate() {
+            let mut pi_builder = peers_builder.reborrow().get(i as u32);
+            encode_peer_info(peer, &mut pi_builder)?;
+        }
+
+        if let Some(descriptor) = &self.descriptor {
+            let mut d_builder = builder.reborrow().init_descriptor();
+            encode_signed_value_descriptor(descriptor, &mut d_builder)?;
+        }
+
+        Ok(())
+    }
+}
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_set_value.rs b/veilid-core/src/rpc_processor/coders/operations/operation_set_value.rs
index be7ba9a3..45d00643 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_set_value.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_set_value.rs
@@ -109,6 +109,8 @@ impl RPCOperationSetValueQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationSetValueA {
     set: bool,
@@ -139,13 +141,13 @@ impl RPCOperationSetValueA {
             panic!("Wrong context type for SetValueA");
         };
 
-        if let Some(value) = &self.value {
-            // Ensure the descriptor itself validates
-            set_value_context
-                .descriptor
-                .validate(set_value_context.vcrypto.clone())
-                .map_err(RPCError::protocol)?;
+        // Ensure the descriptor itself validates
+        set_value_context
+            .descriptor
+            .validate(set_value_context.vcrypto.clone())
+            .map_err(RPCError::protocol)?;
 
+        if let Some(value) = &self.value {
             // And the signed value data
             value
                 .validate(
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_start_tunnel.rs b/veilid-core/src/rpc_processor/coders/operations/operation_start_tunnel.rs
index e9b2fe24..3b7d8ff4 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_start_tunnel.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_start_tunnel.rs
@@ -65,6 +65,8 @@ impl RPCOperationStartTunnelQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[cfg(feature = "unstable-tunnels")]
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) enum RPCOperationStartTunnelA {
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_status.rs b/veilid-core/src/rpc_processor/coders/operations/operation_status.rs
index f2725c18..f77f5baf 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_status.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_status.rs
@@ -42,6 +42,8 @@ impl RPCOperationStatusQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationStatusA {
     node_status: Option<NodeStatus>,
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_supply_block.rs b/veilid-core/src/rpc_processor/coders/operations/operation_supply_block.rs
index e9a618b9..dbfa1a5c 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_supply_block.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_supply_block.rs
@@ -42,6 +42,8 @@ impl RPCOperationSupplyBlockQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationSupplyBlockA {
     expiration: u64,
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_value_changed.rs b/veilid-core/src/rpc_processor/coders/operations/operation_value_changed.rs
index 1fecc143..3340ce2f 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_value_changed.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_value_changed.rs
@@ -1,13 +1,14 @@
 use super::*;
 use crate::storage_manager::SignedValueData;
 
-const MAX_VALUE_CHANGED_SUBKEYS_LEN: usize = 512;
+const MAX_VALUE_CHANGED_SUBKEY_RANGES_LEN: usize = 512;
 
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationValueChanged {
     key: TypedKey,
     subkeys: ValueSubkeyRangeSet,
     count: u32,
+    watch_id: u64,
     value: SignedValueData,
 }
 
@@ -17,26 +18,33 @@ impl RPCOperationValueChanged {
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
         count: u32,
+        watch_id: u64,
         value: SignedValueData,
     ) -> Result<Self, RPCError> {
-        // Needed because RangeSetBlaze uses different types here all the time
-        #[allow(clippy::unnecessary_cast)]
-        let subkeys_len = subkeys.ranges_len() as usize;
+        if subkeys.ranges_len() > MAX_VALUE_CHANGED_SUBKEY_RANGES_LEN {
+            return Err(RPCError::protocol(
+                "ValueChanged subkey ranges length too long",
+            ));
+        }
 
-        if subkeys_len > MAX_VALUE_CHANGED_SUBKEYS_LEN {
-            return Err(RPCError::protocol("ValueChanged subkeys length too long"));
+        if watch_id == 0 {
+            return Err(RPCError::protocol("ValueChanged needs a nonzero watch id"));
         }
 
         Ok(Self {
             key,
             subkeys,
             count,
+            watch_id,
             value,
         })
     }
 
     pub fn validate(&mut self, _validate_context: &RPCValidateContext) -> Result<(), RPCError> {
-        // validation must be done by storage manager as this is more complicated
+        if self.watch_id == 0 {
+            return Err(RPCError::protocol("ValueChanged does not have a valid id"));
+        }
+        // further validation must be done by storage manager as this is more complicated
         Ok(())
     }
 
@@ -55,14 +63,25 @@ impl RPCOperationValueChanged {
         self.count
     }
 
+    #[allow(dead_code)]
+    pub fn watch_id(&self) -> u64 {
+        self.watch_id
+    }
+
     #[allow(dead_code)]
     pub fn value(&self) -> &SignedValueData {
         &self.value
     }
 
     #[allow(dead_code)]
-    pub fn destructure(self) -> (TypedKey, ValueSubkeyRangeSet, u32, SignedValueData) {
-        (self.key, self.subkeys, self.count, self.value)
+    pub fn destructure(self) -> (TypedKey, ValueSubkeyRangeSet, u32, u64, SignedValueData) {
+        (
+            self.key,
+            self.subkeys,
+            self.count,
+            self.watch_id,
+            self.value,
+        )
     }
 
     pub fn decode(
@@ -72,8 +91,10 @@ impl RPCOperationValueChanged {
         let key = decode_typed_key(&k_reader)?;
 
         let sk_reader = reader.get_subkeys().map_err(RPCError::protocol)?;
-        if sk_reader.len() as usize > MAX_VALUE_CHANGED_SUBKEYS_LEN {
-            return Err(RPCError::protocol("ValueChanged subkeys length too long"));
+        if sk_reader.len() as usize > MAX_VALUE_CHANGED_SUBKEY_RANGES_LEN {
+            return Err(RPCError::protocol(
+                "ValueChanged subkey ranges length too long",
+            ));
         }
 
         let mut subkeys = ValueSubkeyRangeSet::new();
@@ -93,11 +114,14 @@ impl RPCOperationValueChanged {
         }
         let count = reader.get_count();
         let v_reader = reader.get_value().map_err(RPCError::protocol)?;
+        let watch_id = reader.get_watch_id();
         let value = decode_signed_value_data(&v_reader)?;
+
         Ok(Self {
             key,
             subkeys,
             count,
+            watch_id,
             value,
         })
     }
@@ -121,6 +145,7 @@ impl RPCOperationValueChanged {
         }
 
         builder.set_count(self.count);
+        builder.set_watch_id(self.watch_id);
 
         let mut v_builder = builder.reborrow().init_value();
         encode_signed_value_data(&self.value, &mut v_builder)?;
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs b/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
index bc137b74..3eb12eed 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-const MAX_WATCH_VALUE_Q_SUBKEYS_LEN: usize = 512;
+const MAX_WATCH_VALUE_Q_SUBKEY_RANGES_LEN: usize = 512;
 const MAX_WATCH_VALUE_A_PEERS_LEN: usize = 20;
 
 #[derive(Debug, Clone)]
@@ -9,6 +9,7 @@ pub(in crate::rpc_processor) struct RPCOperationWatchValueQ {
     subkeys: ValueSubkeyRangeSet,
     expiration: u64,
     count: u32,
+    watch_id: Option<u64>,
     watcher: PublicKey,
     signature: Signature,
 }
@@ -20,18 +21,20 @@ impl RPCOperationWatchValueQ {
         subkeys: ValueSubkeyRangeSet,
         expiration: u64,
         count: u32,
+        watch_id: Option<u64>,
         watcher: KeyPair,
         vcrypto: CryptoSystemVersion,
     ) -> Result<Self, RPCError> {
-        // Needed because RangeSetBlaze uses different types here all the time
-        #[allow(clippy::unnecessary_cast)]
-        let subkeys_len = subkeys.ranges_len() as usize;
-
-        if subkeys_len > MAX_WATCH_VALUE_Q_SUBKEYS_LEN {
+        if subkeys.ranges_len() > MAX_WATCH_VALUE_Q_SUBKEY_RANGES_LEN {
             return Err(RPCError::protocol("WatchValueQ subkeys length too long"));
         }
 
-        let signature_data = Self::make_signature_data(&key, &subkeys, expiration, count);
+        // Count is zero means cancelling, so there should always be a watch id in this case
+        if count == 0 && watch_id.is_none() {
+            return Err(RPCError::protocol("can't cancel zero watch id"));
+        }
+
+        let signature_data = Self::make_signature_data(&key, &subkeys, expiration, count, watch_id);
         let signature = vcrypto
             .sign(&watcher.key, &watcher.secret, &signature_data)
             .map_err(RPCError::protocol)?;
@@ -41,6 +44,7 @@ impl RPCOperationWatchValueQ {
             subkeys,
             expiration,
             count,
+            watch_id,
             watcher: watcher.key,
             signature,
         })
@@ -52,12 +56,12 @@ impl RPCOperationWatchValueQ {
         subkeys: &ValueSubkeyRangeSet,
         expiration: u64,
         count: u32,
+        watch_id: Option<u64>,
     ) -> Vec<u8> {
-        // Needed because RangeSetBlaze uses different types here all the time
-        #[allow(clippy::unnecessary_cast)]
-        let subkeys_len = subkeys.ranges_len() as usize;
+        let subkeys_ranges_len = subkeys.ranges_len();
 
-        let mut sig_data = Vec::with_capacity(PUBLIC_KEY_LENGTH + 4 + (subkeys_len * 8) + 8 + 4);
+        let mut sig_data =
+            Vec::with_capacity(PUBLIC_KEY_LENGTH + 4 + (subkeys_ranges_len * 8) + 8 + 8);
         sig_data.extend_from_slice(&key.kind.0);
         sig_data.extend_from_slice(&key.value.bytes);
         for sk in subkeys.ranges() {
@@ -66,6 +70,9 @@ impl RPCOperationWatchValueQ {
         }
         sig_data.extend_from_slice(&expiration.to_le_bytes());
         sig_data.extend_from_slice(&count.to_le_bytes());
+        if let Some(watch_id) = watch_id {
+            sig_data.extend_from_slice(&watch_id.to_le_bytes());
+        }
         sig_data
     }
 
@@ -74,11 +81,22 @@ impl RPCOperationWatchValueQ {
             return Err(RPCError::protocol("unsupported cryptosystem"));
         };
 
-        let sig_data =
-            Self::make_signature_data(&self.key, &self.subkeys, self.expiration, self.count);
+        let sig_data = Self::make_signature_data(
+            &self.key,
+            &self.subkeys,
+            self.expiration,
+            self.count,
+            self.watch_id,
+        );
         vcrypto
             .verify(&self.watcher, &sig_data, &self.signature)
             .map_err(RPCError::protocol)?;
+
+        // Count is zero means cancelling, so there should always be a watch id in this case
+        if self.count == 0 && self.watch_id.is_none() {
+            return Err(RPCError::protocol("can't cancel zero watch id"));
+        }
+
         Ok(())
     }
 
@@ -102,6 +120,11 @@ impl RPCOperationWatchValueQ {
         self.count
     }
 
+    #[allow(dead_code)]
+    pub fn watch_id(&self) -> Option<u64> {
+        self.watch_id
+    }
+
     #[allow(dead_code)]
     pub fn watcher(&self) -> &PublicKey {
         &self.watcher
@@ -118,6 +141,7 @@ impl RPCOperationWatchValueQ {
         ValueSubkeyRangeSet,
         u64,
         u32,
+        Option<u64>,
         PublicKey,
         Signature,
     ) {
@@ -126,6 +150,7 @@ impl RPCOperationWatchValueQ {
             self.subkeys,
             self.expiration,
             self.count,
+            self.watch_id,
             self.watcher,
             self.signature,
         )
@@ -138,8 +163,8 @@ impl RPCOperationWatchValueQ {
         let key = decode_typed_key(&k_reader)?;
 
         let sk_reader = reader.get_subkeys().map_err(RPCError::protocol)?;
-        if sk_reader.len() as usize > MAX_WATCH_VALUE_Q_SUBKEYS_LEN {
-            return Err(RPCError::protocol("WatchValueQ subkeys length too long"));
+        if sk_reader.len() as usize > MAX_WATCH_VALUE_Q_SUBKEY_RANGES_LEN {
+            return Err(RPCError::protocol("WatchValueQ too many subkey ranges"));
         }
         let mut subkeys = ValueSubkeyRangeSet::new();
         for skr in sk_reader.iter() {
@@ -159,6 +184,11 @@ impl RPCOperationWatchValueQ {
 
         let expiration = reader.get_expiration();
         let count = reader.get_count();
+        let watch_id = if reader.get_watch_id() != 0 {
+            Some(reader.get_watch_id())
+        } else {
+            None
+        };
 
         let w_reader = reader.get_watcher().map_err(RPCError::protocol)?;
         let watcher = decode_key256(&w_reader);
@@ -171,6 +201,7 @@ impl RPCOperationWatchValueQ {
             subkeys,
             expiration,
             count,
+            watch_id,
             watcher,
             signature,
         })
@@ -196,6 +227,7 @@ impl RPCOperationWatchValueQ {
         }
         builder.set_expiration(self.expiration);
         builder.set_count(self.count);
+        builder.set_watch_id(self.watch_id.unwrap_or(0u64));
 
         let mut w_builder = builder.reborrow().init_watcher();
         encode_key256(&self.watcher, &mut w_builder);
@@ -207,19 +239,33 @@ impl RPCOperationWatchValueQ {
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub(in crate::rpc_processor) struct RPCOperationWatchValueA {
+    accepted: bool,
     expiration: u64,
     peers: Vec<PeerInfo>,
+    watch_id: u64,
 }
 
 impl RPCOperationWatchValueA {
     #[allow(dead_code)]
-    pub fn new(expiration: u64, peers: Vec<PeerInfo>) -> Result<Self, RPCError> {
+    pub fn new(
+        accepted: bool,
+        expiration: u64,
+        peers: Vec<PeerInfo>,
+        watch_id: u64,
+    ) -> Result<Self, RPCError> {
         if peers.len() > MAX_WATCH_VALUE_A_PEERS_LEN {
             return Err(RPCError::protocol("WatchValueA peers length too long"));
         }
-        Ok(Self { expiration, peers })
+        Ok(Self {
+            accepted,
+            expiration,
+            peers,
+            watch_id,
+        })
     }
 
     pub fn validate(&mut self, validate_context: &RPCValidateContext) -> Result<(), RPCError> {
@@ -227,6 +273,10 @@ impl RPCOperationWatchValueA {
         Ok(())
     }
 
+    #[allow(dead_code)]
+    pub fn accepted(&self) -> bool {
+        self.accepted
+    }
     #[allow(dead_code)]
     pub fn expiration(&self) -> u64 {
         self.expiration
@@ -236,13 +286,18 @@ impl RPCOperationWatchValueA {
         &self.peers
     }
     #[allow(dead_code)]
-    pub fn destructure(self) -> (u64, Vec<PeerInfo>) {
-        (self.expiration, self.peers)
+    pub fn watch_id(&self) -> u64 {
+        self.watch_id
+    }
+    #[allow(dead_code)]
+    pub fn destructure(self) -> (bool, u64, Vec<PeerInfo>, u64) {
+        (self.accepted, self.expiration, self.peers, self.watch_id)
     }
 
     pub fn decode(
         reader: &veilid_capnp::operation_watch_value_a::Reader,
     ) -> Result<Self, RPCError> {
+        let accepted = reader.get_accepted();
         let expiration = reader.get_expiration();
         let peers_reader = reader.get_peers().map_err(RPCError::protocol)?;
         if peers_reader.len() as usize > MAX_WATCH_VALUE_A_PEERS_LEN {
@@ -258,13 +313,20 @@ impl RPCOperationWatchValueA {
             let peer_info = decode_peer_info(&p)?;
             peers.push(peer_info);
         }
+        let watch_id = reader.get_watch_id();
 
-        Ok(Self { expiration, peers })
+        Ok(Self {
+            accepted,
+            expiration,
+            peers,
+            watch_id,
+        })
     }
     pub fn encode(
         &self,
         builder: &mut veilid_capnp::operation_watch_value_a::Builder,
     ) -> Result<(), RPCError> {
+        builder.set_accepted(self.accepted);
         builder.set_expiration(self.expiration);
 
         let mut peers_builder = builder.reborrow().init_peers(
@@ -277,6 +339,7 @@ impl RPCOperationWatchValueA {
             let mut pi_builder = peers_builder.reborrow().get(i as u32);
             encode_peer_info(peer, &mut pi_builder)?;
         }
+        builder.set_watch_id(self.watch_id);
 
         Ok(())
     }
diff --git a/veilid-core/src/rpc_processor/coders/operations/question.rs b/veilid-core/src/rpc_processor/coders/operations/question.rs
index 566e225d..bf36b35e 100644
--- a/veilid-core/src/rpc_processor/coders/operations/question.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/question.rs
@@ -20,6 +20,7 @@ impl RPCQuestion {
     pub fn detail(&self) -> &RPCQuestionDetail {
         &self.detail
     }
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         self.detail.desc()
     }
@@ -49,6 +50,7 @@ pub(in crate::rpc_processor) enum RPCQuestionDetail {
     GetValueQ(Box<RPCOperationGetValueQ>),
     SetValueQ(Box<RPCOperationSetValueQ>),
     WatchValueQ(Box<RPCOperationWatchValueQ>),
+    InspectValueQ(Box<RPCOperationInspectValueQ>),
     #[cfg(feature = "unstable-blockstore")]
     SupplyBlockQ(Box<RPCOperationSupplyBlockQ>),
     #[cfg(feature = "unstable-blockstore")]
@@ -62,6 +64,7 @@ pub(in crate::rpc_processor) enum RPCQuestionDetail {
 }
 
 impl RPCQuestionDetail {
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         match self {
             RPCQuestionDetail::StatusQ(_) => "StatusQ",
@@ -70,6 +73,7 @@ impl RPCQuestionDetail {
             RPCQuestionDetail::GetValueQ(_) => "GetValueQ",
             RPCQuestionDetail::SetValueQ(_) => "SetValueQ",
             RPCQuestionDetail::WatchValueQ(_) => "WatchValueQ",
+            RPCQuestionDetail::InspectValueQ(_) => "InspectValueQ",
             #[cfg(feature = "unstable-blockstore")]
             RPCQuestionDetail::SupplyBlockQ(_) => "SupplyBlockQ",
             #[cfg(feature = "unstable-blockstore")]
@@ -90,6 +94,7 @@ impl RPCQuestionDetail {
             RPCQuestionDetail::GetValueQ(r) => r.validate(validate_context),
             RPCQuestionDetail::SetValueQ(r) => r.validate(validate_context),
             RPCQuestionDetail::WatchValueQ(r) => r.validate(validate_context),
+            RPCQuestionDetail::InspectValueQ(r) => r.validate(validate_context),
             #[cfg(feature = "unstable-blockstore")]
             RPCQuestionDetail::SupplyBlockQ(r) => r.validate(validate_context),
             #[cfg(feature = "unstable-blockstore")]
@@ -138,6 +143,11 @@ impl RPCQuestionDetail {
                 let out = RPCOperationWatchValueQ::decode(&op_reader)?;
                 RPCQuestionDetail::WatchValueQ(Box::new(out))
             }
+            veilid_capnp::question::detail::InspectValueQ(r) => {
+                let op_reader = r.map_err(RPCError::protocol)?;
+                let out = RPCOperationInspectValueQ::decode(&op_reader)?;
+                RPCQuestionDetail::InspectValueQ(Box::new(out))
+            }
             #[cfg(feature = "unstable-blockstore")]
             veilid_capnp::question::detail::SupplyBlockQ(r) => {
                 let op_reader = r.map_err(RPCError::protocol)?;
@@ -184,6 +194,9 @@ impl RPCQuestionDetail {
             RPCQuestionDetail::WatchValueQ(d) => {
                 d.encode(&mut builder.reborrow().init_watch_value_q())
             }
+            RPCQuestionDetail::InspectValueQ(d) => {
+                d.encode(&mut builder.reborrow().init_inspect_value_q())
+            }
             #[cfg(feature = "unstable-blockstore")]
             RPCQuestionDetail::SupplyBlockQ(d) => {
                 d.encode(&mut builder.reborrow().init_supply_block_q())
diff --git a/veilid-core/src/rpc_processor/coders/operations/statement.rs b/veilid-core/src/rpc_processor/coders/operations/statement.rs
index 98fe146d..0395afa6 100644
--- a/veilid-core/src/rpc_processor/coders/operations/statement.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/statement.rs
@@ -15,6 +15,7 @@ impl RPCStatement {
     pub fn detail(&self) -> &RPCStatementDetail {
         &self.detail
     }
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         self.detail.desc()
     }
@@ -43,6 +44,7 @@ pub(in crate::rpc_processor) enum RPCStatementDetail {
 }
 
 impl RPCStatementDetail {
+    #[cfg(feature = "verbose-tracing")]
     pub fn desc(&self) -> &'static str {
         match self {
             RPCStatementDetail::ValidateDialInfo(_) => "ValidateDialInfo",
diff --git a/veilid-core/src/rpc_processor/fanout_call.rs b/veilid-core/src/rpc_processor/fanout_call.rs
index 70813534..7b7330ba 100644
--- a/veilid-core/src/rpc_processor/fanout_call.rs
+++ b/veilid-core/src/rpc_processor/fanout_call.rs
@@ -8,6 +8,49 @@ where
     result: Option<Result<R, RPCError>>,
 }
 
+#[derive(Debug, Copy, Clone)]
+pub(crate) enum FanoutResultKind {
+    Timeout,
+    Finished,
+    Exhausted,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct FanoutResult {
+    pub kind: FanoutResultKind,
+    pub value_nodes: Vec<NodeRef>,
+}
+
+pub(crate) fn debug_fanout_result(result: &FanoutResult) -> String {
+    let kc = match result.kind {
+        FanoutResultKind::Timeout => "T",
+        FanoutResultKind::Finished => "F",
+        FanoutResultKind::Exhausted => "E",
+    };
+    format!("{}:{}", kc, result.value_nodes.len())
+}
+
+pub(crate) fn debug_fanout_results(results: &[FanoutResult]) -> String {
+    let mut col = 0;
+    let mut out = String::new();
+    let mut left = results.len();
+    for r in results {
+        if col == 0 {
+            out += "    ";
+        }
+        let sr = debug_fanout_result(r);
+        out += &sr;
+        out += ",";
+        col += 1;
+        left -= 1;
+        if col == 32 && left != 0 {
+            col = 0;
+            out += "\n"
+        }
+    }
+    out
+}
+
 pub(crate) type FanoutCallReturnType = RPCNetworkResult<Vec<PeerInfo>>;
 pub(crate) type FanoutNodeInfoFilter = Arc<dyn Fn(&[TypedKey], &NodeInfo) -> bool + Send + Sync>;
 
@@ -158,8 +201,7 @@ where
                 #[allow(unused_variables)]
                 Ok(x) => {
                     // Call failed, node will not be considered again
-                    #[cfg(feature = "network-result-extra")]
-                    log_rpc!(debug "Fanout result {}: {:?}", &next_node, x);
+                    log_network_result!(debug "Fanout result {}: {:?}", &next_node, x);
                 }
                 Err(e) => {
                     // Error happened, abort everything and return the error
diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs
index 6994f2d1..bbfa4e1d 100644
--- a/veilid-core/src/rpc_processor/mod.rs
+++ b/veilid-core/src/rpc_processor/mod.rs
@@ -8,6 +8,7 @@ mod rpc_app_message;
 mod rpc_error;
 mod rpc_find_node;
 mod rpc_get_value;
+mod rpc_inspect_value;
 mod rpc_return_receipt;
 mod rpc_route;
 mod rpc_set_value;
@@ -168,14 +169,14 @@ pub(crate) struct RPCMessage {
     opt_sender_nr: Option<NodeRef>,
 }
 
+#[instrument(skip_all, err)]
 pub fn builder_to_vec<'a, T>(builder: capnp::message::Builder<T>) -> Result<Vec<u8>, RPCError>
 where
     T: capnp::message::Allocator + 'a,
 {
     let mut buffer = vec![];
     capnp::serialize_packed::write_message(&mut buffer, &builder)
-        .map_err(RPCError::protocol)
-        .map_err(logthru_rpc!())?;
+        .map_err(RPCError::protocol)?;
     Ok(buffer)
 }
 
@@ -373,7 +374,7 @@ impl RPCProcessor {
 
     #[instrument(level = "debug", skip_all, err)]
     pub async fn startup(&self) -> EyreResult<()> {
-        debug!("startup rpc processor");
+        log_rpc!(debug "startup rpc processor");
         {
             let mut inner = self.inner.lock();
 
@@ -382,7 +383,7 @@ impl RPCProcessor {
             inner.stop_source = Some(StopSource::new());
 
             // spin up N workers
-            trace!(
+            log_rpc!(
                 "Spinning up {} RPC workers",
                 self.unlocked_inner.concurrency
             );
@@ -408,7 +409,7 @@ impl RPCProcessor {
 
     #[instrument(level = "debug", skip_all)]
     pub async fn shutdown(&self) {
-        debug!("starting rpc processor shutdown");
+        log_rpc!(debug "starting rpc processor shutdown");
 
         // Stop storage manager from using us
         self.storage_manager.set_rpc_processor(None).await;
@@ -424,17 +425,17 @@ impl RPCProcessor {
             // drop the stop
             drop(inner.stop_source.take());
         }
-        debug!("stopping {} rpc worker tasks", unord.len());
+        log_rpc!(debug "stopping {} rpc worker tasks", unord.len());
 
         // Wait for them to complete
         while unord.next().await.is_some() {}
 
-        debug!("resetting rpc processor state");
+        log_rpc!(debug "resetting rpc processor state");
 
         // Release the rpc processor
         *self.inner.lock() = Self::new_inner();
 
-        debug!("finished rpc processor shutdown");
+        log_rpc!(debug "finished rpc processor shutdown");
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -470,6 +471,11 @@ impl RPCProcessor {
     ) -> TimeoutOr<Result<Option<NodeRef>, RPCError>> {
         let routing_table = self.routing_table();
 
+        // Ignore own node
+        if routing_table.matches_own_node_id(&[node_id]) {
+            return TimeoutOr::Value(Err(RPCError::network("can't search for own node id")));
+        }
+
         // Routine to call to generate fanout
         let call_routine = |next_node: NodeRef| {
             let this = self.clone();
@@ -610,6 +616,20 @@ impl RPCProcessor {
                 // Reply received
                 let recv_ts = get_aligned_timestamp();
 
+                // Ensure the reply comes over the private route that was requested
+                if let Some(reply_private_route) = waitable_reply.reply_private_route {
+                    match &rpcreader.header.detail {
+                        RPCMessageHeaderDetail::Direct(_) | RPCMessageHeaderDetail::SafetyRouted(_) => {
+                            return Err(RPCError::protocol("should have received reply over private route"));
+                        }
+                        RPCMessageHeaderDetail::PrivateRouted(pr) => {
+                            if pr.private_route != reply_private_route {
+                                return Err(RPCError::protocol("received reply over the wrong private route"));
+                            }
+                        }
+                    };
+                }
+
                 // Record answer received
                 self.record_answer_received(
                     waitable_reply.send_ts,
@@ -918,12 +938,12 @@ impl RPCProcessor {
         // If safety route was in use, record failure to send there
         if let Some(sr_pubkey) = &safety_route {
             let rss = self.routing_table.route_spec_store();
-            rss.with_route_stats(send_ts, sr_pubkey, |s| s.record_send_failed());
+            rss.with_route_stats_mut(send_ts, sr_pubkey, |s| s.record_send_failed());
         } else {
             // If no safety route was in use, then it's the private route's fault if we have one
             if let Some(pr_pubkey) = &remote_private_route {
                 let rss = self.routing_table.route_spec_store();
-                rss.with_route_stats(send_ts, pr_pubkey, |s| s.record_send_failed());
+                rss.with_route_stats_mut(send_ts, pr_pubkey, |s| s.record_send_failed());
             }
         }
     }
@@ -952,19 +972,19 @@ impl RPCProcessor {
         // If safety route was used, record question lost there
         if let Some(sr_pubkey) = &safety_route {
             let rss = self.routing_table.route_spec_store();
-            rss.with_route_stats(send_ts, sr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, sr_pubkey, |s| {
                 s.record_question_lost();
             });
         }
         // If remote private route was used, record question lost there
         if let Some(rpr_pubkey) = &remote_private_route {
-            rss.with_route_stats(send_ts, rpr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, rpr_pubkey, |s| {
                 s.record_question_lost();
             });
         }
         // If private route was used, record question lost there
         if let Some(pr_pubkey) = &private_route {
-            rss.with_route_stats(send_ts, pr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, pr_pubkey, |s| {
                 s.record_question_lost();
             });
         }
@@ -998,7 +1018,7 @@ impl RPCProcessor {
 
         // If safety route was used, record send there
         if let Some(sr_pubkey) = &safety_route {
-            rss.with_route_stats(send_ts, sr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, sr_pubkey, |s| {
                 s.record_sent(send_ts, bytes);
             });
         }
@@ -1006,7 +1026,7 @@ impl RPCProcessor {
         // If remote private route was used, record send there
         if let Some(pr_pubkey) = &remote_private_route {
             let rss = self.routing_table.route_spec_store();
-            rss.with_route_stats(send_ts, pr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, pr_pubkey, |s| {
                 s.record_sent(send_ts, bytes);
             });
         }
@@ -1039,7 +1059,7 @@ impl RPCProcessor {
 
         // If safety route was used, record route there
         if let Some(sr_pubkey) = &safety_route {
-            rss.with_route_stats(send_ts, sr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, sr_pubkey, |s| {
                 // If we received an answer, the safety route we sent over can be considered tested
                 s.record_tested(recv_ts);
 
@@ -1050,7 +1070,7 @@ impl RPCProcessor {
 
         // If local private route was used, record route there
         if let Some(pr_pubkey) = &reply_private_route {
-            rss.with_route_stats(send_ts, pr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, pr_pubkey, |s| {
                 // Record received bytes
                 s.record_received(recv_ts, bytes);
 
@@ -1061,7 +1081,7 @@ impl RPCProcessor {
 
         // If remote private route was used, record there
         if let Some(rpr_pubkey) = &remote_private_route {
-            rss.with_route_stats(send_ts, rpr_pubkey, |s| {
+            rss.with_route_stats_mut(send_ts, rpr_pubkey, |s| {
                 // Record received bytes
                 s.record_received(recv_ts, bytes);
 
@@ -1086,12 +1106,12 @@ impl RPCProcessor {
             // then we must have received with a local private route too, per the design rules
             if let Some(sr_pubkey) = &safety_route {
                 let rss = self.routing_table.route_spec_store();
-                rss.with_route_stats(send_ts, sr_pubkey, |s| {
+                rss.with_route_stats_mut(send_ts, sr_pubkey, |s| {
                     s.record_latency(total_latency / 2u64);
                 });
             }
             if let Some(pr_pubkey) = &reply_private_route {
-                rss.with_route_stats(send_ts, pr_pubkey, |s| {
+                rss.with_route_stats_mut(send_ts, pr_pubkey, |s| {
                     s.record_latency(total_latency / 2u64);
                 });
             }
@@ -1117,7 +1137,7 @@ impl RPCProcessor {
 
                 // This may record nothing if the remote safety route is not also
                 // a remote private route that been imported, but that's okay
-                rss.with_route_stats(recv_ts, &d.remote_safety_route, |s| {
+                rss.with_route_stats_mut(recv_ts, &d.remote_safety_route, |s| {
                     s.record_received(recv_ts, bytes);
                 });
             }
@@ -1129,12 +1149,12 @@ impl RPCProcessor {
                 // a remote private route that been imported, but that's okay
                 // it could also be a node id if no remote safety route was used
                 // in which case this also will do nothing
-                rss.with_route_stats(recv_ts, &d.remote_safety_route, |s| {
+                rss.with_route_stats_mut(recv_ts, &d.remote_safety_route, |s| {
                     s.record_received(recv_ts, bytes);
                 });
 
                 // Record for our local private route we received over
-                rss.with_route_stats(recv_ts, &d.private_route, |s| {
+                rss.with_route_stats_mut(recv_ts, &d.private_route, |s| {
                     s.record_received(recv_ts, bytes);
                 });
             }
@@ -1403,6 +1423,7 @@ impl RPCProcessor {
     /// Decoding RPC from the wire
     /// This performs a capnp decode on the data, and if it passes the capnp schema
     /// it performs the cryptographic validation required to pass the operation up for processing
+    #[instrument(skip_all)]
     fn decode_rpc_operation(
         &self,
         encoded_msg: &RPCMessageEncoded,
@@ -1410,8 +1431,7 @@ impl RPCProcessor {
         let reader = encoded_msg.data.get_reader()?;
         let op_reader = reader
             .get_root::<veilid_capnp::operation::Reader>()
-            .map_err(RPCError::protocol)
-            .map_err(logthru_rpc!())?;
+            .map_err(RPCError::protocol)?;
         let mut operation = RPCOperation::decode(&op_reader)?;
 
         // Validate the RPC message
@@ -1420,7 +1440,12 @@ impl RPCProcessor {
         Ok(operation)
     }
 
-    /// Cryptographic RPC validation
+    /// Cryptographic RPC validation and sanitization
+    /// 
+    /// This code may modify the RPC operation to remove elements that are inappropriate for this node
+    /// or reject the RPC operation entirely. For example, PeerInfo in fanout peer lists may be 
+    /// removed if they are deemed inappropriate for this node, without rejecting the entire operation.
+    /// 
     /// We do this as part of the RPC network layer to ensure that any RPC operations that are
     /// processed have already been validated cryptographically and it is not the job of the
     /// caller or receiver. This does not mean the operation is 'semantically correct'. For
@@ -1467,15 +1492,29 @@ impl RPCProcessor {
                 let sender_node_id = detail.envelope.get_sender_typed_id();
 
                 // Decode and validate the RPC operation
-                let operation = match self.decode_rpc_operation(&encoded_msg) {
+                let decode_res = self.decode_rpc_operation(&encoded_msg);
+                let operation = match decode_res {
                     Ok(v) => v,
                     Err(e) => {
-                        // Punish nodes that send direct undecodable crap
-                        if matches!(e, RPCError::Protocol(_) | RPCError::InvalidFormat(_)) {
-                            address_filter.punish_node_id(sender_node_id);
-                        }
+                        match e {
+                            // Invalid messages that should be punished
+                            RPCError::Protocol(_) | RPCError::InvalidFormat(_) => {
+                                log_rpc!(debug "Invalid RPC Operation: {}", e);
+
+                                // Punish nodes that send direct undecodable crap
+                                address_filter.punish_node_id(sender_node_id);
+                            },
+                            // Ignored messages that should be dropped
+                            RPCError::Ignore(_) | RPCError::Network(_) | RPCError::TryAgain(_) => {
+                                log_rpc!(debug "Dropping RPC Operation: {}", e);
+                            },
+                            // Internal errors that deserve louder logging
+                            RPCError::Unimplemented(_) | RPCError::Internal(_) => {
+                                log_rpc!(error "Error decoding RPC operation: {}", e);
+                            }
+                        };
                         return Ok(NetworkResult::invalid_message(e));
-                    }
+                    },
                 };
 
                 // Get the routing domain this message came over
@@ -1547,7 +1586,10 @@ impl RPCProcessor {
                 let operation = match self.decode_rpc_operation(&encoded_msg) {
                     Ok(v) => v,
                     Err(e) => {
-                        // Punish routes that send routed undecodable crap
+                        // Debug on error
+                        log_rpc!(debug "Dropping RPC operation: {}", e);
+
+                        // XXX: Punish routes that send routed undecodable crap
                         // address_filter.punish_route_id(xxx);
                         return Ok(NetworkResult::invalid_message(e));
                     }
@@ -1563,30 +1605,36 @@ impl RPCProcessor {
         };
 
         // Process stats for questions/statements received
-        let kind = match msg.operation.kind() {
+        match msg.operation.kind() {
             RPCOperationKind::Question(_) => {
                 self.record_question_received(&msg);
 
                 if let Some(sender_nr) = msg.opt_sender_nr.clone() {
                     sender_nr.stats_question_rcvd(msg.header.timestamp, msg.header.body_len);
                 }
-                "question"
+                
+                // Log rpc receive
+                #[cfg(feature = "verbose-tracing")]
+                debug!(target: "rpc_message", dir = "recv", kind = "question", op_id = msg.operation.op_id().as_u64(), desc = msg.operation.kind().desc(), header = ?msg.header);        
             }
             RPCOperationKind::Statement(_) => {
                 if let Some(sender_nr) = msg.opt_sender_nr.clone() {
                     sender_nr.stats_question_rcvd(msg.header.timestamp, msg.header.body_len);
                 }
-                "statement"
+                
+                // Log rpc receive
+                #[cfg(feature = "verbose-tracing")]
+                debug!(target: "rpc_message", dir = "recv", kind = "statement", op_id = msg.operation.op_id().as_u64(), desc = msg.operation.kind().desc(), header = ?msg.header);        
             }
             RPCOperationKind::Answer(_) => {
                 // Answer stats are processed in wait_for_reply
-                "answer"
+
+                // Log rpc receive
+                #[cfg(feature = "verbose-tracing")]
+                debug!(target: "rpc_message", dir = "recv", kind = "answer", op_id = msg.operation.op_id().as_u64(), desc = msg.operation.kind().desc(), header = ?msg.header);                        
             }
         };
 
-        // Log rpc receive
-        trace!(target: "rpc_message", dir = "recv", kind, op_id = msg.operation.op_id().as_u64(), desc = msg.operation.kind().desc(), header = ?msg.header);
-
         // Process specific message kind
         match msg.operation.kind() {
             RPCOperationKind::Question(q) => match q.detail() {
@@ -1596,6 +1644,7 @@ impl RPCProcessor {
                 RPCQuestionDetail::GetValueQ(_) => self.process_get_value_q(msg).await,
                 RPCQuestionDetail::SetValueQ(_) => self.process_set_value_q(msg).await,
                 RPCQuestionDetail::WatchValueQ(_) => self.process_watch_value_q(msg).await,
+                RPCQuestionDetail::InspectValueQ(_) => self.process_inspect_value_q(msg).await,
                 #[cfg(feature = "unstable-blockstore")]
                 RPCQuestionDetail::SupplyBlockQ(_) => self.process_supply_block_q(msg).await,
                 #[cfg(feature = "unstable-blockstore")]
diff --git a/veilid-core/src/rpc_processor/operation_waiter.rs b/veilid-core/src/rpc_processor/operation_waiter.rs
index 3a2e38ed..3c8ab352 100644
--- a/veilid-core/src/rpc_processor/operation_waiter.rs
+++ b/veilid-core/src/rpc_processor/operation_waiter.rs
@@ -116,7 +116,7 @@ where
     pub fn get_op_context(&self, op_id: OperationId) -> Result<C, RPCError> {
         let inner = self.inner.lock();
         let Some(waiting_op) = inner.waiting_op_table.get(&op_id) else {
-            return Err(RPCError::internal("Missing operation id getting op context"));
+            return Err(RPCError::ignore("Missing operation id getting op context"));
         };
         Ok(waiting_op.context.clone())
     }
diff --git a/veilid-core/src/rpc_processor/rpc_app_call.rs b/veilid-core/src/rpc_processor/rpc_app_call.rs
index 925516ff..1a26bbf9 100644
--- a/veilid-core/src/rpc_processor/rpc_app_call.rs
+++ b/veilid-core/src/rpc_processor/rpc_app_call.rs
@@ -55,6 +55,8 @@ impl RPCProcessor {
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_app_call_q(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Ignore if disabled
@@ -71,6 +73,24 @@ impl RPCProcessor {
             ));
         }
 
+        // Get the private route this came over
+        let opt_pr_pubkey = match &msg.header.detail {
+            RPCMessageHeaderDetail::Direct(_) | RPCMessageHeaderDetail::SafetyRouted(_) => None,
+            RPCMessageHeaderDetail::PrivateRouted(pr) => Some(pr.private_route),
+        };
+        let route_id = if let Some(pr_pubkey) = opt_pr_pubkey {
+            let rss = routing_table.route_spec_store();
+            let Some(route_id) = rss.get_route_id_for_key(&pr_pubkey) else {
+                return Ok(NetworkResult::invalid_message(format!(
+                    "private route does not exist for key: {}",
+                    pr_pubkey
+                )));
+            };
+            Some(route_id)
+        } else {
+            None
+        };
+
         // Get the question
         let (op_id, _, _, kind) = msg.operation.clone().destructure();
         let app_call_q = match kind {
@@ -99,7 +119,7 @@ impl RPCProcessor {
         // Pass the call up through the update callback
         let message_q = app_call_q.destructure();
         (self.unlocked_inner.update_callback)(VeilidUpdate::AppCall(Box::new(VeilidAppCall::new(
-            sender, message_q, op_id,
+            sender, route_id, message_q, op_id,
         ))));
 
         // Wait for an app call answer to come back from the app
diff --git a/veilid-core/src/rpc_processor/rpc_app_message.rs b/veilid-core/src/rpc_processor/rpc_app_message.rs
index d0aac195..5c397883 100644
--- a/veilid-core/src/rpc_processor/rpc_app_message.rs
+++ b/veilid-core/src/rpc_processor/rpc_app_message.rs
@@ -19,6 +19,8 @@ impl RPCProcessor {
         self.statement(dest, statement).await
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_app_message(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Ignore if disabled
@@ -34,6 +36,24 @@ impl RPCProcessor {
             ));
         }
 
+        // Get the private route this came over
+        let opt_pr_pubkey = match &msg.header.detail {
+            RPCMessageHeaderDetail::Direct(_) | RPCMessageHeaderDetail::SafetyRouted(_) => None,
+            RPCMessageHeaderDetail::PrivateRouted(pr) => Some(pr.private_route),
+        };
+        let route_id = if let Some(pr_pubkey) = opt_pr_pubkey {
+            let rss = routing_table.route_spec_store();
+            let Some(route_id) = rss.get_route_id_for_key(&pr_pubkey) else {
+                return Ok(NetworkResult::invalid_message(format!(
+                    "private route does not exist for key: {}",
+                    pr_pubkey
+                )));
+            };
+            Some(route_id)
+        } else {
+            None
+        };
+
         // Get the statement
         let (_, _, _, kind) = msg.operation.destructure();
         let app_message = match kind {
@@ -56,7 +76,7 @@ impl RPCProcessor {
         // Pass the message up through the update callback
         let message = app_message.destructure();
         (self.unlocked_inner.update_callback)(VeilidUpdate::AppMessage(Box::new(
-            VeilidAppMessage::new(sender, message),
+            VeilidAppMessage::new(sender, route_id, message),
         )));
 
         Ok(NetworkResult::value(()))
diff --git a/veilid-core/src/rpc_processor/rpc_error.rs b/veilid-core/src/rpc_processor/rpc_error.rs
index dc339fb7..93ddaa34 100644
--- a/veilid-core/src/rpc_processor/rpc_error.rs
+++ b/veilid-core/src/rpc_processor/rpc_error.rs
@@ -15,6 +15,8 @@ pub enum RPCError {
     Network(String),
     #[error("[RPCError: TryAgain({0})]")]
     TryAgain(String),
+    #[error("[RPCError: Ignore({0})]")]
+    Ignore(String),
 }
 
 impl RPCError {
@@ -48,6 +50,18 @@ impl RPCError {
     pub fn map_network<M: ToString, X: ToString>(message: M) -> impl FnOnce(X) -> Self {
         move |x| Self::Network(format!("{}: {}", message.to_string(), x.to_string()))
     }
+    pub fn try_again<X: ToString>(x: X) -> Self {
+        Self::TryAgain(x.to_string())
+    }
+    pub fn map_try_again<M: ToString, X: ToString>(message: M) -> impl FnOnce(X) -> Self {
+        move |x| Self::TryAgain(format!("{}: {}", message.to_string(), x.to_string()))
+    }
+    pub fn ignore<X: ToString>(x: X) -> Self {
+        Self::Ignore(x.to_string())
+    }
+    pub fn map_ignore<M: ToString, X: ToString>(message: M) -> impl FnOnce(X) -> Self {
+        move |x| Self::Ignore(format!("{}: {}", message.to_string(), x.to_string()))
+    }
 }
 
 impl From<RPCError> for VeilidAPIError {
@@ -59,6 +73,7 @@ impl From<RPCError> for VeilidAPIError {
             RPCError::Internal(message) => VeilidAPIError::Internal { message },
             RPCError::Network(message) => VeilidAPIError::Generic { message },
             RPCError::TryAgain(message) => VeilidAPIError::TryAgain { message },
+            RPCError::Ignore(message) => VeilidAPIError::Generic { message },
         }
     }
 }
diff --git a/veilid-core/src/rpc_processor/rpc_find_node.rs b/veilid-core/src/rpc_processor/rpc_find_node.rs
index 3eeeea34..8d456238 100644
--- a/veilid-core/src/rpc_processor/rpc_find_node.rs
+++ b/veilid-core/src/rpc_processor/rpc_find_node.rs
@@ -84,6 +84,8 @@ impl RPCProcessor {
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_find_node_q(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Ensure this never came over a private route, safety route is okay though
diff --git a/veilid-core/src/rpc_processor/rpc_get_value.rs b/veilid-core/src/rpc_processor/rpc_get_value.rs
index 0859c9b2..94d71306 100644
--- a/veilid-core/src/rpc_processor/rpc_get_value.rs
+++ b/veilid-core/src/rpc_processor/rpc_get_value.rs
@@ -74,8 +74,7 @@ impl RPCProcessor {
             vcrypto: vcrypto.clone(),
         });
 
-        #[cfg(feature="debug-dht")]
-        log_rpc!(debug "{}", debug_string);
+        log_dht!(debug "{}", debug_string);
 
         let waitable_reply = network_result_try!(
             self.question(dest.clone(), question, Some(question_context))
@@ -102,8 +101,7 @@ impl RPCProcessor {
         };
 
         let (value, peers, descriptor) = get_value_a.destructure();
-        #[cfg(feature="debug-dht")]
-        {   
+        if debug_target_enabled!("dht") {
             let debug_string_value = value.as_ref().map(|v| {
                 format!(" len={} seq={} writer={}",
                     v.value_data().data().len(),
@@ -126,10 +124,10 @@ impl RPCProcessor {
                 dest
             );
 
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
             
             let peer_ids:Vec<String> = peers.iter().filter_map(|p| p.node_ids().get(key.kind).map(|k| k.to_string())).collect();
-            log_rpc!(debug "Peers: {:#?}", peer_ids);
+            log_dht!(debug "Peers: {:#?}", peer_ids);
         }
 
         // Validate peers returned are, in fact, closer to the key than the node we sent this to
@@ -168,6 +166,8 @@ impl RPCProcessor {
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_get_value_q(
         &self,
@@ -213,8 +213,7 @@ impl RPCProcessor {
         let routing_table = self.routing_table();
         let closer_to_key_peers = network_result_try!(routing_table.find_preferred_peers_closer_to_key(key, vec![CAP_DHT, CAP_DHT_WATCH]));
 
-        #[cfg(feature="debug-dht")]
-        {   
+        if debug_target_enabled!("dht") {
             let debug_string = format!(
                 "IN <=== GetValueQ({} #{}{}) <== {}",
                 key,
@@ -227,7 +226,7 @@ impl RPCProcessor {
                 msg.header.direct_sender_node_id()
             );
 
-            log_rpc!(debug "{}", debug_string);
+            log_dht!(debug "{}", debug_string);
         }
 
         // See if we would have accepted this as a set
@@ -235,7 +234,7 @@ impl RPCProcessor {
             let c = self.config.get();
             c.network.dht.set_value_count as usize
         };
-        let (subkey_result_value, subkey_result_descriptor) = if closer_to_key_peers.len() >= set_value_count {
+        let (get_result_value, get_result_descriptor) = if closer_to_key_peers.len() >= set_value_count {
             // Not close enough
             (None, None)
         } else {
@@ -243,16 +242,15 @@ impl RPCProcessor {
 
             // See if we have this record ourselves
             let storage_manager = self.storage_manager();
-            let subkey_result = network_result_try!(storage_manager
+            let get_result = network_result_try!(storage_manager
                 .inbound_get_value(key, subkey, want_descriptor)
                 .await
                 .map_err(RPCError::internal)?);
-            (subkey_result.value, subkey_result.descriptor)
+            (get_result.opt_value, get_result.opt_descriptor)
         };
 
-        #[cfg(feature="debug-dht")]
-        {
-            let debug_string_value = subkey_result_value.as_ref().map(|v| {
+        if debug_target_enabled!("dht") {
+            let debug_string_value = get_result_value.as_ref().map(|v| {
                 format!(" len={} seq={} writer={}",
                     v.value_data().data().len(),
                     v.value_data().seq(),
@@ -265,7 +263,7 @@ impl RPCProcessor {
                 key,
                 subkey,
                 debug_string_value,
-                if subkey_result_descriptor.is_some() {
+                if get_result_descriptor.is_some() {
                     " +desc"
                 } else {
                     ""
@@ -274,14 +272,14 @@ impl RPCProcessor {
                 msg.header.direct_sender_node_id()
             );
         
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
         }
             
         // Make GetValue answer
         let get_value_a = RPCOperationGetValueA::new(
-            subkey_result_value.map(|x| (*x).clone()),
+            get_result_value.map(|x| (*x).clone()),
             closer_to_key_peers,
-            subkey_result_descriptor.map(|x| (*x).clone()),
+            get_result_descriptor.map(|x| (*x).clone()),
         )?;
 
         // Send GetValue answer
diff --git a/veilid-core/src/rpc_processor/rpc_inspect_value.rs b/veilid-core/src/rpc_processor/rpc_inspect_value.rs
new file mode 100644
index 00000000..d68f4585
--- /dev/null
+++ b/veilid-core/src/rpc_processor/rpc_inspect_value.rs
@@ -0,0 +1,269 @@
+use super::*;
+use crate::storage_manager::SignedValueDescriptor;
+
+#[derive(Clone, Debug)]
+pub struct InspectValueAnswer {
+    pub seqs: Vec<ValueSeqNum>,
+    pub peers: Vec<PeerInfo>,
+    pub descriptor: Option<SignedValueDescriptor>,
+}
+
+impl RPCProcessor {
+    /// Sends an inspect value request and wait for response
+    /// Can be sent via all methods including relays
+    /// Safety routes may be used, but never private routes.
+    /// Because this leaks information about the identity of the node itself,
+    /// replying to this request received over a private route will leak
+    /// the identity of the node and defeat the private route.
+    /// The number of subkey sequence numbers returned may either be:
+    ///  * the amount requested
+    ///  * an amount truncated to MAX_INSPECT_VALUE_A_SEQS_LEN subkeys
+    ///  * zero if nothing was found
+    #[cfg_attr(
+        feature = "verbose-tracing",        
+        instrument(level = "trace", skip(self, last_descriptor), 
+            fields(ret.value.data.len, 
+                ret.seqs, 
+                ret.peers.len,
+                ret.latency
+            ),err)
+    )]
+    pub async fn rpc_call_inspect_value(
+        self,
+        dest: Destination,
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        last_descriptor: Option<SignedValueDescriptor>,
+    ) -> RPCNetworkResult<Answer<InspectValueAnswer>> {
+        // Ensure destination never has a private route
+        // and get the target noderef so we can validate the response
+        let Some(target) = dest.node() else {
+            return Err(RPCError::internal(
+                "Never send get value requests over private routes",
+            ));
+        };
+
+        // Get the target node id
+        let Some(vcrypto) = self.crypto.get(key.kind) else {
+            return Err(RPCError::internal("unsupported cryptosystem"));
+        };
+        let Some(target_node_id) = target.node_ids().get(key.kind) else {
+            return Err(RPCError::internal("No node id for crypto kind"));
+        };
+
+        let debug_string = format!(
+            "OUT ==> InspectValueQ({} #{}{}) => {}",
+            key,
+            &subkeys,
+            if last_descriptor.is_some() {
+                " +lastdesc"
+            } else {
+                ""
+            },
+            dest
+        );
+
+        // Send the inspectvalue question
+        let inspect_value_q = RPCOperationInspectValueQ::new(key, subkeys.clone(), last_descriptor.is_none())?;
+        let question = RPCQuestion::new(
+            network_result_try!(self.get_destination_respond_to(&dest)?),
+            RPCQuestionDetail::InspectValueQ(Box::new(inspect_value_q)),
+        );
+
+        let question_context = QuestionContext::InspectValue(ValidateInspectValueContext {
+            last_descriptor,
+            subkeys,
+            vcrypto: vcrypto.clone(),
+        });
+
+        log_dht!(debug "{}", debug_string);
+
+        let waitable_reply = network_result_try!(
+            self.question(dest.clone(), question, Some(question_context))
+                .await?
+        );
+
+        // Keep the reply private route that was used to return with the answer
+        let reply_private_route = waitable_reply.reply_private_route;
+
+        // Wait for reply
+        let (msg, latency) = match self.wait_for_reply(waitable_reply, debug_string).await? {
+            TimeoutOr::Timeout => return Ok(NetworkResult::Timeout),
+            TimeoutOr::Value(v) => v,
+        };
+
+        // Get the right answer type
+        let (_, _, _, kind) = msg.operation.destructure();
+        let inspect_value_a = match kind {
+            RPCOperationKind::Answer(a) => match a.destructure() {
+                RPCAnswerDetail::InspectValueA(a) => a,
+                _ => return Ok(NetworkResult::invalid_message("not an inspectvalue answer")),
+            },
+            _ => return Ok(NetworkResult::invalid_message("not an answer")),
+        };
+
+        let (seqs, peers, descriptor) = inspect_value_a.destructure();
+        if debug_target_enabled!("dht") {
+            let debug_string_answer = format!(
+                "OUT <== InspectValueA({} {} peers={}) <= {} seqs:\n{}",
+                key,
+                if descriptor.is_some() {
+                    " +desc"
+                } else {
+                    ""
+                },
+                peers.len(),
+                dest,
+                debug_seqs(&seqs)
+            );
+
+            log_dht!(debug "{}", debug_string_answer);
+            
+            let peer_ids:Vec<String> = peers.iter().filter_map(|p| p.node_ids().get(key.kind).map(|k| k.to_string())).collect();
+            log_dht!(debug "Peers: {:#?}", peer_ids);
+        }
+
+        // Validate peers returned are, in fact, closer to the key than the node we sent this to
+        let valid = match RoutingTable::verify_peers_closer(vcrypto, target_node_id, key, &peers) {
+            Ok(v) => v,
+            Err(e) => {
+                return Ok(NetworkResult::invalid_message(format!(
+                    "missing cryptosystem in peers node ids: {}",
+                    e
+                )));
+            }
+        };
+        if !valid {
+            return Ok(NetworkResult::invalid_message("non-closer peers returned"));
+        }
+
+        #[cfg(feature = "verbose-tracing")]
+        tracing::Span::current().record("ret.latency", latency.as_u64());
+        #[cfg(feature = "verbose-tracing")]
+        tracing::Span::current().record("ret.seqs", seqs);
+        #[cfg(feature = "verbose-tracing")]
+        tracing::Span::current().record("ret.peers.len", peers.len());
+
+        Ok(NetworkResult::value(Answer::new(
+            latency,
+            reply_private_route,
+            InspectValueAnswer {
+                seqs,
+                peers,
+                descriptor,
+            },
+        )))
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
+    #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
+    pub(crate) async fn process_inspect_value_q(
+        &self,
+        msg: RPCMessage,
+    ) -> RPCNetworkResult<()> {
+
+        // Ensure this never came over a private route, safety route is okay though
+        match &msg.header.detail {
+            RPCMessageHeaderDetail::Direct(_) | RPCMessageHeaderDetail::SafetyRouted(_) => {}
+            RPCMessageHeaderDetail::PrivateRouted(_) => {
+                return Ok(NetworkResult::invalid_message(
+                    "not processing inspect value request over private route",
+                ))
+            }
+        }
+        // Ignore if disabled
+        let routing_table = self.routing_table();
+        let opi = routing_table.get_own_peer_info(msg.header.routing_domain());
+        if !opi
+            .signed_node_info()
+            .node_info()
+            .has_capability(CAP_DHT)
+        {
+            return Ok(NetworkResult::service_unavailable(
+                "dht is not available",
+            ));
+        }
+
+        // Get the question
+        let kind = msg.operation.kind().clone();
+        let inspect_value_q = match kind {
+            RPCOperationKind::Question(q) => match q.destructure() {
+                (_, RPCQuestionDetail::InspectValueQ(q)) => q,
+                _ => panic!("not a inspectvalue question"),
+            },
+            _ => panic!("not a question"),
+        };
+
+        // Destructure
+        let (key, subkeys, want_descriptor) = inspect_value_q.destructure();
+
+        // Get the nodes that we know about that are closer to the the key than our own node
+        let routing_table = self.routing_table();
+        let closer_to_key_peers = network_result_try!(routing_table.find_preferred_peers_closer_to_key(key, vec![CAP_DHT, CAP_DHT_WATCH]));
+
+        if debug_target_enabled!("dht") {
+            let debug_string = format!(
+                "IN <=== InspectValueQ({} {}{}) <== {}",
+                key,
+                subkeys,
+                if want_descriptor {
+                    " +wantdesc"
+                } else {
+                    ""
+                },
+                msg.header.direct_sender_node_id()
+            );
+
+            log_dht!(debug "{}", debug_string);
+        }
+
+        // See if we would have accepted this as a set
+        let set_value_count = {
+            let c = self.config.get();
+            c.network.dht.set_value_count as usize
+        };
+        let (inspect_result_seqs, inspect_result_descriptor) = if closer_to_key_peers.len() >= set_value_count {
+            // Not close enough
+            (Vec::new(), None)
+        } else {
+            // Close enough, lets get it
+
+            // See if we have this record ourselves
+            let storage_manager = self.storage_manager();
+            let inspect_result = network_result_try!(storage_manager
+                .inbound_inspect_value(key, subkeys, want_descriptor)
+                .await
+                .map_err(RPCError::internal)?);
+            (inspect_result.seqs, inspect_result.opt_descriptor)
+        };
+
+        if debug_target_enabled!("dht") {
+            let debug_string_answer = format!(
+                "IN ===> InspectValueA({} {:?}{} peers={}) ==> {}",
+                key,
+                inspect_result_seqs,
+                if inspect_result_descriptor.is_some() {
+                    " +desc"
+                } else {
+                    ""
+                },
+                closer_to_key_peers.len(),
+                msg.header.direct_sender_node_id()
+            );
+        
+            log_dht!(debug "{}", debug_string_answer);
+        }
+            
+        // Make InspectValue answer
+        let inspect_value_a = RPCOperationInspectValueA::new(
+            inspect_result_seqs,
+            closer_to_key_peers,
+            inspect_result_descriptor.map(|x| (*x).clone()),
+        )?;
+
+        // Send InspectValue answer
+        self.answer(msg, RPCAnswer::new(RPCAnswerDetail::InspectValueA(Box::new(inspect_value_a))))
+            .await
+    }
+}
diff --git a/veilid-core/src/rpc_processor/rpc_set_value.rs b/veilid-core/src/rpc_processor/rpc_set_value.rs
index 36bead3a..380eb160 100644
--- a/veilid-core/src/rpc_processor/rpc_set_value.rs
+++ b/veilid-core/src/rpc_processor/rpc_set_value.rs
@@ -88,8 +88,9 @@ impl RPCProcessor {
             vcrypto: vcrypto.clone(),
         });
 
-        #[cfg(feature="debug-dht")]
-        log_rpc!(debug "{}", debug_string);
+        if debug_target_enabled!("dht") {
+            log_dht!(debug "{}", debug_string);
+        }
 
         let waitable_reply = network_result_try!(
             self.question(dest.clone(), question, Some(question_context))
@@ -117,8 +118,7 @@ impl RPCProcessor {
 
         let (set, value, peers) = set_value_a.destructure();
 
-        #[cfg(feature="debug-dht")]
-        {   
+        if debug_target_enabled!("dht") {
             let debug_string_value = value.as_ref().map(|v| {
                 format!(" len={} writer={}",
                     v.value_data().data().len(),
@@ -141,10 +141,10 @@ impl RPCProcessor {
                 dest,
             );
 
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
             
             let peer_ids:Vec<String> = peers.iter().filter_map(|p| p.node_ids().get(key.kind).map(|k| k.to_string())).collect();
-            log_rpc!(debug "Peers: {:#?}", peer_ids);
+            log_dht!(debug "Peers: {:#?}", peer_ids);
         }
 
         // Validate peers returned are, in fact, closer to the key than the node we sent this to
@@ -181,6 +181,8 @@ impl RPCProcessor {
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_set_value_q(
         &self,
@@ -270,8 +272,7 @@ impl RPCProcessor {
             (true, new_value)
         };
 
-        #[cfg(feature="debug-dht")]
-        {
+        if debug_target_enabled!("dht") {
             let debug_string_value = new_value.as_ref().map(|v| {
                 format!(" len={} seq={} writer={}",
                     v.value_data().data().len(),
@@ -294,7 +295,7 @@ impl RPCProcessor {
                 msg.header.direct_sender_node_id()
             );
 
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
         }
 
         // Make SetValue answer
diff --git a/veilid-core/src/rpc_processor/rpc_signal.rs b/veilid-core/src/rpc_processor/rpc_signal.rs
index aa36d37f..6c8c73ef 100644
--- a/veilid-core/src/rpc_processor/rpc_signal.rs
+++ b/veilid-core/src/rpc_processor/rpc_signal.rs
@@ -32,6 +32,8 @@ impl RPCProcessor {
         self.statement(dest, statement).await
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_signal(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Ignore if disabled
diff --git a/veilid-core/src/rpc_processor/rpc_status.rs b/veilid-core/src/rpc_processor/rpc_status.rs
index 9a203cb9..d08d50eb 100644
--- a/veilid-core/src/rpc_processor/rpc_status.rs
+++ b/veilid-core/src/rpc_processor/rpc_status.rs
@@ -200,6 +200,8 @@ impl RPCProcessor {
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_status_q(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Get the question
diff --git a/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs b/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs
index 44e16711..07970dda 100644
--- a/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs
+++ b/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs
@@ -56,6 +56,8 @@ impl RPCProcessor {
         }
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_validate_dial_info(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         let routing_table = self.routing_table();
diff --git a/veilid-core/src/rpc_processor/rpc_value_changed.rs b/veilid-core/src/rpc_processor/rpc_value_changed.rs
index b0ba8c15..8a5aa114 100644
--- a/veilid-core/src/rpc_processor/rpc_value_changed.rs
+++ b/veilid-core/src/rpc_processor/rpc_value_changed.rs
@@ -14,9 +14,16 @@ impl RPCProcessor {
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
         count: u32,
+        watch_id: u64,
         value: SignedValueData,
     ) -> RPCNetworkResult<()> {
-        let value_changed = RPCOperationValueChanged::new(key, subkeys, count, value)?;
+        // Ensure destination is never using a safety route
+        if matches!(dest.get_safety_selection(), SafetySelection::Safe(_)) {
+            return Err(RPCError::internal(
+                "Never send value changes over safety routes",
+            ));
+        }
+        let value_changed = RPCOperationValueChanged::new(key, subkeys, count, watch_id, value)?;
         let statement =
             RPCStatement::new(RPCStatementDetail::ValueChanged(Box::new(value_changed)));
 
@@ -24,10 +31,12 @@ impl RPCProcessor {
         self.statement(dest, statement).await
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     pub(crate) async fn process_value_changed(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         // Get the statement
         let (_, _, _, kind) = msg.operation.destructure();
-        let (key, subkeys, count, value) = match kind {
+        let (key, subkeys, count, watch_id, value) = match kind {
             RPCOperationKind::Statement(s) => match s.destructure() {
                 RPCStatementDetail::ValueChanged(s) => s.destructure(),
                 _ => panic!("not a value changed statement"),
@@ -35,8 +44,25 @@ impl RPCProcessor {
             _ => panic!("not a statement"),
         };
 
-        #[cfg(feature = "debug-dht")]
-        {
+        // Get the inbound node if if this came in directly
+        // If this was received over just a safety route, ignore it
+        // It this was received over a private route, the inbound node id could be either the actual
+        // node id, or a safety route (can't tell if a stub was used).
+        // Try it as the node if, and the storage manager will reject the
+        // value change if it doesn't match the active watch's node id
+        let inbound_node_id = match &msg.header.detail {
+            RPCMessageHeaderDetail::Direct(d) => d.envelope.get_sender_typed_id(),
+            RPCMessageHeaderDetail::SafetyRouted(_) => {
+                return Ok(NetworkResult::invalid_message(
+                    "not processing value change over safety route",
+                ));
+            }
+            RPCMessageHeaderDetail::PrivateRouted(p) => {
+                TypedKey::new(p.direct.envelope.get_crypto_kind(), p.remote_safety_route)
+            }
+        };
+
+        if debug_target_enabled!("dht") {
             let debug_string_value = format!(
                 " len={} seq={} writer={}",
                 value.value_data().data().len(),
@@ -45,21 +71,30 @@ impl RPCProcessor {
             );
 
             let debug_string_stmt = format!(
-                "IN <== ValueChanged({} #{:?}+{}{}) <= {}",
+                "IN <== ValueChanged(id={} {} #{:?}+{}{}) from {} <= {}",
+                watch_id,
                 key,
                 subkeys,
                 count,
                 debug_string_value,
-                msg.header.direct_sender_node_id()
+                inbound_node_id,
+                msg.header.direct_sender_node_id(),
             );
 
-            log_rpc!(debug "{}", debug_string_stmt);
+            log_dht!(debug "{}", debug_string_stmt);
         }
 
         // Save the subkey, creating a new record if necessary
         let storage_manager = self.storage_manager();
         storage_manager
-            .inbound_value_changed(key, subkeys, count, Arc::new(value))
+            .inbound_value_changed(
+                key,
+                subkeys,
+                count,
+                Arc::new(value),
+                inbound_node_id,
+                watch_id,
+            )
             .await
             .map_err(RPCError::internal)?;
 
diff --git a/veilid-core/src/rpc_processor/rpc_watch_value.rs b/veilid-core/src/rpc_processor/rpc_watch_value.rs
index 8b08a642..4fff8dfc 100644
--- a/veilid-core/src/rpc_processor/rpc_watch_value.rs
+++ b/veilid-core/src/rpc_processor/rpc_watch_value.rs
@@ -2,8 +2,10 @@ use super::*;
 
 #[derive(Clone, Debug)]
 pub struct WatchValueAnswer {
+    pub accepted: bool,
     pub expiration_ts: Timestamp,
     pub peers: Vec<PeerInfo>,
+    pub watch_id: u64,
 }
 
 impl RPCProcessor {
@@ -22,6 +24,7 @@ impl RPCProcessor {
                 ret.peers.len
             ),err)
     )]
+    #[allow(clippy::too_many_arguments)]
     pub async fn rpc_call_watch_value(
         self,
         dest: Destination,
@@ -30,6 +33,7 @@ impl RPCProcessor {
         expiration: Timestamp,
         count: u32,
         watcher: KeyPair,
+        watch_id: Option<u64>,
     ) -> RPCNetworkResult<Answer<WatchValueAnswer>> {
         // Ensure destination never has a private route
         // and get the target noderef so we can validate the response
@@ -48,8 +52,18 @@ impl RPCProcessor {
         };
 
         let debug_string = format!(
-            "OUT ==> WatchValueQ({} {}@{}+{}) => {} (watcher={})",
-            key, subkeys, expiration, count, dest, watcher.key
+            "OUT ==> WatchValueQ({} {} {}@{}+{}) => {} (watcher={}) ",
+            if let Some(watch_id) = watch_id {
+                format!("id={} ", watch_id)
+            } else {
+                "".to_owned()
+            },
+            key,
+            subkeys,
+            expiration,
+            count,
+            dest,
+            watcher.key
         );
 
         // Send the watchvalue question
@@ -58,6 +72,7 @@ impl RPCProcessor {
             subkeys.clone(),
             expiration.as_u64(),
             count,
+            watch_id,
             watcher,
             vcrypto.clone(),
         )?;
@@ -66,8 +81,7 @@ impl RPCProcessor {
             RPCQuestionDetail::WatchValueQ(Box::new(watch_value_q)),
         );
 
-        #[cfg(feature = "debug-dht")]
-        log_rpc!(debug "{}", debug_string);
+        log_dht!(debug "{}", debug_string);
 
         let waitable_reply =
             network_result_try!(self.question(dest.clone(), question, None).await?);
@@ -90,12 +104,13 @@ impl RPCProcessor {
             },
             _ => return Ok(NetworkResult::invalid_message("not an answer")),
         };
-
-        let (expiration, peers) = watch_value_a.destructure();
-        #[cfg(feature = "debug-dht")]
-        {
+        let question_watch_id = watch_id;
+        let (accepted, expiration, peers, watch_id) = watch_value_a.destructure();
+        if debug_target_enabled!("dht") {
             let debug_string_answer = format!(
-                "OUT <== WatchValueA({} #{:?}@{} peers={}) <= {}",
+                "OUT <== WatchValueA({}id={} {} #{:?}@{} peers={}) <= {}",
+                if accepted { "+accept " } else { "" },
+                watch_id,
                 key,
                 subkeys,
                 expiration,
@@ -103,13 +118,32 @@ impl RPCProcessor {
                 dest
             );
 
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
 
             let peer_ids: Vec<String> = peers
                 .iter()
                 .filter_map(|p| p.node_ids().get(key.kind).map(|k| k.to_string()))
                 .collect();
-            log_rpc!(debug "Peers: {:#?}", peer_ids);
+            log_dht!(debug "Peers: {:#?}", peer_ids);
+        }
+
+        // Validate accepted requests
+        if accepted {
+            // Verify returned answer watch id is the same as the question watch id if it exists
+            if let Some(question_watch_id) = question_watch_id {
+                if question_watch_id != watch_id {
+                    return Ok(NetworkResult::invalid_message(format!(
+                        "answer watch id={} doesn't match question watch id={}",
+                        watch_id, question_watch_id,
+                    )));
+                }
+            }
+            // Validate if a watch is created/updated, that it has a nonzero id
+            if expiration != 0 && watch_id == 0 {
+                return Ok(NetworkResult::invalid_message(
+                    "zero watch id returned on accepted or cancelled watch",
+                ));
+            }
         }
 
         // Validate peers returned are, in fact, closer to the key than the node we sent this to
@@ -137,12 +171,16 @@ impl RPCProcessor {
             latency,
             reply_private_route,
             WatchValueAnswer {
+                accepted,
                 expiration_ts: Timestamp::new(expiration),
                 peers,
+                watch_id,
             },
         )))
     }
 
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     #[cfg_attr(feature="verbose-tracing", instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id), ret, err))]
     pub(crate) async fn process_watch_value_q(&self, msg: RPCMessage) -> RPCNetworkResult<()> {
         let routing_table = self.routing_table();
@@ -185,16 +223,21 @@ impl RPCProcessor {
         };
 
         // Destructure
-        let (key, subkeys, expiration, count, watcher, _signature) = watch_value_q.destructure();
+        let (key, subkeys, expiration, count, watch_id, watcher, _signature) =
+            watch_value_q.destructure();
 
         // Get target for ValueChanged notifications
         let dest = network_result_try!(self.get_respond_to_destination(&msg));
         let target = dest.get_target(rss)?;
 
-        #[cfg(feature = "debug-dht")]
-        {
+        if debug_target_enabled!("dht") {
             let debug_string = format!(
-                "IN <=== WatchValueQ({} {}@{}+{}) <== {} (watcher={})",
+                "IN <=== WatchValueQ({}{} {}@{}+{}) <== {} (watcher={})",
+                if let Some(watch_id) = watch_id {
+                    format!("id={} ", watch_id)
+                } else {
+                    "".to_owned()
+                },
                 key,
                 subkeys,
                 expiration,
@@ -203,7 +246,7 @@ impl RPCProcessor {
                 watcher
             );
 
-            log_rpc!(debug "{}", debug_string);
+            log_dht!(debug "{}", debug_string);
         }
 
         // Get the nodes that we know about that are closer to the the key than our own node
@@ -211,40 +254,53 @@ impl RPCProcessor {
             routing_table.find_preferred_peers_closer_to_key(key, vec![CAP_DHT, CAP_DHT_WATCH])
         );
 
-        // See if we would have accepted this as a set
+        // See if we would have accepted this as a set, same set_value_count for watches
         let set_value_count = {
             let c = self.config.get();
             c.network.dht.set_value_count as usize
         };
-        let ret_expiration = if closer_to_key_peers.len() >= set_value_count {
-            // Not close enough
+        let (ret_accepted, ret_expiration, ret_watch_id) =
+            if closer_to_key_peers.len() >= set_value_count {
+                // Not close enough, not accepted
+                log_dht!(debug "Not close enough for watch value");
 
-            #[cfg(feature = "debug-dht")]
-            log_rpc!(debug "Not close enough for watch value");
+                (false, 0, watch_id.unwrap_or_default())
+            } else {
+                // Accepted, lets try to watch or cancel it
 
-            Timestamp::default()
-        } else {
-            // Close enough, lets watch it
-
-            // See if we have this record ourselves, if so, accept the watch
-            let storage_manager = self.storage_manager();
-            network_result_try!(storage_manager
-                .inbound_watch_value(
-                    key,
-                    subkeys.clone(),
-                    Timestamp::new(expiration),
+                let params = WatchParameters {
+                    subkeys: subkeys.clone(),
+                    expiration: Timestamp::new(expiration),
                     count,
+                    watcher,
                     target,
-                    watcher
-                )
-                .await
-                .map_err(RPCError::internal)?)
-        };
+                };
 
-        #[cfg(feature = "debug-dht")]
-        {
+                // See if we have this record ourselves, if so, accept the watch
+                let storage_manager = self.storage_manager();
+                let watch_result = network_result_try!(storage_manager
+                    .inbound_watch_value(key, params, watch_id,)
+                    .await
+                    .map_err(RPCError::internal)?);
+
+                // Encode the watch result
+                // Rejections and cancellations are treated the same way by clients
+                let (ret_expiration, ret_watch_id) = match watch_result {
+                    WatchResult::Created { id, expiration } => (expiration.as_u64(), id),
+                    WatchResult::Changed { expiration } => {
+                        (expiration.as_u64(), watch_id.unwrap_or_default())
+                    }
+                    WatchResult::Cancelled => (0, watch_id.unwrap_or_default()),
+                    WatchResult::Rejected => (0, watch_id.unwrap_or_default()),
+                };
+                (true, ret_expiration, ret_watch_id)
+            };
+
+        if debug_target_enabled!("dht") {
             let debug_string_answer = format!(
-                "IN ===> WatchValueA({} #{} expiration={} peers={}) ==> {}",
+                "IN ===> WatchValueA({}id={} {} #{} expiration={} peers={}) ==> {}",
+                if ret_accepted { "+accept " } else { "" },
+                ret_watch_id,
                 key,
                 subkeys,
                 ret_expiration,
@@ -252,17 +308,15 @@ impl RPCProcessor {
                 msg.header.direct_sender_node_id()
             );
 
-            log_rpc!(debug "{}", debug_string_answer);
+            log_dht!(debug "{}", debug_string_answer);
         }
 
         // Make WatchValue answer
         let watch_value_a = RPCOperationWatchValueA::new(
-            ret_expiration.as_u64(),
-            if ret_expiration.as_u64() == 0 {
-                closer_to_key_peers
-            } else {
-                vec![]
-            },
+            ret_accepted,
+            ret_expiration,
+            closer_to_key_peers,
+            ret_watch_id,
         )?;
 
         // Send GetValue answer
diff --git a/veilid-core/src/storage_manager/debug.rs b/veilid-core/src/storage_manager/debug.rs
index 8a8328b5..2332ce31 100644
--- a/veilid-core/src/storage_manager/debug.rs
+++ b/veilid-core/src/storage_manager/debug.rs
@@ -15,6 +15,20 @@ impl StorageManager {
         };
         remote_record_store.debug_records()
     }
+    pub(crate) async fn debug_opened_records(&self) -> String {
+        let inner = self.inner.lock().await;
+        let mut out = "[\n".to_owned();
+        for (k, v) in &inner.opened_records {
+            let writer = if let Some(w) = v.writer() {
+                w.to_string()
+            } else {
+                "".to_owned()
+            };
+            out += &format!("  {} {},\n", k, writer);
+        }
+        format!("{}]\n", out)
+    }
+
     pub(crate) async fn purge_local_records(&self, reclaim: Option<usize>) -> String {
         let mut inner = self.inner.lock().await;
         let Some(local_record_store) = &mut inner.local_record_store else {
@@ -66,8 +80,17 @@ impl StorageManager {
         let Some(local_record_store) = &inner.local_record_store else {
             return "not initialized".to_owned();
         };
-        local_record_store.debug_record_info(key)
+        let local_debug = local_record_store.debug_record_info(key);
+
+        let opened_debug = if let Some(o) = inner.opened_records.get(&key) {
+            format!("Opened Record: {:#?}\n", o)
+        } else {
+            "".to_owned()
+        };
+
+        format!("{}\n{}", local_debug, opened_debug)
     }
+
     pub(crate) async fn debug_remote_record_info(&self, key: TypedKey) -> String {
         let inner = self.inner.lock().await;
         let Some(remote_record_store) = &inner.remote_record_store else {
diff --git a/veilid-core/src/storage_manager/get_value.rs b/veilid-core/src/storage_manager/get_value.rs
index 6e7b0ab1..111479f0 100644
--- a/veilid-core/src/storage_manager/get_value.rs
+++ b/veilid-core/src/storage_manager/get_value.rs
@@ -14,10 +14,10 @@ struct OutboundGetValueContext {
 
 /// The result of the outbound_get_value operation
 pub(super) struct OutboundGetValueResult {
+    /// Fanout result
+    pub fanout_result: FanoutResult,
     /// The subkey that was retrieved
-    pub subkey_result: SubkeyResult,
-    /// And where it was retrieved from
-    pub value_nodes: Vec<NodeRef>,
+    pub get_result: GetResult,
 }
 
 impl StorageManager {
@@ -28,7 +28,7 @@ impl StorageManager {
         key: TypedKey,
         subkey: ValueSubkey,
         safety_selection: SafetySelection,
-        last_subkey_result: SubkeyResult,
+        last_get_result: GetResult,
     ) -> VeilidAPIResult<OutboundGetValueResult> {
         let routing_table = rpc_processor.routing_table();
 
@@ -44,15 +44,15 @@ impl StorageManager {
         };
 
         // Make do-get-value answer context
-        let schema = if let Some(d) = &last_subkey_result.descriptor {
+        let schema = if let Some(d) = &last_get_result.opt_descriptor {
             Some(d.schema()?)
         } else {
             None
         };
         let context = Arc::new(Mutex::new(OutboundGetValueContext {
-            value: last_subkey_result.value,
+            value: last_get_result.opt_value,
             value_nodes: vec![],
-            descriptor: last_subkey_result.descriptor.clone(),
+            descriptor: last_get_result.opt_descriptor.clone(),
             schema,
         }));
 
@@ -60,7 +60,7 @@ impl StorageManager {
         let call_routine = |next_node: NodeRef| {
             let rpc_processor = rpc_processor.clone();
             let context = context.clone();
-            let last_descriptor = last_subkey_result.descriptor.clone();
+            let last_descriptor = last_get_result.opt_descriptor.clone();
             async move {
                 let gva = network_result_try!(
                     rpc_processor
@@ -79,14 +79,20 @@ impl StorageManager {
                 if let Some(descriptor) = gva.answer.descriptor {
                     let mut ctx = context.lock();
                     if ctx.descriptor.is_none() && ctx.schema.is_none() {
-                        ctx.schema = Some(descriptor.schema().map_err(RPCError::invalid_format)?);
+                        let schema = match descriptor.schema() {
+                            Ok(v) => v,
+                            Err(e) => {
+                                return Ok(NetworkResult::invalid_message(e));
+                            }
+                        };
+                        ctx.schema = Some(schema);
                         ctx.descriptor = Some(Arc::new(descriptor));
                     }
                 }
 
                 // Keep the value if we got one and it is newer and it passes schema validation
                 if let Some(value) = gva.answer.value {
-                    log_stor!(debug "Got value back: len={} seq={}", value.value_data().data().len(), value.value_data().seq());
+                    log_dht!(debug "Got value back: len={} seq={}", value.value_data().data().len(), value.value_data().seq());
                     let mut ctx = context.lock();
 
                     // Ensure we have a schema and descriptor
@@ -142,8 +148,7 @@ impl StorageManager {
                 }
 
                 // Return peers if we have some
-                #[cfg(feature = "network-result-extra")]
-                log_stor!(debug "GetValue fanout call returned peers {}", gva.answer.peers.len());
+                log_network_result!(debug "GetValue fanout call returned peers {}", gva.answer.peers.len());
 
                 Ok(NetworkResult::value(gva.answer.peers))
             }
@@ -174,65 +179,35 @@ impl StorageManager {
             check_done,
         );
 
-        match fanout_call.run(vec![]).await {
+        let kind = match fanout_call.run(vec![]).await {
             // If we don't finish in the timeout (too much time passed checking for consensus)
-            TimeoutOr::Timeout => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "GetValue Fanout Timeout Consensus");
-                } else {
-                    log_stor!(debug "GetValue Fanout Timeout Non-Consensus: {}", ctx.value_nodes.len());
-                }
-                Ok(OutboundGetValueResult {
-                    subkey_result: SubkeyResult {
-                        value: ctx.value.clone(),
-                        descriptor: ctx.descriptor.clone(),
-                    },
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
-            // If we finished with consensus (enough nodes returning the same value)
-            TimeoutOr::Value(Ok(Some(()))) => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "GetValue Fanout Consensus");
-                } else {
-                    log_stor!(debug "GetValue Fanout Non-Consensus: {}", ctx.value_nodes.len());
-                }
-                Ok(OutboundGetValueResult {
-                    subkey_result: SubkeyResult {
-                        value: ctx.value.clone(),
-                        descriptor: ctx.descriptor.clone(),
-                    },
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
-            // If we finished without consensus (ran out of nodes before getting consensus)
-            TimeoutOr::Value(Ok(None)) => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "GetValue Fanout Exhausted Consensus");
-                } else {
-                    log_stor!(debug "GetValue Fanout Exhausted Non-Consensus: {}", ctx.value_nodes.len());
-                }
-                Ok(OutboundGetValueResult {
-                    subkey_result: SubkeyResult {
-                        value: ctx.value.clone(),
-                        descriptor: ctx.descriptor.clone(),
-                    },
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
+            TimeoutOr::Timeout => FanoutResultKind::Timeout,
+            // If we finished with or without consensus (enough nodes returning the same value)
+            TimeoutOr::Value(Ok(Some(()))) => FanoutResultKind::Finished,
+            // If we ran out of nodes before getting consensus)
+            TimeoutOr::Value(Ok(None)) => FanoutResultKind::Exhausted,
             // Failed
             TimeoutOr::Value(Err(e)) => {
                 // If we finished with an error, return that
-                log_stor!(debug "GetValue Fanout Error: {}", e);
-                Err(e.into())
+                log_dht!(debug "GetValue Fanout Error: {}", e);
+                return Err(e.into());
             }
-        }
+        };
+
+        let ctx = context.lock();
+        let fanout_result = FanoutResult {
+            kind,
+            value_nodes: ctx.value_nodes.clone(),
+        };
+        log_network_result!(debug "GetValue Fanout: {:?}", fanout_result);
+
+        Ok(OutboundGetValueResult {
+            fanout_result,
+            get_result: GetResult {
+                opt_value: ctx.value.clone(),
+                opt_descriptor: ctx.descriptor.clone(),
+            },
+        })
     }
 
     /// Handle a received 'Get Value' query
@@ -241,28 +216,28 @@ impl StorageManager {
         key: TypedKey,
         subkey: ValueSubkey,
         want_descriptor: bool,
-    ) -> VeilidAPIResult<NetworkResult<SubkeyResult>> {
+    ) -> VeilidAPIResult<NetworkResult<GetResult>> {
         let mut inner = self.lock().await?;
 
         // See if this is a remote or local value
-        let (_is_local, last_subkey_result) = {
+        let (_is_local, last_get_result) = {
             // See if the subkey we are getting has a last known local value
-            let mut last_subkey_result = inner.handle_get_local_value(key, subkey, true).await?;
+            let mut last_get_result = inner.handle_get_local_value(key, subkey, true).await?;
             // If this is local, it must have a descriptor already
-            if last_subkey_result.descriptor.is_some() {
+            if last_get_result.opt_descriptor.is_some() {
                 if !want_descriptor {
-                    last_subkey_result.descriptor = None;
+                    last_get_result.opt_descriptor = None;
                 }
-                (true, last_subkey_result)
+                (true, last_get_result)
             } else {
                 // See if the subkey we are getting has a last known remote value
-                let last_subkey_result = inner
+                let last_get_result = inner
                     .handle_get_remote_value(key, subkey, want_descriptor)
                     .await?;
-                (false, last_subkey_result)
+                (false, last_get_result)
             }
         };
 
-        Ok(NetworkResult::value(last_subkey_result))
+        Ok(NetworkResult::value(last_get_result))
     }
 }
diff --git a/veilid-core/src/storage_manager/inspect_value.rs b/veilid-core/src/storage_manager/inspect_value.rs
new file mode 100644
index 00000000..5a907098
--- /dev/null
+++ b/veilid-core/src/storage_manager/inspect_value.rs
@@ -0,0 +1,337 @@
+use super::*;
+
+/// The fully parsed descriptor
+struct DescriptorInfo {
+    /// The descriptor itself
+    descriptor: Arc<SignedValueDescriptor>,
+
+    /// The in-schema subkeys that overlap the inspected range
+    subkeys: ValueSubkeyRangeSet,
+}
+
+impl DescriptorInfo {
+    pub fn new(
+        descriptor: Arc<SignedValueDescriptor>,
+        subkeys: &ValueSubkeyRangeSet,
+    ) -> VeilidAPIResult<Self> {
+        let schema = descriptor.schema().map_err(RPCError::invalid_format)?;
+        let subkeys = schema.truncate_subkeys(subkeys, Some(MAX_INSPECT_VALUE_A_SEQS_LEN));
+        Ok(Self {
+            descriptor,
+            subkeys,
+        })
+    }
+}
+
+/// Info tracked per subkey
+struct SubkeySeqCount {
+    /// The newest sequence number found for a subkey
+    pub seq: ValueSeqNum,
+    /// The nodes that have returned the value so far (up to the consensus count)
+    pub value_nodes: Vec<NodeRef>,
+}
+
+/// The context of the outbound_get_value operation
+struct OutboundInspectValueContext {
+    /// The combined sequence numbers and result counts so far
+    pub seqcounts: Vec<SubkeySeqCount>,
+    /// The descriptor if we got a fresh one or empty if no descriptor was needed
+    pub opt_descriptor_info: Option<DescriptorInfo>,
+}
+
+/// The result of the outbound_get_value operation
+pub(super) struct OutboundInspectValueResult {
+    /// Fanout results for each subkey
+    pub fanout_results: Vec<FanoutResult>,
+    /// The inspection that was retrieved
+    pub inspect_result: InspectResult,
+}
+
+impl StorageManager {
+    /// Perform a 'inspect value' query on the network
+    pub(super) async fn outbound_inspect_value(
+        &self,
+        rpc_processor: RPCProcessor,
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        safety_selection: SafetySelection,
+        local_inspect_result: InspectResult,
+        use_set_scope: bool,
+    ) -> VeilidAPIResult<OutboundInspectValueResult> {
+        let routing_table = rpc_processor.routing_table();
+
+        // Get the DHT parameters for 'InspectValue'
+        // Can use either 'get scope' or 'set scope' depending on the purpose of the inspection
+        let (key_count, consensus_count, fanout, timeout_us) = {
+            let c = self.unlocked_inner.config.get();
+
+            if use_set_scope {
+                (
+                    c.network.dht.max_find_node_count as usize,
+                    c.network.dht.set_value_count as usize,
+                    c.network.dht.set_value_fanout as usize,
+                    TimestampDuration::from(ms_to_us(c.network.dht.set_value_timeout_ms)),
+                )
+            } else {
+                (
+                    c.network.dht.max_find_node_count as usize,
+                    c.network.dht.get_value_count as usize,
+                    c.network.dht.get_value_fanout as usize,
+                    TimestampDuration::from(ms_to_us(c.network.dht.get_value_timeout_ms)),
+                )
+            }
+        };
+
+        // Make do-inspect-value answer context
+        let opt_descriptor_info = if let Some(descriptor) = &local_inspect_result.opt_descriptor {
+            // Get the descriptor info. This also truncates the subkeys list to what can be returned from the network.
+            Some(DescriptorInfo::new(descriptor.clone(), &subkeys)?)
+        } else {
+            None
+        };
+
+        let context = Arc::new(Mutex::new(OutboundInspectValueContext {
+            seqcounts: local_inspect_result
+                .seqs
+                .iter()
+                .map(|s| SubkeySeqCount {
+                    seq: *s,
+                    value_nodes: vec![],
+                })
+                .collect(),
+            opt_descriptor_info,
+        }));
+
+        // Routine to call to generate fanout
+        let call_routine = |next_node: NodeRef| {
+            let rpc_processor = rpc_processor.clone();
+            let context = context.clone();
+            let opt_descriptor = local_inspect_result.opt_descriptor.clone();
+            let subkeys = subkeys.clone();
+            async move {
+                let iva = network_result_try!(
+                    rpc_processor
+                        .clone()
+                        .rpc_call_inspect_value(
+                            Destination::direct(next_node.clone()).with_safety(safety_selection),
+                            key,
+                            subkeys.clone(),
+                            opt_descriptor.map(|x| (*x).clone()),
+                        )
+                        .await?
+                );
+                let answer = iva.answer;
+
+                // Keep the descriptor if we got one. If we had a last_descriptor it will
+                // already be validated by rpc_call_inspect_value
+                if let Some(descriptor) = answer.descriptor {
+                    let mut ctx = context.lock();
+                    if ctx.opt_descriptor_info.is_none() {
+                        // Get the descriptor info. This also truncates the subkeys list to what can be returned from the network.
+                        let descriptor_info =
+                            match DescriptorInfo::new(Arc::new(descriptor.clone()), &subkeys) {
+                                Ok(v) => v,
+                                Err(e) => {
+                                    return Ok(NetworkResult::invalid_message(e));
+                                }
+                            };
+                        ctx.opt_descriptor_info = Some(descriptor_info);
+                    }
+                }
+
+                // Keep the value if we got one and it is newer and it passes schema validation
+                if !answer.seqs.is_empty() {
+                    log_dht!(debug "Got seqs back: len={}", answer.seqs.len());
+                    let mut ctx = context.lock();
+
+                    // Ensure we have a schema and descriptor etc
+                    let Some(descriptor_info) = &ctx.opt_descriptor_info else {
+                        // Got a value but no descriptor for it
+                        // Move to the next node
+                        return Ok(NetworkResult::invalid_message(
+                            "Got inspection with no descriptor",
+                        ));
+                    };
+
+                    // Get number of subkeys from schema and ensure we are getting the
+                    // right number of sequence numbers betwen that and what we asked for
+                    #[allow(clippy::unnecessary_cast)]
+                    if answer.seqs.len() as u64 != descriptor_info.subkeys.len() as u64 {
+                        // Not the right number of sequence numbers
+                        // Move to the next node
+                        return Ok(NetworkResult::invalid_message(format!(
+                            "wrong number of seqs returned {} (wanted {})",
+                            answer.seqs.len(),
+                            descriptor_info.subkeys.len()
+                        )));
+                    }
+
+                    // If we have a prior seqs list, merge in the new seqs
+                    if ctx.seqcounts.is_empty() {
+                        ctx.seqcounts = answer
+                            .seqs
+                            .iter()
+                            .map(|s| SubkeySeqCount {
+                                seq: *s,
+                                // One node has shown us the newest sequence numbers so far
+                                value_nodes: if *s == ValueSeqNum::MAX {
+                                    vec![]
+                                } else {
+                                    vec![next_node.clone()]
+                                },
+                            })
+                            .collect();
+                    } else {
+                        if ctx.seqcounts.len() != answer.seqs.len() {
+                            return Err(RPCError::internal(
+                                "seqs list length should always be equal by now",
+                            ));
+                        }
+                        for pair in ctx.seqcounts.iter_mut().zip(answer.seqs.iter()) {
+                            let ctx_seqcnt = pair.0;
+                            let answer_seq = *pair.1;
+
+                            // If we already have consensus for this subkey, don't bother updating it any more
+                            // While we may find a better sequence number if we keep looking, this does not mimic the behavior
+                            // of get and set unless we stop here
+                            if ctx_seqcnt.value_nodes.len() >= consensus_count {
+                                continue;
+                            }
+
+                            // If the new seq isn't undefined and is better than the old seq (either greater or old is undefined)
+                            // Then take that sequence number and note that we have gotten newer sequence numbers so we keep
+                            // looking for consensus
+                            // If the sequence number matches the old sequence number, then we keep the value node for reference later
+                            if answer_seq != ValueSeqNum::MAX {
+                                if ctx_seqcnt.seq == ValueSeqNum::MAX || answer_seq > ctx_seqcnt.seq
+                                {
+                                    // One node has shown us the latest sequence numbers so far
+                                    ctx_seqcnt.seq = answer_seq;
+                                    ctx_seqcnt.value_nodes = vec![next_node.clone()];
+                                } else if answer_seq == ctx_seqcnt.seq {
+                                    // Keep the nodes that showed us the latest values
+                                    ctx_seqcnt.value_nodes.push(next_node.clone());
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Return peers if we have some
+                log_network_result!(debug "InspectValue fanout call returned peers {}", answer.peers.len());
+
+                Ok(NetworkResult::value(answer.peers))
+            }
+        };
+
+        // Routine to call to check if we're done at each step
+        let check_done = |_closest_nodes: &[NodeRef]| {
+            // If we have reached sufficient consensus on all subkeys, return done
+            let ctx = context.lock();
+            let mut has_consensus = true;
+            for cs in ctx.seqcounts.iter() {
+                if cs.value_nodes.len() < consensus_count {
+                    has_consensus = false;
+                    break;
+                }
+            }
+            if !ctx.seqcounts.is_empty() && ctx.opt_descriptor_info.is_some() && has_consensus {
+                return Some(());
+            }
+            None
+        };
+
+        // Call the fanout
+        let fanout_call = FanoutCall::new(
+            routing_table.clone(),
+            key,
+            key_count,
+            fanout,
+            timeout_us,
+            capability_fanout_node_info_filter(vec![CAP_DHT, CAP_DHT_WATCH]),
+            call_routine,
+            check_done,
+        );
+
+        let kind = match fanout_call.run(vec![]).await {
+            // If we don't finish in the timeout (too much time passed checking for consensus)
+            TimeoutOr::Timeout => FanoutResultKind::Timeout,
+            // If we finished with or without consensus (enough nodes returning the same value)
+            TimeoutOr::Value(Ok(Some(()))) => FanoutResultKind::Finished,
+            // If we ran out of nodes before getting consensus)
+            TimeoutOr::Value(Ok(None)) => FanoutResultKind::Exhausted,
+            // Failed
+            TimeoutOr::Value(Err(e)) => {
+                // If we finished with an error, return that
+                log_dht!(debug "InspectValue Fanout Error: {}", e);
+                return Err(e.into());
+            }
+        };
+
+        let ctx = context.lock();
+        let mut fanout_results = vec![];
+        for cs in &ctx.seqcounts {
+            let has_consensus = cs.value_nodes.len() >= consensus_count;
+            let fanout_result = FanoutResult {
+                kind: if has_consensus {
+                    FanoutResultKind::Finished
+                } else {
+                    kind
+                },
+                value_nodes: cs.value_nodes.clone(),
+            };
+            fanout_results.push(fanout_result);
+        }
+
+        log_network_result!(debug "InspectValue Fanout ({:?}):\n{}", kind, debug_fanout_results(&fanout_results));
+
+        Ok(OutboundInspectValueResult {
+            fanout_results,
+            inspect_result: InspectResult {
+                subkeys: ctx
+                    .opt_descriptor_info
+                    .as_ref()
+                    .map(|d| d.subkeys.clone())
+                    .unwrap_or_default(),
+                seqs: ctx.seqcounts.iter().map(|cs| cs.seq).collect(),
+                opt_descriptor: ctx
+                    .opt_descriptor_info
+                    .as_ref()
+                    .map(|d| d.descriptor.clone()),
+            },
+        })
+    }
+
+    /// Handle a received 'Inspect Value' query
+    pub async fn inbound_inspect_value(
+        &self,
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        want_descriptor: bool,
+    ) -> VeilidAPIResult<NetworkResult<InspectResult>> {
+        let mut inner = self.lock().await?;
+
+        // See if this is a remote or local value
+        let (_is_local, inspect_result) = {
+            // See if the subkey we are getting has a last known local value
+            let mut local_inspect_result = inner
+                .handle_inspect_local_value(key, subkeys.clone(), true)
+                .await?;
+            // If this is local, it must have a descriptor already
+            if local_inspect_result.opt_descriptor.is_some() {
+                if !want_descriptor {
+                    local_inspect_result.opt_descriptor = None;
+                }
+                (true, local_inspect_result)
+            } else {
+                // See if the subkey we are getting has a last known remote value
+                let remote_inspect_result = inner
+                    .handle_inspect_remote_value(key, subkeys, want_descriptor)
+                    .await?;
+                (false, remote_inspect_result)
+            }
+        };
+
+        Ok(NetworkResult::value(inspect_result))
+    }
+}
diff --git a/veilid-core/src/storage_manager/mod.rs b/veilid-core/src/storage_manager/mod.rs
index 60ae420d..79724517 100644
--- a/veilid-core/src/storage_manager/mod.rs
+++ b/veilid-core/src/storage_manager/mod.rs
@@ -1,27 +1,22 @@
 mod debug;
 mod get_value;
-mod keys;
-mod limited_size;
+mod inspect_value;
 mod record_store;
-mod record_store_limits;
 mod set_value;
 mod storage_manager_inner;
 mod tasks;
 mod types;
 mod watch_value;
 
-use keys::*;
-use limited_size::*;
-use record_store::*;
-use record_store_limits::*;
-use storage_manager_inner::*;
-
-pub use types::*;
-
 use super::*;
 use network_manager::*;
+use record_store::*;
 use routing_table::*;
 use rpc_processor::*;
+use storage_manager_inner::*;
+
+pub use record_store::{WatchParameters, WatchResult};
+pub use types::*;
 
 /// The maximum size of a single subkey
 const MAX_SUBKEY_SIZE: usize = ValueData::MAX_LEN;
@@ -33,8 +28,10 @@ const FLUSH_RECORD_STORES_INTERVAL_SECS: u32 = 1;
 const OFFLINE_SUBKEY_WRITES_INTERVAL_SECS: u32 = 1;
 /// Frequency to send ValueChanged notifications to the network
 const SEND_VALUE_CHANGES_INTERVAL_SECS: u32 = 1;
-/// Frequence to check for dead nodes and routes for active watches
+/// Frequency to check for dead nodes and routes for client-side active watches
 const CHECK_ACTIVE_WATCHES_INTERVAL_SECS: u32 = 1;
+/// Frequency to check for expired server-side watched records
+const CHECK_WATCHED_RECORDS_INTERVAL_SECS: u32 = 1;
 
 #[derive(Debug, Clone)]
 /// A single 'value changed' message to send
@@ -43,6 +40,7 @@ struct ValueChangedInfo {
     key: TypedKey,
     subkeys: ValueSubkeyRangeSet,
     count: u32,
+    watch_id: u64,
     value: Arc<SignedValueData>,
 }
 
@@ -58,6 +56,7 @@ struct StorageManagerUnlockedInner {
     offline_subkey_writes_task: TickTask<EyreReport>,
     send_value_changes_task: TickTask<EyreReport>,
     check_active_watches_task: TickTask<EyreReport>,
+    check_watched_records_task: TickTask<EyreReport>,
 
     // Anonymous watch keys
     anonymous_watch_keys: TypedKeyPairGroup,
@@ -94,6 +93,7 @@ impl StorageManager {
             offline_subkey_writes_task: TickTask::new(OFFLINE_SUBKEY_WRITES_INTERVAL_SECS),
             send_value_changes_task: TickTask::new(SEND_VALUE_CHANGES_INTERVAL_SECS),
             check_active_watches_task: TickTask::new(CHECK_ACTIVE_WATCHES_INTERVAL_SECS),
+            check_watched_records_task: TickTask::new(CHECK_WATCHED_RECORDS_INTERVAL_SECS),
 
             anonymous_watch_keys,
         }
@@ -127,7 +127,7 @@ impl StorageManager {
 
     #[instrument(level = "debug", skip_all, err)]
     pub async fn init(&self, update_callback: UpdateCallback) -> EyreResult<()> {
-        debug!("startup storage manager");
+        log_stor!(debug "startup storage manager");
 
         let mut inner = self.inner.lock().await;
         inner.init(self.clone(), update_callback).await?;
@@ -137,7 +137,7 @@ impl StorageManager {
 
     #[instrument(level = "debug", skip_all)]
     pub async fn terminate(&self) {
-        debug!("starting storage manager shutdown");
+        log_stor!(debug "starting storage manager shutdown");
 
         let mut inner = self.inner.lock().await;
         inner.terminate().await;
@@ -148,7 +148,7 @@ impl StorageManager {
         // Release the storage manager
         *inner = Self::new_inner(self.unlocked_inner.clone());
 
-        debug!("finished storage manager shutdown");
+        log_stor!(debug "finished storage manager shutdown");
     }
 
     pub async fn set_rpc_processor(&self, opt_rpc_processor: Option<RPCProcessor>) {
@@ -169,7 +169,7 @@ impl StorageManager {
         Ok(inner)
     }
 
-    fn online_writes_ready_inner(inner: &StorageManagerInner) -> Option<RPCProcessor> {
+    fn online_ready_inner(inner: &StorageManagerInner) -> Option<RPCProcessor> {
         if let Some(rpc_processor) = { inner.opt_rpc_processor.clone() } {
             if let Some(network_class) = rpc_processor
                 .routing_table()
@@ -193,7 +193,7 @@ impl StorageManager {
 
     async fn online_writes_ready(&self) -> EyreResult<Option<RPCProcessor>> {
         let inner = self.lock().await?;
-        Ok(Self::online_writes_ready_inner(&inner))
+        Ok(Self::online_ready_inner(&inner))
     }
 
     async fn has_offline_subkey_writes(&self) -> EyreResult<bool> {
@@ -209,6 +209,7 @@ impl StorageManager {
         safety_selection: SafetySelection,
     ) -> VeilidAPIResult<DHTRecordDescriptor> {
         let mut inner = self.lock().await?;
+        schema.validate()?;
 
         // Create a new owned local record from scratch
         let (key, owner) = inner
@@ -243,7 +244,7 @@ impl StorageManager {
         // No record yet, try to get it from the network
 
         // Get rpc processor and drop mutex so we don't block while getting the value from the network
-        let Some(rpc_processor) = inner.opt_rpc_processor.clone() else {
+        let Some(rpc_processor) = Self::online_ready_inner(&inner) else {
             apibail_try_again!("offline, try again later");
         };
 
@@ -259,12 +260,12 @@ impl StorageManager {
                 key,
                 subkey,
                 safety_selection,
-                SubkeyResult::default(),
+                GetResult::default(),
             )
             .await?;
 
         // If we got nothing back, the key wasn't found
-        if result.subkey_result.value.is_none() && result.subkey_result.descriptor.is_none() {
+        if result.get_result.opt_value.is_none() && result.get_result.opt_descriptor.is_none() {
             // No result
             apibail_key_not_found!(key);
         };
@@ -285,7 +286,7 @@ impl StorageManager {
 
         // Open the new record
         inner
-            .open_new_record(key, writer, subkey, result.subkey_result, safety_selection)
+            .open_new_record(key, writer, subkey, result.get_result, safety_selection)
             .await
     }
 
@@ -293,7 +294,7 @@ impl StorageManager {
     pub async fn close_record(&self, key: TypedKey) -> VeilidAPIResult<()> {
         let (opt_opened_record, opt_rpc_processor) = {
             let mut inner = self.lock().await?;
-            (inner.close_record(key)?, inner.opt_rpc_processor.clone())
+            (inner.close_record(key)?, Self::online_ready_inner(&inner))
         };
 
         // Send a one-time cancel request for the watch if we have one and we're online
@@ -311,14 +312,14 @@ impl StorageManager {
                             0,
                             opened_record.safety_selection(),
                             opened_record.writer().cloned(),
+                            Some(active_watch.id),
                             Some(active_watch.watch_node),
                         )
                         .await?;
                     if let Some(owvresult) = opt_owvresult {
                         if owvresult.expiration_ts.as_u64() != 0 {
                             log_stor!(debug
-                                "close record watch cancel got unexpected expiration: {}",
-                                owvresult.expiration_ts
+                                "close record watch cancel should have zero expiration"
                             );
                         }
                     } else {
@@ -364,22 +365,22 @@ impl StorageManager {
         };
 
         // See if the requested subkey is our local record store
-        let last_subkey_result = inner.handle_get_local_value(key, subkey, true).await?;
+        let last_get_result = inner.handle_get_local_value(key, subkey, true).await?;
 
         // Return the existing value if we have one unless we are forcing a refresh
         if !force_refresh {
-            if let Some(last_subkey_result_value) = last_subkey_result.value {
-                return Ok(Some(last_subkey_result_value.value_data().clone()));
+            if let Some(last_get_result_value) = last_get_result.opt_value {
+                return Ok(Some(last_get_result_value.value_data().clone()));
             }
         }
 
         // Refresh if we can
 
         // Get rpc processor and drop mutex so we don't block while getting the value from the network
-        let Some(rpc_processor) = inner.opt_rpc_processor.clone() else {
+        let Some(rpc_processor) = Self::online_ready_inner(&inner) else {
             // Return the existing value if we have one if we aren't online
-            if let Some(last_subkey_result_value) = last_subkey_result.value {
-                return Ok(Some(last_subkey_result_value.value_data().clone()));
+            if let Some(last_get_result_value) = last_get_result.opt_value {
+                return Ok(Some(last_get_result_value.value_data().clone()));
             }
             apibail_try_again!("offline, try again later");
         };
@@ -389,8 +390,8 @@ impl StorageManager {
 
         // May have last descriptor / value
         // Use the safety selection we opened the record with
-        let opt_last_seq = last_subkey_result
-            .value
+        let opt_last_seq = last_get_result
+            .opt_value
             .as_ref()
             .map(|v| v.value_data().seq());
         let result = self
@@ -399,32 +400,36 @@ impl StorageManager {
                 key,
                 subkey,
                 safety_selection,
-                last_subkey_result,
+                last_get_result,
             )
             .await?;
 
         // See if we got a value back
-        let Some(subkey_result_value) = result.subkey_result.value else {
+        let Some(get_result_value) = result.get_result.opt_value else {
             // If we got nothing back then we also had nothing beforehand, return nothing
             return Ok(None);
         };
 
         // Keep the list of nodes that returned a value for later reference
         let mut inner = self.lock().await?;
-        inner.set_value_nodes(key, result.value_nodes)?;
+        inner.process_fanout_results(
+            key,
+            core::iter::once((subkey, &result.fanout_result)),
+            false,
+        )?;
 
         // If we got a new value back then write it to the opened record
-        if Some(subkey_result_value.value_data().seq()) != opt_last_seq {
+        if Some(get_result_value.value_data().seq()) != opt_last_seq {
             inner
                 .handle_set_local_value(
                     key,
                     subkey,
-                    subkey_result_value.clone(),
+                    get_result_value.clone(),
                     WatchUpdateMode::UpdateAll,
                 )
                 .await?;
         }
-        Ok(Some(subkey_result_value.value_data().clone()))
+        Ok(Some(get_result_value.value_data().clone()))
     }
 
     /// Set the value of a subkey on an opened local record
@@ -433,6 +438,7 @@ impl StorageManager {
         key: TypedKey,
         subkey: ValueSubkey,
         data: Vec<u8>,
+        writer: Option<KeyPair>,
     ) -> VeilidAPIResult<Option<ValueData>> {
         let mut inner = self.lock().await?;
 
@@ -451,22 +457,25 @@ impl StorageManager {
             )
         };
 
+        // Use the specified writer, or if not specified, the default writer when the record was opened
+        let opt_writer = writer.or(opt_writer);
+
         // If we don't have a writer then we can't write
         let Some(writer) = opt_writer else {
             apibail_generic!("value is not writable");
         };
 
         // See if the subkey we are modifying has a last known local value
-        let last_subkey_result = inner.handle_get_local_value(key, subkey, true).await?;
+        let last_get_result = inner.handle_get_local_value(key, subkey, true).await?;
 
         // Get the descriptor and schema for the key
-        let Some(descriptor) = last_subkey_result.descriptor else {
+        let Some(descriptor) = last_get_result.opt_descriptor else {
             apibail_generic!("must have a descriptor");
         };
         let schema = descriptor.schema()?;
 
         // Make new subkey data
-        let value_data = if let Some(last_signed_value_data) = last_subkey_result.value {
+        let value_data = if let Some(last_signed_value_data) = last_get_result.opt_value {
             if last_signed_value_data.value_data().data() == data
                 && last_signed_value_data.value_data().writer() == &writer.key
             {
@@ -495,20 +504,19 @@ impl StorageManager {
             writer.secret,
         )?);
 
+        // Write the value locally first
+        log_stor!(debug "Writing subkey locally: {}:{} len={}", key, subkey, signed_value_data.value_data().data().len() );
+        inner
+            .handle_set_local_value(
+                key,
+                subkey,
+                signed_value_data.clone(),
+                WatchUpdateMode::NoUpdate,
+            )
+            .await?;
+
         // Get rpc processor and drop mutex so we don't block while getting the value from the network
-        let Some(rpc_processor) = Self::online_writes_ready_inner(&inner) else {
-            log_stor!(debug "Writing subkey locally: {}:{} len={}", key, subkey, signed_value_data.value_data().data().len() );
-
-            // Offline, just write it locally and return immediately
-            inner
-                .handle_set_local_value(
-                    key,
-                    subkey,
-                    signed_value_data.clone(),
-                    WatchUpdateMode::UpdateAll,
-                )
-                .await?;
-
+        let Some(rpc_processor) = Self::online_ready_inner(&inner) else {
             log_stor!(debug "Writing subkey offline: {}:{} len={}", key, subkey, signed_value_data.value_data().data().len() );
             // Add to offline writes to flush
             inner
@@ -527,6 +535,8 @@ impl StorageManager {
         // Drop the lock for network access
         drop(inner);
 
+        log_stor!(debug "Writing subkey to the network: {}:{} len={}", key, subkey, signed_value_data.value_data().data().len() );
+
         // Use the safety selection we opened the record with
         let result = self
             .outbound_set_value(
@@ -541,20 +551,24 @@ impl StorageManager {
 
         // Keep the list of nodes that returned a value for later reference
         let mut inner = self.lock().await?;
-        inner.set_value_nodes(key, result.value_nodes)?;
-
-        // Whatever record we got back, store it locally, might be newer than the one we asked to save
-        inner
-            .handle_set_local_value(
-                key,
-                subkey,
-                result.signed_value_data.clone(),
-                WatchUpdateMode::UpdateAll,
-            )
-            .await?;
+        inner.process_fanout_results(
+            key,
+            core::iter::once((subkey, &result.fanout_result)),
+            true,
+        )?;
 
         // Return the new value if it differs from what was asked to set
         if result.signed_value_data.value_data() != signed_value_data.value_data() {
+            // Record the newer value and send and update since it is different than what we just set
+            inner
+                .handle_set_local_value(
+                    key,
+                    subkey,
+                    result.signed_value_data.clone(),
+                    WatchUpdateMode::UpdateAll,
+                )
+                .await?;
+
             return Ok(Some(result.signed_value_data.value_data().clone()));
         }
 
@@ -562,7 +576,7 @@ impl StorageManager {
         Ok(None)
     }
 
-    /// Add a watch to a DHT value
+    /// Create,update or cancel an outbound watch to a DHT value
     pub async fn watch_values(
         &self,
         key: TypedKey,
@@ -572,6 +586,20 @@ impl StorageManager {
     ) -> VeilidAPIResult<Timestamp> {
         let inner = self.lock().await?;
 
+        // Get the safety selection and the writer we opened this record
+        // and whatever active watch id and watch node we may have in case this is a watch update
+        let (safety_selection, opt_writer, opt_watch_id, opt_watch_node) = {
+            let Some(opened_record) = inner.opened_records.get(&key) else {
+                apibail_generic!("record not open");
+            };
+            (
+                opened_record.safety_selection(),
+                opened_record.writer().cloned(),
+                opened_record.active_watch().map(|aw| aw.id),
+                opened_record.active_watch().map(|aw| aw.watch_node.clone()),
+            )
+        };
+
         // Rewrite subkey range if empty to full
         let subkeys = if subkeys.is_empty() {
             ValueSubkeyRangeSet::full()
@@ -579,20 +607,19 @@ impl StorageManager {
             subkeys
         };
 
-        // Get the safety selection and the writer we opened this record with
-        let (safety_selection, opt_writer, opt_watch_node) = {
-            let Some(opened_record) = inner.opened_records.get(&key) else {
-                apibail_generic!("record not open");
+        // Get the schema so we can truncate the watch to the number of subkeys
+        let schema = if let Some(lrs) = inner.local_record_store.as_ref() {
+            let Some(schema) = lrs.peek_record(key, |r| r.schema()) else {
+                apibail_generic!("no local record found");
             };
-            (
-                opened_record.safety_selection(),
-                opened_record.writer().cloned(),
-                opened_record.active_watch().map(|aw| aw.watch_node.clone()),
-            )
+            schema
+        } else {
+            apibail_not_initialized!();
         };
+        let subkeys = schema.truncate_subkeys(&subkeys, None);
 
         // Get rpc processor and drop mutex so we don't block while requesting the watch from the network
-        let Some(rpc_processor) = inner.opt_rpc_processor.clone() else {
+        let Some(rpc_processor) = Self::online_ready_inner(&inner) else {
             apibail_try_again!("offline, try again later");
         };
 
@@ -610,13 +637,14 @@ impl StorageManager {
                 count,
                 safety_selection,
                 opt_writer,
+                opt_watch_id,
                 opt_watch_node,
             )
             .await?;
 
-        // If we did not get a valid response return a zero timestamp
+        // If we did not get a valid response assume nothing changed
         let Some(owvresult) = opt_owvresult else {
-            return Ok(Timestamp::new(0));
+            apibail_try_again!("did not get a valid response");
         };
 
         // Clear any existing watch if the watch succeeded or got cancelled
@@ -642,24 +670,29 @@ impl StorageManager {
             expiration.as_u64()
         };
 
-        // If the expiration time is less than our minimum expiration time consider this watch cancelled
+        // If the expiration time is less than our minimum expiration time (or zero) consider this watch inactive
         let mut expiration_ts = owvresult.expiration_ts;
         if expiration_ts.as_u64() < min_expiration_ts {
             return Ok(Timestamp::new(0));
         }
 
-        // If the expiration time is greated than our maximum expiration time, clamp our local watch so we ignore extra valuechanged messages
+        // If the expiration time is greater than our maximum expiration time, clamp our local watch so we ignore extra valuechanged messages
         if expiration_ts.as_u64() > max_expiration_ts {
             expiration_ts = Timestamp::new(max_expiration_ts);
         }
 
         // If we requested a cancellation, then consider this watch cancelled
         if count == 0 {
+            // Expiration returned should be zero if we requested a cancellation
+            if expiration_ts.as_u64() != 0 {
+                log_stor!(debug "got active watch despite asking for a cancellation");
+            }
             return Ok(Timestamp::new(0));
         }
 
         // Keep a record of the watch
         opened_record.set_active_watch(ActiveWatch {
+            id: owvresult.watch_id,
             expiration_ts,
             watch_node: owvresult.watch_node,
             opt_value_changed_route: owvresult.opt_value_changed_route,
@@ -707,25 +740,141 @@ impl StorageManager {
             active_watch.count
         };
 
-        // Update the watch
+        // Update the watch. This just calls through to the above watch_values() function
+        // This will update the active_watch so we don't need to do that in this routine.
         let expiration_ts = self
             .watch_values(key, subkeys, active_watch.expiration_ts, count)
             .await?;
 
-        // A zero expiration time means the watch is done or nothing is left, and the watch is no longer active
+        // A zero expiration time returned from watch_value() means the watch is done
+        // or no subkeys are left, and the watch is no longer active
         if expiration_ts.as_u64() == 0 {
+            // Return false indicating the watch is completely gone
             return Ok(false);
         }
 
+        // Return true because the the watch was changed
         Ok(true)
     }
 
+    /// Inspect an opened DHT record for its subkey sequence numbers
+    pub async fn inspect_record(
+        &self,
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        scope: DHTReportScope,
+    ) -> VeilidAPIResult<DHTRecordReport> {
+        let subkeys = if subkeys.is_empty() {
+            ValueSubkeyRangeSet::full()
+        } else {
+            subkeys
+        };
+
+        let mut inner = self.lock().await?;
+        let safety_selection = {
+            let Some(opened_record) = inner.opened_records.get(&key) else {
+                apibail_generic!("record not open");
+            };
+            opened_record.safety_selection()
+        };
+
+        // See if the requested record is our local record store
+        let mut local_inspect_result = inner
+            .handle_inspect_local_value(key, subkeys.clone(), true)
+            .await?;
+
+        #[allow(clippy::unnecessary_cast)]
+        {
+            assert!(
+                local_inspect_result.subkeys.len() as u64 == local_inspect_result.seqs.len() as u64,
+                "mismatch between local subkeys returned and sequence number list returned"
+            );
+        }
+        assert!(
+            local_inspect_result.subkeys.is_subset(&subkeys),
+            "more subkeys returned locally than requested"
+        );
+
+        // If this is the maximum scope we're interested in, return the report
+        if matches!(scope, DHTReportScope::Local) {
+            return Ok(DHTRecordReport::new(
+                local_inspect_result.subkeys,
+                local_inspect_result.seqs,
+                vec![],
+            ));
+        }
+
+        // Get rpc processor and drop mutex so we don't block while getting the value from the network
+        let Some(rpc_processor) = Self::online_ready_inner(&inner) else {
+            apibail_try_again!("offline, try again later");
+        };
+
+        // Drop the lock for network access
+        drop(inner);
+
+        // If we're simulating a set, increase the previous sequence number we have by 1
+        if matches!(scope, DHTReportScope::UpdateSet) {
+            for seq in &mut local_inspect_result.seqs {
+                *seq = seq.overflowing_add(1).0;
+            }
+        }
+
+        // Get the inspect record report from the network
+        let result = self
+            .outbound_inspect_value(
+                rpc_processor,
+                key,
+                subkeys,
+                safety_selection,
+                if matches!(scope, DHTReportScope::SyncGet | DHTReportScope::SyncSet) {
+                    InspectResult::default()
+                } else {
+                    local_inspect_result.clone()
+                },
+                matches!(scope, DHTReportScope::UpdateSet | DHTReportScope::SyncSet),
+            )
+            .await?;
+
+        // Sanity check before zip
+        #[allow(clippy::unnecessary_cast)]
+        {
+            assert_eq!(
+                result.inspect_result.subkeys.len() as u64,
+                result.fanout_results.len() as u64,
+                "mismatch between subkeys returned and fanout results returned"
+            );
+        }
+        if !local_inspect_result.subkeys.is_empty() && !result.inspect_result.subkeys.is_empty() {
+            assert_eq!(
+                result.inspect_result.subkeys.len(),
+                local_inspect_result.subkeys.len(),
+                "mismatch between local subkeys returned and network results returned"
+            );
+        }
+
+        // Keep the list of nodes that returned a value for later reference
+        let mut inner = self.lock().await?;
+        let results_iter = result
+            .inspect_result
+            .subkeys
+            .iter()
+            .zip(result.fanout_results.iter());
+
+        inner.process_fanout_results(key, results_iter, false)?;
+
+        Ok(DHTRecordReport::new(
+            result.inspect_result.subkeys,
+            local_inspect_result.seqs,
+            result.inspect_result.seqs,
+        ))
+    }
+
     // Send single value change out to the network
     #[instrument(level = "trace", skip(self), err)]
     async fn send_value_change(&self, vc: ValueChangedInfo) -> VeilidAPIResult<()> {
         let rpc_processor = {
             let inner = self.inner.lock().await;
-            if let Some(rpc_processor) = &inner.opt_rpc_processor {
+            if let Some(rpc_processor) = Self::online_ready_inner(&inner) {
                 rpc_processor.clone()
             } else {
                 apibail_try_again!("network is not available");
@@ -741,10 +890,9 @@ impl StorageManager {
             .map_err(VeilidAPIError::from)?;
 
         network_result_value_or_log!(rpc_processor
-        .rpc_call_value_changed(dest, vc.key, vc.subkeys.clone(), vc.count, (*vc.value).clone())
-        .await
-        .map_err(VeilidAPIError::from)? => [format!(": dest={:?} vc={:?}", dest, vc)] {
-        });
+            .rpc_call_value_changed(dest, vc.key, vc.subkeys.clone(), vc.count, vc.watch_id, (*vc.value).clone() )
+            .await
+            .map_err(VeilidAPIError::from)? => [format!(": dest={:?} vc={:?}", dest, vc)] {});
 
         Ok(())
     }
diff --git a/veilid-core/src/storage_manager/record_store/inspect_cache.rs b/veilid-core/src/storage_manager/record_store/inspect_cache.rs
new file mode 100644
index 00000000..d3b09189
--- /dev/null
+++ b/veilid-core/src/storage_manager/record_store/inspect_cache.rs
@@ -0,0 +1,79 @@
+use super::*;
+
+const L2_CACHE_DEPTH: usize = 4; // XXX: i just picked this. we could probably do better than this someday
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct InspectCacheL2Value {
+    pub seqs: Vec<ValueSeqNum>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+struct InspectCacheL2 {
+    pub cache: LruCache<ValueSubkeyRangeSet, InspectCacheL2Value>,
+}
+
+impl InspectCacheL2 {
+    pub fn new(l2_cache_limit: usize) -> Self {
+        Self {
+            cache: LruCache::new(l2_cache_limit),
+        }
+    }
+}
+
+pub struct InspectCache {
+    cache: LruCache<TypedKey, InspectCacheL2>,
+}
+
+impl InspectCache {
+    pub fn new(l1_cache_limit: usize) -> Self {
+        Self {
+            cache: LruCache::new(l1_cache_limit),
+        }
+    }
+
+    pub fn get(
+        &mut self,
+        key: &TypedKey,
+        subkeys: &ValueSubkeyRangeSet,
+    ) -> Option<InspectCacheL2Value> {
+        if let Some(l2c) = self.cache.get_mut(key) {
+            if let Some(l2v) = l2c.cache.get(subkeys) {
+                return Some(l2v.clone());
+            }
+        }
+        None
+    }
+
+    pub fn put(&mut self, key: TypedKey, subkeys: ValueSubkeyRangeSet, value: InspectCacheL2Value) {
+        self.cache
+            .entry(key)
+            .or_insert_with(|| InspectCacheL2::new(L2_CACHE_DEPTH))
+            .cache
+            .insert(subkeys, value);
+    }
+
+    pub fn invalidate(&mut self, key: &TypedKey) {
+        self.cache.remove(key);
+    }
+
+    pub fn replace_subkey_seq(&mut self, key: &TypedKey, subkey: ValueSubkey, seq: ValueSeqNum) {
+        let Some(l2) = self.cache.get_mut(key) else {
+            return;
+        };
+
+        for entry in &mut l2.cache {
+            let Some(idx) = entry.0.idx_of_subkey(subkey) else {
+                continue;
+            };
+            if idx < entry.1.seqs.len() {
+                entry.1.seqs[idx] = seq;
+            } else if idx > entry.1.seqs.len() {
+                panic!(
+                    "representational error in l2 inspect cache: {} > {}",
+                    idx,
+                    entry.1.seqs.len()
+                )
+            }
+        }
+    }
+}
diff --git a/veilid-core/src/storage_manager/keys.rs b/veilid-core/src/storage_manager/record_store/keys.rs
similarity index 100%
rename from veilid-core/src/storage_manager/keys.rs
rename to veilid-core/src/storage_manager/record_store/keys.rs
diff --git a/veilid-core/src/storage_manager/limited_size.rs b/veilid-core/src/storage_manager/record_store/limited_size.rs
similarity index 100%
rename from veilid-core/src/storage_manager/limited_size.rs
rename to veilid-core/src/storage_manager/record_store/limited_size.rs
diff --git a/veilid-core/src/storage_manager/record_store/local_record_detail.rs b/veilid-core/src/storage_manager/record_store/local_record_detail.rs
new file mode 100644
index 00000000..b0d336c3
--- /dev/null
+++ b/veilid-core/src/storage_manager/record_store/local_record_detail.rs
@@ -0,0 +1,29 @@
+use super::*;
+
+/// Information about nodes that cache a local record remotely
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub(in crate::storage_manager) struct PerNodeRecordDetail {
+    pub last_set: Timestamp,
+    pub last_seen: Timestamp,
+    pub subkeys: ValueSubkeyRangeSet,
+}
+
+/// Information required to handle locally opened records
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub(in crate::storage_manager) struct LocalRecordDetail {
+    /// The last 'safety selection' used when creating/opening this record.
+    /// Even when closed, this safety selection applies to re-publication attempts by the system.
+    pub safety_selection: SafetySelection,
+    /// The nodes that we have seen this record cached on recently
+    #[serde(default)]
+    pub nodes: HashMap<PublicKey, PerNodeRecordDetail>,
+}
+
+impl LocalRecordDetail {
+    pub fn new(safety_selection: SafetySelection) -> Self {
+        Self {
+            safety_selection,
+            nodes: Default::default(),
+        }
+    }
+}
diff --git a/veilid-core/src/storage_manager/record_store.rs b/veilid-core/src/storage_manager/record_store/mod.rs
similarity index 66%
rename from veilid-core/src/storage_manager/record_store.rs
rename to veilid-core/src/storage_manager/record_store/mod.rs
index 8d55c00b..1214c6f2 100644
--- a/veilid-core/src/storage_manager/record_store.rs
+++ b/veilid-core/src/storage_manager/record_store/mod.rs
@@ -4,6 +4,29 @@
 /// This store does not perform any validation on the schema, and all ValueRecordData passed in must have been previously validated.
 /// Uses an in-memory store for the records, backed by the TableStore. Subkey data is LRU cached and rotated out by a limits policy,
 /// and backed to the TableStore for persistence.
+mod inspect_cache;
+mod keys;
+mod limited_size;
+mod local_record_detail;
+mod opened_record;
+mod record;
+mod record_data;
+mod record_store_limits;
+mod remote_record_detail;
+mod watch;
+
+pub(super) use inspect_cache::*;
+pub(super) use keys::*;
+pub(super) use limited_size::*;
+pub(super) use local_record_detail::*;
+pub(super) use opened_record::*;
+pub(super) use record::*;
+pub(super) use record_data::*;
+pub(super) use record_store_limits::*;
+pub(super) use remote_record_detail::*;
+pub(super) use watch::*;
+pub use watch::{WatchParameters, WatchResult};
+
 use super::*;
 use hashlink::LruCache;
 
@@ -22,30 +45,6 @@ where
     in_total_storage: bool,
 }
 
-/// An individual watch
-#[derive(Debug, Clone)]
-struct WatchedRecordWatch {
-    subkeys: ValueSubkeyRangeSet,
-    expiration: Timestamp,
-    count: u32,
-    target: Target,
-    watcher: CryptoKey,
-    changed: ValueSubkeyRangeSet,
-}
-
-#[derive(Debug, Default, Clone)]
-/// A record being watched for changes
-struct WatchedRecord {
-    /// The list of active watchers
-    watchers: Vec<WatchedRecordWatch>,
-}
-
-pub(super) enum WatchUpdateMode {
-    NoUpdate,
-    UpdateAll,
-    ExcludeTarget(Target),
-}
-
 pub(super) struct RecordStore<D>
 where
     D: fmt::Debug + Clone + Serialize + for<'d> Deserialize<'d>,
@@ -62,6 +61,8 @@ where
     record_index: LruCache<RecordTableKey, Record<D>>,
     /// The in-memory cache of commonly accessed subkey data so we don't have to keep hitting the db
     subkey_cache: LruCache<SubkeyTableKey, RecordData>,
+    /// The in-memory cache of commonly accessed sequence number data so we don't have to keep hitting the db
+    inspect_cache: InspectCache,
     /// Total storage space or subkey data inclusive of structures in memory
     subkey_cache_total_size: LimitedSize<usize>,
     /// Total storage space of records in the tabledb inclusive of subkey data and structures
@@ -71,21 +72,31 @@ where
     /// The list of records that have changed since last flush to disk (optimization for batched writes)
     changed_records: HashSet<RecordTableKey>,
     /// The list of records being watched for changes
-    watched_records: HashMap<RecordTableKey, WatchedRecord>,
+    watched_records: HashMap<RecordTableKey, WatchList>,
     /// The list of watched records that have changed values since last notification
     changed_watched_values: HashSet<RecordTableKey>,
-
     /// A mutex to ensure we handle this concurrently
     purge_dead_records_mutex: Arc<AsyncMutex<()>>,
 }
 
 /// The result of the do_get_value_operation
-#[derive(Default, Debug)]
-pub struct SubkeyResult {
+#[derive(Default, Clone, Debug)]
+pub struct GetResult {
     /// The subkey value if we got one
-    pub value: Option<Arc<SignedValueData>>,
+    pub opt_value: Option<Arc<SignedValueData>>,
     /// The descriptor if we got a fresh one or empty if no descriptor was needed
-    pub descriptor: Option<Arc<SignedValueDescriptor>>,
+    pub opt_descriptor: Option<Arc<SignedValueDescriptor>>,
+}
+
+/// The result of the do_inspect_value_operation
+#[derive(Default, Clone, Debug)]
+pub struct InspectResult {
+    /// The actual in-schema subkey range being reported on
+    pub subkeys: ValueSubkeyRangeSet,
+    /// The sequence map
+    pub seqs: Vec<ValueSeqNum>,
+    /// The descriptor if we got a fresh one or empty if no descriptor was needed
+    pub opt_descriptor: Option<Arc<SignedValueDescriptor>>,
 }
 
 impl<D> RecordStore<D>
@@ -109,6 +120,7 @@ where
             subkey_table: None,
             record_index: LruCache::new(limits.max_records.unwrap_or(usize::MAX)),
             subkey_cache: LruCache::new(subkey_cache_size),
+            inspect_cache: InspectCache::new(subkey_cache_size),
             subkey_cache_total_size: LimitedSize::new(
                 "subkey_cache_total_size",
                 0,
@@ -279,6 +291,16 @@ where
                 log_stor!(error "dead record found in index: {:?}", dr.key);
             }
 
+            // Record should have no watches now
+            if self.watched_records.contains_key(&dr.key) {
+                log_stor!(error "dead record found in watches: {:?}", dr.key);
+            }
+
+            // Record should have no watch changes now
+            if self.changed_watched_values.contains(&dr.key) {
+                log_stor!(error "dead record found in watch changes: {:?}", dr.key);
+            }
+
             // Delete record
             if let Err(e) = rt_xact.delete(0, &dr.key.bytes()) {
                 log_stor!(error "record could not be deleted: {}", e);
@@ -399,13 +421,27 @@ where
             apibail_key_not_found!(key);
         };
 
-        self.add_dead_record(rtk, record);
+        // Remove watches
+        self.watched_records.remove(&rtk);
 
+        // Remove watch changes
+        self.changed_watched_values.remove(&rtk);
+
+        // Invalidate inspect cache for this key
+        self.inspect_cache.invalidate(&rtk.key);
+
+        // Remove from table store immediately
+        self.add_dead_record(rtk, record);
         self.purge_dead_records(false).await;
 
         Ok(())
     }
 
+    pub(super) fn contains_record(&mut self, key: TypedKey) -> bool {
+        let rtk = RecordTableKey { key };
+        self.record_index.contains_key(&rtk)
+    }
+
     pub(super) fn with_record<R, F>(&mut self, key: TypedKey, f: F) -> Option<R>
     where
         F: FnOnce(&Record<D>) -> R,
@@ -471,7 +507,7 @@ where
         key: TypedKey,
         subkey: ValueSubkey,
         want_descriptor: bool,
-    ) -> VeilidAPIResult<Option<SubkeyResult>> {
+    ) -> VeilidAPIResult<Option<GetResult>> {
         // Get record from index
         let Some((subkey_count, has_subkey, opt_descriptor)) = self.with_record(key, |record| {
             (
@@ -496,9 +532,9 @@ where
         // See if we have this subkey stored
         if !has_subkey {
             // If not, return no value but maybe with descriptor
-            return Ok(Some(SubkeyResult {
-                value: None,
-                descriptor: opt_descriptor,
+            return Ok(Some(GetResult {
+                opt_value: None,
+                opt_descriptor,
             }));
         }
 
@@ -509,12 +545,12 @@ where
 
         // If subkey exists in subkey cache, use that
         let stk = SubkeyTableKey { key, subkey };
-        if let Some(record_data) = self.subkey_cache.get_mut(&stk) {
+        if let Some(record_data) = self.subkey_cache.get(&stk) {
             let out = record_data.signed_value_data().clone();
 
-            return Ok(Some(SubkeyResult {
-                value: Some(out),
-                descriptor: opt_descriptor,
+            return Ok(Some(GetResult {
+                opt_value: Some(out),
+                opt_descriptor,
             }));
         }
         // If not in cache, try to pull from table store if it is in our stored subkey set
@@ -531,9 +567,9 @@ where
         // Add to cache, do nothing with lru out
         self.add_to_subkey_cache(stk, record_data);
 
-        Ok(Some(SubkeyResult {
-            value: Some(out),
-            descriptor: opt_descriptor,
+        Ok(Some(GetResult {
+            opt_value: Some(out),
+            opt_descriptor,
         }))
     }
 
@@ -542,7 +578,7 @@ where
         key: TypedKey,
         subkey: ValueSubkey,
         want_descriptor: bool,
-    ) -> VeilidAPIResult<Option<SubkeyResult>> {
+    ) -> VeilidAPIResult<Option<GetResult>> {
         // record from index
         let Some((subkey_count, has_subkey, opt_descriptor)) = self.peek_record(key, |record| {
             (
@@ -567,9 +603,9 @@ where
         // See if we have this subkey stored
         if !has_subkey {
             // If not, return no value but maybe with descriptor
-            return Ok(Some(SubkeyResult {
-                value: None,
-                descriptor: opt_descriptor,
+            return Ok(Some(GetResult {
+                opt_value: None,
+                opt_descriptor,
             }));
         }
 
@@ -583,9 +619,9 @@ where
         if let Some(record_data) = self.subkey_cache.peek(&stk) {
             let out = record_data.signed_value_data().clone();
 
-            return Ok(Some(SubkeyResult {
-                value: Some(out),
-                descriptor: opt_descriptor,
+            return Ok(Some(GetResult {
+                opt_value: Some(out),
+                opt_descriptor,
             }));
         }
         // If not in cache, try to pull from table store if it is in our stored subkey set
@@ -599,9 +635,9 @@ where
 
         let out = record_data.signed_value_data().clone();
 
-        Ok(Some(SubkeyResult {
-            value: Some(out),
-            descriptor: opt_descriptor,
+        Ok(Some(GetResult {
+            opt_value: Some(out),
+            opt_descriptor,
         }))
     }
 
@@ -609,20 +645,30 @@ where
         &mut self,
         key: TypedKey,
         subkey: ValueSubkey,
-        opt_ignore_target: Option<Target>,
+        watch_update_mode: WatchUpdateMode,
     ) {
+        let (do_update, opt_ignore_target) = match watch_update_mode {
+            WatchUpdateMode::NoUpdate => (false, None),
+            WatchUpdateMode::UpdateAll => (true, None),
+            WatchUpdateMode::ExcludeTarget(target) => (true, Some(target)),
+        };
+        if !do_update {
+            return;
+        }
+
         let rtk = RecordTableKey { key };
         let Some(wr) = self.watched_records.get_mut(&rtk) else {
             return;
         };
+
         // Update all watchers
         let mut changed = false;
-        for w in &mut wr.watchers {
+        for w in &mut wr.watches {
             // If this watcher is watching the changed subkey then add to the watcher's changed list
             // Don't bother marking changes for value sets coming from the same watching node/target because they
             // are already going to be aware of the changes in that case
-            if Some(&w.target) != opt_ignore_target.as_ref()
-                && w.subkeys.contains(subkey)
+            if Some(&w.params.target) != opt_ignore_target.as_ref()
+                && w.params.subkeys.contains(subkey)
                 && w.changed.insert(subkey)
             {
                 changed = true;
@@ -713,6 +759,13 @@ where
             .await
             .map_err(VeilidAPIError::internal)?;
 
+        // Write to inspect cache
+        self.inspect_cache.replace_subkey_seq(
+            &stk.key,
+            subkey,
+            subkey_record_data.signed_value_data().value_data().seq(),
+        );
+
         // Write to subkey cache
         self.add_to_subkey_cache(stk, subkey_record_data);
 
@@ -726,34 +779,239 @@ where
         // Update storage space
         self.total_storage_space.commit().unwrap();
 
-        // Update watched value
-
-        let (do_update, opt_ignore_target) = match watch_update_mode {
-            WatchUpdateMode::NoUpdate => (false, None),
-            WatchUpdateMode::UpdateAll => (true, None),
-            WatchUpdateMode::ExcludeTarget(target) => (true, Some(target)),
-        };
-        if do_update {
-            self.update_watched_value(key, subkey, opt_ignore_target)
-                .await;
-        }
+        // Send updates to
+        self.update_watched_value(key, subkey, watch_update_mode)
+            .await;
 
         Ok(())
     }
 
-    /// Add a record watch for changes
-    pub async fn watch_record(
+    pub async fn inspect_record(
         &mut self,
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
-        mut expiration: Timestamp,
-        count: u32,
-        target: Target,
-        watcher: CryptoKey,
-    ) -> VeilidAPIResult<Option<Timestamp>> {
-        // If subkeys is empty or count is zero then we're cancelling a watch completely
-        if subkeys.is_empty() || count == 0 {
-            return self.cancel_watch(key, target, watcher).await;
+        want_descriptor: bool,
+    ) -> VeilidAPIResult<Option<InspectResult>> {
+        // Get subkey table
+        let Some(subkey_table) = self.subkey_table.clone() else {
+            apibail_internal!("record store not initialized");
+        };
+
+        // Get record from index
+        let Some((subkeys, opt_descriptor)) = self.with_record(key, |record| {
+            // Get number of subkeys from schema and ensure we are getting the
+            // right number of sequence numbers betwen that and what we asked for
+            let truncated_subkeys = record
+                .schema()
+                .truncate_subkeys(&subkeys, Some(MAX_INSPECT_VALUE_A_SEQS_LEN));
+            (
+                truncated_subkeys,
+                if want_descriptor {
+                    Some(record.descriptor().clone())
+                } else {
+                    None
+                },
+            )
+        }) else {
+            // Record not available
+            return Ok(None);
+        };
+
+        // Check if we can return some subkeys
+        if subkeys.is_empty() {
+            apibail_invalid_argument!("subkeys set does not overlap schema", "subkeys", subkeys);
+        }
+
+        // See if we have this inspection cached
+        if let Some(icv) = self.inspect_cache.get(&key, &subkeys) {
+            return Ok(Some(InspectResult {
+                subkeys,
+                seqs: icv.seqs,
+                opt_descriptor,
+            }));
+        }
+
+        // Build sequence number list to return
+        #[allow(clippy::unnecessary_cast)]
+        let mut seqs = Vec::with_capacity(subkeys.len() as usize);
+        for subkey in subkeys.iter() {
+            let stk = SubkeyTableKey { key, subkey };
+            let seq = if let Some(record_data) = self.subkey_cache.peek(&stk) {
+                record_data.signed_value_data().value_data().seq()
+            } else {
+                // If not in cache, try to pull from table store if it is in our stored subkey set
+                // XXX: This would be better if it didn't have to pull the whole record data to get the seq.
+                if let Some(record_data) = subkey_table
+                    .load_json::<RecordData>(0, &stk.bytes())
+                    .await
+                    .map_err(VeilidAPIError::internal)?
+                {
+                    record_data.signed_value_data().value_data().seq()
+                } else {
+                    // Subkey not written to
+                    ValueSubkey::MAX
+                }
+            };
+            seqs.push(seq)
+        }
+
+        // Save seqs cache
+        self.inspect_cache.put(
+            key,
+            subkeys.clone(),
+            InspectCacheL2Value { seqs: seqs.clone() },
+        );
+
+        Ok(Some(InspectResult {
+            subkeys,
+            seqs,
+            opt_descriptor,
+        }))
+    }
+
+    pub async fn _change_existing_watch(
+        &mut self,
+        key: TypedKey,
+        params: WatchParameters,
+        watch_id: u64,
+    ) -> VeilidAPIResult<WatchResult> {
+        if params.count == 0 {
+            apibail_internal!("cancel watch should not have gotten here");
+        }
+        if params.expiration.as_u64() == 0 {
+            apibail_internal!("zero expiration should have been resolved to max by now");
+        }
+        // Get the watch list for this record
+        let rtk = RecordTableKey { key };
+        let Some(watch_list) = self.watched_records.get_mut(&rtk) else {
+            // No watches, nothing to change
+            return Ok(WatchResult::Rejected);
+        };
+
+        // Check each watch to see if we have an exact match for the id to change
+        for w in &mut watch_list.watches {
+            // If the watch id doesn't match, then we're not updating
+            // Also do not allow the watcher key to change
+            if w.id == watch_id && w.params.watcher == params.watcher {
+                // Updating an existing watch
+                w.params = params;
+                return Ok(WatchResult::Changed {
+                    expiration: w.params.expiration,
+                });
+            }
+        }
+
+        // No existing watch found
+        Ok(WatchResult::Rejected)
+    }
+
+    pub async fn _create_new_watch(
+        &mut self,
+        key: TypedKey,
+        params: WatchParameters,
+        member_check: Box<dyn Fn(PublicKey) -> bool + Send>,
+    ) -> VeilidAPIResult<WatchResult> {
+        // Generate a record-unique watch id > 0
+        let rtk = RecordTableKey { key };
+        let mut id = 0;
+        while id == 0 {
+            id = get_random_u64();
+        }
+        if let Some(watched_record) = self.watched_records.get_mut(&rtk) {
+            // Make sure it doesn't match any other id (unlikely, but lets be certain)
+            'x: loop {
+                for w in &mut watched_record.watches {
+                    if w.id == id {
+                        loop {
+                            id = id.overflowing_add(1).0;
+                            if id != 0 {
+                                break;
+                            }
+                        }
+                        continue 'x;
+                    }
+                }
+                break;
+            }
+        }
+
+        // Calculate watch limits
+        let mut watch_count = 0;
+        let mut target_watch_count = 0;
+
+        let is_member = member_check(params.watcher);
+
+        let rtk = RecordTableKey { key };
+        if let Some(watched_record) = self.watched_records.get_mut(&rtk) {
+            // Total up the number of watches for this key
+            for w in &mut watched_record.watches {
+                // See if this watch should be counted toward any limits
+                let count_watch = if is_member {
+                    // If the watcher is a member of the schema, then consider the total per-watcher key
+                    w.params.watcher == params.watcher
+                } else {
+                    // If the watcher is not a member of the schema, the check if this watch is an anonymous watch and contributes to per-record key total
+                    !member_check(w.params.watcher)
+                };
+
+                // For any watch, if the target matches our also tally that separately
+                // If the watcher is a member of the schema, then consider the total per-target-per-watcher key
+                // If the watcher is not a member of the schema, then it is an anonymous watch and the total is per-target-per-record key
+                if count_watch {
+                    watch_count += 1;
+                    if w.params.target == params.target {
+                        target_watch_count += 1;
+                    }
+                }
+            }
+        }
+
+        // For members, no more than one watch per target per watcher per record
+        // For anonymous, no more than one watch per target per record
+        if target_watch_count > 0 {
+            // Too many watches
+            return Ok(WatchResult::Rejected);
+        }
+
+        // Check watch table for limits
+        let watch_limit = if is_member {
+            self.limits.member_watch_limit
+        } else {
+            self.limits.public_watch_limit
+        };
+        if watch_count >= watch_limit {
+            return Ok(WatchResult::Rejected);
+        }
+
+        // Ok this is an acceptable new watch, add it
+        let watch_list = self.watched_records.entry(rtk).or_default();
+        let expiration = params.expiration;
+        watch_list.watches.push(Watch {
+            params,
+            id,
+            changed: ValueSubkeyRangeSet::new(),
+        });
+        Ok(WatchResult::Created { id, expiration })
+    }
+
+    /// Add or update an inbound record watch for changes
+    #[allow(clippy::too_many_arguments)]
+    pub async fn watch_record(
+        &mut self,
+        key: TypedKey,
+        mut params: WatchParameters,
+        opt_watch_id: Option<u64>,
+    ) -> VeilidAPIResult<WatchResult> {
+        // If count is zero then we're cancelling a watch completely
+        if params.count == 0 {
+            if let Some(watch_id) = opt_watch_id {
+                let cancelled = self.cancel_watch(key, watch_id, params.watcher).await?;
+                if cancelled {
+                    return Ok(WatchResult::Cancelled);
+                }
+                return Ok(WatchResult::Rejected);
+            }
+            apibail_internal!("shouldn't have let a None watch id get here");
         }
 
         // See if expiration timestamp is too far in the future or not enough in the future
@@ -761,114 +1019,67 @@ where
         let max_ts = cur_ts + self.limits.max_watch_expiration.as_u64();
         let min_ts = cur_ts + self.limits.min_watch_expiration.as_u64();
 
-        if expiration.as_u64() == 0 || expiration.as_u64() > max_ts {
+        if params.expiration.as_u64() == 0 || params.expiration.as_u64() > max_ts {
             // Clamp expiration max time (or set zero expiration to max)
-            expiration = Timestamp::new(max_ts);
-        } else if expiration.as_u64() < min_ts {
+            params.expiration = Timestamp::new(max_ts);
+        } else if params.expiration.as_u64() < min_ts {
             // Don't add watches with too low of an expiration time
-            return Ok(None);
-        }
-
-        // Get the record being watched
-        let Some(is_member) = self.with_record(key, |record| {
-            // Check if the watcher specified is a schema member
-            let schema = record.schema();
-            (*record.owner()) == watcher || schema.is_member(&watcher)
-        }) else {
-            // Record not found
-            return Ok(None);
-        };
-
-        // See if we are updating an existing watch
-        // with the watcher matched on target
-        let mut watch_count = 0;
-        let rtk = RecordTableKey { key };
-        if let Some(watch) = self.watched_records.get_mut(&rtk) {
-            for w in &mut watch.watchers {
-                if w.watcher == watcher {
-                    watch_count += 1;
-
-                    // Only one watch for an anonymous watcher
-                    // Allow members to have one watch per target
-                    if !is_member || w.target == target {
-                        // Updating an existing watch
-                        w.subkeys = subkeys;
-                        w.expiration = expiration;
-                        w.count = count;
-                        return Ok(Some(expiration));
-                    }
+            if let Some(watch_id) = opt_watch_id {
+                let cancelled = self.cancel_watch(key, watch_id, params.watcher).await?;
+                if cancelled {
+                    return Ok(WatchResult::Cancelled);
                 }
             }
+            return Ok(WatchResult::Rejected);
         }
 
-        // Adding a new watcher to a watch
-        // Check watch table for limits
-        if is_member {
-            // Member watch
-            if watch_count >= self.limits.member_watch_limit {
-                // Too many watches
-                return Ok(None);
-            }
+        // Make a closure to check for member vs anonymous
+        let Some(member_check) = self.with_record(key, |record| {
+            let schema = record.schema();
+            let owner = *record.owner();
+            Box::new(move |watcher| owner == params.watcher || schema.is_member(&watcher))
+        }) else {
+            // Record not found
+            return Ok(WatchResult::Rejected);
+        };
+
+        // Create or update depending on if a watch id is specified or not
+        if let Some(watch_id) = opt_watch_id {
+            self._change_existing_watch(key, params, watch_id).await
         } else {
-            // Public watch
-            if watch_count >= self.limits.public_watch_limit {
-                // Too many watches
-                return Ok(None);
-            }
+            self._create_new_watch(key, params, member_check).await
         }
-
-        // Ok this is an acceptable new watch, add it
-        let watch = self.watched_records.entry(rtk).or_default();
-        watch.watchers.push(WatchedRecordWatch {
-            subkeys,
-            expiration,
-            count,
-            target,
-            watcher,
-            changed: ValueSubkeyRangeSet::new(),
-        });
-        Ok(Some(expiration))
     }
 
-    /// Add a record watch for changes
+    /// Clear a specific watch for a record
+    /// returns true if the watch was found and cancelled
     async fn cancel_watch(
         &mut self,
         key: TypedKey,
-        target: Target,
-        watcher: CryptoKey,
-    ) -> VeilidAPIResult<Option<Timestamp>> {
-        // Get the record being watched
-        let Some(is_member) = self.with_record(key, |record| {
-            // Check if the watcher specified is a schema member
-            let schema = record.schema();
-            (*record.owner()) == watcher || schema.is_member(&watcher)
-        }) else {
-            // Record not found
-            return Ok(None);
-        };
-
+        watch_id: u64,
+        watcher: PublicKey,
+    ) -> VeilidAPIResult<bool> {
+        if watch_id == 0 {
+            apibail_internal!("should not have let a zero watch id get here");
+        }
         // See if we are cancelling an existing watch
-        // with the watcher matched on target
         let rtk = RecordTableKey { key };
         let mut is_empty = false;
-        let mut ret_timestamp = None;
-        if let Some(watch) = self.watched_records.get_mut(&rtk) {
+        let mut ret = false;
+        if let Some(watch_list) = self.watched_records.get_mut(&rtk) {
             let mut dead_watcher = None;
-            for (wn, w) in watch.watchers.iter_mut().enumerate() {
-                if w.watcher == watcher {
-                    // Only one watch for an anonymous watcher
-                    // Allow members to have one watch per target
-                    if !is_member || w.target == target {
-                        // Canceling an existing watch
-                        dead_watcher = Some(wn);
-                        ret_timestamp = Some(w.expiration);
-                        break;
-                    }
+            for (wn, w) in watch_list.watches.iter_mut().enumerate() {
+                // Must match the watch id and the watcher key to cancel
+                if w.id == watch_id && w.params.watcher == watcher {
+                    // Canceling an existing watch
+                    dead_watcher = Some(wn);
+                    ret = true;
+                    break;
                 }
             }
             if let Some(dw) = dead_watcher {
-                watch.watchers.remove(dw);
-                if watch.watchers.is_empty() {
+                watch_list.watches.remove(dw);
+                if watch_list.watches.is_empty() {
                     is_empty = true;
                 }
             }
@@ -877,7 +1088,42 @@ where
             self.watched_records.remove(&rtk);
         }
 
-        Ok(ret_timestamp)
+        Ok(ret)
+    }
+
+    /// Move watches from one store to another
+    pub fn move_watches(
+        &mut self,
+        key: TypedKey,
+        in_watch: Option<(WatchList, bool)>,
+    ) -> Option<(WatchList, bool)> {
+        let rtk = RecordTableKey { key };
+        let out = self.watched_records.remove(&rtk);
+        if let Some(in_watch) = in_watch {
+            self.watched_records.insert(rtk, in_watch.0);
+            if in_watch.1 {
+                self.changed_watched_values.insert(rtk);
+            }
+        }
+        let is_watched = self.changed_watched_values.remove(&rtk);
+        out.map(|r| (r, is_watched))
+    }
+
+    /// See if any watched records have expired and clear them out
+    pub fn check_watched_records(&mut self) {
+        let now = get_aligned_timestamp();
+        self.watched_records.retain(|key, watch_list| {
+            watch_list.watches.retain(|w| {
+                w.params.count != 0 && w.params.expiration > now && !w.params.subkeys.is_empty()
+            });
+            if watch_list.watches.is_empty() {
+                // If we're removing the watched record, drop any changed watch values too
+                self.changed_watched_values.remove(key);
+                false
+            } else {
+                true
+            }
+        });
     }
 
     pub async fn take_value_changes(&mut self, changes: &mut Vec<ValueChangedInfo>) {
@@ -887,6 +1133,7 @@ where
             key: TypedKey,
             subkeys: ValueSubkeyRangeSet,
             count: u32,
+            watch_id: u64,
         }
 
         let mut evcis = vec![];
@@ -895,31 +1142,38 @@ where
             if let Some(watch) = self.watched_records.get_mut(&rtk) {
                 // Process watch notifications
                 let mut dead_watchers = vec![];
-                for (wn, w) in watch.watchers.iter_mut().enumerate() {
+                for (wn, w) in watch.watches.iter_mut().enumerate() {
                     // Get the subkeys that have changed
                     let subkeys = w.changed.clone();
+
+                    // If no subkeys on this watcher have changed then skip it
+                    if subkeys.is_empty() {
+                        continue;
+                    }
+
                     w.changed.clear();
 
                     // Reduce the count of changes sent
                     // if count goes to zero mark this watcher dead
-                    w.count -= 1;
-                    let count = w.count;
+                    w.params.count -= 1;
+                    let count = w.params.count;
                     if count == 0 {
                         dead_watchers.push(wn);
                     }
 
                     evcis.push(EarlyValueChangedInfo {
-                        target: w.target,
+                        target: w.params.target,
                         key: rtk.key,
                         subkeys,
                         count,
+                        watch_id: w.id,
                     });
                 }
 
                 // Remove in reverse so we don't have to offset the index to remove the right key
                 for dw in dead_watchers.iter().rev().copied() {
-                    watch.watchers.remove(dw);
-                    if watch.watchers.is_empty() {
+                    watch.watches.remove(dw);
+                    if watch.watches.is_empty() {
                         empty_watched_records.push(rtk);
                     }
                 }
@@ -935,7 +1189,7 @@ where
                 log_stor!(error "first subkey should exist for value change notification");
                 continue;
             };
-            let subkey_result = match self.get_subkey(evci.key, first_subkey, false).await {
+            let get_result = match self.get_subkey(evci.key, first_subkey, false).await {
                 Ok(Some(skr)) => skr,
                 Ok(None) => {
                     log_stor!(error "subkey should have data for value change notification");
@@ -946,7 +1200,7 @@ where
                     continue;
                 }
             };
-            let Some(value) = subkey_result.value else {
+            let Some(value) = get_result.opt_value else {
                 log_stor!(error "first subkey should have had value for value change notification");
                 continue;
             };
@@ -956,6 +1210,7 @@ where
                 key: evci.key,
                 subkeys: evci.subkeys,
                 count: evci.count,
+                watch_id: evci.watch_id,
                 value,
             });
         }
@@ -1013,8 +1268,16 @@ where
     }
 
     pub fn debug_record_info(&self, key: TypedKey) -> String {
-        self.peek_record(key, |r| format!("{:#?}", r))
-            .unwrap_or("Not found".to_owned())
+        let record_info = self
+            .peek_record(key, |r| format!("{:#?}", r))
+            .unwrap_or("Not found".to_owned());
+        let watched_record = match self.watched_records.get(&RecordTableKey { key }) {
+            Some(w) => {
+                format!("Remote Watches: {:#?}", w)
+            }
+            None => "No remote watches".to_owned(),
+        };
+        format!("{}\n{}\n", record_info, watched_record)
     }
 
     pub async fn debug_record_subkey_info(&self, key: TypedKey, subkey: ValueSubkey) -> String {
diff --git a/veilid-core/src/storage_manager/types/opened_record.rs b/veilid-core/src/storage_manager/record_store/opened_record.rs
similarity index 86%
rename from veilid-core/src/storage_manager/types/opened_record.rs
rename to veilid-core/src/storage_manager/record_store/opened_record.rs
index 831b74fc..acde0a08 100644
--- a/veilid-core/src/storage_manager/types/opened_record.rs
+++ b/veilid-core/src/storage_manager/record_store/opened_record.rs
@@ -2,6 +2,8 @@ use super::*;
 
 #[derive(Clone, Debug)]
 pub(in crate::storage_manager) struct ActiveWatch {
+    /// The watch id returned from the watch node
+    pub id: u64,
     /// The expiration of a successful watch
     pub expiration_ts: Timestamp,
     /// Which node accepted the watch
@@ -42,10 +44,16 @@ impl OpenedRecord {
     pub fn writer(&self) -> Option<&KeyPair> {
         self.writer.as_ref()
     }
+    pub fn set_writer(&mut self, writer: Option<KeyPair>) {
+        self.writer = writer;
+    }
 
     pub fn safety_selection(&self) -> SafetySelection {
         self.safety_selection
     }
+    pub fn set_safety_selection(&mut self, safety_selection: SafetySelection) {
+        self.safety_selection = safety_selection;
+    }
 
     pub fn set_active_watch(&mut self, active_watch: ActiveWatch) {
         self.active_watch = Some(active_watch);
diff --git a/veilid-core/src/storage_manager/types/record.rs b/veilid-core/src/storage_manager/record_store/record.rs
similarity index 97%
rename from veilid-core/src/storage_manager/types/record.rs
rename to veilid-core/src/storage_manager/record_store/record.rs
index 5e33d508..4a93cdd1 100644
--- a/veilid-core/src/storage_manager/types/record.rs
+++ b/veilid-core/src/storage_manager/record_store/record.rs
@@ -23,7 +23,7 @@ where
         detail: D,
     ) -> VeilidAPIResult<Self> {
         let schema = descriptor.schema()?;
-        let subkey_count = schema.subkey_count();
+        let subkey_count = schema.max_subkey() as usize + 1;
         Ok(Self {
             descriptor,
             subkey_count,
diff --git a/veilid-core/src/storage_manager/types/record_data.rs b/veilid-core/src/storage_manager/record_store/record_data.rs
similarity index 100%
rename from veilid-core/src/storage_manager/types/record_data.rs
rename to veilid-core/src/storage_manager/record_store/record_data.rs
diff --git a/veilid-core/src/storage_manager/record_store_limits.rs b/veilid-core/src/storage_manager/record_store/record_store_limits.rs
similarity index 100%
rename from veilid-core/src/storage_manager/record_store_limits.rs
rename to veilid-core/src/storage_manager/record_store/record_store_limits.rs
diff --git a/veilid-core/src/storage_manager/types/remote_record_detail.rs b/veilid-core/src/storage_manager/record_store/remote_record_detail.rs
similarity index 100%
rename from veilid-core/src/storage_manager/types/remote_record_detail.rs
rename to veilid-core/src/storage_manager/record_store/remote_record_detail.rs
diff --git a/veilid-core/src/storage_manager/record_store/watch.rs b/veilid-core/src/storage_manager/record_store/watch.rs
new file mode 100644
index 00000000..60440a29
--- /dev/null
+++ b/veilid-core/src/storage_manager/record_store/watch.rs
@@ -0,0 +1,66 @@
+use super::*;
+
+/// Watch parameters used to configure a watch
+#[derive(Debug, Clone)]
+pub struct WatchParameters {
+    /// The range of subkeys being watched, empty meaning full
+    pub subkeys: ValueSubkeyRangeSet,
+    /// When this watch will expire
+    pub expiration: Timestamp,
+    /// How many updates are left before forced expiration
+    pub count: u32,
+    /// The watching schema member key, or an anonymous key
+    pub watcher: PublicKey,
+    /// The place where updates are sent
+    pub target: Target,
+}
+
+/// Watch result to return with answer
+/// Default result is cancelled/expired/inactive/rejected
+#[derive(Debug, Clone)]
+pub enum WatchResult {
+    /// A new watch was created
+    Created {
+        /// The new id of the watch
+        id: u64,
+        /// The expiration timestamp of the watch. This should never be zero.
+        expiration: Timestamp,
+    },
+    /// An existing watch was modified
+    Changed {
+        /// The new expiration timestamp of the modified watch. This should never be zero.
+        expiration: Timestamp,
+    },
+    /// An existing watch was cancelled
+    Cancelled,
+    /// The request was rejected due to invalid parameters or a missing watch
+    Rejected,
+}
+
+/// An individual watch
+#[derive(Debug, Clone)]
+pub struct Watch {
+    /// The configuration of the watch
+    pub params: WatchParameters,
+    /// A unique id per record assigned at watch creation time. Used to disambiguate a client's version of a watch
+    pub id: u64,
+    /// What has changed since the last update
+    pub changed: ValueSubkeyRangeSet,
+}
+
+#[derive(Debug, Default, Clone)]
+/// A record being watched for changes
+pub struct WatchList {
+    /// The list of active watches
+    pub watches: Vec<Watch>,
+}
+
+/// How a watch gets updated when a value changes
+pub enum WatchUpdateMode {
+    /// Update no watchers
+    NoUpdate,
+    /// Update all watchers
+    UpdateAll,
+    /// Update all watchers except ones that come from a specific target
+    ExcludeTarget(Target),
+}
diff --git a/veilid-core/src/storage_manager/set_value.rs b/veilid-core/src/storage_manager/set_value.rs
index e5279157..f5bb3550 100644
--- a/veilid-core/src/storage_manager/set_value.rs
+++ b/veilid-core/src/storage_manager/set_value.rs
@@ -14,10 +14,10 @@ struct OutboundSetValueContext {
 
 /// The result of the outbound_set_value operation
 pub(super) struct OutboundSetValueResult {
+    /// Fanout result
+    pub fanout_result: FanoutResult,
     /// The value that was set
     pub signed_value_data: Arc<SignedValueData>,
-    /// And where it was set to
-    pub value_nodes: Vec<NodeRef>,
 }
 
 impl StorageManager {
@@ -88,7 +88,7 @@ impl StorageManager {
 
                     // Keep the value if we got one and it is newer and it passes schema validation
                     if let Some(value) = sva.answer.value {
-                        log_stor!(debug "Got value back: len={} seq={}", value.value_data().data().len(), value.value_data().seq());
+                        log_dht!(debug "Got value back: len={} seq={}", value.value_data().data().len(), value.value_data().seq());
 
                         // Validate with schema
                         if !ctx.schema.check_subkey_value_data(
@@ -127,8 +127,7 @@ impl StorageManager {
                 }
 
                 // Return peers if we have some
-                #[cfg(feature = "network-result-extra")]
-                log_stor!(debug "SetValue fanout call returned peers {}", sva.answer.peers.len());
+                log_network_result!(debug "SetValue fanout call returned peers {}", sva.answer.peers.len());
 
                 Ok(NetworkResult::value(sva.answer.peers))
             }
@@ -165,57 +164,31 @@ impl StorageManager {
             check_done,
         );
 
-        match fanout_call.run(vec![]).await {
+        let kind = match fanout_call.run(vec![]).await {
             // If we don't finish in the timeout (too much time passed checking for consensus)
-            TimeoutOr::Timeout => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "SetValue Fanout Timeout Consensus");
-                } else {
-                    log_stor!(debug "SetValue Fanout Timeout Non-Consensus: {}", ctx.value_nodes.len());
-                }
-
-                Ok(OutboundSetValueResult {
-                    signed_value_data: ctx.value.clone(),
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
+            TimeoutOr::Timeout => FanoutResultKind::Timeout,
             // If we finished with or without consensus (enough nodes returning the same value)
-            TimeoutOr::Value(Ok(Some(()))) => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "SetValue Fanout Consensus");
-                } else {
-                    log_stor!(debug "SetValue Fanout Non-Consensus: {}", ctx.value_nodes.len());
-                }
-                Ok(OutboundSetValueResult {
-                    signed_value_data: ctx.value.clone(),
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
+            TimeoutOr::Value(Ok(Some(()))) => FanoutResultKind::Finished,
             // If we ran out of nodes before getting consensus)
-            TimeoutOr::Value(Ok(None)) => {
-                // Return the best answer we've got
-                let ctx = context.lock();
-                if ctx.value_nodes.len() >= consensus_count {
-                    log_stor!(debug "SetValue Fanout Exhausted Consensus");
-                } else {
-                    log_stor!(debug "SetValue Fanout Exhausted Non-Consensus: {}", ctx.value_nodes.len());
-                }
-                Ok(OutboundSetValueResult {
-                    signed_value_data: ctx.value.clone(),
-                    value_nodes: ctx.value_nodes.clone(),
-                })
-            }
+            TimeoutOr::Value(Ok(None)) => FanoutResultKind::Exhausted,
             // Failed
             TimeoutOr::Value(Err(e)) => {
                 // If we finished with an error, return that
-                log_stor!(debug "SetValue Fanout Error: {}", e);
-                Err(e.into())
+                log_dht!(debug "SetValue Fanout Error: {}", e);
+                return Err(e.into());
             }
-        }
+        };
+        let ctx = context.lock();
+        let fanout_result = FanoutResult {
+            kind,
+            value_nodes: ctx.value_nodes.clone(),
+        };
+        log_network_result!(debug "SetValue Fanout: {:?}", fanout_result);
+
+        Ok(OutboundSetValueResult {
+            fanout_result,
+            signed_value_data: ctx.value.clone(),
+        })
     }
 
     /// Handle a received 'Set Value' query
@@ -232,21 +205,21 @@ impl StorageManager {
         let mut inner = self.lock().await?;
 
         // See if this is a remote or local value
-        let (is_local, last_subkey_result) = {
+        let (is_local, last_get_result) = {
             // See if the subkey we are modifying has a last known local value
-            let last_subkey_result = inner.handle_get_local_value(key, subkey, true).await?;
+            let last_get_result = inner.handle_get_local_value(key, subkey, true).await?;
             // If this is local, it must have a descriptor already
-            if last_subkey_result.descriptor.is_some() {
-                (true, last_subkey_result)
+            if last_get_result.opt_descriptor.is_some() {
+                (true, last_get_result)
             } else {
                 // See if the subkey we are modifying has a last known remote value
-                let last_subkey_result = inner.handle_get_remote_value(key, subkey, true).await?;
-                (false, last_subkey_result)
+                let last_get_result = inner.handle_get_remote_value(key, subkey, true).await?;
+                (false, last_get_result)
             }
         };
 
         // Make sure this value would actually be newer
-        if let Some(last_value) = &last_subkey_result.value {
+        if let Some(last_value) = &last_get_result.opt_value {
             if value.value_data().seq() <= last_value.value_data().seq() {
                 // inbound value is older or equal sequence number than the one we have, just return the one we have
                 return Ok(NetworkResult::value(Some(last_value.clone())));
@@ -254,7 +227,7 @@ impl StorageManager {
         }
 
         // Get the descriptor and schema for the key
-        let actual_descriptor = match last_subkey_result.descriptor {
+        let actual_descriptor = match last_get_result.opt_descriptor {
             Some(last_descriptor) => {
                 if let Some(descriptor) = descriptor {
                     // Descriptor must match last one if it is provided
diff --git a/veilid-core/src/storage_manager/storage_manager_inner.rs b/veilid-core/src/storage_manager/storage_manager_inner.rs
index 0d78a90a..4f4be09a 100644
--- a/veilid-core/src/storage_manager/storage_manager_inner.rs
+++ b/veilid-core/src/storage_manager/storage_manager_inner.rs
@@ -32,6 +32,9 @@ pub(super) struct StorageManagerInner {
     pub tick_future: Option<SendPinBoxFuture<()>>,
     /// Update callback to send ValueChanged notification to
     pub update_callback: Option<UpdateCallback>,
+
+    /// The maximum consensus count
+    set_consensus_count: usize,
 }
 
 fn local_limits_from_config(config: VeilidConfig) -> RecordStoreLimits {
@@ -72,6 +75,7 @@ fn remote_limits_from_config(config: VeilidConfig) -> RecordStoreLimits {
 
 impl StorageManagerInner {
     pub fn new(unlocked_inner: Arc<StorageManagerUnlockedInner>) -> Self {
+        let set_consensus_count = unlocked_inner.config.get().network.dht.set_value_count as usize;
         Self {
             unlocked_inner,
             initialized: false,
@@ -84,6 +88,7 @@ impl StorageManagerInner {
             opt_routing_table: Default::default(),
             tick_future: Default::default(),
             update_callback: None,
+            set_consensus_count,
         }
     }
 
@@ -187,7 +192,7 @@ impl StorageManagerInner {
                 Ok(v) => v.unwrap_or_default(),
                 Err(_) => {
                     if let Err(e) = metadata_db.delete(0, OFFLINE_SUBKEY_WRITES).await {
-                        debug!("offline_subkey_writes format changed, clearing: {}", e);
+                        log_stor!(debug "offline_subkey_writes format changed, clearing: {}", e);
                     }
                     Default::default()
                 }
@@ -212,6 +217,20 @@ impl StorageManagerInner {
             apibail_not_initialized!();
         };
 
+        // Verify the dht schema does not contain the node id
+        {
+            let cfg = self.unlocked_inner.config.get();
+            if let Some(node_id) = cfg.network.routing_table.node_id.get(kind) {
+                if schema.is_member(&node_id.value) {
+                    apibail_invalid_argument!(
+                        "node id can not be schema member",
+                        "schema",
+                        node_id.value
+                    );
+                }
+            }
+        }
+
         // Compile the dht schema
         let schema_data = schema.compile();
 
@@ -228,10 +247,7 @@ impl StorageManagerInner {
 
         // Add new local value record
         let cur_ts = get_aligned_timestamp();
-        let local_record_detail = LocalRecordDetail {
-            safety_selection,
-            value_nodes: vec![],
-        };
+        let local_record_detail = LocalRecordDetail::new(safety_selection);
         let record =
             Record::<LocalRecordDetail>::new(cur_ts, signed_value_descriptor, local_record_detail)?;
 
@@ -270,22 +286,18 @@ impl StorageManagerInner {
         let local_record = Record::new(
             cur_ts,
             remote_record.descriptor().clone(),
-            LocalRecordDetail {
-                safety_selection,
-                value_nodes: vec![],
-            },
+            LocalRecordDetail::new(safety_selection),
         )?;
         local_record_store.new_record(key, local_record).await?;
 
         // Move copy subkey data from remote to local store
         for subkey in remote_record.stored_subkeys().iter() {
-            let Some(subkey_result) = remote_record_store.get_subkey(key, subkey, false).await?
-            else {
+            let Some(get_result) = remote_record_store.get_subkey(key, subkey, false).await? else {
                 // Subkey was missing
                 warn!("Subkey was missing: {} #{}", key, subkey);
                 continue;
             };
-            let Some(subkey_data) = subkey_result.value else {
+            let Some(subkey_data) = get_result.opt_value else {
                 // Subkey was missing
                 warn!("Subkey data was missing: {} #{}", key, subkey);
                 continue;
@@ -295,6 +307,9 @@ impl StorageManagerInner {
                 .await?;
         }
 
+        // Move watches
+        local_record_store.move_watches(key, remote_record_store.move_watches(key, None));
+
         // Delete remote record from store
         remote_record_store.delete_record(key).await?;
 
@@ -308,11 +323,6 @@ impl StorageManagerInner {
         writer: Option<KeyPair>,
         safety_selection: SafetySelection,
     ) -> VeilidAPIResult<Option<DHTRecordDescriptor>> {
-        // Ensure the record is closed
-        if self.opened_records.contains_key(&key) {
-            apibail_generic!("record is already open and should be closed first");
-        }
-
         // Get local record store
         let Some(local_record_store) = self.local_record_store.as_mut() else {
             apibail_not_initialized!();
@@ -359,7 +369,12 @@ impl StorageManagerInner {
 
         // Write open record
         self.opened_records
-            .insert(key, OpenedRecord::new(writer, safety_selection));
+            .entry(key)
+            .and_modify(|e| {
+                e.set_writer(writer);
+                e.set_safety_selection(safety_selection);
+            })
+            .or_insert_with(|| OpenedRecord::new(writer, safety_selection));
 
         // Make DHT Record Descriptor to return
         let descriptor = DHTRecordDescriptor::new(key, owner, owner_secret, schema);
@@ -371,7 +386,7 @@ impl StorageManagerInner {
         key: TypedKey,
         writer: Option<KeyPair>,
         subkey: ValueSubkey,
-        subkey_result: SubkeyResult,
+        get_result: GetResult,
         safety_selection: SafetySelection,
     ) -> VeilidAPIResult<DHTRecordDescriptor> {
         // Ensure the record is closed
@@ -380,7 +395,7 @@ impl StorageManagerInner {
         }
 
         // Must have descriptor
-        let Some(signed_value_descriptor) = subkey_result.descriptor else {
+        let Some(signed_value_descriptor) = get_result.opt_descriptor else {
             // No descriptor for new record, can't store this
             apibail_generic!("no descriptor");
         };
@@ -409,15 +424,12 @@ impl StorageManagerInner {
         let record = Record::<LocalRecordDetail>::new(
             get_aligned_timestamp(),
             signed_value_descriptor,
-            LocalRecordDetail {
-                safety_selection,
-                value_nodes: vec![],
-            },
+            LocalRecordDetail::new(safety_selection),
         )?;
         local_record_store.new_record(key, record).await?;
 
         // If we got a subkey with the getvalue, it has already been validated against the schema, so store it
-        if let Some(signed_value_data) = subkey_result.value {
+        if let Some(signed_value_data) = get_result.opt_value {
             // Write subkey to local store
             local_record_store
                 .set_subkey(key, subkey, signed_value_data, WatchUpdateMode::NoUpdate)
@@ -446,8 +458,8 @@ impl StorageManagerInner {
 
         let opt_value_nodes = local_record_store.peek_record(key, |r| {
             let d = r.detail();
-            d.value_nodes
-                .iter()
+            d.nodes
+                .keys()
                 .copied()
                 .filter_map(|x| {
                     routing_table
@@ -461,21 +473,46 @@ impl StorageManagerInner {
         Ok(opt_value_nodes)
     }
 
-    pub fn set_value_nodes(
+    pub fn process_fanout_results<'a, I: IntoIterator<Item = (ValueSubkey, &'a FanoutResult)>>(
         &mut self,
         key: TypedKey,
-        value_nodes: Vec<NodeRef>,
+        subkey_results_iter: I,
+        is_set: bool,
     ) -> VeilidAPIResult<()> {
         // Get local record store
         let Some(local_record_store) = self.local_record_store.as_mut() else {
             apibail_not_initialized!();
         };
+        let cur_ts = get_aligned_timestamp();
         local_record_store.with_record_mut(key, |r| {
             let d = r.detail_mut();
-            d.value_nodes = value_nodes
-                .into_iter()
-                .filter_map(|x| x.node_ids().get(key.kind).map(|k| k.value))
-                .collect();
+
+            for (subkey, fanout_result) in subkey_results_iter {
+                for node_id in fanout_result
+                    .value_nodes
+                    .iter()
+                    .filter_map(|x| x.node_ids().get(key.kind).map(|k| k.value))
+                {
+                    let pnd = d.nodes.entry(node_id).or_default();
+                    if is_set || pnd.last_set == Timestamp::default() {
+                        pnd.last_set = cur_ts;
+                    }
+                    pnd.last_seen = cur_ts;
+                    pnd.subkeys.insert(subkey);
+                }
+            }
+
+            // Purge nodes down to the N most recently seen, where N is the consensus count for a set operation
+            let mut nodes_ts = d
+                .nodes
+                .iter()
+                .map(|kv| (*kv.0, kv.1.last_seen))
+                .collect::<Vec<_>>();
+            nodes_ts.sort_by(|a, b| b.1.cmp(&a.1));
+
+            for dead_node_key in nodes_ts.iter().skip(self.set_consensus_count) {
+                d.nodes.remove(&dead_node_key.0);
+            }
         });
         Ok(())
     }
@@ -496,21 +533,21 @@ impl StorageManagerInner {
         key: TypedKey,
         subkey: ValueSubkey,
         want_descriptor: bool,
-    ) -> VeilidAPIResult<SubkeyResult> {
+    ) -> VeilidAPIResult<GetResult> {
         // See if it's in the local record store
         let Some(local_record_store) = self.local_record_store.as_mut() else {
             apibail_not_initialized!();
         };
-        if let Some(subkey_result) = local_record_store
+        if let Some(get_result) = local_record_store
             .get_subkey(key, subkey, want_descriptor)
             .await?
         {
-            return Ok(subkey_result);
+            return Ok(get_result);
         }
 
-        Ok(SubkeyResult {
-            value: None,
-            descriptor: None,
+        Ok(GetResult {
+            opt_value: None,
+            opt_descriptor: None,
         })
     }
 
@@ -534,22 +571,28 @@ impl StorageManagerInner {
         Ok(())
     }
 
-    pub(super) async fn handle_watch_local_value(
+    pub(super) async fn handle_inspect_local_value(
         &mut self,
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
-        expiration: Timestamp,
-        count: u32,
-        target: Target,
-        watcher: CryptoKey,
-    ) -> VeilidAPIResult<Option<Timestamp>> {
+        want_descriptor: bool,
+    ) -> VeilidAPIResult<InspectResult> {
         // See if it's in the local record store
         let Some(local_record_store) = self.local_record_store.as_mut() else {
             apibail_not_initialized!();
         };
-        local_record_store
-            .watch_record(key, subkeys, expiration, count, target, watcher)
-            .await
+        if let Some(inspect_result) = local_record_store
+            .inspect_record(key, subkeys, want_descriptor)
+            .await?
+        {
+            return Ok(inspect_result);
+        }
+
+        Ok(InspectResult {
+            subkeys: ValueSubkeyRangeSet::new(),
+            seqs: vec![],
+            opt_descriptor: None,
+        })
     }
 
     pub(super) async fn handle_get_remote_value(
@@ -557,21 +600,21 @@ impl StorageManagerInner {
         key: TypedKey,
         subkey: ValueSubkey,
         want_descriptor: bool,
-    ) -> VeilidAPIResult<SubkeyResult> {
+    ) -> VeilidAPIResult<GetResult> {
         // See if it's in the remote record store
         let Some(remote_record_store) = self.remote_record_store.as_mut() else {
             apibail_not_initialized!();
         };
-        if let Some(subkey_result) = remote_record_store
+        if let Some(get_result) = remote_record_store
             .get_subkey(key, subkey, want_descriptor)
             .await?
         {
-            return Ok(subkey_result);
+            return Ok(get_result);
         }
 
-        Ok(SubkeyResult {
-            value: None,
-            descriptor: None,
+        Ok(GetResult {
+            opt_value: None,
+            opt_descriptor: None,
         })
     }
 
@@ -609,22 +652,28 @@ impl StorageManagerInner {
         Ok(())
     }
 
-    pub(super) async fn handle_watch_remote_value(
+    pub(super) async fn handle_inspect_remote_value(
         &mut self,
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
-        expiration: Timestamp,
-        count: u32,
-        target: Target,
-        watcher: CryptoKey,
-    ) -> VeilidAPIResult<Option<Timestamp>> {
-        // See if it's in the remote record store
+        want_descriptor: bool,
+    ) -> VeilidAPIResult<InspectResult> {
+        // See if it's in the local record store
         let Some(remote_record_store) = self.remote_record_store.as_mut() else {
             apibail_not_initialized!();
         };
-        remote_record_store
-            .watch_record(key, subkeys, expiration, count, target, watcher)
-            .await
+        if let Some(inspect_result) = remote_record_store
+            .inspect_record(key, subkeys, want_descriptor)
+            .await?
+        {
+            return Ok(inspect_result);
+        }
+
+        Ok(InspectResult {
+            subkeys: ValueSubkeyRangeSet::new(),
+            seqs: vec![],
+            opt_descriptor: None,
+        })
     }
 
     /// # DHT Key = Hash(ownerKeyKind) of: [ ownerKeyValue, schema ]
diff --git a/veilid-core/src/storage_manager/tasks/check_active_watches.rs b/veilid-core/src/storage_manager/tasks/check_active_watches.rs
index 89c37903..da49621a 100644
--- a/veilid-core/src/storage_manager/tasks/check_active_watches.rs
+++ b/veilid-core/src/storage_manager/tasks/check_active_watches.rs
@@ -1,7 +1,7 @@
 use super::*;
 
 impl StorageManager {
-    // Check if watches either have dead nodes or if the watch has expired
+    // Check if client-side watches on opened records either have dead nodes or if the watch has expired
     #[instrument(level = "trace", skip(self), err)]
     pub(super) async fn check_active_watches_task_routine(
         self,
diff --git a/veilid-core/src/storage_manager/tasks/check_watched_records.rs b/veilid-core/src/storage_manager/tasks/check_watched_records.rs
new file mode 100644
index 00000000..fff2a392
--- /dev/null
+++ b/veilid-core/src/storage_manager/tasks/check_watched_records.rs
@@ -0,0 +1,23 @@
+use super::*;
+
+impl StorageManager {
+    // Check if server-side watches have expired
+    #[instrument(level = "trace", skip(self), err)]
+    pub(super) async fn check_watched_records_task_routine(
+        self,
+        stop_token: StopToken,
+        _last_ts: Timestamp,
+        _cur_ts: Timestamp,
+    ) -> EyreResult<()> {
+        let mut inner = self.inner.lock().await;
+
+        if let Some(local_record_store) = &mut inner.local_record_store {
+            local_record_store.check_watched_records();
+        }
+        if let Some(remote_record_store) = &mut inner.remote_record_store {
+            remote_record_store.check_watched_records();
+        }
+
+        Ok(())
+    }
+}
diff --git a/veilid-core/src/storage_manager/tasks/mod.rs b/veilid-core/src/storage_manager/tasks/mod.rs
index e87e66a0..3e5df9cb 100644
--- a/veilid-core/src/storage_manager/tasks/mod.rs
+++ b/veilid-core/src/storage_manager/tasks/mod.rs
@@ -1,4 +1,5 @@
 pub mod check_active_watches;
+pub mod check_watched_records;
 pub mod flush_record_stores;
 pub mod offline_subkey_writes;
 pub mod send_value_changes;
@@ -8,7 +9,7 @@ use super::*;
 impl StorageManager {
     pub(crate) fn setup_tasks(&self) {
         // Set flush records tick task
-        debug!("starting flush record stores task");
+        log_stor!(debug "starting flush record stores task");
         {
             let this = self.clone();
             self.unlocked_inner
@@ -29,7 +30,7 @@ impl StorageManager {
                 });
         }
         // Set offline subkey writes tick task
-        debug!("starting offline subkey writes task");
+        log_stor!(debug "starting offline subkey writes task");
         {
             let this = self.clone();
             self.unlocked_inner
@@ -50,7 +51,7 @@ impl StorageManager {
                 });
         }
         // Set send value changes tick task
-        debug!("starting send value changes task");
+        log_stor!(debug "starting send value changes task");
         {
             let this = self.clone();
             self.unlocked_inner
@@ -71,7 +72,7 @@ impl StorageManager {
                 });
         }
         // Set check active watches tick task
-        debug!("starting check active watches task");
+        log_stor!(debug "starting check active watches task");
         {
             let this = self.clone();
             self.unlocked_inner
@@ -91,6 +92,27 @@ impl StorageManager {
                     )
                 });
         }
+        // Set check watched records tick task
+        log_stor!(debug "starting checked watched records task");
+        {
+            let this = self.clone();
+            self.unlocked_inner
+                .check_watched_records_task
+                .set_routine(move |s, l, t| {
+                    Box::pin(
+                        this.clone()
+                            .check_watched_records_task_routine(
+                                s,
+                                Timestamp::new(l),
+                                Timestamp::new(t),
+                            )
+                            .instrument(trace_span!(
+                                parent: None,
+                                "StorageManager check watched records task routine"
+                            )),
+                    )
+                });
+        }
     }
 
     pub async fn tick(&self) -> EyreResult<()> {
@@ -100,6 +122,12 @@ impl StorageManager {
         // Check active watches
         self.unlocked_inner.check_active_watches_task.tick().await?;
 
+        // Check watched records
+        self.unlocked_inner
+            .check_watched_records_task
+            .tick()
+            .await?;
+
         // Run online-only tasks
         if self.online_writes_ready().await?.is_some() {
             // Run offline subkey writes task if there's work to be done
@@ -117,19 +145,23 @@ impl StorageManager {
     }
 
     pub(crate) async fn cancel_tasks(&self) {
-        debug!("stopping check active watches task");
+        log_stor!(debug "stopping check watched records task");
+        if let Err(e) = self.unlocked_inner.check_watched_records_task.stop().await {
+            warn!("check_watched_records_task not stopped: {}", e);
+        }
+        log_stor!(debug "stopping check active watches task");
         if let Err(e) = self.unlocked_inner.check_active_watches_task.stop().await {
             warn!("check_active_watches_task not stopped: {}", e);
         }
-        debug!("stopping send value changes task");
+        log_stor!(debug "stopping send value changes task");
         if let Err(e) = self.unlocked_inner.send_value_changes_task.stop().await {
             warn!("send_value_changes_task not stopped: {}", e);
         }
-        debug!("stopping flush record stores task");
+        log_stor!(debug "stopping flush record stores task");
         if let Err(e) = self.unlocked_inner.flush_record_stores_task.stop().await {
             warn!("flush_record_stores_task not stopped: {}", e);
         }
-        debug!("stopping offline subkey writes task");
+        log_stor!(debug "stopping offline subkey writes task");
         if let Err(e) = self.unlocked_inner.offline_subkey_writes_task.stop().await {
             warn!("offline_subkey_writes_task not stopped: {}", e);
         }
diff --git a/veilid-core/src/storage_manager/tasks/offline_subkey_writes.rs b/veilid-core/src/storage_manager/tasks/offline_subkey_writes.rs
index 93a4d55e..cd31dfdc 100644
--- a/veilid-core/src/storage_manager/tasks/offline_subkey_writes.rs
+++ b/veilid-core/src/storage_manager/tasks/offline_subkey_writes.rs
@@ -26,19 +26,19 @@ impl StorageManager {
                 break;
             };
             for subkey in osw.subkeys.iter() {
-                let subkey_result = {
+                let get_result = {
                     let mut inner = self.lock().await?;
                     inner.handle_get_local_value(key, subkey, true).await
                 };
-                let Ok(subkey_result) = subkey_result else {
+                let Ok(get_result) = get_result else {
                     log_stor!(debug "Offline subkey write had no subkey result: {}:{}", key, subkey);
-                    continue;                    
+                    continue;
                 };
-                let Some(value) = subkey_result.value else {
+                let Some(value) = get_result.opt_value else {
                     log_stor!(debug "Offline subkey write had no subkey value: {}:{}", key, subkey);
                     continue;
                 };
-                let Some(descriptor) = subkey_result.descriptor else {
+                let Some(descriptor) = get_result.opt_descriptor else {
                     log_stor!(debug "Offline subkey write had no descriptor: {}:{}", key, subkey);
                     continue;
                 };
diff --git a/veilid-core/src/storage_manager/types/local_record_detail.rs b/veilid-core/src/storage_manager/types/local_record_detail.rs
deleted file mode 100644
index f456f38f..00000000
--- a/veilid-core/src/storage_manager/types/local_record_detail.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use super::*;
-
-/// Information required to handle locally opened records
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub(in crate::storage_manager) struct LocalRecordDetail {
-    /// The last 'safety selection' used when creating/opening this record.
-    /// Even when closed, this safety selection applies to re-publication attempts by the system.
-    pub safety_selection: SafetySelection,
-    /// The nodes that we have seen this record cached on recently
-    #[serde(default)]
-    pub value_nodes: Vec<PublicKey>,
-}
diff --git a/veilid-core/src/storage_manager/types/mod.rs b/veilid-core/src/storage_manager/types/mod.rs
index 71c1e84c..9eea4ad8 100644
--- a/veilid-core/src/storage_manager/types/mod.rs
+++ b/veilid-core/src/storage_manager/types/mod.rs
@@ -1,17 +1,7 @@
-mod local_record_detail;
-mod opened_record;
-mod record;
-mod record_data;
-mod remote_record_detail;
 mod signed_value_data;
 mod signed_value_descriptor;
 
 use super::*;
 
-pub(super) use local_record_detail::*;
-pub(super) use opened_record::*;
-pub(super) use record::*;
-pub(super) use record_data::*;
-pub(super) use remote_record_detail::*;
 pub use signed_value_data::*;
 pub use signed_value_descriptor::*;
diff --git a/veilid-core/src/storage_manager/types/signed_value_descriptor.rs b/veilid-core/src/storage_manager/types/signed_value_descriptor.rs
index a1c07615..2a7b8428 100644
--- a/veilid-core/src/storage_manager/types/signed_value_descriptor.rs
+++ b/veilid-core/src/storage_manager/types/signed_value_descriptor.rs
@@ -20,7 +20,10 @@ impl SignedValueDescriptor {
 
     pub fn validate(&self, vcrypto: CryptoSystemVersion) -> VeilidAPIResult<()> {
         // validate signature
-        vcrypto.verify(&self.owner, &self.schema_data, &self.signature)
+        vcrypto.verify(&self.owner, &self.schema_data, &self.signature)?;
+        // validate schema
+        DHTSchema::try_from(self.schema_data.as_slice())?;
+        Ok(())
     }
 
     pub fn owner(&self) -> &PublicKey {
diff --git a/veilid-core/src/storage_manager/watch_value.rs b/veilid-core/src/storage_manager/watch_value.rs
index 22344916..1aa1b6f3 100644
--- a/veilid-core/src/storage_manager/watch_value.rs
+++ b/veilid-core/src/storage_manager/watch_value.rs
@@ -11,6 +11,8 @@ struct OutboundWatchValueContext {
 pub(super) struct OutboundWatchValueResult {
     /// The expiration of a successful watch
     pub expiration_ts: Timestamp,
+    /// What watch id was returned
+    pub watch_id: u64,
     /// Which node accepted the watch
     pub watch_node: NodeRef,
     /// Which private route is responsible for receiving ValueChanged notifications
@@ -18,7 +20,7 @@ pub(super) struct OutboundWatchValueResult {
 }
 
 impl StorageManager {
-    /// Perform a 'watch value' query on the network
+    /// Perform a 'watch value' query on the network using fanout
     #[allow(clippy::too_many_arguments)]
     pub(super) async fn outbound_watch_value(
         &self,
@@ -29,16 +31,17 @@ impl StorageManager {
         count: u32,
         safety_selection: SafetySelection,
         opt_watcher: Option<KeyPair>,
+        opt_watch_id: Option<u64>,
         opt_watch_node: Option<NodeRef>,
     ) -> VeilidAPIResult<Option<OutboundWatchValueResult>> {
         let routing_table = rpc_processor.routing_table();
 
-        // Get the DHT parameters for 'WatchValue', some of which are the same for 'WatchValue' operations
+        // Get the DHT parameters for 'WatchValue', some of which are the same for 'SetValue' operations
         let (key_count, timeout_us) = {
             let c = self.unlocked_inner.config.get();
             (
                 c.network.dht.max_find_node_count as usize,
-                TimestampDuration::from(ms_to_us(c.network.dht.get_value_timeout_ms)),
+                TimestampDuration::from(ms_to_us(c.network.dht.set_value_timeout_ms)),
             )
         };
 
@@ -50,7 +53,8 @@ impl StorageManager {
             inner.get_value_nodes(key)?.unwrap_or_default()
         };
 
-        // Get the appropriate watcher key
+        // Get the appropriate watcher key, if anonymous use a static anonymous watch key
+        // which lives for the duration of the app's runtime
         let watcher = opt_watcher.unwrap_or_else(|| {
             self.unlocked_inner
                 .anonymous_watch_keys
@@ -79,31 +83,32 @@ impl StorageManager {
                             subkeys,
                             expiration,
                             count,
-                            watcher
+                            watcher,
+                            opt_watch_id
                         )
                         .await?
                 );
 
                 // Keep answer if we got one
-                if wva.answer.expiration_ts.as_u64() > 0 {
-                    if count > 0 {
-                        // If we asked for a nonzero notification count, then this is an accepted watch
-                        log_stor!(debug "Watch accepted: expiration_ts={}", debug_ts(wva.answer.expiration_ts.as_u64()));
+                if wva.answer.accepted {
+                    if wva.answer.expiration_ts.as_u64() > 0 {
+                        // If the expiration time is greater than zero this watch is active
+                        log_dht!(debug "Watch active: id={} expiration_ts={}", wva.answer.watch_id, debug_ts(wva.answer.expiration_ts.as_u64()));
                     } else {
-                        // If we asked for a zero notification count, then this is a cancelled watch
-                        log_stor!(debug "Watch cancelled");
+                        // If the returned expiration time is zero, this watch was cancelled, or inactive
+                        log_dht!(debug "Watch inactive: id={}", wva.answer.watch_id);
                     }
                     let mut ctx = context.lock();
                     ctx.opt_watch_value_result = Some(OutboundWatchValueResult {
                         expiration_ts: wva.answer.expiration_ts,
+                        watch_id: wva.answer.watch_id,
                         watch_node: next_node.clone(),
                         opt_value_changed_route: wva.reply_private_route,
                     });
                 }
 
                 // Return peers if we have some
-                #[cfg(feature = "network-result-extra")]
-                log_stor!(debug "WatchValue fanout call returned peers {}", wva.answer.peers.len());
+                log_network_result!(debug "WatchValue fanout call returned peers {}", wva.answer.peers.len());
 
                 Ok(NetworkResult::value(wva.answer.peers))
             }
@@ -138,9 +143,9 @@ impl StorageManager {
                 // Return the best answer we've got
                 let ctx = context.lock();
                 if ctx.opt_watch_value_result.is_some() {
-                    log_stor!(debug "WatchValue Fanout Timeout Success");
+                    log_dht!(debug "WatchValue Fanout Timeout Success");
                 } else {
-                    log_stor!(debug "WatchValue Fanout Timeout Failure");
+                    log_dht!(debug "WatchValue Fanout Timeout Failure");
                 }
                 Ok(ctx.opt_watch_value_result.clone())
             }
@@ -149,9 +154,9 @@ impl StorageManager {
                 // Return the best answer we've got
                 let ctx = context.lock();
                 if ctx.opt_watch_value_result.is_some() {
-                    log_stor!(debug "WatchValue Fanout Success");
+                    log_dht!(debug "WatchValue Fanout Success");
                 } else {
-                    log_stor!(debug "WatchValue Fanout Failure");
+                    log_dht!(debug "WatchValue Fanout Failure");
                 }
                 Ok(ctx.opt_watch_value_result.clone())
             }
@@ -160,58 +165,60 @@ impl StorageManager {
                 // Return the best answer we've got
                 let ctx = context.lock();
                 if ctx.opt_watch_value_result.is_some() {
-                    log_stor!(debug "WatchValue Fanout Exhausted Success");
+                    log_dht!(debug "WatchValue Fanout Exhausted Success");
                 } else {
-                    log_stor!(debug "WatchValue Fanout Exhausted Failure");
+                    log_dht!(debug "WatchValue Fanout Exhausted Failure");
                 }
                 Ok(ctx.opt_watch_value_result.clone())
             }
             // Failed
             TimeoutOr::Value(Err(e)) => {
                 // If we finished with an error, return that
-                log_stor!(debug "WatchValue Fanout Error: {}", e);
+                log_dht!(debug "WatchValue Fanout Error: {}", e);
                 Err(e.into())
             }
         }
     }
 
     /// Handle a received 'Watch Value' query
+    #[allow(clippy::too_many_arguments)]
     pub async fn inbound_watch_value(
         &self,
         key: TypedKey,
-        subkeys: ValueSubkeyRangeSet,
-        expiration: Timestamp,
-        count: u32,
-        target: Target,
-        watcher: CryptoKey,
-    ) -> VeilidAPIResult<NetworkResult<Timestamp>> {
+        params: WatchParameters,
+        watch_id: Option<u64>,
+    ) -> VeilidAPIResult<NetworkResult<WatchResult>> {
         let mut inner = self.lock().await?;
 
-        // See if this is a remote or local value
-        let (_is_local, opt_expiration_ts) = {
-            // See if the subkey we are watching has a local value
-            let opt_expiration_ts = inner
-                .handle_watch_local_value(
-                    key,
-                    subkeys.clone(),
-                    expiration,
-                    count,
-                    target,
-                    watcher,
-                )
-                .await?;
-            if opt_expiration_ts.is_some() {
-                (true, opt_expiration_ts)
-            } else {
-                // See if the subkey we are watching is a remote value
-                let opt_expiration_ts = inner
-                    .handle_watch_remote_value(key, subkeys, expiration, count, target, watcher)
-                    .await?;
-                (false, opt_expiration_ts)
-            }
-        };
+        // Validate input
+        if params.count == 0 && (watch_id.unwrap_or_default() == 0) {
+            // Can't cancel a watch without a watch id
+            return VeilidAPIResult::Ok(NetworkResult::invalid_message(
+                "can't cancel watch without id",
+            ));
+        }
 
-        Ok(NetworkResult::value(opt_expiration_ts.unwrap_or_default()))
+        // Try from local and remote record stores
+        let Some(local_record_store) = inner.local_record_store.as_mut() else {
+            apibail_not_initialized!();
+        };
+        if local_record_store.contains_record(key) {
+            return local_record_store
+                .watch_record(key, params, watch_id)
+                .await
+                .map(NetworkResult::value);
+        }
+        let Some(remote_record_store) = inner.remote_record_store.as_mut() else {
+            apibail_not_initialized!();
+        };
+        if remote_record_store.contains_record(key) {
+            return remote_record_store
+                .watch_record(key, params, watch_id)
+                .await
+                .map(NetworkResult::value);
+        }
+        // No record found
+        Ok(NetworkResult::value(WatchResult::Rejected))
     }
 
     /// Handle a received 'Value Changed' statement
@@ -221,33 +228,37 @@ impl StorageManager {
         subkeys: ValueSubkeyRangeSet,
         mut count: u32,
         value: Arc<SignedValueData>,
+        inbound_node_id: TypedKey,
+        watch_id: u64,
     ) -> VeilidAPIResult<()> {
         // Update local record store with new value
         let (res, opt_update_callback) = {
             let mut inner = self.lock().await?;
 
-            let res = if let Some(first_subkey) = subkeys.first() {
-                inner
-                    .handle_set_local_value(
-                        key,
-                        first_subkey,
-                        value.clone(),
-                        WatchUpdateMode::NoUpdate,
-                    )
-                    .await
-            } else {
-                VeilidAPIResult::Ok(())
+            // Don't process update if the record is closed
+            let Some(opened_record) = inner.opened_records.get_mut(&key) else {
+                return Ok(());
             };
 
-            let Some(opened_record) = inner.opened_records.get_mut(&key) else {
-                // Don't send update or update the ActiveWatch if this record is closed
-                return res;
-            };
+            // No active watch means no callback
             let Some(mut active_watch) = opened_record.active_watch() else {
-                // No active watch means no callback
-                return res;
+                return Ok(());
             };
 
+            // If the watch id doesn't match, then don't process this
+            if active_watch.id != watch_id {
+                return Ok(());
+            }
+
+            // If the reporting node is not the same as our watch, don't process the value change
+            if !active_watch
+                .watch_node
+                .node_ids()
+                .contains(&inbound_node_id)
+            {
+                return Ok(());
+            }
+
             if count > active_watch.count {
                 // If count is greater than our requested count then this is invalid, cancel the watch
                 log_stor!(debug "watch count went backward: {}: {}/{}", key, count, active_watch.count);
@@ -259,7 +270,7 @@ impl StorageManager {
                 log_stor!(debug "watch count finished: {}", key);
                 opened_record.clear_active_watch();
             } else {
-                log_stor!(
+                log_stor!(debug
                     "watch count decremented: {}: {}/{}",
                     key,
                     count,
@@ -269,6 +280,20 @@ impl StorageManager {
                 opened_record.set_active_watch(active_watch);
             }
 
+            // Set the local value
+            let res = if let Some(first_subkey) = subkeys.first() {
+                inner
+                    .handle_set_local_value(
+                        key,
+                        first_subkey,
+                        value.clone(),
+                        WatchUpdateMode::NoUpdate,
+                    )
+                    .await
+            } else {
+                VeilidAPIResult::Ok(())
+            };
+
             (res, inner.update_callback.clone())
         };
 
diff --git a/veilid-core/src/table_store/mod.rs b/veilid-core/src/table_store/mod.rs
index 8d623ea8..8751314a 100644
--- a/veilid-core/src/table_store/mod.rs
+++ b/veilid-core/src/table_store/mod.rs
@@ -237,7 +237,7 @@ impl TableStore {
     ) -> EyreResult<Vec<u8>> {
         // Check if we are to protect the key
         if device_encryption_key_password.is_empty() {
-            debug!("no dek password");
+            log_tstore!(debug "no dek password");
             // Return the unprotected key bytes
             let mut out = Vec::with_capacity(4 + SHARED_SECRET_LENGTH);
             out.extend_from_slice(&dek.kind.0);
@@ -273,7 +273,7 @@ impl TableStore {
             .load_user_secret("device_encryption_key")
             .await?;
         let Some(dek_bytes) = dek_bytes else {
-            debug!("no device encryption key");
+            log_tstore!(debug "no device encryption key");
             return Ok(None);
         };
 
@@ -298,7 +298,7 @@ impl TableStore {
                 .protected_store
                 .remove_user_secret("device_encryption_key")
                 .await?;
-            debug!("removed device encryption key. existed: {}", existed);
+            log_tstore!(debug "removed device encryption key. existed: {}", existed);
             return Ok(());
         };
 
@@ -310,7 +310,7 @@ impl TableStore {
         let device_encryption_key_password =
             if let Some(new_device_encryption_key_password) = new_device_encryption_key_password {
                 // Change password
-                debug!("changing dek password");
+                log_tstore!(debug "changing dek password");
                 self.config
                     .with_mut(|c| {
                         c.protected_store.device_encryption_key_password =
@@ -320,7 +320,7 @@ impl TableStore {
                     .unwrap()
             } else {
                 // Get device encryption key protection password if we have it
-                debug!("saving with existing dek password");
+                log_tstore!(debug "saving with existing dek password");
                 let c = self.config.get();
                 c.protected_store.device_encryption_key_password.clone()
             };
@@ -335,7 +335,7 @@ impl TableStore {
             .protected_store
             .save_user_secret("device_encryption_key", &dek_bytes)
             .await?;
-        debug!("saving device encryption key. existed: {}", existed);
+        log_tstore!(debug "saving device encryption key. existed: {}", existed);
         Ok(())
     }
 
@@ -393,7 +393,7 @@ impl TableStore {
             },
             Ok(None) => {
                 // No table names yet, that's okay
-                trace!("__veilid_all_tables is empty");
+                log_tstore!("__veilid_all_tables is empty");
             }
             Err(e) => {
                 error!("could not get __veilid_all_tables: {}", e);
@@ -586,7 +586,7 @@ impl TableStore {
                 apibail_not_initialized!();
             }
         }
-        trace!("TableStore::rename {} -> {}", old_name, new_name);
+        log_tstore!(debug "TableStore::rename {} -> {}", old_name, new_name);
         self.name_rename(old_name, new_name).await?;
         self.flush().await;
         Ok(())
diff --git a/veilid-core/src/table_store/native.rs b/veilid-core/src/table_store/native.rs
index fadbc4ef..951e7060 100644
--- a/veilid-core/src/table_store/native.rs
+++ b/veilid-core/src/table_store/native.rs
@@ -17,7 +17,15 @@ impl TableStoreDriver {
         let tablestoredir = c.table_store.directory.clone();
         std::fs::create_dir_all(&tablestoredir).map_err(VeilidAPIError::from)?;
 
-        let dbpath: PathBuf = [tablestoredir, String::from(table)].iter().collect();
+        let c = self.config.get();
+        let namespace = c.namespace.clone();
+        let dbpath: PathBuf = if namespace.is_empty() {
+            [tablestoredir, String::from(table)].iter().collect()
+        } else {
+            [tablestoredir, format!("{}_{}", namespace, table)]
+                .iter()
+                .collect()
+        };
         Ok(dbpath)
     }
 
@@ -33,7 +41,7 @@ impl TableStoreDriver {
         // Ensure permissions are correct
         ensure_file_private_owner(&dbpath).map_err(VeilidAPIError::internal)?;
 
-        trace!(
+        log_tstore!(
             "opened table store '{}' at path '{:?}' with {} columns",
             table_name,
             dbpath,
diff --git a/veilid-core/src/table_store/wasm.rs b/veilid-core/src/table_store/wasm.rs
index 71b2b4fa..b34896e2 100644
--- a/veilid-core/src/table_store/wasm.rs
+++ b/veilid-core/src/table_store/wasm.rs
@@ -15,7 +15,7 @@ impl TableStoreDriver {
         let db = Database::open(table_name, column_count, false)
             .await
             .map_err(VeilidAPIError::generic)?;
-        trace!(
+        log_tstore!(
             "opened table store '{}' with {} columns",
             table_name,
             column_count
@@ -28,9 +28,9 @@ impl TableStoreDriver {
         if is_browser() {
             let out = Database::delete(table_name).await.is_ok();
             if out {
-                trace!("TableStore::delete {} deleted", table_name);
+                log_tstore!("TableStore::delete {} deleted", table_name);
             } else {
-                debug!("TableStore::delete {} not deleted", table_name);
+                log_tstore!(debug "TableStore::delete {} not deleted", table_name);
             }
             Ok(out)
         } else {
diff --git a/veilid-core/src/tests/android/mod.rs b/veilid-core/src/tests/android/mod.rs
index b8ba9645..405e942e 100644
--- a/veilid-core/src/tests/android/mod.rs
+++ b/veilid-core/src/tests/android/mod.rs
@@ -20,7 +20,7 @@ pub extern "system" fn Java_com_veilid_veilid_1core_1android_1tests_MainActivity
 
 pub fn veilid_core_setup_android_tests(env: JNIEnv, ctx: JObject) {
     // Set up subscriber and layers
-    let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None);
+    let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Info, None);
     let layer = paranoid_android::layer("veilid-core");
     tracing_subscriber::registry()
         .with(layer.with_filter(filter))
diff --git a/veilid-core/src/tests/common/test_dht.rs b/veilid-core/src/tests/common/test_dht.rs
index 6c796ea3..97070a93 100644
--- a/veilid-core/src/tests/common/test_dht.rs
+++ b/veilid-core/src/tests/common/test_dht.rs
@@ -62,10 +62,7 @@ pub async fn test_create_delete_dht_record_simple(api: VeilidAPI) {
         .unwrap();
 
     let rec = rc
-        .create_dht_record(
-            DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 1 }),
-            Some(CRYPTO_KIND_VLD0),
-        )
+        .create_dht_record(DHTSchema::dflt(1).unwrap(), Some(CRYPTO_KIND_VLD0))
         .await
         .unwrap();
 
@@ -82,10 +79,7 @@ pub async fn test_get_dht_value_nonexistent(api: VeilidAPI) {
         .unwrap();
 
     let rec = rc
-        .create_dht_record(
-            DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 1 }),
-            Some(CRYPTO_KIND_VLD0),
-        )
+        .create_dht_record(DHTSchema::dflt(1).unwrap(), Some(CRYPTO_KIND_VLD0))
         .await
         .unwrap();
     let dht_key = *rec.key();
@@ -104,17 +98,14 @@ pub async fn test_set_get_dht_value(api: VeilidAPI) {
         .unwrap();
 
     let rec = rc
-        .create_dht_record(
-            DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 2 }),
-            Some(CRYPTO_KIND_VLD0),
-        )
+        .create_dht_record(DHTSchema::dflt(2).unwrap(), Some(CRYPTO_KIND_VLD0))
         .await
         .unwrap();
     let dht_key = *rec.key();
 
     let test_value = String::from("BLAH BLAH BLAH").as_bytes().to_vec();
     // convert string to byte array
-    let set_dht_value_result = rc.set_dht_value(dht_key, 0, test_value.clone()).await;
+    let set_dht_value_result = rc.set_dht_value(dht_key, 0, test_value.clone(), None).await;
     assert_eq!(set_dht_value_result.expect("should be Ok(None)"), None);
 
     let get_dht_value_result_0_non_force = rc.get_dht_value(dht_key, 0, false).await;
@@ -159,10 +150,7 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
         .unwrap();
 
     let rec = rc
-        .create_dht_record(
-            DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 2 }),
-            Some(CRYPTO_KIND_VLD0),
-        )
+        .create_dht_record(DHTSchema::dflt(2).unwrap(), Some(CRYPTO_KIND_VLD0))
         .await
         .unwrap();
     let key = *rec.key();
@@ -184,7 +172,7 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
     // 5. Read data from subkey 0 with force_refresh, check data
     // 6. Read data from subkey 1 with force_refresh, check data
     // 7. Overwrite value 1 twice, check that there's no errors
-    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_value_1.clone()).await;
+    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_value_1.clone(), None).await;
     assert!(set_dht_test_value_1_result.is_ok());
 
     let get_dht_value_result_1_non_force = rc.get_dht_value(key, 1, false).await;
@@ -202,7 +190,7 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
         None
     );
 
-    let set_dht_test_value_0_result = rc.set_dht_value(key, 0, test_data_2.clone()).await;
+    let set_dht_test_value_0_result = rc.set_dht_value(key, 0, test_data_2.clone(), None).await;
     assert!(set_dht_test_value_0_result.is_ok());
 
     let get_dht_value_result_0_force = rc.get_dht_value(key, 0, true).await;
@@ -223,10 +211,10 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
         test_value_1
     );
 
-    let overwrite_value_1_result_1 = rc.set_dht_value(key, 1, test_value_1.clone()).await;
+    let overwrite_value_1_result_1 = rc.set_dht_value(key, 1, test_value_1.clone(), None).await;
     assert!(overwrite_value_1_result_1.is_ok());
 
-    let overwrite_value_1_result_2 = rc.set_dht_value(key, 1, test_data_2.clone()).await;
+    let overwrite_value_1_result_2 = rc.set_dht_value(key, 1, test_data_2.clone(), None).await;
     assert!(overwrite_value_1_result_2.is_ok());
 
     // Now that we initialized some subkeys
@@ -252,13 +240,10 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
     assert_eq!(rec.key().kind, key.kind);
     assert_eq!(rec.owner(), owner);
     assert_eq!(rec.owner_secret().unwrap(), secret);
-    assert!(matches!(
-        rec.schema().clone(),
-        DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 2 })
-    ));
+    assert_eq!(rec.schema(), &DHTSchema::dflt(2).unwrap());
 
     //Verify subkey 1 can be set before it is get but newer is available online
-    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_data_3.clone()).await;
+    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_data_3.clone(), None).await;
     assert!(set_dht_test_value_1_result.is_ok());
     let vdtemp = set_dht_test_value_1_result.unwrap().unwrap();
     assert_eq!(vdtemp.data(), test_data_2);
@@ -266,7 +251,7 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
     assert_eq!(vdtemp.writer(), owner);
 
     // Verify subkey 1 can be set a second time and it updates because seq is newer
-    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_data_3.clone()).await;
+    let set_dht_test_value_1_result = rc.set_dht_value(key, 1, test_data_3.clone(), None).await;
     assert!(set_dht_test_value_1_result.is_ok());
 
     // Verify the network got the subkey update with a refresh check
@@ -301,18 +286,20 @@ pub async fn test_open_writer_dht_value(api: VeilidAPI) {
     assert_eq!(rec.key().kind, key.kind);
     assert_eq!(rec.owner(), owner);
     assert_eq!(rec.owner_secret(), None);
-    let schema = rec.schema().clone();
-    assert!(matches!(
-        schema,
-        DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 2 })
-    ));
+    assert_eq!(rec.schema(), &DHTSchema::dflt(2).unwrap());
 
     // Verify subkey 1 can NOT be set because we have the wrong writer
-    let set_dht_test_value_0_result = rc.set_dht_value(key, 1, test_value_1.clone()).await;
+    let set_dht_test_value_0_result = rc.set_dht_value(key, 1, test_value_1.clone(), None).await;
     assert_err!(set_dht_test_value_0_result);
 
     // Verify subkey 0 can NOT be set because we have the wrong writer
-    let set_dht_test_value_0_result = rc.set_dht_value(key, 0, test_value_1.clone()).await;
+    let set_dht_test_value_0_result = rc.set_dht_value(key, 0, test_value_1.clone(), None).await;
+    assert_err!(set_dht_test_value_0_result);
+
+    // Verify subkey 0 can be set because we have overridden with the correct writer
+    let set_dht_test_value_0_result = rc
+        .set_dht_value(key, 0, test_value_1.clone(), Some(keypair))
+        .await;
     assert_err!(set_dht_test_value_0_result);
 
     rc.close_dht_record(key).await.unwrap();
diff --git a/veilid-core/src/tests/common/test_veilid_config.rs b/veilid-core/src/tests/common/test_veilid_config.rs
index 43515cbd..538f8cf2 100644
--- a/veilid-core/src/tests/common/test_veilid_config.rs
+++ b/veilid-core/src/tests/common/test_veilid_config.rs
@@ -155,7 +155,7 @@ cfg_if! {
 }
 
 fn update_callback(_update: VeilidUpdate) {
-    // println!("update_callback: {:?}", update);
+    // info!("update_callback: {:?}", update);
 }
 
 pub fn setup_veilid_core() -> (UpdateCallback, ConfigCallback) {
diff --git a/veilid-core/src/tests/ios/mod.rs b/veilid-core/src/tests/ios/mod.rs
index fe4fc783..7317d399 100644
--- a/veilid-core/src/tests/ios/mod.rs
+++ b/veilid-core/src/tests/ios/mod.rs
@@ -16,7 +16,7 @@ pub extern "C" fn run_veilid_core_tests() {
 
 pub fn veilid_core_setup_ios_tests() {
     // Set up subscriber and layers
-    let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None);
+    let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Info, None);
     tracing_subscriber::registry()
         .with(OsLogger::new("com.veilid.veilidcore-tests", "").with_filter(filter))
         .init();
diff --git a/veilid-core/src/tests/native/mod.rs b/veilid-core/src/tests/native/mod.rs
index 1faa2aa5..e11c5d1e 100644
--- a/veilid-core/src/tests/native/mod.rs
+++ b/veilid-core/src/tests/native/mod.rs
@@ -96,8 +96,8 @@ cfg_if! {
 
         pub fn setup() {
             SETUP_ONCE.call_once(|| {
-                use tracing_subscriber::{EnvFilter, filter::LevelFilter, fmt, prelude::*};
-                let mut env_filter = EnvFilter::builder().with_default_directive(LevelFilter::INFO.into()).from_env_lossy();
+                use tracing_subscriber::{EnvFilter, fmt, prelude::*};
+                let mut env_filter = EnvFilter::builder().from_env_lossy();
                 for ig in DEFAULT_LOG_IGNORE_LIST {
                     env_filter = env_filter.add_directive(format!("{}=off", ig).parse().unwrap());
                 }
diff --git a/veilid-core/src/veilid_api/api.rs b/veilid-core/src/veilid_api/api.rs
index 12e282a5..d455fa42 100644
--- a/veilid-core/src/veilid_api/api.rs
+++ b/veilid-core/src/veilid_api/api.rs
@@ -39,8 +39,10 @@ pub struct VeilidAPI {
 }
 
 impl VeilidAPI {
-    #[instrument(skip_all)]
+    #[instrument(target = "veilid_api", level = "debug", skip_all)]
     pub(crate) fn new(context: VeilidCoreContext) -> Self {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::new()");
         Self {
             inner: Arc::new(Mutex::new(VeilidAPIInner {
                 context: Some(context),
@@ -49,8 +51,10 @@ impl VeilidAPI {
     }
 
     /// Shut down Veilid and terminate the API
-    #[instrument(skip_all)]
+    #[instrument(target = "veilid_api", level = "debug", skip_all)]
     pub async fn shutdown(self) {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::shutdown()");
         let context = { self.inner.lock().context.take() };
         if let Some(context) = context {
             api_shutdown(context).await;
@@ -168,7 +172,11 @@ impl VeilidAPI {
     }
 
     /// Connect to the network
+    #[instrument(target = "veilid_api", level = "debug", skip_all, ret, err)]
     pub async fn attach(&self) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::attach()");
+
         let attachment_manager = self.attachment_manager()?;
         if !attachment_manager.attach().await {
             apibail_generic!("Already attached");
@@ -177,7 +185,11 @@ impl VeilidAPI {
     }
 
     /// Disconnect from the network
+    #[instrument(target = "veilid_api", level = "debug", skip_all, ret, err)]
     pub async fn detach(&self) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::detach()");
+
         let attachment_manager = self.attachment_manager()?;
         if !attachment_manager.detach().await {
             apibail_generic!("Already detached");
@@ -188,8 +200,12 @@ impl VeilidAPI {
     ////////////////////////////////////////////////////////////////
     // Routing Context
 
-    /// Get a new `RoutingContext` object to use to send messages over the Veilid network.
+    /// Get a new `RoutingContext` object to use to send messages over the Veilid network with default safety, sequencing, and stability parameters.
+    #[instrument(target = "veilid_api", level = "debug", skip_all, err, ret)]
     pub fn routing_context(&self) -> VeilidAPIResult<RoutingContext> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::routing_context()");
+
         RoutingContext::try_new(self.clone())
     }
 
@@ -200,9 +216,13 @@ impl VeilidAPI {
     /// `VLD0:XmnGyJrjMJBRC5ayJZRPXWTBspdX36-pbLb98H3UMeE` but if the prefix is left off
     /// `XmnGyJrjMJBRC5ayJZRPXWTBspdX36-pbLb98H3UMeE` will be parsed with the 'best' cryptosystem
     /// available (at the time of this writing this is `VLD0`)
+    #[instrument(target = "veilid_api", level = "debug", skip(self), fields(s=s.to_string()), ret, err)]
     pub async fn parse_as_target<S: ToString>(&self, s: S) -> VeilidAPIResult<Target> {
         let s = s.to_string();
 
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::parse_as_target(s: {:?})", s);
+
         // Is this a route id?
         if let Ok(rrid) = RouteId::from_str(&s) {
             let routing_table = self.routing_table()?;
@@ -226,32 +246,43 @@ impl VeilidAPI {
     // Private route allocation
 
     /// Allocate a new private route set with default cryptography and network options
+    /// Default settings are for Stability::Reliable and Sequencing::EnsureOrdered
     /// Returns a route id and a publishable 'blob' with the route encrypted with each crypto kind
     /// Those nodes importing the blob will have their choice of which crypto kind to use
     ///
     /// Returns a route id and 'blob' that can be published over some means (DHT or otherwise) to be
     /// imported by another Veilid node.
+    //#[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn new_private_route(&self) -> VeilidAPIResult<(RouteId, Vec<u8>)> {
         self.new_custom_private_route(
             &VALID_CRYPTO_KINDS,
             Stability::Reliable,
-            Sequencing::PreferOrdered,
+            Sequencing::EnsureOrdered,
         )
         .await
     }
 
     /// Allocate a new private route and specify a specific cryptosystem, stability and sequencing preference
+    /// Faster connections may be possible with Stability::LowLatency, and Sequencing::NoPreference at the 
+    /// expense of some loss of messages
     /// Returns a route id and a publishable 'blob' with the route encrypted with each crypto kind
     /// Those nodes importing the blob will have their choice of which crypto kind to use
     ///
     /// Returns a route id and 'blob' that can be published over some means (DHT or otherwise) to be
     /// imported by another Veilid node.
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn new_custom_private_route(
         &self,
         crypto_kinds: &[CryptoKind],
         stability: Stability,
         sequencing: Sequencing,
     ) -> VeilidAPIResult<(RouteId, Vec<u8>)> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::new_custom_private_route(crypto_kinds: {:?}, stability: {:?}, sequencing: {:?})", 
+            crypto_kinds, 
+            stability, 
+            sequencing);
+
         for kind in crypto_kinds {
             Crypto::validate_crypto_kind(*kind)?;
         }
@@ -293,7 +324,10 @@ impl VeilidAPI {
     /// Import a private route blob as a remote private route.
     ///
     /// Returns a route id that can be used to send private messages to the node creating this route.
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub fn import_remote_private_route(&self, blob: Vec<u8>) -> VeilidAPIResult<RouteId> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::import_remote_private_route(blob: {:?})", blob);
         let rss = self.routing_table()?.route_spec_store();
         rss.import_remote_private_route_blob(blob)
     }
@@ -302,7 +336,10 @@ impl VeilidAPI {
     ///
     /// This will deactivate the route and free its resources and it can no longer be sent to
     /// or received from.
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub fn release_private_route(&self, route_id: RouteId) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::release_private_route(route_id: {:?})", route_id);
         let rss = self.routing_table()?.route_spec_store();
         if !rss.release_route(route_id) {
             apibail_invalid_argument!("release_private_route", "key", route_id);
@@ -317,11 +354,15 @@ impl VeilidAPI {
     ///
     /// * `call_id` - specifies which call to reply to, and it comes from a [VeilidUpdate::AppCall], specifically the [VeilidAppCall::id()] value.
     /// * `message` - is an answer blob to be returned by the remote node's [RoutingContext::app_call()] function, and may be up to 32768 bytes
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn app_call_reply(
         &self,
         call_id: OperationId,
         message: Vec<u8>,
     ) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "VeilidAPI::app_call_reply(call_id: {:?}, message: {:?})", call_id, message);
+
         let rpc_processor = self.rpc_processor()?;
         rpc_processor
             .app_call_reply(call_id, message)
@@ -333,6 +374,7 @@ impl VeilidAPI {
     // Tunnel Building
 
     #[cfg(feature = "unstable-tunnels")]
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn start_tunnel(
         &self,
         _endpoint_mode: TunnelMode,
@@ -342,6 +384,7 @@ impl VeilidAPI {
     }
 
     #[cfg(feature = "unstable-tunnels")]
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn complete_tunnel(
         &self,
         _endpoint_mode: TunnelMode,
@@ -352,6 +395,7 @@ impl VeilidAPI {
     }
 
     #[cfg(feature = "unstable-tunnels")]
+    #[instrument(target = "veilid_api", level = "debug", skip(self), ret, err)]
     pub async fn cancel_tunnel(&self, _tunnel_id: TunnelId) -> VeilidAPIResult<bool> {
         panic!("unimplemented");
     }
diff --git a/veilid-core/src/veilid_api/debug.rs b/veilid-core/src/veilid_api/debug.rs
index 0fc13136..7596bcc4 100644
--- a/veilid-core/src/veilid_api/debug.rs
+++ b/veilid-core/src/veilid_api/debug.rs
@@ -78,13 +78,24 @@ fn get_data(text: &str) -> Option<Vec<u8>> {
 }
 
 fn get_subkeys(text: &str) -> Option<ValueSubkeyRangeSet> {
-    if let Some(n) = get_number(text) {
-        Some(ValueSubkeyRangeSet::single(n.try_into().ok()?))
+    if let Some(n) = get_number::<u32>(text) {
+        Some(ValueSubkeyRangeSet::single(n))
     } else {
         ValueSubkeyRangeSet::from_str(text).ok()
     }
 }
 
+fn get_dht_report_scope(text: &str) -> Option<DHTReportScope> {
+    match text.to_ascii_lowercase().trim() {
+        "local" => Some(DHTReportScope::Local),
+        "syncget" => Some(DHTReportScope::SyncGet),
+        "syncset" => Some(DHTReportScope::SyncSet),
+        "updateget" => Some(DHTReportScope::UpdateGet),
+        "updateset" => Some(DHTReportScope::UpdateSet),
+        _ => None,
+    }
+}
+
 fn get_route_id(
     rss: RouteSpecStore,
     allow_allocated: bool,
@@ -134,8 +145,14 @@ fn get_route_id(
     }
 }
 
-fn get_dht_schema(text: &str) -> Option<DHTSchema> {
-    deserialize_json::<DHTSchema>(text).ok()
+fn get_dht_schema(text: &str) -> Option<VeilidAPIResult<DHTSchema>> {
+    if text.is_empty() {
+        return None;
+    }
+    if let Ok(n) = u16::from_str(text) {
+        return Some(DHTSchema::dflt(n));
+    }
+    Some(deserialize_json::<DHTSchema>(text))
 }
 
 fn get_safety_selection(routing_table: RoutingTable) -> impl Fn(&str) -> Option<SafetySelection> {
@@ -284,8 +301,8 @@ fn get_destination(
     }
 }
 
-fn get_number(text: &str) -> Option<usize> {
-    usize::from_str(text).ok()
+fn get_number<T: num_traits::Num + FromStr>(text: &str) -> Option<T> {
+    T::from_str(text).ok()
 }
 
 fn get_typed_key(text: &str) -> Option<TypedKey> {
@@ -1388,6 +1405,11 @@ impl VeilidAPI {
                 out += &storage_manager.debug_remote_records().await;
                 out
             }
+            "opened" => {
+                let mut out = "Opened Records:\n".to_string();
+                out += &storage_manager.debug_opened_records().await;
+                out
+            }
             _ => "Invalid scope\n".to_owned(),
         };
         Ok(out)
@@ -1419,7 +1441,7 @@ impl VeilidAPI {
             "dht_schema",
             get_dht_schema,
         )
-        .unwrap_or_else(|_| DHTSchema::dflt(1));
+        .unwrap_or_else(|_| Ok(DHTSchema::default()))?;
 
         let csv = get_debug_argument_at(
             &args,
@@ -1450,7 +1472,7 @@ impl VeilidAPI {
             rc
         };
 
-        // Do a record get
+        // Do a record create
         let record = match rc.create_dht_record(schema, Some(csv.kind())).await {
             Err(e) => return Ok(format!("Can't open DHT record: {}", e)),
             Ok(v) => v,
@@ -1460,8 +1482,13 @@ impl VeilidAPI {
         let mut dc = DEBUG_CACHE.lock();
         dc.opened_record_contexts.insert(*record.key(), rc);
 
-        debug!("DHT Record Created:\n{:#?}", record);
-        Ok(format!("Created: {:?} : {:?}", record.key(), record))
+        Ok(format!(
+            "Created: {} {}:{}\n{:?}",
+            record.key(),
+            record.owner(),
+            record.owner_secret().unwrap(),
+            record
+        ))
     }
 
     async fn debug_record_open(&self, args: Vec<String>) -> VeilidAPIResult<String> {
@@ -1514,12 +1541,35 @@ impl VeilidAPI {
     }
 
     async fn debug_record_set(&self, args: Vec<String>) -> VeilidAPIResult<String> {
+        let opt_arg_add = if args.len() >= 2 && get_dht_key_no_safety(&args[1]).is_some() {
+            1
+        } else {
+            0
+        };
         let (key, rc) = get_opened_dht_record_context(&args, "debug_record_set", "key", 1)?;
-        let subkey = get_debug_argument_at(&args, 2, "debug_record_set", "subkey", get_number)?;
-        let data = get_debug_argument_at(&args, 3, "debug_record_set", "data", get_data)?;
+        let subkey = get_debug_argument_at(
+            &args,
+            1 + opt_arg_add,
+            "debug_record_set",
+            "subkey",
+            get_number::<u32>,
+        )?;
+        let data =
+            get_debug_argument_at(&args, 2 + opt_arg_add, "debug_record_set", "data", get_data)?;
+        let writer = get_debug_argument_at(
+            &args,
+            3 + opt_arg_add,
+            "debug_record_set",
+            "writer",
+            get_keypair,
+        )
+        .ok();
 
         // Do a record set
-        let value = match rc.set_dht_value(key, subkey as ValueSubkey, data).await {
+        let value = match rc
+            .set_dht_value(key, subkey as ValueSubkey, data, writer)
+            .await
+        {
             Err(e) => {
                 return Ok(format!("Can't set DHT value: {}", e));
             }
@@ -1534,12 +1584,24 @@ impl VeilidAPI {
     }
 
     async fn debug_record_get(&self, args: Vec<String>) -> VeilidAPIResult<String> {
+        let opt_arg_add = if args.len() >= 2 && get_dht_key_no_safety(&args[1]).is_some() {
+            1
+        } else {
+            0
+        };
+
         let (key, rc) = get_opened_dht_record_context(&args, "debug_record_get", "key", 1)?;
-        let subkey = get_debug_argument_at(&args, 2, "debug_record_get", "subkey", get_number)?;
+        let subkey = get_debug_argument_at(
+            &args,
+            1 + opt_arg_add,
+            "debug_record_get",
+            "subkey",
+            get_number::<u32>,
+        )?;
         let force_refresh = if args.len() >= 4 {
             Some(get_debug_argument_at(
                 &args,
-                3,
+                2 + opt_arg_add,
                 "debug_record_get",
                 "force_refresh",
                 get_string,
@@ -1600,15 +1662,21 @@ impl VeilidAPI {
         let key =
             get_debug_argument_at(&args, 1, "debug_record_info", "key", get_dht_key_no_safety)?;
 
-        let subkey =
-            get_debug_argument_at(&args, 2, "debug_record_info", "subkey", get_number).ok();
+        let subkey = get_debug_argument_at(
+            &args,
+            2,
+            "debug_record_info",
+            "subkey",
+            get_number::<ValueSubkey>,
+        )
+        .ok();
 
         let out = if let Some(subkey) = subkey {
             let li = storage_manager
-                .debug_local_record_subkey_info(key, subkey as ValueSubkey)
+                .debug_local_record_subkey_info(key, subkey)
                 .await;
             let ri = storage_manager
-                .debug_remote_record_subkey_info(key, subkey as ValueSubkey)
+                .debug_remote_record_subkey_info(key, subkey)
                 .await;
             format!(
                 "Local Subkey Info:\n{}\n\nRemote Subkey Info:\n{}\n",
@@ -1623,17 +1691,61 @@ impl VeilidAPI {
     }
 
     async fn debug_record_watch(&self, args: Vec<String>) -> VeilidAPIResult<String> {
+        let opt_arg_add = if args.len() >= 2 && get_dht_key_no_safety(&args[1]).is_some() {
+            1
+        } else {
+            0
+        };
+
         let (key, rc) = get_opened_dht_record_context(&args, "debug_record_watch", "key", 1)?;
-        let subkeys = get_debug_argument_at(&args, 2, "debug_record_watch", "subkeys", get_subkeys)
+
+        let mut rest_defaults = false;
+        let subkeys = get_debug_argument_at(
+            &args,
+            1 + opt_arg_add,
+            "debug_record_watch",
+            "subkeys",
+            get_subkeys,
+        )
+        .ok()
+        .unwrap_or_else(|| {
+            rest_defaults = true;
+            Default::default()
+        });
+
+        let expiration = if rest_defaults {
+            Default::default()
+        } else {
+            get_debug_argument_at(
+                &args,
+                2 + opt_arg_add,
+                "debug_record_watch",
+                "expiration",
+                parse_duration,
+            )
             .ok()
-            .unwrap_or_default();
-        let expiration =
-            get_debug_argument_at(&args, 3, "debug_record_watch", "expiration", parse_duration)
-                .ok()
-                .unwrap_or_default();
-        let count = get_debug_argument_at(&args, 4, "debug_record_watch", "count", get_number)
+            .map(|dur| dur + get_timestamp())
+            .unwrap_or_else(|| {
+                rest_defaults = true;
+                Default::default()
+            })
+        };
+        let count = if rest_defaults {
+            Default::default()
+        } else {
+            get_debug_argument_at(
+                &args,
+                3 + opt_arg_add,
+                "debug_record_watch",
+                "count",
+                get_number,
+            )
             .ok()
-            .unwrap_or(usize::MAX) as u32;
+            .unwrap_or_else(|| {
+                rest_defaults = true;
+                u32::MAX
+            })
+        };
 
         // Do a record watch
         let ts = match rc
@@ -1652,10 +1764,22 @@ impl VeilidAPI {
     }
 
     async fn debug_record_cancel(&self, args: Vec<String>) -> VeilidAPIResult<String> {
+        let opt_arg_add = if args.len() >= 2 && get_dht_key_no_safety(&args[1]).is_some() {
+            1
+        } else {
+            0
+        };
+
         let (key, rc) = get_opened_dht_record_context(&args, "debug_record_watch", "key", 1)?;
-        let subkeys = get_debug_argument_at(&args, 2, "debug_record_watch", "subkeys", get_subkeys)
-            .ok()
-            .unwrap_or_default();
+        let subkeys = get_debug_argument_at(
+            &args,
+            1 + opt_arg_add,
+            "debug_record_watch",
+            "subkeys",
+            get_subkeys,
+        )
+        .ok()
+        .unwrap_or_default();
 
         // Do a record watch cancel
         let still_active = match rc.cancel_dht_watch(key, subkeys).await {
@@ -1672,6 +1796,58 @@ impl VeilidAPI {
         })
     }
 
+    async fn debug_record_inspect(&self, args: Vec<String>) -> VeilidAPIResult<String> {
+        let opt_arg_add = if args.len() >= 2 && get_dht_key_no_safety(&args[1]).is_some() {
+            1
+        } else {
+            0
+        };
+
+        let (key, rc) = get_opened_dht_record_context(&args, "debug_record_watch", "key", 1)?;
+
+        let mut rest_defaults = false;
+
+        let scope = if rest_defaults {
+            Default::default()
+        } else {
+            get_debug_argument_at(
+                &args,
+                1 + opt_arg_add,
+                "debug_record_inspect",
+                "scope",
+                get_dht_report_scope,
+            )
+            .ok()
+            .unwrap_or_else(|| {
+                rest_defaults = true;
+                Default::default()
+            })
+        };
+
+        let subkeys = get_debug_argument_at(
+            &args,
+            2 + opt_arg_add,
+            "debug_record_inspect",
+            "subkeys",
+            get_subkeys,
+        )
+        .ok()
+        .unwrap_or_else(|| {
+            rest_defaults = true;
+            Default::default()
+        });
+
+        // Do a record inspect
+        let report = match rc.inspect_dht_record(key, subkeys, scope).await {
+            Err(e) => {
+                return Ok(format!("Can't inspect DHT record: {}", e));
+            }
+            Ok(v) => v,
+        };
+
+        Ok(format!("Success: report={:?}", report))
+    }
+
     async fn debug_record(&self, args: String) -> VeilidAPIResult<String> {
         let args: Vec<String> =
             shell_words::split(&args).map_err(|e| VeilidAPIError::parse_error(e, args))?;
@@ -1700,6 +1876,8 @@ impl VeilidAPI {
             self.debug_record_watch(args).await
         } else if command == "cancel" {
             self.debug_record_cancel(args).await
+        } else if command == "inspect" {
+            self.debug_record_inspect(args).await
         } else {
             Ok(">>> Unknown command\n".to_owned())
         }
@@ -1778,8 +1956,9 @@ record list <local|remote>
        get [<key>] <subkey> [force]
        delete <key>
        info [<key>] [subkey]
-       watch [<key>] [<subkeys>] [<expiration>] [<count>]
+       watch [<key>] [<subkeys> [<expiration> [<count>]]]
        cancel [<key>] [<subkeys>]
+       inspect [<key>] [<scope> [<subkeys>]]
 --------------------------------------------------------------------
 <key> is: VLD0:GsgXCRPrzSK6oBNgxhNpm-rTYFd02R0ySx6j9vbQBG4
     * also <node>, <relay>, <target>, <route>
@@ -1796,7 +1975,11 @@ record list <local|remote>
 <addresstype> is: ipv4|ipv6
 <routingdomain> is: public|local
 <cryptokind> is: VLD0
-<dhtschema> is: a json dht schema, default is '{"kind":"DFLT","o_cnt":1}'
+<dhtschema> is: 
+    * a single-quoted json dht schema, or 
+    * an integer number for a DFLT schema subkey count.
+    default is '{"kind":"DFLT","o_cnt":1}'
+<scope> is: local, syncget, syncset, updateget, updateset
 <subkey> is: a number: 2
 <subkeys> is: 
     * a number: 2
diff --git a/veilid-core/src/veilid_api/json_api/crypto_system.rs b/veilid-core/src/veilid_api/json_api/crypto_system.rs
index d66bcaf4..6bb960a9 100644
--- a/veilid-core/src/veilid_api/json_api/crypto_system.rs
+++ b/veilid-core/src/veilid_api/json_api/crypto_system.rs
@@ -30,6 +30,15 @@ pub enum CryptoSystemRequestOp {
         #[schemars(with = "String")]
         secret: SecretKey,
     },
+    GenerateSharedSecret {
+        #[schemars(with = "String")]
+        key: PublicKey,
+        #[schemars(with = "String")]
+        secret: SecretKey,
+        #[serde(with = "as_human_base64")]
+        #[schemars(with = "String")]
+        domain: Vec<u8>,
+    },
     RandomBytes {
         len: u32,
     },
@@ -151,6 +160,11 @@ pub enum CryptoSystemResponseOp {
         #[schemars(with = "ApiResult<String>")]
         result: ApiResultWithString<SharedSecret>,
     },
+    GenerateSharedSecret {
+        #[serde(flatten)]
+        #[schemars(with = "ApiResult<String>")]
+        result: ApiResultWithString<SharedSecret>,
+    },
     RandomBytes {
         #[serde(with = "as_human_base64")]
         #[schemars(with = "String")]
diff --git a/veilid-core/src/veilid_api/json_api/mod.rs b/veilid-core/src/veilid_api/json_api/mod.rs
index 4ec0210c..3b1c3338 100644
--- a/veilid-core/src/veilid_api/json_api/mod.rs
+++ b/veilid-core/src/veilid_api/json_api/mod.rs
@@ -120,6 +120,7 @@ pub enum RequestOp {
     },
     VeilidVersionString,
     VeilidVersion,
+    DefaultVeilidConfig,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
@@ -230,6 +231,9 @@ pub enum ResponseOp {
         minor: u32,
         patch: u32,
     },
+    DefaultVeilidConfig {
+        value: String,
+    },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
diff --git a/veilid-core/src/veilid_api/json_api/process.rs b/veilid-core/src/veilid_api/json_api/process.rs
index f12ef6b6..d342f959 100644
--- a/veilid-core/src/veilid_api/json_api/process.rs
+++ b/veilid-core/src/veilid_api/json_api/process.rs
@@ -323,13 +323,18 @@ impl JsonRequestProcessor {
                         .await,
                 ),
             },
-            RoutingContextRequestOp::SetDhtValue { key, subkey, data } => {
-                RoutingContextResponseOp::SetDhtValue {
-                    result: to_json_api_result(
-                        routing_context.set_dht_value(key, subkey, data).await,
-                    ),
-                }
-            }
+            RoutingContextRequestOp::SetDhtValue {
+                key,
+                subkey,
+                data,
+                writer,
+            } => RoutingContextResponseOp::SetDhtValue {
+                result: to_json_api_result(
+                    routing_context
+                        .set_dht_value(key, subkey, data, writer)
+                        .await,
+                ),
+            },
             RoutingContextRequestOp::WatchDhtValues {
                 key,
                 subkeys,
@@ -349,6 +354,18 @@ impl JsonRequestProcessor {
                     ),
                 }
             }
+            RoutingContextRequestOp::InspectDhtRecord {
+                key,
+                subkeys,
+                scope,
+            } => RoutingContextResponseOp::InspectDhtRecord {
+                result: to_json_api_result(
+                    routing_context
+                        .inspect_dht_record(key, subkeys, scope)
+                        .await
+                        .map(Box::new),
+                ),
+            },
         };
         RoutingContextResponse {
             rc_id: rcr.rc_id,
@@ -451,6 +468,16 @@ impl JsonRequestProcessor {
             CryptoSystemRequestOp::ComputeDh { key, secret } => CryptoSystemResponseOp::ComputeDh {
                 result: to_json_api_result_with_string(csv.compute_dh(&key, &secret)),
             },
+            CryptoSystemRequestOp::GenerateSharedSecret {
+                key,
+                secret,
+                domain,
+            } => CryptoSystemResponseOp::GenerateSharedSecret {
+                result: to_json_api_result_with_string(
+                    csv.generate_shared_secret(&key, &secret, &domain),
+                ),
+            },
+
             CryptoSystemRequestOp::RandomBytes { len } => CryptoSystemResponseOp::RandomBytes {
                 value: csv.random_bytes(len),
             },
@@ -787,6 +814,9 @@ impl JsonRequestProcessor {
                     patch,
                 }
             }
+            RequestOp::DefaultVeilidConfig => ResponseOp::DefaultVeilidConfig {
+                value: default_veilid_config(),
+            },
         };
 
         Response { id, op }
diff --git a/veilid-core/src/veilid_api/json_api/routing_context.rs b/veilid-core/src/veilid_api/json_api/routing_context.rs
index 5c8c2c41..b4ef2a9a 100644
--- a/veilid-core/src/veilid_api/json_api/routing_context.rs
+++ b/veilid-core/src/veilid_api/json_api/routing_context.rs
@@ -70,6 +70,8 @@ pub enum RoutingContextRequestOp {
         #[serde(with = "as_human_base64")]
         #[schemars(with = "String")]
         data: Vec<u8>,
+        #[schemars(with = "Option<String>")]
+        writer: Option<KeyPair>,
     },
     WatchDhtValues {
         #[schemars(with = "String")]
@@ -83,7 +85,14 @@ pub enum RoutingContextRequestOp {
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
     },
+    InspectDhtRecord {
+        #[schemars(with = "String")]
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        scope: DHTReportScope,
+    },
 }
+
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "rc_op")]
 pub enum RoutingContextResponseOp {
@@ -144,4 +153,8 @@ pub enum RoutingContextResponseOp {
         #[serde(flatten)]
         result: ApiResult<bool>,
     },
+    InspectDhtRecord {
+        #[serde(flatten)]
+        result: ApiResult<Box<DHTRecordReport>>,
+    },
 }
diff --git a/veilid-core/src/veilid_api/routing_context.rs b/veilid-core/src/veilid_api/routing_context.rs
index 06931c5d..6c9f3b85 100644
--- a/veilid-core/src/veilid_api/routing_context.rs
+++ b/veilid-core/src/veilid_api/routing_context.rs
@@ -32,6 +32,15 @@ pub struct RoutingContext {
     unlocked_inner: Arc<RoutingContextUnlockedInner>,
 }
 
+impl fmt::Debug for RoutingContext {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("RoutingContext")
+            .field("ptr", &format!("{:p}", Arc::as_ptr(&self.unlocked_inner)))
+            .field("safety_selection", &self.unlocked_inner.safety_selection)
+            .finish()
+    }
+}
+
 impl RoutingContext {
     ////////////////////////////////////////////////////////////////
 
@@ -46,8 +55,8 @@ impl RoutingContext {
                 safety_selection: SafetySelection::Safe(SafetySpec {
                     preferred_route: None,
                     hop_count: c.network.rpc.default_route_hop_count as usize,
-                    stability: Stability::default(),
-                    sequencing: Sequencing::PreferOrdered,
+                    stability: Stability::Reliable,
+                    sequencing: Sequencing::EnsureOrdered,
                 }),
             }),
         })
@@ -63,20 +72,28 @@ impl RoutingContext {
     /// * Sequencing default is to prefer ordered before unordered message delivery
     ///
     /// To customize the safety selection in use, use [RoutingContext::with_safety()].
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub fn with_default_safety(self) -> VeilidAPIResult<Self> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::with_default_safety(self: {:?})", self);
+
         let config = self.api.config()?;
         let c = config.get();
 
         self.with_safety(SafetySelection::Safe(SafetySpec {
             preferred_route: None,
             hop_count: c.network.rpc.default_route_hop_count as usize,
-            stability: Stability::default(),
-            sequencing: Sequencing::PreferOrdered,
+            stability: Stability::Reliable,
+            sequencing: Sequencing::EnsureOrdered,
         }))
     }
 
     /// Use a custom [SafetySelection]. Can be used to disable safety via [SafetySelection::Unsafe]
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub fn with_safety(self, safety_selection: SafetySelection) -> VeilidAPIResult<Self> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::with_safety(self: {:?}, safety_selection: {:?})", self, safety_selection);
+
         Ok(Self {
             api: self.api.clone(),
             inner: Arc::new(Mutex::new(RoutingContextInner {})),
@@ -85,7 +102,11 @@ impl RoutingContext {
     }
 
     /// Use a specified [Sequencing] preference, with or without privacy
+    #[instrument(target = "veilid_api", level = "debug", ret)]
     pub fn with_sequencing(self, sequencing: Sequencing) -> Self {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::with_sequencing(self: {:?}, sequencing: {:?})", self, sequencing);
+
         Self {
             api: self.api.clone(),
             inner: Arc::new(Mutex::new(RoutingContextInner {})),
@@ -120,7 +141,11 @@ impl RoutingContext {
         self.api.clone()
     }
 
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     async fn get_destination(&self, target: Target) -> VeilidAPIResult<rpc_processor::Destination> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::get_destination(self: {:?}, target: {:?})", self, target);
+
         let rpc_processor = self.api.rpc_processor()?;
         rpc_processor
             .resolve_target_to_destination(target, self.unlocked_inner.safety_selection)
@@ -139,7 +164,11 @@ impl RoutingContext {
     /// * `message` - an arbitrary message blob of up to 32768 bytes
     ///
     /// Returns an answer blob of up to 32768 bytes
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn app_call(&self, target: Target, message: Vec<u8>) -> VeilidAPIResult<Vec<u8>> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::app_call(self: {:?}, target: {:?}, message: {:?})", self, target, message);
+
         let rpc_processor = self.api.rpc_processor()?;
 
         // Get destination
@@ -169,7 +198,11 @@ impl RoutingContext {
     ///
     /// * `target` - can be either a direct node id or a private route
     /// * `message` - an arbitrary message blob of up to 32768 bytes
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn app_message(&self, target: Target, message: Vec<u8>) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::app_message(self: {:?}, target: {:?}, message: {:?})", self, target, message);
+
         let rpc_processor = self.api.rpc_processor()?;
 
         // Get destination
@@ -200,11 +233,16 @@ impl RoutingContext {
     /// The record is considered 'open' after the create operation succeeds.
     ///
     /// Returns the newly allocated DHT record's key if successful.    
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn create_dht_record(
         &self,
         schema: DHTSchema,
         kind: Option<CryptoKind>,
     ) -> VeilidAPIResult<DHTRecordDescriptor> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::create_dht_record(self: {:?}, schema: {:?}, kind: {:?})", self, schema, kind);
+        schema.validate()?;
+
         let kind = kind.unwrap_or(best_crypto_kind());
         Crypto::validate_crypto_kind(kind)?;
         let storage_manager = self.api.storage_manager()?;
@@ -215,26 +253,39 @@ impl RoutingContext {
 
     /// Opens a DHT record at a specific key
     ///
-    /// Associates a secret if one is provided to provide writer capability.
-    /// Records may only be opened or created. To re-open with a different routing context, first close the value.
+    /// Associates a 'default_writer' secret if one is provided to provide writer capability. The
+    /// writer can be overridden if specified here via the set_dht_value writer.
+    ///
+    /// Records may only be opened or created. If a record is re-opened it will use the new writer and routing context
+    /// ignoring the settings of the last time it was opened. This allows one to open a record a second time
+    /// without first closing it, which will keep the active 'watches' on the record but change the default writer or
+    /// safety selection.
     ///
     /// Returns the DHT record descriptor for the opened record if successful
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn open_dht_record(
         &self,
         key: TypedKey,
-        writer: Option<KeyPair>,
+        default_writer: Option<KeyPair>,
     ) -> VeilidAPIResult<DHTRecordDescriptor> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::open_dht_record(self: {:?}, key: {:?}, default_writer: {:?})", self, key, default_writer);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager
-            .open_record(key, writer, self.unlocked_inner.safety_selection)
+            .open_record(key, default_writer, self.unlocked_inner.safety_selection)
             .await
     }
 
     /// Closes a DHT record at a specific key that was opened with create_dht_record or open_dht_record.
     ///
     /// Closing a record allows you to re-open it with a different routing context
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn close_dht_record(&self, key: TypedKey) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::close_dht_record(self: {:?}, key: {:?})", self, key);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager.close_record(key).await
@@ -245,7 +296,11 @@ impl RoutingContext {
     /// If the record is opened, it must be closed before it is deleted.
     /// Deleting a record does not delete it from the network, but will remove the storage of the record
     /// locally, and will prevent its value from being refreshed on the network by this node.
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn delete_dht_record(&self, key: TypedKey) -> VeilidAPIResult<()> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::delete_dht_record(self: {:?}, key: {:?})", self, key);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager.delete_record(key).await
@@ -257,51 +312,65 @@ impl RoutingContext {
     ///
     /// Returns `None` if the value subkey has not yet been set
     /// Returns `Some(data)` if the value subkey has valid data
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn get_dht_value(
         &self,
         key: TypedKey,
         subkey: ValueSubkey,
         force_refresh: bool,
     ) -> VeilidAPIResult<Option<ValueData>> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::get_dht_value(self: {:?}, key: {:?}, subkey: {:?}, force_refresh: {:?})", self, key, subkey, force_refresh);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager.get_value(key, subkey, force_refresh).await
     }
 
     /// Pushes a changed subkey value to the network
+    /// The DHT record must first by opened via open_dht_record or create_dht_record.
+    ///
+    /// The writer, if specified, will override the 'default_writer' specified when the record is opened.
     ///
     /// Returns `None` if the value was successfully put
     /// Returns `Some(data)` if the value put was older than the one available on the network
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn set_dht_value(
         &self,
         key: TypedKey,
         subkey: ValueSubkey,
         data: Vec<u8>,
+        writer: Option<KeyPair>,
     ) -> VeilidAPIResult<Option<ValueData>> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::set_dht_value(self: {:?}, key: {:?}, subkey: {:?}, data: {:?}, writer: {:?})", self, key, subkey, data, writer);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
-        storage_manager.set_value(key, subkey, data).await
+        storage_manager.set_value(key, subkey, data, writer).await
     }
 
-    /// Add a watch to a DHT value that informs the user via an VeilidUpdate::ValueChange callback when the record has subkeys change.
+    /// Add or update a watch to a DHT value that informs the user via an VeilidUpdate::ValueChange callback when the record has subkeys change.
     /// One remote node will be selected to perform the watch and it will offer an expiration time based on a suggestion, and make an attempt to
     /// continue to report changes via the callback. Nodes that agree to doing watches will be put on our 'ping' list to ensure they are still around
     /// otherwise the watch will be cancelled and will have to be re-watched.
     ///
-    /// There is only one watch permitted per record. If a change to a watch is desired, the first one must will be overwritten.
+    /// There is only one watch permitted per record. If a change to a watch is desired, the previous one will be overwritten.
     /// * `key` is the record key to watch. it must first be opened for reading or writing.
     /// * `subkeys` is the the range of subkeys to watch. The range must not exceed 512 discrete non-overlapping or adjacent subranges. If no range is specified, this is equivalent to watching the entire range of subkeys.
     /// * `expiration` is the desired timestamp of when to automatically terminate the watch, in microseconds. If this value is less than `network.rpc.timeout_ms` milliseconds in the future, this function will return an error immediately.
     /// * `count` is the number of times the watch will be sent, maximum. A zero value here is equivalent to a cancellation.
     ///
-    /// Returns a timestamp of when the watch will expire. All watches are guaranteed to expire at some point in the future, and the returned timestamp will
-    /// be no later than the requested expiration, but -may- be before the requested expiration.
+    /// Returns a timestamp of when the watch will expire. All watches are guaranteed to expire at some point in the future,
+    /// and the returned timestamp will be no later than the requested expiration, but -may- be before the requested expiration.
+    /// If the returned timestamp is zero it indicates that the watch creation or update has failed. In the case of a faild update, the watch is considered cancelled.
     ///
     /// DHT watches are accepted with the following conditions:
     /// * First-come first-served basis for arbitrary unauthenticated readers, up to network.dht.public_watch_limit per record
     /// * If a member (either the owner or a SMPL schema member) has opened the key for writing (even if no writing is performed) then the watch will be signed and guaranteed network.dht.member_watch_limit per writer
     ///
     /// Members can be specified via the SMPL schema and do not need to allocate writable subkeys in order to offer a member watch capability.
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn watch_dht_values(
         &self,
         key: TypedKey,
@@ -309,6 +378,9 @@ impl RoutingContext {
         expiration: Timestamp,
         count: u32,
     ) -> VeilidAPIResult<Timestamp> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::watch_dht_values(self: {:?}, key: {:?}, subkeys: {:?}, expiration: {:?}, count: {:?})", self, key, subkeys, expiration, count);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager
@@ -318,28 +390,91 @@ impl RoutingContext {
 
     /// Cancels a watch early
     ///
-    /// This is a convenience function that cancels watching all subkeys in a range
+    /// This is a convenience function that cancels watching all subkeys in a range. The subkeys specified here
+    /// are subtracted from the watched subkey range. If no range is specified, this is equivalent to cancelling the entire range of subkeys.
+    /// Only the subkey range is changed, the expiration and count remain the same.
+    /// If no subkeys remain, the watch is entirely cancelled and will receive no more updates.
     /// Returns Ok(true) if there is any remaining watch for this record
     /// Returns Ok(false) if the entire watch has been cancelled
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn cancel_dht_watch(
         &self,
         key: TypedKey,
         subkeys: ValueSubkeyRangeSet,
     ) -> VeilidAPIResult<bool> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::cancel_dht_watch(self: {:?}, key: {:?}, subkeys: {:?}", self, key, subkeys);
+
         Crypto::validate_crypto_kind(key.kind)?;
         let storage_manager = self.api.storage_manager()?;
         storage_manager.cancel_watch_values(key, subkeys).await
     }
 
+    /// Inspects a DHT record for subkey state.
+    /// This is useful for checking if you should push new subkeys to the network, or retrieve the current state of a record from the network
+    /// to see what needs updating locally.
+    ///
+    /// * `key` is the record key to watch. it must first be opened for reading or writing.
+    /// * `subkeys` is the the range of subkeys to inspect. The range must not exceed 512 discrete non-overlapping or adjacent subranges.
+    ///    If no range is specified, this is equivalent to inspecting the entire range of subkeys. In total, the list of subkeys returned will be truncated at 512 elements.
+    /// * `scope` is what kind of range the inspection has:
+    ///
+    ///   - DHTReportScope::Local
+    ///     Results will be only for a locally stored record.
+    ///     Useful for seeing what subkeys you have locally and which ones have not been retrieved
+    ///
+    ///   - DHTReportScope::SyncGet
+    ///     Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    ///     Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if the local copy did not exist locally.
+    ///     Useful for determining if the current local copy should be updated from the network.
+    ///
+    ///   - DHTReportScope::SyncSet
+    ///     Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    ///     Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if the local copy did not exist locally.
+    ///     Useful for determining if the unchanged local copy should be pushed to the network.
+    ///
+    ///   - DHTReportScope::UpdateGet
+    ///     Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    ///     Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if a GetValue operation were being performed, including accepting newer values from the network.
+    ///     Useful for determining which subkeys would change with a GetValue operation
+    ///
+    ///   - DHTReportScope::UpdateSet
+    ///     Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    ///     Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if a SetValue operation were being performed, including accepting newer values from the network.
+    ///     This simulates a SetValue with the initial sequence number incremented by 1, like a real SetValue would when updating.
+    ///     Useful for determine which subkeys would change with an SetValue operation
+    ///
+    /// Returns a DHTRecordReport with the subkey ranges that were returned that overlapped the schema, and sequence numbers for each of the subkeys in the range.
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
+    pub async fn inspect_dht_record(
+        &self,
+        key: TypedKey,
+        subkeys: ValueSubkeyRangeSet,
+        scope: DHTReportScope,
+    ) -> VeilidAPIResult<DHTRecordReport> {
+        event!(target: "veilid_api", Level::DEBUG, 
+            "RoutingContext::inspect_dht_record(self: {:?}, key: {:?}, subkeys: {:?}, scope: {:?})", self, key, subkeys, scope);
+
+        Crypto::validate_crypto_kind(key.kind)?;
+        let storage_manager = self.api.storage_manager()?;
+        storage_manager.inspect_record(key, subkeys, scope).await
+    }
+
     ///////////////////////////////////
     /// Block Store
 
     #[cfg(feature = "unstable-blockstore")]
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn find_block(&self, _block_id: PublicKey) -> VeilidAPIResult<Vec<u8>> {
         panic!("unimplemented");
     }
 
     #[cfg(feature = "unstable-blockstore")]
+    #[instrument(target = "veilid_api", level = "debug", ret, err)]
     pub async fn supply_block(&self, _block_id: PublicKey) -> VeilidAPIResult<bool> {
         panic!("unimplemented");
     }
diff --git a/veilid-core/src/veilid_api/tests/test_types.rs b/veilid-core/src/veilid_api/tests/test_types.rs
index 3a9b38bf..73617bff 100644
--- a/veilid-core/src/veilid_api/tests/test_types.rs
+++ b/veilid-core/src/veilid_api/tests/test_types.rs
@@ -13,7 +13,11 @@ pub async fn test_alignedu64() {
 // app_messsage_call
 
 pub async fn test_veilidappmessage() {
-    let orig = VeilidAppMessage::new(Some(fix_typedkey()), b"Hi there!".to_vec());
+    let orig = VeilidAppMessage::new(
+        Some(fix_typedkey()),
+        Some(fix_cryptokey()),
+        b"Hi there!".to_vec(),
+    );
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
     assert_eq!(orig, copy);
@@ -22,6 +26,7 @@ pub async fn test_veilidappmessage() {
 pub async fn test_veilidappcall() {
     let orig = VeilidAppCall::new(
         Some(fix_typedkey()),
+        Some(fix_cryptokey()),
         b"Well, hello!".to_vec(),
         AlignedU64::from(123),
     );
diff --git a/veilid-core/src/veilid_api/tests/test_types_dht.rs b/veilid-core/src/veilid_api/tests/test_types_dht.rs
index 73f32eda..a8b5aa13 100644
--- a/veilid-core/src/veilid_api/tests/test_types_dht.rs
+++ b/veilid-core/src/veilid_api/tests/test_types_dht.rs
@@ -9,7 +9,7 @@ pub async fn test_dhtrecorddescriptor() {
         fix_typedkey(),
         fix_cryptokey(),
         Some(fix_cryptokey()),
-        DHTSchema::DFLT(DHTSchemaDFLT { o_cnt: 4321 }),
+        DHTSchema::dflt(4321).unwrap(),
     );
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
diff --git a/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs b/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
index 582d4040..885ac144 100644
--- a/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
+++ b/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
@@ -4,7 +4,7 @@ use crate::*;
 // dlft
 
 pub async fn test_dhtschemadflt() {
-    let orig = DHTSchemaDFLT { o_cnt: 9 };
+    let orig = DHTSchemaDFLT::new(9);
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
     assert_eq!(orig, copy);
@@ -13,19 +13,22 @@ pub async fn test_dhtschemadflt() {
 // mod
 
 pub async fn test_dhtschema() {
-    let orig = DHTSchema::SMPL(DHTSchemaSMPL {
-        o_cnt: 91,
-        members: vec![
-            DHTSchemaSMPLMember {
-                m_key: fix_cryptokey(),
-                m_cnt: 5,
-            },
-            DHTSchemaSMPLMember {
-                m_key: fix_cryptokey(),
-                m_cnt: 6,
-            },
-        ],
-    });
+    let orig = DHTSchema::SMPL(
+        DHTSchemaSMPL::new(
+            91,
+            vec![
+                DHTSchemaSMPLMember {
+                    m_key: fix_cryptokey(),
+                    m_cnt: 5,
+                },
+                DHTSchemaSMPLMember {
+                    m_key: fix_cryptokey(),
+                    m_cnt: 6,
+                },
+            ],
+        )
+        .unwrap(),
+    );
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
     assert_eq!(orig, copy);
@@ -44,9 +47,9 @@ pub async fn test_dhtschemasmplmember() {
 }
 
 pub async fn test_dhtschemasmpl() {
-    let orig = DHTSchemaSMPL {
-        o_cnt: 91,
-        members: vec![
+    let orig = DHTSchemaSMPL::new(
+        91,
+        vec![
             DHTSchemaSMPLMember {
                 m_key: fix_cryptokey(),
                 m_cnt: 8,
@@ -56,7 +59,8 @@ pub async fn test_dhtschemasmpl() {
                 m_cnt: 9,
             },
         ],
-    };
+    )
+    .unwrap();
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
     assert_eq!(orig, copy);
diff --git a/veilid-core/src/veilid_api/types/app_message_call.rs b/veilid-core/src/veilid_api/types/app_message_call.rs
index ff117e5e..388ace53 100644
--- a/veilid-core/src/veilid_api/types/app_message_call.rs
+++ b/veilid-core/src/veilid_api/types/app_message_call.rs
@@ -9,6 +9,11 @@ pub struct VeilidAppMessage {
     #[cfg_attr(target_arch = "wasm32", tsify(optional, type = "string"))]
     sender: Option<TypedKey>,
 
+    #[serde(with = "as_human_opt_string")]
+    #[schemars(with = "Option<String>")]
+    #[cfg_attr(target_arch = "wasm32", tsify(optional, type = "string"))]
+    route_id: Option<RouteId>,
+
     #[cfg_attr(not(target_arch = "wasm32"), serde(with = "as_human_base64"))]
     #[schemars(with = "String")]
     #[cfg_attr(
@@ -20,8 +25,12 @@ pub struct VeilidAppMessage {
 }
 
 impl VeilidAppMessage {
-    pub fn new(sender: Option<TypedKey>, message: Vec<u8>) -> Self {
-        Self { sender, message }
+    pub fn new(sender: Option<TypedKey>, route_id: Option<RouteId>, message: Vec<u8>) -> Self {
+        Self {
+            sender,
+            route_id,
+            message,
+        }
     }
 
     /// Some(sender) if the message was sent directly, None if received via a private/safety route
@@ -29,6 +38,11 @@ impl VeilidAppMessage {
         self.sender.as_ref()
     }
 
+    /// Some(route_id) if the message was received over a private route, None if received only a safety route or directly
+    pub fn route_id(&self) -> Option<&RouteId> {
+        self.route_id.as_ref()
+    }
+
     /// The content of the message to deliver to the application
     pub fn message(&self) -> &[u8] {
         &self.message
@@ -44,6 +58,11 @@ pub struct VeilidAppCall {
     #[cfg_attr(target_arch = "wasm32", tsify(optional))]
     sender: Option<TypedKey>,
 
+    #[serde(with = "as_human_opt_string")]
+    #[schemars(with = "Option<String>")]
+    #[cfg_attr(target_arch = "wasm32", tsify(optional, type = "string"))]
+    route_id: Option<RouteId>,
+
     #[cfg_attr(not(target_arch = "wasm32"), serde(with = "as_human_base64"))]
     #[schemars(with = "String")]
     #[cfg_attr(
@@ -59,9 +78,15 @@ pub struct VeilidAppCall {
 }
 
 impl VeilidAppCall {
-    pub fn new(sender: Option<TypedKey>, message: Vec<u8>, call_id: OperationId) -> Self {
+    pub fn new(
+        sender: Option<TypedKey>,
+        route_id: Option<RouteId>,
+        message: Vec<u8>,
+        call_id: OperationId,
+    ) -> Self {
         Self {
             sender,
+            route_id,
             message,
             call_id,
         }
@@ -71,6 +96,12 @@ impl VeilidAppCall {
     pub fn sender(&self) -> Option<&TypedKey> {
         self.sender.as_ref()
     }
+
+    /// Some(route_id) if the request was received over a private route, None if received only a safety route or directly
+    pub fn route_id(&self) -> Option<&RouteId> {
+        self.route_id.as_ref()
+    }
+
     /// The content of the request to deliver to the application
     pub fn message(&self) -> &[u8] {
         &self.message
diff --git a/veilid-core/src/veilid_api/types/dht/dht_record_report.rs b/veilid-core/src/veilid_api/types/dht/dht_record_report.rs
new file mode 100644
index 00000000..3fa74ffa
--- /dev/null
+++ b/veilid-core/src/veilid_api/types/dht/dht_record_report.rs
@@ -0,0 +1,96 @@
+use super::*;
+
+/// DHT Record Report
+#[derive(Default, Clone, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[cfg_attr(
+    target_arch = "wasm32",
+    derive(Tsify),
+    tsify(from_wasm_abi, into_wasm_abi)
+)]
+pub struct DHTRecordReport {
+    /// The actual subkey range within the schema being reported on
+    /// This may be a subset of the requested range if it exceeds the schema limits
+    /// or has more than 512 subkeys
+    subkeys: ValueSubkeyRangeSet,
+    /// The sequence numbers of each subkey requested from a locally stored DHT Record
+    local_seqs: Vec<ValueSeqNum>,
+    /// The sequence numbers of each subkey requested from the DHT over the network
+    network_seqs: Vec<ValueSeqNum>,
+}
+from_impl_to_jsvalue!(DHTRecordReport);
+
+impl DHTRecordReport {
+    pub fn new(
+        subkeys: ValueSubkeyRangeSet,
+        local_seqs: Vec<ValueSeqNum>,
+        network_seqs: Vec<ValueSeqNum>,
+    ) -> Self {
+        Self {
+            subkeys,
+            local_seqs,
+            network_seqs,
+        }
+    }
+
+    pub fn subkeys(&self) -> &ValueSubkeyRangeSet {
+        &self.subkeys
+    }
+    pub fn local_seqs(&self) -> &[ValueSeqNum] {
+        &self.local_seqs
+    }
+    pub fn network_seqs(&self) -> &[ValueSeqNum] {
+        &self.network_seqs
+    }
+}
+
+impl fmt::Debug for DHTRecordReport {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "DHTRecordReport {{\n  subkeys: {:?}\n  local_seqs:\n{}\n  remote_seqs:\n{}\n}}\n",
+            &self.subkeys,
+            &debug_seqs(&self.local_seqs),
+            &debug_seqs(&self.network_seqs)
+        )
+    }
+}
+/// DHT Record Report Scope
+#[derive(
+    Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
+#[cfg_attr(
+    target_arch = "wasm32",
+    derive(Tsify),
+    tsify(from_wasm_abi, into_wasm_abi, namespace)
+)]
+pub enum DHTReportScope {
+    /// Return only the local copy sequence numbers
+    /// Useful for seeing what subkeys you have locally and which ones have not been retrieved
+    Local = 0,
+    /// Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    /// Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    /// would be reached as if the local copy did not exist locally.
+    /// Useful for determining if the current local copy should be updated from the network.
+    SyncGet = 1,
+    /// Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    /// Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    /// would be reached as if the local copy did not exist locally.
+    /// Useful for determining if the unchanged local copy should be pushed to the network.
+    SyncSet = 2,
+    /// Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    /// Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    /// would be reached as if a GetValue operation were being performed, including accepting newer values from the network.
+    /// Useful for determining which subkeys would change with a GetValue operation
+    UpdateGet = 3,
+    /// Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    /// Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    /// would be reached as if a SetValue operation were being performed, including accepting newer values from the network.
+    /// This simulates a SetValue with the initial sequence number incremented by 1, like a real SetValue would when updating.
+    /// Useful for determine which subkeys would change on an SetValue operation
+    UpdateSet = 4,
+}
+impl Default for DHTReportScope {
+    fn default() -> Self {
+        Self::Local
+    }
+}
diff --git a/veilid-core/src/veilid_api/types/dht/mod.rs b/veilid-core/src/veilid_api/types/dht/mod.rs
index bd7b93eb..693a1c68 100644
--- a/veilid-core/src/veilid_api/types/dht/mod.rs
+++ b/veilid-core/src/veilid_api/types/dht/mod.rs
@@ -1,4 +1,5 @@
 mod dht_record_descriptor;
+mod dht_record_report;
 mod schema;
 mod value_data;
 mod value_subkey_range_set;
@@ -6,6 +7,7 @@ mod value_subkey_range_set;
 use super::*;
 
 pub use dht_record_descriptor::*;
+pub use dht_record_report::*;
 pub use schema::*;
 pub use value_data::*;
 pub use value_subkey_range_set::*;
@@ -16,3 +18,28 @@ pub type ValueSubkey = u32;
 /// Value sequence number
 #[cfg_attr(target_arch = "wasm32", declare)]
 pub type ValueSeqNum = u32;
+
+pub(crate) fn debug_seqs(seqs: &[ValueSeqNum]) -> String {
+    let mut col = 0;
+    let mut out = String::new();
+    let mut left = seqs.len();
+    for s in seqs {
+        if col == 0 {
+            out += "    ";
+        }
+        let sc = if *s == ValueSeqNum::MAX {
+            "-".to_owned()
+        } else {
+            s.to_string()
+        };
+        out += &sc;
+        out += ",";
+        col += 1;
+        left -= 1;
+        if col == 32 && left != 0 {
+            col = 0;
+            out += "\n"
+        }
+    }
+    out
+}
diff --git a/veilid-core/src/veilid_api/types/dht/schema/dflt.rs b/veilid-core/src/veilid_api/types/dht/schema/dflt.rs
index 25c5bf9b..bb595a23 100644
--- a/veilid-core/src/veilid_api/types/dht/schema/dflt.rs
+++ b/veilid-core/src/veilid_api/types/dht/schema/dflt.rs
@@ -5,13 +5,33 @@ use super::*;
 #[cfg_attr(target_arch = "wasm32", derive(Tsify), tsify(from_wasm_abi))]
 pub struct DHTSchemaDFLT {
     /// Owner subkey count
-    pub o_cnt: u16,
+    o_cnt: u16,
 }
 
 impl DHTSchemaDFLT {
     pub const FCC: [u8; 4] = *b"DFLT";
     pub const FIXED_SIZE: usize = 6;
 
+    /// Make a schema
+    pub fn new(o_cnt: u16) -> VeilidAPIResult<Self> {
+        let out = Self { o_cnt };
+        out.validate()?;
+        Ok(out)
+    }
+
+    /// Validate the data representation
+    pub fn validate(&self) -> VeilidAPIResult<()> {
+        if self.o_cnt == 0 {
+            apibail_invalid_argument!("must have at least one subkey", "o_cnt", self.o_cnt);
+        }
+        Ok(())
+    }
+
+    /// Get the owner subkey count
+    pub fn o_cnt(&self) -> u16 {
+        self.o_cnt
+    }
+
     /// Build the data representation of the schema
     pub fn compile(&self) -> Vec<u8> {
         let mut out = Vec::<u8>::with_capacity(Self::FIXED_SIZE);
@@ -22,9 +42,9 @@ impl DHTSchemaDFLT {
         out
     }
 
-    /// Get the number of subkeys this schema allocates
-    pub fn subkey_count(&self) -> usize {
-        self.o_cnt as usize
+    /// Get the maximum subkey this schema allocates
+    pub fn max_subkey(&self) -> ValueSubkey {
+        self.o_cnt as ValueSubkey - 1
     }
     /// Get the data size of this schema beyond the size of the structure itself
     pub fn data_size(&self) -> usize {
@@ -72,6 +92,6 @@ impl TryFrom<&[u8]> for DHTSchemaDFLT {
 
         let o_cnt = u16::from_le_bytes(b[4..6].try_into().map_err(VeilidAPIError::internal)?);
 
-        Ok(Self { o_cnt })
+        Self::new(o_cnt)
     }
 }
diff --git a/veilid-core/src/veilid_api/types/dht/schema/mod.rs b/veilid-core/src/veilid_api/types/dht/schema/mod.rs
index 42213240..e384e49f 100644
--- a/veilid-core/src/veilid_api/types/dht/schema/mod.rs
+++ b/veilid-core/src/veilid_api/types/dht/schema/mod.rs
@@ -16,11 +16,19 @@ pub enum DHTSchema {
 }
 
 impl DHTSchema {
-    pub fn dflt(o_cnt: u16) -> DHTSchema {
-        DHTSchema::DFLT(DHTSchemaDFLT { o_cnt })
+    pub fn dflt(o_cnt: u16) -> VeilidAPIResult<DHTSchema> {
+        Ok(DHTSchema::DFLT(DHTSchemaDFLT::new(o_cnt)?))
     }
-    pub fn smpl(o_cnt: u16, members: Vec<DHTSchemaSMPLMember>) -> DHTSchema {
-        DHTSchema::SMPL(DHTSchemaSMPL { o_cnt, members })
+    pub fn smpl(o_cnt: u16, members: Vec<DHTSchemaSMPLMember>) -> VeilidAPIResult<DHTSchema> {
+        Ok(DHTSchema::SMPL(DHTSchemaSMPL::new(o_cnt, members)?))
+    }
+
+    /// Validate the data representation
+    pub fn validate(&self) -> VeilidAPIResult<()> {
+        match self {
+            DHTSchema::DFLT(d) => d.validate(),
+            DHTSchema::SMPL(s) => s.validate(),
+        }
     }
 
     /// Build the data representation of the schema
@@ -31,11 +39,11 @@ impl DHTSchema {
         }
     }
 
-    /// Get the number of subkeys this schema allocates
-    pub fn subkey_count(&self) -> usize {
+    /// Get maximum subkey number for this schema
+    pub fn max_subkey(&self) -> ValueSubkey {
         match self {
-            DHTSchema::DFLT(d) => d.subkey_count(),
-            DHTSchema::SMPL(s) => s.subkey_count(),
+            DHTSchema::DFLT(d) => d.max_subkey(),
+            DHTSchema::SMPL(s) => s.max_subkey(),
         }
     }
 
@@ -67,11 +75,37 @@ impl DHTSchema {
             DHTSchema::SMPL(s) => s.is_member(key),
         }
     }
+
+    /// Truncate a subkey range set to the schema
+    /// Optionally also trim to maximum number of subkeys in the range
+    pub fn truncate_subkeys(
+        &self,
+        subkeys: &ValueSubkeyRangeSet,
+        opt_max_subkey_len: Option<usize>,
+    ) -> ValueSubkeyRangeSet {
+        // Get number of subkeys from schema and trim to the bounds of the schema
+        let in_schema_subkeys =
+            subkeys.intersect(&ValueSubkeyRangeSet::single_range(0, self.max_subkey()));
+
+        // Cap the number of total subkeys being inspected to the amount we can send across the wire
+        if let Some(max_subkey_len) = opt_max_subkey_len {
+            if let Some(nth_subkey) = in_schema_subkeys.nth_subkey(max_subkey_len) {
+                in_schema_subkeys.difference(&ValueSubkeyRangeSet::single_range(
+                    nth_subkey,
+                    ValueSubkey::MAX,
+                ))
+            } else {
+                in_schema_subkeys
+            }
+        } else {
+            in_schema_subkeys
+        }
+    }
 }
 
 impl Default for DHTSchema {
     fn default() -> Self {
-        Self::dflt(1)
+        Self::dflt(1).unwrap()
     }
 }
 
diff --git a/veilid-core/src/veilid_api/types/dht/schema/smpl.rs b/veilid-core/src/veilid_api/types/dht/schema/smpl.rs
index 93093eec..ab3fac23 100644
--- a/veilid-core/src/veilid_api/types/dht/schema/smpl.rs
+++ b/veilid-core/src/veilid_api/types/dht/schema/smpl.rs
@@ -16,15 +16,48 @@ pub struct DHTSchemaSMPLMember {
 #[cfg_attr(target_arch = "wasm32", derive(Tsify), tsify(from_wasm_abi))]
 pub struct DHTSchemaSMPL {
     /// Owner subkey count
-    pub o_cnt: u16,
+    o_cnt: u16,
     /// Members
-    pub members: Vec<DHTSchemaSMPLMember>,
+    members: Vec<DHTSchemaSMPLMember>,
 }
 
 impl DHTSchemaSMPL {
     pub const FCC: [u8; 4] = *b"SMPL";
     pub const FIXED_SIZE: usize = 6;
 
+    /// Make a schema
+    pub fn new(o_cnt: u16, members: Vec<DHTSchemaSMPLMember>) -> VeilidAPIResult<Self> {
+        let out = Self { o_cnt, members };
+        out.validate()?;
+        Ok(out)
+    }
+
+    /// Validate the data representation
+    pub fn validate(&self) -> VeilidAPIResult<()> {
+        let keycount = self
+            .members
+            .iter()
+            .fold(self.o_cnt as usize, |acc, x| acc + (x.m_cnt as usize));
+
+        if keycount == 0 {
+            apibail_invalid_argument!("must have at least one subkey", "keycount", keycount);
+        }
+        if keycount > 65535 {
+            apibail_invalid_argument!("too many subkeys", "keycount", keycount);
+        }
+        Ok(())
+    }
+
+    /// Get the owner subkey count
+    pub fn o_cnt(&self) -> u16 {
+        self.o_cnt
+    }
+
+    /// Get the members of the schema
+    pub fn members(&self) -> &[DHTSchemaSMPLMember] {
+        &self.members
+    }
+
     /// Build the data representation of the schema
     pub fn compile(&self) -> Vec<u8> {
         let mut out = Vec::<u8>::with_capacity(
@@ -44,11 +77,13 @@ impl DHTSchemaSMPL {
         out
     }
 
-    /// Get the number of subkeys this schema allocates
-    pub fn subkey_count(&self) -> usize {
-        self.members
+    /// Get the maximum subkey this schema allocates
+    pub fn max_subkey(&self) -> ValueSubkey {
+        let subkey_count = self
+            .members
             .iter()
-            .fold(self.o_cnt as usize, |acc, x| acc + (x.m_cnt as usize))
+            .fold(self.o_cnt as usize, |acc, x| acc + (x.m_cnt as usize));
+        (subkey_count - 1) as ValueSubkey
     }
 
     /// Get the data size of this schema beyond the size of the structure itself
@@ -134,6 +169,6 @@ impl TryFrom<&[u8]> for DHTSchemaSMPL {
             members.push(DHTSchemaSMPLMember { m_key, m_cnt });
         }
 
-        Ok(Self { o_cnt, members })
+        Self::new(o_cnt, members)
     }
 }
diff --git a/veilid-core/src/veilid_api/types/dht/value_subkey_range_set.rs b/veilid-core/src/veilid_api/types/dht/value_subkey_range_set.rs
index c769826a..7f3b3150 100644
--- a/veilid-core/src/veilid_api/types/dht/value_subkey_range_set.rs
+++ b/veilid-core/src/veilid_api/types/dht/value_subkey_range_set.rs
@@ -2,7 +2,14 @@ use super::*;
 use core::ops::{Deref, DerefMut};
 use range_set_blaze::*;
 
-#[derive(Clone, Default, PartialOrd, PartialEq, Eq, Ord, Serialize, Deserialize, JsonSchema)]
+#[derive(
+    Clone, Default, Hash, PartialOrd, PartialEq, Eq, Ord, Serialize, Deserialize, JsonSchema,
+)]
+#[cfg_attr(
+    target_arch = "wasm32",
+    derive(Tsify),
+    tsify(from_wasm_abi, into_wasm_abi)
+)]
 #[serde(transparent)]
 pub struct ValueSubkeyRangeSet {
     #[serde(with = "serialize_range_set_blaze")]
@@ -29,6 +36,11 @@ impl ValueSubkeyRangeSet {
         data.insert(value);
         Self { data }
     }
+    pub fn single_range(low: ValueSubkey, high: ValueSubkey) -> Self {
+        let mut data = RangeSetBlaze::new();
+        data.ranges_insert(low..=high);
+        Self { data }
+    }
 
     pub fn intersect(&self, other: &ValueSubkeyRangeSet) -> ValueSubkeyRangeSet {
         Self::new_with_data(&self.data & &other.data)
@@ -46,8 +58,72 @@ impl ValueSubkeyRangeSet {
     pub fn into_data(self) -> RangeSetBlaze<ValueSubkey> {
         self.data
     }
+
+    pub fn nth_subkey(&self, idx: usize) -> Option<ValueSubkey> {
+        let mut idxleft = idx;
+        for range in self.data.ranges() {
+            let range_len = (*range.end() - *range.start() + 1) as usize;
+            if idxleft < range_len {
+                return Some(*range.start() + idxleft as u32);
+            }
+            idxleft -= range_len;
+        }
+        None
+    }
+
+    pub fn idx_of_subkey(&self, subkey: ValueSubkey) -> Option<usize> {
+        let mut idx = 0usize;
+        for range in self.data.ranges() {
+            if range.contains(&subkey) {
+                idx += (subkey - *range.start()) as usize;
+                return Some(idx);
+            } else {
+                idx += (*range.end() - *range.start() + 1) as usize;
+            }
+        }
+        None
+    }
 }
 
+// impl TryFrom<Box<[Box<[ValueSubkey]>]>> for ValueSubkeyRangeSet {
+//     type Error = VeilidAPIError;
+
+//     fn try_from(value: Box<[Box<[ValueSubkey]>]>) -> Result<Self, Self::Error> {
+//         let mut data = RangeSetBlaze::<ValueSubkey>::new();
+
+//         let mut last = None;
+
+//         for r in value.iter() {
+//             if r.len() != 2 {
+//                 apibail_generic!("not a pair");
+//             }
+//             let start = r[0];
+//             let end = r[1];
+//             if let Some(last) = last {
+//                 if start >= last {
+//                     apibail_generic!("pair out of order");
+//                 }
+//             }
+//             if start > end {
+//                 apibail_generic!("invalid pair");
+//             }
+//             last = Some(end);
+//             data.ranges_insert(start..=end);
+//         }
+
+//         Ok(Self::new_with_data(data))
+//     }
+// }
+
+// impl From<ValueSubkeyRangeSet> for Box<[Box<[ValueSubkey]>]> {
+//     fn from(value: ValueSubkeyRangeSet) -> Self {
+//         value
+//             .ranges()
+//             .map(|r| Box::new([*r.start(), *r.end()]) as Box<[ValueSubkey]>)
+//             .collect()
+//     }
+// }
+
 impl FromStr for ValueSubkeyRangeSet {
     type Err = VeilidAPIError;
 
diff --git a/veilid-core/src/veilid_api/types/safety.rs b/veilid-core/src/veilid_api/types/safety.rs
index 26ef4305..b49bbe7d 100644
--- a/veilid-core/src/veilid_api/types/safety.rs
+++ b/veilid-core/src/veilid_api/types/safety.rs
@@ -4,7 +4,11 @@ use super::*;
 #[derive(
     Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
 )]
-#[cfg_attr(target_arch = "wasm32", derive(Tsify), tsify(from_wasm_abi, namespace))]
+#[cfg_attr(
+    target_arch = "wasm32",
+    derive(Tsify),
+    tsify(from_wasm_abi, into_wasm_abi, namespace)
+)]
 pub enum Sequencing {
     NoPreference = 0,
     PreferOrdered = 1,
@@ -13,6 +17,7 @@ pub enum Sequencing {
 
 impl Default for Sequencing {
     fn default() -> Self {
+        // This is the default for veilid-core, and should not be the default used in any API-level code
         Self::NoPreference
     }
 }
@@ -21,7 +26,11 @@ impl Default for Sequencing {
 #[derive(
     Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
 )]
-#[cfg_attr(target_arch = "wasm32", derive(Tsify), tsify(from_wasm_abi, namespace))]
+#[cfg_attr(
+    target_arch = "wasm32",
+    derive(Tsify),
+    tsify(from_wasm_abi, into_wasm_abi, namespace)
+)]
 pub enum Stability {
     LowLatency = 0,
     Reliable = 1,
@@ -29,6 +38,7 @@ pub enum Stability {
 
 impl Default for Stability {
     fn default() -> Self {
+        // This is the default for veilid-core, and should not be the default used in any API-level code
         Self::LowLatency
     }
 }
diff --git a/veilid-core/src/veilid_config.rs b/veilid-core/src/veilid_config.rs
index 70d4da91..e41c0e45 100644
--- a/veilid-core/src/veilid_config.rs
+++ b/veilid-core/src/veilid_config.rs
@@ -1,6 +1,20 @@
 use crate::*;
-use directories::ProjectDirs;
-use std::path::PathBuf;
+
+cfg_if::cfg_if! {
+    if #[cfg(not(target_arch = "wasm32"))] {
+        use sysinfo::System;
+        use lazy_static::*;
+        use directories::ProjectDirs;
+
+        lazy_static! {
+            static ref SYSTEM:System = {
+                sysinfo::System::new_with_specifics(
+                    sysinfo::RefreshKind::new().with_memory(sysinfo::MemoryRefreshKind::everything()),
+                )
+            };
+        }
+    }
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 pub type ConfigCallbackReturn = VeilidAPIResult<Box<dyn core::any::Any + Send>>;
@@ -103,8 +117,15 @@ pub struct VeilidConfigUDP {
 
 impl Default for VeilidConfigUDP {
     fn default() -> Self {
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "wasm32")] {
+                let enabled = false;
+            } else {
+                let enabled = true;
+            }
+        }
         Self {
-            enabled: true,
+            enabled,
             socket_pool_size: 0,
             listen_address: String::from(""),
             public_address: None,
@@ -135,9 +156,18 @@ pub struct VeilidConfigTCP {
 
 impl Default for VeilidConfigTCP {
     fn default() -> Self {
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "wasm32")] {
+                let connect = false;
+                let listen = false;
+            } else {
+                let connect = true;
+                let listen = true;
+            }
+        }
         Self {
-            connect: true,
-            listen: true,
+            connect,
+            listen,
             max_connections: 32,
             listen_address: String::from(""),
             public_address: None,
@@ -151,7 +181,7 @@ impl Default for VeilidConfigTCP {
 /// ws:
 ///     connect: true
 ///     listen: true
-///     max_connections: 16
+///     max_connections: 32
 ///     listen_address: ':5150'
 ///     path: 'ws'
 ///     url: 'ws://localhost:5150/ws'
@@ -171,10 +201,19 @@ pub struct VeilidConfigWS {
 
 impl Default for VeilidConfigWS {
     fn default() -> Self {
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "wasm32")] {
+                let connect = true;
+                let listen = false;
+            } else {
+                let connect = true;
+                let listen = true;
+            }
+        }
         Self {
-            connect: true,
-            listen: true,
-            max_connections: 16,
+            connect,
+            listen,
+            max_connections: 32,
             listen_address: String::from(""),
             path: String::from("ws"),
             url: None,
@@ -188,7 +227,7 @@ impl Default for VeilidConfigWS {
 /// wss:
 ///     connect: true
 ///     listen: false
-///     max_connections: 16
+///     max_connections: 32
 ///     listen_address: ':5150'
 ///     path: 'ws'
 ///     url: ''
@@ -211,7 +250,7 @@ impl Default for VeilidConfigWSS {
         Self {
             connect: true,
             listen: false,
-            max_connections: 16,
+            max_connections: 32,
             listen_address: String::from(""),
             path: String::from("ws"),
             url: None,
@@ -254,28 +293,37 @@ pub struct VeilidConfigTLS {
 
 impl Default for VeilidConfigTLS {
     fn default() -> Self {
+        let certificate_path = get_default_ssl_directory("certs/server.crt");
+        let private_key_path = get_default_ssl_directory("keys/server.key");
         Self {
-            certificate_path: get_default_ssl_directory("certs/server.crt"),
-            private_key_path: get_default_ssl_directory("keys/server.key"),
+            certificate_path,
+            private_key_path,
             connection_initial_timeout_ms: 2000,
         }
     }
 }
 
+#[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
 pub fn get_default_ssl_directory(sub_path: &str) -> String {
-    #[cfg(unix)]
-    {
-        let default_path = PathBuf::from("/etc/veilid-server/ssl").join(sub_path);
-        if default_path.exists() {
-            return default_path.to_string_lossy().into();
+    cfg_if::cfg_if! {
+        if #[cfg(target_arch = "wasm32")] {
+            "".to_owned()
+        } else {
+            use std::path::PathBuf;
+            #[cfg(unix)]
+            {
+                let default_path = PathBuf::from("/etc/veilid-server/ssl").join(sub_path);
+                if default_path.exists() {
+                    return default_path.to_string_lossy().into();
+                }
+            }
+            ProjectDirs::from("org", "Veilid", "Veilid")
+                .map(|dirs| dirs.data_local_dir().join("ssl").join(sub_path))
+                .unwrap_or_else(|| PathBuf::from("./ssl").join(sub_path))
+                .to_string_lossy()
+                .into()
         }
     }
-
-    ProjectDirs::from("org", "Veilid", "Veilid")
-        .map(|dirs| dirs.data_local_dir().join("ssl").join(sub_path))
-        .unwrap_or_else(|| PathBuf::from("./ssl").join(sub_path))
-        .to_string_lossy()
-        .into()
 }
 
 /// Configure the Distributed Hash Table (DHT)
@@ -309,8 +357,33 @@ pub struct VeilidConfigDHT {
 
 impl Default for VeilidConfigDHT {
     fn default() -> Self {
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "wasm32")] {
+                let local_subkey_cache_size = 128;
+                let local_max_subkey_cache_memory_mb = 256;
+                let remote_subkey_cache_size = 64;
+                let remote_max_records = 64;
+                let remote_max_subkey_cache_memory_mb = 256;
+                let remote_max_storage_space_mb = 128;
+            } else {
+                let local_subkey_cache_size = 1024;
+                let local_max_subkey_cache_memory_mb = if sysinfo::IS_SUPPORTED_SYSTEM {
+                    (SYSTEM.total_memory() / 32u64 / (1024u64 * 1024u64)) as u32
+                } else {
+                    256
+                };
+                let remote_subkey_cache_size = 128;
+                let remote_max_records = 128;
+                let remote_max_subkey_cache_memory_mb = if sysinfo::IS_SUPPORTED_SYSTEM {
+                    (SYSTEM.total_memory() / 32u64 / (1024u64 * 1024u64)) as u32
+                } else {
+                    256
+                };
+                let remote_max_storage_space_mb = 256;
+            }
+        }
+
         Self {
-            // Assuming some reasonable defaults
             max_find_node_count: 20,
             resolve_node_timeout_ms: 10000,
             resolve_node_count: 1,
@@ -324,12 +397,12 @@ impl Default for VeilidConfigDHT {
             min_peer_count: 20,
             min_peer_refresh_time_ms: 60000,
             validate_dial_info_receipt_time_ms: 2000,
-            local_subkey_cache_size: 1024,
-            local_max_subkey_cache_memory_mb: 256,
-            remote_subkey_cache_size: 128,
-            remote_max_records: 128,
-            remote_max_subkey_cache_memory_mb: 256,
-            remote_max_storage_space_mb: 256,
+            local_subkey_cache_size,
+            local_max_subkey_cache_memory_mb,
+            remote_subkey_cache_size,
+            remote_max_records,
+            remote_max_subkey_cache_memory_mb,
+            remote_max_storage_space_mb,
             public_watch_limit: 32,
             member_watch_limit: 8,
             max_watch_expiration_ms: 600000,
@@ -388,10 +461,18 @@ pub struct VeilidConfigRoutingTable {
 
 impl Default for VeilidConfigRoutingTable {
     fn default() -> Self {
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "wasm32")] {
+                let bootstrap = vec!["ws://bootstrap.veilid.net:5150/ws".to_string()];
+            } else {
+                let bootstrap = vec!["bootstrap.veilid.net".to_string()];
+            }
+        }
+
         Self {
             node_id: TypedKeyGroup::default(),
             node_id_secret: TypedSecretGroup::default(),
-            bootstrap: vec!["bootstrap.veilid.net".to_string()],
+            bootstrap,
             limit_over_attached: 64,
             limit_fully_attached: 32,
             limit_attached_strong: 16,
@@ -468,21 +549,28 @@ impl Default for VeilidConfigTableStore {
     }
 }
 
+#[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
 fn get_default_store_path(store_type: &str) -> String {
-    #[cfg(unix)]
-    {
-        let globalpath = PathBuf::from(format!("/var/db/veilid-server/{}", store_type));
-        if globalpath.exists() {
-            return globalpath.to_string_lossy().into();
+    cfg_if::cfg_if! {
+        if #[cfg(target_arch = "wasm32")] {
+            "".to_owned()
+        } else {
+            use std::path::PathBuf;
+            #[cfg(unix)]
+            {
+                let globalpath = PathBuf::from(format!("/var/db/veilid-server/{}", store_type));
+                if globalpath.exists() {
+                    return globalpath.to_string_lossy().into();
+                }
+            }
+            ProjectDirs::from("org", "Veilid", "Veilid")
+                .map(|dirs| dirs.data_local_dir().to_path_buf())
+                .unwrap_or_else(|| PathBuf::from("./"))
+                .join(store_type)
+                .to_string_lossy()
+                .into()
         }
     }
-
-    ProjectDirs::from("org", "Veilid", "Veilid")
-        .map(|dirs| dirs.data_local_dir().to_path_buf())
-        .unwrap_or_else(|| PathBuf::from("./"))
-        .join(store_type)
-        .to_string_lossy()
-        .into()
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
@@ -520,7 +608,7 @@ impl Default for VeilidConfigProtectedStore {
             always_use_insecure_storage: false,
             directory: get_default_store_path("protected_store"),
             delete: false,
-            device_encryption_key_password: String::from(""),
+            device_encryption_key_password: "".to_owned(),
             new_device_encryption_key_password: None,
         }
     }
@@ -1079,29 +1167,29 @@ impl VeilidConfig {
         let table_key_node_id_secret = format!("node_id_secret_{}", ck);
 
         if node_id.is_none() {
-            debug!("pulling {} from storage", table_key_node_id);
+            log_tstore!(debug "pulling {} from storage", table_key_node_id);
             if let Ok(Some(stored_node_id)) = config_table
                 .load_json::<TypedKey>(0, table_key_node_id.as_bytes())
                 .await
             {
-                debug!("{} found in storage", table_key_node_id);
+                log_tstore!(debug "{} found in storage", table_key_node_id);
                 node_id = Some(stored_node_id);
             } else {
-                debug!("{} not found in storage", table_key_node_id);
+                log_tstore!(debug "{} not found in storage", table_key_node_id);
             }
         }
 
         // See if node id secret was previously stored in the protected store
         if node_id_secret.is_none() {
-            debug!("pulling {} from storage", table_key_node_id_secret);
+            log_tstore!(debug "pulling {} from storage", table_key_node_id_secret);
             if let Ok(Some(stored_node_id_secret)) = config_table
                 .load_json::<TypedSecret>(0, table_key_node_id_secret.as_bytes())
                 .await
             {
-                debug!("{} found in storage", table_key_node_id_secret);
+                log_tstore!(debug "{} found in storage", table_key_node_id_secret);
                 node_id_secret = Some(stored_node_id_secret);
             } else {
-                debug!("{} not found in storage", table_key_node_id_secret);
+                log_tstore!(debug "{} not found in storage", table_key_node_id_secret);
             }
         }
 
@@ -1118,7 +1206,7 @@ impl VeilidConfig {
                 (node_id, node_id_secret)
             } else {
                 // If we still don't have a valid node id, generate one
-                debug!("generating new node_id_{}", ck);
+                log_tstore!(debug "generating new node_id_{}", ck);
                 let kp = vcrypto.generate_keypair();
                 (TypedKey::new(ck, kp.key), TypedSecret::new(ck, kp.secret))
             };
@@ -1171,8 +1259,6 @@ impl VeilidConfig {
             Ok(())
         })?;
 
-        trace!("init_node_ids complete");
-
         Ok(())
     }
 }
diff --git a/veilid-flutter/debug_integration_tests.sh b/veilid-flutter/debug_integration_tests.sh
new file mode 100755
index 00000000..c689e648
--- /dev/null
+++ b/veilid-flutter/debug_integration_tests.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+pushd example 2>/dev/null
+flutter run integration_test/app_test.dart $@
+popd 2>/dev/null
diff --git a/veilid-flutter/example/integration_test/app_test.dart b/veilid-flutter/example/integration_test/app_test.dart
new file mode 100644
index 00000000..3ac5baf9
--- /dev/null
+++ b/veilid-flutter/example/integration_test/app_test.dart
@@ -0,0 +1,77 @@
+@Timeout(Duration(seconds: 60))
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+import 'fixtures.dart';
+import 'test_crypto.dart';
+import 'test_routing_context.dart';
+import 'test_table_db.dart';
+import 'test_veilid_config.dart';
+import 'test_dht.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  final fixture = DefaultFixture();
+
+  group('Unstarted Tests', () {
+    test('veilid config defaults', testVeilidConfigDefaults);
+  });
+
+  group('Started Tests', () {
+    setUpAll(fixture.setUp);
+    tearDownAll(fixture.tearDown);
+
+    group('Crypto Tests', () {
+      test('best cryptosystem', testBestCryptoSystem);
+      test('get cryptosystem', testGetCryptoSystem);
+      test('get cryptosystem invalid', testGetCryptoSystemInvalid);
+      test('hash and verify password', testHashAndVerifyPassword);
+    });
+
+    group('Table DB Tests', () {
+      test('delete table db nonexistent', testDeleteTableDbNonExistent);
+      test('open delete table db', testOpenDeleteTableDb);
+      test('open twice table db', testOpenTwiceTableDb);
+      test('open twice table db store load', testOpenTwiceTableDbStoreLoad);
+      test('open twice table db store delete load',
+          testOpenTwiceTableDbStoreDeleteLoad);
+      test('resize table db', testResizeTableDb);
+    });
+
+    group('Attached Tests', () {
+      setUpAll(fixture.attach);
+      tearDownAll(fixture.detach);
+
+      group('Routing Contexts', () {
+        test('routing contexts', testRoutingContexts);
+        test('app message loopback',
+            () => testAppMessageLoopback(fixture.updateStream));
+        test('app call loopback',
+            () => testAppCallLoopback(fixture.updateStream));
+        test('app message loopback big packets',
+            () => testAppMessageLoopbackBigPackets(fixture.updateStream));
+        test('app call loopback big packets',
+            () => testAppCallLoopbackBigPackets(fixture.updateStream));
+      });
+
+      group('Veilid DHT', () {
+        test('get dht value unopened', testGetDHTValueUnopened);
+        test('open dht record nonexistent no writer',
+            testOpenDHTRecordNonexistentNoWriter);
+        test('close dht record nonexistent', testCloseDHTRecordNonexistent);
+        test('delete dht record nonexistent', testDeleteDHTRecordNonexistent);
+        test(
+            'create delete dht record simple', testCreateDeleteDHTRecordSimple);
+        test('create delete dht record no close',
+            testCreateDeleteDHTRecordNoClose);
+        test('get dht value nonexistent', testGetDHTValueNonexistent);
+        test('set get dht value', testSetGetDHTValue);
+        test('open writer dht value', testOpenWriterDHTValue);
+        test(
+            'watch dht values', () => testWatchDHTValues(fixture.updateStream));
+        test('inspect dht record', testInspectDHTRecord);
+      });
+    });
+  });
+}
diff --git a/veilid-flutter/example/integration_test/fixtures.dart b/veilid-flutter/example/integration_test/fixtures.dart
new file mode 100644
index 00000000..703e9a00
--- /dev/null
+++ b/veilid-flutter/example/integration_test/fixtures.dart
@@ -0,0 +1,139 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:mutex/mutex.dart';
+import 'package:veilid/veilid.dart';
+
+class DefaultFixture {
+  DefaultFixture();
+
+  StreamSubscription<VeilidUpdate>? _veilidUpdateSubscription;
+  Stream<VeilidUpdate>? _veilidUpdateStream;
+  final StreamController<VeilidUpdate> _updateStreamController =
+      StreamController.broadcast();
+
+  static final _fixtureMutex = Mutex();
+
+  Future<void> setUp() async {
+    await _fixtureMutex.acquire();
+
+    assert(_veilidUpdateStream == null, 'should not set up fixture twice');
+
+    final Map<String, dynamic> platformConfigJson;
+    if (kIsWeb) {
+      const platformConfig = VeilidWASMConfig(
+          logging: VeilidWASMConfigLogging(
+              performance: VeilidWASMConfigLoggingPerformance(
+                enabled: true,
+                level: VeilidConfigLogLevel.debug,
+                logsInTimings: true,
+                logsInConsole: false,
+              ),
+              api: VeilidWASMConfigLoggingApi(
+                enabled: true,
+                level: VeilidConfigLogLevel.info,
+              )));
+      platformConfigJson = platformConfig.toJson();
+    } else {
+      const platformConfig = VeilidFFIConfig(
+          logging: VeilidFFIConfigLogging(
+              terminal: VeilidFFIConfigLoggingTerminal(
+                enabled: false,
+                level: VeilidConfigLogLevel.debug,
+              ),
+              otlp: VeilidFFIConfigLoggingOtlp(
+                enabled: false,
+                level: VeilidConfigLogLevel.trace,
+                grpcEndpoint: 'localhost:4317',
+                serviceName: 'Veilid Tests',
+              ),
+              api: VeilidFFIConfigLoggingApi(
+                enabled: true,
+                level: VeilidConfigLogLevel.info,
+              )));
+      platformConfigJson = platformConfig.toJson();
+    }
+    Veilid.instance.initializeVeilidCore(platformConfigJson);
+
+    var config = await getDefaultVeilidConfig(
+      isWeb: kIsWeb,
+      programName: 'Veilid Tests',
+      // ignore: avoid_redundant_argument_values, do_not_use_environment
+      bootstrap: const String.fromEnvironment('BOOTSTRAP'),
+      // ignore: avoid_redundant_argument_values, do_not_use_environment
+      networkKeyPassword: const String.fromEnvironment('NETWORK_KEY'),
+    );
+
+    config =
+        config.copyWith(tableStore: config.tableStore.copyWith(delete: true));
+    config = config.copyWith(
+        protectedStore: config.protectedStore.copyWith(delete: true));
+    config =
+        config.copyWith(blockStore: config.blockStore.copyWith(delete: true));
+
+    final us =
+        _veilidUpdateStream = await Veilid.instance.startupVeilidCore(config);
+
+    _veilidUpdateSubscription = us.listen((update) {
+      if (update is VeilidLog) {
+        // print(update.message);
+      } else if (update is VeilidUpdateAttachment) {
+      } else if (update is VeilidUpdateConfig) {
+      } else if (update is VeilidUpdateNetwork) {
+      } else if (update is VeilidAppMessage) {
+      } else if (update is VeilidAppCall) {
+      } else if (update is VeilidUpdateValueChange) {
+      } else if (update is VeilidUpdateRouteChange) {
+      } else {
+        throw Exception('unexpected update: $update');
+      }
+      _updateStreamController.sink.add(update);
+    });
+  }
+
+  Stream<VeilidUpdate> get updateStream => _updateStreamController.stream;
+
+  Future<void> attach() async {
+    await Veilid.instance.attach();
+
+    // Wait for attached state
+    while (true) {
+      final state = await Veilid.instance.getVeilidState();
+      var done = false;
+      if (state.attachment.publicInternetReady) {
+        switch (state.attachment.state) {
+          case AttachmentState.detached:
+            break;
+          case AttachmentState.attaching:
+            break;
+          case AttachmentState.detaching:
+            break;
+          default:
+            done = true;
+            break;
+        }
+      }
+      if (done) {
+        break;
+      }
+      await Future.delayed(const Duration(seconds: 1));
+    }
+  }
+
+  Future<void> detach() async {
+    await Veilid.instance.detach();
+  }
+
+  Future<void> tearDown() async {
+    assert(_veilidUpdateStream != null, 'should not tearDown without setUp');
+
+    final cancelFut = _veilidUpdateSubscription?.cancel();
+    await Veilid.instance.shutdownVeilidCore();
+    await cancelFut;
+
+    _veilidUpdateSubscription = null;
+    _veilidUpdateStream = null;
+
+    _fixtureMutex.release();
+  }
+}
diff --git a/veilid-flutter/example/integration_test/test_crypto.dart b/veilid-flutter/example/integration_test/test_crypto.dart
new file mode 100644
index 00000000..91e4f7e6
--- /dev/null
+++ b/veilid-flutter/example/integration_test/test_crypto.dart
@@ -0,0 +1,59 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/veilid.dart';
+
+Future<void> testBestCryptoSystem() async {
+  final cs = await Veilid.instance.bestCryptoSystem();
+  expect(await cs.defaultSaltLength(), equals(16));
+}
+
+Future<void> testGetCryptoSystem() async {
+  final cs = await Veilid.instance.getCryptoSystem(cryptoKindVLD0);
+  expect(await cs.defaultSaltLength(), equals(16));
+}
+
+Future<void> testGetCryptoSystemInvalid() async {
+  await expectLater(
+      () async => await Veilid.instance.getCryptoSystem(cryptoKindNONE),
+      throwsA(isA<VeilidAPIException>()));
+}
+
+Future<void> testHashAndVerifyPassword() async {
+  final cs = await Veilid.instance.bestCryptoSystem();
+  final nonce = await cs.randomNonce();
+  final salt = nonce.decode();
+
+  // Password match
+  final phash = await cs.hashPassword(utf8.encode("abc123"), salt);
+  expect(await cs.verifyPassword(utf8.encode("abc123"), phash), isTrue);
+
+  // Password mismatch
+  await cs.hashPassword(utf8.encode("abc1234"), salt);
+  expect(await cs.verifyPassword(utf8.encode("abc1235"), phash), isFalse);
+}
+
+Future<void> testGenerateSharedSecret() async {
+  final cs = await Veilid.instance.bestCryptoSystem();
+
+  final kp1 = await cs.generateKeyPair();
+  final kp2 = await cs.generateKeyPair();
+  final kp3 = await cs.generateKeyPair();
+
+  final ssA =
+      await cs.generateSharedSecret(kp1.key, kp2.secret, utf8.encode("abc123"));
+  final ssB =
+      await cs.generateSharedSecret(kp2.key, kp1.secret, utf8.encode("abc123"));
+
+  expect(ssA, equals(ssB));
+
+  final ssC = await cs.generateSharedSecret(
+      kp2.key, kp1.secret, utf8.encode("abc1234"));
+
+  expect(ssA, isNot(equals(ssC)));
+
+  final ssD =
+      await cs.generateSharedSecret(kp3.key, kp1.secret, utf8.encode("abc123"));
+
+  expect(ssA, isNot(equals(ssD)));
+}
diff --git a/veilid-flutter/example/integration_test/test_dht.dart b/veilid-flutter/example/integration_test/test_dht.dart
new file mode 100644
index 00000000..795ff83a
--- /dev/null
+++ b/veilid-flutter/example/integration_test/test_dht.dart
@@ -0,0 +1,375 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/veilid.dart';
+
+final bogusKey =
+    TypedKey.fromString("VLD0:qD10lHHPD1_Qr23_Qy-1JnxTht12eaWwENVG_m2v7II");
+
+Future<void> testGetDHTValueUnopened() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    await expectLater(
+        () async => await rc.getDHTValue(bogusKey, 0, forceRefresh: false),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testOpenDHTRecordNonexistentNoWriter() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    await expectLater(() async => await rc.openDHTRecord(bogusKey),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testCloseDHTRecordNonexistent() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    await expectLater(() async => await rc.closeDHTRecord(bogusKey),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testDeleteDHTRecordNonexistent() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    await expectLater(() async => await rc.deleteDHTRecord(bogusKey),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testCreateDeleteDHTRecordSimple() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    final rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 1));
+    await rc.closeDHTRecord(rec.key);
+    await rc.deleteDHTRecord(rec.key);
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testCreateDeleteDHTRecordNoClose() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    final rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 1));
+    await rc.deleteDHTRecord(rec.key);
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testGetDHTValueNonexistent() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    final rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 1));
+    expect(await rc.getDHTValue(rec.key, 0), isNull);
+    await rc.deleteDHTRecord(rec.key);
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testSetGetDHTValue() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    final rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 2));
+    expect(await rc.setDHTValue(rec.key, 0, utf8.encode("BLAH BLAH BLAH")),
+        isNull);
+    final vd2 = await rc.getDHTValue(rec.key, 0);
+    expect(vd2, isNotNull);
+
+    final vd3 = await rc.getDHTValue(rec.key, 0, forceRefresh: true);
+    expect(vd3, isNotNull);
+
+    final vd4 = await rc.getDHTValue(rec.key, 1);
+    expect(vd4, isNull);
+
+    expect(vd2, equals(vd3));
+
+    await rc.deleteDHTRecord(rec.key);
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testOpenWriterDHTValue() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    var rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 2));
+    final key = rec.key;
+    final owner = rec.owner;
+    final secret = rec.ownerSecret!;
+
+    final cs = await Veilid.instance.getCryptoSystem(rec.key.kind);
+    expect(await cs.validateKeyPair(owner, secret), isTrue);
+    final otherKeyPair = await cs.generateKeyPair();
+
+    final va = utf8.encode("Qwertyuiop Asdfghjkl Zxcvbnm");
+    final vb = utf8.encode("1234567890");
+    final vc = utf8.encode("!@#\$%^&*()");
+
+    // Test subkey writes
+    expect(await rc.setDHTValue(key, 1, va), isNull);
+
+    var vdtemp = await rc.getDHTValue(key, 1);
+    expect(vdtemp, isNotNull);
+    expect(vdtemp!.data, equals(va));
+    expect(vdtemp.seq, equals(0));
+    expect(vdtemp.writer, equals(owner));
+
+    expect(await rc.getDHTValue(key, 0), isNull);
+
+    expect(await rc.setDHTValue(key, 0, vb), isNull);
+
+    expect(
+        await rc.getDHTValue(key, 0, forceRefresh: true),
+        equals(ValueData(
+          data: vb,
+          seq: 0,
+          writer: owner,
+        )));
+
+    expect(
+        await rc.getDHTValue(key, 1, forceRefresh: true),
+        equals(ValueData(
+          data: va,
+          seq: 0,
+          writer: owner,
+        )));
+
+    // Equal value should not trigger sequence number update
+    expect(await rc.setDHTValue(key, 1, va), isNull);
+
+    // Different value should trigger sequence number update
+    expect(await rc.setDHTValue(key, 1, vb), isNull);
+
+    // Now that we initialized some subkeys
+    // and verified they stored correctly
+    // Delete things locally and reopen and see if we can write
+    // with the same writer key
+    //
+
+    await rc.closeDHTRecord(key);
+    await rc.deleteDHTRecord(key);
+
+    rec = await rc.openDHTRecord(key,
+        writer: KeyPair(key: owner, secret: secret));
+    expect(rec, isNotNull);
+    expect(rec.key, equals(key));
+    expect(rec.owner, equals(owner));
+    expect(rec.ownerSecret, equals(secret));
+    expect(rec.schema, isA<DHTSchemaDFLT>());
+    expect(rec.schema.oCnt, equals(2));
+
+    // Verify subkey 1 can be set before it is get but newer is available online
+    vdtemp = await rc.setDHTValue(key, 1, vc);
+    expect(vdtemp, isNotNull);
+    expect(vdtemp!.data, equals(vb));
+    expect(vdtemp.seq, equals(1));
+    expect(vdtemp.writer, equals(owner));
+
+    // Verify subkey 1 can be set a second time and it updates because seq is newer
+    expect(await rc.setDHTValue(key, 1, vc), isNull);
+
+    // Verify the network got the subkey update with a refresh check
+    vdtemp = await rc.getDHTValue(key, 1, forceRefresh: true);
+    expect(vdtemp, isNotNull);
+    expect(vdtemp!.data, equals(vc));
+    expect(vdtemp.seq, equals(2));
+    expect(vdtemp.writer, equals(owner));
+
+    // Delete things locally and reopen and see if we can write
+    // with a different writer key (should fail)
+    await rc.closeDHTRecord(key);
+    await rc.deleteDHTRecord(key);
+
+    rec = await rc.openDHTRecord(key, writer: otherKeyPair);
+    expect(rec, isNotNull);
+    expect(rec.key, equals(key));
+    expect(rec.owner, equals(owner));
+    expect(rec.ownerSecret, isNull);
+    expect(rec.schema, isA<DHTSchemaDFLT>());
+    expect(rec.schema.oCnt, equals(2));
+
+    // Verify subkey 1 can NOT be set because we have the wrong writer
+    await expectLater(() async => await rc.setDHTValue(key, 1, va),
+        throwsA(isA<VeilidAPIException>()));
+
+    // Verify subkey 0 can NOT be set because we have the wrong writer
+    await expectLater(() async => await rc.setDHTValue(key, 0, va),
+        throwsA(isA<VeilidAPIException>()));
+
+    // Verify subkey 0 can be set because override with the right writer
+    expect(
+        await rc.setDHTValue(key, 0, va,
+            writer: KeyPair(key: owner, secret: secret)),
+        isNull);
+
+    // Clean up
+    await rc.closeDHTRecord(key);
+    await rc.deleteDHTRecord(key);
+  } finally {
+    rc.close();
+  }
+}
+
+Future<void> testWatchDHTValues(Stream<VeilidUpdate> updateStream) async {
+  final valueChangeQueue = StreamController<VeilidUpdateValueChange>();
+  final valueChangeSubscription = updateStream.listen((update) {
+    if (update is VeilidUpdateValueChange) {
+      // print("valuechange: " + update.toString());
+      valueChangeQueue.sink.add(update);
+    }
+  });
+  final valueChangeQueueIterator = StreamIterator(valueChangeQueue.stream);
+
+  try {
+    // Make two routing contexts, one with and one without safety
+    // So we can pretend to be a different node and get the watch updates
+    // Normally they would not get sent if the set comes from the same target
+    // as the watch's target
+
+    final rcWatch = await Veilid.instance.routingContext();
+    final rcSet = await Veilid.instance
+        .unsafeRoutingContext(sequencing: Sequencing.ensureOrdered);
+    try {
+      // Make a DHT record
+      var rec = await rcWatch.createDHTRecord(const DHTSchema.dflt(oCnt: 10));
+
+      // Set some subkey we care about
+      expect(
+          await rcWatch.setDHTValue(rec.key, 3, utf8.encode("BLAH BLAH BLAH")),
+          isNull);
+
+      // Make a watch on that subkey
+      expect(await rcWatch.watchDHTValues(rec.key),
+          isNot(equals(Timestamp.zero())));
+
+      // Reopen without closing to change routing context and not lose watch
+      rec = await rcSet.openDHTRecord(rec.key, writer: rec.ownerKeyPair());
+
+      // Now set the subkey and trigger an update
+      expect(await rcSet.setDHTValue(rec.key, 3, utf8.encode("BLAH")), isNull);
+
+      // Wait for the update
+      await valueChangeQueueIterator
+          .moveNext()
+          .timeout(const Duration(seconds: 5), onTimeout: () {
+        fail("should have a change");
+      });
+
+      // Verify the update
+      expect(valueChangeQueueIterator.current.key, equals(rec.key));
+      expect(valueChangeQueueIterator.current.count, equals(0xFFFFFFFE));
+      expect(valueChangeQueueIterator.current.subkeys,
+          equals([ValueSubkeyRange.single(3)]));
+      expect(valueChangeQueueIterator.current.value.seq, equals(1));
+      expect(valueChangeQueueIterator.current.value.data,
+          equals(utf8.encode("BLAH")));
+      expect(valueChangeQueueIterator.current.value.writer, equals(rec.owner));
+
+      // Reopen without closing to change routing context and not lose watch
+      rec = await rcWatch.openDHTRecord(rec.key, writer: rec.ownerKeyPair());
+
+      // Cancel some subkeys we don't care about
+      expect(
+          await rcWatch
+              .cancelDHTWatch(rec.key, subkeys: [ValueSubkeyRange.make(0, 2)]),
+          isTrue);
+
+      // Reopen without closing to change routing context and not lose watch
+      rec = await rcSet.openDHTRecord(rec.key, writer: rec.ownerKeyPair());
+
+      // Change our subkey
+      expect(await rcSet.setDHTValue(rec.key, 3, utf8.encode("BLAH BLAH BLAH")),
+          isNull);
+
+      // Wait for the update
+      await valueChangeQueueIterator
+          .moveNext()
+          .timeout(const Duration(seconds: 5), onTimeout: () {
+        fail("should have a change");
+      });
+
+      // Verify the update
+      expect(valueChangeQueueIterator.current.key, equals(rec.key));
+      expect(valueChangeQueueIterator.current.count, equals(0xFFFFFFFD));
+      expect(valueChangeQueueIterator.current.subkeys,
+          equals([ValueSubkeyRange.single(3)]));
+      expect(valueChangeQueueIterator.current.value.seq, equals(2));
+      expect(valueChangeQueueIterator.current.value.data,
+          equals(utf8.encode("BLAH BLAH BLAH")));
+      expect(valueChangeQueueIterator.current.value.writer, equals(rec.owner));
+
+      // Reopen without closing to change routing context and not lose watch
+      rec = await rcWatch.openDHTRecord(rec.key, writer: rec.ownerKeyPair());
+
+      // Now cancel the update
+      expect(
+          await rcWatch
+              .cancelDHTWatch(rec.key, subkeys: [ValueSubkeyRange.make(3, 9)]),
+          isFalse);
+
+      // Reopen without closing to change routing context and not lose watch
+      rec = await rcSet.openDHTRecord(rec.key, writer: rec.ownerKeyPair());
+
+      // Set the value without a watch
+      expect(await rcSet.setDHTValue(rec.key, 3, utf8.encode("BLAH")), isNull);
+
+      // Now we should NOT get an update
+      if (await valueChangeQueueIterator
+          .moveNext()
+          .timeout(const Duration(seconds: 5), onTimeout: () {
+        return false;
+      })) {
+        fail("should not have a change");
+      }
+
+      // Clean up
+      await rcSet.closeDHTRecord(rec.key);
+      await rcSet.deleteDHTRecord(rec.key);
+    } finally {
+      rcWatch.close();
+      rcSet.close();
+    }
+  } finally {
+    await valueChangeSubscription.cancel();
+  }
+}
+
+Future<void> testInspectDHTRecord() async {
+  final rc = await Veilid.instance.routingContext();
+  try {
+    var rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 2));
+
+    expect(await rc.setDHTValue(rec.key, 0, utf8.encode("BLAH BLAH BLAH")),
+        isNull);
+
+    final rr = await rc.inspectDHTRecord(rec.key);
+    expect(rr.subkeys, equals([ValueSubkeyRange.make(0, 1)]));
+    expect(rr.localSeqs, equals([0, 0xFFFFFFFF]));
+    expect(rr.networkSeqs, equals([]));
+
+    final rr2 =
+        await rc.inspectDHTRecord(rec.key, scope: DHTReportScope.syncGet);
+    expect(rr2.subkeys, equals([ValueSubkeyRange.make(0, 1)]));
+    expect(rr2.localSeqs, equals([0, 0xFFFFFFFF]));
+    expect(rr2.networkSeqs, equals([0, 0xFFFFFFFF]));
+
+    await rc.closeDHTRecord(rec.key);
+    await rc.deleteDHTRecord(rec.key);
+  } finally {
+    rc.close();
+  }
+}
diff --git a/veilid-flutter/example/integration_test/test_routing_context.dart b/veilid-flutter/example/integration_test/test_routing_context.dart
new file mode 100644
index 00000000..f794350f
--- /dev/null
+++ b/veilid-flutter/example/integration_test/test_routing_context.dart
@@ -0,0 +1,261 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:math';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/veilid.dart';
+
+Future<void> testRoutingContexts() async {
+  {
+    final rc = await Veilid.instance.routingContext();
+    rc.close();
+  }
+
+  {
+    final rc = await Veilid.instance.routingContext();
+    final rcp = rc.withDefaultSafety();
+    rcp.close();
+    rc.close();
+  }
+
+  {
+    final rc = await Veilid.instance.routingContext();
+    final rcp = rc.withSequencing(Sequencing.ensureOrdered);
+    rcp.close();
+    rc.close();
+  }
+
+  {
+    final rc = await Veilid.instance.routingContext();
+    final rcp = rc.withSafety(const SafetySelectionSafe(
+        safetySpec: SafetySpec(
+            hopCount: 2,
+            stability: Stability.lowLatency,
+            sequencing: Sequencing.noPreference)));
+    rcp.close();
+    rc.close();
+  }
+  {
+    final rc = await Veilid.instance.routingContext();
+    final rcp = rc.withSafety(
+        const SafetySelectionUnsafe(sequencing: Sequencing.preferOrdered));
+    rcp.close();
+    rc.close();
+  }
+}
+
+Future<void> testAppMessageLoopback(Stream<VeilidUpdate> updateStream) async {
+  final appMessageQueue = StreamController<VeilidAppMessage>();
+  final appMessageSubscription = updateStream.listen((update) {
+    if (update is VeilidAppMessage) {
+      appMessageQueue.sink.add(update);
+    }
+  });
+  try {
+    await Veilid.instance.debug("purge routes");
+
+    // make a routing context that uses a safety route
+    final rc = await Veilid.instance.routingContext();
+    try {
+      // make a new local private route
+      final prl = await Veilid.instance.newPrivateRoute();
+      try {
+        // import it as a remote route as well so we can send to it
+        final prr = await Veilid.instance.importRemotePrivateRoute(prl.blob);
+        try {
+          // send an app message to our own private route
+          final message = utf8.encode("abcd1234");
+          await rc.appMessage(prr, message);
+
+          // we should get the same message back
+          final update = await appMessageQueue.stream.first;
+          expect(update.message, equals(message));
+          expect(update.routeId, isNotNull);
+        } finally {
+          await Veilid.instance.releasePrivateRoute(prr);
+        }
+      } finally {
+        await Veilid.instance.releasePrivateRoute(prl.routeId);
+      }
+    } finally {
+      rc.close();
+    }
+  } finally {
+    await appMessageSubscription.cancel();
+  }
+}
+
+Future<void> testAppCallLoopback(Stream<VeilidUpdate> updateStream) async {
+  final appCallQueue = StreamController<VeilidAppCall>();
+  final appMessageSubscription = updateStream.listen((update) {
+    if (update is VeilidAppCall) {
+      appCallQueue.sink.add(update);
+    }
+  });
+  try {
+    await Veilid.instance.debug("purge routes");
+
+    // make a routing context that uses a safety route
+    final rc = await Veilid.instance.routingContext();
+    try {
+      // make a new local private route
+      final prl = await Veilid.instance.newPrivateRoute();
+      try {
+        // import it as a remote route as well so we can send to it
+        final prr = await Veilid.instance.importRemotePrivateRoute(prl.blob);
+        try {
+          // send an app call to our own private route
+          final message = utf8.encode("abcd1234");
+          final appCallFuture = rc.appCall(prr, message);
+
+          // we should get the same call back
+          final update = await appCallQueue.stream.first;
+          final appcallid = update.callId;
+
+          expect(update.message, equals(message));
+          expect(update.routeId, isNotNull);
+
+          // now we reply to the request
+          final reply = utf8.encode("qwer5678");
+          await Veilid.instance.appCallReply(appcallid, reply);
+
+          // now we should get the reply from the call
+          final result = await appCallFuture;
+          expect(result, equals(reply));
+        } finally {
+          await Veilid.instance.releasePrivateRoute(prr);
+        }
+      } finally {
+        await Veilid.instance.releasePrivateRoute(prl.routeId);
+      }
+    } finally {
+      rc.close();
+    }
+  } finally {
+    await appMessageSubscription.cancel();
+  }
+}
+
+Future<void> testAppMessageLoopbackBigPackets(
+    Stream<VeilidUpdate> updateStream) async {
+  final appMessageQueue = StreamController<VeilidAppMessage>();
+  final appMessageSubscription = updateStream.listen((update) {
+    if (update is VeilidAppMessage) {
+      appMessageQueue.sink.add(update);
+    }
+  });
+
+  final sentMessages = <String>{};
+  final random = Random.secure();
+  final cs = await Veilid.instance.bestCryptoSystem();
+
+  try {
+    await Veilid.instance.debug("purge routes");
+
+    // make a routing context that uses a safety route
+    final rc = await Veilid.instance.routingContext();
+    try {
+      // make a new local private route
+      final prl = await Veilid.instance.newPrivateRoute();
+      try {
+        // import it as a remote route as well so we can send to it
+        final prr = await Veilid.instance.importRemotePrivateRoute(prl.blob);
+        try {
+          for (var i = 0; i < 5; i++) {
+            // send an app message to our own private route
+            final message = await cs.randomBytes(random.nextInt(32768));
+            await rc.appMessage(prr, message);
+            sentMessages.add(base64Url.encode(message));
+          }
+
+          final appMessageQueueIterator =
+              StreamIterator(appMessageQueue.stream);
+
+          // we should get the same messages back
+          for (var i = 0; i < sentMessages.length; i++) {
+            if (await appMessageQueueIterator.moveNext()) {
+              final update = appMessageQueueIterator.current;
+              expect(sentMessages.contains(base64Url.encode(update.message)),
+                  isTrue);
+            } else {
+              fail("not enough messages in the queue");
+            }
+          }
+        } finally {
+          await Veilid.instance.releasePrivateRoute(prr);
+        }
+      } finally {
+        await Veilid.instance.releasePrivateRoute(prl.routeId);
+      }
+    } finally {
+      rc.close();
+    }
+  } finally {
+    await appMessageSubscription.cancel();
+  }
+}
+
+Future<void> testAppCallLoopbackBigPackets(
+    Stream<VeilidUpdate> updateStream) async {
+  final appCallQueue = StreamController<VeilidAppCall>();
+  final appMessageSubscription = updateStream.listen((update) {
+    if (update is VeilidAppCall) {
+      appCallQueue.sink.add(update);
+    }
+  });
+  final appCallQueueHandler = () async {
+    await for (final update in appCallQueue.stream) {
+      await Veilid.instance.appCallReply(update.callId, update.message);
+    }
+  }();
+
+  final sentMessages = <String>{};
+  final random = Random.secure();
+  final cs = await Veilid.instance.bestCryptoSystem();
+
+  try {
+    await Veilid.instance.debug("purge routes");
+
+    // make a routing context that uses a safety route
+    final rc = await Veilid.instance.routingContext();
+    try {
+      // make a new local private route
+      final prl = await Veilid.instance.newPrivateRoute();
+      try {
+        // import it as a remote route as well so we can send to it
+        final prr = await Veilid.instance.importRemotePrivateRoute(prl.blob);
+        try {
+          for (var i = 0; i < 5; i++) {
+            // send an app message to our own private route
+            final message = await cs.randomBytes(random.nextInt(32768));
+            final outmessage = await rc.appCall(prr, message);
+            expect(message, equals(outmessage));
+          }
+
+          final appMessageQueueIterator = StreamIterator(appCallQueue.stream);
+
+          // we should get the same messages back
+          for (var i = 0; i < sentMessages.length; i++) {
+            if (await appMessageQueueIterator.moveNext()) {
+              final update = appMessageQueueIterator.current;
+              expect(sentMessages.contains(base64Url.encode(update.message)),
+                  isTrue);
+            } else {
+              fail("not enough messages in the queue");
+            }
+          }
+        } finally {
+          await Veilid.instance.releasePrivateRoute(prr);
+        }
+      } finally {
+        await Veilid.instance.releasePrivateRoute(prl.routeId);
+      }
+    } finally {
+      rc.close();
+    }
+  } finally {
+    await appMessageSubscription.cancel();
+  }
+  await appCallQueue.close();
+  await appCallQueueHandler;
+}
diff --git a/veilid-flutter/example/integration_test/test_table_db.dart b/veilid-flutter/example/integration_test/test_table_db.dart
new file mode 100644
index 00000000..56674adf
--- /dev/null
+++ b/veilid-flutter/example/integration_test/test_table_db.dart
@@ -0,0 +1,133 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/veilid.dart';
+
+const testDb = "__dart_test_db";
+const testNonexistentDb = "__dart_test_nonexistent_db";
+
+Future<void> testDeleteTableDbNonExistent() async {
+  expect(await Veilid.instance.deleteTableDB(testNonexistentDb), isFalse);
+}
+
+Future<void> testOpenDeleteTableDb() async {
+  // delete test db if it exists
+  await Veilid.instance.deleteTableDB(testDb);
+
+  final tdb = await Veilid.instance.openTableDB(testDb, 1);
+  try {
+    await expectLater(() async => await Veilid.instance.deleteTableDB(testDb),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    tdb.close();
+  }
+  expect(await Veilid.instance.deleteTableDB(testDb), isTrue);
+}
+
+Future<void> testOpenTwiceTableDb() async {
+  // delete test db if it exists
+  await Veilid.instance.deleteTableDB(testDb);
+
+  final tdb = await Veilid.instance.openTableDB(testDb, 1);
+  final tdb2 = await Veilid.instance.openTableDB(testDb, 1);
+
+  // delete should fail because open
+  await expectLater(() async => await Veilid.instance.deleteTableDB(testDb),
+      throwsA(isA<VeilidAPIException>()));
+  tdb.close();
+  // delete should fail because open
+  await expectLater(() async => await Veilid.instance.deleteTableDB(testDb),
+      throwsA(isA<VeilidAPIException>()));
+  tdb2.close();
+
+  // delete should now succeed
+  expect(await Veilid.instance.deleteTableDB(testDb), isTrue);
+}
+
+Future<void> testOpenTwiceTableDbStoreLoad() async {
+  // delete test db if it exists
+  await Veilid.instance.deleteTableDB(testDb);
+
+  final tdb = await Veilid.instance.openTableDB(testDb, 1);
+  try {
+    final tdb2 = await Veilid.instance.openTableDB(testDb, 1);
+    try {
+      // store into first db copy
+      await tdb.store(0, utf8.encode("asdf"), utf8.encode("1234"));
+      // load from second db copy
+      expect(
+          await tdb2.load(0, utf8.encode("asdf")), equals(utf8.encode("1234")));
+    } finally {
+      tdb2.close();
+    }
+  } finally {
+    tdb.close();
+  }
+
+  // delete should now succeed
+  expect(await Veilid.instance.deleteTableDB(testDb), isTrue);
+}
+
+Future<void> testOpenTwiceTableDbStoreDeleteLoad() async {
+  // delete test db if it exists
+  await Veilid.instance.deleteTableDB(testDb);
+
+  final tdb = await Veilid.instance.openTableDB(testDb, 1);
+  try {
+    final tdb2 = await Veilid.instance.openTableDB(testDb, 1);
+    try {
+      // store into first db copy
+      await tdb.store(0, utf8.encode("asdf"), utf8.encode("1234"));
+      // delete from second db copy and clean up
+      await tdb2.delete(0, utf8.encode("asdf"));
+    } finally {
+      tdb2.close();
+    }
+    // load from first db copy
+    expect(await tdb.load(0, utf8.encode("asdf")), isNull);
+  } finally {
+    tdb.close();
+  }
+
+  // delete should now succeed
+  expect(await Veilid.instance.deleteTableDB(testDb), isTrue);
+}
+
+Future<void> testResizeTableDb() async {
+  // delete test db if it exists
+  await Veilid.instance.deleteTableDB(testDb);
+
+  final tdb = await Veilid.instance.openTableDB(testDb, 1);
+  try {
+    // reopen the db with more columns should fail if it is already open
+    await expectLater(() async => await Veilid.instance.openTableDB(testDb, 2),
+        throwsA(isA<VeilidAPIException>()));
+  } finally {
+    tdb.close();
+  }
+
+  final tdb2 = await Veilid.instance.openTableDB(testDb, 2);
+  try {
+    // write something to second column
+    await tdb2.store(1, utf8.encode("qwer"), utf8.encode("5678"));
+
+    // reopen the db with fewer columns
+    final tdb3 = await Veilid.instance.openTableDB(testDb, 1);
+    try {
+      // Should fail access to second column
+      await expectLater(() async => await tdb3.load(1, utf8.encode("qwer")),
+          throwsA(isA<VeilidAPIException>()));
+
+      // Should succeed with access to second column
+      expect(
+          await tdb2.load(1, utf8.encode("qwer")), equals(utf8.encode("5678")));
+    } finally {
+      tdb3.close();
+    }
+  } finally {
+    tdb2.close();
+  }
+
+  // delete should now succeed
+  expect(await Veilid.instance.deleteTableDB(testDb), isTrue);
+}
diff --git a/veilid-flutter/example/integration_test/test_veilid_config.dart b/veilid-flutter/example/integration_test/test_veilid_config.dart
new file mode 100644
index 00000000..b7772ad2
--- /dev/null
+++ b/veilid-flutter/example/integration_test/test_veilid_config.dart
@@ -0,0 +1,10 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/default_config.dart';
+
+Future<void> testVeilidConfigDefaults() async {
+  const programName = 'Veilid Tests';
+  final defaultConfig =
+      await getDefaultVeilidConfig(isWeb: kIsWeb, programName: programName);
+  assert(defaultConfig.programName == programName, 'program name should match');
+}
diff --git a/veilid-flutter/example/lib/app.dart b/veilid-flutter/example/lib/app.dart
index 550deba7..94ca1e11 100644
--- a/veilid-flutter/example/lib/app.dart
+++ b/veilid-flutter/example/lib/app.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:veilid/veilid.dart';
 import 'package:loggy/loggy.dart';
@@ -12,7 +13,7 @@ import 'history_wrapper.dart';
 
 // Main App
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();
@@ -109,7 +110,8 @@ class _MyAppState extends State<MyApp> with UiLoggy {
 
   Future<void> toggleStartup(bool startup) async {
     if (startup && !_startedUp) {
-      var config = await getDefaultVeilidConfig("Veilid Plugin Example");
+      var config = await getDefaultVeilidConfig(
+          isWeb: kIsWeb, programName: "Veilid Plugin Example");
       if (const String.fromEnvironment("DELETE_TABLE_STORE") == "1") {
         config = config.copyWith(
             tableStore: config.tableStore.copyWith(delete: true));
diff --git a/veilid-flutter/example/lib/log_terminal.dart b/veilid-flutter/example/lib/log_terminal.dart
index b9c8eacd..7ce676fe 100644
--- a/veilid-flutter/example/lib/log_terminal.dart
+++ b/veilid-flutter/example/lib/log_terminal.dart
@@ -10,7 +10,7 @@ const kDefaultTerminalStyle = TerminalStyle(
     fontFamily: kDefaultMonoTerminalFontFamily);
 
 class LogTerminal extends StatefulWidget {
-  const LogTerminal({Key? key}) : super(key: key);
+  const LogTerminal({super.key});
 
   @override
   // ignore: library_private_types_in_public_api
diff --git a/veilid-flutter/example/macos/Podfile.lock b/veilid-flutter/example/macos/Podfile.lock
index 6310dc01..88db902f 100644
--- a/veilid-flutter/example/macos/Podfile.lock
+++ b/veilid-flutter/example/macos/Podfile.lock
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   veilid: a54f57b7bcf0e4e072fe99272d76ca126b2026d0
 
 PODFILE CHECKSUM: 73d2f470b1d889e27fcfda1d6e6efec66f98af3f
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/veilid-flutter/example/macos/Runner.xcodeproj/project.pbxproj b/veilid-flutter/example/macos/Runner.xcodeproj/project.pbxproj
index df7ba6b9..e6d744c8 100644
--- a/veilid-flutter/example/macos/Runner.xcodeproj/project.pbxproj
+++ b/veilid-flutter/example/macos/Runner.xcodeproj/project.pbxproj
@@ -208,7 +208,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
diff --git a/veilid-flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/veilid-flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 83d88728..5b055a3a 100644
--- a/veilid-flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/veilid-flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/veilid-flutter/example/pubspec.lock b/veilid-flutter/example/pubspec.lock
index 28671d7b..a535b345 100644
--- a/veilid-flutter/example/pubspec.lock
+++ b/veilid-flutter/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: "direct main"
     description:
       name: ansicolor
-      sha256: "607f8fa9786f392043f169898923e6c59b4518242b68b8862eb8a8b7d9c30b4a"
+      sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   async:
     dependency: transitive
     description:
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: change_case
-      sha256: f4e08feaa845e75e4f5ad2b0e15f24813d7ea6c27e7b78252f0c17f752cf1157
+      sha256: "47c48c36f95f20c6d0ba03efabceff261d05026cca322cc2c4c01c343371b5bb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "2.0.1"
   characters:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   equatable:
     dependency: transitive
     description:
@@ -101,18 +101,18 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
-  file_utils:
+    version: "2.1.2"
+  file:
     dependency: transitive
     description:
-      name: file_utils
-      sha256: d1e64389a22649095c8405c9e177272caf05139255931c9ff30d53b5c9bcaa34
+      name: file
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
@@ -134,14 +134,19 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.3"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -160,6 +165,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.1"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   globbing:
     dependency: transitive
     description:
@@ -168,6 +178,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   json_annotation:
     dependency: transitive
     description:
@@ -176,14 +191,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   loggy:
     dependency: "direct main"
     description:
@@ -196,114 +235,122 @@ packages:
     dependency: transitive
     description:
       name: macos_window_utils
-      sha256: "43a90473f8786f00f07203e6819dab67e032f8896dafa4a6f85fbc71fba32c0b"
+      sha256: "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.5.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
+  mutex:
+    dependency: "direct dev"
+    description:
+      name: mutex
+      sha256: "8827da25de792088eb33e572115a5eb0d61d61a3c01acbc8bcbe76ed78f1a1f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
+      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.2"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
+      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
-  platform_info:
-    dependency: transitive
-    description:
-      name: platform_info
-      sha256: "012e73712166cf0b56d3eb95c0d33491f56b428c169eca385f036448474147e4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.8"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.2"
   quiver:
     dependency: transitive
     description:
@@ -349,14 +396,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   system_info2:
     dependency: transitive
     description:
       name: system_info2
-      sha256: af2f948e3f31a3367a049932a8ad59faf0063ecf836a020d975b9f41566d8bc9
+      sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   system_info_plus:
     dependency: transitive
     description:
@@ -404,38 +459,54 @@ packages:
       relative: true
     source: path
     version: "0.2.5"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "13.0.0"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa"
+      sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.7"
+    version: "5.3.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   xterm:
     dependency: "direct main"
     description:
       name: xterm
-      sha256: "6a02b15d03152b8186e12790902ff28c8a932fc441e89fa7255a7491661a8e69"
+      sha256: "168dfedca77cba33fdb6f52e2cd001e9fde216e398e89335c19b524bb22da3a2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "4.0.0"
+  zmodem:
+    dependency: transitive
+    description:
+      name: zmodem
+      sha256: "3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.6"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
-  flutter: ">=3.10.6"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.1"
diff --git a/veilid-flutter/example/pubspec.yaml b/veilid-flutter/example/pubspec.yaml
index a3ac6915..9493cdc7 100644
--- a/veilid-flutter/example/pubspec.yaml
+++ b/veilid-flutter/example/pubspec.yaml
@@ -31,27 +31,21 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-  loggy: ^2.0.1+1
-  path_provider: ^2.0.11
-  path: ^1.8.1
-  xterm: ^3.4.0
-  flutter_acrylic: ^1.0.0+2
-  ansicolor: ^2.0.1
+  cupertino_icons: ^1.0.6
+  loggy: ^2.0.3
+  path_provider: ^2.1.2
+  path: ^1.9.0
+  xterm: ^4.0.0
+  flutter_acrylic: ^1.1.3
+  ansicolor: ^2.0.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^2.0.1
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
+  integration_test:
+    sdk: flutter
+  flutter_lints: ^3.0.1
+  mutex: ^3.1.0
 
 # The following section is specific to Flutter.
 flutter:
diff --git a/veilid-flutter/example/test_driver/integration_test.dart b/veilid-flutter/example/test_driver/integration_test.dart
new file mode 100644
index 00000000..b38629cc
--- /dev/null
+++ b/veilid-flutter/example/test_driver/integration_test.dart
@@ -0,0 +1,3 @@
+import 'package:integration_test/integration_test_driver.dart';
+
+Future<void> main() => integrationDriver();
diff --git a/veilid-flutter/lib/default_config.dart b/veilid-flutter/lib/default_config.dart
index eeb1833a..ccc844af 100644
--- a/veilid-flutter/lib/default_config.dart
+++ b/veilid-flutter/lib/default_config.dart
@@ -1,193 +1,49 @@
-import 'dart:io';
+import 'dart:convert';
 
-import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
-import 'package:system_info2/system_info2.dart' as sysinfo;
-import 'package:system_info_plus/system_info_plus.dart';
 
 import 'veilid.dart';
 
-const int megaByte = 1024 * 1024;
-
-int getLocalSubkeyCacheSize() {
-  if (kIsWeb) {
-    return 128;
-  }
-  return 1024;
-}
-
-Future<int> getLocalMaxSubkeyCacheMemoryMb() async {
-  if (kIsWeb) {
-    return 256;
-  }
-  if (Platform.isIOS || Platform.isAndroid) {
-    return (await SystemInfoPlus.physicalMemory ?? 2048) ~/ 32;
-  }
-  return sysinfo.SysInfo.getTotalPhysicalMemory() ~/ 32 ~/ megaByte;
-}
-
-int getRemoteSubkeyCacheSize() {
-  if (kIsWeb) {
-    return 64;
-  }
-  return 128;
-}
-
-int getRemoteMaxRecords() {
-  if (kIsWeb) {
-    return 64;
-  }
-  return 128;
-}
-
-Future<int> getRemoteMaxSubkeyCacheMemoryMb() async {
-  if (kIsWeb) {
-    return 256;
-  }
-  if (Platform.isIOS || Platform.isAndroid) {
-    return (await SystemInfoPlus.physicalMemory ?? 2048) ~/ 32;
-  }
-  return sysinfo.SysInfo.getTotalPhysicalMemory() ~/ 32 ~/ megaByte;
-}
-
-int getRemoteMaxStorageSpaceMb() {
-  if (kIsWeb) {
-    return 128;
-  }
-  return 256;
-}
-
-Future<VeilidConfig> getDefaultVeilidConfig(String programName) async {
-  // ignore: do_not_use_environment
-  const bootstrap = String.fromEnvironment('BOOTSTRAP');
-  return VeilidConfig(
-    programName: programName,
-    namespace: '',
-    capabilities: const VeilidConfigCapabilities(disable: []),
-    protectedStore: const VeilidConfigProtectedStore(
-      allowInsecureFallback: false,
-      alwaysUseInsecureStorage: false,
-      directory: '',
-      delete: false,
-      deviceEncryptionKeyPassword: '',
-    ),
-    tableStore: VeilidConfigTableStore(
-      directory: kIsWeb
-          ? ''
-          : p.join((await getApplicationSupportDirectory()).absolute.path,
-              'table_store'),
-      delete: false,
-    ),
-    blockStore: VeilidConfigBlockStore(
-      directory: kIsWeb
-          ? ''
-          : p.join((await getApplicationSupportDirectory()).absolute.path,
-              'block_store'),
-      delete: false,
-    ),
-    network: VeilidConfigNetwork(
-      connectionInitialTimeoutMs: 2000,
-      connectionInactivityTimeoutMs: 60000,
-      maxConnectionsPerIp4: 32,
-      maxConnectionsPerIp6Prefix: 32,
-      maxConnectionsPerIp6PrefixSize: 56,
-      maxConnectionFrequencyPerMin: 128,
-      clientAllowlistTimeoutMs: 300000,
-      reverseConnectionReceiptTimeMs: 5000,
-      holePunchReceiptTimeMs: 5000,
-      routingTable: VeilidConfigRoutingTable(
-        nodeId: [],
-        nodeIdSecret: [],
-        bootstrap: bootstrap.isNotEmpty
-            ? bootstrap.split(',')
-            : (kIsWeb
-                ? ['ws://bootstrap.veilid.net:5150/ws']
-                : ['bootstrap.veilid.net']),
-        limitOverAttached: 64,
-        limitFullyAttached: 32,
-        limitAttachedStrong: 16,
-        limitAttachedGood: 8,
-        limitAttachedWeak: 4,
+Future<VeilidConfig> getDefaultVeilidConfig({
+  required bool isWeb,
+  required String programName,
+  String bootstrap = '',
+  String namespace = '',
+  String deviceEncryptionKeyPassword = '',
+  String? newDeviceEncryptionKeyPassword,
+  String networkKeyPassword = '',
+}) async {
+  final defaultConfigStr = Veilid.instance.defaultVeilidConfig();
+  final defaultConfig = VeilidConfig.fromJson(jsonDecode(defaultConfigStr));
+  return defaultConfig.copyWith(
+      programName: programName,
+      namespace: namespace,
+      tableStore: defaultConfig.tableStore.copyWith(
+        directory: isWeb
+            ? ''
+            : p.join((await getApplicationSupportDirectory()).absolute.path,
+                'table_store'),
       ),
-      rpc: const VeilidConfigRPC(
-        concurrency: 0,
-        queueSize: 1024,
-        maxTimestampBehindMs: 10000,
-        maxTimestampAheadMs: 10000,
-        timeoutMs: 5000,
-        maxRouteHopCount: 4,
-        defaultRouteHopCount: 1,
+      blockStore: defaultConfig.blockStore.copyWith(
+        directory: isWeb
+            ? ''
+            : p.join((await getApplicationSupportDirectory()).absolute.path,
+                'block_store'),
       ),
-      dht: VeilidConfigDHT(
-          maxFindNodeCount: 20,
-          resolveNodeTimeoutMs: 10000,
-          resolveNodeCount: 1,
-          resolveNodeFanout: 4,
-          getValueTimeoutMs: 10000,
-          getValueCount: 3,
-          getValueFanout: 4,
-          setValueTimeoutMs: 10000,
-          setValueCount: 5,
-          setValueFanout: 4,
-          minPeerCount: 20,
-          minPeerRefreshTimeMs: 60000,
-          validateDialInfoReceiptTimeMs: 2000,
-          localSubkeyCacheSize: getLocalSubkeyCacheSize(),
-          localMaxSubkeyCacheMemoryMb: await getLocalMaxSubkeyCacheMemoryMb(),
-          remoteSubkeyCacheSize: getRemoteSubkeyCacheSize(),
-          remoteMaxRecords: getRemoteMaxRecords(),
-          remoteMaxSubkeyCacheMemoryMb: await getRemoteMaxSubkeyCacheMemoryMb(),
-          remoteMaxStorageSpaceMb: getRemoteMaxStorageSpaceMb(),
-          publicWatchLimit: 32,
-          memberWatchLimit: 8,
-          maxWatchExpirationMs: 600000),
-      upnp: true,
-      detectAddressChanges: true,
-      restrictedNatRetries: 0,
-      tls: const VeilidConfigTLS(
-        certificatePath: '',
-        privateKeyPath: '',
-        connectionInitialTimeoutMs: 2000,
+      protectedStore: defaultConfig.protectedStore.copyWith(
+        directory: isWeb
+            ? ''
+            : p.join((await getApplicationSupportDirectory()).absolute.path,
+                'protected_store'),
+        deviceEncryptionKeyPassword: deviceEncryptionKeyPassword,
+        newDeviceEncryptionKeyPassword: newDeviceEncryptionKeyPassword,
       ),
-      application: const VeilidConfigApplication(
-          https: VeilidConfigHTTPS(
-            enabled: false,
-            listenAddress: '',
-            path: '',
-          ),
-          http: VeilidConfigHTTP(
-            enabled: false,
-            listenAddress: '',
-            path: '',
-          )),
-      protocol: const VeilidConfigProtocol(
-        udp: VeilidConfigUDP(
-          enabled: !kIsWeb,
-          socketPoolSize: 0,
-          listenAddress: '',
-        ),
-        tcp: VeilidConfigTCP(
-          connect: !kIsWeb,
-          listen: !kIsWeb,
-          maxConnections: 32,
-          listenAddress: '',
-        ),
-        ws: VeilidConfigWS(
-          connect: true,
-          listen: !kIsWeb,
-          maxConnections: 32,
-          listenAddress: '',
-          path: 'ws',
-        ),
-        wss: VeilidConfigWSS(
-          connect: true,
-          listen: false,
-          maxConnections: 32,
-          listenAddress: '',
-          path: 'ws',
-        ),
-      ),
-    ),
-  );
+      network: defaultConfig.network.copyWith(
+          networkKeyPassword: networkKeyPassword,
+          routingTable: defaultConfig.network.routingTable.copyWith(
+              bootstrap: bootstrap.isNotEmpty
+                  ? bootstrap.split(',')
+                  : defaultConfig.network.routingTable.bootstrap),
+          dht: defaultConfig.network.dht.copyWith()));
 }
diff --git a/veilid-flutter/lib/routing_context.dart b/veilid-flutter/lib/routing_context.dart
index 99799bef..276e5518 100644
--- a/veilid-flutter/lib/routing_context.dart
+++ b/veilid-flutter/lib/routing_context.dart
@@ -38,7 +38,7 @@ extension ValidateSMPL on DHTSchemaSMPL {
     return true;
   }
 
-  int subkeyCount() => members.fold(0, (acc, v) => acc + v.mCnt) + oCnt;
+  int subkeyCount() => members.fold(oCnt, (acc, v) => acc + v.mCnt);
 }
 
 extension Validate on DHTSchema {
@@ -123,30 +123,6 @@ extension DHTRecordDescriptorExt on DHTRecordDescriptor {
   }
 }
 
-//////////////////////////////////////
-/// ValueSubkeyRange
-
-@freezed
-class ValueSubkeyRange with _$ValueSubkeyRange {
-  @Assert('low < 0 || low > high', 'low out of range')
-  @Assert('high < 0', 'high out of range')
-  const factory ValueSubkeyRange({
-    required int low,
-    required int high,
-  }) = _ValueSubkeyRange;
-
-  factory ValueSubkeyRange.fromJson(dynamic json) =>
-      _$ValueSubkeyRangeFromJson(json as Map<String, dynamic>);
-}
-
-extension ValueSubkeyRangeExt on ValueSubkeyRange {
-  bool contains(int v) => low <= v && v <= high;
-}
-
-extension ListValueSubkeyRangeExt on List<ValueSubkeyRange> {
-  bool containsSubkey(int v) => indexWhere((e) => e.contains(v)) != -1;
-}
-
 //////////////////////////////////////
 /// ValueData
 
@@ -264,6 +240,31 @@ class RouteBlob with _$RouteBlob {
       _$RouteBlobFromJson(json as Map<String, dynamic>);
 }
 
+//////////////////////////////////////
+/// Inspect
+@freezed
+class DHTRecordReport with _$DHTRecordReport {
+  const factory DHTRecordReport({
+    required List<ValueSubkeyRange> subkeys,
+    required List<int> localSeqs,
+    required List<int> networkSeqs,
+  }) = _DHTRecordReport;
+  factory DHTRecordReport.fromJson(dynamic json) =>
+      _$DHTRecordReportFromJson(json as Map<String, dynamic>);
+}
+
+enum DHTReportScope {
+  local,
+  syncGet,
+  syncSet,
+  updateGet,
+  updateSet;
+
+  factory DHTReportScope.fromJson(dynamic j) =>
+      DHTReportScope.values.byName((j as String).toCamelCase());
+  String toJson() => name.toPascalCase();
+}
+
 //////////////////////////////////////
 /// VeilidRoutingContext
 
@@ -271,9 +272,11 @@ abstract class VeilidRoutingContext {
   void close();
 
   // Modifiers
-  VeilidRoutingContext withDefaultSafety();
-  VeilidRoutingContext withSafety(SafetySelection safetySelection);
-  VeilidRoutingContext withSequencing(Sequencing sequencing);
+  VeilidRoutingContext withDefaultSafety({bool closeSelf = false});
+  VeilidRoutingContext withSafety(SafetySelection safetySelection,
+      {bool closeSelf = false});
+  VeilidRoutingContext withSequencing(Sequencing sequencing,
+      {bool closeSelf = false});
   Future<SafetySelection> safety();
 
   // App call/message
@@ -283,12 +286,17 @@ abstract class VeilidRoutingContext {
   // DHT Operations
   Future<DHTRecordDescriptor> createDHTRecord(DHTSchema schema,
       {CryptoKind kind = 0});
-  Future<DHTRecordDescriptor> openDHTRecord(TypedKey key, KeyPair? writer);
+  Future<DHTRecordDescriptor> openDHTRecord(TypedKey key, {KeyPair? writer});
   Future<void> closeDHTRecord(TypedKey key);
   Future<void> deleteDHTRecord(TypedKey key);
-  Future<ValueData?> getDHTValue(TypedKey key, int subkey, bool forceRefresh);
-  Future<ValueData?> setDHTValue(TypedKey key, int subkey, Uint8List data);
+  Future<ValueData?> getDHTValue(TypedKey key, int subkey,
+      {bool forceRefresh = false});
+  Future<ValueData?> setDHTValue(TypedKey key, int subkey, Uint8List data,
+      {KeyPair? writer});
   Future<Timestamp> watchDHTValues(TypedKey key,
       {List<ValueSubkeyRange>? subkeys, Timestamp? expiration, int? count});
   Future<bool> cancelDHTWatch(TypedKey key, {List<ValueSubkeyRange>? subkeys});
+  Future<DHTRecordReport> inspectDHTRecord(TypedKey key,
+      {List<ValueSubkeyRange>? subkeys,
+      DHTReportScope scope = DHTReportScope.local});
 }
diff --git a/veilid-flutter/lib/routing_context.freezed.dart b/veilid-flutter/lib/routing_context.freezed.dart
index af4f4aab..43add7ad 100644
--- a/veilid-flutter/lib/routing_context.freezed.dart
+++ b/veilid-flutter/lib/routing_context.freezed.dart
@@ -12,7 +12,7 @@ part of 'routing_context.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 DHTSchema _$DHTSchemaFromJson(Map<String, dynamic> json) {
   switch (json['kind']) {
@@ -107,22 +107,22 @@ class _$DHTSchemaCopyWithImpl<$Res, $Val extends DHTSchema>
 }
 
 /// @nodoc
-abstract class _$$DHTSchemaDFLTCopyWith<$Res>
+abstract class _$$DHTSchemaDFLTImplCopyWith<$Res>
     implements $DHTSchemaCopyWith<$Res> {
-  factory _$$DHTSchemaDFLTCopyWith(
-          _$DHTSchemaDFLT value, $Res Function(_$DHTSchemaDFLT) then) =
-      __$$DHTSchemaDFLTCopyWithImpl<$Res>;
+  factory _$$DHTSchemaDFLTImplCopyWith(
+          _$DHTSchemaDFLTImpl value, $Res Function(_$DHTSchemaDFLTImpl) then) =
+      __$$DHTSchemaDFLTImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({int oCnt});
 }
 
 /// @nodoc
-class __$$DHTSchemaDFLTCopyWithImpl<$Res>
-    extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaDFLT>
-    implements _$$DHTSchemaDFLTCopyWith<$Res> {
-  __$$DHTSchemaDFLTCopyWithImpl(
-      _$DHTSchemaDFLT _value, $Res Function(_$DHTSchemaDFLT) _then)
+class __$$DHTSchemaDFLTImplCopyWithImpl<$Res>
+    extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaDFLTImpl>
+    implements _$$DHTSchemaDFLTImplCopyWith<$Res> {
+  __$$DHTSchemaDFLTImplCopyWithImpl(
+      _$DHTSchemaDFLTImpl _value, $Res Function(_$DHTSchemaDFLTImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -130,7 +130,7 @@ class __$$DHTSchemaDFLTCopyWithImpl<$Res>
   $Res call({
     Object? oCnt = null,
   }) {
-    return _then(_$DHTSchemaDFLT(
+    return _then(_$DHTSchemaDFLTImpl(
       oCnt: null == oCnt
           ? _value.oCnt
           : oCnt // ignore: cast_nullable_to_non_nullable
@@ -141,12 +141,12 @@ class __$$DHTSchemaDFLTCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$DHTSchemaDFLT implements DHTSchemaDFLT {
-  const _$DHTSchemaDFLT({required this.oCnt, final String? $type})
+class _$DHTSchemaDFLTImpl implements DHTSchemaDFLT {
+  const _$DHTSchemaDFLTImpl({required this.oCnt, final String? $type})
       : $type = $type ?? 'DFLT';
 
-  factory _$DHTSchemaDFLT.fromJson(Map<String, dynamic> json) =>
-      _$$DHTSchemaDFLTFromJson(json);
+  factory _$DHTSchemaDFLTImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DHTSchemaDFLTImplFromJson(json);
 
   @override
   final int oCnt;
@@ -160,10 +160,10 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$DHTSchemaDFLT &&
+            other is _$DHTSchemaDFLTImpl &&
             (identical(other.oCnt, oCnt) || other.oCnt == oCnt));
   }
 
@@ -174,8 +174,8 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$DHTSchemaDFLTCopyWith<_$DHTSchemaDFLT> get copyWith =>
-      __$$DHTSchemaDFLTCopyWithImpl<_$DHTSchemaDFLT>(this, _$identity);
+  _$$DHTSchemaDFLTImplCopyWith<_$DHTSchemaDFLTImpl> get copyWith =>
+      __$$DHTSchemaDFLTImplCopyWithImpl<_$DHTSchemaDFLTImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -241,43 +241,43 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$DHTSchemaDFLTToJson(
+    return _$$DHTSchemaDFLTImplToJson(
       this,
     );
   }
 }
 
 abstract class DHTSchemaDFLT implements DHTSchema {
-  const factory DHTSchemaDFLT({required final int oCnt}) = _$DHTSchemaDFLT;
+  const factory DHTSchemaDFLT({required final int oCnt}) = _$DHTSchemaDFLTImpl;
 
   factory DHTSchemaDFLT.fromJson(Map<String, dynamic> json) =
-      _$DHTSchemaDFLT.fromJson;
+      _$DHTSchemaDFLTImpl.fromJson;
 
   @override
   int get oCnt;
   @override
   @JsonKey(ignore: true)
-  _$$DHTSchemaDFLTCopyWith<_$DHTSchemaDFLT> get copyWith =>
+  _$$DHTSchemaDFLTImplCopyWith<_$DHTSchemaDFLTImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$DHTSchemaSMPLCopyWith<$Res>
+abstract class _$$DHTSchemaSMPLImplCopyWith<$Res>
     implements $DHTSchemaCopyWith<$Res> {
-  factory _$$DHTSchemaSMPLCopyWith(
-          _$DHTSchemaSMPL value, $Res Function(_$DHTSchemaSMPL) then) =
-      __$$DHTSchemaSMPLCopyWithImpl<$Res>;
+  factory _$$DHTSchemaSMPLImplCopyWith(
+          _$DHTSchemaSMPLImpl value, $Res Function(_$DHTSchemaSMPLImpl) then) =
+      __$$DHTSchemaSMPLImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({int oCnt, List<DHTSchemaMember> members});
 }
 
 /// @nodoc
-class __$$DHTSchemaSMPLCopyWithImpl<$Res>
-    extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaSMPL>
-    implements _$$DHTSchemaSMPLCopyWith<$Res> {
-  __$$DHTSchemaSMPLCopyWithImpl(
-      _$DHTSchemaSMPL _value, $Res Function(_$DHTSchemaSMPL) _then)
+class __$$DHTSchemaSMPLImplCopyWithImpl<$Res>
+    extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaSMPLImpl>
+    implements _$$DHTSchemaSMPLImplCopyWith<$Res> {
+  __$$DHTSchemaSMPLImplCopyWithImpl(
+      _$DHTSchemaSMPLImpl _value, $Res Function(_$DHTSchemaSMPLImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -286,7 +286,7 @@ class __$$DHTSchemaSMPLCopyWithImpl<$Res>
     Object? oCnt = null,
     Object? members = null,
   }) {
-    return _then(_$DHTSchemaSMPL(
+    return _then(_$DHTSchemaSMPLImpl(
       oCnt: null == oCnt
           ? _value.oCnt
           : oCnt // ignore: cast_nullable_to_non_nullable
@@ -301,16 +301,16 @@ class __$$DHTSchemaSMPLCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$DHTSchemaSMPL implements DHTSchemaSMPL {
-  const _$DHTSchemaSMPL(
+class _$DHTSchemaSMPLImpl implements DHTSchemaSMPL {
+  const _$DHTSchemaSMPLImpl(
       {required this.oCnt,
       required final List<DHTSchemaMember> members,
       final String? $type})
       : _members = members,
         $type = $type ?? 'SMPL';
 
-  factory _$DHTSchemaSMPL.fromJson(Map<String, dynamic> json) =>
-      _$$DHTSchemaSMPLFromJson(json);
+  factory _$DHTSchemaSMPLImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DHTSchemaSMPLImplFromJson(json);
 
   @override
   final int oCnt;
@@ -331,10 +331,10 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$DHTSchemaSMPL &&
+            other is _$DHTSchemaSMPLImpl &&
             (identical(other.oCnt, oCnt) || other.oCnt == oCnt) &&
             const DeepCollectionEquality().equals(other._members, _members));
   }
@@ -347,8 +347,8 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$DHTSchemaSMPLCopyWith<_$DHTSchemaSMPL> get copyWith =>
-      __$$DHTSchemaSMPLCopyWithImpl<_$DHTSchemaSMPL>(this, _$identity);
+  _$$DHTSchemaSMPLImplCopyWith<_$DHTSchemaSMPLImpl> get copyWith =>
+      __$$DHTSchemaSMPLImplCopyWithImpl<_$DHTSchemaSMPLImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -414,7 +414,7 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$DHTSchemaSMPLToJson(
+    return _$$DHTSchemaSMPLImplToJson(
       this,
     );
   }
@@ -423,17 +423,17 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
 abstract class DHTSchemaSMPL implements DHTSchema {
   const factory DHTSchemaSMPL(
       {required final int oCnt,
-      required final List<DHTSchemaMember> members}) = _$DHTSchemaSMPL;
+      required final List<DHTSchemaMember> members}) = _$DHTSchemaSMPLImpl;
 
   factory DHTSchemaSMPL.fromJson(Map<String, dynamic> json) =
-      _$DHTSchemaSMPL.fromJson;
+      _$DHTSchemaSMPLImpl.fromJson;
 
   @override
   int get oCnt;
   List<DHTSchemaMember> get members;
   @override
   @JsonKey(ignore: true)
-  _$$DHTSchemaSMPLCopyWith<_$DHTSchemaSMPL> get copyWith =>
+  _$$DHTSchemaSMPLImplCopyWith<_$DHTSchemaSMPLImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -491,22 +491,22 @@ class _$DHTSchemaMemberCopyWithImpl<$Res, $Val extends DHTSchemaMember>
 }
 
 /// @nodoc
-abstract class _$$_DHTSchemaMemberCopyWith<$Res>
+abstract class _$$DHTSchemaMemberImplCopyWith<$Res>
     implements $DHTSchemaMemberCopyWith<$Res> {
-  factory _$$_DHTSchemaMemberCopyWith(
-          _$_DHTSchemaMember value, $Res Function(_$_DHTSchemaMember) then) =
-      __$$_DHTSchemaMemberCopyWithImpl<$Res>;
+  factory _$$DHTSchemaMemberImplCopyWith(_$DHTSchemaMemberImpl value,
+          $Res Function(_$DHTSchemaMemberImpl) then) =
+      __$$DHTSchemaMemberImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({FixedEncodedString43 mKey, int mCnt});
 }
 
 /// @nodoc
-class __$$_DHTSchemaMemberCopyWithImpl<$Res>
-    extends _$DHTSchemaMemberCopyWithImpl<$Res, _$_DHTSchemaMember>
-    implements _$$_DHTSchemaMemberCopyWith<$Res> {
-  __$$_DHTSchemaMemberCopyWithImpl(
-      _$_DHTSchemaMember _value, $Res Function(_$_DHTSchemaMember) _then)
+class __$$DHTSchemaMemberImplCopyWithImpl<$Res>
+    extends _$DHTSchemaMemberCopyWithImpl<$Res, _$DHTSchemaMemberImpl>
+    implements _$$DHTSchemaMemberImplCopyWith<$Res> {
+  __$$DHTSchemaMemberImplCopyWithImpl(
+      _$DHTSchemaMemberImpl _value, $Res Function(_$DHTSchemaMemberImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -515,7 +515,7 @@ class __$$_DHTSchemaMemberCopyWithImpl<$Res>
     Object? mKey = null,
     Object? mCnt = null,
   }) {
-    return _then(_$_DHTSchemaMember(
+    return _then(_$DHTSchemaMemberImpl(
       mKey: null == mKey
           ? _value.mKey
           : mKey // ignore: cast_nullable_to_non_nullable
@@ -530,12 +530,12 @@ class __$$_DHTSchemaMemberCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_DHTSchemaMember implements _DHTSchemaMember {
-  const _$_DHTSchemaMember({required this.mKey, required this.mCnt})
+class _$DHTSchemaMemberImpl implements _DHTSchemaMember {
+  const _$DHTSchemaMemberImpl({required this.mKey, required this.mCnt})
       : assert(mCnt > 0 && mCnt <= 65535, 'value out of range');
 
-  factory _$_DHTSchemaMember.fromJson(Map<String, dynamic> json) =>
-      _$$_DHTSchemaMemberFromJson(json);
+  factory _$DHTSchemaMemberImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DHTSchemaMemberImplFromJson(json);
 
   @override
   final FixedEncodedString43 mKey;
@@ -548,10 +548,10 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_DHTSchemaMember &&
+            other is _$DHTSchemaMemberImpl &&
             (identical(other.mKey, mKey) || other.mKey == mKey) &&
             (identical(other.mCnt, mCnt) || other.mCnt == mCnt));
   }
@@ -563,12 +563,13 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_DHTSchemaMemberCopyWith<_$_DHTSchemaMember> get copyWith =>
-      __$$_DHTSchemaMemberCopyWithImpl<_$_DHTSchemaMember>(this, _$identity);
+  _$$DHTSchemaMemberImplCopyWith<_$DHTSchemaMemberImpl> get copyWith =>
+      __$$DHTSchemaMemberImplCopyWithImpl<_$DHTSchemaMemberImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_DHTSchemaMemberToJson(
+    return _$$DHTSchemaMemberImplToJson(
       this,
     );
   }
@@ -577,10 +578,10 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
 abstract class _DHTSchemaMember implements DHTSchemaMember {
   const factory _DHTSchemaMember(
       {required final FixedEncodedString43 mKey,
-      required final int mCnt}) = _$_DHTSchemaMember;
+      required final int mCnt}) = _$DHTSchemaMemberImpl;
 
   factory _DHTSchemaMember.fromJson(Map<String, dynamic> json) =
-      _$_DHTSchemaMember.fromJson;
+      _$DHTSchemaMemberImpl.fromJson;
 
   @override
   FixedEncodedString43 get mKey;
@@ -588,7 +589,7 @@ abstract class _DHTSchemaMember implements DHTSchemaMember {
   int get mCnt;
   @override
   @JsonKey(ignore: true)
-  _$$_DHTSchemaMemberCopyWith<_$_DHTSchemaMember> get copyWith =>
+  _$$DHTSchemaMemberImplCopyWith<_$DHTSchemaMemberImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -672,11 +673,11 @@ class _$DHTRecordDescriptorCopyWithImpl<$Res, $Val extends DHTRecordDescriptor>
 }
 
 /// @nodoc
-abstract class _$$_DHTRecordDescriptorCopyWith<$Res>
+abstract class _$$DHTRecordDescriptorImplCopyWith<$Res>
     implements $DHTRecordDescriptorCopyWith<$Res> {
-  factory _$$_DHTRecordDescriptorCopyWith(_$_DHTRecordDescriptor value,
-          $Res Function(_$_DHTRecordDescriptor) then) =
-      __$$_DHTRecordDescriptorCopyWithImpl<$Res>;
+  factory _$$DHTRecordDescriptorImplCopyWith(_$DHTRecordDescriptorImpl value,
+          $Res Function(_$DHTRecordDescriptorImpl) then) =
+      __$$DHTRecordDescriptorImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -690,11 +691,11 @@ abstract class _$$_DHTRecordDescriptorCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
-    extends _$DHTRecordDescriptorCopyWithImpl<$Res, _$_DHTRecordDescriptor>
-    implements _$$_DHTRecordDescriptorCopyWith<$Res> {
-  __$$_DHTRecordDescriptorCopyWithImpl(_$_DHTRecordDescriptor _value,
-      $Res Function(_$_DHTRecordDescriptor) _then)
+class __$$DHTRecordDescriptorImplCopyWithImpl<$Res>
+    extends _$DHTRecordDescriptorCopyWithImpl<$Res, _$DHTRecordDescriptorImpl>
+    implements _$$DHTRecordDescriptorImplCopyWith<$Res> {
+  __$$DHTRecordDescriptorImplCopyWithImpl(_$DHTRecordDescriptorImpl _value,
+      $Res Function(_$DHTRecordDescriptorImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -705,7 +706,7 @@ class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
     Object? schema = null,
     Object? ownerSecret = freezed,
   }) {
-    return _then(_$_DHTRecordDescriptor(
+    return _then(_$DHTRecordDescriptorImpl(
       key: null == key
           ? _value.key
           : key // ignore: cast_nullable_to_non_nullable
@@ -728,15 +729,15 @@ class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
-  const _$_DHTRecordDescriptor(
+class _$DHTRecordDescriptorImpl implements _DHTRecordDescriptor {
+  const _$DHTRecordDescriptorImpl(
       {required this.key,
       required this.owner,
       required this.schema,
       this.ownerSecret});
 
-  factory _$_DHTRecordDescriptor.fromJson(Map<String, dynamic> json) =>
-      _$$_DHTRecordDescriptorFromJson(json);
+  factory _$DHTRecordDescriptorImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DHTRecordDescriptorImplFromJson(json);
 
   @override
   final Typed<FixedEncodedString43> key;
@@ -753,10 +754,10 @@ class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_DHTRecordDescriptor &&
+            other is _$DHTRecordDescriptorImpl &&
             (identical(other.key, key) || other.key == key) &&
             (identical(other.owner, owner) || other.owner == owner) &&
             (identical(other.schema, schema) || other.schema == schema) &&
@@ -771,13 +772,13 @@ class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_DHTRecordDescriptorCopyWith<_$_DHTRecordDescriptor> get copyWith =>
-      __$$_DHTRecordDescriptorCopyWithImpl<_$_DHTRecordDescriptor>(
+  _$$DHTRecordDescriptorImplCopyWith<_$DHTRecordDescriptorImpl> get copyWith =>
+      __$$DHTRecordDescriptorImplCopyWithImpl<_$DHTRecordDescriptorImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_DHTRecordDescriptorToJson(
+    return _$$DHTRecordDescriptorImplToJson(
       this,
     );
   }
@@ -788,10 +789,10 @@ abstract class _DHTRecordDescriptor implements DHTRecordDescriptor {
       {required final Typed<FixedEncodedString43> key,
       required final FixedEncodedString43 owner,
       required final DHTSchema schema,
-      final FixedEncodedString43? ownerSecret}) = _$_DHTRecordDescriptor;
+      final FixedEncodedString43? ownerSecret}) = _$DHTRecordDescriptorImpl;
 
   factory _DHTRecordDescriptor.fromJson(Map<String, dynamic> json) =
-      _$_DHTRecordDescriptor.fromJson;
+      _$DHTRecordDescriptorImpl.fromJson;
 
   @override
   Typed<FixedEncodedString43> get key;
@@ -803,162 +804,7 @@ abstract class _DHTRecordDescriptor implements DHTRecordDescriptor {
   FixedEncodedString43? get ownerSecret;
   @override
   @JsonKey(ignore: true)
-  _$$_DHTRecordDescriptorCopyWith<_$_DHTRecordDescriptor> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-ValueSubkeyRange _$ValueSubkeyRangeFromJson(Map<String, dynamic> json) {
-  return _ValueSubkeyRange.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ValueSubkeyRange {
-  int get low => throw _privateConstructorUsedError;
-  int get high => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ValueSubkeyRangeCopyWith<ValueSubkeyRange> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ValueSubkeyRangeCopyWith<$Res> {
-  factory $ValueSubkeyRangeCopyWith(
-          ValueSubkeyRange value, $Res Function(ValueSubkeyRange) then) =
-      _$ValueSubkeyRangeCopyWithImpl<$Res, ValueSubkeyRange>;
-  @useResult
-  $Res call({int low, int high});
-}
-
-/// @nodoc
-class _$ValueSubkeyRangeCopyWithImpl<$Res, $Val extends ValueSubkeyRange>
-    implements $ValueSubkeyRangeCopyWith<$Res> {
-  _$ValueSubkeyRangeCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? low = null,
-    Object? high = null,
-  }) {
-    return _then(_value.copyWith(
-      low: null == low
-          ? _value.low
-          : low // ignore: cast_nullable_to_non_nullable
-              as int,
-      high: null == high
-          ? _value.high
-          : high // ignore: cast_nullable_to_non_nullable
-              as int,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$_ValueSubkeyRangeCopyWith<$Res>
-    implements $ValueSubkeyRangeCopyWith<$Res> {
-  factory _$$_ValueSubkeyRangeCopyWith(
-          _$_ValueSubkeyRange value, $Res Function(_$_ValueSubkeyRange) then) =
-      __$$_ValueSubkeyRangeCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({int low, int high});
-}
-
-/// @nodoc
-class __$$_ValueSubkeyRangeCopyWithImpl<$Res>
-    extends _$ValueSubkeyRangeCopyWithImpl<$Res, _$_ValueSubkeyRange>
-    implements _$$_ValueSubkeyRangeCopyWith<$Res> {
-  __$$_ValueSubkeyRangeCopyWithImpl(
-      _$_ValueSubkeyRange _value, $Res Function(_$_ValueSubkeyRange) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? low = null,
-    Object? high = null,
-  }) {
-    return _then(_$_ValueSubkeyRange(
-      low: null == low
-          ? _value.low
-          : low // ignore: cast_nullable_to_non_nullable
-              as int,
-      high: null == high
-          ? _value.high
-          : high // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$_ValueSubkeyRange implements _ValueSubkeyRange {
-  const _$_ValueSubkeyRange({required this.low, required this.high})
-      : assert(low < 0 || low > high, 'low out of range'),
-        assert(high < 0, 'high out of range');
-
-  factory _$_ValueSubkeyRange.fromJson(Map<String, dynamic> json) =>
-      _$$_ValueSubkeyRangeFromJson(json);
-
-  @override
-  final int low;
-  @override
-  final int high;
-
-  @override
-  String toString() {
-    return 'ValueSubkeyRange(low: $low, high: $high)';
-  }
-
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$_ValueSubkeyRange &&
-            (identical(other.low, low) || other.low == low) &&
-            (identical(other.high, high) || other.high == high));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, low, high);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$_ValueSubkeyRangeCopyWith<_$_ValueSubkeyRange> get copyWith =>
-      __$$_ValueSubkeyRangeCopyWithImpl<_$_ValueSubkeyRange>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$_ValueSubkeyRangeToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ValueSubkeyRange implements ValueSubkeyRange {
-  const factory _ValueSubkeyRange(
-      {required final int low, required final int high}) = _$_ValueSubkeyRange;
-
-  factory _ValueSubkeyRange.fromJson(Map<String, dynamic> json) =
-      _$_ValueSubkeyRange.fromJson;
-
-  @override
-  int get low;
-  @override
-  int get high;
-  @override
-  @JsonKey(ignore: true)
-  _$$_ValueSubkeyRangeCopyWith<_$_ValueSubkeyRange> get copyWith =>
+  _$$DHTRecordDescriptorImplCopyWith<_$DHTRecordDescriptorImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1025,10 +871,11 @@ class _$ValueDataCopyWithImpl<$Res, $Val extends ValueData>
 }
 
 /// @nodoc
-abstract class _$$_ValueDataCopyWith<$Res> implements $ValueDataCopyWith<$Res> {
-  factory _$$_ValueDataCopyWith(
-          _$_ValueData value, $Res Function(_$_ValueData) then) =
-      __$$_ValueDataCopyWithImpl<$Res>;
+abstract class _$$ValueDataImplCopyWith<$Res>
+    implements $ValueDataCopyWith<$Res> {
+  factory _$$ValueDataImplCopyWith(
+          _$ValueDataImpl value, $Res Function(_$ValueDataImpl) then) =
+      __$$ValueDataImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1038,11 +885,11 @@ abstract class _$$_ValueDataCopyWith<$Res> implements $ValueDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$_ValueDataCopyWithImpl<$Res>
-    extends _$ValueDataCopyWithImpl<$Res, _$_ValueData>
-    implements _$$_ValueDataCopyWith<$Res> {
-  __$$_ValueDataCopyWithImpl(
-      _$_ValueData _value, $Res Function(_$_ValueData) _then)
+class __$$ValueDataImplCopyWithImpl<$Res>
+    extends _$ValueDataCopyWithImpl<$Res, _$ValueDataImpl>
+    implements _$$ValueDataImplCopyWith<$Res> {
+  __$$ValueDataImplCopyWithImpl(
+      _$ValueDataImpl _value, $Res Function(_$ValueDataImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1052,7 +899,7 @@ class __$$_ValueDataCopyWithImpl<$Res>
     Object? data = null,
     Object? writer = null,
   }) {
-    return _then(_$_ValueData(
+    return _then(_$ValueDataImpl(
       seq: null == seq
           ? _value.seq
           : seq // ignore: cast_nullable_to_non_nullable
@@ -1071,15 +918,15 @@ class __$$_ValueDataCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_ValueData implements _ValueData {
-  const _$_ValueData(
+class _$ValueDataImpl implements _ValueData {
+  const _$ValueDataImpl(
       {required this.seq,
       @Uint8ListJsonConverter.jsIsArray() required this.data,
       required this.writer})
       : assert(seq >= 0, 'seq out of range');
 
-  factory _$_ValueData.fromJson(Map<String, dynamic> json) =>
-      _$$_ValueDataFromJson(json);
+  factory _$ValueDataImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ValueDataImplFromJson(json);
 
   @override
   final int seq;
@@ -1095,10 +942,10 @@ class _$_ValueData implements _ValueData {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_ValueData &&
+            other is _$ValueDataImpl &&
             (identical(other.seq, seq) || other.seq == seq) &&
             const DeepCollectionEquality().equals(other.data, data) &&
             (identical(other.writer, writer) || other.writer == writer));
@@ -1112,12 +959,12 @@ class _$_ValueData implements _ValueData {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_ValueDataCopyWith<_$_ValueData> get copyWith =>
-      __$$_ValueDataCopyWithImpl<_$_ValueData>(this, _$identity);
+  _$$ValueDataImplCopyWith<_$ValueDataImpl> get copyWith =>
+      __$$ValueDataImplCopyWithImpl<_$ValueDataImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_ValueDataToJson(
+    return _$$ValueDataImplToJson(
       this,
     );
   }
@@ -1127,10 +974,10 @@ abstract class _ValueData implements ValueData {
   const factory _ValueData(
       {required final int seq,
       @Uint8ListJsonConverter.jsIsArray() required final Uint8List data,
-      required final FixedEncodedString43 writer}) = _$_ValueData;
+      required final FixedEncodedString43 writer}) = _$ValueDataImpl;
 
   factory _ValueData.fromJson(Map<String, dynamic> json) =
-      _$_ValueData.fromJson;
+      _$ValueDataImpl.fromJson;
 
   @override
   int get seq;
@@ -1141,7 +988,7 @@ abstract class _ValueData implements ValueData {
   FixedEncodedString43 get writer;
   @override
   @JsonKey(ignore: true)
-  _$$_ValueDataCopyWith<_$_ValueData> get copyWith =>
+  _$$ValueDataImplCopyWith<_$ValueDataImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1215,11 +1062,11 @@ class _$SafetySpecCopyWithImpl<$Res, $Val extends SafetySpec>
 }
 
 /// @nodoc
-abstract class _$$_SafetySpecCopyWith<$Res>
+abstract class _$$SafetySpecImplCopyWith<$Res>
     implements $SafetySpecCopyWith<$Res> {
-  factory _$$_SafetySpecCopyWith(
-          _$_SafetySpec value, $Res Function(_$_SafetySpec) then) =
-      __$$_SafetySpecCopyWithImpl<$Res>;
+  factory _$$SafetySpecImplCopyWith(
+          _$SafetySpecImpl value, $Res Function(_$SafetySpecImpl) then) =
+      __$$SafetySpecImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1230,11 +1077,11 @@ abstract class _$$_SafetySpecCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_SafetySpecCopyWithImpl<$Res>
-    extends _$SafetySpecCopyWithImpl<$Res, _$_SafetySpec>
-    implements _$$_SafetySpecCopyWith<$Res> {
-  __$$_SafetySpecCopyWithImpl(
-      _$_SafetySpec _value, $Res Function(_$_SafetySpec) _then)
+class __$$SafetySpecImplCopyWithImpl<$Res>
+    extends _$SafetySpecCopyWithImpl<$Res, _$SafetySpecImpl>
+    implements _$$SafetySpecImplCopyWith<$Res> {
+  __$$SafetySpecImplCopyWithImpl(
+      _$SafetySpecImpl _value, $Res Function(_$SafetySpecImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1245,7 +1092,7 @@ class __$$_SafetySpecCopyWithImpl<$Res>
     Object? sequencing = null,
     Object? preferredRoute = freezed,
   }) {
-    return _then(_$_SafetySpec(
+    return _then(_$SafetySpecImpl(
       hopCount: null == hopCount
           ? _value.hopCount
           : hopCount // ignore: cast_nullable_to_non_nullable
@@ -1268,15 +1115,15 @@ class __$$_SafetySpecCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_SafetySpec implements _SafetySpec {
-  const _$_SafetySpec(
+class _$SafetySpecImpl implements _SafetySpec {
+  const _$SafetySpecImpl(
       {required this.hopCount,
       required this.stability,
       required this.sequencing,
       this.preferredRoute});
 
-  factory _$_SafetySpec.fromJson(Map<String, dynamic> json) =>
-      _$$_SafetySpecFromJson(json);
+  factory _$SafetySpecImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SafetySpecImplFromJson(json);
 
   @override
   final int hopCount;
@@ -1293,10 +1140,10 @@ class _$_SafetySpec implements _SafetySpec {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_SafetySpec &&
+            other is _$SafetySpecImpl &&
             (identical(other.hopCount, hopCount) ||
                 other.hopCount == hopCount) &&
             (identical(other.stability, stability) ||
@@ -1315,12 +1162,12 @@ class _$_SafetySpec implements _SafetySpec {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_SafetySpecCopyWith<_$_SafetySpec> get copyWith =>
-      __$$_SafetySpecCopyWithImpl<_$_SafetySpec>(this, _$identity);
+  _$$SafetySpecImplCopyWith<_$SafetySpecImpl> get copyWith =>
+      __$$SafetySpecImplCopyWithImpl<_$SafetySpecImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_SafetySpecToJson(
+    return _$$SafetySpecImplToJson(
       this,
     );
   }
@@ -1331,10 +1178,10 @@ abstract class _SafetySpec implements SafetySpec {
       {required final int hopCount,
       required final Stability stability,
       required final Sequencing sequencing,
-      final String? preferredRoute}) = _$_SafetySpec;
+      final String? preferredRoute}) = _$SafetySpecImpl;
 
   factory _SafetySpec.fromJson(Map<String, dynamic> json) =
-      _$_SafetySpec.fromJson;
+      _$SafetySpecImpl.fromJson;
 
   @override
   int get hopCount;
@@ -1346,7 +1193,7 @@ abstract class _SafetySpec implements SafetySpec {
   String? get preferredRoute;
   @override
   @JsonKey(ignore: true)
-  _$$_SafetySpecCopyWith<_$_SafetySpec> get copyWith =>
+  _$$SafetySpecImplCopyWith<_$SafetySpecImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1404,21 +1251,22 @@ class _$RouteBlobCopyWithImpl<$Res, $Val extends RouteBlob>
 }
 
 /// @nodoc
-abstract class _$$_RouteBlobCopyWith<$Res> implements $RouteBlobCopyWith<$Res> {
-  factory _$$_RouteBlobCopyWith(
-          _$_RouteBlob value, $Res Function(_$_RouteBlob) then) =
-      __$$_RouteBlobCopyWithImpl<$Res>;
+abstract class _$$RouteBlobImplCopyWith<$Res>
+    implements $RouteBlobCopyWith<$Res> {
+  factory _$$RouteBlobImplCopyWith(
+          _$RouteBlobImpl value, $Res Function(_$RouteBlobImpl) then) =
+      __$$RouteBlobImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String routeId, @Uint8ListJsonConverter() Uint8List blob});
 }
 
 /// @nodoc
-class __$$_RouteBlobCopyWithImpl<$Res>
-    extends _$RouteBlobCopyWithImpl<$Res, _$_RouteBlob>
-    implements _$$_RouteBlobCopyWith<$Res> {
-  __$$_RouteBlobCopyWithImpl(
-      _$_RouteBlob _value, $Res Function(_$_RouteBlob) _then)
+class __$$RouteBlobImplCopyWithImpl<$Res>
+    extends _$RouteBlobCopyWithImpl<$Res, _$RouteBlobImpl>
+    implements _$$RouteBlobImplCopyWith<$Res> {
+  __$$RouteBlobImplCopyWithImpl(
+      _$RouteBlobImpl _value, $Res Function(_$RouteBlobImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1427,7 +1275,7 @@ class __$$_RouteBlobCopyWithImpl<$Res>
     Object? routeId = null,
     Object? blob = null,
   }) {
-    return _then(_$_RouteBlob(
+    return _then(_$RouteBlobImpl(
       routeId: null == routeId
           ? _value.routeId
           : routeId // ignore: cast_nullable_to_non_nullable
@@ -1442,12 +1290,12 @@ class __$$_RouteBlobCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_RouteBlob implements _RouteBlob {
-  const _$_RouteBlob(
+class _$RouteBlobImpl implements _RouteBlob {
+  const _$RouteBlobImpl(
       {required this.routeId, @Uint8ListJsonConverter() required this.blob});
 
-  factory _$_RouteBlob.fromJson(Map<String, dynamic> json) =>
-      _$$_RouteBlobFromJson(json);
+  factory _$RouteBlobImpl.fromJson(Map<String, dynamic> json) =>
+      _$$RouteBlobImplFromJson(json);
 
   @override
   final String routeId;
@@ -1461,10 +1309,10 @@ class _$_RouteBlob implements _RouteBlob {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_RouteBlob &&
+            other is _$RouteBlobImpl &&
             (identical(other.routeId, routeId) || other.routeId == routeId) &&
             const DeepCollectionEquality().equals(other.blob, blob));
   }
@@ -1477,12 +1325,12 @@ class _$_RouteBlob implements _RouteBlob {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_RouteBlobCopyWith<_$_RouteBlob> get copyWith =>
-      __$$_RouteBlobCopyWithImpl<_$_RouteBlob>(this, _$identity);
+  _$$RouteBlobImplCopyWith<_$RouteBlobImpl> get copyWith =>
+      __$$RouteBlobImplCopyWithImpl<_$RouteBlobImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_RouteBlobToJson(
+    return _$$RouteBlobImplToJson(
       this,
     );
   }
@@ -1490,11 +1338,12 @@ class _$_RouteBlob implements _RouteBlob {
 
 abstract class _RouteBlob implements RouteBlob {
   const factory _RouteBlob(
-      {required final String routeId,
-      @Uint8ListJsonConverter() required final Uint8List blob}) = _$_RouteBlob;
+          {required final String routeId,
+          @Uint8ListJsonConverter() required final Uint8List blob}) =
+      _$RouteBlobImpl;
 
   factory _RouteBlob.fromJson(Map<String, dynamic> json) =
-      _$_RouteBlob.fromJson;
+      _$RouteBlobImpl.fromJson;
 
   @override
   String get routeId;
@@ -1503,6 +1352,213 @@ abstract class _RouteBlob implements RouteBlob {
   Uint8List get blob;
   @override
   @JsonKey(ignore: true)
-  _$$_RouteBlobCopyWith<_$_RouteBlob> get copyWith =>
+  _$$RouteBlobImplCopyWith<_$RouteBlobImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+DHTRecordReport _$DHTRecordReportFromJson(Map<String, dynamic> json) {
+  return _DHTRecordReport.fromJson(json);
+}
+
+/// @nodoc
+mixin _$DHTRecordReport {
+  List<ValueSubkeyRange> get subkeys => throw _privateConstructorUsedError;
+  List<int> get localSeqs => throw _privateConstructorUsedError;
+  List<int> get networkSeqs => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $DHTRecordReportCopyWith<DHTRecordReport> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $DHTRecordReportCopyWith<$Res> {
+  factory $DHTRecordReportCopyWith(
+          DHTRecordReport value, $Res Function(DHTRecordReport) then) =
+      _$DHTRecordReportCopyWithImpl<$Res, DHTRecordReport>;
+  @useResult
+  $Res call(
+      {List<ValueSubkeyRange> subkeys,
+      List<int> localSeqs,
+      List<int> networkSeqs});
+}
+
+/// @nodoc
+class _$DHTRecordReportCopyWithImpl<$Res, $Val extends DHTRecordReport>
+    implements $DHTRecordReportCopyWith<$Res> {
+  _$DHTRecordReportCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? subkeys = null,
+    Object? localSeqs = null,
+    Object? networkSeqs = null,
+  }) {
+    return _then(_value.copyWith(
+      subkeys: null == subkeys
+          ? _value.subkeys
+          : subkeys // ignore: cast_nullable_to_non_nullable
+              as List<ValueSubkeyRange>,
+      localSeqs: null == localSeqs
+          ? _value.localSeqs
+          : localSeqs // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+      networkSeqs: null == networkSeqs
+          ? _value.networkSeqs
+          : networkSeqs // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$DHTRecordReportImplCopyWith<$Res>
+    implements $DHTRecordReportCopyWith<$Res> {
+  factory _$$DHTRecordReportImplCopyWith(_$DHTRecordReportImpl value,
+          $Res Function(_$DHTRecordReportImpl) then) =
+      __$$DHTRecordReportImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {List<ValueSubkeyRange> subkeys,
+      List<int> localSeqs,
+      List<int> networkSeqs});
+}
+
+/// @nodoc
+class __$$DHTRecordReportImplCopyWithImpl<$Res>
+    extends _$DHTRecordReportCopyWithImpl<$Res, _$DHTRecordReportImpl>
+    implements _$$DHTRecordReportImplCopyWith<$Res> {
+  __$$DHTRecordReportImplCopyWithImpl(
+      _$DHTRecordReportImpl _value, $Res Function(_$DHTRecordReportImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? subkeys = null,
+    Object? localSeqs = null,
+    Object? networkSeqs = null,
+  }) {
+    return _then(_$DHTRecordReportImpl(
+      subkeys: null == subkeys
+          ? _value._subkeys
+          : subkeys // ignore: cast_nullable_to_non_nullable
+              as List<ValueSubkeyRange>,
+      localSeqs: null == localSeqs
+          ? _value._localSeqs
+          : localSeqs // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+      networkSeqs: null == networkSeqs
+          ? _value._networkSeqs
+          : networkSeqs // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$DHTRecordReportImpl implements _DHTRecordReport {
+  const _$DHTRecordReportImpl(
+      {required final List<ValueSubkeyRange> subkeys,
+      required final List<int> localSeqs,
+      required final List<int> networkSeqs})
+      : _subkeys = subkeys,
+        _localSeqs = localSeqs,
+        _networkSeqs = networkSeqs;
+
+  factory _$DHTRecordReportImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DHTRecordReportImplFromJson(json);
+
+  final List<ValueSubkeyRange> _subkeys;
+  @override
+  List<ValueSubkeyRange> get subkeys {
+    if (_subkeys is EqualUnmodifiableListView) return _subkeys;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_subkeys);
+  }
+
+  final List<int> _localSeqs;
+  @override
+  List<int> get localSeqs {
+    if (_localSeqs is EqualUnmodifiableListView) return _localSeqs;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_localSeqs);
+  }
+
+  final List<int> _networkSeqs;
+  @override
+  List<int> get networkSeqs {
+    if (_networkSeqs is EqualUnmodifiableListView) return _networkSeqs;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_networkSeqs);
+  }
+
+  @override
+  String toString() {
+    return 'DHTRecordReport(subkeys: $subkeys, localSeqs: $localSeqs, networkSeqs: $networkSeqs)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$DHTRecordReportImpl &&
+            const DeepCollectionEquality().equals(other._subkeys, _subkeys) &&
+            const DeepCollectionEquality()
+                .equals(other._localSeqs, _localSeqs) &&
+            const DeepCollectionEquality()
+                .equals(other._networkSeqs, _networkSeqs));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(_subkeys),
+      const DeepCollectionEquality().hash(_localSeqs),
+      const DeepCollectionEquality().hash(_networkSeqs));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$DHTRecordReportImplCopyWith<_$DHTRecordReportImpl> get copyWith =>
+      __$$DHTRecordReportImplCopyWithImpl<_$DHTRecordReportImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$DHTRecordReportImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _DHTRecordReport implements DHTRecordReport {
+  const factory _DHTRecordReport(
+      {required final List<ValueSubkeyRange> subkeys,
+      required final List<int> localSeqs,
+      required final List<int> networkSeqs}) = _$DHTRecordReportImpl;
+
+  factory _DHTRecordReport.fromJson(Map<String, dynamic> json) =
+      _$DHTRecordReportImpl.fromJson;
+
+  @override
+  List<ValueSubkeyRange> get subkeys;
+  @override
+  List<int> get localSeqs;
+  @override
+  List<int> get networkSeqs;
+  @override
+  @JsonKey(ignore: true)
+  _$$DHTRecordReportImplCopyWith<_$DHTRecordReportImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/veilid-flutter/lib/routing_context.g.dart b/veilid-flutter/lib/routing_context.g.dart
index d76ff703..e0991f99 100644
--- a/veilid-flutter/lib/routing_context.g.dart
+++ b/veilid-flutter/lib/routing_context.g.dart
@@ -6,20 +6,20 @@ part of 'routing_context.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$DHTSchemaDFLT _$$DHTSchemaDFLTFromJson(Map<String, dynamic> json) =>
-    _$DHTSchemaDFLT(
+_$DHTSchemaDFLTImpl _$$DHTSchemaDFLTImplFromJson(Map<String, dynamic> json) =>
+    _$DHTSchemaDFLTImpl(
       oCnt: json['o_cnt'] as int,
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$DHTSchemaDFLTToJson(_$DHTSchemaDFLT instance) =>
+Map<String, dynamic> _$$DHTSchemaDFLTImplToJson(_$DHTSchemaDFLTImpl instance) =>
     <String, dynamic>{
       'o_cnt': instance.oCnt,
       'kind': instance.$type,
     };
 
-_$DHTSchemaSMPL _$$DHTSchemaSMPLFromJson(Map<String, dynamic> json) =>
-    _$DHTSchemaSMPL(
+_$DHTSchemaSMPLImpl _$$DHTSchemaSMPLImplFromJson(Map<String, dynamic> json) =>
+    _$DHTSchemaSMPLImpl(
       oCnt: json['o_cnt'] as int,
       members: (json['members'] as List<dynamic>)
           .map(DHTSchemaMember.fromJson)
@@ -27,28 +27,30 @@ _$DHTSchemaSMPL _$$DHTSchemaSMPLFromJson(Map<String, dynamic> json) =>
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$DHTSchemaSMPLToJson(_$DHTSchemaSMPL instance) =>
+Map<String, dynamic> _$$DHTSchemaSMPLImplToJson(_$DHTSchemaSMPLImpl instance) =>
     <String, dynamic>{
       'o_cnt': instance.oCnt,
       'members': instance.members.map((e) => e.toJson()).toList(),
       'kind': instance.$type,
     };
 
-_$_DHTSchemaMember _$$_DHTSchemaMemberFromJson(Map<String, dynamic> json) =>
-    _$_DHTSchemaMember(
+_$DHTSchemaMemberImpl _$$DHTSchemaMemberImplFromJson(
+        Map<String, dynamic> json) =>
+    _$DHTSchemaMemberImpl(
       mKey: FixedEncodedString43.fromJson(json['m_key']),
       mCnt: json['m_cnt'] as int,
     );
 
-Map<String, dynamic> _$$_DHTSchemaMemberToJson(_$_DHTSchemaMember instance) =>
+Map<String, dynamic> _$$DHTSchemaMemberImplToJson(
+        _$DHTSchemaMemberImpl instance) =>
     <String, dynamic>{
       'm_key': instance.mKey.toJson(),
       'm_cnt': instance.mCnt,
     };
 
-_$_DHTRecordDescriptor _$$_DHTRecordDescriptorFromJson(
+_$DHTRecordDescriptorImpl _$$DHTRecordDescriptorImplFromJson(
         Map<String, dynamic> json) =>
-    _$_DHTRecordDescriptor(
+    _$DHTRecordDescriptorImpl(
       key: Typed<FixedEncodedString43>.fromJson(json['key']),
       owner: FixedEncodedString43.fromJson(json['owner']),
       schema: DHTSchema.fromJson(json['schema']),
@@ -57,8 +59,8 @@ _$_DHTRecordDescriptor _$$_DHTRecordDescriptorFromJson(
           : FixedEncodedString43.fromJson(json['owner_secret']),
     );
 
-Map<String, dynamic> _$$_DHTRecordDescriptorToJson(
-        _$_DHTRecordDescriptor instance) =>
+Map<String, dynamic> _$$DHTRecordDescriptorImplToJson(
+        _$DHTRecordDescriptorImpl instance) =>
     <String, dynamic>{
       'key': instance.key.toJson(),
       'owner': instance.owner.toJson(),
@@ -66,40 +68,29 @@ Map<String, dynamic> _$$_DHTRecordDescriptorToJson(
       'owner_secret': instance.ownerSecret?.toJson(),
     };
 
-_$_ValueSubkeyRange _$$_ValueSubkeyRangeFromJson(Map<String, dynamic> json) =>
-    _$_ValueSubkeyRange(
-      low: json['low'] as int,
-      high: json['high'] as int,
-    );
-
-Map<String, dynamic> _$$_ValueSubkeyRangeToJson(_$_ValueSubkeyRange instance) =>
-    <String, dynamic>{
-      'low': instance.low,
-      'high': instance.high,
-    };
-
-_$_ValueData _$$_ValueDataFromJson(Map<String, dynamic> json) => _$_ValueData(
+_$ValueDataImpl _$$ValueDataImplFromJson(Map<String, dynamic> json) =>
+    _$ValueDataImpl(
       seq: json['seq'] as int,
       data: const Uint8ListJsonConverter.jsIsArray().fromJson(json['data']),
       writer: FixedEncodedString43.fromJson(json['writer']),
     );
 
-Map<String, dynamic> _$$_ValueDataToJson(_$_ValueData instance) =>
+Map<String, dynamic> _$$ValueDataImplToJson(_$ValueDataImpl instance) =>
     <String, dynamic>{
       'seq': instance.seq,
       'data': const Uint8ListJsonConverter.jsIsArray().toJson(instance.data),
       'writer': instance.writer.toJson(),
     };
 
-_$_SafetySpec _$$_SafetySpecFromJson(Map<String, dynamic> json) =>
-    _$_SafetySpec(
+_$SafetySpecImpl _$$SafetySpecImplFromJson(Map<String, dynamic> json) =>
+    _$SafetySpecImpl(
       hopCount: json['hop_count'] as int,
       stability: Stability.fromJson(json['stability']),
       sequencing: Sequencing.fromJson(json['sequencing']),
       preferredRoute: json['preferred_route'] as String?,
     );
 
-Map<String, dynamic> _$$_SafetySpecToJson(_$_SafetySpec instance) =>
+Map<String, dynamic> _$$SafetySpecImplToJson(_$SafetySpecImpl instance) =>
     <String, dynamic>{
       'hop_count': instance.hopCount,
       'stability': instance.stability.toJson(),
@@ -107,13 +98,34 @@ Map<String, dynamic> _$$_SafetySpecToJson(_$_SafetySpec instance) =>
       'preferred_route': instance.preferredRoute,
     };
 
-_$_RouteBlob _$$_RouteBlobFromJson(Map<String, dynamic> json) => _$_RouteBlob(
+_$RouteBlobImpl _$$RouteBlobImplFromJson(Map<String, dynamic> json) =>
+    _$RouteBlobImpl(
       routeId: json['route_id'] as String,
       blob: const Uint8ListJsonConverter().fromJson(json['blob']),
     );
 
-Map<String, dynamic> _$$_RouteBlobToJson(_$_RouteBlob instance) =>
+Map<String, dynamic> _$$RouteBlobImplToJson(_$RouteBlobImpl instance) =>
     <String, dynamic>{
       'route_id': instance.routeId,
       'blob': const Uint8ListJsonConverter().toJson(instance.blob),
     };
+
+_$DHTRecordReportImpl _$$DHTRecordReportImplFromJson(
+        Map<String, dynamic> json) =>
+    _$DHTRecordReportImpl(
+      subkeys: (json['subkeys'] as List<dynamic>)
+          .map(ValueSubkeyRange.fromJson)
+          .toList(),
+      localSeqs:
+          (json['local_seqs'] as List<dynamic>).map((e) => e as int).toList(),
+      networkSeqs:
+          (json['network_seqs'] as List<dynamic>).map((e) => e as int).toList(),
+    );
+
+Map<String, dynamic> _$$DHTRecordReportImplToJson(
+        _$DHTRecordReportImpl instance) =>
+    <String, dynamic>{
+      'subkeys': instance.subkeys.map((e) => e.toJson()).toList(),
+      'local_seqs': instance.localSeqs,
+      'network_seqs': instance.networkSeqs,
+    };
diff --git a/veilid-flutter/lib/value_subkey_range.dart b/veilid-flutter/lib/value_subkey_range.dart
new file mode 100644
index 00000000..a8ef3b0e
--- /dev/null
+++ b/veilid-flutter/lib/value_subkey_range.dart
@@ -0,0 +1,161 @@
+import 'dart:math';
+
+import 'package:equatable/equatable.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+@immutable
+class ValueSubkeyRange extends Equatable {
+  const ValueSubkeyRange({
+    required this.low,
+    required this.high,
+  }) : assert(low >= 0 && low <= high, 'range is invalid');
+
+  factory ValueSubkeyRange.single(int val) =>
+      ValueSubkeyRange(low: val, high: val);
+  factory ValueSubkeyRange.make(int low, int high) =>
+      ValueSubkeyRange(low: low, high: high);
+  factory ValueSubkeyRange.fromIntPair((int, int) pair) =>
+      ValueSubkeyRange(low: pair.$1, high: pair.$2);
+  factory ValueSubkeyRange.fromIntList(List<int> intlist) {
+    assert(intlist.length == 2, 'range must be a two item list');
+    return ValueSubkeyRange(low: intlist[0], high: intlist[1]);
+  }
+  factory ValueSubkeyRange.fromJson(dynamic json) =>
+      ValueSubkeyRange.fromIntList((json as List<dynamic>).cast<int>());
+
+  List<int> toJson() => <int>[low, high];
+
+  @override
+  List<Object> get props => [low, high];
+
+  final int low;
+  final int high;
+}
+
+extension ValueSubkeyRangeExt on ValueSubkeyRange {
+  bool contains(int v) => low <= v && v <= high;
+  List<ValueSubkeyRange> remove(int v) {
+    if (v < low || v > high) {
+      return [ValueSubkeyRange(low: low, high: high)];
+    }
+    if (v == low) {
+      if (v == high) {
+        return [];
+      } else {
+        return [ValueSubkeyRange(low: v + 1, high: high)];
+      }
+    } else if (v == high) {
+      return [ValueSubkeyRange(low: low, high: v - 1)];
+    } else {
+      return [
+        ValueSubkeyRange(low: low, high: v - 1),
+        ValueSubkeyRange(low: v + 1, high: high)
+      ];
+    }
+  }
+
+  ValueSubkeyRange? intersect(ValueSubkeyRange other) {
+    if (high < other.low || low > other.high) {
+      return null;
+    }
+    return ValueSubkeyRange(
+        low: max(low, other.low), high: min(high, other.high));
+  }
+
+  ValueSubkeyRange? union(ValueSubkeyRange other) {
+    if (high < (other.low - 1) || low > (other.high + 1)) {
+      return null;
+    }
+    return ValueSubkeyRange(
+        low: min(low, other.low), high: max(high, other.high));
+  }
+}
+
+extension ListValueSubkeyRangeExt on List<ValueSubkeyRange> {
+  static List<ValueSubkeyRange> fromIntPairs(List<(int, int)> x) =>
+      x.map(ValueSubkeyRange.fromIntPair).toList();
+
+  void validate() {
+    int? lastHigh;
+    for (final r in this) {
+      assert(lastHigh == null || r.low > lastHigh,
+          'subrange not in order or disjoint');
+      lastHigh = r.high;
+    }
+  }
+
+  bool containsSubkey(int v) => indexWhere((e) => e.contains(v)) != -1;
+  List<ValueSubkeyRange> removeSubkey(int v) {
+    for (var i = 0; i < length; i++) {
+      if (this[i].contains(v)) {
+        return [...sublist(0, i), ...this[i].remove(v), ...sublist(i + 1)];
+      }
+    }
+    return toList();
+  }
+
+  int? get firstSubkey => isNotEmpty ? first.low : null;
+
+  List<ValueSubkeyRange> intersectSubkeys(List<ValueSubkeyRange> other) {
+    final out = <ValueSubkeyRange>[];
+    for (var i = 0, j = 0; i < length && j < other.length;) {
+      final vsrThis = this[i];
+      final vsrOther = other[j];
+      if (vsrThis.high < vsrOther.low) {
+        i++;
+        continue;
+      }
+      if (vsrOther.high < vsrThis.low) {
+        j++;
+        continue;
+      }
+
+      // Otherwise we intersect
+      out.add(vsrThis.intersect(vsrOther)!);
+
+      // Iterate whichever has a lower high
+      // If they both have the same high then both ranges are exhausted
+      // and should be iterated
+      if (vsrThis.high < vsrOther.high) {
+        // Iterate this because other could still have some overlaps
+        i++;
+      } else if (vsrThis.high == vsrOther.high) {
+        // Iterate both because both ranges are exhausted
+        i++;
+        j++;
+      } else {
+        // Iterate other because this could still have some overlaps
+        j++;
+      }
+    }
+    return out;
+  }
+
+  List<ValueSubkeyRange> unionSubkeys(List<ValueSubkeyRange> other) {
+    final out = <ValueSubkeyRange>[];
+    ValueSubkeyRange? current;
+    for (var i = 0, j = 0; i < length || j < other.length;) {
+      if (i == length) {
+        current = other[j];
+        j++;
+      } else if (j == other.length) {
+        current = this[i];
+        i++;
+      } else if (this[i].low < other[j].low) {
+        current = this[i];
+        i++;
+      } else {
+        current = other[j];
+        j++;
+      }
+
+      if (out.isNotEmpty && out.last.high >= (current.low - 1)) {
+        out[out.length - 1] = ValueSubkeyRange(
+            low: out.last.low, high: max(out.last.high, current.high));
+      } else {
+        out.add(current);
+      }
+    }
+    return out;
+  }
+}
diff --git a/veilid-flutter/lib/veilid.dart b/veilid-flutter/lib/veilid.dart
index e17ec7e9..fbcd6f54 100644
--- a/veilid-flutter/lib/veilid.dart
+++ b/veilid-flutter/lib/veilid.dart
@@ -18,6 +18,7 @@ import 'veilid_table_db.dart';
 
 export 'default_config.dart';
 export 'routing_context.dart';
+export 'value_subkey_range.dart';
 export 'veilid.dart';
 export 'veilid_api_exception.dart';
 export 'veilid_config.dart';
@@ -42,7 +43,7 @@ Object? veilidApiToEncodable(Object? value) {
 
 List<T> Function(dynamic) jsonListConstructor<T>(
         T Function(dynamic) jsonConstructor) =>
-    (dynamic j) => (j as List<dynamic>).map((e) => jsonConstructor(e)).toList();
+    (dynamic j) => (j as List<dynamic>).map(jsonConstructor).toList();
 
 //////////////////////////////////////
 /// VeilidVersion
@@ -62,6 +63,7 @@ class VeilidVersion extends Equatable {
 @immutable
 class Timestamp extends Equatable implements Comparable<Timestamp> {
   const Timestamp({required this.value});
+  factory Timestamp.zero() => Timestamp(value: BigInt.zero);
   factory Timestamp.fromInt64(Int64 i64) => Timestamp(
       value: (BigInt.from((i64 >> 32).toUnsigned(32).toInt()) << 32) |
           BigInt.from(i64.toUnsigned(32).toInt()));
@@ -75,6 +77,11 @@ class Timestamp extends Equatable implements Comparable<Timestamp> {
   @override
   int compareTo(Timestamp other) => value.compareTo(other.value);
 
+  bool operator <(Timestamp other) => compareTo(other) < 0;
+  bool operator <=(Timestamp other) => compareTo(other) <= 0;
+  bool operator >(Timestamp other) => compareTo(other) > 0;
+  bool operator >=(Timestamp other) => compareTo(other) >= 0;
+
   @override
   String toString() => value.toString();
   String toJson() => toString();
@@ -95,6 +102,11 @@ class TimestampDuration extends Equatable
   factory TimestampDuration.fromInt64(Int64 i64) => TimestampDuration(
       value: (BigInt.from((i64 >> 32).toUnsigned(32).toInt()) << 32) |
           BigInt.from(i64.toUnsigned(32).toInt()));
+  factory TimestampDuration.fromMillis(int millis) =>
+      TimestampDuration(value: BigInt.from(millis) * BigInt.from(1000));
+  factory TimestampDuration.fromDuration(Duration d) => TimestampDuration(
+      value: BigInt.from(d.inSeconds) * BigInt.from(1000000) +
+          BigInt.from(d.inMicroseconds % 1000000));
   factory TimestampDuration.fromString(String s) =>
       TimestampDuration(value: BigInt.parse(s));
   factory TimestampDuration.fromJson(dynamic json) =>
@@ -106,6 +118,11 @@ class TimestampDuration extends Equatable
   @override
   int compareTo(TimestampDuration other) => value.compareTo(other.value);
 
+  bool operator <(TimestampDuration other) => compareTo(other) < 0;
+  bool operator <=(TimestampDuration other) => compareTo(other) <= 0;
+  bool operator >(TimestampDuration other) => compareTo(other) > 0;
+  bool operator >=(TimestampDuration other) => compareTo(other) >= 0;
+
   @override
   String toString() => value.toString();
   String toJson() => toString();
@@ -124,6 +141,7 @@ abstract class Veilid {
 
   void initializeVeilidCore(Map<String, dynamic> platformConfigJson);
   void changeLogLevel(String layer, VeilidConfigLogLevel logLevel);
+  void changeLogIgnore(String layer, List<String> changes);
   Future<Stream<VeilidUpdate>> startupVeilidCore(VeilidConfig config);
   Future<VeilidState> getVeilidState();
   Future<void> attach();
@@ -142,13 +160,28 @@ abstract class Veilid {
 
   // Routing context
   Future<VeilidRoutingContext> routingContext();
+  Future<VeilidRoutingContext> safeRoutingContext(
+      {Stability stability = Stability.lowLatency,
+      Sequencing sequencing = Sequencing.preferOrdered}) async {
+    final rc = await routingContext();
+    final originalSafety = await rc.safety() as SafetySelectionSafe;
+    final safetySpec = originalSafety.safetySpec
+        .copyWith(stability: stability, sequencing: sequencing);
+    return rc.withSafety(SafetySelectionSafe(safetySpec: safetySpec),
+        closeSelf: true);
+  }
+
+  Future<VeilidRoutingContext> unsafeRoutingContext(
+          {Sequencing sequencing = Sequencing.preferOrdered}) async =>
+      (await routingContext())
+          .withSafety(SafetySelectionUnsafe(sequencing: sequencing));
 
   // Private route allocation
   Future<RouteBlob> newPrivateRoute();
   Future<RouteBlob> newCustomPrivateRoute(
       Stability stability, Sequencing sequencing);
   Future<String> importRemotePrivateRoute(Uint8List blob);
-  Future<void> releasePrivateRoute(String key);
+  Future<void> releasePrivateRoute(String routeId);
 
   // App calls
   Future<void> appCallReply(String callId, Uint8List message);
@@ -161,5 +194,6 @@ abstract class Veilid {
   Timestamp now();
   String veilidVersionString();
   VeilidVersion veilidVersion();
+  String defaultVeilidConfig();
   Future<String> debug(String command);
 }
diff --git a/veilid-flutter/lib/veilid_config.dart b/veilid-flutter/lib/veilid_config.dart
index cc34e6b5..8a0d6871 100644
--- a/veilid-flutter/lib/veilid_config.dart
+++ b/veilid-flutter/lib/veilid_config.dart
@@ -14,6 +14,7 @@ class VeilidFFIConfigLoggingTerminal with _$VeilidFFIConfigLoggingTerminal {
   const factory VeilidFFIConfigLoggingTerminal({
     required bool enabled,
     required VeilidConfigLogLevel level,
+    @Default([]) List<String> ignoreLogTargets,
   }) = _VeilidFFIConfigLoggingTerminal;
 
   factory VeilidFFIConfigLoggingTerminal.fromJson(dynamic json) =>
@@ -27,6 +28,7 @@ class VeilidFFIConfigLoggingOtlp with _$VeilidFFIConfigLoggingOtlp {
     required VeilidConfigLogLevel level,
     required String grpcEndpoint,
     required String serviceName,
+    @Default([]) List<String> ignoreLogTargets,
   }) = _VeilidFFIConfigLoggingOtlp;
 
   factory VeilidFFIConfigLoggingOtlp.fromJson(dynamic json) =>
@@ -38,6 +40,7 @@ class VeilidFFIConfigLoggingApi with _$VeilidFFIConfigLoggingApi {
   const factory VeilidFFIConfigLoggingApi({
     required bool enabled,
     required VeilidConfigLogLevel level,
+    @Default([]) List<String> ignoreLogTargets,
   }) = _VeilidFFIConfigLoggingApi;
 
   factory VeilidFFIConfigLoggingApi.fromJson(dynamic json) =>
@@ -76,6 +79,7 @@ class VeilidWASMConfigLoggingPerformance
     required VeilidConfigLogLevel level,
     required bool logsInTimings,
     required bool logsInConsole,
+    @Default([]) List<String> ignoreLogTargets,
   }) = _VeilidWASMConfigLoggingPerformance;
 
   factory VeilidWASMConfigLoggingPerformance.fromJson(dynamic json) =>
@@ -88,6 +92,7 @@ class VeilidWASMConfigLoggingApi with _$VeilidWASMConfigLoggingApi {
   const factory VeilidWASMConfigLoggingApi({
     required bool enabled,
     required VeilidConfigLogLevel level,
+    @Default([]) List<String> ignoreLogTargets,
   }) = _VeilidWASMConfigLoggingApi;
 
   factory VeilidWASMConfigLoggingApi.fromJson(dynamic json) =>
diff --git a/veilid-flutter/lib/veilid_config.freezed.dart b/veilid-flutter/lib/veilid_config.freezed.dart
index 0f74d2d4..f7a00931 100644
--- a/veilid-flutter/lib/veilid_config.freezed.dart
+++ b/veilid-flutter/lib/veilid_config.freezed.dart
@@ -12,7 +12,7 @@ part of 'veilid_config.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 VeilidFFIConfigLoggingTerminal _$VeilidFFIConfigLoggingTerminalFromJson(
     Map<String, dynamic> json) {
@@ -23,6 +23,7 @@ VeilidFFIConfigLoggingTerminal _$VeilidFFIConfigLoggingTerminalFromJson(
 mixin _$VeilidFFIConfigLoggingTerminal {
   bool get enabled => throw _privateConstructorUsedError;
   VeilidConfigLogLevel get level => throw _privateConstructorUsedError;
+  List<String> get ignoreLogTargets => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -38,7 +39,10 @@ abstract class $VeilidFFIConfigLoggingTerminalCopyWith<$Res> {
       _$VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res,
           VeilidFFIConfigLoggingTerminal>;
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
@@ -57,6 +61,7 @@ class _$VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res,
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
     return _then(_value.copyWith(
       enabled: null == enabled
@@ -67,30 +72,37 @@ class _$VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res,
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value.ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$_VeilidFFIConfigLoggingTerminalCopyWith<$Res>
+abstract class _$$VeilidFFIConfigLoggingTerminalImplCopyWith<$Res>
     implements $VeilidFFIConfigLoggingTerminalCopyWith<$Res> {
-  factory _$$_VeilidFFIConfigLoggingTerminalCopyWith(
-          _$_VeilidFFIConfigLoggingTerminal value,
-          $Res Function(_$_VeilidFFIConfigLoggingTerminal) then) =
-      __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res>;
+  factory _$$VeilidFFIConfigLoggingTerminalImplCopyWith(
+          _$VeilidFFIConfigLoggingTerminalImpl value,
+          $Res Function(_$VeilidFFIConfigLoggingTerminalImpl) then) =
+      __$$VeilidFFIConfigLoggingTerminalImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
-class __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res>
+class __$$VeilidFFIConfigLoggingTerminalImplCopyWithImpl<$Res>
     extends _$VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res,
-        _$_VeilidFFIConfigLoggingTerminal>
-    implements _$$_VeilidFFIConfigLoggingTerminalCopyWith<$Res> {
-  __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl(
-      _$_VeilidFFIConfigLoggingTerminal _value,
-      $Res Function(_$_VeilidFFIConfigLoggingTerminal) _then)
+        _$VeilidFFIConfigLoggingTerminalImpl>
+    implements _$$VeilidFFIConfigLoggingTerminalImplCopyWith<$Res> {
+  __$$VeilidFFIConfigLoggingTerminalImplCopyWithImpl(
+      _$VeilidFFIConfigLoggingTerminalImpl _value,
+      $Res Function(_$VeilidFFIConfigLoggingTerminalImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -98,8 +110,9 @@ class __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res>
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
-    return _then(_$_VeilidFFIConfigLoggingTerminal(
+    return _then(_$VeilidFFIConfigLoggingTerminalImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -108,30 +121,46 @@ class __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl<$Res>
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value._ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidFFIConfigLoggingTerminal
+class _$VeilidFFIConfigLoggingTerminalImpl
     with DiagnosticableTreeMixin
     implements _VeilidFFIConfigLoggingTerminal {
-  const _$_VeilidFFIConfigLoggingTerminal(
-      {required this.enabled, required this.level});
+  const _$VeilidFFIConfigLoggingTerminalImpl(
+      {required this.enabled,
+      required this.level,
+      final List<String> ignoreLogTargets = const []})
+      : _ignoreLogTargets = ignoreLogTargets;
 
-  factory _$_VeilidFFIConfigLoggingTerminal.fromJson(
+  factory _$VeilidFFIConfigLoggingTerminalImpl.fromJson(
           Map<String, dynamic> json) =>
-      _$$_VeilidFFIConfigLoggingTerminalFromJson(json);
+      _$$VeilidFFIConfigLoggingTerminalImplFromJson(json);
 
   @override
   final bool enabled;
   @override
   final VeilidConfigLogLevel level;
+  final List<String> _ignoreLogTargets;
+  @override
+  @JsonKey()
+  List<String> get ignoreLogTargets {
+    if (_ignoreLogTargets is EqualUnmodifiableListView)
+      return _ignoreLogTargets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ignoreLogTargets);
+  }
 
   @override
   String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
-    return 'VeilidFFIConfigLoggingTerminal(enabled: $enabled, level: $level)';
+    return 'VeilidFFIConfigLoggingTerminal(enabled: $enabled, level: $level, ignoreLogTargets: $ignoreLogTargets)';
   }
 
   @override
@@ -140,32 +169,37 @@ class _$_VeilidFFIConfigLoggingTerminal
     properties
       ..add(DiagnosticsProperty('type', 'VeilidFFIConfigLoggingTerminal'))
       ..add(DiagnosticsProperty('enabled', enabled))
-      ..add(DiagnosticsProperty('level', level));
+      ..add(DiagnosticsProperty('level', level))
+      ..add(DiagnosticsProperty('ignoreLogTargets', ignoreLogTargets));
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidFFIConfigLoggingTerminal &&
+            other is _$VeilidFFIConfigLoggingTerminalImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
-            (identical(other.level, level) || other.level == level));
+            (identical(other.level, level) || other.level == level) &&
+            const DeepCollectionEquality()
+                .equals(other._ignoreLogTargets, _ignoreLogTargets));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, enabled, level);
+  int get hashCode => Object.hash(runtimeType, enabled, level,
+      const DeepCollectionEquality().hash(_ignoreLogTargets));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidFFIConfigLoggingTerminalCopyWith<_$_VeilidFFIConfigLoggingTerminal>
-      get copyWith => __$$_VeilidFFIConfigLoggingTerminalCopyWithImpl<
-          _$_VeilidFFIConfigLoggingTerminal>(this, _$identity);
+  _$$VeilidFFIConfigLoggingTerminalImplCopyWith<
+          _$VeilidFFIConfigLoggingTerminalImpl>
+      get copyWith => __$$VeilidFFIConfigLoggingTerminalImplCopyWithImpl<
+          _$VeilidFFIConfigLoggingTerminalImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidFFIConfigLoggingTerminalToJson(
+    return _$$VeilidFFIConfigLoggingTerminalImplToJson(
       this,
     );
   }
@@ -175,19 +209,23 @@ abstract class _VeilidFFIConfigLoggingTerminal
     implements VeilidFFIConfigLoggingTerminal {
   const factory _VeilidFFIConfigLoggingTerminal(
           {required final bool enabled,
-          required final VeilidConfigLogLevel level}) =
-      _$_VeilidFFIConfigLoggingTerminal;
+          required final VeilidConfigLogLevel level,
+          final List<String> ignoreLogTargets}) =
+      _$VeilidFFIConfigLoggingTerminalImpl;
 
   factory _VeilidFFIConfigLoggingTerminal.fromJson(Map<String, dynamic> json) =
-      _$_VeilidFFIConfigLoggingTerminal.fromJson;
+      _$VeilidFFIConfigLoggingTerminalImpl.fromJson;
 
   @override
   bool get enabled;
   @override
   VeilidConfigLogLevel get level;
   @override
+  List<String> get ignoreLogTargets;
+  @override
   @JsonKey(ignore: true)
-  _$$_VeilidFFIConfigLoggingTerminalCopyWith<_$_VeilidFFIConfigLoggingTerminal>
+  _$$VeilidFFIConfigLoggingTerminalImplCopyWith<
+          _$VeilidFFIConfigLoggingTerminalImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -202,6 +240,7 @@ mixin _$VeilidFFIConfigLoggingOtlp {
   VeilidConfigLogLevel get level => throw _privateConstructorUsedError;
   String get grpcEndpoint => throw _privateConstructorUsedError;
   String get serviceName => throw _privateConstructorUsedError;
+  List<String> get ignoreLogTargets => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -220,7 +259,8 @@ abstract class $VeilidFFIConfigLoggingOtlpCopyWith<$Res> {
       {bool enabled,
       VeilidConfigLogLevel level,
       String grpcEndpoint,
-      String serviceName});
+      String serviceName,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
@@ -241,6 +281,7 @@ class _$VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res,
     Object? level = null,
     Object? grpcEndpoint = null,
     Object? serviceName = null,
+    Object? ignoreLogTargets = null,
   }) {
     return _then(_value.copyWith(
       enabled: null == enabled
@@ -259,34 +300,39 @@ class _$VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res,
           ? _value.serviceName
           : serviceName // ignore: cast_nullable_to_non_nullable
               as String,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value.ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$_VeilidFFIConfigLoggingOtlpCopyWith<$Res>
+abstract class _$$VeilidFFIConfigLoggingOtlpImplCopyWith<$Res>
     implements $VeilidFFIConfigLoggingOtlpCopyWith<$Res> {
-  factory _$$_VeilidFFIConfigLoggingOtlpCopyWith(
-          _$_VeilidFFIConfigLoggingOtlp value,
-          $Res Function(_$_VeilidFFIConfigLoggingOtlp) then) =
-      __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res>;
+  factory _$$VeilidFFIConfigLoggingOtlpImplCopyWith(
+          _$VeilidFFIConfigLoggingOtlpImpl value,
+          $Res Function(_$VeilidFFIConfigLoggingOtlpImpl) then) =
+      __$$VeilidFFIConfigLoggingOtlpImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {bool enabled,
       VeilidConfigLogLevel level,
       String grpcEndpoint,
-      String serviceName});
+      String serviceName,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
-class __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res>
+class __$$VeilidFFIConfigLoggingOtlpImplCopyWithImpl<$Res>
     extends _$VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res,
-        _$_VeilidFFIConfigLoggingOtlp>
-    implements _$$_VeilidFFIConfigLoggingOtlpCopyWith<$Res> {
-  __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl(
-      _$_VeilidFFIConfigLoggingOtlp _value,
-      $Res Function(_$_VeilidFFIConfigLoggingOtlp) _then)
+        _$VeilidFFIConfigLoggingOtlpImpl>
+    implements _$$VeilidFFIConfigLoggingOtlpImplCopyWith<$Res> {
+  __$$VeilidFFIConfigLoggingOtlpImplCopyWithImpl(
+      _$VeilidFFIConfigLoggingOtlpImpl _value,
+      $Res Function(_$VeilidFFIConfigLoggingOtlpImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -296,8 +342,9 @@ class __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res>
     Object? level = null,
     Object? grpcEndpoint = null,
     Object? serviceName = null,
+    Object? ignoreLogTargets = null,
   }) {
-    return _then(_$_VeilidFFIConfigLoggingOtlp(
+    return _then(_$VeilidFFIConfigLoggingOtlpImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -314,23 +361,30 @@ class __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl<$Res>
           ? _value.serviceName
           : serviceName // ignore: cast_nullable_to_non_nullable
               as String,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value._ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidFFIConfigLoggingOtlp
+class _$VeilidFFIConfigLoggingOtlpImpl
     with DiagnosticableTreeMixin
     implements _VeilidFFIConfigLoggingOtlp {
-  const _$_VeilidFFIConfigLoggingOtlp(
+  const _$VeilidFFIConfigLoggingOtlpImpl(
       {required this.enabled,
       required this.level,
       required this.grpcEndpoint,
-      required this.serviceName});
+      required this.serviceName,
+      final List<String> ignoreLogTargets = const []})
+      : _ignoreLogTargets = ignoreLogTargets;
 
-  factory _$_VeilidFFIConfigLoggingOtlp.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidFFIConfigLoggingOtlpFromJson(json);
+  factory _$VeilidFFIConfigLoggingOtlpImpl.fromJson(
+          Map<String, dynamic> json) =>
+      _$$VeilidFFIConfigLoggingOtlpImplFromJson(json);
 
   @override
   final bool enabled;
@@ -340,10 +394,19 @@ class _$_VeilidFFIConfigLoggingOtlp
   final String grpcEndpoint;
   @override
   final String serviceName;
+  final List<String> _ignoreLogTargets;
+  @override
+  @JsonKey()
+  List<String> get ignoreLogTargets {
+    if (_ignoreLogTargets is EqualUnmodifiableListView)
+      return _ignoreLogTargets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ignoreLogTargets);
+  }
 
   @override
   String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
-    return 'VeilidFFIConfigLoggingOtlp(enabled: $enabled, level: $level, grpcEndpoint: $grpcEndpoint, serviceName: $serviceName)';
+    return 'VeilidFFIConfigLoggingOtlp(enabled: $enabled, level: $level, grpcEndpoint: $grpcEndpoint, serviceName: $serviceName, ignoreLogTargets: $ignoreLogTargets)';
   }
 
   @override
@@ -354,37 +417,40 @@ class _$_VeilidFFIConfigLoggingOtlp
       ..add(DiagnosticsProperty('enabled', enabled))
       ..add(DiagnosticsProperty('level', level))
       ..add(DiagnosticsProperty('grpcEndpoint', grpcEndpoint))
-      ..add(DiagnosticsProperty('serviceName', serviceName));
+      ..add(DiagnosticsProperty('serviceName', serviceName))
+      ..add(DiagnosticsProperty('ignoreLogTargets', ignoreLogTargets));
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidFFIConfigLoggingOtlp &&
+            other is _$VeilidFFIConfigLoggingOtlpImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
             (identical(other.level, level) || other.level == level) &&
             (identical(other.grpcEndpoint, grpcEndpoint) ||
                 other.grpcEndpoint == grpcEndpoint) &&
             (identical(other.serviceName, serviceName) ||
-                other.serviceName == serviceName));
+                other.serviceName == serviceName) &&
+            const DeepCollectionEquality()
+                .equals(other._ignoreLogTargets, _ignoreLogTargets));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, enabled, level, grpcEndpoint, serviceName);
+  int get hashCode => Object.hash(runtimeType, enabled, level, grpcEndpoint,
+      serviceName, const DeepCollectionEquality().hash(_ignoreLogTargets));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidFFIConfigLoggingOtlpCopyWith<_$_VeilidFFIConfigLoggingOtlp>
-      get copyWith => __$$_VeilidFFIConfigLoggingOtlpCopyWithImpl<
-          _$_VeilidFFIConfigLoggingOtlp>(this, _$identity);
+  _$$VeilidFFIConfigLoggingOtlpImplCopyWith<_$VeilidFFIConfigLoggingOtlpImpl>
+      get copyWith => __$$VeilidFFIConfigLoggingOtlpImplCopyWithImpl<
+          _$VeilidFFIConfigLoggingOtlpImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidFFIConfigLoggingOtlpToJson(
+    return _$$VeilidFFIConfigLoggingOtlpImplToJson(
       this,
     );
   }
@@ -396,10 +462,11 @@ abstract class _VeilidFFIConfigLoggingOtlp
       {required final bool enabled,
       required final VeilidConfigLogLevel level,
       required final String grpcEndpoint,
-      required final String serviceName}) = _$_VeilidFFIConfigLoggingOtlp;
+      required final String serviceName,
+      final List<String> ignoreLogTargets}) = _$VeilidFFIConfigLoggingOtlpImpl;
 
   factory _VeilidFFIConfigLoggingOtlp.fromJson(Map<String, dynamic> json) =
-      _$_VeilidFFIConfigLoggingOtlp.fromJson;
+      _$VeilidFFIConfigLoggingOtlpImpl.fromJson;
 
   @override
   bool get enabled;
@@ -410,8 +477,10 @@ abstract class _VeilidFFIConfigLoggingOtlp
   @override
   String get serviceName;
   @override
+  List<String> get ignoreLogTargets;
+  @override
   @JsonKey(ignore: true)
-  _$$_VeilidFFIConfigLoggingOtlpCopyWith<_$_VeilidFFIConfigLoggingOtlp>
+  _$$VeilidFFIConfigLoggingOtlpImplCopyWith<_$VeilidFFIConfigLoggingOtlpImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -424,6 +493,7 @@ VeilidFFIConfigLoggingApi _$VeilidFFIConfigLoggingApiFromJson(
 mixin _$VeilidFFIConfigLoggingApi {
   bool get enabled => throw _privateConstructorUsedError;
   VeilidConfigLogLevel get level => throw _privateConstructorUsedError;
+  List<String> get ignoreLogTargets => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -437,7 +507,10 @@ abstract class $VeilidFFIConfigLoggingApiCopyWith<$Res> {
           $Res Function(VeilidFFIConfigLoggingApi) then) =
       _$VeilidFFIConfigLoggingApiCopyWithImpl<$Res, VeilidFFIConfigLoggingApi>;
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
@@ -456,6 +529,7 @@ class _$VeilidFFIConfigLoggingApiCopyWithImpl<$Res,
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
     return _then(_value.copyWith(
       enabled: null == enabled
@@ -466,30 +540,37 @@ class _$VeilidFFIConfigLoggingApiCopyWithImpl<$Res,
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value.ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$_VeilidFFIConfigLoggingApiCopyWith<$Res>
+abstract class _$$VeilidFFIConfigLoggingApiImplCopyWith<$Res>
     implements $VeilidFFIConfigLoggingApiCopyWith<$Res> {
-  factory _$$_VeilidFFIConfigLoggingApiCopyWith(
-          _$_VeilidFFIConfigLoggingApi value,
-          $Res Function(_$_VeilidFFIConfigLoggingApi) then) =
-      __$$_VeilidFFIConfigLoggingApiCopyWithImpl<$Res>;
+  factory _$$VeilidFFIConfigLoggingApiImplCopyWith(
+          _$VeilidFFIConfigLoggingApiImpl value,
+          $Res Function(_$VeilidFFIConfigLoggingApiImpl) then) =
+      __$$VeilidFFIConfigLoggingApiImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
-class __$$_VeilidFFIConfigLoggingApiCopyWithImpl<$Res>
+class __$$VeilidFFIConfigLoggingApiImplCopyWithImpl<$Res>
     extends _$VeilidFFIConfigLoggingApiCopyWithImpl<$Res,
-        _$_VeilidFFIConfigLoggingApi>
-    implements _$$_VeilidFFIConfigLoggingApiCopyWith<$Res> {
-  __$$_VeilidFFIConfigLoggingApiCopyWithImpl(
-      _$_VeilidFFIConfigLoggingApi _value,
-      $Res Function(_$_VeilidFFIConfigLoggingApi) _then)
+        _$VeilidFFIConfigLoggingApiImpl>
+    implements _$$VeilidFFIConfigLoggingApiImplCopyWith<$Res> {
+  __$$VeilidFFIConfigLoggingApiImplCopyWithImpl(
+      _$VeilidFFIConfigLoggingApiImpl _value,
+      $Res Function(_$VeilidFFIConfigLoggingApiImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -497,8 +578,9 @@ class __$$_VeilidFFIConfigLoggingApiCopyWithImpl<$Res>
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
-    return _then(_$_VeilidFFIConfigLoggingApi(
+    return _then(_$VeilidFFIConfigLoggingApiImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -507,29 +589,45 @@ class __$$_VeilidFFIConfigLoggingApiCopyWithImpl<$Res>
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value._ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidFFIConfigLoggingApi
+class _$VeilidFFIConfigLoggingApiImpl
     with DiagnosticableTreeMixin
     implements _VeilidFFIConfigLoggingApi {
-  const _$_VeilidFFIConfigLoggingApi(
-      {required this.enabled, required this.level});
+  const _$VeilidFFIConfigLoggingApiImpl(
+      {required this.enabled,
+      required this.level,
+      final List<String> ignoreLogTargets = const []})
+      : _ignoreLogTargets = ignoreLogTargets;
 
-  factory _$_VeilidFFIConfigLoggingApi.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidFFIConfigLoggingApiFromJson(json);
+  factory _$VeilidFFIConfigLoggingApiImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidFFIConfigLoggingApiImplFromJson(json);
 
   @override
   final bool enabled;
   @override
   final VeilidConfigLogLevel level;
+  final List<String> _ignoreLogTargets;
+  @override
+  @JsonKey()
+  List<String> get ignoreLogTargets {
+    if (_ignoreLogTargets is EqualUnmodifiableListView)
+      return _ignoreLogTargets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ignoreLogTargets);
+  }
 
   @override
   String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
-    return 'VeilidFFIConfigLoggingApi(enabled: $enabled, level: $level)';
+    return 'VeilidFFIConfigLoggingApi(enabled: $enabled, level: $level, ignoreLogTargets: $ignoreLogTargets)';
   }
 
   @override
@@ -538,32 +636,36 @@ class _$_VeilidFFIConfigLoggingApi
     properties
       ..add(DiagnosticsProperty('type', 'VeilidFFIConfigLoggingApi'))
       ..add(DiagnosticsProperty('enabled', enabled))
-      ..add(DiagnosticsProperty('level', level));
+      ..add(DiagnosticsProperty('level', level))
+      ..add(DiagnosticsProperty('ignoreLogTargets', ignoreLogTargets));
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidFFIConfigLoggingApi &&
+            other is _$VeilidFFIConfigLoggingApiImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
-            (identical(other.level, level) || other.level == level));
+            (identical(other.level, level) || other.level == level) &&
+            const DeepCollectionEquality()
+                .equals(other._ignoreLogTargets, _ignoreLogTargets));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, enabled, level);
+  int get hashCode => Object.hash(runtimeType, enabled, level,
+      const DeepCollectionEquality().hash(_ignoreLogTargets));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidFFIConfigLoggingApiCopyWith<_$_VeilidFFIConfigLoggingApi>
-      get copyWith => __$$_VeilidFFIConfigLoggingApiCopyWithImpl<
-          _$_VeilidFFIConfigLoggingApi>(this, _$identity);
+  _$$VeilidFFIConfigLoggingApiImplCopyWith<_$VeilidFFIConfigLoggingApiImpl>
+      get copyWith => __$$VeilidFFIConfigLoggingApiImplCopyWithImpl<
+          _$VeilidFFIConfigLoggingApiImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidFFIConfigLoggingApiToJson(
+    return _$$VeilidFFIConfigLoggingApiImplToJson(
       this,
     );
   }
@@ -571,20 +673,22 @@ class _$_VeilidFFIConfigLoggingApi
 
 abstract class _VeilidFFIConfigLoggingApi implements VeilidFFIConfigLoggingApi {
   const factory _VeilidFFIConfigLoggingApi(
-          {required final bool enabled,
-          required final VeilidConfigLogLevel level}) =
-      _$_VeilidFFIConfigLoggingApi;
+      {required final bool enabled,
+      required final VeilidConfigLogLevel level,
+      final List<String> ignoreLogTargets}) = _$VeilidFFIConfigLoggingApiImpl;
 
   factory _VeilidFFIConfigLoggingApi.fromJson(Map<String, dynamic> json) =
-      _$_VeilidFFIConfigLoggingApi.fromJson;
+      _$VeilidFFIConfigLoggingApiImpl.fromJson;
 
   @override
   bool get enabled;
   @override
   VeilidConfigLogLevel get level;
   @override
+  List<String> get ignoreLogTargets;
+  @override
   @JsonKey(ignore: true)
-  _$$_VeilidFFIConfigLoggingApiCopyWith<_$_VeilidFFIConfigLoggingApi>
+  _$$VeilidFFIConfigLoggingApiImplCopyWith<_$VeilidFFIConfigLoggingApiImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -683,11 +787,12 @@ class _$VeilidFFIConfigLoggingCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidFFIConfigLoggingCopyWith<$Res>
+abstract class _$$VeilidFFIConfigLoggingImplCopyWith<$Res>
     implements $VeilidFFIConfigLoggingCopyWith<$Res> {
-  factory _$$_VeilidFFIConfigLoggingCopyWith(_$_VeilidFFIConfigLogging value,
-          $Res Function(_$_VeilidFFIConfigLogging) then) =
-      __$$_VeilidFFIConfigLoggingCopyWithImpl<$Res>;
+  factory _$$VeilidFFIConfigLoggingImplCopyWith(
+          _$VeilidFFIConfigLoggingImpl value,
+          $Res Function(_$VeilidFFIConfigLoggingImpl) then) =
+      __$$VeilidFFIConfigLoggingImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -704,12 +809,13 @@ abstract class _$$_VeilidFFIConfigLoggingCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidFFIConfigLoggingCopyWithImpl<$Res>
+class __$$VeilidFFIConfigLoggingImplCopyWithImpl<$Res>
     extends _$VeilidFFIConfigLoggingCopyWithImpl<$Res,
-        _$_VeilidFFIConfigLogging>
-    implements _$$_VeilidFFIConfigLoggingCopyWith<$Res> {
-  __$$_VeilidFFIConfigLoggingCopyWithImpl(_$_VeilidFFIConfigLogging _value,
-      $Res Function(_$_VeilidFFIConfigLogging) _then)
+        _$VeilidFFIConfigLoggingImpl>
+    implements _$$VeilidFFIConfigLoggingImplCopyWith<$Res> {
+  __$$VeilidFFIConfigLoggingImplCopyWithImpl(
+      _$VeilidFFIConfigLoggingImpl _value,
+      $Res Function(_$VeilidFFIConfigLoggingImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -719,7 +825,7 @@ class __$$_VeilidFFIConfigLoggingCopyWithImpl<$Res>
     Object? otlp = null,
     Object? api = null,
   }) {
-    return _then(_$_VeilidFFIConfigLogging(
+    return _then(_$VeilidFFIConfigLoggingImpl(
       terminal: null == terminal
           ? _value.terminal
           : terminal // ignore: cast_nullable_to_non_nullable
@@ -738,14 +844,14 @@ class __$$_VeilidFFIConfigLoggingCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidFFIConfigLogging
+class _$VeilidFFIConfigLoggingImpl
     with DiagnosticableTreeMixin
     implements _VeilidFFIConfigLogging {
-  const _$_VeilidFFIConfigLogging(
+  const _$VeilidFFIConfigLoggingImpl(
       {required this.terminal, required this.otlp, required this.api});
 
-  factory _$_VeilidFFIConfigLogging.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidFFIConfigLoggingFromJson(json);
+  factory _$VeilidFFIConfigLoggingImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidFFIConfigLoggingImplFromJson(json);
 
   @override
   final VeilidFFIConfigLoggingTerminal terminal;
@@ -770,10 +876,10 @@ class _$_VeilidFFIConfigLogging
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidFFIConfigLogging &&
+            other is _$VeilidFFIConfigLoggingImpl &&
             (identical(other.terminal, terminal) ||
                 other.terminal == terminal) &&
             (identical(other.otlp, otlp) || other.otlp == otlp) &&
@@ -787,13 +893,13 @@ class _$_VeilidFFIConfigLogging
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidFFIConfigLoggingCopyWith<_$_VeilidFFIConfigLogging> get copyWith =>
-      __$$_VeilidFFIConfigLoggingCopyWithImpl<_$_VeilidFFIConfigLogging>(
-          this, _$identity);
+  _$$VeilidFFIConfigLoggingImplCopyWith<_$VeilidFFIConfigLoggingImpl>
+      get copyWith => __$$VeilidFFIConfigLoggingImplCopyWithImpl<
+          _$VeilidFFIConfigLoggingImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidFFIConfigLoggingToJson(
+    return _$$VeilidFFIConfigLoggingImplToJson(
       this,
     );
   }
@@ -804,10 +910,10 @@ abstract class _VeilidFFIConfigLogging implements VeilidFFIConfigLogging {
           {required final VeilidFFIConfigLoggingTerminal terminal,
           required final VeilidFFIConfigLoggingOtlp otlp,
           required final VeilidFFIConfigLoggingApi api}) =
-      _$_VeilidFFIConfigLogging;
+      _$VeilidFFIConfigLoggingImpl;
 
   factory _VeilidFFIConfigLogging.fromJson(Map<String, dynamic> json) =
-      _$_VeilidFFIConfigLogging.fromJson;
+      _$VeilidFFIConfigLoggingImpl.fromJson;
 
   @override
   VeilidFFIConfigLoggingTerminal get terminal;
@@ -817,8 +923,8 @@ abstract class _VeilidFFIConfigLogging implements VeilidFFIConfigLogging {
   VeilidFFIConfigLoggingApi get api;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidFFIConfigLoggingCopyWith<_$_VeilidFFIConfigLogging> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidFFIConfigLoggingImplCopyWith<_$VeilidFFIConfigLoggingImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidFFIConfig _$VeilidFFIConfigFromJson(Map<String, dynamic> json) {
@@ -879,11 +985,11 @@ class _$VeilidFFIConfigCopyWithImpl<$Res, $Val extends VeilidFFIConfig>
 }
 
 /// @nodoc
-abstract class _$$_VeilidFFIConfigCopyWith<$Res>
+abstract class _$$VeilidFFIConfigImplCopyWith<$Res>
     implements $VeilidFFIConfigCopyWith<$Res> {
-  factory _$$_VeilidFFIConfigCopyWith(
-          _$_VeilidFFIConfig value, $Res Function(_$_VeilidFFIConfig) then) =
-      __$$_VeilidFFIConfigCopyWithImpl<$Res>;
+  factory _$$VeilidFFIConfigImplCopyWith(_$VeilidFFIConfigImpl value,
+          $Res Function(_$VeilidFFIConfigImpl) then) =
+      __$$VeilidFFIConfigImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({VeilidFFIConfigLogging logging});
@@ -893,11 +999,11 @@ abstract class _$$_VeilidFFIConfigCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidFFIConfigCopyWithImpl<$Res>
-    extends _$VeilidFFIConfigCopyWithImpl<$Res, _$_VeilidFFIConfig>
-    implements _$$_VeilidFFIConfigCopyWith<$Res> {
-  __$$_VeilidFFIConfigCopyWithImpl(
-      _$_VeilidFFIConfig _value, $Res Function(_$_VeilidFFIConfig) _then)
+class __$$VeilidFFIConfigImplCopyWithImpl<$Res>
+    extends _$VeilidFFIConfigCopyWithImpl<$Res, _$VeilidFFIConfigImpl>
+    implements _$$VeilidFFIConfigImplCopyWith<$Res> {
+  __$$VeilidFFIConfigImplCopyWithImpl(
+      _$VeilidFFIConfigImpl _value, $Res Function(_$VeilidFFIConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -905,7 +1011,7 @@ class __$$_VeilidFFIConfigCopyWithImpl<$Res>
   $Res call({
     Object? logging = null,
   }) {
-    return _then(_$_VeilidFFIConfig(
+    return _then(_$VeilidFFIConfigImpl(
       logging: null == logging
           ? _value.logging
           : logging // ignore: cast_nullable_to_non_nullable
@@ -916,13 +1022,13 @@ class __$$_VeilidFFIConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidFFIConfig
+class _$VeilidFFIConfigImpl
     with DiagnosticableTreeMixin
     implements _VeilidFFIConfig {
-  const _$_VeilidFFIConfig({required this.logging});
+  const _$VeilidFFIConfigImpl({required this.logging});
 
-  factory _$_VeilidFFIConfig.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidFFIConfigFromJson(json);
+  factory _$VeilidFFIConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidFFIConfigImplFromJson(json);
 
   @override
   final VeilidFFIConfigLogging logging;
@@ -941,10 +1047,10 @@ class _$_VeilidFFIConfig
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidFFIConfig &&
+            other is _$VeilidFFIConfigImpl &&
             (identical(other.logging, logging) || other.logging == logging));
   }
 
@@ -955,12 +1061,13 @@ class _$_VeilidFFIConfig
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidFFIConfigCopyWith<_$_VeilidFFIConfig> get copyWith =>
-      __$$_VeilidFFIConfigCopyWithImpl<_$_VeilidFFIConfig>(this, _$identity);
+  _$$VeilidFFIConfigImplCopyWith<_$VeilidFFIConfigImpl> get copyWith =>
+      __$$VeilidFFIConfigImplCopyWithImpl<_$VeilidFFIConfigImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidFFIConfigToJson(
+    return _$$VeilidFFIConfigImplToJson(
       this,
     );
   }
@@ -968,16 +1075,16 @@ class _$_VeilidFFIConfig
 
 abstract class _VeilidFFIConfig implements VeilidFFIConfig {
   const factory _VeilidFFIConfig(
-      {required final VeilidFFIConfigLogging logging}) = _$_VeilidFFIConfig;
+      {required final VeilidFFIConfigLogging logging}) = _$VeilidFFIConfigImpl;
 
   factory _VeilidFFIConfig.fromJson(Map<String, dynamic> json) =
-      _$_VeilidFFIConfig.fromJson;
+      _$VeilidFFIConfigImpl.fromJson;
 
   @override
   VeilidFFIConfigLogging get logging;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidFFIConfigCopyWith<_$_VeilidFFIConfig> get copyWith =>
+  _$$VeilidFFIConfigImplCopyWith<_$VeilidFFIConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -992,6 +1099,7 @@ mixin _$VeilidWASMConfigLoggingPerformance {
   VeilidConfigLogLevel get level => throw _privateConstructorUsedError;
   bool get logsInTimings => throw _privateConstructorUsedError;
   bool get logsInConsole => throw _privateConstructorUsedError;
+  List<String> get ignoreLogTargets => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -1012,7 +1120,8 @@ abstract class $VeilidWASMConfigLoggingPerformanceCopyWith<$Res> {
       {bool enabled,
       VeilidConfigLogLevel level,
       bool logsInTimings,
-      bool logsInConsole});
+      bool logsInConsole,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
@@ -1033,6 +1142,7 @@ class _$VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res,
     Object? level = null,
     Object? logsInTimings = null,
     Object? logsInConsole = null,
+    Object? ignoreLogTargets = null,
   }) {
     return _then(_value.copyWith(
       enabled: null == enabled
@@ -1051,34 +1161,39 @@ class _$VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res,
           ? _value.logsInConsole
           : logsInConsole // ignore: cast_nullable_to_non_nullable
               as bool,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value.ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$_VeilidWASMConfigLoggingPerformanceCopyWith<$Res>
+abstract class _$$VeilidWASMConfigLoggingPerformanceImplCopyWith<$Res>
     implements $VeilidWASMConfigLoggingPerformanceCopyWith<$Res> {
-  factory _$$_VeilidWASMConfigLoggingPerformanceCopyWith(
-          _$_VeilidWASMConfigLoggingPerformance value,
-          $Res Function(_$_VeilidWASMConfigLoggingPerformance) then) =
-      __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res>;
+  factory _$$VeilidWASMConfigLoggingPerformanceImplCopyWith(
+          _$VeilidWASMConfigLoggingPerformanceImpl value,
+          $Res Function(_$VeilidWASMConfigLoggingPerformanceImpl) then) =
+      __$$VeilidWASMConfigLoggingPerformanceImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {bool enabled,
       VeilidConfigLogLevel level,
       bool logsInTimings,
-      bool logsInConsole});
+      bool logsInConsole,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
-class __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res>
+class __$$VeilidWASMConfigLoggingPerformanceImplCopyWithImpl<$Res>
     extends _$VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res,
-        _$_VeilidWASMConfigLoggingPerformance>
-    implements _$$_VeilidWASMConfigLoggingPerformanceCopyWith<$Res> {
-  __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl(
-      _$_VeilidWASMConfigLoggingPerformance _value,
-      $Res Function(_$_VeilidWASMConfigLoggingPerformance) _then)
+        _$VeilidWASMConfigLoggingPerformanceImpl>
+    implements _$$VeilidWASMConfigLoggingPerformanceImplCopyWith<$Res> {
+  __$$VeilidWASMConfigLoggingPerformanceImplCopyWithImpl(
+      _$VeilidWASMConfigLoggingPerformanceImpl _value,
+      $Res Function(_$VeilidWASMConfigLoggingPerformanceImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1088,8 +1203,9 @@ class __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res>
     Object? level = null,
     Object? logsInTimings = null,
     Object? logsInConsole = null,
+    Object? ignoreLogTargets = null,
   }) {
-    return _then(_$_VeilidWASMConfigLoggingPerformance(
+    return _then(_$VeilidWASMConfigLoggingPerformanceImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -1106,24 +1222,30 @@ class __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl<$Res>
           ? _value.logsInConsole
           : logsInConsole // ignore: cast_nullable_to_non_nullable
               as bool,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value._ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidWASMConfigLoggingPerformance
+class _$VeilidWASMConfigLoggingPerformanceImpl
     with DiagnosticableTreeMixin
     implements _VeilidWASMConfigLoggingPerformance {
-  const _$_VeilidWASMConfigLoggingPerformance(
+  const _$VeilidWASMConfigLoggingPerformanceImpl(
       {required this.enabled,
       required this.level,
       required this.logsInTimings,
-      required this.logsInConsole});
+      required this.logsInConsole,
+      final List<String> ignoreLogTargets = const []})
+      : _ignoreLogTargets = ignoreLogTargets;
 
-  factory _$_VeilidWASMConfigLoggingPerformance.fromJson(
+  factory _$VeilidWASMConfigLoggingPerformanceImpl.fromJson(
           Map<String, dynamic> json) =>
-      _$$_VeilidWASMConfigLoggingPerformanceFromJson(json);
+      _$$VeilidWASMConfigLoggingPerformanceImplFromJson(json);
 
   @override
   final bool enabled;
@@ -1133,10 +1255,19 @@ class _$_VeilidWASMConfigLoggingPerformance
   final bool logsInTimings;
   @override
   final bool logsInConsole;
+  final List<String> _ignoreLogTargets;
+  @override
+  @JsonKey()
+  List<String> get ignoreLogTargets {
+    if (_ignoreLogTargets is EqualUnmodifiableListView)
+      return _ignoreLogTargets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ignoreLogTargets);
+  }
 
   @override
   String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
-    return 'VeilidWASMConfigLoggingPerformance(enabled: $enabled, level: $level, logsInTimings: $logsInTimings, logsInConsole: $logsInConsole)';
+    return 'VeilidWASMConfigLoggingPerformance(enabled: $enabled, level: $level, logsInTimings: $logsInTimings, logsInConsole: $logsInConsole, ignoreLogTargets: $ignoreLogTargets)';
   }
 
   @override
@@ -1147,38 +1278,41 @@ class _$_VeilidWASMConfigLoggingPerformance
       ..add(DiagnosticsProperty('enabled', enabled))
       ..add(DiagnosticsProperty('level', level))
       ..add(DiagnosticsProperty('logsInTimings', logsInTimings))
-      ..add(DiagnosticsProperty('logsInConsole', logsInConsole));
+      ..add(DiagnosticsProperty('logsInConsole', logsInConsole))
+      ..add(DiagnosticsProperty('ignoreLogTargets', ignoreLogTargets));
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidWASMConfigLoggingPerformance &&
+            other is _$VeilidWASMConfigLoggingPerformanceImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
             (identical(other.level, level) || other.level == level) &&
             (identical(other.logsInTimings, logsInTimings) ||
                 other.logsInTimings == logsInTimings) &&
             (identical(other.logsInConsole, logsInConsole) ||
-                other.logsInConsole == logsInConsole));
+                other.logsInConsole == logsInConsole) &&
+            const DeepCollectionEquality()
+                .equals(other._ignoreLogTargets, _ignoreLogTargets));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, enabled, level, logsInTimings, logsInConsole);
+  int get hashCode => Object.hash(runtimeType, enabled, level, logsInTimings,
+      logsInConsole, const DeepCollectionEquality().hash(_ignoreLogTargets));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidWASMConfigLoggingPerformanceCopyWith<
-          _$_VeilidWASMConfigLoggingPerformance>
-      get copyWith => __$$_VeilidWASMConfigLoggingPerformanceCopyWithImpl<
-          _$_VeilidWASMConfigLoggingPerformance>(this, _$identity);
+  _$$VeilidWASMConfigLoggingPerformanceImplCopyWith<
+          _$VeilidWASMConfigLoggingPerformanceImpl>
+      get copyWith => __$$VeilidWASMConfigLoggingPerformanceImplCopyWithImpl<
+          _$VeilidWASMConfigLoggingPerformanceImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidWASMConfigLoggingPerformanceToJson(
+    return _$$VeilidWASMConfigLoggingPerformanceImplToJson(
       this,
     );
   }
@@ -1190,12 +1324,13 @@ abstract class _VeilidWASMConfigLoggingPerformance
           {required final bool enabled,
           required final VeilidConfigLogLevel level,
           required final bool logsInTimings,
-          required final bool logsInConsole}) =
-      _$_VeilidWASMConfigLoggingPerformance;
+          required final bool logsInConsole,
+          final List<String> ignoreLogTargets}) =
+      _$VeilidWASMConfigLoggingPerformanceImpl;
 
   factory _VeilidWASMConfigLoggingPerformance.fromJson(
           Map<String, dynamic> json) =
-      _$_VeilidWASMConfigLoggingPerformance.fromJson;
+      _$VeilidWASMConfigLoggingPerformanceImpl.fromJson;
 
   @override
   bool get enabled;
@@ -1206,9 +1341,11 @@ abstract class _VeilidWASMConfigLoggingPerformance
   @override
   bool get logsInConsole;
   @override
+  List<String> get ignoreLogTargets;
+  @override
   @JsonKey(ignore: true)
-  _$$_VeilidWASMConfigLoggingPerformanceCopyWith<
-          _$_VeilidWASMConfigLoggingPerformance>
+  _$$VeilidWASMConfigLoggingPerformanceImplCopyWith<
+          _$VeilidWASMConfigLoggingPerformanceImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -1221,6 +1358,7 @@ VeilidWASMConfigLoggingApi _$VeilidWASMConfigLoggingApiFromJson(
 mixin _$VeilidWASMConfigLoggingApi {
   bool get enabled => throw _privateConstructorUsedError;
   VeilidConfigLogLevel get level => throw _privateConstructorUsedError;
+  List<String> get ignoreLogTargets => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -1235,7 +1373,10 @@ abstract class $VeilidWASMConfigLoggingApiCopyWith<$Res> {
       _$VeilidWASMConfigLoggingApiCopyWithImpl<$Res,
           VeilidWASMConfigLoggingApi>;
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
@@ -1254,6 +1395,7 @@ class _$VeilidWASMConfigLoggingApiCopyWithImpl<$Res,
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
     return _then(_value.copyWith(
       enabled: null == enabled
@@ -1264,30 +1406,37 @@ class _$VeilidWASMConfigLoggingApiCopyWithImpl<$Res,
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value.ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$_VeilidWASMConfigLoggingApiCopyWith<$Res>
+abstract class _$$VeilidWASMConfigLoggingApiImplCopyWith<$Res>
     implements $VeilidWASMConfigLoggingApiCopyWith<$Res> {
-  factory _$$_VeilidWASMConfigLoggingApiCopyWith(
-          _$_VeilidWASMConfigLoggingApi value,
-          $Res Function(_$_VeilidWASMConfigLoggingApi) then) =
-      __$$_VeilidWASMConfigLoggingApiCopyWithImpl<$Res>;
+  factory _$$VeilidWASMConfigLoggingApiImplCopyWith(
+          _$VeilidWASMConfigLoggingApiImpl value,
+          $Res Function(_$VeilidWASMConfigLoggingApiImpl) then) =
+      __$$VeilidWASMConfigLoggingApiImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({bool enabled, VeilidConfigLogLevel level});
+  $Res call(
+      {bool enabled,
+      VeilidConfigLogLevel level,
+      List<String> ignoreLogTargets});
 }
 
 /// @nodoc
-class __$$_VeilidWASMConfigLoggingApiCopyWithImpl<$Res>
+class __$$VeilidWASMConfigLoggingApiImplCopyWithImpl<$Res>
     extends _$VeilidWASMConfigLoggingApiCopyWithImpl<$Res,
-        _$_VeilidWASMConfigLoggingApi>
-    implements _$$_VeilidWASMConfigLoggingApiCopyWith<$Res> {
-  __$$_VeilidWASMConfigLoggingApiCopyWithImpl(
-      _$_VeilidWASMConfigLoggingApi _value,
-      $Res Function(_$_VeilidWASMConfigLoggingApi) _then)
+        _$VeilidWASMConfigLoggingApiImpl>
+    implements _$$VeilidWASMConfigLoggingApiImplCopyWith<$Res> {
+  __$$VeilidWASMConfigLoggingApiImplCopyWithImpl(
+      _$VeilidWASMConfigLoggingApiImpl _value,
+      $Res Function(_$VeilidWASMConfigLoggingApiImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1295,8 +1444,9 @@ class __$$_VeilidWASMConfigLoggingApiCopyWithImpl<$Res>
   $Res call({
     Object? enabled = null,
     Object? level = null,
+    Object? ignoreLogTargets = null,
   }) {
-    return _then(_$_VeilidWASMConfigLoggingApi(
+    return _then(_$VeilidWASMConfigLoggingApiImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -1305,29 +1455,46 @@ class __$$_VeilidWASMConfigLoggingApiCopyWithImpl<$Res>
           ? _value.level
           : level // ignore: cast_nullable_to_non_nullable
               as VeilidConfigLogLevel,
+      ignoreLogTargets: null == ignoreLogTargets
+          ? _value._ignoreLogTargets
+          : ignoreLogTargets // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidWASMConfigLoggingApi
+class _$VeilidWASMConfigLoggingApiImpl
     with DiagnosticableTreeMixin
     implements _VeilidWASMConfigLoggingApi {
-  const _$_VeilidWASMConfigLoggingApi(
-      {required this.enabled, required this.level});
+  const _$VeilidWASMConfigLoggingApiImpl(
+      {required this.enabled,
+      required this.level,
+      final List<String> ignoreLogTargets = const []})
+      : _ignoreLogTargets = ignoreLogTargets;
 
-  factory _$_VeilidWASMConfigLoggingApi.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidWASMConfigLoggingApiFromJson(json);
+  factory _$VeilidWASMConfigLoggingApiImpl.fromJson(
+          Map<String, dynamic> json) =>
+      _$$VeilidWASMConfigLoggingApiImplFromJson(json);
 
   @override
   final bool enabled;
   @override
   final VeilidConfigLogLevel level;
+  final List<String> _ignoreLogTargets;
+  @override
+  @JsonKey()
+  List<String> get ignoreLogTargets {
+    if (_ignoreLogTargets is EqualUnmodifiableListView)
+      return _ignoreLogTargets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ignoreLogTargets);
+  }
 
   @override
   String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
-    return 'VeilidWASMConfigLoggingApi(enabled: $enabled, level: $level)';
+    return 'VeilidWASMConfigLoggingApi(enabled: $enabled, level: $level, ignoreLogTargets: $ignoreLogTargets)';
   }
 
   @override
@@ -1336,32 +1503,36 @@ class _$_VeilidWASMConfigLoggingApi
     properties
       ..add(DiagnosticsProperty('type', 'VeilidWASMConfigLoggingApi'))
       ..add(DiagnosticsProperty('enabled', enabled))
-      ..add(DiagnosticsProperty('level', level));
+      ..add(DiagnosticsProperty('level', level))
+      ..add(DiagnosticsProperty('ignoreLogTargets', ignoreLogTargets));
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidWASMConfigLoggingApi &&
+            other is _$VeilidWASMConfigLoggingApiImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
-            (identical(other.level, level) || other.level == level));
+            (identical(other.level, level) || other.level == level) &&
+            const DeepCollectionEquality()
+                .equals(other._ignoreLogTargets, _ignoreLogTargets));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, enabled, level);
+  int get hashCode => Object.hash(runtimeType, enabled, level,
+      const DeepCollectionEquality().hash(_ignoreLogTargets));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidWASMConfigLoggingApiCopyWith<_$_VeilidWASMConfigLoggingApi>
-      get copyWith => __$$_VeilidWASMConfigLoggingApiCopyWithImpl<
-          _$_VeilidWASMConfigLoggingApi>(this, _$identity);
+  _$$VeilidWASMConfigLoggingApiImplCopyWith<_$VeilidWASMConfigLoggingApiImpl>
+      get copyWith => __$$VeilidWASMConfigLoggingApiImplCopyWithImpl<
+          _$VeilidWASMConfigLoggingApiImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidWASMConfigLoggingApiToJson(
+    return _$$VeilidWASMConfigLoggingApiImplToJson(
       this,
     );
   }
@@ -1370,20 +1541,22 @@ class _$_VeilidWASMConfigLoggingApi
 abstract class _VeilidWASMConfigLoggingApi
     implements VeilidWASMConfigLoggingApi {
   const factory _VeilidWASMConfigLoggingApi(
-          {required final bool enabled,
-          required final VeilidConfigLogLevel level}) =
-      _$_VeilidWASMConfigLoggingApi;
+      {required final bool enabled,
+      required final VeilidConfigLogLevel level,
+      final List<String> ignoreLogTargets}) = _$VeilidWASMConfigLoggingApiImpl;
 
   factory _VeilidWASMConfigLoggingApi.fromJson(Map<String, dynamic> json) =
-      _$_VeilidWASMConfigLoggingApi.fromJson;
+      _$VeilidWASMConfigLoggingApiImpl.fromJson;
 
   @override
   bool get enabled;
   @override
   VeilidConfigLogLevel get level;
   @override
+  List<String> get ignoreLogTargets;
+  @override
   @JsonKey(ignore: true)
-  _$$_VeilidWASMConfigLoggingApiCopyWith<_$_VeilidWASMConfigLoggingApi>
+  _$$VeilidWASMConfigLoggingApiImplCopyWith<_$VeilidWASMConfigLoggingApiImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -1466,11 +1639,12 @@ class _$VeilidWASMConfigLoggingCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidWASMConfigLoggingCopyWith<$Res>
+abstract class _$$VeilidWASMConfigLoggingImplCopyWith<$Res>
     implements $VeilidWASMConfigLoggingCopyWith<$Res> {
-  factory _$$_VeilidWASMConfigLoggingCopyWith(_$_VeilidWASMConfigLogging value,
-          $Res Function(_$_VeilidWASMConfigLogging) then) =
-      __$$_VeilidWASMConfigLoggingCopyWithImpl<$Res>;
+  factory _$$VeilidWASMConfigLoggingImplCopyWith(
+          _$VeilidWASMConfigLoggingImpl value,
+          $Res Function(_$VeilidWASMConfigLoggingImpl) then) =
+      __$$VeilidWASMConfigLoggingImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1484,12 +1658,13 @@ abstract class _$$_VeilidWASMConfigLoggingCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidWASMConfigLoggingCopyWithImpl<$Res>
+class __$$VeilidWASMConfigLoggingImplCopyWithImpl<$Res>
     extends _$VeilidWASMConfigLoggingCopyWithImpl<$Res,
-        _$_VeilidWASMConfigLogging>
-    implements _$$_VeilidWASMConfigLoggingCopyWith<$Res> {
-  __$$_VeilidWASMConfigLoggingCopyWithImpl(_$_VeilidWASMConfigLogging _value,
-      $Res Function(_$_VeilidWASMConfigLogging) _then)
+        _$VeilidWASMConfigLoggingImpl>
+    implements _$$VeilidWASMConfigLoggingImplCopyWith<$Res> {
+  __$$VeilidWASMConfigLoggingImplCopyWithImpl(
+      _$VeilidWASMConfigLoggingImpl _value,
+      $Res Function(_$VeilidWASMConfigLoggingImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1498,7 +1673,7 @@ class __$$_VeilidWASMConfigLoggingCopyWithImpl<$Res>
     Object? performance = null,
     Object? api = null,
   }) {
-    return _then(_$_VeilidWASMConfigLogging(
+    return _then(_$VeilidWASMConfigLoggingImpl(
       performance: null == performance
           ? _value.performance
           : performance // ignore: cast_nullable_to_non_nullable
@@ -1513,14 +1688,14 @@ class __$$_VeilidWASMConfigLoggingCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidWASMConfigLogging
+class _$VeilidWASMConfigLoggingImpl
     with DiagnosticableTreeMixin
     implements _VeilidWASMConfigLogging {
-  const _$_VeilidWASMConfigLogging(
+  const _$VeilidWASMConfigLoggingImpl(
       {required this.performance, required this.api});
 
-  factory _$_VeilidWASMConfigLogging.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidWASMConfigLoggingFromJson(json);
+  factory _$VeilidWASMConfigLoggingImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidWASMConfigLoggingImplFromJson(json);
 
   @override
   final VeilidWASMConfigLoggingPerformance performance;
@@ -1542,10 +1717,10 @@ class _$_VeilidWASMConfigLogging
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidWASMConfigLogging &&
+            other is _$VeilidWASMConfigLoggingImpl &&
             (identical(other.performance, performance) ||
                 other.performance == performance) &&
             (identical(other.api, api) || other.api == api));
@@ -1558,14 +1733,13 @@ class _$_VeilidWASMConfigLogging
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidWASMConfigLoggingCopyWith<_$_VeilidWASMConfigLogging>
-      get copyWith =>
-          __$$_VeilidWASMConfigLoggingCopyWithImpl<_$_VeilidWASMConfigLogging>(
-              this, _$identity);
+  _$$VeilidWASMConfigLoggingImplCopyWith<_$VeilidWASMConfigLoggingImpl>
+      get copyWith => __$$VeilidWASMConfigLoggingImplCopyWithImpl<
+          _$VeilidWASMConfigLoggingImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidWASMConfigLoggingToJson(
+    return _$$VeilidWASMConfigLoggingImplToJson(
       this,
     );
   }
@@ -1575,10 +1749,10 @@ abstract class _VeilidWASMConfigLogging implements VeilidWASMConfigLogging {
   const factory _VeilidWASMConfigLogging(
           {required final VeilidWASMConfigLoggingPerformance performance,
           required final VeilidWASMConfigLoggingApi api}) =
-      _$_VeilidWASMConfigLogging;
+      _$VeilidWASMConfigLoggingImpl;
 
   factory _VeilidWASMConfigLogging.fromJson(Map<String, dynamic> json) =
-      _$_VeilidWASMConfigLogging.fromJson;
+      _$VeilidWASMConfigLoggingImpl.fromJson;
 
   @override
   VeilidWASMConfigLoggingPerformance get performance;
@@ -1586,7 +1760,7 @@ abstract class _VeilidWASMConfigLogging implements VeilidWASMConfigLogging {
   VeilidWASMConfigLoggingApi get api;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidWASMConfigLoggingCopyWith<_$_VeilidWASMConfigLogging>
+  _$$VeilidWASMConfigLoggingImplCopyWith<_$VeilidWASMConfigLoggingImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -1648,11 +1822,11 @@ class _$VeilidWASMConfigCopyWithImpl<$Res, $Val extends VeilidWASMConfig>
 }
 
 /// @nodoc
-abstract class _$$_VeilidWASMConfigCopyWith<$Res>
+abstract class _$$VeilidWASMConfigImplCopyWith<$Res>
     implements $VeilidWASMConfigCopyWith<$Res> {
-  factory _$$_VeilidWASMConfigCopyWith(
-          _$_VeilidWASMConfig value, $Res Function(_$_VeilidWASMConfig) then) =
-      __$$_VeilidWASMConfigCopyWithImpl<$Res>;
+  factory _$$VeilidWASMConfigImplCopyWith(_$VeilidWASMConfigImpl value,
+          $Res Function(_$VeilidWASMConfigImpl) then) =
+      __$$VeilidWASMConfigImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({VeilidWASMConfigLogging logging});
@@ -1662,11 +1836,11 @@ abstract class _$$_VeilidWASMConfigCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidWASMConfigCopyWithImpl<$Res>
-    extends _$VeilidWASMConfigCopyWithImpl<$Res, _$_VeilidWASMConfig>
-    implements _$$_VeilidWASMConfigCopyWith<$Res> {
-  __$$_VeilidWASMConfigCopyWithImpl(
-      _$_VeilidWASMConfig _value, $Res Function(_$_VeilidWASMConfig) _then)
+class __$$VeilidWASMConfigImplCopyWithImpl<$Res>
+    extends _$VeilidWASMConfigCopyWithImpl<$Res, _$VeilidWASMConfigImpl>
+    implements _$$VeilidWASMConfigImplCopyWith<$Res> {
+  __$$VeilidWASMConfigImplCopyWithImpl(_$VeilidWASMConfigImpl _value,
+      $Res Function(_$VeilidWASMConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1674,7 +1848,7 @@ class __$$_VeilidWASMConfigCopyWithImpl<$Res>
   $Res call({
     Object? logging = null,
   }) {
-    return _then(_$_VeilidWASMConfig(
+    return _then(_$VeilidWASMConfigImpl(
       logging: null == logging
           ? _value.logging
           : logging // ignore: cast_nullable_to_non_nullable
@@ -1685,13 +1859,13 @@ class __$$_VeilidWASMConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidWASMConfig
+class _$VeilidWASMConfigImpl
     with DiagnosticableTreeMixin
     implements _VeilidWASMConfig {
-  const _$_VeilidWASMConfig({required this.logging});
+  const _$VeilidWASMConfigImpl({required this.logging});
 
-  factory _$_VeilidWASMConfig.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidWASMConfigFromJson(json);
+  factory _$VeilidWASMConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidWASMConfigImplFromJson(json);
 
   @override
   final VeilidWASMConfigLogging logging;
@@ -1710,10 +1884,10 @@ class _$_VeilidWASMConfig
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidWASMConfig &&
+            other is _$VeilidWASMConfigImpl &&
             (identical(other.logging, logging) || other.logging == logging));
   }
 
@@ -1724,12 +1898,13 @@ class _$_VeilidWASMConfig
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidWASMConfigCopyWith<_$_VeilidWASMConfig> get copyWith =>
-      __$$_VeilidWASMConfigCopyWithImpl<_$_VeilidWASMConfig>(this, _$identity);
+  _$$VeilidWASMConfigImplCopyWith<_$VeilidWASMConfigImpl> get copyWith =>
+      __$$VeilidWASMConfigImplCopyWithImpl<_$VeilidWASMConfigImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidWASMConfigToJson(
+    return _$$VeilidWASMConfigImplToJson(
       this,
     );
   }
@@ -1737,16 +1912,17 @@ class _$_VeilidWASMConfig
 
 abstract class _VeilidWASMConfig implements VeilidWASMConfig {
   const factory _VeilidWASMConfig(
-      {required final VeilidWASMConfigLogging logging}) = _$_VeilidWASMConfig;
+          {required final VeilidWASMConfigLogging logging}) =
+      _$VeilidWASMConfigImpl;
 
   factory _VeilidWASMConfig.fromJson(Map<String, dynamic> json) =
-      _$_VeilidWASMConfig.fromJson;
+      _$VeilidWASMConfigImpl.fromJson;
 
   @override
   VeilidWASMConfigLogging get logging;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidWASMConfigCopyWith<_$_VeilidWASMConfig> get copyWith =>
+  _$$VeilidWASMConfigImplCopyWith<_$VeilidWASMConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1816,22 +1992,22 @@ class _$VeilidConfigHTTPSCopyWithImpl<$Res, $Val extends VeilidConfigHTTPS>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigHTTPSCopyWith<$Res>
+abstract class _$$VeilidConfigHTTPSImplCopyWith<$Res>
     implements $VeilidConfigHTTPSCopyWith<$Res> {
-  factory _$$_VeilidConfigHTTPSCopyWith(_$_VeilidConfigHTTPS value,
-          $Res Function(_$_VeilidConfigHTTPS) then) =
-      __$$_VeilidConfigHTTPSCopyWithImpl<$Res>;
+  factory _$$VeilidConfigHTTPSImplCopyWith(_$VeilidConfigHTTPSImpl value,
+          $Res Function(_$VeilidConfigHTTPSImpl) then) =
+      __$$VeilidConfigHTTPSImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({bool enabled, String listenAddress, String path, String? url});
 }
 
 /// @nodoc
-class __$$_VeilidConfigHTTPSCopyWithImpl<$Res>
-    extends _$VeilidConfigHTTPSCopyWithImpl<$Res, _$_VeilidConfigHTTPS>
-    implements _$$_VeilidConfigHTTPSCopyWith<$Res> {
-  __$$_VeilidConfigHTTPSCopyWithImpl(
-      _$_VeilidConfigHTTPS _value, $Res Function(_$_VeilidConfigHTTPS) _then)
+class __$$VeilidConfigHTTPSImplCopyWithImpl<$Res>
+    extends _$VeilidConfigHTTPSCopyWithImpl<$Res, _$VeilidConfigHTTPSImpl>
+    implements _$$VeilidConfigHTTPSImplCopyWith<$Res> {
+  __$$VeilidConfigHTTPSImplCopyWithImpl(_$VeilidConfigHTTPSImpl _value,
+      $Res Function(_$VeilidConfigHTTPSImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1842,7 +2018,7 @@ class __$$_VeilidConfigHTTPSCopyWithImpl<$Res>
     Object? path = null,
     Object? url = freezed,
   }) {
-    return _then(_$_VeilidConfigHTTPS(
+    return _then(_$VeilidConfigHTTPSImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -1865,17 +2041,17 @@ class __$$_VeilidConfigHTTPSCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigHTTPS
+class _$VeilidConfigHTTPSImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigHTTPS {
-  const _$_VeilidConfigHTTPS(
+  const _$VeilidConfigHTTPSImpl(
       {required this.enabled,
       required this.listenAddress,
       required this.path,
       this.url});
 
-  factory _$_VeilidConfigHTTPS.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigHTTPSFromJson(json);
+  factory _$VeilidConfigHTTPSImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigHTTPSImplFromJson(json);
 
   @override
   final bool enabled;
@@ -1903,10 +2079,10 @@ class _$_VeilidConfigHTTPS
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigHTTPS &&
+            other is _$VeilidConfigHTTPSImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
             (identical(other.listenAddress, listenAddress) ||
                 other.listenAddress == listenAddress) &&
@@ -1922,13 +2098,13 @@ class _$_VeilidConfigHTTPS
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigHTTPSCopyWith<_$_VeilidConfigHTTPS> get copyWith =>
-      __$$_VeilidConfigHTTPSCopyWithImpl<_$_VeilidConfigHTTPS>(
+  _$$VeilidConfigHTTPSImplCopyWith<_$VeilidConfigHTTPSImpl> get copyWith =>
+      __$$VeilidConfigHTTPSImplCopyWithImpl<_$VeilidConfigHTTPSImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigHTTPSToJson(
+    return _$$VeilidConfigHTTPSImplToJson(
       this,
     );
   }
@@ -1939,10 +2115,10 @@ abstract class _VeilidConfigHTTPS implements VeilidConfigHTTPS {
       {required final bool enabled,
       required final String listenAddress,
       required final String path,
-      final String? url}) = _$_VeilidConfigHTTPS;
+      final String? url}) = _$VeilidConfigHTTPSImpl;
 
   factory _VeilidConfigHTTPS.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigHTTPS.fromJson;
+      _$VeilidConfigHTTPSImpl.fromJson;
 
   @override
   bool get enabled;
@@ -1954,7 +2130,7 @@ abstract class _VeilidConfigHTTPS implements VeilidConfigHTTPS {
   String? get url;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigHTTPSCopyWith<_$_VeilidConfigHTTPS> get copyWith =>
+  _$$VeilidConfigHTTPSImplCopyWith<_$VeilidConfigHTTPSImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -2024,22 +2200,22 @@ class _$VeilidConfigHTTPCopyWithImpl<$Res, $Val extends VeilidConfigHTTP>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigHTTPCopyWith<$Res>
+abstract class _$$VeilidConfigHTTPImplCopyWith<$Res>
     implements $VeilidConfigHTTPCopyWith<$Res> {
-  factory _$$_VeilidConfigHTTPCopyWith(
-          _$_VeilidConfigHTTP value, $Res Function(_$_VeilidConfigHTTP) then) =
-      __$$_VeilidConfigHTTPCopyWithImpl<$Res>;
+  factory _$$VeilidConfigHTTPImplCopyWith(_$VeilidConfigHTTPImpl value,
+          $Res Function(_$VeilidConfigHTTPImpl) then) =
+      __$$VeilidConfigHTTPImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({bool enabled, String listenAddress, String path, String? url});
 }
 
 /// @nodoc
-class __$$_VeilidConfigHTTPCopyWithImpl<$Res>
-    extends _$VeilidConfigHTTPCopyWithImpl<$Res, _$_VeilidConfigHTTP>
-    implements _$$_VeilidConfigHTTPCopyWith<$Res> {
-  __$$_VeilidConfigHTTPCopyWithImpl(
-      _$_VeilidConfigHTTP _value, $Res Function(_$_VeilidConfigHTTP) _then)
+class __$$VeilidConfigHTTPImplCopyWithImpl<$Res>
+    extends _$VeilidConfigHTTPCopyWithImpl<$Res, _$VeilidConfigHTTPImpl>
+    implements _$$VeilidConfigHTTPImplCopyWith<$Res> {
+  __$$VeilidConfigHTTPImplCopyWithImpl(_$VeilidConfigHTTPImpl _value,
+      $Res Function(_$VeilidConfigHTTPImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2050,7 +2226,7 @@ class __$$_VeilidConfigHTTPCopyWithImpl<$Res>
     Object? path = null,
     Object? url = freezed,
   }) {
-    return _then(_$_VeilidConfigHTTP(
+    return _then(_$VeilidConfigHTTPImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -2073,17 +2249,17 @@ class __$$_VeilidConfigHTTPCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigHTTP
+class _$VeilidConfigHTTPImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigHTTP {
-  const _$_VeilidConfigHTTP(
+  const _$VeilidConfigHTTPImpl(
       {required this.enabled,
       required this.listenAddress,
       required this.path,
       this.url});
 
-  factory _$_VeilidConfigHTTP.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigHTTPFromJson(json);
+  factory _$VeilidConfigHTTPImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigHTTPImplFromJson(json);
 
   @override
   final bool enabled;
@@ -2111,10 +2287,10 @@ class _$_VeilidConfigHTTP
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigHTTP &&
+            other is _$VeilidConfigHTTPImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
             (identical(other.listenAddress, listenAddress) ||
                 other.listenAddress == listenAddress) &&
@@ -2130,12 +2306,13 @@ class _$_VeilidConfigHTTP
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigHTTPCopyWith<_$_VeilidConfigHTTP> get copyWith =>
-      __$$_VeilidConfigHTTPCopyWithImpl<_$_VeilidConfigHTTP>(this, _$identity);
+  _$$VeilidConfigHTTPImplCopyWith<_$VeilidConfigHTTPImpl> get copyWith =>
+      __$$VeilidConfigHTTPImplCopyWithImpl<_$VeilidConfigHTTPImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigHTTPToJson(
+    return _$$VeilidConfigHTTPImplToJson(
       this,
     );
   }
@@ -2146,10 +2323,10 @@ abstract class _VeilidConfigHTTP implements VeilidConfigHTTP {
       {required final bool enabled,
       required final String listenAddress,
       required final String path,
-      final String? url}) = _$_VeilidConfigHTTP;
+      final String? url}) = _$VeilidConfigHTTPImpl;
 
   factory _VeilidConfigHTTP.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigHTTP.fromJson;
+      _$VeilidConfigHTTPImpl.fromJson;
 
   @override
   bool get enabled;
@@ -2161,7 +2338,7 @@ abstract class _VeilidConfigHTTP implements VeilidConfigHTTP {
   String? get url;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigHTTPCopyWith<_$_VeilidConfigHTTP> get copyWith =>
+  _$$VeilidConfigHTTPImplCopyWith<_$VeilidConfigHTTPImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -2240,11 +2417,12 @@ class _$VeilidConfigApplicationCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigApplicationCopyWith<$Res>
+abstract class _$$VeilidConfigApplicationImplCopyWith<$Res>
     implements $VeilidConfigApplicationCopyWith<$Res> {
-  factory _$$_VeilidConfigApplicationCopyWith(_$_VeilidConfigApplication value,
-          $Res Function(_$_VeilidConfigApplication) then) =
-      __$$_VeilidConfigApplicationCopyWithImpl<$Res>;
+  factory _$$VeilidConfigApplicationImplCopyWith(
+          _$VeilidConfigApplicationImpl value,
+          $Res Function(_$VeilidConfigApplicationImpl) then) =
+      __$$VeilidConfigApplicationImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({VeilidConfigHTTPS https, VeilidConfigHTTP http});
@@ -2256,12 +2434,13 @@ abstract class _$$_VeilidConfigApplicationCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigApplicationCopyWithImpl<$Res>
+class __$$VeilidConfigApplicationImplCopyWithImpl<$Res>
     extends _$VeilidConfigApplicationCopyWithImpl<$Res,
-        _$_VeilidConfigApplication>
-    implements _$$_VeilidConfigApplicationCopyWith<$Res> {
-  __$$_VeilidConfigApplicationCopyWithImpl(_$_VeilidConfigApplication _value,
-      $Res Function(_$_VeilidConfigApplication) _then)
+        _$VeilidConfigApplicationImpl>
+    implements _$$VeilidConfigApplicationImplCopyWith<$Res> {
+  __$$VeilidConfigApplicationImplCopyWithImpl(
+      _$VeilidConfigApplicationImpl _value,
+      $Res Function(_$VeilidConfigApplicationImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2270,7 +2449,7 @@ class __$$_VeilidConfigApplicationCopyWithImpl<$Res>
     Object? https = null,
     Object? http = null,
   }) {
-    return _then(_$_VeilidConfigApplication(
+    return _then(_$VeilidConfigApplicationImpl(
       https: null == https
           ? _value.https
           : https // ignore: cast_nullable_to_non_nullable
@@ -2285,13 +2464,14 @@ class __$$_VeilidConfigApplicationCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigApplication
+class _$VeilidConfigApplicationImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigApplication {
-  const _$_VeilidConfigApplication({required this.https, required this.http});
+  const _$VeilidConfigApplicationImpl(
+      {required this.https, required this.http});
 
-  factory _$_VeilidConfigApplication.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigApplicationFromJson(json);
+  factory _$VeilidConfigApplicationImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigApplicationImplFromJson(json);
 
   @override
   final VeilidConfigHTTPS https;
@@ -2313,10 +2493,10 @@ class _$_VeilidConfigApplication
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigApplication &&
+            other is _$VeilidConfigApplicationImpl &&
             (identical(other.https, https) || other.https == https) &&
             (identical(other.http, http) || other.http == http));
   }
@@ -2328,14 +2508,13 @@ class _$_VeilidConfigApplication
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigApplicationCopyWith<_$_VeilidConfigApplication>
-      get copyWith =>
-          __$$_VeilidConfigApplicationCopyWithImpl<_$_VeilidConfigApplication>(
-              this, _$identity);
+  _$$VeilidConfigApplicationImplCopyWith<_$VeilidConfigApplicationImpl>
+      get copyWith => __$$VeilidConfigApplicationImplCopyWithImpl<
+          _$VeilidConfigApplicationImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigApplicationToJson(
+    return _$$VeilidConfigApplicationImplToJson(
       this,
     );
   }
@@ -2344,10 +2523,10 @@ class _$_VeilidConfigApplication
 abstract class _VeilidConfigApplication implements VeilidConfigApplication {
   const factory _VeilidConfigApplication(
       {required final VeilidConfigHTTPS https,
-      required final VeilidConfigHTTP http}) = _$_VeilidConfigApplication;
+      required final VeilidConfigHTTP http}) = _$VeilidConfigApplicationImpl;
 
   factory _VeilidConfigApplication.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigApplication.fromJson;
+      _$VeilidConfigApplicationImpl.fromJson;
 
   @override
   VeilidConfigHTTPS get https;
@@ -2355,7 +2534,7 @@ abstract class _VeilidConfigApplication implements VeilidConfigApplication {
   VeilidConfigHTTP get http;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigApplicationCopyWith<_$_VeilidConfigApplication>
+  _$$VeilidConfigApplicationImplCopyWith<_$VeilidConfigApplicationImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -2429,11 +2608,11 @@ class _$VeilidConfigUDPCopyWithImpl<$Res, $Val extends VeilidConfigUDP>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigUDPCopyWith<$Res>
+abstract class _$$VeilidConfigUDPImplCopyWith<$Res>
     implements $VeilidConfigUDPCopyWith<$Res> {
-  factory _$$_VeilidConfigUDPCopyWith(
-          _$_VeilidConfigUDP value, $Res Function(_$_VeilidConfigUDP) then) =
-      __$$_VeilidConfigUDPCopyWithImpl<$Res>;
+  factory _$$VeilidConfigUDPImplCopyWith(_$VeilidConfigUDPImpl value,
+          $Res Function(_$VeilidConfigUDPImpl) then) =
+      __$$VeilidConfigUDPImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -2444,11 +2623,11 @@ abstract class _$$_VeilidConfigUDPCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigUDPCopyWithImpl<$Res>
-    extends _$VeilidConfigUDPCopyWithImpl<$Res, _$_VeilidConfigUDP>
-    implements _$$_VeilidConfigUDPCopyWith<$Res> {
-  __$$_VeilidConfigUDPCopyWithImpl(
-      _$_VeilidConfigUDP _value, $Res Function(_$_VeilidConfigUDP) _then)
+class __$$VeilidConfigUDPImplCopyWithImpl<$Res>
+    extends _$VeilidConfigUDPCopyWithImpl<$Res, _$VeilidConfigUDPImpl>
+    implements _$$VeilidConfigUDPImplCopyWith<$Res> {
+  __$$VeilidConfigUDPImplCopyWithImpl(
+      _$VeilidConfigUDPImpl _value, $Res Function(_$VeilidConfigUDPImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2459,7 +2638,7 @@ class __$$_VeilidConfigUDPCopyWithImpl<$Res>
     Object? listenAddress = null,
     Object? publicAddress = freezed,
   }) {
-    return _then(_$_VeilidConfigUDP(
+    return _then(_$VeilidConfigUDPImpl(
       enabled: null == enabled
           ? _value.enabled
           : enabled // ignore: cast_nullable_to_non_nullable
@@ -2482,17 +2661,17 @@ class __$$_VeilidConfigUDPCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigUDP
+class _$VeilidConfigUDPImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigUDP {
-  const _$_VeilidConfigUDP(
+  const _$VeilidConfigUDPImpl(
       {required this.enabled,
       required this.socketPoolSize,
       required this.listenAddress,
       this.publicAddress});
 
-  factory _$_VeilidConfigUDP.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigUDPFromJson(json);
+  factory _$VeilidConfigUDPImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigUDPImplFromJson(json);
 
   @override
   final bool enabled;
@@ -2520,10 +2699,10 @@ class _$_VeilidConfigUDP
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigUDP &&
+            other is _$VeilidConfigUDPImpl &&
             (identical(other.enabled, enabled) || other.enabled == enabled) &&
             (identical(other.socketPoolSize, socketPoolSize) ||
                 other.socketPoolSize == socketPoolSize) &&
@@ -2541,12 +2720,13 @@ class _$_VeilidConfigUDP
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigUDPCopyWith<_$_VeilidConfigUDP> get copyWith =>
-      __$$_VeilidConfigUDPCopyWithImpl<_$_VeilidConfigUDP>(this, _$identity);
+  _$$VeilidConfigUDPImplCopyWith<_$VeilidConfigUDPImpl> get copyWith =>
+      __$$VeilidConfigUDPImplCopyWithImpl<_$VeilidConfigUDPImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigUDPToJson(
+    return _$$VeilidConfigUDPImplToJson(
       this,
     );
   }
@@ -2557,10 +2737,10 @@ abstract class _VeilidConfigUDP implements VeilidConfigUDP {
       {required final bool enabled,
       required final int socketPoolSize,
       required final String listenAddress,
-      final String? publicAddress}) = _$_VeilidConfigUDP;
+      final String? publicAddress}) = _$VeilidConfigUDPImpl;
 
   factory _VeilidConfigUDP.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigUDP.fromJson;
+      _$VeilidConfigUDPImpl.fromJson;
 
   @override
   bool get enabled;
@@ -2572,7 +2752,7 @@ abstract class _VeilidConfigUDP implements VeilidConfigUDP {
   String? get publicAddress;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigUDPCopyWith<_$_VeilidConfigUDP> get copyWith =>
+  _$$VeilidConfigUDPImplCopyWith<_$VeilidConfigUDPImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -2653,11 +2833,11 @@ class _$VeilidConfigTCPCopyWithImpl<$Res, $Val extends VeilidConfigTCP>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigTCPCopyWith<$Res>
+abstract class _$$VeilidConfigTCPImplCopyWith<$Res>
     implements $VeilidConfigTCPCopyWith<$Res> {
-  factory _$$_VeilidConfigTCPCopyWith(
-          _$_VeilidConfigTCP value, $Res Function(_$_VeilidConfigTCP) then) =
-      __$$_VeilidConfigTCPCopyWithImpl<$Res>;
+  factory _$$VeilidConfigTCPImplCopyWith(_$VeilidConfigTCPImpl value,
+          $Res Function(_$VeilidConfigTCPImpl) then) =
+      __$$VeilidConfigTCPImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -2669,11 +2849,11 @@ abstract class _$$_VeilidConfigTCPCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigTCPCopyWithImpl<$Res>
-    extends _$VeilidConfigTCPCopyWithImpl<$Res, _$_VeilidConfigTCP>
-    implements _$$_VeilidConfigTCPCopyWith<$Res> {
-  __$$_VeilidConfigTCPCopyWithImpl(
-      _$_VeilidConfigTCP _value, $Res Function(_$_VeilidConfigTCP) _then)
+class __$$VeilidConfigTCPImplCopyWithImpl<$Res>
+    extends _$VeilidConfigTCPCopyWithImpl<$Res, _$VeilidConfigTCPImpl>
+    implements _$$VeilidConfigTCPImplCopyWith<$Res> {
+  __$$VeilidConfigTCPImplCopyWithImpl(
+      _$VeilidConfigTCPImpl _value, $Res Function(_$VeilidConfigTCPImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2685,7 +2865,7 @@ class __$$_VeilidConfigTCPCopyWithImpl<$Res>
     Object? listenAddress = null,
     Object? publicAddress = freezed,
   }) {
-    return _then(_$_VeilidConfigTCP(
+    return _then(_$VeilidConfigTCPImpl(
       connect: null == connect
           ? _value.connect
           : connect // ignore: cast_nullable_to_non_nullable
@@ -2712,18 +2892,18 @@ class __$$_VeilidConfigTCPCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigTCP
+class _$VeilidConfigTCPImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigTCP {
-  const _$_VeilidConfigTCP(
+  const _$VeilidConfigTCPImpl(
       {required this.connect,
       required this.listen,
       required this.maxConnections,
       required this.listenAddress,
       this.publicAddress});
 
-  factory _$_VeilidConfigTCP.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigTCPFromJson(json);
+  factory _$VeilidConfigTCPImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigTCPImplFromJson(json);
 
   @override
   final bool connect;
@@ -2754,10 +2934,10 @@ class _$_VeilidConfigTCP
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigTCP &&
+            other is _$VeilidConfigTCPImpl &&
             (identical(other.connect, connect) || other.connect == connect) &&
             (identical(other.listen, listen) || other.listen == listen) &&
             (identical(other.maxConnections, maxConnections) ||
@@ -2776,12 +2956,13 @@ class _$_VeilidConfigTCP
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigTCPCopyWith<_$_VeilidConfigTCP> get copyWith =>
-      __$$_VeilidConfigTCPCopyWithImpl<_$_VeilidConfigTCP>(this, _$identity);
+  _$$VeilidConfigTCPImplCopyWith<_$VeilidConfigTCPImpl> get copyWith =>
+      __$$VeilidConfigTCPImplCopyWithImpl<_$VeilidConfigTCPImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigTCPToJson(
+    return _$$VeilidConfigTCPImplToJson(
       this,
     );
   }
@@ -2793,10 +2974,10 @@ abstract class _VeilidConfigTCP implements VeilidConfigTCP {
       required final bool listen,
       required final int maxConnections,
       required final String listenAddress,
-      final String? publicAddress}) = _$_VeilidConfigTCP;
+      final String? publicAddress}) = _$VeilidConfigTCPImpl;
 
   factory _VeilidConfigTCP.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigTCP.fromJson;
+      _$VeilidConfigTCPImpl.fromJson;
 
   @override
   bool get connect;
@@ -2810,7 +2991,7 @@ abstract class _VeilidConfigTCP implements VeilidConfigTCP {
   String? get publicAddress;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigTCPCopyWith<_$_VeilidConfigTCP> get copyWith =>
+  _$$VeilidConfigTCPImplCopyWith<_$VeilidConfigTCPImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -2898,11 +3079,11 @@ class _$VeilidConfigWSCopyWithImpl<$Res, $Val extends VeilidConfigWS>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigWSCopyWith<$Res>
+abstract class _$$VeilidConfigWSImplCopyWith<$Res>
     implements $VeilidConfigWSCopyWith<$Res> {
-  factory _$$_VeilidConfigWSCopyWith(
-          _$_VeilidConfigWS value, $Res Function(_$_VeilidConfigWS) then) =
-      __$$_VeilidConfigWSCopyWithImpl<$Res>;
+  factory _$$VeilidConfigWSImplCopyWith(_$VeilidConfigWSImpl value,
+          $Res Function(_$VeilidConfigWSImpl) then) =
+      __$$VeilidConfigWSImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -2915,11 +3096,11 @@ abstract class _$$_VeilidConfigWSCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigWSCopyWithImpl<$Res>
-    extends _$VeilidConfigWSCopyWithImpl<$Res, _$_VeilidConfigWS>
-    implements _$$_VeilidConfigWSCopyWith<$Res> {
-  __$$_VeilidConfigWSCopyWithImpl(
-      _$_VeilidConfigWS _value, $Res Function(_$_VeilidConfigWS) _then)
+class __$$VeilidConfigWSImplCopyWithImpl<$Res>
+    extends _$VeilidConfigWSCopyWithImpl<$Res, _$VeilidConfigWSImpl>
+    implements _$$VeilidConfigWSImplCopyWith<$Res> {
+  __$$VeilidConfigWSImplCopyWithImpl(
+      _$VeilidConfigWSImpl _value, $Res Function(_$VeilidConfigWSImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2932,7 +3113,7 @@ class __$$_VeilidConfigWSCopyWithImpl<$Res>
     Object? path = null,
     Object? url = freezed,
   }) {
-    return _then(_$_VeilidConfigWS(
+    return _then(_$VeilidConfigWSImpl(
       connect: null == connect
           ? _value.connect
           : connect // ignore: cast_nullable_to_non_nullable
@@ -2963,10 +3144,10 @@ class __$$_VeilidConfigWSCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigWS
+class _$VeilidConfigWSImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigWS {
-  const _$_VeilidConfigWS(
+  const _$VeilidConfigWSImpl(
       {required this.connect,
       required this.listen,
       required this.maxConnections,
@@ -2974,8 +3155,8 @@ class _$_VeilidConfigWS
       required this.path,
       this.url});
 
-  factory _$_VeilidConfigWS.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigWSFromJson(json);
+  factory _$VeilidConfigWSImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigWSImplFromJson(json);
 
   @override
   final bool connect;
@@ -3009,10 +3190,10 @@ class _$_VeilidConfigWS
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigWS &&
+            other is _$VeilidConfigWSImpl &&
             (identical(other.connect, connect) || other.connect == connect) &&
             (identical(other.listen, listen) || other.listen == listen) &&
             (identical(other.maxConnections, maxConnections) ||
@@ -3031,12 +3212,13 @@ class _$_VeilidConfigWS
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigWSCopyWith<_$_VeilidConfigWS> get copyWith =>
-      __$$_VeilidConfigWSCopyWithImpl<_$_VeilidConfigWS>(this, _$identity);
+  _$$VeilidConfigWSImplCopyWith<_$VeilidConfigWSImpl> get copyWith =>
+      __$$VeilidConfigWSImplCopyWithImpl<_$VeilidConfigWSImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigWSToJson(
+    return _$$VeilidConfigWSImplToJson(
       this,
     );
   }
@@ -3049,10 +3231,10 @@ abstract class _VeilidConfigWS implements VeilidConfigWS {
       required final int maxConnections,
       required final String listenAddress,
       required final String path,
-      final String? url}) = _$_VeilidConfigWS;
+      final String? url}) = _$VeilidConfigWSImpl;
 
   factory _VeilidConfigWS.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigWS.fromJson;
+      _$VeilidConfigWSImpl.fromJson;
 
   @override
   bool get connect;
@@ -3068,7 +3250,7 @@ abstract class _VeilidConfigWS implements VeilidConfigWS {
   String? get url;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigWSCopyWith<_$_VeilidConfigWS> get copyWith =>
+  _$$VeilidConfigWSImplCopyWith<_$VeilidConfigWSImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -3156,11 +3338,11 @@ class _$VeilidConfigWSSCopyWithImpl<$Res, $Val extends VeilidConfigWSS>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigWSSCopyWith<$Res>
+abstract class _$$VeilidConfigWSSImplCopyWith<$Res>
     implements $VeilidConfigWSSCopyWith<$Res> {
-  factory _$$_VeilidConfigWSSCopyWith(
-          _$_VeilidConfigWSS value, $Res Function(_$_VeilidConfigWSS) then) =
-      __$$_VeilidConfigWSSCopyWithImpl<$Res>;
+  factory _$$VeilidConfigWSSImplCopyWith(_$VeilidConfigWSSImpl value,
+          $Res Function(_$VeilidConfigWSSImpl) then) =
+      __$$VeilidConfigWSSImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -3173,11 +3355,11 @@ abstract class _$$_VeilidConfigWSSCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigWSSCopyWithImpl<$Res>
-    extends _$VeilidConfigWSSCopyWithImpl<$Res, _$_VeilidConfigWSS>
-    implements _$$_VeilidConfigWSSCopyWith<$Res> {
-  __$$_VeilidConfigWSSCopyWithImpl(
-      _$_VeilidConfigWSS _value, $Res Function(_$_VeilidConfigWSS) _then)
+class __$$VeilidConfigWSSImplCopyWithImpl<$Res>
+    extends _$VeilidConfigWSSCopyWithImpl<$Res, _$VeilidConfigWSSImpl>
+    implements _$$VeilidConfigWSSImplCopyWith<$Res> {
+  __$$VeilidConfigWSSImplCopyWithImpl(
+      _$VeilidConfigWSSImpl _value, $Res Function(_$VeilidConfigWSSImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3190,7 +3372,7 @@ class __$$_VeilidConfigWSSCopyWithImpl<$Res>
     Object? path = null,
     Object? url = freezed,
   }) {
-    return _then(_$_VeilidConfigWSS(
+    return _then(_$VeilidConfigWSSImpl(
       connect: null == connect
           ? _value.connect
           : connect // ignore: cast_nullable_to_non_nullable
@@ -3221,10 +3403,10 @@ class __$$_VeilidConfigWSSCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigWSS
+class _$VeilidConfigWSSImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigWSS {
-  const _$_VeilidConfigWSS(
+  const _$VeilidConfigWSSImpl(
       {required this.connect,
       required this.listen,
       required this.maxConnections,
@@ -3232,8 +3414,8 @@ class _$_VeilidConfigWSS
       required this.path,
       this.url});
 
-  factory _$_VeilidConfigWSS.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigWSSFromJson(json);
+  factory _$VeilidConfigWSSImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigWSSImplFromJson(json);
 
   @override
   final bool connect;
@@ -3267,10 +3449,10 @@ class _$_VeilidConfigWSS
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigWSS &&
+            other is _$VeilidConfigWSSImpl &&
             (identical(other.connect, connect) || other.connect == connect) &&
             (identical(other.listen, listen) || other.listen == listen) &&
             (identical(other.maxConnections, maxConnections) ||
@@ -3289,12 +3471,13 @@ class _$_VeilidConfigWSS
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigWSSCopyWith<_$_VeilidConfigWSS> get copyWith =>
-      __$$_VeilidConfigWSSCopyWithImpl<_$_VeilidConfigWSS>(this, _$identity);
+  _$$VeilidConfigWSSImplCopyWith<_$VeilidConfigWSSImpl> get copyWith =>
+      __$$VeilidConfigWSSImplCopyWithImpl<_$VeilidConfigWSSImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigWSSToJson(
+    return _$$VeilidConfigWSSImplToJson(
       this,
     );
   }
@@ -3307,10 +3490,10 @@ abstract class _VeilidConfigWSS implements VeilidConfigWSS {
       required final int maxConnections,
       required final String listenAddress,
       required final String path,
-      final String? url}) = _$_VeilidConfigWSS;
+      final String? url}) = _$VeilidConfigWSSImpl;
 
   factory _VeilidConfigWSS.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigWSS.fromJson;
+      _$VeilidConfigWSSImpl.fromJson;
 
   @override
   bool get connect;
@@ -3326,7 +3509,7 @@ abstract class _VeilidConfigWSS implements VeilidConfigWSS {
   String? get url;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigWSSCopyWith<_$_VeilidConfigWSS> get copyWith =>
+  _$$VeilidConfigWSSImplCopyWith<_$VeilidConfigWSSImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -3438,11 +3621,11 @@ class _$VeilidConfigProtocolCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigProtocolCopyWith<$Res>
+abstract class _$$VeilidConfigProtocolImplCopyWith<$Res>
     implements $VeilidConfigProtocolCopyWith<$Res> {
-  factory _$$_VeilidConfigProtocolCopyWith(_$_VeilidConfigProtocol value,
-          $Res Function(_$_VeilidConfigProtocol) then) =
-      __$$_VeilidConfigProtocolCopyWithImpl<$Res>;
+  factory _$$VeilidConfigProtocolImplCopyWith(_$VeilidConfigProtocolImpl value,
+          $Res Function(_$VeilidConfigProtocolImpl) then) =
+      __$$VeilidConfigProtocolImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -3462,11 +3645,11 @@ abstract class _$$_VeilidConfigProtocolCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigProtocolCopyWithImpl<$Res>
-    extends _$VeilidConfigProtocolCopyWithImpl<$Res, _$_VeilidConfigProtocol>
-    implements _$$_VeilidConfigProtocolCopyWith<$Res> {
-  __$$_VeilidConfigProtocolCopyWithImpl(_$_VeilidConfigProtocol _value,
-      $Res Function(_$_VeilidConfigProtocol) _then)
+class __$$VeilidConfigProtocolImplCopyWithImpl<$Res>
+    extends _$VeilidConfigProtocolCopyWithImpl<$Res, _$VeilidConfigProtocolImpl>
+    implements _$$VeilidConfigProtocolImplCopyWith<$Res> {
+  __$$VeilidConfigProtocolImplCopyWithImpl(_$VeilidConfigProtocolImpl _value,
+      $Res Function(_$VeilidConfigProtocolImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3477,7 +3660,7 @@ class __$$_VeilidConfigProtocolCopyWithImpl<$Res>
     Object? ws = null,
     Object? wss = null,
   }) {
-    return _then(_$_VeilidConfigProtocol(
+    return _then(_$VeilidConfigProtocolImpl(
       udp: null == udp
           ? _value.udp
           : udp // ignore: cast_nullable_to_non_nullable
@@ -3500,17 +3683,17 @@ class __$$_VeilidConfigProtocolCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigProtocol
+class _$VeilidConfigProtocolImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigProtocol {
-  const _$_VeilidConfigProtocol(
+  const _$VeilidConfigProtocolImpl(
       {required this.udp,
       required this.tcp,
       required this.ws,
       required this.wss});
 
-  factory _$_VeilidConfigProtocol.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigProtocolFromJson(json);
+  factory _$VeilidConfigProtocolImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigProtocolImplFromJson(json);
 
   @override
   final VeilidConfigUDP udp;
@@ -3538,10 +3721,10 @@ class _$_VeilidConfigProtocol
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigProtocol &&
+            other is _$VeilidConfigProtocolImpl &&
             (identical(other.udp, udp) || other.udp == udp) &&
             (identical(other.tcp, tcp) || other.tcp == tcp) &&
             (identical(other.ws, ws) || other.ws == ws) &&
@@ -3555,13 +3738,14 @@ class _$_VeilidConfigProtocol
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigProtocolCopyWith<_$_VeilidConfigProtocol> get copyWith =>
-      __$$_VeilidConfigProtocolCopyWithImpl<_$_VeilidConfigProtocol>(
-          this, _$identity);
+  _$$VeilidConfigProtocolImplCopyWith<_$VeilidConfigProtocolImpl>
+      get copyWith =>
+          __$$VeilidConfigProtocolImplCopyWithImpl<_$VeilidConfigProtocolImpl>(
+              this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigProtocolToJson(
+    return _$$VeilidConfigProtocolImplToJson(
       this,
     );
   }
@@ -3572,10 +3756,10 @@ abstract class _VeilidConfigProtocol implements VeilidConfigProtocol {
       {required final VeilidConfigUDP udp,
       required final VeilidConfigTCP tcp,
       required final VeilidConfigWS ws,
-      required final VeilidConfigWSS wss}) = _$_VeilidConfigProtocol;
+      required final VeilidConfigWSS wss}) = _$VeilidConfigProtocolImpl;
 
   factory _VeilidConfigProtocol.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigProtocol.fromJson;
+      _$VeilidConfigProtocolImpl.fromJson;
 
   @override
   VeilidConfigUDP get udp;
@@ -3587,8 +3771,8 @@ abstract class _VeilidConfigProtocol implements VeilidConfigProtocol {
   VeilidConfigWSS get wss;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigProtocolCopyWith<_$_VeilidConfigProtocol> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidConfigProtocolImplCopyWith<_$VeilidConfigProtocolImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidConfigTLS _$VeilidConfigTLSFromJson(Map<String, dynamic> json) {
@@ -3654,11 +3838,11 @@ class _$VeilidConfigTLSCopyWithImpl<$Res, $Val extends VeilidConfigTLS>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigTLSCopyWith<$Res>
+abstract class _$$VeilidConfigTLSImplCopyWith<$Res>
     implements $VeilidConfigTLSCopyWith<$Res> {
-  factory _$$_VeilidConfigTLSCopyWith(
-          _$_VeilidConfigTLS value, $Res Function(_$_VeilidConfigTLS) then) =
-      __$$_VeilidConfigTLSCopyWithImpl<$Res>;
+  factory _$$VeilidConfigTLSImplCopyWith(_$VeilidConfigTLSImpl value,
+          $Res Function(_$VeilidConfigTLSImpl) then) =
+      __$$VeilidConfigTLSImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -3668,11 +3852,11 @@ abstract class _$$_VeilidConfigTLSCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigTLSCopyWithImpl<$Res>
-    extends _$VeilidConfigTLSCopyWithImpl<$Res, _$_VeilidConfigTLS>
-    implements _$$_VeilidConfigTLSCopyWith<$Res> {
-  __$$_VeilidConfigTLSCopyWithImpl(
-      _$_VeilidConfigTLS _value, $Res Function(_$_VeilidConfigTLS) _then)
+class __$$VeilidConfigTLSImplCopyWithImpl<$Res>
+    extends _$VeilidConfigTLSCopyWithImpl<$Res, _$VeilidConfigTLSImpl>
+    implements _$$VeilidConfigTLSImplCopyWith<$Res> {
+  __$$VeilidConfigTLSImplCopyWithImpl(
+      _$VeilidConfigTLSImpl _value, $Res Function(_$VeilidConfigTLSImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3682,7 +3866,7 @@ class __$$_VeilidConfigTLSCopyWithImpl<$Res>
     Object? privateKeyPath = null,
     Object? connectionInitialTimeoutMs = null,
   }) {
-    return _then(_$_VeilidConfigTLS(
+    return _then(_$VeilidConfigTLSImpl(
       certificatePath: null == certificatePath
           ? _value.certificatePath
           : certificatePath // ignore: cast_nullable_to_non_nullable
@@ -3701,16 +3885,16 @@ class __$$_VeilidConfigTLSCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigTLS
+class _$VeilidConfigTLSImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigTLS {
-  const _$_VeilidConfigTLS(
+  const _$VeilidConfigTLSImpl(
       {required this.certificatePath,
       required this.privateKeyPath,
       required this.connectionInitialTimeoutMs});
 
-  factory _$_VeilidConfigTLS.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigTLSFromJson(json);
+  factory _$VeilidConfigTLSImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigTLSImplFromJson(json);
 
   @override
   final String certificatePath;
@@ -3736,10 +3920,10 @@ class _$_VeilidConfigTLS
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigTLS &&
+            other is _$VeilidConfigTLSImpl &&
             (identical(other.certificatePath, certificatePath) ||
                 other.certificatePath == certificatePath) &&
             (identical(other.privateKeyPath, privateKeyPath) ||
@@ -3758,12 +3942,13 @@ class _$_VeilidConfigTLS
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigTLSCopyWith<_$_VeilidConfigTLS> get copyWith =>
-      __$$_VeilidConfigTLSCopyWithImpl<_$_VeilidConfigTLS>(this, _$identity);
+  _$$VeilidConfigTLSImplCopyWith<_$VeilidConfigTLSImpl> get copyWith =>
+      __$$VeilidConfigTLSImplCopyWithImpl<_$VeilidConfigTLSImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigTLSToJson(
+    return _$$VeilidConfigTLSImplToJson(
       this,
     );
   }
@@ -3773,10 +3958,10 @@ abstract class _VeilidConfigTLS implements VeilidConfigTLS {
   const factory _VeilidConfigTLS(
       {required final String certificatePath,
       required final String privateKeyPath,
-      required final int connectionInitialTimeoutMs}) = _$_VeilidConfigTLS;
+      required final int connectionInitialTimeoutMs}) = _$VeilidConfigTLSImpl;
 
   factory _VeilidConfigTLS.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigTLS.fromJson;
+      _$VeilidConfigTLSImpl.fromJson;
 
   @override
   String get certificatePath;
@@ -3786,7 +3971,7 @@ abstract class _VeilidConfigTLS implements VeilidConfigTLS {
   int get connectionInitialTimeoutMs;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigTLSCopyWith<_$_VeilidConfigTLS> get copyWith =>
+  _$$VeilidConfigTLSImplCopyWith<_$VeilidConfigTLSImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -3986,11 +4171,11 @@ class _$VeilidConfigDHTCopyWithImpl<$Res, $Val extends VeilidConfigDHT>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigDHTCopyWith<$Res>
+abstract class _$$VeilidConfigDHTImplCopyWith<$Res>
     implements $VeilidConfigDHTCopyWith<$Res> {
-  factory _$$_VeilidConfigDHTCopyWith(
-          _$_VeilidConfigDHT value, $Res Function(_$_VeilidConfigDHT) then) =
-      __$$_VeilidConfigDHTCopyWithImpl<$Res>;
+  factory _$$VeilidConfigDHTImplCopyWith(_$VeilidConfigDHTImpl value,
+          $Res Function(_$VeilidConfigDHTImpl) then) =
+      __$$VeilidConfigDHTImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -4019,11 +4204,11 @@ abstract class _$$_VeilidConfigDHTCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigDHTCopyWithImpl<$Res>
-    extends _$VeilidConfigDHTCopyWithImpl<$Res, _$_VeilidConfigDHT>
-    implements _$$_VeilidConfigDHTCopyWith<$Res> {
-  __$$_VeilidConfigDHTCopyWithImpl(
-      _$_VeilidConfigDHT _value, $Res Function(_$_VeilidConfigDHT) _then)
+class __$$VeilidConfigDHTImplCopyWithImpl<$Res>
+    extends _$VeilidConfigDHTCopyWithImpl<$Res, _$VeilidConfigDHTImpl>
+    implements _$$VeilidConfigDHTImplCopyWith<$Res> {
+  __$$VeilidConfigDHTImplCopyWithImpl(
+      _$VeilidConfigDHTImpl _value, $Res Function(_$VeilidConfigDHTImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -4052,7 +4237,7 @@ class __$$_VeilidConfigDHTCopyWithImpl<$Res>
     Object? memberWatchLimit = null,
     Object? maxWatchExpirationMs = null,
   }) {
-    return _then(_$_VeilidConfigDHT(
+    return _then(_$VeilidConfigDHTImpl(
       resolveNodeTimeoutMs: null == resolveNodeTimeoutMs
           ? _value.resolveNodeTimeoutMs
           : resolveNodeTimeoutMs // ignore: cast_nullable_to_non_nullable
@@ -4147,10 +4332,10 @@ class __$$_VeilidConfigDHTCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigDHT
+class _$VeilidConfigDHTImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigDHT {
-  const _$_VeilidConfigDHT(
+  const _$VeilidConfigDHTImpl(
       {required this.resolveNodeTimeoutMs,
       required this.resolveNodeCount,
       required this.resolveNodeFanout,
@@ -4174,8 +4359,8 @@ class _$_VeilidConfigDHT
       required this.memberWatchLimit,
       required this.maxWatchExpirationMs});
 
-  factory _$_VeilidConfigDHT.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigDHTFromJson(json);
+  factory _$VeilidConfigDHTImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigDHTImplFromJson(json);
 
   @override
   final int resolveNodeTimeoutMs;
@@ -4261,10 +4446,10 @@ class _$_VeilidConfigDHT
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigDHT &&
+            other is _$VeilidConfigDHTImpl &&
             (identical(other.resolveNodeTimeoutMs, resolveNodeTimeoutMs) ||
                 other.resolveNodeTimeoutMs == resolveNodeTimeoutMs) &&
             (identical(other.resolveNodeCount, resolveNodeCount) ||
@@ -4348,12 +4533,13 @@ class _$_VeilidConfigDHT
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigDHTCopyWith<_$_VeilidConfigDHT> get copyWith =>
-      __$$_VeilidConfigDHTCopyWithImpl<_$_VeilidConfigDHT>(this, _$identity);
+  _$$VeilidConfigDHTImplCopyWith<_$VeilidConfigDHTImpl> get copyWith =>
+      __$$VeilidConfigDHTImplCopyWithImpl<_$VeilidConfigDHTImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigDHTToJson(
+    return _$$VeilidConfigDHTImplToJson(
       this,
     );
   }
@@ -4382,10 +4568,10 @@ abstract class _VeilidConfigDHT implements VeilidConfigDHT {
       required final int remoteMaxStorageSpaceMb,
       required final int publicWatchLimit,
       required final int memberWatchLimit,
-      required final int maxWatchExpirationMs}) = _$_VeilidConfigDHT;
+      required final int maxWatchExpirationMs}) = _$VeilidConfigDHTImpl;
 
   factory _VeilidConfigDHT.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigDHT.fromJson;
+      _$VeilidConfigDHTImpl.fromJson;
 
   @override
   int get resolveNodeTimeoutMs;
@@ -4433,7 +4619,7 @@ abstract class _VeilidConfigDHT implements VeilidConfigDHT {
   int get maxWatchExpirationMs;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigDHTCopyWith<_$_VeilidConfigDHT> get copyWith =>
+  _$$VeilidConfigDHTImplCopyWith<_$VeilidConfigDHTImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -4528,11 +4714,11 @@ class _$VeilidConfigRPCCopyWithImpl<$Res, $Val extends VeilidConfigRPC>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigRPCCopyWith<$Res>
+abstract class _$$VeilidConfigRPCImplCopyWith<$Res>
     implements $VeilidConfigRPCCopyWith<$Res> {
-  factory _$$_VeilidConfigRPCCopyWith(
-          _$_VeilidConfigRPC value, $Res Function(_$_VeilidConfigRPC) then) =
-      __$$_VeilidConfigRPCCopyWithImpl<$Res>;
+  factory _$$VeilidConfigRPCImplCopyWith(_$VeilidConfigRPCImpl value,
+          $Res Function(_$VeilidConfigRPCImpl) then) =
+      __$$VeilidConfigRPCImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -4546,11 +4732,11 @@ abstract class _$$_VeilidConfigRPCCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigRPCCopyWithImpl<$Res>
-    extends _$VeilidConfigRPCCopyWithImpl<$Res, _$_VeilidConfigRPC>
-    implements _$$_VeilidConfigRPCCopyWith<$Res> {
-  __$$_VeilidConfigRPCCopyWithImpl(
-      _$_VeilidConfigRPC _value, $Res Function(_$_VeilidConfigRPC) _then)
+class __$$VeilidConfigRPCImplCopyWithImpl<$Res>
+    extends _$VeilidConfigRPCCopyWithImpl<$Res, _$VeilidConfigRPCImpl>
+    implements _$$VeilidConfigRPCImplCopyWith<$Res> {
+  __$$VeilidConfigRPCImplCopyWithImpl(
+      _$VeilidConfigRPCImpl _value, $Res Function(_$VeilidConfigRPCImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -4564,7 +4750,7 @@ class __$$_VeilidConfigRPCCopyWithImpl<$Res>
     Object? maxTimestampBehindMs = freezed,
     Object? maxTimestampAheadMs = freezed,
   }) {
-    return _then(_$_VeilidConfigRPC(
+    return _then(_$VeilidConfigRPCImpl(
       concurrency: null == concurrency
           ? _value.concurrency
           : concurrency // ignore: cast_nullable_to_non_nullable
@@ -4599,10 +4785,10 @@ class __$$_VeilidConfigRPCCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigRPC
+class _$VeilidConfigRPCImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigRPC {
-  const _$_VeilidConfigRPC(
+  const _$VeilidConfigRPCImpl(
       {required this.concurrency,
       required this.queueSize,
       required this.timeoutMs,
@@ -4611,8 +4797,8 @@ class _$_VeilidConfigRPC
       this.maxTimestampBehindMs,
       this.maxTimestampAheadMs});
 
-  factory _$_VeilidConfigRPC.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigRPCFromJson(json);
+  factory _$VeilidConfigRPCImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigRPCImplFromJson(json);
 
   @override
   final int concurrency;
@@ -4649,10 +4835,10 @@ class _$_VeilidConfigRPC
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigRPC &&
+            other is _$VeilidConfigRPCImpl &&
             (identical(other.concurrency, concurrency) ||
                 other.concurrency == concurrency) &&
             (identical(other.queueSize, queueSize) ||
@@ -4684,12 +4870,13 @@ class _$_VeilidConfigRPC
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigRPCCopyWith<_$_VeilidConfigRPC> get copyWith =>
-      __$$_VeilidConfigRPCCopyWithImpl<_$_VeilidConfigRPC>(this, _$identity);
+  _$$VeilidConfigRPCImplCopyWith<_$VeilidConfigRPCImpl> get copyWith =>
+      __$$VeilidConfigRPCImplCopyWithImpl<_$VeilidConfigRPCImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigRPCToJson(
+    return _$$VeilidConfigRPCImplToJson(
       this,
     );
   }
@@ -4703,10 +4890,10 @@ abstract class _VeilidConfigRPC implements VeilidConfigRPC {
       required final int maxRouteHopCount,
       required final int defaultRouteHopCount,
       final int? maxTimestampBehindMs,
-      final int? maxTimestampAheadMs}) = _$_VeilidConfigRPC;
+      final int? maxTimestampAheadMs}) = _$VeilidConfigRPCImpl;
 
   factory _VeilidConfigRPC.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigRPC.fromJson;
+      _$VeilidConfigRPCImpl.fromJson;
 
   @override
   int get concurrency;
@@ -4724,7 +4911,7 @@ abstract class _VeilidConfigRPC implements VeilidConfigRPC {
   int? get maxTimestampAheadMs;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigRPCCopyWith<_$_VeilidConfigRPC> get copyWith =>
+  _$$VeilidConfigRPCImplCopyWith<_$VeilidConfigRPCImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -4830,12 +5017,12 @@ class _$VeilidConfigRoutingTableCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigRoutingTableCopyWith<$Res>
+abstract class _$$VeilidConfigRoutingTableImplCopyWith<$Res>
     implements $VeilidConfigRoutingTableCopyWith<$Res> {
-  factory _$$_VeilidConfigRoutingTableCopyWith(
-          _$_VeilidConfigRoutingTable value,
-          $Res Function(_$_VeilidConfigRoutingTable) then) =
-      __$$_VeilidConfigRoutingTableCopyWithImpl<$Res>;
+  factory _$$VeilidConfigRoutingTableImplCopyWith(
+          _$VeilidConfigRoutingTableImpl value,
+          $Res Function(_$VeilidConfigRoutingTableImpl) then) =
+      __$$VeilidConfigRoutingTableImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -4850,12 +5037,13 @@ abstract class _$$_VeilidConfigRoutingTableCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigRoutingTableCopyWithImpl<$Res>
+class __$$VeilidConfigRoutingTableImplCopyWithImpl<$Res>
     extends _$VeilidConfigRoutingTableCopyWithImpl<$Res,
-        _$_VeilidConfigRoutingTable>
-    implements _$$_VeilidConfigRoutingTableCopyWith<$Res> {
-  __$$_VeilidConfigRoutingTableCopyWithImpl(_$_VeilidConfigRoutingTable _value,
-      $Res Function(_$_VeilidConfigRoutingTable) _then)
+        _$VeilidConfigRoutingTableImpl>
+    implements _$$VeilidConfigRoutingTableImplCopyWith<$Res> {
+  __$$VeilidConfigRoutingTableImplCopyWithImpl(
+      _$VeilidConfigRoutingTableImpl _value,
+      $Res Function(_$VeilidConfigRoutingTableImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -4870,7 +5058,7 @@ class __$$_VeilidConfigRoutingTableCopyWithImpl<$Res>
     Object? limitAttachedGood = null,
     Object? limitAttachedWeak = null,
   }) {
-    return _then(_$_VeilidConfigRoutingTable(
+    return _then(_$VeilidConfigRoutingTableImpl(
       nodeId: null == nodeId
           ? _value._nodeId
           : nodeId // ignore: cast_nullable_to_non_nullable
@@ -4909,10 +5097,10 @@ class __$$_VeilidConfigRoutingTableCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigRoutingTable
+class _$VeilidConfigRoutingTableImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigRoutingTable {
-  const _$_VeilidConfigRoutingTable(
+  const _$VeilidConfigRoutingTableImpl(
       {required final List<Typed<FixedEncodedString43>> nodeId,
       required final List<Typed<FixedEncodedString43>> nodeIdSecret,
       required final List<String> bootstrap,
@@ -4925,8 +5113,8 @@ class _$_VeilidConfigRoutingTable
         _nodeIdSecret = nodeIdSecret,
         _bootstrap = bootstrap;
 
-  factory _$_VeilidConfigRoutingTable.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigRoutingTableFromJson(json);
+  factory _$VeilidConfigRoutingTableImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigRoutingTableImplFromJson(json);
 
   final List<Typed<FixedEncodedString43>> _nodeId;
   @override
@@ -4984,10 +5172,10 @@ class _$_VeilidConfigRoutingTable
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigRoutingTable &&
+            other is _$VeilidConfigRoutingTableImpl &&
             const DeepCollectionEquality().equals(other._nodeId, _nodeId) &&
             const DeepCollectionEquality()
                 .equals(other._nodeIdSecret, _nodeIdSecret) &&
@@ -5021,13 +5209,13 @@ class _$_VeilidConfigRoutingTable
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigRoutingTableCopyWith<_$_VeilidConfigRoutingTable>
-      get copyWith => __$$_VeilidConfigRoutingTableCopyWithImpl<
-          _$_VeilidConfigRoutingTable>(this, _$identity);
+  _$$VeilidConfigRoutingTableImplCopyWith<_$VeilidConfigRoutingTableImpl>
+      get copyWith => __$$VeilidConfigRoutingTableImplCopyWithImpl<
+          _$VeilidConfigRoutingTableImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigRoutingTableToJson(
+    return _$$VeilidConfigRoutingTableImplToJson(
       this,
     );
   }
@@ -5042,10 +5230,10 @@ abstract class _VeilidConfigRoutingTable implements VeilidConfigRoutingTable {
       required final int limitFullyAttached,
       required final int limitAttachedStrong,
       required final int limitAttachedGood,
-      required final int limitAttachedWeak}) = _$_VeilidConfigRoutingTable;
+      required final int limitAttachedWeak}) = _$VeilidConfigRoutingTableImpl;
 
   factory _VeilidConfigRoutingTable.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigRoutingTable.fromJson;
+      _$VeilidConfigRoutingTableImpl.fromJson;
 
   @override
   List<Typed<FixedEncodedString43>> get nodeId;
@@ -5065,7 +5253,7 @@ abstract class _VeilidConfigRoutingTable implements VeilidConfigRoutingTable {
   int get limitAttachedWeak;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigRoutingTableCopyWith<_$_VeilidConfigRoutingTable>
+  _$$VeilidConfigRoutingTableImplCopyWith<_$VeilidConfigRoutingTableImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -5301,11 +5489,11 @@ class _$VeilidConfigNetworkCopyWithImpl<$Res, $Val extends VeilidConfigNetwork>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigNetworkCopyWith<$Res>
+abstract class _$$VeilidConfigNetworkImplCopyWith<$Res>
     implements $VeilidConfigNetworkCopyWith<$Res> {
-  factory _$$_VeilidConfigNetworkCopyWith(_$_VeilidConfigNetwork value,
-          $Res Function(_$_VeilidConfigNetwork) then) =
-      __$$_VeilidConfigNetworkCopyWithImpl<$Res>;
+  factory _$$VeilidConfigNetworkImplCopyWith(_$VeilidConfigNetworkImpl value,
+          $Res Function(_$VeilidConfigNetworkImpl) then) =
+      __$$VeilidConfigNetworkImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -5344,11 +5532,11 @@ abstract class _$$_VeilidConfigNetworkCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigNetworkCopyWithImpl<$Res>
-    extends _$VeilidConfigNetworkCopyWithImpl<$Res, _$_VeilidConfigNetwork>
-    implements _$$_VeilidConfigNetworkCopyWith<$Res> {
-  __$$_VeilidConfigNetworkCopyWithImpl(_$_VeilidConfigNetwork _value,
-      $Res Function(_$_VeilidConfigNetwork) _then)
+class __$$VeilidConfigNetworkImplCopyWithImpl<$Res>
+    extends _$VeilidConfigNetworkCopyWithImpl<$Res, _$VeilidConfigNetworkImpl>
+    implements _$$VeilidConfigNetworkImplCopyWith<$Res> {
+  __$$VeilidConfigNetworkImplCopyWithImpl(_$VeilidConfigNetworkImpl _value,
+      $Res Function(_$VeilidConfigNetworkImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -5374,7 +5562,7 @@ class __$$_VeilidConfigNetworkCopyWithImpl<$Res>
     Object? protocol = null,
     Object? networkKeyPassword = freezed,
   }) {
-    return _then(_$_VeilidConfigNetwork(
+    return _then(_$VeilidConfigNetworkImpl(
       connectionInitialTimeoutMs: null == connectionInitialTimeoutMs
           ? _value.connectionInitialTimeoutMs
           : connectionInitialTimeoutMs // ignore: cast_nullable_to_non_nullable
@@ -5457,10 +5645,10 @@ class __$$_VeilidConfigNetworkCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigNetwork
+class _$VeilidConfigNetworkImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigNetwork {
-  const _$_VeilidConfigNetwork(
+  const _$VeilidConfigNetworkImpl(
       {required this.connectionInitialTimeoutMs,
       required this.connectionInactivityTimeoutMs,
       required this.maxConnectionsPerIp4,
@@ -5481,8 +5669,8 @@ class _$_VeilidConfigNetwork
       required this.protocol,
       this.networkKeyPassword});
 
-  factory _$_VeilidConfigNetwork.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigNetworkFromJson(json);
+  factory _$VeilidConfigNetworkImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigNetworkImplFromJson(json);
 
   @override
   final int connectionInitialTimeoutMs;
@@ -5563,10 +5751,10 @@ class _$_VeilidConfigNetwork
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigNetwork &&
+            other is _$VeilidConfigNetworkImpl &&
             (identical(other.connectionInitialTimeoutMs, connectionInitialTimeoutMs) ||
                 other.connectionInitialTimeoutMs ==
                     connectionInitialTimeoutMs) &&
@@ -5638,13 +5826,13 @@ class _$_VeilidConfigNetwork
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigNetworkCopyWith<_$_VeilidConfigNetwork> get copyWith =>
-      __$$_VeilidConfigNetworkCopyWithImpl<_$_VeilidConfigNetwork>(
+  _$$VeilidConfigNetworkImplCopyWith<_$VeilidConfigNetworkImpl> get copyWith =>
+      __$$VeilidConfigNetworkImplCopyWithImpl<_$VeilidConfigNetworkImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigNetworkToJson(
+    return _$$VeilidConfigNetworkImplToJson(
       this,
     );
   }
@@ -5670,10 +5858,10 @@ abstract class _VeilidConfigNetwork implements VeilidConfigNetwork {
       required final VeilidConfigTLS tls,
       required final VeilidConfigApplication application,
       required final VeilidConfigProtocol protocol,
-      final String? networkKeyPassword}) = _$_VeilidConfigNetwork;
+      final String? networkKeyPassword}) = _$VeilidConfigNetworkImpl;
 
   factory _VeilidConfigNetwork.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigNetwork.fromJson;
+      _$VeilidConfigNetworkImpl.fromJson;
 
   @override
   int get connectionInitialTimeoutMs;
@@ -5715,7 +5903,7 @@ abstract class _VeilidConfigNetwork implements VeilidConfigNetwork {
   String? get networkKeyPassword;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigNetworkCopyWith<_$_VeilidConfigNetwork> get copyWith =>
+  _$$VeilidConfigNetworkImplCopyWith<_$VeilidConfigNetworkImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -5775,23 +5963,25 @@ class _$VeilidConfigTableStoreCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigTableStoreCopyWith<$Res>
+abstract class _$$VeilidConfigTableStoreImplCopyWith<$Res>
     implements $VeilidConfigTableStoreCopyWith<$Res> {
-  factory _$$_VeilidConfigTableStoreCopyWith(_$_VeilidConfigTableStore value,
-          $Res Function(_$_VeilidConfigTableStore) then) =
-      __$$_VeilidConfigTableStoreCopyWithImpl<$Res>;
+  factory _$$VeilidConfigTableStoreImplCopyWith(
+          _$VeilidConfigTableStoreImpl value,
+          $Res Function(_$VeilidConfigTableStoreImpl) then) =
+      __$$VeilidConfigTableStoreImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String directory, bool delete});
 }
 
 /// @nodoc
-class __$$_VeilidConfigTableStoreCopyWithImpl<$Res>
+class __$$VeilidConfigTableStoreImplCopyWithImpl<$Res>
     extends _$VeilidConfigTableStoreCopyWithImpl<$Res,
-        _$_VeilidConfigTableStore>
-    implements _$$_VeilidConfigTableStoreCopyWith<$Res> {
-  __$$_VeilidConfigTableStoreCopyWithImpl(_$_VeilidConfigTableStore _value,
-      $Res Function(_$_VeilidConfigTableStore) _then)
+        _$VeilidConfigTableStoreImpl>
+    implements _$$VeilidConfigTableStoreImplCopyWith<$Res> {
+  __$$VeilidConfigTableStoreImplCopyWithImpl(
+      _$VeilidConfigTableStoreImpl _value,
+      $Res Function(_$VeilidConfigTableStoreImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -5800,7 +5990,7 @@ class __$$_VeilidConfigTableStoreCopyWithImpl<$Res>
     Object? directory = null,
     Object? delete = null,
   }) {
-    return _then(_$_VeilidConfigTableStore(
+    return _then(_$VeilidConfigTableStoreImpl(
       directory: null == directory
           ? _value.directory
           : directory // ignore: cast_nullable_to_non_nullable
@@ -5815,14 +6005,14 @@ class __$$_VeilidConfigTableStoreCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigTableStore
+class _$VeilidConfigTableStoreImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigTableStore {
-  const _$_VeilidConfigTableStore(
+  const _$VeilidConfigTableStoreImpl(
       {required this.directory, required this.delete});
 
-  factory _$_VeilidConfigTableStore.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigTableStoreFromJson(json);
+  factory _$VeilidConfigTableStoreImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigTableStoreImplFromJson(json);
 
   @override
   final String directory;
@@ -5844,10 +6034,10 @@ class _$_VeilidConfigTableStore
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigTableStore &&
+            other is _$VeilidConfigTableStoreImpl &&
             (identical(other.directory, directory) ||
                 other.directory == directory) &&
             (identical(other.delete, delete) || other.delete == delete));
@@ -5860,13 +6050,13 @@ class _$_VeilidConfigTableStore
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigTableStoreCopyWith<_$_VeilidConfigTableStore> get copyWith =>
-      __$$_VeilidConfigTableStoreCopyWithImpl<_$_VeilidConfigTableStore>(
-          this, _$identity);
+  _$$VeilidConfigTableStoreImplCopyWith<_$VeilidConfigTableStoreImpl>
+      get copyWith => __$$VeilidConfigTableStoreImplCopyWithImpl<
+          _$VeilidConfigTableStoreImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigTableStoreToJson(
+    return _$$VeilidConfigTableStoreImplToJson(
       this,
     );
   }
@@ -5875,10 +6065,10 @@ class _$_VeilidConfigTableStore
 abstract class _VeilidConfigTableStore implements VeilidConfigTableStore {
   const factory _VeilidConfigTableStore(
       {required final String directory,
-      required final bool delete}) = _$_VeilidConfigTableStore;
+      required final bool delete}) = _$VeilidConfigTableStoreImpl;
 
   factory _VeilidConfigTableStore.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigTableStore.fromJson;
+      _$VeilidConfigTableStoreImpl.fromJson;
 
   @override
   String get directory;
@@ -5886,8 +6076,8 @@ abstract class _VeilidConfigTableStore implements VeilidConfigTableStore {
   bool get delete;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigTableStoreCopyWith<_$_VeilidConfigTableStore> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidConfigTableStoreImplCopyWith<_$VeilidConfigTableStoreImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidConfigBlockStore _$VeilidConfigBlockStoreFromJson(
@@ -5946,23 +6136,25 @@ class _$VeilidConfigBlockStoreCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigBlockStoreCopyWith<$Res>
+abstract class _$$VeilidConfigBlockStoreImplCopyWith<$Res>
     implements $VeilidConfigBlockStoreCopyWith<$Res> {
-  factory _$$_VeilidConfigBlockStoreCopyWith(_$_VeilidConfigBlockStore value,
-          $Res Function(_$_VeilidConfigBlockStore) then) =
-      __$$_VeilidConfigBlockStoreCopyWithImpl<$Res>;
+  factory _$$VeilidConfigBlockStoreImplCopyWith(
+          _$VeilidConfigBlockStoreImpl value,
+          $Res Function(_$VeilidConfigBlockStoreImpl) then) =
+      __$$VeilidConfigBlockStoreImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String directory, bool delete});
 }
 
 /// @nodoc
-class __$$_VeilidConfigBlockStoreCopyWithImpl<$Res>
+class __$$VeilidConfigBlockStoreImplCopyWithImpl<$Res>
     extends _$VeilidConfigBlockStoreCopyWithImpl<$Res,
-        _$_VeilidConfigBlockStore>
-    implements _$$_VeilidConfigBlockStoreCopyWith<$Res> {
-  __$$_VeilidConfigBlockStoreCopyWithImpl(_$_VeilidConfigBlockStore _value,
-      $Res Function(_$_VeilidConfigBlockStore) _then)
+        _$VeilidConfigBlockStoreImpl>
+    implements _$$VeilidConfigBlockStoreImplCopyWith<$Res> {
+  __$$VeilidConfigBlockStoreImplCopyWithImpl(
+      _$VeilidConfigBlockStoreImpl _value,
+      $Res Function(_$VeilidConfigBlockStoreImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -5971,7 +6163,7 @@ class __$$_VeilidConfigBlockStoreCopyWithImpl<$Res>
     Object? directory = null,
     Object? delete = null,
   }) {
-    return _then(_$_VeilidConfigBlockStore(
+    return _then(_$VeilidConfigBlockStoreImpl(
       directory: null == directory
           ? _value.directory
           : directory // ignore: cast_nullable_to_non_nullable
@@ -5986,14 +6178,14 @@ class __$$_VeilidConfigBlockStoreCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigBlockStore
+class _$VeilidConfigBlockStoreImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigBlockStore {
-  const _$_VeilidConfigBlockStore(
+  const _$VeilidConfigBlockStoreImpl(
       {required this.directory, required this.delete});
 
-  factory _$_VeilidConfigBlockStore.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigBlockStoreFromJson(json);
+  factory _$VeilidConfigBlockStoreImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigBlockStoreImplFromJson(json);
 
   @override
   final String directory;
@@ -6015,10 +6207,10 @@ class _$_VeilidConfigBlockStore
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigBlockStore &&
+            other is _$VeilidConfigBlockStoreImpl &&
             (identical(other.directory, directory) ||
                 other.directory == directory) &&
             (identical(other.delete, delete) || other.delete == delete));
@@ -6031,13 +6223,13 @@ class _$_VeilidConfigBlockStore
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigBlockStoreCopyWith<_$_VeilidConfigBlockStore> get copyWith =>
-      __$$_VeilidConfigBlockStoreCopyWithImpl<_$_VeilidConfigBlockStore>(
-          this, _$identity);
+  _$$VeilidConfigBlockStoreImplCopyWith<_$VeilidConfigBlockStoreImpl>
+      get copyWith => __$$VeilidConfigBlockStoreImplCopyWithImpl<
+          _$VeilidConfigBlockStoreImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigBlockStoreToJson(
+    return _$$VeilidConfigBlockStoreImplToJson(
       this,
     );
   }
@@ -6046,10 +6238,10 @@ class _$_VeilidConfigBlockStore
 abstract class _VeilidConfigBlockStore implements VeilidConfigBlockStore {
   const factory _VeilidConfigBlockStore(
       {required final String directory,
-      required final bool delete}) = _$_VeilidConfigBlockStore;
+      required final bool delete}) = _$VeilidConfigBlockStoreImpl;
 
   factory _VeilidConfigBlockStore.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigBlockStore.fromJson;
+      _$VeilidConfigBlockStoreImpl.fromJson;
 
   @override
   String get directory;
@@ -6057,8 +6249,8 @@ abstract class _VeilidConfigBlockStore implements VeilidConfigBlockStore {
   bool get delete;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigBlockStoreCopyWith<_$_VeilidConfigBlockStore> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidConfigBlockStoreImplCopyWith<_$VeilidConfigBlockStoreImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidConfigProtectedStore _$VeilidConfigProtectedStoreFromJson(
@@ -6149,12 +6341,12 @@ class _$VeilidConfigProtectedStoreCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigProtectedStoreCopyWith<$Res>
+abstract class _$$VeilidConfigProtectedStoreImplCopyWith<$Res>
     implements $VeilidConfigProtectedStoreCopyWith<$Res> {
-  factory _$$_VeilidConfigProtectedStoreCopyWith(
-          _$_VeilidConfigProtectedStore value,
-          $Res Function(_$_VeilidConfigProtectedStore) then) =
-      __$$_VeilidConfigProtectedStoreCopyWithImpl<$Res>;
+  factory _$$VeilidConfigProtectedStoreImplCopyWith(
+          _$VeilidConfigProtectedStoreImpl value,
+          $Res Function(_$VeilidConfigProtectedStoreImpl) then) =
+      __$$VeilidConfigProtectedStoreImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -6167,13 +6359,13 @@ abstract class _$$_VeilidConfigProtectedStoreCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigProtectedStoreCopyWithImpl<$Res>
+class __$$VeilidConfigProtectedStoreImplCopyWithImpl<$Res>
     extends _$VeilidConfigProtectedStoreCopyWithImpl<$Res,
-        _$_VeilidConfigProtectedStore>
-    implements _$$_VeilidConfigProtectedStoreCopyWith<$Res> {
-  __$$_VeilidConfigProtectedStoreCopyWithImpl(
-      _$_VeilidConfigProtectedStore _value,
-      $Res Function(_$_VeilidConfigProtectedStore) _then)
+        _$VeilidConfigProtectedStoreImpl>
+    implements _$$VeilidConfigProtectedStoreImplCopyWith<$Res> {
+  __$$VeilidConfigProtectedStoreImplCopyWithImpl(
+      _$VeilidConfigProtectedStoreImpl _value,
+      $Res Function(_$VeilidConfigProtectedStoreImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -6186,7 +6378,7 @@ class __$$_VeilidConfigProtectedStoreCopyWithImpl<$Res>
     Object? deviceEncryptionKeyPassword = null,
     Object? newDeviceEncryptionKeyPassword = freezed,
   }) {
-    return _then(_$_VeilidConfigProtectedStore(
+    return _then(_$VeilidConfigProtectedStoreImpl(
       allowInsecureFallback: null == allowInsecureFallback
           ? _value.allowInsecureFallback
           : allowInsecureFallback // ignore: cast_nullable_to_non_nullable
@@ -6217,10 +6409,10 @@ class __$$_VeilidConfigProtectedStoreCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigProtectedStore
+class _$VeilidConfigProtectedStoreImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigProtectedStore {
-  const _$_VeilidConfigProtectedStore(
+  const _$VeilidConfigProtectedStoreImpl(
       {required this.allowInsecureFallback,
       required this.alwaysUseInsecureStorage,
       required this.directory,
@@ -6228,8 +6420,9 @@ class _$_VeilidConfigProtectedStore
       required this.deviceEncryptionKeyPassword,
       this.newDeviceEncryptionKeyPassword});
 
-  factory _$_VeilidConfigProtectedStore.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigProtectedStoreFromJson(json);
+  factory _$VeilidConfigProtectedStoreImpl.fromJson(
+          Map<String, dynamic> json) =>
+      _$$VeilidConfigProtectedStoreImplFromJson(json);
 
   @override
   final bool allowInsecureFallback;
@@ -6266,10 +6459,10 @@ class _$_VeilidConfigProtectedStore
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigProtectedStore &&
+            other is _$VeilidConfigProtectedStoreImpl &&
             (identical(other.allowInsecureFallback, allowInsecureFallback) ||
                 other.allowInsecureFallback == allowInsecureFallback) &&
             (identical(
@@ -6302,13 +6495,13 @@ class _$_VeilidConfigProtectedStore
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigProtectedStoreCopyWith<_$_VeilidConfigProtectedStore>
-      get copyWith => __$$_VeilidConfigProtectedStoreCopyWithImpl<
-          _$_VeilidConfigProtectedStore>(this, _$identity);
+  _$$VeilidConfigProtectedStoreImplCopyWith<_$VeilidConfigProtectedStoreImpl>
+      get copyWith => __$$VeilidConfigProtectedStoreImplCopyWithImpl<
+          _$VeilidConfigProtectedStoreImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigProtectedStoreToJson(
+    return _$$VeilidConfigProtectedStoreImplToJson(
       this,
     );
   }
@@ -6323,10 +6516,10 @@ abstract class _VeilidConfigProtectedStore
           required final bool delete,
           required final String deviceEncryptionKeyPassword,
           final String? newDeviceEncryptionKeyPassword}) =
-      _$_VeilidConfigProtectedStore;
+      _$VeilidConfigProtectedStoreImpl;
 
   factory _VeilidConfigProtectedStore.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigProtectedStore.fromJson;
+      _$VeilidConfigProtectedStoreImpl.fromJson;
 
   @override
   bool get allowInsecureFallback;
@@ -6342,7 +6535,7 @@ abstract class _VeilidConfigProtectedStore
   String? get newDeviceEncryptionKeyPassword;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigProtectedStoreCopyWith<_$_VeilidConfigProtectedStore>
+  _$$VeilidConfigProtectedStoreImplCopyWith<_$VeilidConfigProtectedStoreImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -6396,24 +6589,25 @@ class _$VeilidConfigCapabilitiesCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigCapabilitiesCopyWith<$Res>
+abstract class _$$VeilidConfigCapabilitiesImplCopyWith<$Res>
     implements $VeilidConfigCapabilitiesCopyWith<$Res> {
-  factory _$$_VeilidConfigCapabilitiesCopyWith(
-          _$_VeilidConfigCapabilities value,
-          $Res Function(_$_VeilidConfigCapabilities) then) =
-      __$$_VeilidConfigCapabilitiesCopyWithImpl<$Res>;
+  factory _$$VeilidConfigCapabilitiesImplCopyWith(
+          _$VeilidConfigCapabilitiesImpl value,
+          $Res Function(_$VeilidConfigCapabilitiesImpl) then) =
+      __$$VeilidConfigCapabilitiesImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({List<String> disable});
 }
 
 /// @nodoc
-class __$$_VeilidConfigCapabilitiesCopyWithImpl<$Res>
+class __$$VeilidConfigCapabilitiesImplCopyWithImpl<$Res>
     extends _$VeilidConfigCapabilitiesCopyWithImpl<$Res,
-        _$_VeilidConfigCapabilities>
-    implements _$$_VeilidConfigCapabilitiesCopyWith<$Res> {
-  __$$_VeilidConfigCapabilitiesCopyWithImpl(_$_VeilidConfigCapabilities _value,
-      $Res Function(_$_VeilidConfigCapabilities) _then)
+        _$VeilidConfigCapabilitiesImpl>
+    implements _$$VeilidConfigCapabilitiesImplCopyWith<$Res> {
+  __$$VeilidConfigCapabilitiesImplCopyWithImpl(
+      _$VeilidConfigCapabilitiesImpl _value,
+      $Res Function(_$VeilidConfigCapabilitiesImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -6421,7 +6615,7 @@ class __$$_VeilidConfigCapabilitiesCopyWithImpl<$Res>
   $Res call({
     Object? disable = null,
   }) {
-    return _then(_$_VeilidConfigCapabilities(
+    return _then(_$VeilidConfigCapabilitiesImpl(
       disable: null == disable
           ? _value._disable
           : disable // ignore: cast_nullable_to_non_nullable
@@ -6432,14 +6626,14 @@ class __$$_VeilidConfigCapabilitiesCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfigCapabilities
+class _$VeilidConfigCapabilitiesImpl
     with DiagnosticableTreeMixin
     implements _VeilidConfigCapabilities {
-  const _$_VeilidConfigCapabilities({required final List<String> disable})
+  const _$VeilidConfigCapabilitiesImpl({required final List<String> disable})
       : _disable = disable;
 
-  factory _$_VeilidConfigCapabilities.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigCapabilitiesFromJson(json);
+  factory _$VeilidConfigCapabilitiesImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigCapabilitiesImplFromJson(json);
 
   final List<String> _disable;
   @override
@@ -6463,10 +6657,10 @@ class _$_VeilidConfigCapabilities
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfigCapabilities &&
+            other is _$VeilidConfigCapabilitiesImpl &&
             const DeepCollectionEquality().equals(other._disable, _disable));
   }
 
@@ -6478,13 +6672,13 @@ class _$_VeilidConfigCapabilities
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigCapabilitiesCopyWith<_$_VeilidConfigCapabilities>
-      get copyWith => __$$_VeilidConfigCapabilitiesCopyWithImpl<
-          _$_VeilidConfigCapabilities>(this, _$identity);
+  _$$VeilidConfigCapabilitiesImplCopyWith<_$VeilidConfigCapabilitiesImpl>
+      get copyWith => __$$VeilidConfigCapabilitiesImplCopyWithImpl<
+          _$VeilidConfigCapabilitiesImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigCapabilitiesToJson(
+    return _$$VeilidConfigCapabilitiesImplToJson(
       this,
     );
   }
@@ -6492,16 +6686,16 @@ class _$_VeilidConfigCapabilities
 
 abstract class _VeilidConfigCapabilities implements VeilidConfigCapabilities {
   const factory _VeilidConfigCapabilities(
-      {required final List<String> disable}) = _$_VeilidConfigCapabilities;
+      {required final List<String> disable}) = _$VeilidConfigCapabilitiesImpl;
 
   factory _VeilidConfigCapabilities.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfigCapabilities.fromJson;
+      _$VeilidConfigCapabilitiesImpl.fromJson;
 
   @override
   List<String> get disable;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigCapabilitiesCopyWith<_$_VeilidConfigCapabilities>
+  _$$VeilidConfigCapabilitiesImplCopyWith<_$VeilidConfigCapabilitiesImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -6646,11 +6840,11 @@ class _$VeilidConfigCopyWithImpl<$Res, $Val extends VeilidConfig>
 }
 
 /// @nodoc
-abstract class _$$_VeilidConfigCopyWith<$Res>
+abstract class _$$VeilidConfigImplCopyWith<$Res>
     implements $VeilidConfigCopyWith<$Res> {
-  factory _$$_VeilidConfigCopyWith(
-          _$_VeilidConfig value, $Res Function(_$_VeilidConfig) then) =
-      __$$_VeilidConfigCopyWithImpl<$Res>;
+  factory _$$VeilidConfigImplCopyWith(
+          _$VeilidConfigImpl value, $Res Function(_$VeilidConfigImpl) then) =
+      __$$VeilidConfigImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -6675,11 +6869,11 @@ abstract class _$$_VeilidConfigCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidConfigCopyWithImpl<$Res>
-    extends _$VeilidConfigCopyWithImpl<$Res, _$_VeilidConfig>
-    implements _$$_VeilidConfigCopyWith<$Res> {
-  __$$_VeilidConfigCopyWithImpl(
-      _$_VeilidConfig _value, $Res Function(_$_VeilidConfig) _then)
+class __$$VeilidConfigImplCopyWithImpl<$Res>
+    extends _$VeilidConfigCopyWithImpl<$Res, _$VeilidConfigImpl>
+    implements _$$VeilidConfigImplCopyWith<$Res> {
+  __$$VeilidConfigImplCopyWithImpl(
+      _$VeilidConfigImpl _value, $Res Function(_$VeilidConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -6693,7 +6887,7 @@ class __$$_VeilidConfigCopyWithImpl<$Res>
     Object? blockStore = null,
     Object? network = null,
   }) {
-    return _then(_$_VeilidConfig(
+    return _then(_$VeilidConfigImpl(
       programName: null == programName
           ? _value.programName
           : programName // ignore: cast_nullable_to_non_nullable
@@ -6728,8 +6922,8 @@ class __$$_VeilidConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidConfig with DiagnosticableTreeMixin implements _VeilidConfig {
-  const _$_VeilidConfig(
+class _$VeilidConfigImpl with DiagnosticableTreeMixin implements _VeilidConfig {
+  const _$VeilidConfigImpl(
       {required this.programName,
       required this.namespace,
       required this.capabilities,
@@ -6738,8 +6932,8 @@ class _$_VeilidConfig with DiagnosticableTreeMixin implements _VeilidConfig {
       required this.blockStore,
       required this.network});
 
-  factory _$_VeilidConfig.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidConfigFromJson(json);
+  factory _$VeilidConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidConfigImplFromJson(json);
 
   @override
   final String programName;
@@ -6776,10 +6970,10 @@ class _$_VeilidConfig with DiagnosticableTreeMixin implements _VeilidConfig {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidConfig &&
+            other is _$VeilidConfigImpl &&
             (identical(other.programName, programName) ||
                 other.programName == programName) &&
             (identical(other.namespace, namespace) ||
@@ -6803,12 +6997,12 @@ class _$_VeilidConfig with DiagnosticableTreeMixin implements _VeilidConfig {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidConfigCopyWith<_$_VeilidConfig> get copyWith =>
-      __$$_VeilidConfigCopyWithImpl<_$_VeilidConfig>(this, _$identity);
+  _$$VeilidConfigImplCopyWith<_$VeilidConfigImpl> get copyWith =>
+      __$$VeilidConfigImplCopyWithImpl<_$VeilidConfigImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidConfigToJson(
+    return _$$VeilidConfigImplToJson(
       this,
     );
   }
@@ -6822,10 +7016,10 @@ abstract class _VeilidConfig implements VeilidConfig {
       required final VeilidConfigProtectedStore protectedStore,
       required final VeilidConfigTableStore tableStore,
       required final VeilidConfigBlockStore blockStore,
-      required final VeilidConfigNetwork network}) = _$_VeilidConfig;
+      required final VeilidConfigNetwork network}) = _$VeilidConfigImpl;
 
   factory _VeilidConfig.fromJson(Map<String, dynamic> json) =
-      _$_VeilidConfig.fromJson;
+      _$VeilidConfigImpl.fromJson;
 
   @override
   String get programName;
@@ -6843,6 +7037,6 @@ abstract class _VeilidConfig implements VeilidConfig {
   VeilidConfigNetwork get network;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidConfigCopyWith<_$_VeilidConfig> get copyWith =>
+  _$$VeilidConfigImplCopyWith<_$VeilidConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/veilid-flutter/lib/veilid_config.g.dart b/veilid-flutter/lib/veilid_config.g.dart
index 08170e0a..b5011a1b 100644
--- a/veilid-flutter/lib/veilid_config.g.dart
+++ b/veilid-flutter/lib/veilid_config.g.dart
@@ -6,191 +6,226 @@ part of 'veilid_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_VeilidFFIConfigLoggingTerminal _$$_VeilidFFIConfigLoggingTerminalFromJson(
-        Map<String, dynamic> json) =>
-    _$_VeilidFFIConfigLoggingTerminal(
-      enabled: json['enabled'] as bool,
-      level: VeilidConfigLogLevel.fromJson(json['level']),
-    );
+_$VeilidFFIConfigLoggingTerminalImpl
+    _$$VeilidFFIConfigLoggingTerminalImplFromJson(Map<String, dynamic> json) =>
+        _$VeilidFFIConfigLoggingTerminalImpl(
+          enabled: json['enabled'] as bool,
+          level: VeilidConfigLogLevel.fromJson(json['level']),
+          ignoreLogTargets: (json['ignore_log_targets'] as List<dynamic>?)
+                  ?.map((e) => e as String)
+                  .toList() ??
+              const [],
+        );
 
-Map<String, dynamic> _$$_VeilidFFIConfigLoggingTerminalToJson(
-        _$_VeilidFFIConfigLoggingTerminal instance) =>
+Map<String, dynamic> _$$VeilidFFIConfigLoggingTerminalImplToJson(
+        _$VeilidFFIConfigLoggingTerminalImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'level': instance.level.toJson(),
+      'ignore_log_targets': instance.ignoreLogTargets,
     };
 
-_$_VeilidFFIConfigLoggingOtlp _$$_VeilidFFIConfigLoggingOtlpFromJson(
+_$VeilidFFIConfigLoggingOtlpImpl _$$VeilidFFIConfigLoggingOtlpImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidFFIConfigLoggingOtlp(
+    _$VeilidFFIConfigLoggingOtlpImpl(
       enabled: json['enabled'] as bool,
       level: VeilidConfigLogLevel.fromJson(json['level']),
       grpcEndpoint: json['grpc_endpoint'] as String,
       serviceName: json['service_name'] as String,
+      ignoreLogTargets: (json['ignore_log_targets'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [],
     );
 
-Map<String, dynamic> _$$_VeilidFFIConfigLoggingOtlpToJson(
-        _$_VeilidFFIConfigLoggingOtlp instance) =>
+Map<String, dynamic> _$$VeilidFFIConfigLoggingOtlpImplToJson(
+        _$VeilidFFIConfigLoggingOtlpImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'level': instance.level.toJson(),
       'grpc_endpoint': instance.grpcEndpoint,
       'service_name': instance.serviceName,
+      'ignore_log_targets': instance.ignoreLogTargets,
     };
 
-_$_VeilidFFIConfigLoggingApi _$$_VeilidFFIConfigLoggingApiFromJson(
+_$VeilidFFIConfigLoggingApiImpl _$$VeilidFFIConfigLoggingApiImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidFFIConfigLoggingApi(
+    _$VeilidFFIConfigLoggingApiImpl(
       enabled: json['enabled'] as bool,
       level: VeilidConfigLogLevel.fromJson(json['level']),
+      ignoreLogTargets: (json['ignore_log_targets'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [],
     );
 
-Map<String, dynamic> _$$_VeilidFFIConfigLoggingApiToJson(
-        _$_VeilidFFIConfigLoggingApi instance) =>
+Map<String, dynamic> _$$VeilidFFIConfigLoggingApiImplToJson(
+        _$VeilidFFIConfigLoggingApiImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'level': instance.level.toJson(),
+      'ignore_log_targets': instance.ignoreLogTargets,
     };
 
-_$_VeilidFFIConfigLogging _$$_VeilidFFIConfigLoggingFromJson(
+_$VeilidFFIConfigLoggingImpl _$$VeilidFFIConfigLoggingImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidFFIConfigLogging(
+    _$VeilidFFIConfigLoggingImpl(
       terminal: VeilidFFIConfigLoggingTerminal.fromJson(json['terminal']),
       otlp: VeilidFFIConfigLoggingOtlp.fromJson(json['otlp']),
       api: VeilidFFIConfigLoggingApi.fromJson(json['api']),
     );
 
-Map<String, dynamic> _$$_VeilidFFIConfigLoggingToJson(
-        _$_VeilidFFIConfigLogging instance) =>
+Map<String, dynamic> _$$VeilidFFIConfigLoggingImplToJson(
+        _$VeilidFFIConfigLoggingImpl instance) =>
     <String, dynamic>{
       'terminal': instance.terminal.toJson(),
       'otlp': instance.otlp.toJson(),
       'api': instance.api.toJson(),
     };
 
-_$_VeilidFFIConfig _$$_VeilidFFIConfigFromJson(Map<String, dynamic> json) =>
-    _$_VeilidFFIConfig(
+_$VeilidFFIConfigImpl _$$VeilidFFIConfigImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidFFIConfigImpl(
       logging: VeilidFFIConfigLogging.fromJson(json['logging']),
     );
 
-Map<String, dynamic> _$$_VeilidFFIConfigToJson(_$_VeilidFFIConfig instance) =>
+Map<String, dynamic> _$$VeilidFFIConfigImplToJson(
+        _$VeilidFFIConfigImpl instance) =>
     <String, dynamic>{
       'logging': instance.logging.toJson(),
     };
 
-_$_VeilidWASMConfigLoggingPerformance
-    _$$_VeilidWASMConfigLoggingPerformanceFromJson(Map<String, dynamic> json) =>
-        _$_VeilidWASMConfigLoggingPerformance(
+_$VeilidWASMConfigLoggingPerformanceImpl
+    _$$VeilidWASMConfigLoggingPerformanceImplFromJson(
+            Map<String, dynamic> json) =>
+        _$VeilidWASMConfigLoggingPerformanceImpl(
           enabled: json['enabled'] as bool,
           level: VeilidConfigLogLevel.fromJson(json['level']),
           logsInTimings: json['logs_in_timings'] as bool,
           logsInConsole: json['logs_in_console'] as bool,
+          ignoreLogTargets: (json['ignore_log_targets'] as List<dynamic>?)
+                  ?.map((e) => e as String)
+                  .toList() ??
+              const [],
         );
 
-Map<String, dynamic> _$$_VeilidWASMConfigLoggingPerformanceToJson(
-        _$_VeilidWASMConfigLoggingPerformance instance) =>
+Map<String, dynamic> _$$VeilidWASMConfigLoggingPerformanceImplToJson(
+        _$VeilidWASMConfigLoggingPerformanceImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'level': instance.level.toJson(),
       'logs_in_timings': instance.logsInTimings,
       'logs_in_console': instance.logsInConsole,
+      'ignore_log_targets': instance.ignoreLogTargets,
     };
 
-_$_VeilidWASMConfigLoggingApi _$$_VeilidWASMConfigLoggingApiFromJson(
+_$VeilidWASMConfigLoggingApiImpl _$$VeilidWASMConfigLoggingApiImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidWASMConfigLoggingApi(
+    _$VeilidWASMConfigLoggingApiImpl(
       enabled: json['enabled'] as bool,
       level: VeilidConfigLogLevel.fromJson(json['level']),
+      ignoreLogTargets: (json['ignore_log_targets'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [],
     );
 
-Map<String, dynamic> _$$_VeilidWASMConfigLoggingApiToJson(
-        _$_VeilidWASMConfigLoggingApi instance) =>
+Map<String, dynamic> _$$VeilidWASMConfigLoggingApiImplToJson(
+        _$VeilidWASMConfigLoggingApiImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'level': instance.level.toJson(),
+      'ignore_log_targets': instance.ignoreLogTargets,
     };
 
-_$_VeilidWASMConfigLogging _$$_VeilidWASMConfigLoggingFromJson(
+_$VeilidWASMConfigLoggingImpl _$$VeilidWASMConfigLoggingImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidWASMConfigLogging(
+    _$VeilidWASMConfigLoggingImpl(
       performance:
           VeilidWASMConfigLoggingPerformance.fromJson(json['performance']),
       api: VeilidWASMConfigLoggingApi.fromJson(json['api']),
     );
 
-Map<String, dynamic> _$$_VeilidWASMConfigLoggingToJson(
-        _$_VeilidWASMConfigLogging instance) =>
+Map<String, dynamic> _$$VeilidWASMConfigLoggingImplToJson(
+        _$VeilidWASMConfigLoggingImpl instance) =>
     <String, dynamic>{
       'performance': instance.performance.toJson(),
       'api': instance.api.toJson(),
     };
 
-_$_VeilidWASMConfig _$$_VeilidWASMConfigFromJson(Map<String, dynamic> json) =>
-    _$_VeilidWASMConfig(
+_$VeilidWASMConfigImpl _$$VeilidWASMConfigImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidWASMConfigImpl(
       logging: VeilidWASMConfigLogging.fromJson(json['logging']),
     );
 
-Map<String, dynamic> _$$_VeilidWASMConfigToJson(_$_VeilidWASMConfig instance) =>
+Map<String, dynamic> _$$VeilidWASMConfigImplToJson(
+        _$VeilidWASMConfigImpl instance) =>
     <String, dynamic>{
       'logging': instance.logging.toJson(),
     };
 
-_$_VeilidConfigHTTPS _$$_VeilidConfigHTTPSFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigHTTPS(
-      enabled: json['enabled'] as bool,
-      listenAddress: json['listen_address'] as String,
-      path: json['path'] as String,
-      url: json['url'] as String?,
-    );
-
-Map<String, dynamic> _$$_VeilidConfigHTTPSToJson(
-        _$_VeilidConfigHTTPS instance) =>
-    <String, dynamic>{
-      'enabled': instance.enabled,
-      'listen_address': instance.listenAddress,
-      'path': instance.path,
-      'url': instance.url,
-    };
-
-_$_VeilidConfigHTTP _$$_VeilidConfigHTTPFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigHTTP(
-      enabled: json['enabled'] as bool,
-      listenAddress: json['listen_address'] as String,
-      path: json['path'] as String,
-      url: json['url'] as String?,
-    );
-
-Map<String, dynamic> _$$_VeilidConfigHTTPToJson(_$_VeilidConfigHTTP instance) =>
-    <String, dynamic>{
-      'enabled': instance.enabled,
-      'listen_address': instance.listenAddress,
-      'path': instance.path,
-      'url': instance.url,
-    };
-
-_$_VeilidConfigApplication _$$_VeilidConfigApplicationFromJson(
+_$VeilidConfigHTTPSImpl _$$VeilidConfigHTTPSImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigApplication(
+    _$VeilidConfigHTTPSImpl(
+      enabled: json['enabled'] as bool,
+      listenAddress: json['listen_address'] as String,
+      path: json['path'] as String,
+      url: json['url'] as String?,
+    );
+
+Map<String, dynamic> _$$VeilidConfigHTTPSImplToJson(
+        _$VeilidConfigHTTPSImpl instance) =>
+    <String, dynamic>{
+      'enabled': instance.enabled,
+      'listen_address': instance.listenAddress,
+      'path': instance.path,
+      'url': instance.url,
+    };
+
+_$VeilidConfigHTTPImpl _$$VeilidConfigHTTPImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigHTTPImpl(
+      enabled: json['enabled'] as bool,
+      listenAddress: json['listen_address'] as String,
+      path: json['path'] as String,
+      url: json['url'] as String?,
+    );
+
+Map<String, dynamic> _$$VeilidConfigHTTPImplToJson(
+        _$VeilidConfigHTTPImpl instance) =>
+    <String, dynamic>{
+      'enabled': instance.enabled,
+      'listen_address': instance.listenAddress,
+      'path': instance.path,
+      'url': instance.url,
+    };
+
+_$VeilidConfigApplicationImpl _$$VeilidConfigApplicationImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigApplicationImpl(
       https: VeilidConfigHTTPS.fromJson(json['https']),
       http: VeilidConfigHTTP.fromJson(json['http']),
     );
 
-Map<String, dynamic> _$$_VeilidConfigApplicationToJson(
-        _$_VeilidConfigApplication instance) =>
+Map<String, dynamic> _$$VeilidConfigApplicationImplToJson(
+        _$VeilidConfigApplicationImpl instance) =>
     <String, dynamic>{
       'https': instance.https.toJson(),
       'http': instance.http.toJson(),
     };
 
-_$_VeilidConfigUDP _$$_VeilidConfigUDPFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigUDP(
+_$VeilidConfigUDPImpl _$$VeilidConfigUDPImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigUDPImpl(
       enabled: json['enabled'] as bool,
       socketPoolSize: json['socket_pool_size'] as int,
       listenAddress: json['listen_address'] as String,
       publicAddress: json['public_address'] as String?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigUDPToJson(_$_VeilidConfigUDP instance) =>
+Map<String, dynamic> _$$VeilidConfigUDPImplToJson(
+        _$VeilidConfigUDPImpl instance) =>
     <String, dynamic>{
       'enabled': instance.enabled,
       'socket_pool_size': instance.socketPoolSize,
@@ -198,8 +233,9 @@ Map<String, dynamic> _$$_VeilidConfigUDPToJson(_$_VeilidConfigUDP instance) =>
       'public_address': instance.publicAddress,
     };
 
-_$_VeilidConfigTCP _$$_VeilidConfigTCPFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigTCP(
+_$VeilidConfigTCPImpl _$$VeilidConfigTCPImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigTCPImpl(
       connect: json['connect'] as bool,
       listen: json['listen'] as bool,
       maxConnections: json['max_connections'] as int,
@@ -207,7 +243,8 @@ _$_VeilidConfigTCP _$$_VeilidConfigTCPFromJson(Map<String, dynamic> json) =>
       publicAddress: json['public_address'] as String?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigTCPToJson(_$_VeilidConfigTCP instance) =>
+Map<String, dynamic> _$$VeilidConfigTCPImplToJson(
+        _$VeilidConfigTCPImpl instance) =>
     <String, dynamic>{
       'connect': instance.connect,
       'listen': instance.listen,
@@ -216,8 +253,8 @@ Map<String, dynamic> _$$_VeilidConfigTCPToJson(_$_VeilidConfigTCP instance) =>
       'public_address': instance.publicAddress,
     };
 
-_$_VeilidConfigWS _$$_VeilidConfigWSFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigWS(
+_$VeilidConfigWSImpl _$$VeilidConfigWSImplFromJson(Map<String, dynamic> json) =>
+    _$VeilidConfigWSImpl(
       connect: json['connect'] as bool,
       listen: json['listen'] as bool,
       maxConnections: json['max_connections'] as int,
@@ -226,7 +263,8 @@ _$_VeilidConfigWS _$$_VeilidConfigWSFromJson(Map<String, dynamic> json) =>
       url: json['url'] as String?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigWSToJson(_$_VeilidConfigWS instance) =>
+Map<String, dynamic> _$$VeilidConfigWSImplToJson(
+        _$VeilidConfigWSImpl instance) =>
     <String, dynamic>{
       'connect': instance.connect,
       'listen': instance.listen,
@@ -236,37 +274,39 @@ Map<String, dynamic> _$$_VeilidConfigWSToJson(_$_VeilidConfigWS instance) =>
       'url': instance.url,
     };
 
-_$_VeilidConfigWSS _$$_VeilidConfigWSSFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigWSS(
-      connect: json['connect'] as bool,
-      listen: json['listen'] as bool,
-      maxConnections: json['max_connections'] as int,
-      listenAddress: json['listen_address'] as String,
-      path: json['path'] as String,
-      url: json['url'] as String?,
-    );
-
-Map<String, dynamic> _$$_VeilidConfigWSSToJson(_$_VeilidConfigWSS instance) =>
-    <String, dynamic>{
-      'connect': instance.connect,
-      'listen': instance.listen,
-      'max_connections': instance.maxConnections,
-      'listen_address': instance.listenAddress,
-      'path': instance.path,
-      'url': instance.url,
-    };
-
-_$_VeilidConfigProtocol _$$_VeilidConfigProtocolFromJson(
+_$VeilidConfigWSSImpl _$$VeilidConfigWSSImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigProtocol(
+    _$VeilidConfigWSSImpl(
+      connect: json['connect'] as bool,
+      listen: json['listen'] as bool,
+      maxConnections: json['max_connections'] as int,
+      listenAddress: json['listen_address'] as String,
+      path: json['path'] as String,
+      url: json['url'] as String?,
+    );
+
+Map<String, dynamic> _$$VeilidConfigWSSImplToJson(
+        _$VeilidConfigWSSImpl instance) =>
+    <String, dynamic>{
+      'connect': instance.connect,
+      'listen': instance.listen,
+      'max_connections': instance.maxConnections,
+      'listen_address': instance.listenAddress,
+      'path': instance.path,
+      'url': instance.url,
+    };
+
+_$VeilidConfigProtocolImpl _$$VeilidConfigProtocolImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigProtocolImpl(
       udp: VeilidConfigUDP.fromJson(json['udp']),
       tcp: VeilidConfigTCP.fromJson(json['tcp']),
       ws: VeilidConfigWS.fromJson(json['ws']),
       wss: VeilidConfigWSS.fromJson(json['wss']),
     );
 
-Map<String, dynamic> _$$_VeilidConfigProtocolToJson(
-        _$_VeilidConfigProtocol instance) =>
+Map<String, dynamic> _$$VeilidConfigProtocolImplToJson(
+        _$VeilidConfigProtocolImpl instance) =>
     <String, dynamic>{
       'udp': instance.udp.toJson(),
       'tcp': instance.tcp.toJson(),
@@ -274,22 +314,25 @@ Map<String, dynamic> _$$_VeilidConfigProtocolToJson(
       'wss': instance.wss.toJson(),
     };
 
-_$_VeilidConfigTLS _$$_VeilidConfigTLSFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigTLS(
+_$VeilidConfigTLSImpl _$$VeilidConfigTLSImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigTLSImpl(
       certificatePath: json['certificate_path'] as String,
       privateKeyPath: json['private_key_path'] as String,
       connectionInitialTimeoutMs: json['connection_initial_timeout_ms'] as int,
     );
 
-Map<String, dynamic> _$$_VeilidConfigTLSToJson(_$_VeilidConfigTLS instance) =>
+Map<String, dynamic> _$$VeilidConfigTLSImplToJson(
+        _$VeilidConfigTLSImpl instance) =>
     <String, dynamic>{
       'certificate_path': instance.certificatePath,
       'private_key_path': instance.privateKeyPath,
       'connection_initial_timeout_ms': instance.connectionInitialTimeoutMs,
     };
 
-_$_VeilidConfigDHT _$$_VeilidConfigDHTFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigDHT(
+_$VeilidConfigDHTImpl _$$VeilidConfigDHTImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigDHTImpl(
       resolveNodeTimeoutMs: json['resolve_node_timeout_ms'] as int,
       resolveNodeCount: json['resolve_node_count'] as int,
       resolveNodeFanout: json['resolve_node_fanout'] as int,
@@ -317,7 +360,8 @@ _$_VeilidConfigDHT _$$_VeilidConfigDHTFromJson(Map<String, dynamic> json) =>
       maxWatchExpirationMs: json['max_watch_expiration_ms'] as int,
     );
 
-Map<String, dynamic> _$$_VeilidConfigDHTToJson(_$_VeilidConfigDHT instance) =>
+Map<String, dynamic> _$$VeilidConfigDHTImplToJson(
+        _$VeilidConfigDHTImpl instance) =>
     <String, dynamic>{
       'resolve_node_timeout_ms': instance.resolveNodeTimeoutMs,
       'resolve_node_count': instance.resolveNodeCount,
@@ -345,8 +389,9 @@ Map<String, dynamic> _$$_VeilidConfigDHTToJson(_$_VeilidConfigDHT instance) =>
       'max_watch_expiration_ms': instance.maxWatchExpirationMs,
     };
 
-_$_VeilidConfigRPC _$$_VeilidConfigRPCFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfigRPC(
+_$VeilidConfigRPCImpl _$$VeilidConfigRPCImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidConfigRPCImpl(
       concurrency: json['concurrency'] as int,
       queueSize: json['queue_size'] as int,
       timeoutMs: json['timeout_ms'] as int,
@@ -356,7 +401,8 @@ _$_VeilidConfigRPC _$$_VeilidConfigRPCFromJson(Map<String, dynamic> json) =>
       maxTimestampAheadMs: json['max_timestamp_ahead_ms'] as int?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigRPCToJson(_$_VeilidConfigRPC instance) =>
+Map<String, dynamic> _$$VeilidConfigRPCImplToJson(
+        _$VeilidConfigRPCImpl instance) =>
     <String, dynamic>{
       'concurrency': instance.concurrency,
       'queue_size': instance.queueSize,
@@ -367,9 +413,9 @@ Map<String, dynamic> _$$_VeilidConfigRPCToJson(_$_VeilidConfigRPC instance) =>
       'max_timestamp_ahead_ms': instance.maxTimestampAheadMs,
     };
 
-_$_VeilidConfigRoutingTable _$$_VeilidConfigRoutingTableFromJson(
+_$VeilidConfigRoutingTableImpl _$$VeilidConfigRoutingTableImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigRoutingTable(
+    _$VeilidConfigRoutingTableImpl(
       nodeId: (json['node_id'] as List<dynamic>)
           .map(Typed<FixedEncodedString43>.fromJson)
           .toList(),
@@ -385,8 +431,8 @@ _$_VeilidConfigRoutingTable _$$_VeilidConfigRoutingTableFromJson(
       limitAttachedWeak: json['limit_attached_weak'] as int,
     );
 
-Map<String, dynamic> _$$_VeilidConfigRoutingTableToJson(
-        _$_VeilidConfigRoutingTable instance) =>
+Map<String, dynamic> _$$VeilidConfigRoutingTableImplToJson(
+        _$VeilidConfigRoutingTableImpl instance) =>
     <String, dynamic>{
       'node_id': instance.nodeId.map((e) => e.toJson()).toList(),
       'node_id_secret': instance.nodeIdSecret.map((e) => e.toJson()).toList(),
@@ -398,9 +444,9 @@ Map<String, dynamic> _$$_VeilidConfigRoutingTableToJson(
       'limit_attached_weak': instance.limitAttachedWeak,
     };
 
-_$_VeilidConfigNetwork _$$_VeilidConfigNetworkFromJson(
+_$VeilidConfigNetworkImpl _$$VeilidConfigNetworkImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigNetwork(
+    _$VeilidConfigNetworkImpl(
       connectionInitialTimeoutMs: json['connection_initial_timeout_ms'] as int,
       connectionInactivityTimeoutMs:
           json['connection_inactivity_timeout_ms'] as int,
@@ -426,8 +472,8 @@ _$_VeilidConfigNetwork _$$_VeilidConfigNetworkFromJson(
       networkKeyPassword: json['network_key_password'] as String?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigNetworkToJson(
-        _$_VeilidConfigNetwork instance) =>
+Map<String, dynamic> _$$VeilidConfigNetworkImplToJson(
+        _$VeilidConfigNetworkImpl instance) =>
     <String, dynamic>{
       'connection_initial_timeout_ms': instance.connectionInitialTimeoutMs,
       'connection_inactivity_timeout_ms':
@@ -453,37 +499,37 @@ Map<String, dynamic> _$$_VeilidConfigNetworkToJson(
       'network_key_password': instance.networkKeyPassword,
     };
 
-_$_VeilidConfigTableStore _$$_VeilidConfigTableStoreFromJson(
+_$VeilidConfigTableStoreImpl _$$VeilidConfigTableStoreImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigTableStore(
+    _$VeilidConfigTableStoreImpl(
       directory: json['directory'] as String,
       delete: json['delete'] as bool,
     );
 
-Map<String, dynamic> _$$_VeilidConfigTableStoreToJson(
-        _$_VeilidConfigTableStore instance) =>
+Map<String, dynamic> _$$VeilidConfigTableStoreImplToJson(
+        _$VeilidConfigTableStoreImpl instance) =>
     <String, dynamic>{
       'directory': instance.directory,
       'delete': instance.delete,
     };
 
-_$_VeilidConfigBlockStore _$$_VeilidConfigBlockStoreFromJson(
+_$VeilidConfigBlockStoreImpl _$$VeilidConfigBlockStoreImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigBlockStore(
+    _$VeilidConfigBlockStoreImpl(
       directory: json['directory'] as String,
       delete: json['delete'] as bool,
     );
 
-Map<String, dynamic> _$$_VeilidConfigBlockStoreToJson(
-        _$_VeilidConfigBlockStore instance) =>
+Map<String, dynamic> _$$VeilidConfigBlockStoreImplToJson(
+        _$VeilidConfigBlockStoreImpl instance) =>
     <String, dynamic>{
       'directory': instance.directory,
       'delete': instance.delete,
     };
 
-_$_VeilidConfigProtectedStore _$$_VeilidConfigProtectedStoreFromJson(
+_$VeilidConfigProtectedStoreImpl _$$VeilidConfigProtectedStoreImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigProtectedStore(
+    _$VeilidConfigProtectedStoreImpl(
       allowInsecureFallback: json['allow_insecure_fallback'] as bool,
       alwaysUseInsecureStorage: json['always_use_insecure_storage'] as bool,
       directory: json['directory'] as String,
@@ -494,8 +540,8 @@ _$_VeilidConfigProtectedStore _$$_VeilidConfigProtectedStoreFromJson(
           json['new_device_encryption_key_password'] as String?,
     );
 
-Map<String, dynamic> _$$_VeilidConfigProtectedStoreToJson(
-        _$_VeilidConfigProtectedStore instance) =>
+Map<String, dynamic> _$$VeilidConfigProtectedStoreImplToJson(
+        _$VeilidConfigProtectedStoreImpl instance) =>
     <String, dynamic>{
       'allow_insecure_fallback': instance.allowInsecureFallback,
       'always_use_insecure_storage': instance.alwaysUseInsecureStorage,
@@ -506,21 +552,21 @@ Map<String, dynamic> _$$_VeilidConfigProtectedStoreToJson(
           instance.newDeviceEncryptionKeyPassword,
     };
 
-_$_VeilidConfigCapabilities _$$_VeilidConfigCapabilitiesFromJson(
+_$VeilidConfigCapabilitiesImpl _$$VeilidConfigCapabilitiesImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidConfigCapabilities(
+    _$VeilidConfigCapabilitiesImpl(
       disable:
           (json['disable'] as List<dynamic>).map((e) => e as String).toList(),
     );
 
-Map<String, dynamic> _$$_VeilidConfigCapabilitiesToJson(
-        _$_VeilidConfigCapabilities instance) =>
+Map<String, dynamic> _$$VeilidConfigCapabilitiesImplToJson(
+        _$VeilidConfigCapabilitiesImpl instance) =>
     <String, dynamic>{
       'disable': instance.disable,
     };
 
-_$_VeilidConfig _$$_VeilidConfigFromJson(Map<String, dynamic> json) =>
-    _$_VeilidConfig(
+_$VeilidConfigImpl _$$VeilidConfigImplFromJson(Map<String, dynamic> json) =>
+    _$VeilidConfigImpl(
       programName: json['program_name'] as String,
       namespace: json['namespace'] as String,
       capabilities: VeilidConfigCapabilities.fromJson(json['capabilities']),
@@ -531,7 +577,7 @@ _$_VeilidConfig _$$_VeilidConfigFromJson(Map<String, dynamic> json) =>
       network: VeilidConfigNetwork.fromJson(json['network']),
     );
 
-Map<String, dynamic> _$$_VeilidConfigToJson(_$_VeilidConfig instance) =>
+Map<String, dynamic> _$$VeilidConfigImplToJson(_$VeilidConfigImpl instance) =>
     <String, dynamic>{
       'program_name': instance.programName,
       'namespace': instance.namespace,
diff --git a/veilid-flutter/lib/veilid_crypto.dart b/veilid-flutter/lib/veilid_crypto.dart
index 85d22397..b7978c84 100644
--- a/veilid-flutter/lib/veilid_crypto.dart
+++ b/veilid-flutter/lib/veilid_crypto.dart
@@ -156,6 +156,8 @@ abstract class VeilidCryptoSystem {
   CryptoKind kind();
   Future<SharedSecret> cachedDH(PublicKey key, SecretKey secret);
   Future<SharedSecret> computeDH(PublicKey key, SecretKey secret);
+  Future<SharedSecret> generateSharedSecret(
+      PublicKey key, SecretKey secret, Uint8List domain);
   Future<Uint8List> randomBytes(int len);
   Future<int> defaultSaltLength();
   Future<String> hashPassword(Uint8List password, Uint8List salt);
diff --git a/veilid-flutter/lib/veilid_ffi.dart b/veilid-flutter/lib/veilid_ffi.dart
index ecac809f..aa289b9d 100644
--- a/veilid-flutter/lib/veilid_ffi.dart
+++ b/veilid-flutter/lib/veilid_ffi.dart
@@ -32,6 +32,8 @@ typedef _FreeStringDart = void Function(Pointer<Utf8>);
 typedef _InitializeVeilidCoreDart = void Function(Pointer<Utf8>);
 // fn change_log_level(layer: FfiStr, log_level: FfiStr)
 typedef _ChangeLogLevelDart = void Function(Pointer<Utf8>, Pointer<Utf8>);
+// fn change_log_ignore(layer: FfiStr, log_ignore: FfiStr)
+typedef _ChangeLogIgnoreDart = void Function(Pointer<Utf8>, Pointer<Utf8>);
 // fn startup_veilid_core(port: i64, config: FfiStr)
 typedef _StartupVeilidCoreDart = void Function(int, int, Pointer<Utf8>);
 // fn get_veilid_state(port: i64)
@@ -81,9 +83,9 @@ typedef _RoutingContextDeleteDHTRecordDart = void Function(
 typedef _RoutingContextGetDHTValueDart = void Function(
     int, int, Pointer<Utf8>, int, bool);
 // fn routing_context_set_dht_value(port: i64,
-//    id: u32, key: FfiStr, subkey: u32, data: FfiStr)
+//    id: u32, key: FfiStr, subkey: u32, data: FfiStr, writer: FfiStr)
 typedef _RoutingContextSetDHTValueDart = void Function(
-    int, int, Pointer<Utf8>, int, Pointer<Utf8>);
+    int, int, Pointer<Utf8>, int, Pointer<Utf8>, Pointer<Utf8>);
 // fn routing_context_watch_dht_values(port: i64,
 //     id: u32, key: FfiStr, subkeys: FfiStr, expiration: FfiStr, count: u32)
 typedef _RoutingContextWatchDHTValuesDart = void Function(
@@ -92,6 +94,10 @@ typedef _RoutingContextWatchDHTValuesDart = void Function(
 //     id: u32, key: FfiStr, subkeys: FfiStr)
 typedef _RoutingContextCancelDHTWatchDart = void Function(
     int, int, Pointer<Utf8>, Pointer<Utf8>);
+// fn routing_context_inspect_dht_record(port: i64,
+//     id: u32, key: FfiStr, subkeys: FfiStr, scope: FfiStr)
+typedef _RoutingContextInspectDHTRecordDart = void Function(
+    int, int, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>);
 
 // fn new_private_route(port: i64)
 typedef _NewPrivateRouteDart = void Function(int);
@@ -157,6 +163,10 @@ typedef _CryptoCachedDHDart = void Function(
 // fn crypto_compute_dh(port: i64, kind: u32, key: FfiStr, secret: FfiStr)
 typedef _CryptoComputeDHDart = void Function(
     int, int, Pointer<Utf8>, Pointer<Utf8>);
+// fn crypto_generate_shared_secret(port: i64, kind: u32, key: FfiStr,
+//   secret: FfiStr, domain: FfiStr)
+typedef _CryptoGenerateSharedSecretDart = void Function(
+    int, int, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>);
 // fn crypto_random_bytes(port: i64, kind: u32, len: u32)
 typedef _CryptoRandomBytesDart = void Function(int, int, int);
 // fn crypto_default_salt_length(port: i64, kind: u32)
@@ -235,6 +245,9 @@ final class VeilidVersionFFI extends Struct {
 
 typedef _VeilidVersionDart = VeilidVersionFFI Function();
 
+// fn default_veilid_config() -> *mut c_char
+typedef _DefaultVeilidConfigDart = Pointer<Utf8> Function();
+
 // Async message types
 const int messageOk = 0;
 const int messageErr = 1;
@@ -476,6 +489,7 @@ Stream<T> processStreamJson<T>(
           }
         case messageStreamClose:
           {
+            port.close();
             break;
           }
         default:
@@ -528,26 +542,40 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
   }
 
   @override
-  VeilidRoutingContextFFI withDefaultSafety() {
+  VeilidRoutingContextFFI withDefaultSafety({bool closeSelf = false}) {
     _ctx.ensureValid();
     final newId = _ctx.ffi._routingContextWithDefaultSafety(_ctx.id!);
-    return VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    final out = VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
-  VeilidRoutingContextFFI withSafety(SafetySelection safetySelection) {
+  VeilidRoutingContextFFI withSafety(SafetySelection safetySelection,
+      {bool closeSelf = false}) {
     _ctx.ensureValid();
     final newId = _ctx.ffi._routingContextWithSafety(
         _ctx.id!, jsonEncode(safetySelection).toNativeUtf8());
-    return VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    final out = VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
-  VeilidRoutingContextFFI withSequencing(Sequencing sequencing) {
+  VeilidRoutingContextFFI withSequencing(Sequencing sequencing,
+      {bool closeSelf = false}) {
     _ctx.ensureValid();
     final newId = _ctx.ffi._routingContextWithSequencing(
         _ctx.id!, jsonEncode(sequencing).toNativeUtf8());
-    return VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    final out = VeilidRoutingContextFFI._(_Ctx(newId, _ctx.ffi));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
@@ -603,8 +631,8 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
   }
 
   @override
-  Future<DHTRecordDescriptor> openDHTRecord(
-      TypedKey key, KeyPair? writer) async {
+  Future<DHTRecordDescriptor> openDHTRecord(TypedKey key,
+      {KeyPair? writer}) async {
     _ctx.ensureValid();
     final nativeKey = jsonEncode(key).toNativeUtf8();
     final nativeWriter =
@@ -641,8 +669,8 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
   }
 
   @override
-  Future<ValueData?> getDHTValue(
-      TypedKey key, int subkey, bool forceRefresh) async {
+  Future<ValueData?> getDHTValue(TypedKey key, int subkey,
+      {bool forceRefresh = false}) async {
     _ctx.ensureValid();
     final nativeKey = jsonEncode(key).toNativeUtf8();
     final recvPort = ReceivePort('routing_context_get_dht_value');
@@ -655,16 +683,18 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
   }
 
   @override
-  Future<ValueData?> setDHTValue(
-      TypedKey key, int subkey, Uint8List data) async {
+  Future<ValueData?> setDHTValue(TypedKey key, int subkey, Uint8List data,
+      {KeyPair? writer}) async {
     _ctx.ensureValid();
     final nativeKey = jsonEncode(key).toNativeUtf8();
     final nativeData = base64UrlNoPadEncode(data).toNativeUtf8();
+    final nativeWriter =
+        writer != null ? jsonEncode(writer).toNativeUtf8() : nullptr;
 
     final recvPort = ReceivePort('routing_context_set_dht_value');
     final sendPort = recvPort.sendPort;
-    _ctx.ffi._routingContextSetDHTValue(
-        sendPort.nativePort, _ctx.id!, nativeKey, subkey, nativeData);
+    _ctx.ffi._routingContextSetDHTValue(sendPort.nativePort, _ctx.id!,
+        nativeKey, subkey, nativeData, nativeWriter);
     final valueData =
         await processFutureOptJson(ValueData.fromJson, recvPort.first);
     return valueData;
@@ -676,7 +706,7 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
       Timestamp? expiration,
       int? count}) async {
     subkeys ??= [];
-    expiration ??= Timestamp(value: BigInt.zero);
+    expiration ??= Timestamp.zero();
     count ??= 0xFFFFFFFF;
 
     _ctx.ensureValid();
@@ -709,6 +739,26 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
     final cancelled = await processFuturePlain<bool>(recvPort.first);
     return cancelled;
   }
+
+  @override
+  Future<DHTRecordReport> inspectDHTRecord(TypedKey key,
+      {List<ValueSubkeyRange>? subkeys,
+      DHTReportScope scope = DHTReportScope.local}) async {
+    subkeys ??= [];
+
+    _ctx.ensureValid();
+    final nativeKey = jsonEncode(key).toNativeUtf8();
+    final nativeSubkeys = jsonEncode(subkeys).toNativeUtf8();
+    final nativeScope = jsonEncode(scope).toNativeUtf8();
+
+    final recvPort = ReceivePort('routing_context_inspect_dht_record');
+    final sendPort = recvPort.sendPort;
+    _ctx.ffi._routingContextInspectDHTRecord(
+        sendPort.nativePort, _ctx.id!, nativeKey, nativeSubkeys, nativeScope);
+    final report =
+        await processFutureJson(DHTRecordReport.fromJson, recvPort.first);
+    return report;
+  }
 }
 
 class _TDBT {
@@ -952,6 +1002,20 @@ class VeilidCryptoSystemFFI extends VeilidCryptoSystem {
     return processFutureJson(SharedSecret.fromJson, recvPort.first);
   }
 
+  @override
+  Future<SharedSecret> generateSharedSecret(
+      PublicKey key, SecretKey secret, Uint8List domain) async {
+    final nativeKey = jsonEncode(key).toNativeUtf8();
+    final nativeSecret = jsonEncode(secret).toNativeUtf8();
+    final nativeDomain = base64UrlNoPadEncode(domain).toNativeUtf8();
+
+    final recvPort = ReceivePort('crypto_generate_shared_secret');
+    final sendPort = recvPort.sendPort;
+    _ffi._cryptoGenerateSharedSecret(
+        sendPort.nativePort, _kind, nativeKey, nativeSecret, nativeDomain);
+    return processFutureJson(SharedSecret.fromJson, recvPort.first);
+  }
+
   @override
   Future<Uint8List> randomBytes(int len) async {
     final recvPort = ReceivePort('crypto_random_bytes');
@@ -1179,6 +1243,9 @@ class VeilidFFI extends Veilid {
         _changeLogLevel = dylib.lookupFunction<
             Void Function(Pointer<Utf8>, Pointer<Utf8>),
             _ChangeLogLevelDart>('change_log_level'),
+        _changeLogIgnore = dylib.lookupFunction<
+            Void Function(Pointer<Utf8>, Pointer<Utf8>),
+            _ChangeLogIgnoreDart>('change_log_ignore'),
         _startupVeilidCore = dylib.lookupFunction<
             Void Function(Int64, Int64, Pointer<Utf8>),
             _StartupVeilidCoreDart>('startup_veilid_core'),
@@ -1236,7 +1303,8 @@ class VeilidFFI extends Veilid {
             Void Function(Int64, Uint32, Pointer<Utf8>, Uint32, Bool),
             _RoutingContextGetDHTValueDart>('routing_context_get_dht_value'),
         _routingContextSetDHTValue = dylib.lookupFunction<
-            Void Function(Int64, Uint32, Pointer<Utf8>, Uint32, Pointer<Utf8>),
+            Void Function(Int64, Uint32, Pointer<Utf8>, Uint32, Pointer<Utf8>,
+                Pointer<Utf8>),
             _RoutingContextSetDHTValueDart>('routing_context_set_dht_value'),
         _routingContextWatchDHTValues = dylib.lookupFunction<
                 Void Function(Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>,
@@ -1247,6 +1315,11 @@ class VeilidFFI extends Veilid {
                 Void Function(Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>),
                 _RoutingContextCancelDHTWatchDart>(
             'routing_context_cancel_dht_watch'),
+        _routingContextInspectDHTRecord = dylib.lookupFunction<
+                Void Function(
+                    Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>),
+                _RoutingContextInspectDHTRecordDart>(
+            'routing_context_inspect_dht_record'),
         _newPrivateRoute =
             dylib.lookupFunction<Void Function(Int64), _NewPrivateRouteDart>(
                 'new_private_route'),
@@ -1322,6 +1395,10 @@ class VeilidFFI extends Veilid {
         _cryptoComputeDH = dylib.lookupFunction<
             Void Function(Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>),
             _CryptoComputeDHDart>('crypto_compute_dh'),
+        _cryptoGenerateSharedSecret = dylib.lookupFunction<
+            Void Function(
+                Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>),
+            _CryptoGenerateSharedSecretDart>('crypto_generate_shared_secret'),
         _cryptoRandomBytes = dylib.lookupFunction<
             Void Function(Int64, Uint32, Uint32),
             _CryptoRandomBytesDart>('crypto_random_bytes'),
@@ -1385,12 +1462,19 @@ class VeilidFFI extends Veilid {
         _veilidVersionString = dylib.lookupFunction<Pointer<Utf8> Function(),
             _VeilidVersionStringDart>('veilid_version_string'),
         _veilidVersion = dylib.lookupFunction<VeilidVersionFFI Function(),
-            _VeilidVersionDart>('veilid_version') {
+            _VeilidVersionDart>('veilid_version'),
+        _defaultVeilidConfig = dylib.lookupFunction<Pointer<Utf8> Function(),
+            _DefaultVeilidConfigDart>('default_veilid_config') {
     // Get veilid_flutter initializer
     final initializeVeilidFlutter = _dylib.lookupFunction<
-        Void Function(Pointer<_DartPostCObject>),
-        void Function(Pointer<_DartPostCObject>)>('initialize_veilid_flutter');
-    initializeVeilidFlutter(NativeApi.postCObject);
+        Void Function(Pointer<_DartPostCObject>, Pointer<Utf8>),
+        void Function(Pointer<_DartPostCObject>,
+            Pointer<Utf8>)>('initialize_veilid_flutter');
+    initializeVeilidFlutter(
+      NativeApi.postCObject,
+      // ignore: avoid_redundant_argument_values, do_not_use_environment
+      const String.fromEnvironment('VEILID_CRASH_PATH').toNativeUtf8(),
+    );
   }
   // veilid_core shared library
   final DynamicLibrary _dylib;
@@ -1399,6 +1483,7 @@ class VeilidFFI extends Veilid {
   final _FreeStringDart _freeString;
   final _InitializeVeilidCoreDart _initializeVeilidCore;
   final _ChangeLogLevelDart _changeLogLevel;
+  final _ChangeLogIgnoreDart _changeLogIgnore;
   final _StartupVeilidCoreDart _startupVeilidCore;
   final _GetVeilidStateDart _getVeilidState;
   final _AttachDart _attach;
@@ -1421,6 +1506,7 @@ class VeilidFFI extends Veilid {
   final _RoutingContextSetDHTValueDart _routingContextSetDHTValue;
   final _RoutingContextWatchDHTValuesDart _routingContextWatchDHTValues;
   final _RoutingContextCancelDHTWatchDart _routingContextCancelDHTWatch;
+  final _RoutingContextInspectDHTRecordDart _routingContextInspectDHTRecord;
 
   final _NewPrivateRouteDart _newPrivateRoute;
   final _NewCustomPrivateRouteDart _newCustomPrivateRoute;
@@ -1452,6 +1538,7 @@ class VeilidFFI extends Veilid {
 
   final _CryptoCachedDHDart _cryptoCachedDH;
   final _CryptoComputeDHDart _cryptoComputeDH;
+  final _CryptoGenerateSharedSecretDart _cryptoGenerateSharedSecret;
 
   final _CryptoRandomBytesDart _cryptoRandomBytes;
   final _CryptoDefaultSaltLengthDart _cryptoDefaultSaltLength;
@@ -1478,6 +1565,7 @@ class VeilidFFI extends Veilid {
   final _DebugDart _debug;
   final _VeilidVersionStringDart _veilidVersionString;
   final _VeilidVersionDart _veilidVersion;
+  final _DefaultVeilidConfigDart _defaultVeilidConfig;
 
   @override
   void initializeVeilidCore(Map<String, dynamic> platformConfigJson) {
@@ -1498,6 +1586,16 @@ class VeilidFFI extends Veilid {
       ..free(nativeLogLevel);
   }
 
+  @override
+  void changeLogIgnore(String layer, List<String> changes) {
+    final nativeChanges = jsonEncode(changes.join(',')).toNativeUtf8();
+    final nativeLayer = layer.toNativeUtf8();
+    _changeLogIgnore(nativeLayer, nativeChanges);
+    malloc
+      ..free(nativeLayer)
+      ..free(nativeChanges);
+  }
+
   @override
   Future<Stream<VeilidUpdate>> startupVeilidCore(VeilidConfig config) async {
     final nativeConfig = jsonEncode(config).toNativeUtf8();
@@ -1542,6 +1640,7 @@ class VeilidFFI extends Veilid {
     final recvPort = ReceivePort('shutdown_veilid_core');
     final sendPort = recvPort.sendPort;
     _shutdownVeilidCore(sendPort.nativePort);
+
     return processFutureVoid(recvPort.first);
   }
 
@@ -1586,12 +1685,12 @@ class VeilidFFI extends Veilid {
   }
 
   @override
-  Future<void> releasePrivateRoute(String key) async {
-    final nativeEncodedKey = key.toNativeUtf8();
+  Future<void> releasePrivateRoute(String routeId) async {
+    final nativeEncodedRouteId = routeId.toNativeUtf8();
 
     final recvPort = ReceivePort('release_private_route');
     final sendPort = recvPort.sendPort;
-    _releasePrivateRoute(sendPort.nativePort, nativeEncodedKey);
+    _releasePrivateRoute(sendPort.nativePort, nativeEncodedRouteId);
     return processFutureVoid(recvPort.first);
   }
 
@@ -1627,7 +1726,7 @@ class VeilidFFI extends Veilid {
     final vckString = _validCryptoKinds();
     final vck = jsonDecode(vckString.toDartString()) as List<dynamic>;
     _freeString(vckString);
-    return vck.map((v) => v as CryptoKind).toList();
+    return vck.cast<CryptoKind>();
   }
 
   @override
@@ -1711,4 +1810,12 @@ class VeilidFFI extends Veilid {
       version.patch,
     );
   }
+
+  @override
+  String defaultVeilidConfig() {
+    final defaultVeilidConfig = _defaultVeilidConfig();
+    final ret = defaultVeilidConfig.toDartString();
+    _freeString(defaultVeilidConfig);
+    return ret;
+  }
 }
diff --git a/veilid-flutter/lib/veilid_js.dart b/veilid-flutter/lib/veilid_js.dart
index 7cbd345b..12660ae7 100644
--- a/veilid-flutter/lib/veilid_js.dart
+++ b/veilid-flutter/lib/veilid_js.dart
@@ -68,28 +68,41 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
   }
 
   @override
-  VeilidRoutingContextJS withDefaultSafety() {
+  VeilidRoutingContextJS withDefaultSafety({bool closeSelf = false}) {
     final id = _ctx.requireId();
     final int newId =
         js_util.callMethod(wasm, 'routing_context_with_default_safety', [id]);
-    return VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    final out = VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
-  VeilidRoutingContextJS withSafety(SafetySelection safetySelection) {
+  VeilidRoutingContextJS withSafety(SafetySelection safetySelection,
+      {bool closeSelf = false}) {
     final id = _ctx.requireId();
     final newId = js_util.callMethod<int>(
         wasm, 'routing_context_with_safety', [id, jsonEncode(safetySelection)]);
-
-    return VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    final out = VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
-  VeilidRoutingContextJS withSequencing(Sequencing sequencing) {
+  VeilidRoutingContextJS withSequencing(Sequencing sequencing,
+      {bool closeSelf = false}) {
     final id = _ctx.requireId();
     final newId = js_util.callMethod<int>(
         wasm, 'routing_context_with_sequencing', [id, jsonEncode(sequencing)]);
-    return VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    final out = VeilidRoutingContextJS._(_Ctx(newId, _ctx.js));
+    if (closeSelf) {
+      close();
+    }
+    return out;
   }
 
   @override
@@ -129,8 +142,8 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
   }
 
   @override
-  Future<DHTRecordDescriptor> openDHTRecord(
-      TypedKey key, KeyPair? writer) async {
+  Future<DHTRecordDescriptor> openDHTRecord(TypedKey key,
+      {KeyPair? writer}) async {
     final id = _ctx.requireId();
     return DHTRecordDescriptor.fromJson(jsonDecode(await _wrapApiPromise(js_util
         .callMethod(wasm, 'routing_context_open_dht_record', [
@@ -155,8 +168,8 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
   }
 
   @override
-  Future<ValueData?> getDHTValue(
-      TypedKey key, int subkey, bool forceRefresh) async {
+  Future<ValueData?> getDHTValue(TypedKey key, int subkey,
+      {bool forceRefresh = false}) async {
     final id = _ctx.requireId();
     final opt = await _wrapApiPromise<String?>(js_util.callMethod(
         wasm,
@@ -170,13 +183,17 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
   }
 
   @override
-  Future<ValueData?> setDHTValue(
-      TypedKey key, int subkey, Uint8List data) async {
+  Future<ValueData?> setDHTValue(TypedKey key, int subkey, Uint8List data,
+      {KeyPair? writer}) async {
     final id = _ctx.requireId();
-    final opt = await _wrapApiPromise<String?>(js_util.callMethod(
-        wasm,
-        'routing_context_set_dht_value',
-        [id, jsonEncode(key), subkey, base64UrlNoPadEncode(data)]));
+    final opt = await _wrapApiPromise<String?>(
+        js_util.callMethod(wasm, 'routing_context_set_dht_value', [
+      id,
+      jsonEncode(key),
+      subkey,
+      base64UrlNoPadEncode(data),
+      if (writer != null) jsonEncode(writer) else null
+    ]));
     if (opt == null) {
       return null;
     }
@@ -190,7 +207,7 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
       Timestamp? expiration,
       int? count}) async {
     subkeys ??= [];
-    expiration ??= Timestamp(value: BigInt.zero);
+    expiration ??= Timestamp.zero();
     count ??= 0xFFFFFFFF;
 
     final id = _ctx.requireId();
@@ -215,6 +232,18 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
         'routing_context_cancel_dht_watch',
         [id, jsonEncode(key), jsonEncode(subkeys)]));
   }
+
+  @override
+  Future<DHTRecordReport> inspectDHTRecord(TypedKey key,
+      {List<ValueSubkeyRange>? subkeys,
+      DHTReportScope scope = DHTReportScope.local}) async {
+    subkeys ??= [];
+
+    final id = _ctx.requireId();
+    return DHTRecordReport.fromJson(jsonDecode(await _wrapApiPromise(js_util
+        .callMethod(wasm, 'routing_context_inspect_dht_record',
+            [id, jsonEncode(key), jsonEncode(subkeys), jsonEncode(scope)]))));
+  }
 }
 
 // JS implementation of VeilidCryptoSystem
@@ -242,6 +271,16 @@ class VeilidCryptoSystemJS extends VeilidCryptoSystem {
           wasm,
           'crypto_compute_dh',
           [_kind, jsonEncode(key), jsonEncode(secret)]))));
+  @override
+  Future<SharedSecret> generateSharedSecret(
+          PublicKey key, SecretKey secret, Uint8List domain) async =>
+      SharedSecret.fromJson(jsonDecode(await _wrapApiPromise(js_util.callMethod(
+          wasm, 'crypto_generate_shared_secret', [
+        _kind,
+        jsonEncode(key),
+        jsonEncode(secret),
+        base64UrlNoPadEncode(domain)
+      ]))));
 
   @override
   Future<Uint8List> randomBytes(int len) async =>
@@ -553,6 +592,13 @@ class VeilidJS extends Veilid {
         wasm, 'change_log_level', [layer, logLevelJsonString]);
   }
 
+  @override
+  void changeLogIgnore(String layer, List<String> changes) {
+    final changesJsonString = jsonEncode(changes.join(','));
+    js_util.callMethod<void>(
+        wasm, 'change_log_ignore', [layer, changesJsonString]);
+  }
+
   @override
   Future<Stream<VeilidUpdate>> startupVeilidCore(VeilidConfig config) async {
     final streamController = StreamController<VeilidUpdate>();
@@ -593,7 +639,7 @@ class VeilidJS extends Veilid {
   List<CryptoKind> validCryptoKinds() {
     final vck = jsonDecode(js_util.callMethod(wasm, 'valid_crypto_kinds', []))
         as List<dynamic>;
-    return vck.map((v) => v as CryptoKind).toList();
+    return vck.cast<CryptoKind>();
   }
 
   @override
@@ -661,8 +707,8 @@ class VeilidJS extends Veilid {
   }
 
   @override
-  Future<void> releasePrivateRoute(String key) =>
-      _wrapApiPromise(js_util.callMethod(wasm, 'release_private_route', [key]));
+  Future<void> releasePrivateRoute(String routeId) => _wrapApiPromise(
+      js_util.callMethod(wasm, 'release_private_route', [routeId]));
 
   @override
   Future<void> appCallReply(String callId, Uint8List message) {
@@ -701,4 +747,8 @@ class VeilidJS extends Veilid {
     return VeilidVersion(jsonVersion['major'] as int,
         jsonVersion['minor'] as int, jsonVersion['patch'] as int);
   }
+
+  @override
+  String defaultVeilidConfig() =>
+      js_util.callMethod(wasm, 'default_veilid_config', []);
 }
diff --git a/veilid-flutter/lib/veilid_state.dart b/veilid-flutter/lib/veilid_state.dart
index 9ed85a5d..f45cd07e 100644
--- a/veilid-flutter/lib/veilid_state.dart
+++ b/veilid-flutter/lib/veilid_state.dart
@@ -144,13 +144,15 @@ sealed class VeilidUpdate with _$VeilidUpdate {
     String? backtrace,
   }) = VeilidLog;
   const factory VeilidUpdate.appMessage({
-    @Uint8ListJsonConverter() required Uint8List message,
+    @Uint8ListJsonConverter.jsIsArray() required Uint8List message,
     TypedKey? sender,
+    String? routeId,
   }) = VeilidAppMessage;
   const factory VeilidUpdate.appCall({
-    @Uint8ListJsonConverter() required Uint8List message,
+    @Uint8ListJsonConverter.jsIsArray() required Uint8List message,
     required String callId,
     TypedKey? sender,
+    String? routeId,
   }) = VeilidAppCall;
   const factory VeilidUpdate.attachment(
       {required AttachmentState state,
@@ -172,7 +174,7 @@ sealed class VeilidUpdate with _$VeilidUpdate {
     required TypedKey key,
     required List<ValueSubkeyRange> subkeys,
     required int count,
-    required ValueData valueData,
+    required ValueData value,
   }) = VeilidUpdateValueChange;
 
   factory VeilidUpdate.fromJson(dynamic json) =>
diff --git a/veilid-flutter/lib/veilid_state.freezed.dart b/veilid-flutter/lib/veilid_state.freezed.dart
index ca6d13af..4bba1f1d 100644
--- a/veilid-flutter/lib/veilid_state.freezed.dart
+++ b/veilid-flutter/lib/veilid_state.freezed.dart
@@ -12,7 +12,7 @@ part of 'veilid_state.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 LatencyStats _$LatencyStatsFromJson(Map<String, dynamic> json) {
   return _LatencyStats.fromJson(json);
@@ -77,11 +77,11 @@ class _$LatencyStatsCopyWithImpl<$Res, $Val extends LatencyStats>
 }
 
 /// @nodoc
-abstract class _$$_LatencyStatsCopyWith<$Res>
+abstract class _$$LatencyStatsImplCopyWith<$Res>
     implements $LatencyStatsCopyWith<$Res> {
-  factory _$$_LatencyStatsCopyWith(
-          _$_LatencyStats value, $Res Function(_$_LatencyStats) then) =
-      __$$_LatencyStatsCopyWithImpl<$Res>;
+  factory _$$LatencyStatsImplCopyWith(
+          _$LatencyStatsImpl value, $Res Function(_$LatencyStatsImpl) then) =
+      __$$LatencyStatsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -91,11 +91,11 @@ abstract class _$$_LatencyStatsCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_LatencyStatsCopyWithImpl<$Res>
-    extends _$LatencyStatsCopyWithImpl<$Res, _$_LatencyStats>
-    implements _$$_LatencyStatsCopyWith<$Res> {
-  __$$_LatencyStatsCopyWithImpl(
-      _$_LatencyStats _value, $Res Function(_$_LatencyStats) _then)
+class __$$LatencyStatsImplCopyWithImpl<$Res>
+    extends _$LatencyStatsCopyWithImpl<$Res, _$LatencyStatsImpl>
+    implements _$$LatencyStatsImplCopyWith<$Res> {
+  __$$LatencyStatsImplCopyWithImpl(
+      _$LatencyStatsImpl _value, $Res Function(_$LatencyStatsImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -105,7 +105,7 @@ class __$$_LatencyStatsCopyWithImpl<$Res>
     Object? average = null,
     Object? slowest = null,
   }) {
-    return _then(_$_LatencyStats(
+    return _then(_$LatencyStatsImpl(
       fastest: null == fastest
           ? _value.fastest
           : fastest // ignore: cast_nullable_to_non_nullable
@@ -124,12 +124,12 @@ class __$$_LatencyStatsCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_LatencyStats implements _LatencyStats {
-  const _$_LatencyStats(
+class _$LatencyStatsImpl implements _LatencyStats {
+  const _$LatencyStatsImpl(
       {required this.fastest, required this.average, required this.slowest});
 
-  factory _$_LatencyStats.fromJson(Map<String, dynamic> json) =>
-      _$$_LatencyStatsFromJson(json);
+  factory _$LatencyStatsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$LatencyStatsImplFromJson(json);
 
   @override
   final TimestampDuration fastest;
@@ -144,10 +144,10 @@ class _$_LatencyStats implements _LatencyStats {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_LatencyStats &&
+            other is _$LatencyStatsImpl &&
             (identical(other.fastest, fastest) || other.fastest == fastest) &&
             (identical(other.average, average) || other.average == average) &&
             (identical(other.slowest, slowest) || other.slowest == slowest));
@@ -160,12 +160,12 @@ class _$_LatencyStats implements _LatencyStats {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_LatencyStatsCopyWith<_$_LatencyStats> get copyWith =>
-      __$$_LatencyStatsCopyWithImpl<_$_LatencyStats>(this, _$identity);
+  _$$LatencyStatsImplCopyWith<_$LatencyStatsImpl> get copyWith =>
+      __$$LatencyStatsImplCopyWithImpl<_$LatencyStatsImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_LatencyStatsToJson(
+    return _$$LatencyStatsImplToJson(
       this,
     );
   }
@@ -175,10 +175,10 @@ abstract class _LatencyStats implements LatencyStats {
   const factory _LatencyStats(
       {required final TimestampDuration fastest,
       required final TimestampDuration average,
-      required final TimestampDuration slowest}) = _$_LatencyStats;
+      required final TimestampDuration slowest}) = _$LatencyStatsImpl;
 
   factory _LatencyStats.fromJson(Map<String, dynamic> json) =
-      _$_LatencyStats.fromJson;
+      _$LatencyStatsImpl.fromJson;
 
   @override
   TimestampDuration get fastest;
@@ -188,7 +188,7 @@ abstract class _LatencyStats implements LatencyStats {
   TimestampDuration get slowest;
   @override
   @JsonKey(ignore: true)
-  _$$_LatencyStatsCopyWith<_$_LatencyStats> get copyWith =>
+  _$$LatencyStatsImplCopyWith<_$LatencyStatsImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -258,22 +258,22 @@ class _$TransferStatsCopyWithImpl<$Res, $Val extends TransferStats>
 }
 
 /// @nodoc
-abstract class _$$_TransferStatsCopyWith<$Res>
+abstract class _$$TransferStatsImplCopyWith<$Res>
     implements $TransferStatsCopyWith<$Res> {
-  factory _$$_TransferStatsCopyWith(
-          _$_TransferStats value, $Res Function(_$_TransferStats) then) =
-      __$$_TransferStatsCopyWithImpl<$Res>;
+  factory _$$TransferStatsImplCopyWith(
+          _$TransferStatsImpl value, $Res Function(_$TransferStatsImpl) then) =
+      __$$TransferStatsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({BigInt total, BigInt maximum, BigInt average, BigInt minimum});
 }
 
 /// @nodoc
-class __$$_TransferStatsCopyWithImpl<$Res>
-    extends _$TransferStatsCopyWithImpl<$Res, _$_TransferStats>
-    implements _$$_TransferStatsCopyWith<$Res> {
-  __$$_TransferStatsCopyWithImpl(
-      _$_TransferStats _value, $Res Function(_$_TransferStats) _then)
+class __$$TransferStatsImplCopyWithImpl<$Res>
+    extends _$TransferStatsCopyWithImpl<$Res, _$TransferStatsImpl>
+    implements _$$TransferStatsImplCopyWith<$Res> {
+  __$$TransferStatsImplCopyWithImpl(
+      _$TransferStatsImpl _value, $Res Function(_$TransferStatsImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -284,7 +284,7 @@ class __$$_TransferStatsCopyWithImpl<$Res>
     Object? average = null,
     Object? minimum = null,
   }) {
-    return _then(_$_TransferStats(
+    return _then(_$TransferStatsImpl(
       total: null == total
           ? _value.total
           : total // ignore: cast_nullable_to_non_nullable
@@ -307,15 +307,15 @@ class __$$_TransferStatsCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_TransferStats implements _TransferStats {
-  const _$_TransferStats(
+class _$TransferStatsImpl implements _TransferStats {
+  const _$TransferStatsImpl(
       {required this.total,
       required this.maximum,
       required this.average,
       required this.minimum});
 
-  factory _$_TransferStats.fromJson(Map<String, dynamic> json) =>
-      _$$_TransferStatsFromJson(json);
+  factory _$TransferStatsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$TransferStatsImplFromJson(json);
 
   @override
   final BigInt total;
@@ -332,10 +332,10 @@ class _$_TransferStats implements _TransferStats {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_TransferStats &&
+            other is _$TransferStatsImpl &&
             (identical(other.total, total) || other.total == total) &&
             (identical(other.maximum, maximum) || other.maximum == maximum) &&
             (identical(other.average, average) || other.average == average) &&
@@ -350,12 +350,12 @@ class _$_TransferStats implements _TransferStats {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_TransferStatsCopyWith<_$_TransferStats> get copyWith =>
-      __$$_TransferStatsCopyWithImpl<_$_TransferStats>(this, _$identity);
+  _$$TransferStatsImplCopyWith<_$TransferStatsImpl> get copyWith =>
+      __$$TransferStatsImplCopyWithImpl<_$TransferStatsImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_TransferStatsToJson(
+    return _$$TransferStatsImplToJson(
       this,
     );
   }
@@ -366,10 +366,10 @@ abstract class _TransferStats implements TransferStats {
       {required final BigInt total,
       required final BigInt maximum,
       required final BigInt average,
-      required final BigInt minimum}) = _$_TransferStats;
+      required final BigInt minimum}) = _$TransferStatsImpl;
 
   factory _TransferStats.fromJson(Map<String, dynamic> json) =
-      _$_TransferStats.fromJson;
+      _$TransferStatsImpl.fromJson;
 
   @override
   BigInt get total;
@@ -381,7 +381,7 @@ abstract class _TransferStats implements TransferStats {
   BigInt get minimum;
   @override
   @JsonKey(ignore: true)
-  _$$_TransferStatsCopyWith<_$_TransferStats> get copyWith =>
+  _$$TransferStatsImplCopyWith<_$TransferStatsImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -458,11 +458,11 @@ class _$TransferStatsDownUpCopyWithImpl<$Res, $Val extends TransferStatsDownUp>
 }
 
 /// @nodoc
-abstract class _$$_TransferStatsDownUpCopyWith<$Res>
+abstract class _$$TransferStatsDownUpImplCopyWith<$Res>
     implements $TransferStatsDownUpCopyWith<$Res> {
-  factory _$$_TransferStatsDownUpCopyWith(_$_TransferStatsDownUp value,
-          $Res Function(_$_TransferStatsDownUp) then) =
-      __$$_TransferStatsDownUpCopyWithImpl<$Res>;
+  factory _$$TransferStatsDownUpImplCopyWith(_$TransferStatsDownUpImpl value,
+          $Res Function(_$TransferStatsDownUpImpl) then) =
+      __$$TransferStatsDownUpImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({TransferStats down, TransferStats up});
@@ -474,11 +474,11 @@ abstract class _$$_TransferStatsDownUpCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_TransferStatsDownUpCopyWithImpl<$Res>
-    extends _$TransferStatsDownUpCopyWithImpl<$Res, _$_TransferStatsDownUp>
-    implements _$$_TransferStatsDownUpCopyWith<$Res> {
-  __$$_TransferStatsDownUpCopyWithImpl(_$_TransferStatsDownUp _value,
-      $Res Function(_$_TransferStatsDownUp) _then)
+class __$$TransferStatsDownUpImplCopyWithImpl<$Res>
+    extends _$TransferStatsDownUpCopyWithImpl<$Res, _$TransferStatsDownUpImpl>
+    implements _$$TransferStatsDownUpImplCopyWith<$Res> {
+  __$$TransferStatsDownUpImplCopyWithImpl(_$TransferStatsDownUpImpl _value,
+      $Res Function(_$TransferStatsDownUpImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -487,7 +487,7 @@ class __$$_TransferStatsDownUpCopyWithImpl<$Res>
     Object? down = null,
     Object? up = null,
   }) {
-    return _then(_$_TransferStatsDownUp(
+    return _then(_$TransferStatsDownUpImpl(
       down: null == down
           ? _value.down
           : down // ignore: cast_nullable_to_non_nullable
@@ -502,11 +502,11 @@ class __$$_TransferStatsDownUpCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_TransferStatsDownUp implements _TransferStatsDownUp {
-  const _$_TransferStatsDownUp({required this.down, required this.up});
+class _$TransferStatsDownUpImpl implements _TransferStatsDownUp {
+  const _$TransferStatsDownUpImpl({required this.down, required this.up});
 
-  factory _$_TransferStatsDownUp.fromJson(Map<String, dynamic> json) =>
-      _$$_TransferStatsDownUpFromJson(json);
+  factory _$TransferStatsDownUpImpl.fromJson(Map<String, dynamic> json) =>
+      _$$TransferStatsDownUpImplFromJson(json);
 
   @override
   final TransferStats down;
@@ -519,10 +519,10 @@ class _$_TransferStatsDownUp implements _TransferStatsDownUp {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_TransferStatsDownUp &&
+            other is _$TransferStatsDownUpImpl &&
             (identical(other.down, down) || other.down == down) &&
             (identical(other.up, up) || other.up == up));
   }
@@ -534,13 +534,13 @@ class _$_TransferStatsDownUp implements _TransferStatsDownUp {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_TransferStatsDownUpCopyWith<_$_TransferStatsDownUp> get copyWith =>
-      __$$_TransferStatsDownUpCopyWithImpl<_$_TransferStatsDownUp>(
+  _$$TransferStatsDownUpImplCopyWith<_$TransferStatsDownUpImpl> get copyWith =>
+      __$$TransferStatsDownUpImplCopyWithImpl<_$TransferStatsDownUpImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_TransferStatsDownUpToJson(
+    return _$$TransferStatsDownUpImplToJson(
       this,
     );
   }
@@ -549,10 +549,10 @@ class _$_TransferStatsDownUp implements _TransferStatsDownUp {
 abstract class _TransferStatsDownUp implements TransferStatsDownUp {
   const factory _TransferStatsDownUp(
       {required final TransferStats down,
-      required final TransferStats up}) = _$_TransferStatsDownUp;
+      required final TransferStats up}) = _$TransferStatsDownUpImpl;
 
   factory _TransferStatsDownUp.fromJson(Map<String, dynamic> json) =
-      _$_TransferStatsDownUp.fromJson;
+      _$TransferStatsDownUpImpl.fromJson;
 
   @override
   TransferStats get down;
@@ -560,7 +560,7 @@ abstract class _TransferStatsDownUp implements TransferStatsDownUp {
   TransferStats get up;
   @override
   @JsonKey(ignore: true)
-  _$$_TransferStatsDownUpCopyWith<_$_TransferStatsDownUp> get copyWith =>
+  _$$TransferStatsDownUpImplCopyWith<_$TransferStatsDownUpImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -661,10 +661,11 @@ class _$RPCStatsCopyWithImpl<$Res, $Val extends RPCStats>
 }
 
 /// @nodoc
-abstract class _$$_RPCStatsCopyWith<$Res> implements $RPCStatsCopyWith<$Res> {
-  factory _$$_RPCStatsCopyWith(
-          _$_RPCStats value, $Res Function(_$_RPCStats) then) =
-      __$$_RPCStatsCopyWithImpl<$Res>;
+abstract class _$$RPCStatsImplCopyWith<$Res>
+    implements $RPCStatsCopyWith<$Res> {
+  factory _$$RPCStatsImplCopyWith(
+          _$RPCStatsImpl value, $Res Function(_$RPCStatsImpl) then) =
+      __$$RPCStatsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -679,11 +680,11 @@ abstract class _$$_RPCStatsCopyWith<$Res> implements $RPCStatsCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$_RPCStatsCopyWithImpl<$Res>
-    extends _$RPCStatsCopyWithImpl<$Res, _$_RPCStats>
-    implements _$$_RPCStatsCopyWith<$Res> {
-  __$$_RPCStatsCopyWithImpl(
-      _$_RPCStats _value, $Res Function(_$_RPCStats) _then)
+class __$$RPCStatsImplCopyWithImpl<$Res>
+    extends _$RPCStatsCopyWithImpl<$Res, _$RPCStatsImpl>
+    implements _$$RPCStatsImplCopyWith<$Res> {
+  __$$RPCStatsImplCopyWithImpl(
+      _$RPCStatsImpl _value, $Res Function(_$RPCStatsImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -698,7 +699,7 @@ class __$$_RPCStatsCopyWithImpl<$Res>
     Object? recentLostAnswers = null,
     Object? failedToSend = null,
   }) {
-    return _then(_$_RPCStats(
+    return _then(_$RPCStatsImpl(
       messagesSent: null == messagesSent
           ? _value.messagesSent
           : messagesSent // ignore: cast_nullable_to_non_nullable
@@ -737,8 +738,8 @@ class __$$_RPCStatsCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_RPCStats implements _RPCStats {
-  const _$_RPCStats(
+class _$RPCStatsImpl implements _RPCStats {
+  const _$RPCStatsImpl(
       {required this.messagesSent,
       required this.messagesRcvd,
       required this.questionsInFlight,
@@ -748,8 +749,8 @@ class _$_RPCStats implements _RPCStats {
       required this.recentLostAnswers,
       required this.failedToSend});
 
-  factory _$_RPCStats.fromJson(Map<String, dynamic> json) =>
-      _$$_RPCStatsFromJson(json);
+  factory _$RPCStatsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$RPCStatsImplFromJson(json);
 
   @override
   final int messagesSent;
@@ -774,10 +775,10 @@ class _$_RPCStats implements _RPCStats {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_RPCStats &&
+            other is _$RPCStatsImpl &&
             (identical(other.messagesSent, messagesSent) ||
                 other.messagesSent == messagesSent) &&
             (identical(other.messagesRcvd, messagesRcvd) ||
@@ -812,12 +813,12 @@ class _$_RPCStats implements _RPCStats {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_RPCStatsCopyWith<_$_RPCStats> get copyWith =>
-      __$$_RPCStatsCopyWithImpl<_$_RPCStats>(this, _$identity);
+  _$$RPCStatsImplCopyWith<_$RPCStatsImpl> get copyWith =>
+      __$$RPCStatsImplCopyWithImpl<_$RPCStatsImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_RPCStatsToJson(
+    return _$$RPCStatsImplToJson(
       this,
     );
   }
@@ -832,9 +833,10 @@ abstract class _RPCStats implements RPCStats {
       required final Timestamp? lastSeenTs,
       required final Timestamp? firstConsecutiveSeenTs,
       required final int recentLostAnswers,
-      required final int failedToSend}) = _$_RPCStats;
+      required final int failedToSend}) = _$RPCStatsImpl;
 
-  factory _RPCStats.fromJson(Map<String, dynamic> json) = _$_RPCStats.fromJson;
+  factory _RPCStats.fromJson(Map<String, dynamic> json) =
+      _$RPCStatsImpl.fromJson;
 
   @override
   int get messagesSent;
@@ -854,7 +856,7 @@ abstract class _RPCStats implements RPCStats {
   int get failedToSend;
   @override
   @JsonKey(ignore: true)
-  _$$_RPCStatsCopyWith<_$_RPCStats> get copyWith =>
+  _$$RPCStatsImplCopyWith<_$RPCStatsImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -959,10 +961,11 @@ class _$PeerStatsCopyWithImpl<$Res, $Val extends PeerStats>
 }
 
 /// @nodoc
-abstract class _$$_PeerStatsCopyWith<$Res> implements $PeerStatsCopyWith<$Res> {
-  factory _$$_PeerStatsCopyWith(
-          _$_PeerStats value, $Res Function(_$_PeerStats) then) =
-      __$$_PeerStatsCopyWithImpl<$Res>;
+abstract class _$$PeerStatsImplCopyWith<$Res>
+    implements $PeerStatsCopyWith<$Res> {
+  factory _$$PeerStatsImplCopyWith(
+          _$PeerStatsImpl value, $Res Function(_$PeerStatsImpl) then) =
+      __$$PeerStatsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -980,11 +983,11 @@ abstract class _$$_PeerStatsCopyWith<$Res> implements $PeerStatsCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$_PeerStatsCopyWithImpl<$Res>
-    extends _$PeerStatsCopyWithImpl<$Res, _$_PeerStats>
-    implements _$$_PeerStatsCopyWith<$Res> {
-  __$$_PeerStatsCopyWithImpl(
-      _$_PeerStats _value, $Res Function(_$_PeerStats) _then)
+class __$$PeerStatsImplCopyWithImpl<$Res>
+    extends _$PeerStatsCopyWithImpl<$Res, _$PeerStatsImpl>
+    implements _$$PeerStatsImplCopyWith<$Res> {
+  __$$PeerStatsImplCopyWithImpl(
+      _$PeerStatsImpl _value, $Res Function(_$PeerStatsImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -995,7 +998,7 @@ class __$$_PeerStatsCopyWithImpl<$Res>
     Object? transfer = null,
     Object? latency = freezed,
   }) {
-    return _then(_$_PeerStats(
+    return _then(_$PeerStatsImpl(
       timeAdded: null == timeAdded
           ? _value.timeAdded
           : timeAdded // ignore: cast_nullable_to_non_nullable
@@ -1018,15 +1021,15 @@ class __$$_PeerStatsCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_PeerStats implements _PeerStats {
-  const _$_PeerStats(
+class _$PeerStatsImpl implements _PeerStats {
+  const _$PeerStatsImpl(
       {required this.timeAdded,
       required this.rpcStats,
       required this.transfer,
       this.latency});
 
-  factory _$_PeerStats.fromJson(Map<String, dynamic> json) =>
-      _$$_PeerStatsFromJson(json);
+  factory _$PeerStatsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$PeerStatsImplFromJson(json);
 
   @override
   final Timestamp timeAdded;
@@ -1043,10 +1046,10 @@ class _$_PeerStats implements _PeerStats {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_PeerStats &&
+            other is _$PeerStatsImpl &&
             (identical(other.timeAdded, timeAdded) ||
                 other.timeAdded == timeAdded) &&
             (identical(other.rpcStats, rpcStats) ||
@@ -1064,12 +1067,12 @@ class _$_PeerStats implements _PeerStats {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_PeerStatsCopyWith<_$_PeerStats> get copyWith =>
-      __$$_PeerStatsCopyWithImpl<_$_PeerStats>(this, _$identity);
+  _$$PeerStatsImplCopyWith<_$PeerStatsImpl> get copyWith =>
+      __$$PeerStatsImplCopyWithImpl<_$PeerStatsImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_PeerStatsToJson(
+    return _$$PeerStatsImplToJson(
       this,
     );
   }
@@ -1080,10 +1083,10 @@ abstract class _PeerStats implements PeerStats {
       {required final Timestamp timeAdded,
       required final RPCStats rpcStats,
       required final TransferStatsDownUp transfer,
-      final LatencyStats? latency}) = _$_PeerStats;
+      final LatencyStats? latency}) = _$PeerStatsImpl;
 
   factory _PeerStats.fromJson(Map<String, dynamic> json) =
-      _$_PeerStats.fromJson;
+      _$PeerStatsImpl.fromJson;
 
   @override
   Timestamp get timeAdded;
@@ -1095,7 +1098,7 @@ abstract class _PeerStats implements PeerStats {
   LatencyStats? get latency;
   @override
   @JsonKey(ignore: true)
-  _$$_PeerStatsCopyWith<_$_PeerStats> get copyWith =>
+  _$$PeerStatsImplCopyWith<_$PeerStatsImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1173,11 +1176,11 @@ class _$PeerTableDataCopyWithImpl<$Res, $Val extends PeerTableData>
 }
 
 /// @nodoc
-abstract class _$$_PeerTableDataCopyWith<$Res>
+abstract class _$$PeerTableDataImplCopyWith<$Res>
     implements $PeerTableDataCopyWith<$Res> {
-  factory _$$_PeerTableDataCopyWith(
-          _$_PeerTableData value, $Res Function(_$_PeerTableData) then) =
-      __$$_PeerTableDataCopyWithImpl<$Res>;
+  factory _$$PeerTableDataImplCopyWith(
+          _$PeerTableDataImpl value, $Res Function(_$PeerTableDataImpl) then) =
+      __$$PeerTableDataImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1190,11 +1193,11 @@ abstract class _$$_PeerTableDataCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_PeerTableDataCopyWithImpl<$Res>
-    extends _$PeerTableDataCopyWithImpl<$Res, _$_PeerTableData>
-    implements _$$_PeerTableDataCopyWith<$Res> {
-  __$$_PeerTableDataCopyWithImpl(
-      _$_PeerTableData _value, $Res Function(_$_PeerTableData) _then)
+class __$$PeerTableDataImplCopyWithImpl<$Res>
+    extends _$PeerTableDataCopyWithImpl<$Res, _$PeerTableDataImpl>
+    implements _$$PeerTableDataImplCopyWith<$Res> {
+  __$$PeerTableDataImplCopyWithImpl(
+      _$PeerTableDataImpl _value, $Res Function(_$PeerTableDataImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1204,7 +1207,7 @@ class __$$_PeerTableDataCopyWithImpl<$Res>
     Object? peerAddress = null,
     Object? peerStats = null,
   }) {
-    return _then(_$_PeerTableData(
+    return _then(_$PeerTableDataImpl(
       nodeIds: null == nodeIds
           ? _value._nodeIds
           : nodeIds // ignore: cast_nullable_to_non_nullable
@@ -1223,15 +1226,15 @@ class __$$_PeerTableDataCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_PeerTableData implements _PeerTableData {
-  const _$_PeerTableData(
+class _$PeerTableDataImpl implements _PeerTableData {
+  const _$PeerTableDataImpl(
       {required final List<Typed<FixedEncodedString43>> nodeIds,
       required this.peerAddress,
       required this.peerStats})
       : _nodeIds = nodeIds;
 
-  factory _$_PeerTableData.fromJson(Map<String, dynamic> json) =>
-      _$$_PeerTableDataFromJson(json);
+  factory _$PeerTableDataImpl.fromJson(Map<String, dynamic> json) =>
+      _$$PeerTableDataImplFromJson(json);
 
   final List<Typed<FixedEncodedString43>> _nodeIds;
   @override
@@ -1252,10 +1255,10 @@ class _$_PeerTableData implements _PeerTableData {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_PeerTableData &&
+            other is _$PeerTableDataImpl &&
             const DeepCollectionEquality().equals(other._nodeIds, _nodeIds) &&
             (identical(other.peerAddress, peerAddress) ||
                 other.peerAddress == peerAddress) &&
@@ -1271,12 +1274,12 @@ class _$_PeerTableData implements _PeerTableData {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_PeerTableDataCopyWith<_$_PeerTableData> get copyWith =>
-      __$$_PeerTableDataCopyWithImpl<_$_PeerTableData>(this, _$identity);
+  _$$PeerTableDataImplCopyWith<_$PeerTableDataImpl> get copyWith =>
+      __$$PeerTableDataImplCopyWithImpl<_$PeerTableDataImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_PeerTableDataToJson(
+    return _$$PeerTableDataImplToJson(
       this,
     );
   }
@@ -1286,10 +1289,10 @@ abstract class _PeerTableData implements PeerTableData {
   const factory _PeerTableData(
       {required final List<Typed<FixedEncodedString43>> nodeIds,
       required final String peerAddress,
-      required final PeerStats peerStats}) = _$_PeerTableData;
+      required final PeerStats peerStats}) = _$PeerTableDataImpl;
 
   factory _PeerTableData.fromJson(Map<String, dynamic> json) =
-      _$_PeerTableData.fromJson;
+      _$PeerTableDataImpl.fromJson;
 
   @override
   List<Typed<FixedEncodedString43>> get nodeIds;
@@ -1299,7 +1302,7 @@ abstract class _PeerTableData implements PeerTableData {
   PeerStats get peerStats;
   @override
   @JsonKey(ignore: true)
-  _$$_PeerTableDataCopyWith<_$_PeerTableData> get copyWith =>
+  _$$PeerTableDataImplCopyWith<_$PeerTableDataImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1335,11 +1338,16 @@ mixin _$VeilidUpdate {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -1352,7 +1360,7 @@ mixin _$VeilidUpdate {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) =>
       throw _privateConstructorUsedError;
@@ -1361,11 +1369,14 @@ mixin _$VeilidUpdate {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1377,7 +1388,7 @@ mixin _$VeilidUpdate {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) =>
       throw _privateConstructorUsedError;
@@ -1386,11 +1397,14 @@ mixin _$VeilidUpdate {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1402,7 +1416,7 @@ mixin _$VeilidUpdate {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) =>
@@ -1466,20 +1480,20 @@ class _$VeilidUpdateCopyWithImpl<$Res, $Val extends VeilidUpdate>
 }
 
 /// @nodoc
-abstract class _$$VeilidLogCopyWith<$Res> {
-  factory _$$VeilidLogCopyWith(
-          _$VeilidLog value, $Res Function(_$VeilidLog) then) =
-      __$$VeilidLogCopyWithImpl<$Res>;
+abstract class _$$VeilidLogImplCopyWith<$Res> {
+  factory _$$VeilidLogImplCopyWith(
+          _$VeilidLogImpl value, $Res Function(_$VeilidLogImpl) then) =
+      __$$VeilidLogImplCopyWithImpl<$Res>;
   @useResult
   $Res call({VeilidLogLevel logLevel, String message, String? backtrace});
 }
 
 /// @nodoc
-class __$$VeilidLogCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidLog>
-    implements _$$VeilidLogCopyWith<$Res> {
-  __$$VeilidLogCopyWithImpl(
-      _$VeilidLog _value, $Res Function(_$VeilidLog) _then)
+class __$$VeilidLogImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidLogImpl>
+    implements _$$VeilidLogImplCopyWith<$Res> {
+  __$$VeilidLogImplCopyWithImpl(
+      _$VeilidLogImpl _value, $Res Function(_$VeilidLogImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1489,7 +1503,7 @@ class __$$VeilidLogCopyWithImpl<$Res>
     Object? message = null,
     Object? backtrace = freezed,
   }) {
-    return _then(_$VeilidLog(
+    return _then(_$VeilidLogImpl(
       logLevel: null == logLevel
           ? _value.logLevel
           : logLevel // ignore: cast_nullable_to_non_nullable
@@ -1508,16 +1522,16 @@ class __$$VeilidLogCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidLog implements VeilidLog {
-  const _$VeilidLog(
+class _$VeilidLogImpl implements VeilidLog {
+  const _$VeilidLogImpl(
       {required this.logLevel,
       required this.message,
       this.backtrace,
       final String? $type})
       : $type = $type ?? 'Log';
 
-  factory _$VeilidLog.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidLogFromJson(json);
+  factory _$VeilidLogImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidLogImplFromJson(json);
 
   @override
   final VeilidLogLevel logLevel;
@@ -1535,10 +1549,10 @@ class _$VeilidLog implements VeilidLog {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidLog &&
+            other is _$VeilidLogImpl &&
             (identical(other.logLevel, logLevel) ||
                 other.logLevel == logLevel) &&
             (identical(other.message, message) || other.message == message) &&
@@ -1553,8 +1567,8 @@ class _$VeilidLog implements VeilidLog {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidLogCopyWith<_$VeilidLog> get copyWith =>
-      __$$VeilidLogCopyWithImpl<_$VeilidLog>(this, _$identity);
+  _$$VeilidLogImplCopyWith<_$VeilidLogImpl> get copyWith =>
+      __$$VeilidLogImplCopyWithImpl<_$VeilidLogImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -1562,11 +1576,16 @@ class _$VeilidLog implements VeilidLog {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -1579,7 +1598,7 @@ class _$VeilidLog implements VeilidLog {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
     return log(logLevel, message, backtrace);
@@ -1591,11 +1610,14 @@ class _$VeilidLog implements VeilidLog {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1607,7 +1629,7 @@ class _$VeilidLog implements VeilidLog {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
     return log?.call(logLevel, message, backtrace);
@@ -1619,11 +1641,14 @@ class _$VeilidLog implements VeilidLog {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1635,7 +1660,7 @@ class _$VeilidLog implements VeilidLog {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
@@ -1696,7 +1721,7 @@ class _$VeilidLog implements VeilidLog {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidLogToJson(
+    return _$$VeilidLogImplToJson(
       this,
     );
   }
@@ -1706,35 +1731,37 @@ abstract class VeilidLog implements VeilidUpdate {
   const factory VeilidLog(
       {required final VeilidLogLevel logLevel,
       required final String message,
-      final String? backtrace}) = _$VeilidLog;
+      final String? backtrace}) = _$VeilidLogImpl;
 
-  factory VeilidLog.fromJson(Map<String, dynamic> json) = _$VeilidLog.fromJson;
+  factory VeilidLog.fromJson(Map<String, dynamic> json) =
+      _$VeilidLogImpl.fromJson;
 
   VeilidLogLevel get logLevel;
   String get message;
   String? get backtrace;
   @JsonKey(ignore: true)
-  _$$VeilidLogCopyWith<_$VeilidLog> get copyWith =>
+  _$$VeilidLogImplCopyWith<_$VeilidLogImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidAppMessageCopyWith<$Res> {
-  factory _$$VeilidAppMessageCopyWith(
-          _$VeilidAppMessage value, $Res Function(_$VeilidAppMessage) then) =
-      __$$VeilidAppMessageCopyWithImpl<$Res>;
+abstract class _$$VeilidAppMessageImplCopyWith<$Res> {
+  factory _$$VeilidAppMessageImplCopyWith(_$VeilidAppMessageImpl value,
+          $Res Function(_$VeilidAppMessageImpl) then) =
+      __$$VeilidAppMessageImplCopyWithImpl<$Res>;
   @useResult
   $Res call(
-      {@Uint8ListJsonConverter() Uint8List message,
-      Typed<FixedEncodedString43>? sender});
+      {@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+      Typed<FixedEncodedString43>? sender,
+      String? routeId});
 }
 
 /// @nodoc
-class __$$VeilidAppMessageCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidAppMessage>
-    implements _$$VeilidAppMessageCopyWith<$Res> {
-  __$$VeilidAppMessageCopyWithImpl(
-      _$VeilidAppMessage _value, $Res Function(_$VeilidAppMessage) _then)
+class __$$VeilidAppMessageImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidAppMessageImpl>
+    implements _$$VeilidAppMessageImplCopyWith<$Res> {
+  __$$VeilidAppMessageImplCopyWithImpl(_$VeilidAppMessageImpl _value,
+      $Res Function(_$VeilidAppMessageImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1742,8 +1769,9 @@ class __$$VeilidAppMessageCopyWithImpl<$Res>
   $Res call({
     Object? message = null,
     Object? sender = freezed,
+    Object? routeId = freezed,
   }) {
-    return _then(_$VeilidAppMessage(
+    return _then(_$VeilidAppMessageImpl(
       message: null == message
           ? _value.message
           : message // ignore: cast_nullable_to_non_nullable
@@ -1752,55 +1780,64 @@ class __$$VeilidAppMessageCopyWithImpl<$Res>
           ? _value.sender
           : sender // ignore: cast_nullable_to_non_nullable
               as Typed<FixedEncodedString43>?,
+      routeId: freezed == routeId
+          ? _value.routeId
+          : routeId // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidAppMessage implements VeilidAppMessage {
-  const _$VeilidAppMessage(
-      {@Uint8ListJsonConverter() required this.message,
+class _$VeilidAppMessageImpl implements VeilidAppMessage {
+  const _$VeilidAppMessageImpl(
+      {@Uint8ListJsonConverter.jsIsArray() required this.message,
       this.sender,
+      this.routeId,
       final String? $type})
       : $type = $type ?? 'AppMessage';
 
-  factory _$VeilidAppMessage.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidAppMessageFromJson(json);
+  factory _$VeilidAppMessageImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidAppMessageImplFromJson(json);
 
   @override
-  @Uint8ListJsonConverter()
+  @Uint8ListJsonConverter.jsIsArray()
   final Uint8List message;
   @override
   final Typed<FixedEncodedString43>? sender;
+  @override
+  final String? routeId;
 
   @JsonKey(name: 'kind')
   final String $type;
 
   @override
   String toString() {
-    return 'VeilidUpdate.appMessage(message: $message, sender: $sender)';
+    return 'VeilidUpdate.appMessage(message: $message, sender: $sender, routeId: $routeId)';
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidAppMessage &&
+            other is _$VeilidAppMessageImpl &&
             const DeepCollectionEquality().equals(other.message, message) &&
-            (identical(other.sender, sender) || other.sender == sender));
+            (identical(other.sender, sender) || other.sender == sender) &&
+            (identical(other.routeId, routeId) || other.routeId == routeId));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(
-      runtimeType, const DeepCollectionEquality().hash(message), sender);
+  int get hashCode => Object.hash(runtimeType,
+      const DeepCollectionEquality().hash(message), sender, routeId);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidAppMessageCopyWith<_$VeilidAppMessage> get copyWith =>
-      __$$VeilidAppMessageCopyWithImpl<_$VeilidAppMessage>(this, _$identity);
+  _$$VeilidAppMessageImplCopyWith<_$VeilidAppMessageImpl> get copyWith =>
+      __$$VeilidAppMessageImplCopyWithImpl<_$VeilidAppMessageImpl>(
+          this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -1808,11 +1845,16 @@ class _$VeilidAppMessage implements VeilidAppMessage {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -1825,10 +1867,10 @@ class _$VeilidAppMessage implements VeilidAppMessage {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
-    return appMessage(message, sender);
+    return appMessage(message, sender, routeId);
   }
 
   @override
@@ -1837,11 +1879,14 @@ class _$VeilidAppMessage implements VeilidAppMessage {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1853,10 +1898,10 @@ class _$VeilidAppMessage implements VeilidAppMessage {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
-    return appMessage?.call(message, sender);
+    return appMessage?.call(message, sender, routeId);
   }
 
   @override
@@ -1865,11 +1910,14 @@ class _$VeilidAppMessage implements VeilidAppMessage {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -1881,12 +1929,12 @@ class _$VeilidAppMessage implements VeilidAppMessage {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
     if (appMessage != null) {
-      return appMessage(message, sender);
+      return appMessage(message, sender, routeId);
     }
     return orElse();
   }
@@ -1942,7 +1990,7 @@ class _$VeilidAppMessage implements VeilidAppMessage {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidAppMessageToJson(
+    return _$$VeilidAppMessageImplToJson(
       this,
     );
   }
@@ -1950,38 +1998,41 @@ class _$VeilidAppMessage implements VeilidAppMessage {
 
 abstract class VeilidAppMessage implements VeilidUpdate {
   const factory VeilidAppMessage(
-      {@Uint8ListJsonConverter() required final Uint8List message,
-      final Typed<FixedEncodedString43>? sender}) = _$VeilidAppMessage;
+      {@Uint8ListJsonConverter.jsIsArray() required final Uint8List message,
+      final Typed<FixedEncodedString43>? sender,
+      final String? routeId}) = _$VeilidAppMessageImpl;
 
   factory VeilidAppMessage.fromJson(Map<String, dynamic> json) =
-      _$VeilidAppMessage.fromJson;
+      _$VeilidAppMessageImpl.fromJson;
 
-  @Uint8ListJsonConverter()
+  @Uint8ListJsonConverter.jsIsArray()
   Uint8List get message;
   Typed<FixedEncodedString43>? get sender;
+  String? get routeId;
   @JsonKey(ignore: true)
-  _$$VeilidAppMessageCopyWith<_$VeilidAppMessage> get copyWith =>
+  _$$VeilidAppMessageImplCopyWith<_$VeilidAppMessageImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidAppCallCopyWith<$Res> {
-  factory _$$VeilidAppCallCopyWith(
-          _$VeilidAppCall value, $Res Function(_$VeilidAppCall) then) =
-      __$$VeilidAppCallCopyWithImpl<$Res>;
+abstract class _$$VeilidAppCallImplCopyWith<$Res> {
+  factory _$$VeilidAppCallImplCopyWith(
+          _$VeilidAppCallImpl value, $Res Function(_$VeilidAppCallImpl) then) =
+      __$$VeilidAppCallImplCopyWithImpl<$Res>;
   @useResult
   $Res call(
-      {@Uint8ListJsonConverter() Uint8List message,
+      {@Uint8ListJsonConverter.jsIsArray() Uint8List message,
       String callId,
-      Typed<FixedEncodedString43>? sender});
+      Typed<FixedEncodedString43>? sender,
+      String? routeId});
 }
 
 /// @nodoc
-class __$$VeilidAppCallCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidAppCall>
-    implements _$$VeilidAppCallCopyWith<$Res> {
-  __$$VeilidAppCallCopyWithImpl(
-      _$VeilidAppCall _value, $Res Function(_$VeilidAppCall) _then)
+class __$$VeilidAppCallImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidAppCallImpl>
+    implements _$$VeilidAppCallImplCopyWith<$Res> {
+  __$$VeilidAppCallImplCopyWithImpl(
+      _$VeilidAppCallImpl _value, $Res Function(_$VeilidAppCallImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1990,8 +2041,9 @@ class __$$VeilidAppCallCopyWithImpl<$Res>
     Object? message = null,
     Object? callId = null,
     Object? sender = freezed,
+    Object? routeId = freezed,
   }) {
-    return _then(_$VeilidAppCall(
+    return _then(_$VeilidAppCallImpl(
       message: null == message
           ? _value.message
           : message // ignore: cast_nullable_to_non_nullable
@@ -2004,59 +2056,67 @@ class __$$VeilidAppCallCopyWithImpl<$Res>
           ? _value.sender
           : sender // ignore: cast_nullable_to_non_nullable
               as Typed<FixedEncodedString43>?,
+      routeId: freezed == routeId
+          ? _value.routeId
+          : routeId // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidAppCall implements VeilidAppCall {
-  const _$VeilidAppCall(
-      {@Uint8ListJsonConverter() required this.message,
+class _$VeilidAppCallImpl implements VeilidAppCall {
+  const _$VeilidAppCallImpl(
+      {@Uint8ListJsonConverter.jsIsArray() required this.message,
       required this.callId,
       this.sender,
+      this.routeId,
       final String? $type})
       : $type = $type ?? 'AppCall';
 
-  factory _$VeilidAppCall.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidAppCallFromJson(json);
+  factory _$VeilidAppCallImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidAppCallImplFromJson(json);
 
   @override
-  @Uint8ListJsonConverter()
+  @Uint8ListJsonConverter.jsIsArray()
   final Uint8List message;
   @override
   final String callId;
   @override
   final Typed<FixedEncodedString43>? sender;
+  @override
+  final String? routeId;
 
   @JsonKey(name: 'kind')
   final String $type;
 
   @override
   String toString() {
-    return 'VeilidUpdate.appCall(message: $message, callId: $callId, sender: $sender)';
+    return 'VeilidUpdate.appCall(message: $message, callId: $callId, sender: $sender, routeId: $routeId)';
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidAppCall &&
+            other is _$VeilidAppCallImpl &&
             const DeepCollectionEquality().equals(other.message, message) &&
             (identical(other.callId, callId) || other.callId == callId) &&
-            (identical(other.sender, sender) || other.sender == sender));
+            (identical(other.sender, sender) || other.sender == sender) &&
+            (identical(other.routeId, routeId) || other.routeId == routeId));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType,
-      const DeepCollectionEquality().hash(message), callId, sender);
+      const DeepCollectionEquality().hash(message), callId, sender, routeId);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidAppCallCopyWith<_$VeilidAppCall> get copyWith =>
-      __$$VeilidAppCallCopyWithImpl<_$VeilidAppCall>(this, _$identity);
+  _$$VeilidAppCallImplCopyWith<_$VeilidAppCallImpl> get copyWith =>
+      __$$VeilidAppCallImplCopyWithImpl<_$VeilidAppCallImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -2064,11 +2124,16 @@ class _$VeilidAppCall implements VeilidAppCall {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -2081,10 +2146,10 @@ class _$VeilidAppCall implements VeilidAppCall {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
-    return appCall(message, callId, sender);
+    return appCall(message, callId, sender, routeId);
   }
 
   @override
@@ -2093,11 +2158,14 @@ class _$VeilidAppCall implements VeilidAppCall {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2109,10 +2177,10 @@ class _$VeilidAppCall implements VeilidAppCall {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
-    return appCall?.call(message, callId, sender);
+    return appCall?.call(message, callId, sender, routeId);
   }
 
   @override
@@ -2121,11 +2189,14 @@ class _$VeilidAppCall implements VeilidAppCall {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2137,12 +2208,12 @@ class _$VeilidAppCall implements VeilidAppCall {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
     if (appCall != null) {
-      return appCall(message, callId, sender);
+      return appCall(message, callId, sender, routeId);
     }
     return orElse();
   }
@@ -2198,7 +2269,7 @@ class _$VeilidAppCall implements VeilidAppCall {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidAppCallToJson(
+    return _$$VeilidAppCallImplToJson(
       this,
     );
   }
@@ -2206,27 +2277,30 @@ class _$VeilidAppCall implements VeilidAppCall {
 
 abstract class VeilidAppCall implements VeilidUpdate {
   const factory VeilidAppCall(
-      {@Uint8ListJsonConverter() required final Uint8List message,
+      {@Uint8ListJsonConverter.jsIsArray() required final Uint8List message,
       required final String callId,
-      final Typed<FixedEncodedString43>? sender}) = _$VeilidAppCall;
+      final Typed<FixedEncodedString43>? sender,
+      final String? routeId}) = _$VeilidAppCallImpl;
 
   factory VeilidAppCall.fromJson(Map<String, dynamic> json) =
-      _$VeilidAppCall.fromJson;
+      _$VeilidAppCallImpl.fromJson;
 
-  @Uint8ListJsonConverter()
+  @Uint8ListJsonConverter.jsIsArray()
   Uint8List get message;
   String get callId;
   Typed<FixedEncodedString43>? get sender;
+  String? get routeId;
   @JsonKey(ignore: true)
-  _$$VeilidAppCallCopyWith<_$VeilidAppCall> get copyWith =>
+  _$$VeilidAppCallImplCopyWith<_$VeilidAppCallImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidUpdateAttachmentCopyWith<$Res> {
-  factory _$$VeilidUpdateAttachmentCopyWith(_$VeilidUpdateAttachment value,
-          $Res Function(_$VeilidUpdateAttachment) then) =
-      __$$VeilidUpdateAttachmentCopyWithImpl<$Res>;
+abstract class _$$VeilidUpdateAttachmentImplCopyWith<$Res> {
+  factory _$$VeilidUpdateAttachmentImplCopyWith(
+          _$VeilidUpdateAttachmentImpl value,
+          $Res Function(_$VeilidUpdateAttachmentImpl) then) =
+      __$$VeilidUpdateAttachmentImplCopyWithImpl<$Res>;
   @useResult
   $Res call(
       {AttachmentState state,
@@ -2235,11 +2309,12 @@ abstract class _$$VeilidUpdateAttachmentCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$VeilidUpdateAttachmentCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateAttachment>
-    implements _$$VeilidUpdateAttachmentCopyWith<$Res> {
-  __$$VeilidUpdateAttachmentCopyWithImpl(_$VeilidUpdateAttachment _value,
-      $Res Function(_$VeilidUpdateAttachment) _then)
+class __$$VeilidUpdateAttachmentImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateAttachmentImpl>
+    implements _$$VeilidUpdateAttachmentImplCopyWith<$Res> {
+  __$$VeilidUpdateAttachmentImplCopyWithImpl(
+      _$VeilidUpdateAttachmentImpl _value,
+      $Res Function(_$VeilidUpdateAttachmentImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2249,7 +2324,7 @@ class __$$VeilidUpdateAttachmentCopyWithImpl<$Res>
     Object? publicInternetReady = null,
     Object? localNetworkReady = null,
   }) {
-    return _then(_$VeilidUpdateAttachment(
+    return _then(_$VeilidUpdateAttachmentImpl(
       state: null == state
           ? _value.state
           : state // ignore: cast_nullable_to_non_nullable
@@ -2268,16 +2343,16 @@ class __$$VeilidUpdateAttachmentCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
-  const _$VeilidUpdateAttachment(
+class _$VeilidUpdateAttachmentImpl implements VeilidUpdateAttachment {
+  const _$VeilidUpdateAttachmentImpl(
       {required this.state,
       required this.publicInternetReady,
       required this.localNetworkReady,
       final String? $type})
       : $type = $type ?? 'Attachment';
 
-  factory _$VeilidUpdateAttachment.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidUpdateAttachmentFromJson(json);
+  factory _$VeilidUpdateAttachmentImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidUpdateAttachmentImplFromJson(json);
 
   @override
   final AttachmentState state;
@@ -2295,10 +2370,10 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidUpdateAttachment &&
+            other is _$VeilidUpdateAttachmentImpl &&
             (identical(other.state, state) || other.state == state) &&
             (identical(other.publicInternetReady, publicInternetReady) ||
                 other.publicInternetReady == publicInternetReady) &&
@@ -2314,9 +2389,9 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidUpdateAttachmentCopyWith<_$VeilidUpdateAttachment> get copyWith =>
-      __$$VeilidUpdateAttachmentCopyWithImpl<_$VeilidUpdateAttachment>(
-          this, _$identity);
+  _$$VeilidUpdateAttachmentImplCopyWith<_$VeilidUpdateAttachmentImpl>
+      get copyWith => __$$VeilidUpdateAttachmentImplCopyWithImpl<
+          _$VeilidUpdateAttachmentImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -2324,11 +2399,16 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -2341,7 +2421,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
     return attachment(state, publicInternetReady, localNetworkReady);
@@ -2353,11 +2433,14 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2369,7 +2452,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
     return attachment?.call(state, publicInternetReady, localNetworkReady);
@@ -2381,11 +2464,14 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2397,7 +2483,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
@@ -2458,7 +2544,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidUpdateAttachmentToJson(
+    return _$$VeilidUpdateAttachmentImplToJson(
       this,
     );
   }
@@ -2468,35 +2554,35 @@ abstract class VeilidUpdateAttachment implements VeilidUpdate {
   const factory VeilidUpdateAttachment(
       {required final AttachmentState state,
       required final bool publicInternetReady,
-      required final bool localNetworkReady}) = _$VeilidUpdateAttachment;
+      required final bool localNetworkReady}) = _$VeilidUpdateAttachmentImpl;
 
   factory VeilidUpdateAttachment.fromJson(Map<String, dynamic> json) =
-      _$VeilidUpdateAttachment.fromJson;
+      _$VeilidUpdateAttachmentImpl.fromJson;
 
   AttachmentState get state;
   bool get publicInternetReady;
   bool get localNetworkReady;
   @JsonKey(ignore: true)
-  _$$VeilidUpdateAttachmentCopyWith<_$VeilidUpdateAttachment> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidUpdateAttachmentImplCopyWith<_$VeilidUpdateAttachmentImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidUpdateNetworkCopyWith<$Res> {
-  factory _$$VeilidUpdateNetworkCopyWith(_$VeilidUpdateNetwork value,
-          $Res Function(_$VeilidUpdateNetwork) then) =
-      __$$VeilidUpdateNetworkCopyWithImpl<$Res>;
+abstract class _$$VeilidUpdateNetworkImplCopyWith<$Res> {
+  factory _$$VeilidUpdateNetworkImplCopyWith(_$VeilidUpdateNetworkImpl value,
+          $Res Function(_$VeilidUpdateNetworkImpl) then) =
+      __$$VeilidUpdateNetworkImplCopyWithImpl<$Res>;
   @useResult
   $Res call(
       {bool started, BigInt bpsDown, BigInt bpsUp, List<PeerTableData> peers});
 }
 
 /// @nodoc
-class __$$VeilidUpdateNetworkCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateNetwork>
-    implements _$$VeilidUpdateNetworkCopyWith<$Res> {
-  __$$VeilidUpdateNetworkCopyWithImpl(
-      _$VeilidUpdateNetwork _value, $Res Function(_$VeilidUpdateNetwork) _then)
+class __$$VeilidUpdateNetworkImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateNetworkImpl>
+    implements _$$VeilidUpdateNetworkImplCopyWith<$Res> {
+  __$$VeilidUpdateNetworkImplCopyWithImpl(_$VeilidUpdateNetworkImpl _value,
+      $Res Function(_$VeilidUpdateNetworkImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2507,7 +2593,7 @@ class __$$VeilidUpdateNetworkCopyWithImpl<$Res>
     Object? bpsUp = null,
     Object? peers = null,
   }) {
-    return _then(_$VeilidUpdateNetwork(
+    return _then(_$VeilidUpdateNetworkImpl(
       started: null == started
           ? _value.started
           : started // ignore: cast_nullable_to_non_nullable
@@ -2530,8 +2616,8 @@ class __$$VeilidUpdateNetworkCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
-  const _$VeilidUpdateNetwork(
+class _$VeilidUpdateNetworkImpl implements VeilidUpdateNetwork {
+  const _$VeilidUpdateNetworkImpl(
       {required this.started,
       required this.bpsDown,
       required this.bpsUp,
@@ -2540,8 +2626,8 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
       : _peers = peers,
         $type = $type ?? 'Network';
 
-  factory _$VeilidUpdateNetwork.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidUpdateNetworkFromJson(json);
+  factory _$VeilidUpdateNetworkImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidUpdateNetworkImplFromJson(json);
 
   @override
   final bool started;
@@ -2566,10 +2652,10 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidUpdateNetwork &&
+            other is _$VeilidUpdateNetworkImpl &&
             (identical(other.started, started) || other.started == started) &&
             (identical(other.bpsDown, bpsDown) || other.bpsDown == bpsDown) &&
             (identical(other.bpsUp, bpsUp) || other.bpsUp == bpsUp) &&
@@ -2584,8 +2670,8 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidUpdateNetworkCopyWith<_$VeilidUpdateNetwork> get copyWith =>
-      __$$VeilidUpdateNetworkCopyWithImpl<_$VeilidUpdateNetwork>(
+  _$$VeilidUpdateNetworkImplCopyWith<_$VeilidUpdateNetworkImpl> get copyWith =>
+      __$$VeilidUpdateNetworkImplCopyWithImpl<_$VeilidUpdateNetworkImpl>(
           this, _$identity);
 
   @override
@@ -2594,11 +2680,16 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -2611,7 +2702,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
     return network(started, bpsDown, bpsUp, peers);
@@ -2623,11 +2714,14 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2639,7 +2733,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
     return network?.call(started, bpsDown, bpsUp, peers);
@@ -2651,11 +2745,14 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2667,7 +2764,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
@@ -2728,7 +2825,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidUpdateNetworkToJson(
+    return _$$VeilidUpdateNetworkImplToJson(
       this,
     );
   }
@@ -2739,25 +2836,25 @@ abstract class VeilidUpdateNetwork implements VeilidUpdate {
       {required final bool started,
       required final BigInt bpsDown,
       required final BigInt bpsUp,
-      required final List<PeerTableData> peers}) = _$VeilidUpdateNetwork;
+      required final List<PeerTableData> peers}) = _$VeilidUpdateNetworkImpl;
 
   factory VeilidUpdateNetwork.fromJson(Map<String, dynamic> json) =
-      _$VeilidUpdateNetwork.fromJson;
+      _$VeilidUpdateNetworkImpl.fromJson;
 
   bool get started;
   BigInt get bpsDown;
   BigInt get bpsUp;
   List<PeerTableData> get peers;
   @JsonKey(ignore: true)
-  _$$VeilidUpdateNetworkCopyWith<_$VeilidUpdateNetwork> get copyWith =>
+  _$$VeilidUpdateNetworkImplCopyWith<_$VeilidUpdateNetworkImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidUpdateConfigCopyWith<$Res> {
-  factory _$$VeilidUpdateConfigCopyWith(_$VeilidUpdateConfig value,
-          $Res Function(_$VeilidUpdateConfig) then) =
-      __$$VeilidUpdateConfigCopyWithImpl<$Res>;
+abstract class _$$VeilidUpdateConfigImplCopyWith<$Res> {
+  factory _$$VeilidUpdateConfigImplCopyWith(_$VeilidUpdateConfigImpl value,
+          $Res Function(_$VeilidUpdateConfigImpl) then) =
+      __$$VeilidUpdateConfigImplCopyWithImpl<$Res>;
   @useResult
   $Res call({VeilidConfig config});
 
@@ -2765,11 +2862,11 @@ abstract class _$$VeilidUpdateConfigCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$VeilidUpdateConfigCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateConfig>
-    implements _$$VeilidUpdateConfigCopyWith<$Res> {
-  __$$VeilidUpdateConfigCopyWithImpl(
-      _$VeilidUpdateConfig _value, $Res Function(_$VeilidUpdateConfig) _then)
+class __$$VeilidUpdateConfigImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateConfigImpl>
+    implements _$$VeilidUpdateConfigImplCopyWith<$Res> {
+  __$$VeilidUpdateConfigImplCopyWithImpl(_$VeilidUpdateConfigImpl _value,
+      $Res Function(_$VeilidUpdateConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -2777,7 +2874,7 @@ class __$$VeilidUpdateConfigCopyWithImpl<$Res>
   $Res call({
     Object? config = null,
   }) {
-    return _then(_$VeilidUpdateConfig(
+    return _then(_$VeilidUpdateConfigImpl(
       config: null == config
           ? _value.config
           : config // ignore: cast_nullable_to_non_nullable
@@ -2796,12 +2893,12 @@ class __$$VeilidUpdateConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidUpdateConfig implements VeilidUpdateConfig {
-  const _$VeilidUpdateConfig({required this.config, final String? $type})
+class _$VeilidUpdateConfigImpl implements VeilidUpdateConfig {
+  const _$VeilidUpdateConfigImpl({required this.config, final String? $type})
       : $type = $type ?? 'Config';
 
-  factory _$VeilidUpdateConfig.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidUpdateConfigFromJson(json);
+  factory _$VeilidUpdateConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidUpdateConfigImplFromJson(json);
 
   @override
   final VeilidConfig config;
@@ -2815,10 +2912,10 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidUpdateConfig &&
+            other is _$VeilidUpdateConfigImpl &&
             (identical(other.config, config) || other.config == config));
   }
 
@@ -2829,8 +2926,8 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidUpdateConfigCopyWith<_$VeilidUpdateConfig> get copyWith =>
-      __$$VeilidUpdateConfigCopyWithImpl<_$VeilidUpdateConfig>(
+  _$$VeilidUpdateConfigImplCopyWith<_$VeilidUpdateConfigImpl> get copyWith =>
+      __$$VeilidUpdateConfigImplCopyWithImpl<_$VeilidUpdateConfigImpl>(
           this, _$identity);
 
   @override
@@ -2839,11 +2936,16 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -2856,7 +2958,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
     return config(this.config);
@@ -2868,11 +2970,14 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2884,7 +2989,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
     return config?.call(this.config);
@@ -2896,11 +3001,14 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -2912,7 +3020,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
@@ -2973,7 +3081,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidUpdateConfigToJson(
+    return _$$VeilidUpdateConfigImplToJson(
       this,
     );
   }
@@ -2981,32 +3089,34 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
 
 abstract class VeilidUpdateConfig implements VeilidUpdate {
   const factory VeilidUpdateConfig({required final VeilidConfig config}) =
-      _$VeilidUpdateConfig;
+      _$VeilidUpdateConfigImpl;
 
   factory VeilidUpdateConfig.fromJson(Map<String, dynamic> json) =
-      _$VeilidUpdateConfig.fromJson;
+      _$VeilidUpdateConfigImpl.fromJson;
 
   VeilidConfig get config;
   @JsonKey(ignore: true)
-  _$$VeilidUpdateConfigCopyWith<_$VeilidUpdateConfig> get copyWith =>
+  _$$VeilidUpdateConfigImplCopyWith<_$VeilidUpdateConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidUpdateRouteChangeCopyWith<$Res> {
-  factory _$$VeilidUpdateRouteChangeCopyWith(_$VeilidUpdateRouteChange value,
-          $Res Function(_$VeilidUpdateRouteChange) then) =
-      __$$VeilidUpdateRouteChangeCopyWithImpl<$Res>;
+abstract class _$$VeilidUpdateRouteChangeImplCopyWith<$Res> {
+  factory _$$VeilidUpdateRouteChangeImplCopyWith(
+          _$VeilidUpdateRouteChangeImpl value,
+          $Res Function(_$VeilidUpdateRouteChangeImpl) then) =
+      __$$VeilidUpdateRouteChangeImplCopyWithImpl<$Res>;
   @useResult
   $Res call({List<String> deadRoutes, List<String> deadRemoteRoutes});
 }
 
 /// @nodoc
-class __$$VeilidUpdateRouteChangeCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateRouteChange>
-    implements _$$VeilidUpdateRouteChangeCopyWith<$Res> {
-  __$$VeilidUpdateRouteChangeCopyWithImpl(_$VeilidUpdateRouteChange _value,
-      $Res Function(_$VeilidUpdateRouteChange) _then)
+class __$$VeilidUpdateRouteChangeImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateRouteChangeImpl>
+    implements _$$VeilidUpdateRouteChangeImplCopyWith<$Res> {
+  __$$VeilidUpdateRouteChangeImplCopyWithImpl(
+      _$VeilidUpdateRouteChangeImpl _value,
+      $Res Function(_$VeilidUpdateRouteChangeImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3015,7 +3125,7 @@ class __$$VeilidUpdateRouteChangeCopyWithImpl<$Res>
     Object? deadRoutes = null,
     Object? deadRemoteRoutes = null,
   }) {
-    return _then(_$VeilidUpdateRouteChange(
+    return _then(_$VeilidUpdateRouteChangeImpl(
       deadRoutes: null == deadRoutes
           ? _value._deadRoutes
           : deadRoutes // ignore: cast_nullable_to_non_nullable
@@ -3030,8 +3140,8 @@ class __$$VeilidUpdateRouteChangeCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
-  const _$VeilidUpdateRouteChange(
+class _$VeilidUpdateRouteChangeImpl implements VeilidUpdateRouteChange {
+  const _$VeilidUpdateRouteChangeImpl(
       {required final List<String> deadRoutes,
       required final List<String> deadRemoteRoutes,
       final String? $type})
@@ -3039,8 +3149,8 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
         _deadRemoteRoutes = deadRemoteRoutes,
         $type = $type ?? 'RouteChange';
 
-  factory _$VeilidUpdateRouteChange.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidUpdateRouteChangeFromJson(json);
+  factory _$VeilidUpdateRouteChangeImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidUpdateRouteChangeImplFromJson(json);
 
   final List<String> _deadRoutes;
   @override
@@ -3068,10 +3178,10 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidUpdateRouteChange &&
+            other is _$VeilidUpdateRouteChangeImpl &&
             const DeepCollectionEquality()
                 .equals(other._deadRoutes, _deadRoutes) &&
             const DeepCollectionEquality()
@@ -3088,9 +3198,9 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidUpdateRouteChangeCopyWith<_$VeilidUpdateRouteChange> get copyWith =>
-      __$$VeilidUpdateRouteChangeCopyWithImpl<_$VeilidUpdateRouteChange>(
-          this, _$identity);
+  _$$VeilidUpdateRouteChangeImplCopyWith<_$VeilidUpdateRouteChangeImpl>
+      get copyWith => __$$VeilidUpdateRouteChangeImplCopyWithImpl<
+          _$VeilidUpdateRouteChangeImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -3098,11 +3208,16 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -3115,7 +3230,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
     return routeChange(deadRoutes, deadRemoteRoutes);
@@ -3127,11 +3242,14 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -3143,7 +3261,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
     return routeChange?.call(deadRoutes, deadRemoteRoutes);
@@ -3155,11 +3273,14 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -3171,7 +3292,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
@@ -3232,7 +3353,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidUpdateRouteChangeToJson(
+    return _$$VeilidUpdateRouteChangeImplToJson(
       this,
     );
   }
@@ -3242,39 +3363,41 @@ abstract class VeilidUpdateRouteChange implements VeilidUpdate {
   const factory VeilidUpdateRouteChange(
           {required final List<String> deadRoutes,
           required final List<String> deadRemoteRoutes}) =
-      _$VeilidUpdateRouteChange;
+      _$VeilidUpdateRouteChangeImpl;
 
   factory VeilidUpdateRouteChange.fromJson(Map<String, dynamic> json) =
-      _$VeilidUpdateRouteChange.fromJson;
+      _$VeilidUpdateRouteChangeImpl.fromJson;
 
   List<String> get deadRoutes;
   List<String> get deadRemoteRoutes;
   @JsonKey(ignore: true)
-  _$$VeilidUpdateRouteChangeCopyWith<_$VeilidUpdateRouteChange> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidUpdateRouteChangeImplCopyWith<_$VeilidUpdateRouteChangeImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class _$$VeilidUpdateValueChangeCopyWith<$Res> {
-  factory _$$VeilidUpdateValueChangeCopyWith(_$VeilidUpdateValueChange value,
-          $Res Function(_$VeilidUpdateValueChange) then) =
-      __$$VeilidUpdateValueChangeCopyWithImpl<$Res>;
+abstract class _$$VeilidUpdateValueChangeImplCopyWith<$Res> {
+  factory _$$VeilidUpdateValueChangeImplCopyWith(
+          _$VeilidUpdateValueChangeImpl value,
+          $Res Function(_$VeilidUpdateValueChangeImpl) then) =
+      __$$VeilidUpdateValueChangeImplCopyWithImpl<$Res>;
   @useResult
   $Res call(
       {Typed<FixedEncodedString43> key,
       List<ValueSubkeyRange> subkeys,
       int count,
-      ValueData valueData});
+      ValueData value});
 
-  $ValueDataCopyWith<$Res> get valueData;
+  $ValueDataCopyWith<$Res> get value;
 }
 
 /// @nodoc
-class __$$VeilidUpdateValueChangeCopyWithImpl<$Res>
-    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateValueChange>
-    implements _$$VeilidUpdateValueChangeCopyWith<$Res> {
-  __$$VeilidUpdateValueChangeCopyWithImpl(_$VeilidUpdateValueChange _value,
-      $Res Function(_$VeilidUpdateValueChange) _then)
+class __$$VeilidUpdateValueChangeImplCopyWithImpl<$Res>
+    extends _$VeilidUpdateCopyWithImpl<$Res, _$VeilidUpdateValueChangeImpl>
+    implements _$$VeilidUpdateValueChangeImplCopyWith<$Res> {
+  __$$VeilidUpdateValueChangeImplCopyWithImpl(
+      _$VeilidUpdateValueChangeImpl _value,
+      $Res Function(_$VeilidUpdateValueChangeImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3283,9 +3406,9 @@ class __$$VeilidUpdateValueChangeCopyWithImpl<$Res>
     Object? key = null,
     Object? subkeys = null,
     Object? count = null,
-    Object? valueData = null,
+    Object? value = null,
   }) {
-    return _then(_$VeilidUpdateValueChange(
+    return _then(_$VeilidUpdateValueChangeImpl(
       key: null == key
           ? _value.key
           : key // ignore: cast_nullable_to_non_nullable
@@ -3298,36 +3421,36 @@ class __$$VeilidUpdateValueChangeCopyWithImpl<$Res>
           ? _value.count
           : count // ignore: cast_nullable_to_non_nullable
               as int,
-      valueData: null == valueData
-          ? _value.valueData
-          : valueData // ignore: cast_nullable_to_non_nullable
+      value: null == value
+          ? _value.value
+          : value // ignore: cast_nullable_to_non_nullable
               as ValueData,
     ));
   }
 
   @override
   @pragma('vm:prefer-inline')
-  $ValueDataCopyWith<$Res> get valueData {
-    return $ValueDataCopyWith<$Res>(_value.valueData, (value) {
-      return _then(_value.copyWith(valueData: value));
+  $ValueDataCopyWith<$Res> get value {
+    return $ValueDataCopyWith<$Res>(_value.value, (value) {
+      return _then(_value.copyWith(value: value));
     });
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
-  const _$VeilidUpdateValueChange(
+class _$VeilidUpdateValueChangeImpl implements VeilidUpdateValueChange {
+  const _$VeilidUpdateValueChangeImpl(
       {required this.key,
       required final List<ValueSubkeyRange> subkeys,
       required this.count,
-      required this.valueData,
+      required this.value,
       final String? $type})
       : _subkeys = subkeys,
         $type = $type ?? 'ValueChange';
 
-  factory _$VeilidUpdateValueChange.fromJson(Map<String, dynamic> json) =>
-      _$$VeilidUpdateValueChangeFromJson(json);
+  factory _$VeilidUpdateValueChangeImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidUpdateValueChangeImplFromJson(json);
 
   @override
   final Typed<FixedEncodedString43> key;
@@ -3342,39 +3465,38 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
   @override
   final int count;
   @override
-  final ValueData valueData;
+  final ValueData value;
 
   @JsonKey(name: 'kind')
   final String $type;
 
   @override
   String toString() {
-    return 'VeilidUpdate.valueChange(key: $key, subkeys: $subkeys, count: $count, valueData: $valueData)';
+    return 'VeilidUpdate.valueChange(key: $key, subkeys: $subkeys, count: $count, value: $value)';
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$VeilidUpdateValueChange &&
+            other is _$VeilidUpdateValueChangeImpl &&
             (identical(other.key, key) || other.key == key) &&
             const DeepCollectionEquality().equals(other._subkeys, _subkeys) &&
             (identical(other.count, count) || other.count == count) &&
-            (identical(other.valueData, valueData) ||
-                other.valueData == valueData));
+            (identical(other.value, value) || other.value == value));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, key,
-      const DeepCollectionEquality().hash(_subkeys), count, valueData);
+      const DeepCollectionEquality().hash(_subkeys), count, value);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$VeilidUpdateValueChangeCopyWith<_$VeilidUpdateValueChange> get copyWith =>
-      __$$VeilidUpdateValueChangeCopyWithImpl<_$VeilidUpdateValueChange>(
-          this, _$identity);
+  _$$VeilidUpdateValueChangeImplCopyWith<_$VeilidUpdateValueChangeImpl>
+      get copyWith => __$$VeilidUpdateValueChangeImplCopyWithImpl<
+          _$VeilidUpdateValueChangeImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
@@ -3382,11 +3504,16 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
     required TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)
         log,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appMessage,
-    required TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)
+    required TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)
         appCall,
     required TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)
@@ -3399,10 +3526,10 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
             List<String> deadRoutes, List<String> deadRemoteRoutes)
         routeChange,
     required TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)
         valueChange,
   }) {
-    return valueChange(key, subkeys, count, valueData);
+    return valueChange(key, subkeys, count, value);
   }
 
   @override
@@ -3411,11 +3538,14 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
     TResult? Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult? Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult? Function(@Uint8ListJsonConverter() Uint8List message,
-            String callId, Typed<FixedEncodedString43>? sender)?
+    TResult? Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult? Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -3427,10 +3557,10 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
     TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult? Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
   }) {
-    return valueChange?.call(key, subkeys, count, valueData);
+    return valueChange?.call(key, subkeys, count, value);
   }
 
   @override
@@ -3439,11 +3569,14 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
     TResult Function(
             VeilidLogLevel logLevel, String message, String? backtrace)?
         log,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(@Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            Typed<FixedEncodedString43>? sender, String? routeId)?
         appMessage,
-    TResult Function(@Uint8ListJsonConverter() Uint8List message, String callId,
-            Typed<FixedEncodedString43>? sender)?
+    TResult Function(
+            @Uint8ListJsonConverter.jsIsArray() Uint8List message,
+            String callId,
+            Typed<FixedEncodedString43>? sender,
+            String? routeId)?
         appCall,
     TResult Function(AttachmentState state, bool publicInternetReady,
             bool localNetworkReady)?
@@ -3455,12 +3588,12 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
     TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
         routeChange,
     TResult Function(Typed<FixedEncodedString43> key,
-            List<ValueSubkeyRange> subkeys, int count, ValueData valueData)?
+            List<ValueSubkeyRange> subkeys, int count, ValueData value)?
         valueChange,
     required TResult orElse(),
   }) {
     if (valueChange != null) {
-      return valueChange(key, subkeys, count, valueData);
+      return valueChange(key, subkeys, count, value);
     }
     return orElse();
   }
@@ -3516,7 +3649,7 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$VeilidUpdateValueChangeToJson(
+    return _$$VeilidUpdateValueChangeImplToJson(
       this,
     );
   }
@@ -3527,18 +3660,18 @@ abstract class VeilidUpdateValueChange implements VeilidUpdate {
       {required final Typed<FixedEncodedString43> key,
       required final List<ValueSubkeyRange> subkeys,
       required final int count,
-      required final ValueData valueData}) = _$VeilidUpdateValueChange;
+      required final ValueData value}) = _$VeilidUpdateValueChangeImpl;
 
   factory VeilidUpdateValueChange.fromJson(Map<String, dynamic> json) =
-      _$VeilidUpdateValueChange.fromJson;
+      _$VeilidUpdateValueChangeImpl.fromJson;
 
   Typed<FixedEncodedString43> get key;
   List<ValueSubkeyRange> get subkeys;
   int get count;
-  ValueData get valueData;
+  ValueData get value;
   @JsonKey(ignore: true)
-  _$$VeilidUpdateValueChangeCopyWith<_$VeilidUpdateValueChange> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidUpdateValueChangeImplCopyWith<_$VeilidUpdateValueChangeImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidStateAttachment _$VeilidStateAttachmentFromJson(
@@ -3606,11 +3739,12 @@ class _$VeilidStateAttachmentCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$_VeilidStateAttachmentCopyWith<$Res>
+abstract class _$$VeilidStateAttachmentImplCopyWith<$Res>
     implements $VeilidStateAttachmentCopyWith<$Res> {
-  factory _$$_VeilidStateAttachmentCopyWith(_$_VeilidStateAttachment value,
-          $Res Function(_$_VeilidStateAttachment) then) =
-      __$$_VeilidStateAttachmentCopyWithImpl<$Res>;
+  factory _$$VeilidStateAttachmentImplCopyWith(
+          _$VeilidStateAttachmentImpl value,
+          $Res Function(_$VeilidStateAttachmentImpl) then) =
+      __$$VeilidStateAttachmentImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -3620,11 +3754,12 @@ abstract class _$$_VeilidStateAttachmentCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidStateAttachmentCopyWithImpl<$Res>
-    extends _$VeilidStateAttachmentCopyWithImpl<$Res, _$_VeilidStateAttachment>
-    implements _$$_VeilidStateAttachmentCopyWith<$Res> {
-  __$$_VeilidStateAttachmentCopyWithImpl(_$_VeilidStateAttachment _value,
-      $Res Function(_$_VeilidStateAttachment) _then)
+class __$$VeilidStateAttachmentImplCopyWithImpl<$Res>
+    extends _$VeilidStateAttachmentCopyWithImpl<$Res,
+        _$VeilidStateAttachmentImpl>
+    implements _$$VeilidStateAttachmentImplCopyWith<$Res> {
+  __$$VeilidStateAttachmentImplCopyWithImpl(_$VeilidStateAttachmentImpl _value,
+      $Res Function(_$VeilidStateAttachmentImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3634,7 +3769,7 @@ class __$$_VeilidStateAttachmentCopyWithImpl<$Res>
     Object? publicInternetReady = null,
     Object? localNetworkReady = null,
   }) {
-    return _then(_$_VeilidStateAttachment(
+    return _then(_$VeilidStateAttachmentImpl(
       state: null == state
           ? _value.state
           : state // ignore: cast_nullable_to_non_nullable
@@ -3653,14 +3788,14 @@ class __$$_VeilidStateAttachmentCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidStateAttachment implements _VeilidStateAttachment {
-  const _$_VeilidStateAttachment(
+class _$VeilidStateAttachmentImpl implements _VeilidStateAttachment {
+  const _$VeilidStateAttachmentImpl(
       {required this.state,
       required this.publicInternetReady,
       required this.localNetworkReady});
 
-  factory _$_VeilidStateAttachment.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidStateAttachmentFromJson(json);
+  factory _$VeilidStateAttachmentImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidStateAttachmentImplFromJson(json);
 
   @override
   final AttachmentState state;
@@ -3675,10 +3810,10 @@ class _$_VeilidStateAttachment implements _VeilidStateAttachment {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidStateAttachment &&
+            other is _$VeilidStateAttachmentImpl &&
             (identical(other.state, state) || other.state == state) &&
             (identical(other.publicInternetReady, publicInternetReady) ||
                 other.publicInternetReady == publicInternetReady) &&
@@ -3694,13 +3829,13 @@ class _$_VeilidStateAttachment implements _VeilidStateAttachment {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidStateAttachmentCopyWith<_$_VeilidStateAttachment> get copyWith =>
-      __$$_VeilidStateAttachmentCopyWithImpl<_$_VeilidStateAttachment>(
-          this, _$identity);
+  _$$VeilidStateAttachmentImplCopyWith<_$VeilidStateAttachmentImpl>
+      get copyWith => __$$VeilidStateAttachmentImplCopyWithImpl<
+          _$VeilidStateAttachmentImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidStateAttachmentToJson(
+    return _$$VeilidStateAttachmentImplToJson(
       this,
     );
   }
@@ -3710,10 +3845,10 @@ abstract class _VeilidStateAttachment implements VeilidStateAttachment {
   const factory _VeilidStateAttachment(
       {required final AttachmentState state,
       required final bool publicInternetReady,
-      required final bool localNetworkReady}) = _$_VeilidStateAttachment;
+      required final bool localNetworkReady}) = _$VeilidStateAttachmentImpl;
 
   factory _VeilidStateAttachment.fromJson(Map<String, dynamic> json) =
-      _$_VeilidStateAttachment.fromJson;
+      _$VeilidStateAttachmentImpl.fromJson;
 
   @override
   AttachmentState get state;
@@ -3723,8 +3858,8 @@ abstract class _VeilidStateAttachment implements VeilidStateAttachment {
   bool get localNetworkReady;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidStateAttachmentCopyWith<_$_VeilidStateAttachment> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$VeilidStateAttachmentImplCopyWith<_$VeilidStateAttachmentImpl>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 VeilidStateNetwork _$VeilidStateNetworkFromJson(Map<String, dynamic> json) {
@@ -3794,11 +3929,11 @@ class _$VeilidStateNetworkCopyWithImpl<$Res, $Val extends VeilidStateNetwork>
 }
 
 /// @nodoc
-abstract class _$$_VeilidStateNetworkCopyWith<$Res>
+abstract class _$$VeilidStateNetworkImplCopyWith<$Res>
     implements $VeilidStateNetworkCopyWith<$Res> {
-  factory _$$_VeilidStateNetworkCopyWith(_$_VeilidStateNetwork value,
-          $Res Function(_$_VeilidStateNetwork) then) =
-      __$$_VeilidStateNetworkCopyWithImpl<$Res>;
+  factory _$$VeilidStateNetworkImplCopyWith(_$VeilidStateNetworkImpl value,
+          $Res Function(_$VeilidStateNetworkImpl) then) =
+      __$$VeilidStateNetworkImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -3806,11 +3941,11 @@ abstract class _$$_VeilidStateNetworkCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidStateNetworkCopyWithImpl<$Res>
-    extends _$VeilidStateNetworkCopyWithImpl<$Res, _$_VeilidStateNetwork>
-    implements _$$_VeilidStateNetworkCopyWith<$Res> {
-  __$$_VeilidStateNetworkCopyWithImpl(
-      _$_VeilidStateNetwork _value, $Res Function(_$_VeilidStateNetwork) _then)
+class __$$VeilidStateNetworkImplCopyWithImpl<$Res>
+    extends _$VeilidStateNetworkCopyWithImpl<$Res, _$VeilidStateNetworkImpl>
+    implements _$$VeilidStateNetworkImplCopyWith<$Res> {
+  __$$VeilidStateNetworkImplCopyWithImpl(_$VeilidStateNetworkImpl _value,
+      $Res Function(_$VeilidStateNetworkImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -3821,7 +3956,7 @@ class __$$_VeilidStateNetworkCopyWithImpl<$Res>
     Object? bpsUp = null,
     Object? peers = null,
   }) {
-    return _then(_$_VeilidStateNetwork(
+    return _then(_$VeilidStateNetworkImpl(
       started: null == started
           ? _value.started
           : started // ignore: cast_nullable_to_non_nullable
@@ -3844,16 +3979,16 @@ class __$$_VeilidStateNetworkCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidStateNetwork implements _VeilidStateNetwork {
-  const _$_VeilidStateNetwork(
+class _$VeilidStateNetworkImpl implements _VeilidStateNetwork {
+  const _$VeilidStateNetworkImpl(
       {required this.started,
       required this.bpsDown,
       required this.bpsUp,
       required final List<PeerTableData> peers})
       : _peers = peers;
 
-  factory _$_VeilidStateNetwork.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidStateNetworkFromJson(json);
+  factory _$VeilidStateNetworkImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidStateNetworkImplFromJson(json);
 
   @override
   final bool started;
@@ -3875,10 +4010,10 @@ class _$_VeilidStateNetwork implements _VeilidStateNetwork {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidStateNetwork &&
+            other is _$VeilidStateNetworkImpl &&
             (identical(other.started, started) || other.started == started) &&
             (identical(other.bpsDown, bpsDown) || other.bpsDown == bpsDown) &&
             (identical(other.bpsUp, bpsUp) || other.bpsUp == bpsUp) &&
@@ -3893,13 +4028,13 @@ class _$_VeilidStateNetwork implements _VeilidStateNetwork {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidStateNetworkCopyWith<_$_VeilidStateNetwork> get copyWith =>
-      __$$_VeilidStateNetworkCopyWithImpl<_$_VeilidStateNetwork>(
+  _$$VeilidStateNetworkImplCopyWith<_$VeilidStateNetworkImpl> get copyWith =>
+      __$$VeilidStateNetworkImplCopyWithImpl<_$VeilidStateNetworkImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidStateNetworkToJson(
+    return _$$VeilidStateNetworkImplToJson(
       this,
     );
   }
@@ -3910,10 +4045,10 @@ abstract class _VeilidStateNetwork implements VeilidStateNetwork {
       {required final bool started,
       required final BigInt bpsDown,
       required final BigInt bpsUp,
-      required final List<PeerTableData> peers}) = _$_VeilidStateNetwork;
+      required final List<PeerTableData> peers}) = _$VeilidStateNetworkImpl;
 
   factory _VeilidStateNetwork.fromJson(Map<String, dynamic> json) =
-      _$_VeilidStateNetwork.fromJson;
+      _$VeilidStateNetworkImpl.fromJson;
 
   @override
   bool get started;
@@ -3925,7 +4060,7 @@ abstract class _VeilidStateNetwork implements VeilidStateNetwork {
   List<PeerTableData> get peers;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidStateNetworkCopyWith<_$_VeilidStateNetwork> get copyWith =>
+  _$$VeilidStateNetworkImplCopyWith<_$VeilidStateNetworkImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -3987,11 +4122,11 @@ class _$VeilidStateConfigCopyWithImpl<$Res, $Val extends VeilidStateConfig>
 }
 
 /// @nodoc
-abstract class _$$_VeilidStateConfigCopyWith<$Res>
+abstract class _$$VeilidStateConfigImplCopyWith<$Res>
     implements $VeilidStateConfigCopyWith<$Res> {
-  factory _$$_VeilidStateConfigCopyWith(_$_VeilidStateConfig value,
-          $Res Function(_$_VeilidStateConfig) then) =
-      __$$_VeilidStateConfigCopyWithImpl<$Res>;
+  factory _$$VeilidStateConfigImplCopyWith(_$VeilidStateConfigImpl value,
+          $Res Function(_$VeilidStateConfigImpl) then) =
+      __$$VeilidStateConfigImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({VeilidConfig config});
@@ -4001,11 +4136,11 @@ abstract class _$$_VeilidStateConfigCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidStateConfigCopyWithImpl<$Res>
-    extends _$VeilidStateConfigCopyWithImpl<$Res, _$_VeilidStateConfig>
-    implements _$$_VeilidStateConfigCopyWith<$Res> {
-  __$$_VeilidStateConfigCopyWithImpl(
-      _$_VeilidStateConfig _value, $Res Function(_$_VeilidStateConfig) _then)
+class __$$VeilidStateConfigImplCopyWithImpl<$Res>
+    extends _$VeilidStateConfigCopyWithImpl<$Res, _$VeilidStateConfigImpl>
+    implements _$$VeilidStateConfigImplCopyWith<$Res> {
+  __$$VeilidStateConfigImplCopyWithImpl(_$VeilidStateConfigImpl _value,
+      $Res Function(_$VeilidStateConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -4013,7 +4148,7 @@ class __$$_VeilidStateConfigCopyWithImpl<$Res>
   $Res call({
     Object? config = null,
   }) {
-    return _then(_$_VeilidStateConfig(
+    return _then(_$VeilidStateConfigImpl(
       config: null == config
           ? _value.config
           : config // ignore: cast_nullable_to_non_nullable
@@ -4024,11 +4159,11 @@ class __$$_VeilidStateConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidStateConfig implements _VeilidStateConfig {
-  const _$_VeilidStateConfig({required this.config});
+class _$VeilidStateConfigImpl implements _VeilidStateConfig {
+  const _$VeilidStateConfigImpl({required this.config});
 
-  factory _$_VeilidStateConfig.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidStateConfigFromJson(json);
+  factory _$VeilidStateConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidStateConfigImplFromJson(json);
 
   @override
   final VeilidConfig config;
@@ -4039,10 +4174,10 @@ class _$_VeilidStateConfig implements _VeilidStateConfig {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidStateConfig &&
+            other is _$VeilidStateConfigImpl &&
             (identical(other.config, config) || other.config == config));
   }
 
@@ -4053,13 +4188,13 @@ class _$_VeilidStateConfig implements _VeilidStateConfig {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidStateConfigCopyWith<_$_VeilidStateConfig> get copyWith =>
-      __$$_VeilidStateConfigCopyWithImpl<_$_VeilidStateConfig>(
+  _$$VeilidStateConfigImplCopyWith<_$VeilidStateConfigImpl> get copyWith =>
+      __$$VeilidStateConfigImplCopyWithImpl<_$VeilidStateConfigImpl>(
           this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidStateConfigToJson(
+    return _$$VeilidStateConfigImplToJson(
       this,
     );
   }
@@ -4067,16 +4202,16 @@ class _$_VeilidStateConfig implements _VeilidStateConfig {
 
 abstract class _VeilidStateConfig implements VeilidStateConfig {
   const factory _VeilidStateConfig({required final VeilidConfig config}) =
-      _$_VeilidStateConfig;
+      _$VeilidStateConfigImpl;
 
   factory _VeilidStateConfig.fromJson(Map<String, dynamic> json) =
-      _$_VeilidStateConfig.fromJson;
+      _$VeilidStateConfigImpl.fromJson;
 
   @override
   VeilidConfig get config;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidStateConfigCopyWith<_$_VeilidStateConfig> get copyWith =>
+  _$$VeilidStateConfigImplCopyWith<_$VeilidStateConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -4171,11 +4306,11 @@ class _$VeilidStateCopyWithImpl<$Res, $Val extends VeilidState>
 }
 
 /// @nodoc
-abstract class _$$_VeilidStateCopyWith<$Res>
+abstract class _$$VeilidStateImplCopyWith<$Res>
     implements $VeilidStateCopyWith<$Res> {
-  factory _$$_VeilidStateCopyWith(
-          _$_VeilidState value, $Res Function(_$_VeilidState) then) =
-      __$$_VeilidStateCopyWithImpl<$Res>;
+  factory _$$VeilidStateImplCopyWith(
+          _$VeilidStateImpl value, $Res Function(_$VeilidStateImpl) then) =
+      __$$VeilidStateImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -4192,11 +4327,11 @@ abstract class _$$_VeilidStateCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_VeilidStateCopyWithImpl<$Res>
-    extends _$VeilidStateCopyWithImpl<$Res, _$_VeilidState>
-    implements _$$_VeilidStateCopyWith<$Res> {
-  __$$_VeilidStateCopyWithImpl(
-      _$_VeilidState _value, $Res Function(_$_VeilidState) _then)
+class __$$VeilidStateImplCopyWithImpl<$Res>
+    extends _$VeilidStateCopyWithImpl<$Res, _$VeilidStateImpl>
+    implements _$$VeilidStateImplCopyWith<$Res> {
+  __$$VeilidStateImplCopyWithImpl(
+      _$VeilidStateImpl _value, $Res Function(_$VeilidStateImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -4206,7 +4341,7 @@ class __$$_VeilidStateCopyWithImpl<$Res>
     Object? network = null,
     Object? config = null,
   }) {
-    return _then(_$_VeilidState(
+    return _then(_$VeilidStateImpl(
       attachment: null == attachment
           ? _value.attachment
           : attachment // ignore: cast_nullable_to_non_nullable
@@ -4225,12 +4360,12 @@ class __$$_VeilidStateCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_VeilidState implements _VeilidState {
-  const _$_VeilidState(
+class _$VeilidStateImpl implements _VeilidState {
+  const _$VeilidStateImpl(
       {required this.attachment, required this.network, required this.config});
 
-  factory _$_VeilidState.fromJson(Map<String, dynamic> json) =>
-      _$$_VeilidStateFromJson(json);
+  factory _$VeilidStateImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VeilidStateImplFromJson(json);
 
   @override
   final VeilidStateAttachment attachment;
@@ -4245,10 +4380,10 @@ class _$_VeilidState implements _VeilidState {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_VeilidState &&
+            other is _$VeilidStateImpl &&
             (identical(other.attachment, attachment) ||
                 other.attachment == attachment) &&
             (identical(other.network, network) || other.network == network) &&
@@ -4262,12 +4397,12 @@ class _$_VeilidState implements _VeilidState {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VeilidStateCopyWith<_$_VeilidState> get copyWith =>
-      __$$_VeilidStateCopyWithImpl<_$_VeilidState>(this, _$identity);
+  _$$VeilidStateImplCopyWith<_$VeilidStateImpl> get copyWith =>
+      __$$VeilidStateImplCopyWithImpl<_$VeilidStateImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VeilidStateToJson(
+    return _$$VeilidStateImplToJson(
       this,
     );
   }
@@ -4277,10 +4412,10 @@ abstract class _VeilidState implements VeilidState {
   const factory _VeilidState(
       {required final VeilidStateAttachment attachment,
       required final VeilidStateNetwork network,
-      required final VeilidStateConfig config}) = _$_VeilidState;
+      required final VeilidStateConfig config}) = _$VeilidStateImpl;
 
   factory _VeilidState.fromJson(Map<String, dynamic> json) =
-      _$_VeilidState.fromJson;
+      _$VeilidStateImpl.fromJson;
 
   @override
   VeilidStateAttachment get attachment;
@@ -4290,6 +4425,6 @@ abstract class _VeilidState implements VeilidState {
   VeilidStateConfig get config;
   @override
   @JsonKey(ignore: true)
-  _$$_VeilidStateCopyWith<_$_VeilidState> get copyWith =>
+  _$$VeilidStateImplCopyWith<_$VeilidStateImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/veilid-flutter/lib/veilid_state.g.dart b/veilid-flutter/lib/veilid_state.g.dart
index 8ed1eb66..4f454466 100644
--- a/veilid-flutter/lib/veilid_state.g.dart
+++ b/veilid-flutter/lib/veilid_state.g.dart
@@ -6,29 +6,29 @@ part of 'veilid_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_LatencyStats _$$_LatencyStatsFromJson(Map<String, dynamic> json) =>
-    _$_LatencyStats(
+_$LatencyStatsImpl _$$LatencyStatsImplFromJson(Map<String, dynamic> json) =>
+    _$LatencyStatsImpl(
       fastest: TimestampDuration.fromJson(json['fastest']),
       average: TimestampDuration.fromJson(json['average']),
       slowest: TimestampDuration.fromJson(json['slowest']),
     );
 
-Map<String, dynamic> _$$_LatencyStatsToJson(_$_LatencyStats instance) =>
+Map<String, dynamic> _$$LatencyStatsImplToJson(_$LatencyStatsImpl instance) =>
     <String, dynamic>{
       'fastest': instance.fastest.toJson(),
       'average': instance.average.toJson(),
       'slowest': instance.slowest.toJson(),
     };
 
-_$_TransferStats _$$_TransferStatsFromJson(Map<String, dynamic> json) =>
-    _$_TransferStats(
+_$TransferStatsImpl _$$TransferStatsImplFromJson(Map<String, dynamic> json) =>
+    _$TransferStatsImpl(
       total: BigInt.parse(json['total'] as String),
       maximum: BigInt.parse(json['maximum'] as String),
       average: BigInt.parse(json['average'] as String),
       minimum: BigInt.parse(json['minimum'] as String),
     );
 
-Map<String, dynamic> _$$_TransferStatsToJson(_$_TransferStats instance) =>
+Map<String, dynamic> _$$TransferStatsImplToJson(_$TransferStatsImpl instance) =>
     <String, dynamic>{
       'total': instance.total.toString(),
       'maximum': instance.maximum.toString(),
@@ -36,21 +36,22 @@ Map<String, dynamic> _$$_TransferStatsToJson(_$_TransferStats instance) =>
       'minimum': instance.minimum.toString(),
     };
 
-_$_TransferStatsDownUp _$$_TransferStatsDownUpFromJson(
+_$TransferStatsDownUpImpl _$$TransferStatsDownUpImplFromJson(
         Map<String, dynamic> json) =>
-    _$_TransferStatsDownUp(
+    _$TransferStatsDownUpImpl(
       down: TransferStats.fromJson(json['down']),
       up: TransferStats.fromJson(json['up']),
     );
 
-Map<String, dynamic> _$$_TransferStatsDownUpToJson(
-        _$_TransferStatsDownUp instance) =>
+Map<String, dynamic> _$$TransferStatsDownUpImplToJson(
+        _$TransferStatsDownUpImpl instance) =>
     <String, dynamic>{
       'down': instance.down.toJson(),
       'up': instance.up.toJson(),
     };
 
-_$_RPCStats _$$_RPCStatsFromJson(Map<String, dynamic> json) => _$_RPCStats(
+_$RPCStatsImpl _$$RPCStatsImplFromJson(Map<String, dynamic> json) =>
+    _$RPCStatsImpl(
       messagesSent: json['messages_sent'] as int,
       messagesRcvd: json['messages_rcvd'] as int,
       questionsInFlight: json['questions_in_flight'] as int,
@@ -67,7 +68,7 @@ _$_RPCStats _$$_RPCStatsFromJson(Map<String, dynamic> json) => _$_RPCStats(
       failedToSend: json['failed_to_send'] as int,
     );
 
-Map<String, dynamic> _$$_RPCStatsToJson(_$_RPCStats instance) =>
+Map<String, dynamic> _$$RPCStatsImplToJson(_$RPCStatsImpl instance) =>
     <String, dynamic>{
       'messages_sent': instance.messagesSent,
       'messages_rcvd': instance.messagesRcvd,
@@ -79,7 +80,8 @@ Map<String, dynamic> _$$_RPCStatsToJson(_$_RPCStats instance) =>
       'failed_to_send': instance.failedToSend,
     };
 
-_$_PeerStats _$$_PeerStatsFromJson(Map<String, dynamic> json) => _$_PeerStats(
+_$PeerStatsImpl _$$PeerStatsImplFromJson(Map<String, dynamic> json) =>
+    _$PeerStatsImpl(
       timeAdded: Timestamp.fromJson(json['time_added']),
       rpcStats: RPCStats.fromJson(json['rpc_stats']),
       transfer: TransferStatsDownUp.fromJson(json['transfer']),
@@ -88,7 +90,7 @@ _$_PeerStats _$$_PeerStatsFromJson(Map<String, dynamic> json) => _$_PeerStats(
           : LatencyStats.fromJson(json['latency']),
     );
 
-Map<String, dynamic> _$$_PeerStatsToJson(_$_PeerStats instance) =>
+Map<String, dynamic> _$$PeerStatsImplToJson(_$PeerStatsImpl instance) =>
     <String, dynamic>{
       'time_added': instance.timeAdded.toJson(),
       'rpc_stats': instance.rpcStats.toJson(),
@@ -96,8 +98,8 @@ Map<String, dynamic> _$$_PeerStatsToJson(_$_PeerStats instance) =>
       'latency': instance.latency?.toJson(),
     };
 
-_$_PeerTableData _$$_PeerTableDataFromJson(Map<String, dynamic> json) =>
-    _$_PeerTableData(
+_$PeerTableDataImpl _$$PeerTableDataImplFromJson(Map<String, dynamic> json) =>
+    _$PeerTableDataImpl(
       nodeIds: (json['node_ids'] as List<dynamic>)
           .map(Typed<FixedEncodedString43>.fromJson)
           .toList(),
@@ -105,21 +107,22 @@ _$_PeerTableData _$$_PeerTableDataFromJson(Map<String, dynamic> json) =>
       peerStats: PeerStats.fromJson(json['peer_stats']),
     );
 
-Map<String, dynamic> _$$_PeerTableDataToJson(_$_PeerTableData instance) =>
+Map<String, dynamic> _$$PeerTableDataImplToJson(_$PeerTableDataImpl instance) =>
     <String, dynamic>{
       'node_ids': instance.nodeIds.map((e) => e.toJson()).toList(),
       'peer_address': instance.peerAddress,
       'peer_stats': instance.peerStats.toJson(),
     };
 
-_$VeilidLog _$$VeilidLogFromJson(Map<String, dynamic> json) => _$VeilidLog(
+_$VeilidLogImpl _$$VeilidLogImplFromJson(Map<String, dynamic> json) =>
+    _$VeilidLogImpl(
       logLevel: VeilidLogLevel.fromJson(json['log_level']),
       message: json['message'] as String,
       backtrace: json['backtrace'] as String?,
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidLogToJson(_$VeilidLog instance) =>
+Map<String, dynamic> _$$VeilidLogImplToJson(_$VeilidLogImpl instance) =>
     <String, dynamic>{
       'log_level': instance.logLevel.toJson(),
       'message': instance.message,
@@ -127,51 +130,61 @@ Map<String, dynamic> _$$VeilidLogToJson(_$VeilidLog instance) =>
       'kind': instance.$type,
     };
 
-_$VeilidAppMessage _$$VeilidAppMessageFromJson(Map<String, dynamic> json) =>
-    _$VeilidAppMessage(
-      message: const Uint8ListJsonConverter().fromJson(json['message']),
+_$VeilidAppMessageImpl _$$VeilidAppMessageImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidAppMessageImpl(
+      message:
+          const Uint8ListJsonConverter.jsIsArray().fromJson(json['message']),
       sender: json['sender'] == null
           ? null
           : Typed<FixedEncodedString43>.fromJson(json['sender']),
+      routeId: json['route_id'] as String?,
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidAppMessageToJson(_$VeilidAppMessage instance) =>
+Map<String, dynamic> _$$VeilidAppMessageImplToJson(
+        _$VeilidAppMessageImpl instance) =>
     <String, dynamic>{
-      'message': const Uint8ListJsonConverter().toJson(instance.message),
+      'message':
+          const Uint8ListJsonConverter.jsIsArray().toJson(instance.message),
       'sender': instance.sender?.toJson(),
+      'route_id': instance.routeId,
       'kind': instance.$type,
     };
 
-_$VeilidAppCall _$$VeilidAppCallFromJson(Map<String, dynamic> json) =>
-    _$VeilidAppCall(
-      message: const Uint8ListJsonConverter().fromJson(json['message']),
+_$VeilidAppCallImpl _$$VeilidAppCallImplFromJson(Map<String, dynamic> json) =>
+    _$VeilidAppCallImpl(
+      message:
+          const Uint8ListJsonConverter.jsIsArray().fromJson(json['message']),
       callId: json['call_id'] as String,
       sender: json['sender'] == null
           ? null
           : Typed<FixedEncodedString43>.fromJson(json['sender']),
+      routeId: json['route_id'] as String?,
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidAppCallToJson(_$VeilidAppCall instance) =>
+Map<String, dynamic> _$$VeilidAppCallImplToJson(_$VeilidAppCallImpl instance) =>
     <String, dynamic>{
-      'message': const Uint8ListJsonConverter().toJson(instance.message),
+      'message':
+          const Uint8ListJsonConverter.jsIsArray().toJson(instance.message),
       'call_id': instance.callId,
       'sender': instance.sender?.toJson(),
+      'route_id': instance.routeId,
       'kind': instance.$type,
     };
 
-_$VeilidUpdateAttachment _$$VeilidUpdateAttachmentFromJson(
+_$VeilidUpdateAttachmentImpl _$$VeilidUpdateAttachmentImplFromJson(
         Map<String, dynamic> json) =>
-    _$VeilidUpdateAttachment(
+    _$VeilidUpdateAttachmentImpl(
       state: AttachmentState.fromJson(json['state']),
       publicInternetReady: json['public_internet_ready'] as bool,
       localNetworkReady: json['local_network_ready'] as bool,
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidUpdateAttachmentToJson(
-        _$VeilidUpdateAttachment instance) =>
+Map<String, dynamic> _$$VeilidUpdateAttachmentImplToJson(
+        _$VeilidUpdateAttachmentImpl instance) =>
     <String, dynamic>{
       'state': instance.state.toJson(),
       'public_internet_ready': instance.publicInternetReady,
@@ -179,9 +192,9 @@ Map<String, dynamic> _$$VeilidUpdateAttachmentToJson(
       'kind': instance.$type,
     };
 
-_$VeilidUpdateNetwork _$$VeilidUpdateNetworkFromJson(
+_$VeilidUpdateNetworkImpl _$$VeilidUpdateNetworkImplFromJson(
         Map<String, dynamic> json) =>
-    _$VeilidUpdateNetwork(
+    _$VeilidUpdateNetworkImpl(
       started: json['started'] as bool,
       bpsDown: BigInt.parse(json['bps_down'] as String),
       bpsUp: BigInt.parse(json['bps_up'] as String),
@@ -190,8 +203,8 @@ _$VeilidUpdateNetwork _$$VeilidUpdateNetworkFromJson(
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidUpdateNetworkToJson(
-        _$VeilidUpdateNetwork instance) =>
+Map<String, dynamic> _$$VeilidUpdateNetworkImplToJson(
+        _$VeilidUpdateNetworkImpl instance) =>
     <String, dynamic>{
       'started': instance.started,
       'bps_down': instance.bpsDown.toString(),
@@ -200,22 +213,23 @@ Map<String, dynamic> _$$VeilidUpdateNetworkToJson(
       'kind': instance.$type,
     };
 
-_$VeilidUpdateConfig _$$VeilidUpdateConfigFromJson(Map<String, dynamic> json) =>
-    _$VeilidUpdateConfig(
+_$VeilidUpdateConfigImpl _$$VeilidUpdateConfigImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidUpdateConfigImpl(
       config: VeilidConfig.fromJson(json['config']),
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidUpdateConfigToJson(
-        _$VeilidUpdateConfig instance) =>
+Map<String, dynamic> _$$VeilidUpdateConfigImplToJson(
+        _$VeilidUpdateConfigImpl instance) =>
     <String, dynamic>{
       'config': instance.config.toJson(),
       'kind': instance.$type,
     };
 
-_$VeilidUpdateRouteChange _$$VeilidUpdateRouteChangeFromJson(
+_$VeilidUpdateRouteChangeImpl _$$VeilidUpdateRouteChangeImplFromJson(
         Map<String, dynamic> json) =>
-    _$VeilidUpdateRouteChange(
+    _$VeilidUpdateRouteChangeImpl(
       deadRoutes: (json['dead_routes'] as List<dynamic>)
           .map((e) => e as String)
           .toList(),
@@ -225,55 +239,55 @@ _$VeilidUpdateRouteChange _$$VeilidUpdateRouteChangeFromJson(
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidUpdateRouteChangeToJson(
-        _$VeilidUpdateRouteChange instance) =>
+Map<String, dynamic> _$$VeilidUpdateRouteChangeImplToJson(
+        _$VeilidUpdateRouteChangeImpl instance) =>
     <String, dynamic>{
       'dead_routes': instance.deadRoutes,
       'dead_remote_routes': instance.deadRemoteRoutes,
       'kind': instance.$type,
     };
 
-_$VeilidUpdateValueChange _$$VeilidUpdateValueChangeFromJson(
+_$VeilidUpdateValueChangeImpl _$$VeilidUpdateValueChangeImplFromJson(
         Map<String, dynamic> json) =>
-    _$VeilidUpdateValueChange(
+    _$VeilidUpdateValueChangeImpl(
       key: Typed<FixedEncodedString43>.fromJson(json['key']),
       subkeys: (json['subkeys'] as List<dynamic>)
           .map(ValueSubkeyRange.fromJson)
           .toList(),
       count: json['count'] as int,
-      valueData: ValueData.fromJson(json['value_data']),
+      value: ValueData.fromJson(json['value']),
       $type: json['kind'] as String?,
     );
 
-Map<String, dynamic> _$$VeilidUpdateValueChangeToJson(
-        _$VeilidUpdateValueChange instance) =>
+Map<String, dynamic> _$$VeilidUpdateValueChangeImplToJson(
+        _$VeilidUpdateValueChangeImpl instance) =>
     <String, dynamic>{
       'key': instance.key.toJson(),
       'subkeys': instance.subkeys.map((e) => e.toJson()).toList(),
       'count': instance.count,
-      'value_data': instance.valueData.toJson(),
+      'value': instance.value.toJson(),
       'kind': instance.$type,
     };
 
-_$_VeilidStateAttachment _$$_VeilidStateAttachmentFromJson(
+_$VeilidStateAttachmentImpl _$$VeilidStateAttachmentImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidStateAttachment(
+    _$VeilidStateAttachmentImpl(
       state: AttachmentState.fromJson(json['state']),
       publicInternetReady: json['public_internet_ready'] as bool,
       localNetworkReady: json['local_network_ready'] as bool,
     );
 
-Map<String, dynamic> _$$_VeilidStateAttachmentToJson(
-        _$_VeilidStateAttachment instance) =>
+Map<String, dynamic> _$$VeilidStateAttachmentImplToJson(
+        _$VeilidStateAttachmentImpl instance) =>
     <String, dynamic>{
       'state': instance.state.toJson(),
       'public_internet_ready': instance.publicInternetReady,
       'local_network_ready': instance.localNetworkReady,
     };
 
-_$_VeilidStateNetwork _$$_VeilidStateNetworkFromJson(
+_$VeilidStateNetworkImpl _$$VeilidStateNetworkImplFromJson(
         Map<String, dynamic> json) =>
-    _$_VeilidStateNetwork(
+    _$VeilidStateNetworkImpl(
       started: json['started'] as bool,
       bpsDown: BigInt.parse(json['bps_down'] as String),
       bpsUp: BigInt.parse(json['bps_up'] as String),
@@ -281,8 +295,8 @@ _$_VeilidStateNetwork _$$_VeilidStateNetworkFromJson(
           (json['peers'] as List<dynamic>).map(PeerTableData.fromJson).toList(),
     );
 
-Map<String, dynamic> _$$_VeilidStateNetworkToJson(
-        _$_VeilidStateNetwork instance) =>
+Map<String, dynamic> _$$VeilidStateNetworkImplToJson(
+        _$VeilidStateNetworkImpl instance) =>
     <String, dynamic>{
       'started': instance.started,
       'bps_down': instance.bpsDown.toString(),
@@ -290,25 +304,26 @@ Map<String, dynamic> _$$_VeilidStateNetworkToJson(
       'peers': instance.peers.map((e) => e.toJson()).toList(),
     };
 
-_$_VeilidStateConfig _$$_VeilidStateConfigFromJson(Map<String, dynamic> json) =>
-    _$_VeilidStateConfig(
+_$VeilidStateConfigImpl _$$VeilidStateConfigImplFromJson(
+        Map<String, dynamic> json) =>
+    _$VeilidStateConfigImpl(
       config: VeilidConfig.fromJson(json['config']),
     );
 
-Map<String, dynamic> _$$_VeilidStateConfigToJson(
-        _$_VeilidStateConfig instance) =>
+Map<String, dynamic> _$$VeilidStateConfigImplToJson(
+        _$VeilidStateConfigImpl instance) =>
     <String, dynamic>{
       'config': instance.config.toJson(),
     };
 
-_$_VeilidState _$$_VeilidStateFromJson(Map<String, dynamic> json) =>
-    _$_VeilidState(
+_$VeilidStateImpl _$$VeilidStateImplFromJson(Map<String, dynamic> json) =>
+    _$VeilidStateImpl(
       attachment: VeilidStateAttachment.fromJson(json['attachment']),
       network: VeilidStateNetwork.fromJson(json['network']),
       config: VeilidStateConfig.fromJson(json['config']),
     );
 
-Map<String, dynamic> _$$_VeilidStateToJson(_$_VeilidState instance) =>
+Map<String, dynamic> _$$VeilidStateImplToJson(_$VeilidStateImpl instance) =>
     <String, dynamic>{
       'attachment': instance.attachment.toJson(),
       'network': instance.network.toJson(),
diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml
index 203eb242..d4a9be75 100644
--- a/veilid-flutter/pubspec.yaml
+++ b/veilid-flutter/pubspec.yaml
@@ -8,30 +8,30 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
-  flutter: '>=3.10.6'
+  flutter: '>=3.19.1'
   
 dependencies:
-  change_case: ^1.0.1
+  change_case: ^2.0.1
   charcode: ^1.3.1
   equatable: ^2.0.5
-  ffi: ^2.0.0
+  ffi: ^2.1.2
   fixnum: ^1.1.0
   flutter:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  freezed_annotation: ^2.2.0
+  freezed_annotation: ^2.4.1
   json_annotation: ^4.8.1
-  path: ^1.8.0
-  path_provider: ^2.0.9
-  system_info2: ^3.0.2
+  path: ^1.9.0
+  path_provider: ^2.1.2
+  system_info2: ^4.0.0
   system_info_plus: ^0.0.5
   
 dev_dependencies:
-  build_runner: ^2.4.6
+  build_runner: ^2.4.8
   flutter_test:
     sdk: flutter
-  freezed: ^2.3.5
+  freezed: ^2.4.7
   json_serializable: ^6.7.1
   lint_hard: ^4.0.0
 
diff --git a/veilid-flutter/run_integration_tests.sh b/veilid-flutter/run_integration_tests.sh
new file mode 100755
index 00000000..9c5b882c
--- /dev/null
+++ b/veilid-flutter/run_integration_tests.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+pushd example 2>/dev/null
+flutter test -r expanded integration_test/app_test.dart $@
+popd 2>/dev/null
diff --git a/veilid-flutter/run_integration_tests_web.sh b/veilid-flutter/run_integration_tests_web.sh
new file mode 100755
index 00000000..c74f9fdf
--- /dev/null
+++ b/veilid-flutter/run_integration_tests_web.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+echo Ensure chromedriver is running on port 4444 and you have compiled veilid-wasm with wasm_build.sh
+pushd example 2>/dev/null
+flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart -d chrome $@
+popd 2>/dev/null
diff --git a/veilid-flutter/run_unit_tests.sh b/veilid-flutter/run_unit_tests.sh
new file mode 100755
index 00000000..388715e2
--- /dev/null
+++ b/veilid-flutter/run_unit_tests.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+flutter test -r expanded $@
diff --git a/veilid-flutter/rust/src/dart_ffi.rs b/veilid-flutter/rust/src/dart_ffi.rs
index 350ec2f2..a6541d4e 100644
--- a/veilid-flutter/rust/src/dart_ffi.rs
+++ b/veilid-flutter/rust/src/dart_ffi.rs
@@ -9,12 +9,12 @@ use opentelemetry::*;
 use opentelemetry_otlp::WithExportConfig;
 use parking_lot::Mutex;
 use serde::*;
+use std::io::Write;
 use std::os::raw::c_char;
 use std::sync::Arc;
 use tracing::*;
 use tracing_subscriber::prelude::*;
-use veilid_core::tools::*;
-use veilid_core::Encodable as _;
+use veilid_core::{tools::*, Encodable};
 
 // Detect flutter load/unload
 cfg_if! {
@@ -99,6 +99,7 @@ const APIRESULT_VOID: APIResult<()> = APIResult::Ok(());
 pub struct VeilidFFIConfigLoggingTerminal {
     pub enabled: bool,
     pub level: veilid_core::VeilidConfigLogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -107,12 +108,14 @@ pub struct VeilidFFIConfigLoggingOtlp {
     pub level: veilid_core::VeilidConfigLogLevel,
     pub grpc_endpoint: String,
     pub service_name: String,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct VeilidFFIConfigLoggingApi {
     pub enabled: bool,
     pub level: veilid_core::VeilidConfigLogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -138,38 +141,58 @@ pub struct VeilidFFIRouteBlob {
 // Initializer
 #[no_mangle]
 #[instrument]
-pub extern "C" fn initialize_veilid_flutter(dart_post_c_object_ptr: ffi::DartPostCObjectFnType) {
+pub extern "C" fn initialize_veilid_flutter(
+    dart_post_c_object_ptr: ffi::DartPostCObjectFnType,
+    crash_path: FfiStr,
+) {
     unsafe {
         store_dart_post_cobject(dart_post_c_object_ptr);
     }
+    let crash_path = crash_path.into_opt_string().unwrap_or_default();
 
     use std::sync::Once;
     static INIT_BACKTRACE: Once = Once::new();
     INIT_BACKTRACE.call_once(move || {
         std::env::set_var("RUST_BACKTRACE", "1");
         std::panic::set_hook(Box::new(move |panic_info| {
+            let crash_file = if crash_path.is_empty() {
+                None
+            } else {
+                Some(std::fs::File::create(&crash_path).unwrap())
+            };
+
             let (file, line) = if let Some(loc) = panic_info.location() {
                 (loc.file(), loc.line())
             } else {
                 ("<unknown>", 0)
             };
-            error!("### Rust `panic!` hit at file '{}', line {}", file, line);
+
+            let mut out = String::new();
+
+            out += &format!("### Rust `panic!` hit at file '{}', line {}\n", file, line);
             if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
-                error!("panic payload: {:?}", s);
+                out += &format!("panic payload: {:?}\n", s);
             } else if let Some(s) = panic_info.payload().downcast_ref::<String>() {
-                error!("panic payload: {:?}", s);
+                out += &format!("panic payload: {:?}\n", s);
             } else if let Some(a) = panic_info.payload().downcast_ref::<std::fmt::Arguments>() {
-                error!("panic payload: {:?}", a);
+                out += &format!("panic payload: {:?}\n", a);
             } else {
-                error!("no panic payload");
+                out += "no panic payload\n";
             }
-            error!(
+            out += &format!(
                 "  Complete stack trace:\n{:?}\n",
                 backtrace::Backtrace::new()
             );
 
+            if let Some(mut crash_file) = crash_file {
+                write!(crash_file, "{}", out).unwrap();
+                crash_file.flush().unwrap();
+            } else {
+                eprintln!("{}", out);
+            }
+
             // And stop the process, no recovery is going to be possible here
-            error!("aborting!");
+            eprintln!("aborting!");
             std::process::abort();
         }));
     });
@@ -205,7 +228,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
         cfg_if! {
             if #[cfg(target_os = "android")] {
                 let filter =
-                    veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, None);
+                    veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets);
                 let layer = paranoid_android::layer("veilid-flutter")
                     .with_ansi(false)
                     .with_filter(filter.clone());
@@ -213,7 +236,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
                 layers.push(layer.boxed());
             } else {
                 let filter =
-                    veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, None);
+                    veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets);
                 let layer = tracing_subscriber::fmt::Layer::new()
                     .compact()
                     .with_writer(std::io::stdout)
@@ -263,7 +286,10 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
                 .map_err(|e| format!("failed to install OpenTelemetry tracer: {}", e))
                 .unwrap();
 
-        let filter = veilid_core::VeilidLayerFilter::new(platform_config.logging.otlp.level, None);
+        let filter = veilid_core::VeilidLayerFilter::new(
+            platform_config.logging.otlp.level,
+            &platform_config.logging.otlp.ignore_log_targets,
+        );
         let layer = tracing_opentelemetry::layer()
             .with_tracer(tracer)
             .with_filter(filter.clone());
@@ -273,7 +299,10 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) {
 
     // API logger
     if platform_config.logging.api.enabled {
-        let filter = veilid_core::VeilidLayerFilter::new(platform_config.logging.api.level, None);
+        let filter = veilid_core::VeilidLayerFilter::new(
+            platform_config.logging.api.level,
+            &platform_config.logging.api.ignore_log_targets,
+        );
         let layer = veilid_core::ApiTracingLayer::get().with_filter(filter.clone());
         filters.insert("api", filter);
         layers.push(layer.boxed());
@@ -312,6 +341,52 @@ pub extern "C" fn change_log_level(layer: FfiStr, log_level: FfiStr) {
     }
 }
 
+fn apply_ignore_change(ignore_list: Vec<String>, target_change: String) -> Vec<String> {
+    let mut ignore_list = ignore_list.clone();
+
+    for change in target_change.split(',').map(|c| c.trim().to_owned()) {
+        if change.is_empty() {
+            continue;
+        }
+        if let Some(target) = change.strip_prefix('-') {
+            ignore_list.retain(|x| x != target);
+        } else if !ignore_list.contains(&change) {
+            ignore_list.push(change.to_string());
+        }
+    }
+
+    ignore_list
+}
+
+#[no_mangle]
+pub extern "C" fn change_log_ignore(layer: FfiStr, log_ignore: FfiStr) {
+    // get layer to change level on
+    let layer = layer.into_opt_string().unwrap_or("all".to_owned());
+    let layer = if layer == "all" { "".to_owned() } else { layer };
+
+    // get changes to make
+    let log_ignore = log_ignore.into_opt_string().unwrap_or_default();
+
+    // change log level on appropriate layer
+    let filters = (*FILTERS).lock();
+    if layer.is_empty() {
+        // Change all layers
+        for f in filters.values() {
+            f.set_ignore_list(Some(apply_ignore_change(
+                f.ignore_list(),
+                log_ignore.clone(),
+            )));
+        }
+    } else {
+        // Change a specific layer
+        let f = filters.get(layer.as_str()).unwrap();
+        f.set_ignore_list(Some(apply_ignore_change(
+            f.ignore_list(),
+            log_ignore.clone(),
+        )));
+    }
+}
+
 #[no_mangle]
 #[instrument]
 pub extern "C" fn startup_veilid_core(port: i64, stream_port: i64, config: FfiStr) {
@@ -466,20 +541,20 @@ pub extern "C" fn routing_context_with_sequencing(id: u32, sequencing: FfiStr) -
     add_routing_context(&mut rc, routing_context)
 }
 
+fn get_routing_context(id: u32, func_name: &str) -> APIResult<veilid_core::RoutingContext> {
+    let rc = ROUTING_CONTEXTS.lock();
+    let Some(routing_context) = rc.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(routing_context.clone())
+}
+
 #[no_mangle]
 pub extern "C" fn routing_context_safety(port: i64, id: u32) {
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_app_call",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_safety")?;
         APIResult::Ok(routing_context.safety())
     });
 }
@@ -490,17 +565,8 @@ pub extern "C" fn routing_context_app_call(port: i64, id: u32, target: FfiStr, r
         .decode(request.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_app_call",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_app_call")?;
+
         let veilid_api = get_veilid_api().await?;
         let target = veilid_api.parse_as_target(target_string).await?;
         let answer = routing_context.app_call(target, request).await?;
@@ -516,17 +582,7 @@ pub extern "C" fn routing_context_app_message(port: i64, id: u32, target: FfiStr
         .decode(message.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_app_message",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_app_message")?;
 
         let veilid_api = get_veilid_api().await?;
         let target = veilid_api.parse_as_target(target_string).await?;
@@ -546,17 +602,7 @@ pub extern "C" fn routing_context_create_dht_record(port: i64, id: u32, schema:
         veilid_core::deserialize_opt_json(schema.into_opt_string()).unwrap();
 
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_create_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_create_dht_record")?;
 
         let dht_record_descriptor = routing_context
             .create_dht_record(schema, crypto_kind)
@@ -573,17 +619,8 @@ pub extern "C" fn routing_context_open_dht_record(port: i64, id: u32, key: FfiSt
         .into_opt_string()
         .map(|s| veilid_core::deserialize_json(&s).unwrap());
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_open_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_open_dht_record")?;
+
         let dht_record_descriptor = routing_context.open_dht_record(key, writer).await?;
         APIResult::Ok(dht_record_descriptor)
     });
@@ -594,17 +631,8 @@ pub extern "C" fn routing_context_close_dht_record(port: i64, id: u32, key: FfiS
     let key: veilid_core::TypedKey =
         veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_close_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_close_dht_record")?;
+
         routing_context.close_dht_record(key).await?;
         APIRESULT_VOID
     });
@@ -615,17 +643,8 @@ pub extern "C" fn routing_context_delete_dht_record(port: i64, id: u32, key: Ffi
     let key: veilid_core::TypedKey =
         veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_delete_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_delete_dht_record")?;
+
         routing_context.delete_dht_record(key).await?;
         APIRESULT_VOID
     });
@@ -642,17 +661,8 @@ pub extern "C" fn routing_context_get_dht_value(
     let key: veilid_core::TypedKey =
         veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_get_dht_value",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_get_dht_value")?;
+
         let res = routing_context
             .get_dht_value(key, subkey, force_refresh)
             .await?;
@@ -667,26 +677,23 @@ pub extern "C" fn routing_context_set_dht_value(
     key: FfiStr,
     subkey: u32,
     data: FfiStr,
+    writer: FfiStr,
 ) {
     let key: veilid_core::TypedKey =
         veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
     let data: Vec<u8> = data_encoding::BASE64URL_NOPAD
         .decode(data.into_opt_string().unwrap().as_bytes())
         .unwrap();
+    let writer: Option<veilid_core::KeyPair> = writer
+        .into_opt_string()
+        .map(|s| veilid_core::deserialize_json(&s).unwrap());
 
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_set_dht_value",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
-        let res = routing_context.set_dht_value(key, subkey, data).await?;
+        let routing_context = get_routing_context(id, "routing_context_set_dht_value")?;
+
+        let res = routing_context
+            .set_dht_value(key, subkey, data, writer)
+            .await?;
         APIResult::Ok(res)
     });
 }
@@ -707,17 +714,8 @@ pub extern "C" fn routing_context_watch_dht_values(
     let expiration = veilid_core::Timestamp::from(expiration);
 
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_watch_dht_values",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_watch_dht_values")?;
+
         let res = routing_context
             .watch_dht_values(key, subkeys, expiration, count)
             .await?;
@@ -738,22 +736,38 @@ pub extern "C" fn routing_context_cancel_dht_watch(
         veilid_core::deserialize_opt_json(subkeys.into_opt_string()).unwrap();
 
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let routing_context = {
-            let rc = ROUTING_CONTEXTS.lock();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_set_dht_value",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_cancel_dht_watch")?;
+
         let res = routing_context.cancel_dht_watch(key, subkeys).await?;
         APIResult::Ok(res)
     });
 }
 
+#[no_mangle]
+pub extern "C" fn routing_context_inspect_dht_record(
+    port: i64,
+    id: u32,
+    key: FfiStr,
+    subkeys: FfiStr,
+    scope: FfiStr,
+) {
+    let key: veilid_core::TypedKey =
+        veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
+    let subkeys: veilid_core::ValueSubkeyRangeSet =
+        veilid_core::deserialize_opt_json(subkeys.into_opt_string()).unwrap();
+    let scope: veilid_core::DHTReportScope =
+        veilid_core::deserialize_opt_json(scope.into_opt_string()).unwrap();
+
+    DartIsolateWrapper::new(port).spawn_result_json(async move {
+        let routing_context = get_routing_context(id, "routing_context_inspect_dht_record")?;
+
+        let res = routing_context
+            .inspect_dht_record(key, subkeys, scope)
+            .await?;
+        APIResult::Ok(res)
+    });
+}
+
 #[no_mangle]
 pub extern "C" fn new_private_route(port: i64) {
     DartIsolateWrapper::new(port).spawn_result_json(async move {
@@ -790,25 +804,20 @@ pub extern "C" fn new_custom_private_route(port: i64, stability: FfiStr, sequenc
 #[no_mangle]
 pub extern "C" fn import_remote_private_route(port: i64, blob: FfiStr) {
     let blob: Vec<u8> = data_encoding::BASE64URL_NOPAD
-        .decode(
-            veilid_core::deserialize_opt_json::<String>(blob.into_opt_string())
-                .unwrap()
-                .as_bytes(),
-        )
+        .decode(blob.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
         let veilid_api = get_veilid_api().await?;
 
-        let route_id = veilid_api.import_remote_private_route(blob)?;
+        let route_id = veilid_api.import_remote_private_route(blob)?.encode();
 
-        APIResult::Ok(route_id.encode())
+        APIResult::Ok(route_id)
     });
 }
 
 #[no_mangle]
 pub extern "C" fn release_private_route(port: i64, route_id: FfiStr) {
-    let route_id: veilid_core::RouteId =
-        veilid_core::deserialize_opt_json(route_id.into_opt_string()).unwrap();
+    let route_id = veilid_core::RouteId::try_decode(route_id.into_string()).unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
         let veilid_api = get_veilid_api().await?;
         veilid_api.release_private_route(route_id)?;
@@ -819,7 +828,10 @@ pub extern "C" fn release_private_route(port: i64, route_id: FfiStr) {
 #[no_mangle]
 pub extern "C" fn app_call_reply(port: i64, call_id: FfiStr, message: FfiStr) {
     let call_id = call_id.into_opt_string().unwrap_or_default();
-    let message = message.into_opt_string().unwrap_or_default();
+    let message = data_encoding::BASE64URL_NOPAD
+        .decode(message.into_opt_string().unwrap().as_bytes())
+        .unwrap();
+
     DartIsolateWrapper::new(port).spawn_result(async move {
         let call_id = match call_id.parse() {
             Ok(v) => v,
@@ -829,9 +841,7 @@ pub extern "C" fn app_call_reply(port: i64, call_id: FfiStr, message: FfiStr) {
                 ))
             }
         };
-        let message = data_encoding::BASE64URL_NOPAD
-            .decode(message.as_bytes())
-            .map_err(|e| veilid_core::VeilidAPIError::invalid_argument(e, "message", message))?;
+
         let veilid_api = get_veilid_api().await?;
         veilid_api.app_call_reply(call_id, message).await?;
         APIRESULT_VOID
@@ -898,20 +908,20 @@ pub extern "C" fn table_db_get_column_count(id: u32) -> u32 {
     cc
 }
 
+fn get_table_db(id: u32, func_name: &str) -> APIResult<veilid_core::TableDB> {
+    let table_dbs = TABLE_DBS.lock();
+    let Some(table_db) = table_dbs.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(table_db.clone())
+}
+
 #[no_mangle]
 pub extern "C" fn table_db_get_keys(port: i64, id: u32, col: u32) {
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let table_db = {
-            let table_dbs = TABLE_DBS.lock();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_get_keys",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_get_keys")?;
 
         let keys = table_db.get_keys(col).await?;
         let out: Vec<String> = keys
@@ -952,20 +962,23 @@ pub extern "C" fn release_table_db_transaction(id: u32) -> i32 {
     1
 }
 
+fn get_table_db_transaction(
+    id: u32,
+    func_name: &str,
+) -> APIResult<veilid_core::TableDBTransaction> {
+    let tdbts = TABLE_DB_TRANSACTIONS.lock();
+    let Some(tdbt) = tdbts.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(tdbt.clone())
+}
+
 #[no_mangle]
 pub extern "C" fn table_db_transaction_commit(port: i64, id: u32) {
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let tdbt = {
-            let tdbts = TABLE_DB_TRANSACTIONS.lock();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_commit",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_commit")?;
 
         tdbt.commit().await?;
         APIRESULT_VOID
@@ -974,17 +987,7 @@ pub extern "C" fn table_db_transaction_commit(port: i64, id: u32) {
 #[no_mangle]
 pub extern "C" fn table_db_transaction_rollback(port: i64, id: u32) {
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let tdbt = {
-            let tdbts = TABLE_DB_TRANSACTIONS.lock();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_rollback",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_rollback")?;
 
         tdbt.rollback();
         APIRESULT_VOID
@@ -1006,17 +1009,7 @@ pub extern "C" fn table_db_transaction_store(
         .decode(value.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let tdbt = {
-            let tdbts = TABLE_DB_TRANSACTIONS.lock();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_store",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_store")?;
 
         tdbt.store(col, &key, &value)?;
         APIRESULT_VOID
@@ -1029,17 +1022,7 @@ pub extern "C" fn table_db_transaction_delete(port: i64, id: u32, col: u32, key:
         .decode(key.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let tdbt = {
-            let tdbts = TABLE_DB_TRANSACTIONS.lock();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_delete",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_delete")?;
 
         tdbt.delete(col, &key)?;
         APIRESULT_VOID
@@ -1055,17 +1038,7 @@ pub extern "C" fn table_db_store(port: i64, id: u32, col: u32, key: FfiStr, valu
         .decode(value.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let table_db = {
-            let table_dbs = TABLE_DBS.lock();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_store",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_store")?;
 
         table_db.store(col, &key, &value).await?;
         APIRESULT_VOID
@@ -1078,17 +1051,7 @@ pub extern "C" fn table_db_load(port: i64, id: u32, col: u32, key: FfiStr) {
         .decode(key.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let table_db = {
-            let table_dbs = TABLE_DBS.lock();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_load",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_load")?;
 
         let out = table_db.load(col, &key).await?;
         let out = out.map(|x| data_encoding::BASE64URL_NOPAD.encode(&x));
@@ -1102,17 +1065,7 @@ pub extern "C" fn table_db_delete(port: i64, id: u32, col: u32, key: FfiStr) {
         .decode(key.into_opt_string().unwrap().as_bytes())
         .unwrap();
     DartIsolateWrapper::new(port).spawn_result(async move {
-        let table_db = {
-            let table_dbs = TABLE_DBS.lock();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_delete",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_delete")?;
 
         let out = table_db.delete(col, &key).await?;
         let out = out.map(|x| data_encoding::BASE64URL_NOPAD.encode(&x));
@@ -1233,6 +1186,39 @@ pub extern "C" fn crypto_compute_dh(port: i64, kind: u32, key: FfiStr, secret: F
     });
 }
 
+#[no_mangle]
+pub extern "C" fn crypto_generate_shared_secret(
+    port: i64,
+    kind: u32,
+    key: FfiStr,
+    secret: FfiStr,
+    domain: FfiStr,
+) {
+    let kind: veilid_core::CryptoKind = veilid_core::FourCC::from(kind);
+
+    let key: veilid_core::PublicKey =
+        veilid_core::deserialize_opt_json(key.into_opt_string()).unwrap();
+    let secret: veilid_core::SecretKey =
+        veilid_core::deserialize_opt_json(secret.into_opt_string()).unwrap();
+    let domain: Vec<u8> = data_encoding::BASE64URL_NOPAD
+        .decode(domain.into_opt_string().unwrap().as_bytes())
+        .unwrap();
+
+    DartIsolateWrapper::new(port).spawn_result_json(async move {
+        let veilid_api = get_veilid_api().await?;
+        let crypto = veilid_api.crypto()?;
+        let csv = crypto.get(kind).ok_or_else(|| {
+            veilid_core::VeilidAPIError::invalid_argument(
+                "crypto_generate_shared_secret",
+                "kind",
+                kind.to_string(),
+            )
+        })?;
+        let out = csv.generate_shared_secret(&key, &secret, &domain)?;
+        APIResult::Ok(out)
+    });
+}
+
 #[no_mangle]
 pub extern "C" fn crypto_random_bytes(port: i64, kind: u32, len: u32) {
     let kind: veilid_core::CryptoKind = veilid_core::FourCC::from(kind);
@@ -1750,3 +1736,8 @@ pub extern "C" fn veilid_version() -> VeilidVersion {
         patch,
     }
 }
+
+#[no_mangle]
+pub extern "C" fn default_veilid_config() -> *mut c_char {
+    veilid_core::default_veilid_config().into_ffi_value()
+}
diff --git a/veilid-flutter/test/test_value_subkey_range.dart b/veilid-flutter/test/test_value_subkey_range.dart
new file mode 100644
index 00000000..84c6aaf5
--- /dev/null
+++ b/veilid-flutter/test/test_value_subkey_range.dart
@@ -0,0 +1,69 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:veilid/value_subkey_range.dart';
+
+void expectCommute<T>(T? Function(T, T) func, T a, T b, T? c) {
+  expect(func(a, b), c);
+  expect(func(b, a), c);
+}
+
+ValueSubkeyRange? vsrUnion(ValueSubkeyRange a, ValueSubkeyRange b) =>
+    a.union(b);
+
+ValueSubkeyRange? vsrIntersect(ValueSubkeyRange a, ValueSubkeyRange b) =>
+    a.intersect(b);
+
+List<ValueSubkeyRange> lvsrUnion(
+        List<ValueSubkeyRange> a, List<ValueSubkeyRange> b) =>
+    a.unionSubkeys(b);
+
+List<ValueSubkeyRange> lvsrIntersect(
+        List<ValueSubkeyRange> a, List<ValueSubkeyRange> b) =>
+    a.intersectSubkeys(b);
+
+Future<void> testValueSubkeyRange() async {
+  final a = ValueSubkeyRange.single(1);
+  const b = ValueSubkeyRange(low: 2, high: 3);
+  const c = ValueSubkeyRange(low: 3, high: 4);
+
+  expectCommute(vsrUnion, a, a, a);
+  expectCommute(vsrUnion, a, b, const ValueSubkeyRange(low: 1, high: 3));
+  expectCommute<ValueSubkeyRange>(vsrUnion, a, c, null);
+  expectCommute(vsrUnion, b, c, const ValueSubkeyRange(low: 2, high: 4));
+
+  const d = ValueSubkeyRange(low: 0, high: 3);
+
+  expectCommute<ValueSubkeyRange>(vsrIntersect, a, b, null);
+  expectCommute(vsrIntersect, c, d, ValueSubkeyRange.single(3));
+  expectCommute(vsrIntersect, d, d, d);
+}
+
+Future<void> testValueSubkeyRangeList() async {
+  final a = [ValueSubkeyRange.single(1)];
+  final b = [ValueSubkeyRange.fromIntPair((2, 3))];
+  final c = [ValueSubkeyRange.make(3, 4)];
+
+  expectCommute(lvsrUnion, a, a, a);
+  expectCommute(lvsrUnion, a, b, [const ValueSubkeyRange(low: 1, high: 3)]);
+  expectCommute<List<ValueSubkeyRange>>(
+      lvsrUnion, a, c, ListValueSubkeyRangeExt.fromIntPairs([(1, 1), (3, 4)]));
+  expectCommute(lvsrUnion, b, c, [const ValueSubkeyRange(low: 2, high: 4)]);
+
+  const d = [ValueSubkeyRange(low: 0, high: 3)];
+
+  expectCommute(lvsrIntersect, a, b, <ValueSubkeyRange>[]);
+  expectCommute(lvsrIntersect, c, d, [ValueSubkeyRange.single(3)]);
+  expectCommute(lvsrIntersect, d, d, d);
+
+  final e = ListValueSubkeyRangeExt.fromIntPairs([(1, 5), (10, 14), (16, 18)]);
+  final f = ListValueSubkeyRangeExt.fromIntPairs([(2, 6), (8, 10), (12, 20)]);
+  final g = ListValueSubkeyRangeExt.fromIntPairs([(1, 6), (8, 20)]);
+
+  expectCommute(lvsrUnion, e, f, g);
+
+  final h = ListValueSubkeyRangeExt.fromIntPairs(
+      [(2, 5), (10, 10), (12, 14), (16, 18)]);
+  expectCommute(lvsrIntersect, e, f, h);
+
+  expectCommute<List<ValueSubkeyRange>>(lvsrUnion, [], [], []);
+  expectCommute<List<ValueSubkeyRange>>(lvsrIntersect, [], [], []);
+}
diff --git a/veilid-flutter/test/veilid_test.dart b/veilid-flutter/test/veilid_test.dart
index b0100283..15e380ba 100644
--- a/veilid-flutter/test/veilid_test.dart
+++ b/veilid-flutter/test/veilid_test.dart
@@ -1,14 +1,21 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'test_encoding.dart';
+import 'test_value_subkey_range.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {});
-
   tearDown(() {});
 
-  test('testEncodingKnownVectors', testEncodingKnownVectors);
-  test('testEncodeDecodeGarbage', testEncodeDecodeGarbage);
-  test('testEncodeDecodeGarbagePad', testEncodeDecodeGarbagePad);
+  group('encoding', () {
+    test('test encoding known vectors', testEncodingKnownVectors);
+    test('test encode/decode garbage', testEncodeDecodeGarbage);
+    test('test encode/decode garbage with pad', testEncodeDecodeGarbagePad);
+  });
+
+  group('ValueSubkeyRange', () {
+    test('test ValueSubkeyRange', testValueSubkeyRange);
+    test('test List<ValueSubkeyRange>', testValueSubkeyRangeList);
+  });
 }
diff --git a/veilid-python/.gitignore b/veilid-python/.gitignore
index 4b069ebc..7b0b9462 100644
--- a/veilid-python/.gitignore
+++ b/veilid-python/.gitignore
@@ -158,3 +158,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
diff --git a/veilid-python/tests/api.py b/veilid-python/tests/api.py
index d3ad9a57..3bb86f33 100644
--- a/veilid-python/tests/api.py
+++ b/veilid-python/tests/api.py
@@ -57,7 +57,7 @@ def ipc_info() -> str:
 
     # hack to deal with rust's 'directories' crate case-inconsistency
     if sys.platform.startswith('darwin'):
-        data_dir = appdirs.user_data_dir("Veilid","Veilid")
+        data_dir = appdirs.user_data_dir("org.Veilid.Veilid")
     else:
         data_dir = appdirs.user_data_dir("veilid","veilid")
     ipc_0_path = os.path.join(data_dir, "ipc", "0")
diff --git a/veilid-python/tests/test_basic.py b/veilid-python/tests/test_basic.py
index 395d0a90..7daafc64 100644
--- a/veilid-python/tests/test_basic.py
+++ b/veilid-python/tests/test_basic.py
@@ -1,6 +1,8 @@
 # Basic veilid tests
 
 import socket
+import json
+import dataclasses
 
 import pytest
 import veilid
@@ -40,3 +42,19 @@ async def test_version(api_connection: veilid.VeilidAPI):
 
     vstr = await api_connection.veilid_version_string()
     print(f"veilid_version_string: {vstr}")
+
+
+@pytest.mark.asyncio
+async def test_config(api_connection: veilid.VeilidAPI):
+    cfgstr = await api_connection.default_veilid_config()
+    print(f"default_veilid_config:\n{cfgstr}")
+    cfgjson = json.loads(cfgstr)
+    
+    veilidConfigInstance = veilid.VeilidConfig(**cfgjson)
+    cfgstr2 = json.dumps(dataclasses.asdict(veilidConfigInstance))
+    
+    cfgjson2 = json.loads(cfgstr2)
+    veilidConfigInstance2 = veilid.VeilidConfig(**cfgjson2)
+    
+    assert veilidConfigInstance == veilidConfigInstance2
+
diff --git a/veilid-python/tests/test_crypto.py b/veilid-python/tests/test_crypto.py
index 328bc856..94754328 100644
--- a/veilid-python/tests/test_crypto.py
+++ b/veilid-python/tests/test_crypto.py
@@ -44,3 +44,26 @@ async def test_hash_and_verify_password(api_connection: veilid.VeilidAPI):
         # Password mismatch
         phash2 = await cs.hash_password(b"abc1234", salt)
         assert not await cs.verify_password(b"abc12345", phash)
+
+
+@pytest.mark.asyncio
+async def test_generate_shared_secret(api_connection: veilid.VeilidAPI):
+    cs = await api_connection.best_crypto_system()
+    async with cs:
+        kp1 = await cs.generate_key_pair()
+        kp2 = await cs.generate_key_pair()
+        kp3 = await cs.generate_key_pair()
+
+        ssA = await cs.generate_shared_secret(kp1.key(), kp2.secret(), b"abc123")
+        ssB = await cs.generate_shared_secret(kp2.key(), kp1.secret(), b"abc123")
+
+        assert ssA == ssB
+
+        ssC = await cs.generate_shared_secret(kp2.key(), kp1.secret(), b"abc1234")
+
+        assert ssA != ssC
+
+        ssD = await cs.generate_shared_secret(kp3.key(), kp1.secret(), b"abc123")
+
+        assert ssA != ssD
+
diff --git a/veilid-python/tests/test_dht.py b/veilid-python/tests/test_dht.py
index efae87fd..5346e229 100644
--- a/veilid-python/tests/test_dht.py
+++ b/veilid-python/tests/test_dht.py
@@ -5,6 +5,7 @@ import pytest
 import asyncio
 import json
 from . import *
+from .api import VeilidTestConnectionError, api_connector
 
 ##################################################################
 BOGUS_KEY = veilid.TypedKey.from_value(
@@ -14,6 +15,7 @@ BOGUS_KEY = veilid.TypedKey.from_value(
 @pytest.mark.asyncio
 async def test_get_dht_value_unopened(api_connection: veilid.VeilidAPI):
     rc = await api_connection.new_routing_context()
+    
     async with rc:
         with pytest.raises(veilid.VeilidAPIError):
             out = await rc.get_dht_value(BOGUS_KEY, veilid.ValueSubkey(0), False)
@@ -195,6 +197,139 @@ async def test_open_writer_dht_value(api_connection: veilid.VeilidAPI):
         with pytest.raises(veilid.VeilidAPIError):
             vdtemp = await rc.set_dht_value(key, 0, va)
 
+        # Verify subkey 0 can be set because override with the right writer
+        vdtemp = await rc.set_dht_value(key, 0, va, veilid.KeyPair.from_parts(owner, secret))
+        assert vdtemp == None
+
         # Clean up
         await rc.close_dht_record(key)
         await rc.delete_dht_record(key)
+
+@pytest.mark.asyncio
+async def test_watch_dht_values():
+
+    value_change_queue: asyncio.Queue[veilid.VeilidUpdate] = asyncio.Queue()
+
+    async def value_change_update_callback(update: veilid.VeilidUpdate):
+        if update.kind == veilid.VeilidUpdateKind.VALUE_CHANGE:
+            await value_change_queue.put(update)
+
+    try:
+        api = await api_connector(value_change_update_callback)
+    except VeilidTestConnectionError:
+        pytest.skip("Unable to connect to veilid-server.")
+        return
+
+    # Make two routing contexts, one with and one without safety
+    # So we can pretend to be a different node and get the watch updates
+    # Normally they would not get sent if the set comes from the same target
+    # as the watch's target
+    rcWatch = await api.new_routing_context()
+    
+    rcSet = await (await api.new_routing_context()).with_safety(
+        veilid.SafetySelection.unsafe(veilid.Sequencing.ENSURE_ORDERED)
+    )
+    async with rcWatch, rcSet:
+        # Make a DHT record
+        rec = await rcWatch.create_dht_record(veilid.DHTSchema.dflt(10))
+
+        # Set some subkey we care about
+        vd = await rcWatch.set_dht_value(rec.key, 3, b"BLAH BLAH BLAH")
+        assert vd == None
+
+        # Make a watch on that subkey
+        ts = await rcWatch.watch_dht_values(rec.key, [], 0, 0xFFFFFFFF)
+        assert ts != 0
+
+        # Reopen without closing to change routing context and not lose watch
+        rec = await rcSet.open_dht_record(rec.key, rec.owner_key_pair())
+        
+        # Now set the subkey and trigger an update
+        vd = await rcSet.set_dht_value(rec.key, 3, b"BLAH")
+        assert vd == None
+
+        # Wait for the update
+        upd = await asyncio.wait_for(value_change_queue.get(), timeout=5)
+
+        # Verify the update
+        assert upd.detail.key == rec.key
+        assert upd.detail.count == 0xFFFFFFFE
+        assert upd.detail.subkeys == [(3,3)]
+        assert upd.detail.value.seq == 1
+        assert upd.detail.value.data == b"BLAH"
+        assert upd.detail.value.writer == rec.owner
+
+        # Reopen without closing to change routing context and not lose watch
+        rec = await rcWatch.open_dht_record(rec.key, rec.owner_key_pair())
+
+        # Cancel some subkeys we don't care about
+        still_active = await rcWatch.cancel_dht_watch(rec.key, [(0, 2)])
+        assert still_active == True
+
+        # Reopen without closing to change routing context and not lose watch
+        rec = await rcSet.open_dht_record(rec.key, rec.owner_key_pair())
+
+        # Change our subkey
+        vd = await rcSet.set_dht_value(rec.key, 3, b"BLAH BLAH BLAH")
+        assert vd == None
+
+        # Wait for the update
+        upd = await asyncio.wait_for(value_change_queue.get(), timeout=5)
+
+        # Verify the update
+        assert upd.detail.key == rec.key
+        assert upd.detail.count == 0xFFFFFFFD
+        assert upd.detail.subkeys == [(3,3)]
+        assert upd.detail.value.seq == 2
+        assert upd.detail.value.data == b"BLAH BLAH BLAH"
+        assert upd.detail.value.writer == rec.owner
+
+        # Reopen without closing to change routing context and not lose watch
+        rec = await rcWatch.open_dht_record(rec.key, rec.owner_key_pair())
+
+        # Now cancel the update
+        still_active = await rcWatch.cancel_dht_watch(rec.key, [(3, 9)])
+        assert still_active == False
+
+        # Reopen without closing to change routing context and not lose watch
+        rec = await rcSet.open_dht_record(rec.key, rec.owner_key_pair())
+
+        # Set the value without a watch
+        vd = await rcSet.set_dht_value(rec.key, 3, b"BLAH")
+        assert vd == None
+        
+        # Now we should NOT get an update
+        update = None
+        try:
+            update = await asyncio.wait_for(value_change_queue.get(), timeout=5)
+        except asyncio.TimeoutError:
+            pass
+        assert update == None
+
+        # Clean up
+        await rcSet.close_dht_record(rec.key)
+        await rcSet.delete_dht_record(rec.key)
+
+@pytest.mark.asyncio
+async def test_inspect_dht_record(api_connection: veilid.VeilidAPI):
+    rc = await api_connection.new_routing_context()
+    async with rc:
+        rec = await rc.create_dht_record(veilid.DHTSchema.dflt(2))
+
+        vd = await rc.set_dht_value(rec.key, 0, b"BLAH BLAH BLAH")
+        assert vd == None
+
+        rr = await rc.inspect_dht_record(rec.key, [], veilid.DHTReportScope.LOCAL)
+        print("rr: {}", rr.__dict__)
+        assert rr.subkeys == [[0,1]]
+        assert rr.local_seqs == [0, 0xFFFFFFFF]
+        assert rr.network_seqs == []
+
+        rr2 = await rc.inspect_dht_record(rec.key, [], veilid.DHTReportScope.SYNC_GET)
+        print("rr2: {}", rr2.__dict__)
+        assert rr2.subkeys == [[0,1]]
+        assert rr2.local_seqs == [0, 0xFFFFFFFF]
+        assert rr2.network_seqs == [0, 0xFFFFFFFF]
+
+        await rc.close_dht_record(rec.key)
+        await rc.delete_dht_record(rec.key)
\ No newline at end of file
diff --git a/veilid-python/tests/test_routing_context.py b/veilid-python/tests/test_routing_context.py
index 0dca6319..2a45c405 100644
--- a/veilid-python/tests/test_routing_context.py
+++ b/veilid-python/tests/test_routing_context.py
@@ -26,9 +26,7 @@ async def test_routing_contexts(api_connection: veilid.VeilidAPI):
         async with rcp:
             pass
 
-    rc = await (await api_connection.new_routing_context()).with_sequencing(
-        veilid.Sequencing.ENSURE_ORDERED
-    )
+    rc = await api_connection.new_routing_context()
     async with rc:
         pass
 
@@ -69,21 +67,29 @@ async def test_routing_context_app_message_loopback():
         async with rc:
             # make a new local private route
             prl, blob = await api.new_private_route()
+            try:
+                # import it as a remote route as well so we can send to it
+                prr = await api.import_remote_private_route(blob)
+                try:
+                    # send an app message to our own private route
+                    message = b"abcd1234"
+                    await rc.app_message(prr, message)
 
-            # import it as a remote route as well so we can send to it
-            prr = await api.import_remote_private_route(blob)
+                    # we should get the same message back
+                    update: veilid.VeilidUpdate = await asyncio.wait_for(
+                        app_message_queue.get(), timeout=10
+                    )
 
-            # send an app message to our own private route
-            message = b"abcd1234"
-            await rc.app_message(prr, message)
+                    assert isinstance(update.detail, veilid.VeilidAppMessage)
+                    assert update.detail.message == message
+                    assert update.detail.route_id is not None
 
-            # we should get the same message back
-            update: veilid.VeilidUpdate = await asyncio.wait_for(
-                app_message_queue.get(), timeout=10
-            )
-
-            assert isinstance(update.detail, veilid.VeilidAppMessage)
-            assert update.detail.message == message
+                finally:
+                        # release imported private route
+                        await api.release_private_route(prr)
+            finally:
+                # release local private route
+                await api.release_private_route(prl)
 
 
 @pytest.mark.asyncio
@@ -109,29 +115,37 @@ async def test_routing_context_app_call_loopback():
         async with rc:
             # make a new local private route
             prl, blob = await api.new_private_route()
+            try:
+                # import it as a remote route as well so we can send to it
+                prr = await api.import_remote_private_route(blob)
+                try:
 
-            # import it as a remote route as well so we can send to it
-            prr = await api.import_remote_private_route(blob)
+                    # send an app message to our own private route
+                    request = b"abcd1234"
+                    app_call_task = asyncio.create_task(rc.app_call(prr, request), name="app call task")
 
-            # send an app message to our own private route
-            request = b"abcd1234"
-            app_call_task = asyncio.create_task(rc.app_call(prr, request), name="app call task")
+                    # we should get the same request back
+                    update: veilid.VeilidUpdate = await asyncio.wait_for(app_call_queue.get(), timeout=10)
+                    appcall = update.detail
 
-            # we should get the same request back
-            update: veilid.VeilidUpdate = await asyncio.wait_for(app_call_queue.get(), timeout=10)
-            appcall = update.detail
+                    assert isinstance(appcall, veilid.VeilidAppCall)
+                    assert appcall.message == request
+                    assert appcall.route_id is not None
 
-            assert isinstance(appcall, veilid.VeilidAppCall)
-            assert appcall.message == request
+                    # now we reply to the request
+                    reply = b"qwer5678"
+                    await api.app_call_reply(appcall.call_id, reply)
 
-            # now we reply to the request
-            reply = b"qwer5678"
-            await api.app_call_reply(appcall.call_id, reply)
-
-            # now we should get the reply from the call
-            result = await app_call_task
-            assert result == reply
+                    # now we should get the reply from the call
+                    result = await app_call_task
+                    assert result == reply
 
+                finally:
+                    # release imported private route
+                    await api.release_private_route(prr)
+            finally:
+                # release local private route
+                await api.release_private_route(prl)
 
 @pytest.mark.asyncio
 async def test_routing_context_app_message_loopback_big_packets():
@@ -162,28 +176,35 @@ async def test_routing_context_app_message_loopback_big_packets():
         async with rc:
             # make a new local private route
             prl, blob = await api.new_private_route()
+            try:
+                # import it as a remote route as well so we can send to it
+                prr = await api.import_remote_private_route(blob)
+                try:
+                    # do this test 5 times
+                    for _ in range(5):
+                        # send a random sized random app message to our own private route
+                        message = random.randbytes(random.randint(0, 32768))
+                        await rc.app_message(prr, message)
 
-            # import it as a remote route as well so we can send to it
-            prr = await api.import_remote_private_route(blob)
+                        sent_messages.add(message)
 
-            # do this test 100 times
-            for _ in range(100):
-                # send a random sized random app message to our own private route
-                message = random.randbytes(random.randint(0, 32768))
-                await rc.app_message(prr, message)
+                    # we should get the same messages back
+                    print(len(sent_messages))
+                    for n in range(len(sent_messages)):
+                        print(n)
+                        update: veilid.VeilidUpdate = await asyncio.wait_for(
+                            app_message_queue.get(), timeout=10
+                        )
+                        assert isinstance(update.detail, veilid.VeilidAppMessage)
 
-                sent_messages.add(message)
+                        assert update.detail.message in sent_messages
+                finally:
+                    # release imported private route
+                    await api.release_private_route(prr)
+            finally:
+                # release local private route
+                await api.release_private_route(prl)
 
-            # we should get the same messages back
-            print(len(sent_messages))
-            for n in range(len(sent_messages)):
-                print(n)
-                update: veilid.VeilidUpdate = await asyncio.wait_for(
-                    app_message_queue.get(), timeout=10
-                )
-                assert isinstance(update.detail, veilid.VeilidAppMessage)
-
-                assert update.detail.message in sent_messages
 
 
 @pytest.mark.asyncio
@@ -216,30 +237,34 @@ async def test_routing_context_app_call_loopback_big_packets():
         await api.debug("purge routes")
 
         app_call_task = asyncio.create_task(app_call_queue_task_handler(api), name="app call task")
+        try:
+            # make a routing context that uses a safety route
+            rc = await api.new_routing_context()
+            async with rc:
+                # make a new local private route
+                prl, blob = await api.new_custom_private_route(
+                    [veilid.CryptoKind.CRYPTO_KIND_VLD0], 
+                    veilid.Stability.RELIABLE, 
+                    veilid.Sequencing.ENSURE_ORDERED)
+                try:
+                    # import it as a remote route as well so we can send to it
+                    prr = await api.import_remote_private_route(blob)
+                    try:
+                        # do this test 5 times
+                        for _ in range(5):
+                            # send a random sized random app message to our own private route
+                            message = random.randbytes(random.randint(0, 32768))
+                            out_message = await rc.app_call(prr, message)
 
-        # make a routing context that uses a safety route
-        rc = await (await api.new_routing_context()).with_sequencing(
-            veilid.Sequencing.ENSURE_ORDERED
-        )
-        async with rc:
-            # make a new local private route
-            prl, blob = await api.new_custom_private_route(
-                [veilid.CryptoKind.CRYPTO_KIND_VLD0], 
-                veilid.Stability.RELIABLE, 
-                veilid.Sequencing.ENSURE_ORDERED)
-
-            # import it as a remote route as well so we can send to it
-            prr = await api.import_remote_private_route(blob)
-            
-            # do this test 10 times
-            for _ in range(10):
-                # send a random sized random app message to our own private route
-                message = random.randbytes(random.randint(0, 32768))
-                out_message = await rc.app_call(prr, message)
-
-                assert message == out_message
-
-        app_call_task.cancel()
+                            assert message == out_message
+                    finally:
+                        # release imported private route
+                        await api.release_private_route(prr)
+                finally:
+                    # release local private route
+                    await api.release_private_route(prl)
+        finally:
+            app_call_task.cancel()
 
 
 @pytest.mark.skipif(os.getenv("NOSKIP") != "1", reason="unneeded test, only for performance check")
@@ -266,16 +291,22 @@ async def test_routing_context_app_message_loopback_bandwidth():
         async with rc:
             # make a new local private route
             prl, blob = await api.new_private_route()
+            try:
+                # import it as a remote route as well so we can send to it
+                prr = await api.import_remote_private_route(blob)
+                try:
+                # do this test 1000 times
+                    message = random.randbytes(16384)
+                    for _ in range(10000):
+                        # send a random sized random app message to our own private route
+                        await rc.app_message(prr, message)
 
-            # import it as a remote route as well so we can send to it
-            prr = await api.import_remote_private_route(blob)
-
-            # do this test 1000 times
-            message = random.randbytes(16384)
-            for _ in range(10000):
-                # send a random sized random app message to our own private route
-                await rc.app_message(prr, message)
-
-            # we should get the same number of messages back (not storing all that data)
-            for _ in range(10000):
-                await asyncio.wait_for(app_message_queue.get(), timeout=10)
+                    # we should get the same number of messages back (not storing all that data)
+                    for _ in range(10000):
+                        await asyncio.wait_for(app_message_queue.get(), timeout=10)
+                finally:
+                    # release imported private route
+                    await api.release_private_route(prr)
+            finally:
+                # release local private route
+                await api.release_private_route(prl)
diff --git a/veilid-python/tests/test_table_db.py b/veilid-python/tests/test_table_db.py
index 962ecd23..22a22fae 100644
--- a/veilid-python/tests/test_table_db.py
+++ b/veilid-python/tests/test_table_db.py
@@ -67,7 +67,7 @@ async def test_open_twice_table_db_store_load(api_connection: veilid.VeilidAPI):
             # store into first db copy
             await tdb.store(b"asdf", b"1234")
             # load from second db copy
-            assert await tdb.load(b"asdf") == b"1234"
+            assert await tdb2.load(b"asdf") == b"1234"
 
     # delete should now succeed
     deleted = await api_connection.delete_table_db(TEST_DB)
diff --git a/veilid-python/veilid/api.py b/veilid-python/veilid/api.py
index ea376119..4f32e178 100644
--- a/veilid-python/veilid/api.py
+++ b/veilid-python/veilid/api.py
@@ -55,7 +55,7 @@ class RoutingContext(ABC):
 
     @abstractmethod
     async def open_dht_record(
-        self, key: types.TypedKey, writer: Optional[types.KeyPair]
+        self, key: types.TypedKey, writer: Optional[types.KeyPair] = None
     ) -> types.DHTRecordDescriptor:
         pass
 
@@ -75,7 +75,7 @@ class RoutingContext(ABC):
 
     @abstractmethod
     async def set_dht_value(
-        self, key: types.TypedKey, subkey: types.ValueSubkey, data: bytes
+        self, key: types.TypedKey, subkey: types.ValueSubkey, data: bytes, writer: Optional[types.KeyPair] = None
     ) -> Optional[types.ValueData]:
         pass
 
@@ -97,6 +97,16 @@ class RoutingContext(ABC):
     ) -> bool:
         pass
 
+    @abstractmethod
+    async def inspect_dht_record(
+        self,
+        key: types.TypedKey,
+        subkeys: list[tuple[types.ValueSubkey, types.ValueSubkey]],
+        scope: types.DHTReportScope,
+    ) -> types.DHTRecordReport:
+        pass
+
+
 
 class TableDbTransaction(ABC):
     async def __aenter__(self) -> Self:
@@ -194,6 +204,12 @@ class CryptoSystem(ABC):
     ) -> types.SharedSecret:
         pass
 
+    @abstractmethod
+    async def generate_shared_secret(
+        self, key: types.PublicKey, secret: types.SecretKey, domain: bytes
+    ) -> types.SharedSecret:
+        pass
+
     @abstractmethod
     async def random_bytes(self, len: int) -> bytes:
         pass
@@ -396,3 +412,7 @@ class VeilidAPI(ABC):
     @abstractmethod
     async def veilid_version(self) -> types.VeilidVersion:
         pass
+
+    @abstractmethod
+    async def default_veilid_config(self) -> str:
+        pass
diff --git a/veilid-python/veilid/json_api.py b/veilid-python/veilid/json_api.py
index 748da356..0ff6ee96 100644
--- a/veilid-python/veilid/json_api.py
+++ b/veilid-python/veilid/json_api.py
@@ -23,6 +23,8 @@ from .types import (
     CryptoKeyDistance,
     CryptoKind,
     DHTRecordDescriptor,
+    DHTRecordReport,
+    DHTReportScope,
     DHTSchema,
     HashDigest,
     KeyPair,
@@ -109,8 +111,12 @@ class _JsonVeilidAPI(VeilidAPI):
         try:
             self.reader = None
             assert self.writer is not None
-            self.writer.close()
-            await self.writer.wait_closed()
+            try:
+                self.writer.close()
+                await self.writer.wait_closed()
+            except:
+                # Already closed
+                pass
             self.writer = None
 
             for reqid, reqfuture in self.in_flight_requests.items():
@@ -432,6 +438,9 @@ class _JsonVeilidAPI(VeilidAPI):
         v = await self.send_ndjson_request(Operation.VEILID_VERSION)
         return VeilidVersion(v["major"], v["minor"], v["patch"])
 
+    async def default_veilid_config(self) -> str:
+        return raise_api_result(await self.send_ndjson_request(Operation.DEFAULT_VEILID_CONFIG))
+
 
 ######################################################
 
@@ -572,7 +581,7 @@ class _JsonRoutingContext(RoutingContext):
         )
 
     async def open_dht_record(
-        self, key: TypedKey, writer: Optional[KeyPair]
+        self, key: TypedKey, writer: Optional[KeyPair] = None
     ) -> DHTRecordDescriptor:
         return DHTRecordDescriptor.from_json(
             raise_api_result(
@@ -626,7 +635,7 @@ class _JsonRoutingContext(RoutingContext):
         return None if ret is None else ValueData.from_json(ret)
 
     async def set_dht_value(
-        self, key: TypedKey, subkey: ValueSubkey, data: bytes
+        self, key: TypedKey, subkey: ValueSubkey, data: bytes, writer: Optional[KeyPair] = None
     ) -> Optional[ValueData]:
         ret = raise_api_result(
             await self.api.send_ndjson_request(
@@ -637,6 +646,7 @@ class _JsonRoutingContext(RoutingContext):
                 key=key,
                 subkey=subkey,
                 data=data,
+                writer=writer,
             )
         )
         return None if ret is None else ValueData.from_json(ret)
@@ -657,7 +667,7 @@ class _JsonRoutingContext(RoutingContext):
                     rc_op=RoutingContextOperation.WATCH_DHT_VALUES,
                     key=key,
                     subkeys=subkeys,
-                    expiration=expiration,
+                    expiration=str(expiration),
                     count=count,
                 )
             )
@@ -677,6 +687,28 @@ class _JsonRoutingContext(RoutingContext):
             )
         )
 
+    async def inspect_dht_record(
+        self,
+        key: TypedKey,
+        subkeys: list[tuple[ValueSubkey, ValueSubkey]],
+        scope: DHTReportScope,
+    ) -> DHTRecordReport:
+        return DHTRecordReport.from_json(            
+            raise_api_result(
+                await self.api.send_ndjson_request(
+                    Operation.ROUTING_CONTEXT,
+                    validate=validate_rc_op,
+                    rc_id=self.rc_id,
+                    rc_op=RoutingContextOperation.INSPECT_DHT_RECORD,
+                    key=key,
+                    subkeys=subkeys,
+                    scope=scope,
+                )
+            )
+        )
+        
+
+
 
 ######################################################
 
@@ -949,6 +981,21 @@ class _JsonCryptoSystem(CryptoSystem):
             )
         )
 
+    async def generate_shared_secret(self, key: PublicKey, secret: SecretKey, domain: bytes) -> SharedSecret:
+        return SharedSecret(
+            raise_api_result(
+                await self.api.send_ndjson_request(
+                    Operation.CRYPTO_SYSTEM,
+                    validate=validate_cs_op,
+                    cs_id=self.cs_id,
+                    cs_op=CryptoSystemOperation.GENERATE_SHARED_SECRET,
+                    key=key,
+                    secret=secret,
+                    domain=domain,
+                )
+            )
+        )
+
     async def random_bytes(self, len: int) -> bytes:
         return urlsafe_b64decode_no_pad(
             raise_api_result(
diff --git a/veilid-python/veilid/operations.py b/veilid-python/veilid/operations.py
index 23fa6df1..a41fb96b 100644
--- a/veilid-python/veilid/operations.py
+++ b/veilid-python/veilid/operations.py
@@ -28,6 +28,7 @@ class Operation(StrEnum):
     DEBUG = "Debug"
     VEILID_VERSION_STRING = "VeilidVersionString"
     VEILID_VERSION = "VeilidVersion"
+    DEFAULT_VEILID_CONFIG = "DefaultVeilidConfig"
 
 
 class RoutingContextOperation(StrEnum):
@@ -47,6 +48,7 @@ class RoutingContextOperation(StrEnum):
     SET_DHT_VALUE = "SetDhtValue"
     WATCH_DHT_VALUES = "WatchDhtValues"
     CANCEL_DHT_WATCH = "CancelDhtWatch"
+    INSPECT_DHT_RECORD = "InspectDhtRecord"
 
 
 class TableDbOperation(StrEnum):
@@ -73,6 +75,7 @@ class CryptoSystemOperation(StrEnum):
     RELEASE = "Release"
     CACHED_DH = "CachedDh"
     COMPUTE_DH = "ComputeDh"
+    GENERATE_SHARED_SECRET = "GenerateSharedSecret"
     RANDOM_BYTES = "RandomBytes"
     DEFAULT_SALT_LENGTH = "DefaultSaltLength"
     HASH_PASSWORD = "HashPassword"
diff --git a/veilid-python/veilid/schema/RecvMessage.json b/veilid-python/veilid/schema/RecvMessage.json
index cdd9bf60..fe92e9a9 100644
--- a/veilid-python/veilid/schema/RecvMessage.json
+++ b/veilid-python/veilid/schema/RecvMessage.json
@@ -923,6 +923,44 @@
                   ]
                 }
               }
+            },
+            {
+              "type": "object",
+              "anyOf": [
+                {
+                  "type": "object",
+                  "required": [
+                    "value"
+                  ],
+                  "properties": {
+                    "value": {
+                      "$ref": "#/definitions/DHTRecordReport"
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "error"
+                  ],
+                  "properties": {
+                    "error": {
+                      "$ref": "#/definitions/VeilidAPIError"
+                    }
+                  }
+                }
+              ],
+              "required": [
+                "rc_op"
+              ],
+              "properties": {
+                "rc_op": {
+                  "type": "string",
+                  "enum": [
+                    "InspectDhtRecord"
+                  ]
+                }
+              }
             }
           ],
           "required": [
@@ -1637,6 +1675,44 @@
                 }
               }
             },
+            {
+              "type": "object",
+              "anyOf": [
+                {
+                  "type": "object",
+                  "required": [
+                    "value"
+                  ],
+                  "properties": {
+                    "value": {
+                      "type": "string"
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "error"
+                  ],
+                  "properties": {
+                    "error": {
+                      "$ref": "#/definitions/VeilidAPIError"
+                    }
+                  }
+                }
+              ],
+              "required": [
+                "cs_op"
+              ],
+              "properties": {
+                "cs_op": {
+                  "type": "string",
+                  "enum": [
+                    "GenerateSharedSecret"
+                  ]
+                }
+              }
+            },
             {
               "type": "object",
               "required": [
@@ -2349,6 +2425,24 @@
               "minimum": 0.0
             }
           }
+        },
+        {
+          "type": "object",
+          "required": [
+            "op",
+            "value"
+          ],
+          "properties": {
+            "op": {
+              "type": "string",
+              "enum": [
+                "DefaultVeilidConfig"
+              ]
+            },
+            "value": {
+              "type": "string"
+            }
+          }
         }
       ],
       "required": [
@@ -2419,6 +2513,12 @@
             "message": {
               "type": "string"
             },
+            "route_id": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
             "sender": {
               "type": [
                 "string",
@@ -2448,6 +2548,12 @@
             "message": {
               "type": "string"
             },
+            "route_id": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
             "sender": {
               "type": [
                 "string",
@@ -2687,6 +2793,56 @@
         }
       }
     },
+    "DHTRecordReport": {
+      "description": "DHT Record Report",
+      "type": "object",
+      "required": [
+        "local_seqs",
+        "network_seqs",
+        "subkeys"
+      ],
+      "properties": {
+        "local_seqs": {
+          "description": "The sequence numbers of each subkey requested from a locally stored DHT Record",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          }
+        },
+        "network_seqs": {
+          "description": "The sequence numbers of each subkey requested from the DHT over the network",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          }
+        },
+        "subkeys": {
+          "description": "The actual subkey range within the schema being reported on This may be a subset of the requested range if it exceeds the schema limits or has more than 512 subkeys",
+          "type": "array",
+          "items": {
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            ],
+            "maxItems": 2,
+            "minItems": 2
+          }
+        }
+      }
+    },
     "DHTSchema": {
       "description": "Enum over all the supported DHT Schemas",
       "oneOf": [
@@ -3964,7 +4120,7 @@
       }
     },
     "VeilidConfigWS": {
-      "description": "Enable and configure Web Sockets\n\n```yaml ws: connect: true listen: true max_connections: 16 listen_address: ':5150' path: 'ws' url: 'ws://localhost:5150/ws'",
+      "description": "Enable and configure Web Sockets\n\n```yaml ws: connect: true listen: true max_connections: 32 listen_address: ':5150' path: 'ws' url: 'ws://localhost:5150/ws'",
       "type": "object",
       "required": [
         "connect",
@@ -4000,7 +4156,7 @@
       }
     },
     "VeilidConfigWSS": {
-      "description": "Enable and configure Secure Web Sockets\n\n```yaml wss: connect: true listen: false max_connections: 16 listen_address: ':5150' path: 'ws' url: ''",
+      "description": "Enable and configure Secure Web Sockets\n\n```yaml wss: connect: true listen: false max_connections: 32 listen_address: ':5150' path: 'ws' url: ''",
       "type": "object",
       "required": [
         "connect",
diff --git a/veilid-python/veilid/schema/Request.json b/veilid-python/veilid/schema/Request.json
index 4fe0b117..19a342cc 100644
--- a/veilid-python/veilid/schema/Request.json
+++ b/veilid-python/veilid/schema/Request.json
@@ -451,6 +451,12 @@
               "type": "integer",
               "format": "uint32",
               "minimum": 0.0
+            },
+            "writer": {
+              "type": [
+                "string",
+                "null"
+              ]
             }
           }
         },
@@ -541,6 +547,49 @@
               }
             }
           }
+        },
+        {
+          "type": "object",
+          "required": [
+            "key",
+            "rc_op",
+            "scope",
+            "subkeys"
+          ],
+          "properties": {
+            "key": {
+              "type": "string"
+            },
+            "rc_op": {
+              "type": "string",
+              "enum": [
+                "InspectDhtRecord"
+              ]
+            },
+            "scope": {
+              "$ref": "#/definitions/DHTReportScope"
+            },
+            "subkeys": {
+              "type": "array",
+              "items": {
+                "type": "array",
+                "items": [
+                  {
+                    "type": "integer",
+                    "format": "uint32",
+                    "minimum": 0.0
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint32",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            }
+          }
         }
       ],
       "required": [
@@ -958,6 +1007,32 @@
             }
           }
         },
+        {
+          "type": "object",
+          "required": [
+            "cs_op",
+            "domain",
+            "key",
+            "secret"
+          ],
+          "properties": {
+            "cs_op": {
+              "type": "string",
+              "enum": [
+                "GenerateSharedSecret"
+              ]
+            },
+            "domain": {
+              "type": "string"
+            },
+            "key": {
+              "type": "string"
+            },
+            "secret": {
+              "type": "string"
+            }
+          }
+        },
         {
           "type": "object",
           "required": [
@@ -1493,6 +1568,20 @@
           ]
         }
       }
+    },
+    {
+      "type": "object",
+      "required": [
+        "op"
+      ],
+      "properties": {
+        "op": {
+          "type": "string",
+          "enum": [
+            "DefaultVeilidConfig"
+          ]
+        }
+      }
     }
   ],
   "properties": {
@@ -1505,6 +1594,46 @@
     }
   },
   "definitions": {
+    "DHTReportScope": {
+      "description": "DHT Record Report Scope",
+      "oneOf": [
+        {
+          "description": "Return only the local copy sequence numbers Useful for seeing what subkeys you have locally and which ones have not been retrieved",
+          "type": "string",
+          "enum": [
+            "Local"
+          ]
+        },
+        {
+          "description": "Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that would be reached as if the local copy did not exist locally. Useful for determining if the current local copy should be updated from the network.",
+          "type": "string",
+          "enum": [
+            "SyncGet"
+          ]
+        },
+        {
+          "description": "Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that would be reached as if the local copy did not exist locally. Useful for determining if the unchanged local copy should be pushed to the network.",
+          "type": "string",
+          "enum": [
+            "SyncSet"
+          ]
+        },
+        {
+          "description": "Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters Provides an view of both the local sequence numbers and the network sequence numbers for nodes that would be reached as if a GetValue operation were being performed, including accepting newer values from the network. Useful for determining which subkeys would change with a GetValue operation",
+          "type": "string",
+          "enum": [
+            "UpdateGet"
+          ]
+        },
+        {
+          "description": "Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters Provides an view of both the local sequence numbers and the network sequence numbers for nodes that would be reached as if a SetValue operation were being performed, including accepting newer values from the network. This simulates a SetValue with the initial sequence number incremented by 1, like a real SetValue would when updating. Useful for determine which subkeys would change on an SetValue operation",
+          "type": "string",
+          "enum": [
+            "UpdateSet"
+          ]
+        }
+      ]
+    },
     "DHTSchema": {
       "description": "Enum over all the supported DHT Schemas",
       "oneOf": [
diff --git a/veilid-python/veilid/state.py b/veilid-python/veilid/state.py
index 6aab549d..df273647 100644
--- a/veilid-python/veilid/state.py
+++ b/veilid-python/veilid/state.py
@@ -296,10 +296,12 @@ class VeilidLog:
 
 class VeilidAppMessage:
     sender: Optional[TypedKey]
+    route_id: Optional[RouteId]
     message: bytes
 
-    def __init__(self, sender: Optional[TypedKey], message: bytes):
+    def __init__(self, sender: Optional[TypedKey], route_id: Optional[RouteId], message: bytes):
         self.sender = sender
+        self.route_id = route_id
         self.message = message
 
     @classmethod
@@ -307,17 +309,20 @@ class VeilidAppMessage:
         """JSON object hook"""
         return cls(
             None if j["sender"] is None else TypedKey(j["sender"]),
+            None if j["route_id"] is None else RouteId(j["route_id"]),
             urlsafe_b64decode_no_pad(j["message"]),
         )
 
 
 class VeilidAppCall:
     sender: Optional[TypedKey]
+    route_id: Optional[RouteId]
     message: bytes
     call_id: OperationId
 
-    def __init__(self, sender: Optional[TypedKey], message: bytes, call_id: OperationId):
+    def __init__(self, sender: Optional[TypedKey], route_id: Optional[TypedKey], message: bytes, call_id: OperationId):
         self.sender = sender
+        self.route_id = route_id
         self.message = message
         self.call_id = call_id
 
@@ -326,6 +331,7 @@ class VeilidAppCall:
         """JSON object hook"""
         return cls(
             None if j["sender"] is None else TypedKey(j["sender"]),
+            None if j["route_id"] is None else RouteId(j["route_id"]),
             urlsafe_b64decode_no_pad(j["message"]),
             OperationId(j["call_id"]),
         )
@@ -350,11 +356,11 @@ class VeilidRouteChange:
 
 class VeilidValueChange:
     key: TypedKey
-    subkeys: list[ValueSubkey]
+    subkeys: list[tuple[ValueSubkey, ValueSubkey]]
     count: int
     value: ValueData
 
-    def __init__(self, key: TypedKey, subkeys: list[ValueSubkey], count: int, value: ValueData):
+    def __init__(self, key: TypedKey, subkeys: list[tuple[ValueSubkey, ValueSubkey]], count: int, value: ValueData):
         self.key = key
         self.subkeys = subkeys
         self.count = count
@@ -365,7 +371,7 @@ class VeilidValueChange:
         """JSON object hook"""
         return cls(
             TypedKey(j["key"]),
-            [ValueSubkey(key) for key in j["subkeys"]],
+            [(p[0], p[1]) for p in j["subkeys"]],
             j["count"],
             ValueData.from_json(j["value"]),
         )
diff --git a/veilid-python/veilid/types.py b/veilid-python/veilid/types.py
index c47d7590..1ba74dff 100644
--- a/veilid-python/veilid/types.py
+++ b/veilid-python/veilid/types.py
@@ -85,6 +85,14 @@ class SafetySelectionKind(StrEnum):
     SAFE = "Safe"
 
 
+class DHTReportScope(StrEnum):
+    LOCAL = "Local"
+    SYNC_GET = "SyncGet"
+    SYNC_SET = "SyncSet"
+    UPDATE_GET = "UpdateGet"
+    UPDATE_SET = "UpdateSet"
+
+
 ####################################################################
 
 
@@ -353,7 +361,10 @@ class DHTRecordDescriptor:
         self.schema = schema
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__}(key={self.key!r})>"
+        return f"<{self.__class__.__name__}(key={self.key!r}, owner={self.owner!r}, owner_secret={self.owner_secret!r}, schema={self.schema!r})>"
+
+    def owner_key_pair(self) -> Optional[KeyPair]:
+        return KeyPair.from_parts(self.owner, self.owner_secret)
 
     @classmethod
     def from_json(cls, j: dict) -> Self:
@@ -368,6 +379,37 @@ class DHTRecordDescriptor:
         return self.__dict__
 
 
+
+class DHTRecordReport:
+    subkeys: list[tuple[ValueSubkey, ValueSubkey]]
+    local_seqs: list[ValueSeqNum]
+    network_seqs: list[ValueSeqNum]
+
+    def __init__(
+        self,
+        subkeys: list[tuple[ValueSubkey, ValueSubkey]],
+        local_seqs: list[ValueSeqNum],
+        network_seqs: list[ValueSeqNum],
+    ):
+        self.subkeys = subkeys
+        self.local_seqs = local_seqs
+        self.network_seqs = network_seqs
+
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__}(subkeys={self.subkeys!r}, local_seqs={self.local_seqs!r}, network_seqs={self.network_seqs!r})>"
+
+    @classmethod
+    def from_json(cls, j: dict) -> Self:
+        return cls(
+            [[p[0], p[1]] for p in j["subkeys"]],
+            [ValueSeqNum(s) for s in j["local_seqs"]],
+            [ValueSeqNum(s) for s in j["network_seqs"]],
+        )
+
+    def to_json(self) -> dict:
+        return self.__dict__
+
+
 @total_ordering
 class ValueData:
     seq: ValueSeqNum
diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml
index 20e090dd..444e7869 100644
--- a/veilid-server/Cargo.toml
+++ b/veilid-server/Cargo.toml
@@ -20,8 +20,8 @@ default-async-std = ["rt-async-std", "veilid-core/default-async-std"]
 crypto-test = ["rt-tokio", "veilid-core/crypto-test"]
 crypto-test-none = ["rt-tokio", "veilid-core/crypto-test-none"]
 
-otlp-tonic = [ "opentelemetry-otlp/grpc-tonic", "opentelemetry-otlp/trace" ]
-otlp-grpc = [ "opentelemetry-otlp/grpc-sys", "opentelemetry-otlp/trace" ]
+otlp-tonic = ["opentelemetry-otlp/grpc-tonic", "opentelemetry-otlp/trace"]
+otlp-grpc = ["opentelemetry-otlp/grpc-sys", "opentelemetry-otlp/trace"]
 
 rt-async-std = [
     "veilid-core/rt-async-std",
@@ -37,8 +37,6 @@ rt-tokio = [
     "console-subscriber",
 ]
 tracking = ["veilid-core/tracking"]
-network-result-extra = ["veilid-core/network-result-extra"]
-verbose-tracing = ["veilid-core/verbose-tracing"]
 debug-json-api = []
 
 [dependencies]
@@ -49,7 +47,7 @@ tracing-appender = "^0"
 tracing-opentelemetry = "0.21"
 # Buggy: tracing-error = "^0"
 opentelemetry = { version = "0.20" }
-opentelemetry-otlp = { version = "0.13", default-features = false, optional=true }
+opentelemetry-otlp = { version = "0.13", default-features = false, optional = true }
 opentelemetry-semantic-conventions = "0.12"
 async-std = { version = "^1", features = ["unstable"], optional = true }
 tokio = { version = "1.35.0", features = ["full", "tracing"], optional = true }
@@ -76,12 +74,12 @@ futures-util = { version = "^0", default-features = false, features = [
 url = "^2"
 ctrlc = "^3"
 lazy_static = "^1"
-bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
+bugsalot = { package = "veilid-bugsalot", version = "0.2.0" }
 flume = { version = "^0", features = ["async"] }
 rpassword = "^7"
 hostname = "^0"
 stop-token = { version = "^0", default-features = false }
-sysinfo = { version = "^0.29.11", default-features = false }
+sysinfo = { version = "^0.30.6" }
 wg = "0.3.2"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/veilid-server/src/client_api.rs b/veilid-server/src/client_api.rs
index a8520b84..22b47838 100644
--- a/veilid-server/src/client_api.rs
+++ b/veilid-server/src/client_api.rs
@@ -19,10 +19,10 @@ use wg::AsyncWaitGroup;
 const MAX_NON_JSON_LOGGING: usize = 50;
 
 cfg_if! {
-   
+
     if #[cfg(feature="rt-async-std")] {
         use futures_util::{AsyncBufReadExt, AsyncWriteExt};
-    } else 
+    } else
     if #[cfg(feature="rt-tokio")] {
         use tokio::io::AsyncBufReadExt;
         use tokio::io::AsyncWriteExt;
@@ -77,7 +77,7 @@ impl ClientApi {
 
     #[instrument(level = "trace", skip_all)]
     fn shutdown(&self) {
-        trace!("ClientApi::shutdown");
+        trace!(target: "client_api", "ClientApi::shutdown");
 
         crate::server::shutdown();
     }
@@ -87,27 +87,34 @@ impl ClientApi {
         layer: String,
         log_level: VeilidConfigLogLevel,
     ) -> VeilidAPIResult<()> {
-        trace!("ClientApi::change_log_level");
+        trace!(target: "client_api", "ClientApi::change_log_level");
 
         let veilid_logs = self.inner.lock().veilid_logs.clone();
         veilid_logs.change_log_level(layer, log_level)
     }
 
+    fn change_log_ignore(&self, layer: String, log_ignore: String) -> VeilidAPIResult<()> {
+        trace!(target: "client_api", "ClientApi::change_log_ignore");
+
+        let veilid_logs = self.inner.lock().veilid_logs.clone();
+        veilid_logs.change_log_ignore(layer, log_ignore)
+    }
+
     #[instrument(level = "trace", skip(self))]
     pub async fn stop(&self) {
-        trace!("ClientApi::stop requested");
+        trace!(target: "client_api", "ClientApi::stop requested");
         let jh = {
             let mut inner = self.inner.lock();
             if inner.join_handle.is_none() {
-                trace!("ClientApi stop ignored");
+                trace!(target: "client_api", "ClientApi stop ignored");
                 return;
             }
             drop(inner.stop.take());
             inner.join_handle.take().unwrap()
         };
-        trace!("ClientApi::stop: waiting for stop");
+        trace!(target: "client_api", "ClientApi::stop: waiting for stop");
         jh.await;
-        trace!("ClientApi::stop: stopped");
+        trace!(target: "client_api", "ClientApi::stop: stopped");
     }
 
     async fn handle_ipc_incoming(self, ipc_path: PathBuf) -> std::io::Result<()> {
@@ -118,7 +125,7 @@ impl ClientApi {
             }
         }
         let mut listener = IpcListener::bind(ipc_path.clone()).await?;
-        debug!("IPC Client API listening on: {:?}", ipc_path);
+        debug!(target: "client_api", "IPC Client API listening on: {:?}", ipc_path);
 
         // Process the incoming accept stream
         let mut incoming_stream = listener.incoming()?;
@@ -149,7 +156,7 @@ impl ClientApi {
 
     async fn handle_tcp_incoming(self, bind_addr: SocketAddr) -> std::io::Result<()> {
         let listener = TcpListener::bind(bind_addr).await?;
-        debug!("TCPClient API listening on: {:?}", bind_addr);
+        debug!(target: "client_api", "TCPClient API listening on: {:?}", bind_addr);
 
         // Process the incoming accept stream
         cfg_if! {
@@ -203,6 +210,12 @@ impl ClientApi {
             let log_level = VeilidConfigLogLevel::from_str(&args[2])?;
             self.change_log_level(args[1].clone(), log_level)?;
             Ok("".to_owned())
+        } else if args[0] == "ChangeLogIgnore" {
+            if args.len() != 3 {
+                apibail_generic!("wrong number of arguments");
+            }
+            self.change_log_ignore(args[1].clone(), args[2].clone())?;
+            Ok("".to_owned())
         } else if args[0] == "GetServerSettings" {
             if args.len() != 1 {
                 apibail_generic!("wrong number of arguments");
diff --git a/veilid-server/src/main.rs b/veilid-server/src/main.rs
index 63c0e608..bfb42791 100644
--- a/veilid-server/src/main.rs
+++ b/veilid-server/src/main.rs
@@ -405,6 +405,12 @@ fn main() -> EyreResult<()> {
         // Init combined console/file logger
         let veilid_logs = VeilidLogs::setup(settings.clone())?;
 
-        run_veilid_server(settings, server_mode, veilid_logs).await
+        cfg_if! {
+            if #[cfg(windows)] {
+                run_veilid_server(settings, server_mode, veilid_logs).await
+            } else if #[cfg(unix)] {
+                unix::run_veilid_server_with_signals(settings, server_mode, veilid_logs).await
+            }
+        }
     })
 }
diff --git a/veilid-server/src/server.rs b/veilid-server/src/server.rs
index c84e0723..33b519fc 100644
--- a/veilid-server/src/server.rs
+++ b/veilid-server/src/server.rs
@@ -32,22 +32,12 @@ pub fn shutdown() {
     }
 }
 
+//#[instrument(err, skip_all)]
 pub async fn run_veilid_server(
     settings: Settings,
     server_mode: ServerMode,
     veilid_logs: VeilidLogs,
 ) -> EyreResult<()> {
-    run_veilid_server_internal(settings, server_mode, veilid_logs).await
-}
-
-//#[instrument(err, skip_all)]
-pub async fn run_veilid_server_internal(
-    settings: Settings,
-    server_mode: ServerMode,
-    veilid_logs: VeilidLogs,
-) -> EyreResult<()> {
-    trace!(?settings, ?server_mode);
-
     let (
         settings_auto_attach,
         settings_client_api_ipc_enabled,
diff --git a/veilid-server/src/settings.rs b/veilid-server/src/settings.rs
index 50893cbb..9cbdce0c 100644
--- a/veilid-server/src/settings.rs
+++ b/veilid-server/src/settings.rs
@@ -7,11 +7,30 @@ use std::ffi::OsStr;
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use sysinfo::{DiskExt, SystemExt};
 use url::Url;
 use veilid_core::tools::*;
 use veilid_core::*;
 
+use lazy_static::*;
+
+lazy_static! {
+    static ref SYSTEM: sysinfo::System = {
+        sysinfo::System::new_with_specifics(
+            sysinfo::RefreshKind::new().with_memory(sysinfo::MemoryRefreshKind::everything()),
+        )
+    };
+    static ref DISKS: sysinfo::Disks = {
+        let mut disks = sysinfo::Disks::new_with_refreshed_list();
+        disks.sort_by(|a, b| {
+            b.mount_point()
+                .to_string_lossy()
+                .len()
+                .cmp(&a.mount_point().to_string_lossy().len())
+        });
+        disks
+    };
+}
+
 pub fn load_default_config() -> EyreResult<config::Config> {
     let mut default_config = String::from(
         r#"---
@@ -27,21 +46,26 @@ logging:
     system:
         enabled: false
         level: 'info'
+        ignore_log_targets: []
     terminal:
         enabled: true
         level: 'info'
+        ignore_log_targets: []
     file: 
         enabled: false
         path: ''
         append: true
         level: 'info'
+        ignore_log_targets: []
     api:
         enabled: true
         level: 'info'
+        ignore_log_targets: []
     otlp:
         enabled: false
         level: 'trace'
         grpc_endpoint: 'localhost:4317'
+        ignore_log_targets: []
     console:
         enabled: false
 testing:
@@ -415,6 +439,7 @@ impl NamedSocketAddrs {
 pub struct Terminal {
     pub enabled: bool,
     pub level: LogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -428,18 +453,21 @@ pub struct File {
     pub path: String,
     pub append: bool,
     pub level: LogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct System {
     pub enabled: bool,
     pub level: LogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Api {
     pub enabled: bool,
     pub level: LogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -447,6 +475,7 @@ pub struct Otlp {
     pub enabled: bool,
     pub level: LogLevel,
     pub grpc_endpoint: NamedSocketAddrs,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -855,31 +884,31 @@ impl Settings {
     }
 
     pub fn get_default_remote_max_subkey_cache_memory_mb() -> u32 {
-        let sys = sysinfo::System::new_with_specifics(sysinfo::RefreshKind::new().with_memory());
-        ((sys.free_memory() / (1024u64 * 1024u64)) / 16) as u32
+        if sysinfo::IS_SUPPORTED_SYSTEM {
+            ((SYSTEM.free_memory() / (1024u64 * 1024u64)) / 16) as u32
+        } else {
+            256
+        }
     }
 
     pub fn get_default_remote_max_storage_space_mb(inner: &SettingsInner) -> u32 {
-        let mut sys = sysinfo::System::new_with_specifics(sysinfo::RefreshKind::new().with_disks());
         let dht_storage_path = inner.core.table_store.directory.clone();
         // Sort longer mount point paths first since we want the mount point closest to our table store directory
-        sys.sort_disks_by(|a, b| {
-            b.mount_point()
-                .to_string_lossy()
-                .len()
-                .cmp(&a.mount_point().to_string_lossy().len())
-        });
-        for disk in sys.disks() {
-            if dht_storage_path.starts_with(&*disk.mount_point().to_string_lossy()) {
-                let available_mb = disk.available_space() / 1_000_000u64;
-                if available_mb > 40_000 {
-                    // Default to 10GB if more than 40GB is available
-                    return 10_000;
+
+        if sysinfo::IS_SUPPORTED_SYSTEM {
+            for disk in DISKS.list() {
+                if dht_storage_path.starts_with(&*disk.mount_point().to_string_lossy()) {
+                    let available_mb = disk.available_space() / 1_000_000u64;
+                    if available_mb > 40_000 {
+                        // Default to 10GB if more than 40GB is available
+                        return 10_000;
+                    }
+                    // Default to 1/4 of the available space, if less than 40GB is available
+                    return available_mb as u32;
                 }
-                // Default to 1/4 of the available space, if less than 40GB is available
-                return available_mb as u32;
             }
         }
+
         // If we can't figure out our storage path go with 1GB of space and pray
         1_000
     }
@@ -917,17 +946,22 @@ impl Settings {
         set_config_value!(inner.auto_attach, value);
         set_config_value!(inner.logging.system.enabled, value);
         set_config_value!(inner.logging.system.level, value);
+        set_config_value!(inner.logging.system.ignore_log_targets, value);
         set_config_value!(inner.logging.terminal.enabled, value);
         set_config_value!(inner.logging.terminal.level, value);
+        set_config_value!(inner.logging.terminal.ignore_log_targets, value);
         set_config_value!(inner.logging.file.enabled, value);
         set_config_value!(inner.logging.file.path, value);
         set_config_value!(inner.logging.file.append, value);
         set_config_value!(inner.logging.file.level, value);
+        set_config_value!(inner.logging.file.ignore_log_targets, value);
         set_config_value!(inner.logging.api.enabled, value);
         set_config_value!(inner.logging.api.level, value);
+        set_config_value!(inner.logging.api.ignore_log_targets, value);
         set_config_value!(inner.logging.otlp.enabled, value);
         set_config_value!(inner.logging.otlp.level, value);
         set_config_value!(inner.logging.otlp.grpc_endpoint, value);
+        set_config_value!(inner.logging.otlp.ignore_log_targets, value);
         set_config_value!(inner.logging.console.enabled, value);
         set_config_value!(inner.testing.subnode_index, value);
         set_config_value!(inner.core.capabilities.disable, value);
diff --git a/veilid-server/src/unix.rs b/veilid-server/src/unix.rs
index b9ab9dba..7f076423 100644
--- a/veilid-server/src/unix.rs
+++ b/veilid-server/src/unix.rs
@@ -24,6 +24,28 @@ async fn handle_signals(mut signals: Signals) {
     }
 }
 
+pub async fn run_veilid_server_with_signals(
+    settings: Settings,
+    server_mode: ServerMode,
+    veilid_logs: VeilidLogs,
+) -> EyreResult<()> {
+    // Catch signals
+    let signals =
+        Signals::new([SIGHUP, SIGTERM, SIGINT, SIGQUIT]).wrap_err("failed to init signals")?;
+    let handle = signals.handle();
+
+    let signals_task = spawn(handle_signals(signals));
+
+    // Run veilid server
+    let res = run_veilid_server(settings, server_mode, veilid_logs).await;
+
+    // Terminate the signal stream.
+    handle.close();
+    let _ = signals_task.await;
+
+    res
+}
+
 #[warn(missing_docs)]
 #[instrument(err)]
 pub fn run_daemon(settings: Settings, _args: CmdlineArgs) -> EyreResult<()> {
@@ -82,19 +104,6 @@ pub fn run_daemon(settings: Settings, _args: CmdlineArgs) -> EyreResult<()> {
         // Daemonize
         daemon.start().wrap_err("Failed to daemonize")?;
 
-        // Catch signals
-        let signals =
-            Signals::new([SIGHUP, SIGTERM, SIGINT, SIGQUIT]).wrap_err("failed to init signals")?;
-        let handle = signals.handle();
-
-        let signals_task = spawn(handle_signals(signals));
-
-        let res = run_veilid_server(settings, ServerMode::Normal, veilid_logs).await;
-
-        // Terminate the signal stream.
-        handle.close();
-        let _ = signals_task.await;
-
-        res
+        run_veilid_server_with_signals(settings, ServerMode::Normal, veilid_logs).await
     })
 }
diff --git a/veilid-server/src/veilid_logs.rs b/veilid-server/src/veilid_logs.rs
index 09b4d0a6..3b8f467a 100644
--- a/veilid-server/src/veilid_logs.rs
+++ b/veilid-server/src/veilid_logs.rs
@@ -61,7 +61,7 @@ impl VeilidLogs {
         if settingsr.logging.terminal.enabled {
             let filter = veilid_core::VeilidLayerFilter::new(
                 convert_loglevel(settingsr.logging.terminal.level),
-                None,
+                &settingsr.logging.terminal.ignore_log_targets,
             );
             let layer = fmt::Layer::new()
                 .compact()
@@ -72,7 +72,7 @@ impl VeilidLogs {
         }
 
         // OpenTelemetry logger
-        #[cfg(feature="opentelemetry-otlp")]
+        #[cfg(feature = "opentelemetry-otlp")]
         if settingsr.logging.otlp.enabled {
             let grpc_endpoint = settingsr.logging.otlp.grpc_endpoint.name.clone();
 
@@ -111,7 +111,7 @@ impl VeilidLogs {
 
             let filter = veilid_core::VeilidLayerFilter::new(
                 convert_loglevel(settingsr.logging.otlp.level),
-                None,
+                &settingsr.logging.otlp.ignore_log_targets,
             );
             let layer = tracing_opentelemetry::layer()
                 .with_tracer(tracer)
@@ -147,7 +147,7 @@ impl VeilidLogs {
 
             let filter = veilid_core::VeilidLayerFilter::new(
                 convert_loglevel(settingsr.logging.file.level),
-                None,
+                &settingsr.logging.file.ignore_log_targets,
             );
             let layer = fmt::Layer::new()
                 .compact()
@@ -162,7 +162,7 @@ impl VeilidLogs {
         if settingsr.logging.api.enabled {
             let filter = veilid_core::VeilidLayerFilter::new(
                 convert_loglevel(settingsr.logging.api.level),
-                None,
+                &settingsr.logging.api.ignore_log_targets,
             );
             let layer = veilid_core::ApiTracingLayer::get().with_filter(filter.clone());
             filters.insert("api", filter);
@@ -175,7 +175,7 @@ impl VeilidLogs {
                 if settingsr.logging.system.enabled {
                     let filter = veilid_core::VeilidLayerFilter::new(
                         convert_loglevel(settingsr.logging.system.level),
-                        None,
+                        &settingsr.logging.system.ignore_log_targets,
                     );
                     let layer = tracing_journald::layer().wrap_err("failed to set up journald logging")?
                         .with_filter(filter.clone());
@@ -229,4 +229,59 @@ impl VeilidLogs {
         }
         Ok(())
     }
+
+    fn apply_ignore_change(ignore_list: Vec<String>, target_change: String) -> Vec<String> {
+        let mut ignore_list = ignore_list.clone();
+
+        for change in target_change.split(',').map(|c| c.trim().to_owned()) {
+            if change.is_empty() {
+                continue;
+            }
+            if let Some(target) = change.strip_prefix('-') {
+                ignore_list.retain(|x| x != target);
+            } else if !ignore_list.contains(&change) {
+                ignore_list.push(change.to_string());
+            }
+        }
+
+        ignore_list
+    }
+
+    pub fn change_log_ignore(
+        &self,
+        layer: String,
+        log_ignore: String,
+    ) -> Result<(), veilid_core::VeilidAPIError> {
+        // get layer to change level on
+        let layer = if layer == "all" { "".to_owned() } else { layer };
+
+        // change log level on appropriate layer
+        let inner = self.inner.lock();
+        if layer.is_empty() {
+            // Change all layers
+            for f in inner.filters.values() {
+                f.set_ignore_list(Some(Self::apply_ignore_change(
+                    f.ignore_list(),
+                    log_ignore.clone(),
+                )));
+            }
+        } else {
+            // Change a specific layer
+            let f = match inner.filters.get(layer.as_str()) {
+                Some(f) => f,
+                None => {
+                    return Err(veilid_core::VeilidAPIError::InvalidArgument {
+                        context: "change_log_level".to_owned(),
+                        argument: "layer".to_owned(),
+                        value: layer,
+                    });
+                }
+            };
+            f.set_ignore_list(Some(Self::apply_ignore_change(
+                f.ignore_list(),
+                log_ignore.clone(),
+            )));
+        }
+        Ok(())
+    }
 }
diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml
index f0722dcd..595a3278 100644
--- a/veilid-tools/Cargo.toml
+++ b/veilid-tools/Cargo.toml
@@ -34,15 +34,15 @@ rt-wasm-bindgen = ["async_executors/bindgen", "async_executors/timer"]
 veilid_tools_android_tests = ["dep:paranoid-android"]
 veilid_tools_ios_tests = ["dep:tracing", "dep:oslog", "dep:tracing-oslog"]
 tracing = ["dep:tracing", "dep:tracing-subscriber"]
-network-result-extra = []
-network-result-info = []
 
 [dependencies]
 tracing = { version = "0.1.40", features = [
     "log",
     "attributes",
 ], optional = true }
-tracing-subscriber = { version = "0.3.18", optional = true }
+tracing-subscriber = { version = "0.3.18", features = [
+    "env-filter",
+], optional = true }
 log = { version = "0.4.20" }
 eyre = "0.6.11"
 static_assertions = "1.1.0"
diff --git a/veilid-tools/src/assembly_buffer.rs b/veilid-tools/src/assembly_buffer.rs
index e31cbb1c..9287b4c6 100644
--- a/veilid-tools/src/assembly_buffer.rs
+++ b/veilid-tools/src/assembly_buffer.rs
@@ -269,12 +269,12 @@ impl AssemblyBuffer {
         // If we receive a frame smaller than or equal to the length of the header, drop it
         // or if this frame is larger than our max message length, then drop it
         if frame.len() <= HEADER_LEN || frame.len() > MAX_LEN {
-            #[cfg(feature = "network-result-extra")]
-            return NetworkResult::invalid_message(format!(
-                "invalid header length: frame.len={}",
-                frame.len()
-            ));
-            #[cfg(not(feature = "network-result-extra"))]
+            if debug_target_enabled!("network_result") {
+                return NetworkResult::invalid_message(format!(
+                    "invalid header length: frame.len={}",
+                    frame.len()
+                ));
+            }
             return NetworkResult::invalid_message("invalid header length");
         }
 
@@ -282,12 +282,12 @@ impl AssemblyBuffer {
 
         // Drop versions we don't understand
         if frame[0] != VERSION_1 {
-            #[cfg(feature = "network-result-extra")]
-            return NetworkResult::invalid_message(format!(
-                "invalid frame version: frame[0]={}",
-                frame[0]
-            ));
-            #[cfg(not(feature = "network-result-extra"))]
+            if debug_target_enabled!("network_result") {
+                return NetworkResult::invalid_message(format!(
+                    "invalid frame version: frame[0]={}",
+                    frame[0]
+                ));
+            }
             return NetworkResult::invalid_message("invalid frame version");
         }
         // Version 1 header
@@ -303,24 +303,24 @@ impl AssemblyBuffer {
 
         // Drop fragments with offsets greater than or equal to the message length
         if off >= len {
-            #[cfg(feature = "network-result-extra")]
-            return NetworkResult::invalid_message(format!(
-                "offset greater than length: off={} >= len={}",
-                off, len
-            ));
-            #[cfg(not(feature = "network-result-extra"))]
+            if debug_target_enabled!("network_result") {
+                return NetworkResult::invalid_message(format!(
+                    "offset greater than length: off={} >= len={}",
+                    off, len
+                ));
+            }
             return NetworkResult::invalid_message("offset greater than length");
         }
         // Drop fragments where the chunk would be applied beyond the message length
         if off as usize + chunk.len() > len as usize {
-            #[cfg(feature = "network-result-extra")]
-            return NetworkResult::invalid_message(format!(
-                "chunk applied beyond message length: off={} + chunk.len={} > len={}",
-                off,
-                chunk.len(),
-                len
-            ));
-            #[cfg(not(feature = "network-result-extra"))]
+            if debug_target_enabled!("network_result") {
+                return NetworkResult::invalid_message(format!(
+                    "chunk applied beyond message length: off={} + chunk.len={} > len={}",
+                    off,
+                    chunk.len(),
+                    len
+                ));
+            }
             return NetworkResult::invalid_message("chunk applied beyond message length");
         }
 
diff --git a/veilid-tools/src/ipc/mod.rs b/veilid-tools/src/ipc/mod.rs
index 665c52de..1aaec522 100644
--- a/veilid-tools/src/ipc/mod.rs
+++ b/veilid-tools/src/ipc/mod.rs
@@ -7,6 +7,7 @@ cfg_if! {
         pub use ipc_tokio::*;
     } else if #[cfg(feature="rt-async-std")] {
         mod ipc_async_std;
+        #[cfg_attr(windows, allow(unused_imports))]
         pub use ipc_async_std::*;
     }
 }
diff --git a/veilid-tools/src/lib.rs b/veilid-tools/src/lib.rs
index c0a5b2a6..57845fae 100644
--- a/veilid-tools/src/lib.rs
+++ b/veilid-tools/src/lib.rs
@@ -37,7 +37,6 @@ pub mod interval;
 pub mod ip_addr_port;
 pub mod ip_extra;
 pub mod ipc;
-pub mod log_thru;
 pub mod must_join_handle;
 pub mod must_join_single_future;
 pub mod mutable_future;
@@ -179,8 +178,6 @@ pub use ip_extra::*;
 #[doc(inline)]
 pub use ipc::*;
 #[doc(inline)]
-pub use log_thru::*;
-#[doc(inline)]
 pub use must_join_handle::*;
 #[doc(inline)]
 pub use must_join_single_future::*;
@@ -221,8 +218,16 @@ pub mod tests;
 cfg_if! {
     if #[cfg(feature = "tracing")] {
         use tracing::*;
+        #[macro_export]
+        macro_rules! debug_target_enabled {
+            ($target:expr) => { enabled!(target: $target, Level::DEBUG) }
+        }
     } else {
         use log::*;
+        #[macro_export]
+        macro_rules! debug_target_enabled {
+            ($target:expr) => { log_enabled!(target: $target, Level::Debug) }
+        }
     }
 }
 use cfg_if::*;
diff --git a/veilid-tools/src/network_interfaces/apple.rs b/veilid-tools/src/network_interfaces/apple.rs
index 95f8e42b..0abba8f4 100644
--- a/veilid-tools/src/network_interfaces/apple.rs
+++ b/veilid-tools/src/network_interfaces/apple.rs
@@ -281,93 +281,99 @@ impl PlatformSupportApple {
     }
 
     async fn refresh_default_route_interfaces(&mut self) {
-        self.default_route_interfaces.clear();
+        loop {
+            let mut mib = [CTL_NET, PF_ROUTE, 0, 0, NET_RT_FLAGS, RTF_GATEWAY];
+            let mut sa_tab: [*const sockaddr; RTAX_MAX as usize] =
+                [std::ptr::null(); RTAX_MAX as usize];
+            let mut rt_buf_len = 0usize;
 
-        let mut mib = [CTL_NET, PF_ROUTE, 0, 0, NET_RT_FLAGS, RTF_GATEWAY];
-        let mut sa_tab: [*const sockaddr; RTAX_MAX as usize] =
-            [std::ptr::null(); RTAX_MAX as usize];
-        let mut rt_buf_len = 0usize;
-
-        // Get memory size for mib result
-        if unsafe {
-            sysctl(
-                mib.as_mut_ptr(),
-                mib.len() as u32,
-                std::ptr::null_mut(),
-                &mut rt_buf_len as *mut usize,
-                std::ptr::null_mut(),
-                0,
-            )
-        } < 0
-        {
-            error!("Unable to get memory size for routing table");
-            return;
-        }
-
-        // Allocate a buffer
-        let mut rt_buf = vec![0u8; rt_buf_len];
-
-        // Get mib result
-        if unsafe {
-            sysctl(
-                mib.as_mut_ptr(),
-                mib.len() as u32,
-                rt_buf.as_mut_ptr() as *mut c_void,
-                &mut rt_buf_len as *mut usize,
-                std::ptr::null_mut(),
-                0,
-            )
-        } < 0
-        {
-            error!("Unable to get memory size for routing table");
-            return;
-        }
-
-        // Process each routing message
-        let mut mib_ptr = rt_buf.as_ptr();
-        let mib_end = unsafe { mib_ptr.add(rt_buf_len) };
-        while mib_ptr < mib_end {
-            let rt = mib_ptr as *const rt_msghdr;
-            let mut sa = unsafe { rt.add(1) } as *const sockaddr;
-            let rtm_addrs = unsafe { (*rt).rtm_addrs };
-            let intf_index = unsafe { (*rt).rtm_index } as u32;
-
-            // Fill in sockaddr table
-            (0..(RTAX_MAX as usize)).for_each(|i| {
-                if rtm_addrs & (1 << i) != 0 {
-                    sa_tab[i] = sa;
-                    sa = unsafe {
-                        let sa_len = (*sa).sa_len;
-                        sa = ((sa as *const u8).add(round_up!(sa_len as usize))) as *const sockaddr;
-                        sa
-                    };
-                }
-            });
-
-            // Look for gateways
-            if rtm_addrs & (RTA_DST | RTA_GATEWAY) == (RTA_DST | RTA_GATEWAY) {
-                // Only interested in AF_INET and AF_INET6 address families
-                // SockAddr::new() takes care of this for us
-                let saddr_dst = match SockAddr::new(sa_tab[RTAX_DST as usize]) {
-                    Some(a) => a,
-                    None => continue,
-                };
-                let _saddr_gateway = match SockAddr::new(sa_tab[RTAX_GATEWAY as usize]) {
-                    Some(a) => a,
-                    None => continue,
-                };
-
-                // Look for default gateways
-                let dst_ipaddr = match saddr_dst.as_ipaddr() {
-                    Some(a) => a,
-                    None => continue,
-                };
-                if dst_ipaddr.is_unspecified() {
-                    self.default_route_interfaces.insert(intf_index);
-                }
+            // Get memory size for mib result
+            if unsafe {
+                sysctl(
+                    mib.as_mut_ptr(),
+                    mib.len() as u32,
+                    std::ptr::null_mut(),
+                    &mut rt_buf_len as *mut usize,
+                    std::ptr::null_mut(),
+                    0,
+                )
+            } < 0
+            {
+                error!("Unable to get memory size for routing table");
+                return;
             }
 
-            mib_ptr = unsafe { mib_ptr.add((*rt).rtm_msglen.into()) };
+            // Allocate a buffer
+            let mut rt_buf = vec![0u8; rt_buf_len];
+
+            // Get mib result
+            if unsafe {
+                sysctl(
+                    mib.as_mut_ptr(),
+                    mib.len() as u32,
+                    rt_buf.as_mut_ptr() as *mut c_void,
+                    &mut rt_buf_len as *mut usize,
+                    std::ptr::null_mut(),
+                    0,
+                )
+            } < 0
+            {
+                debug!("routing table changed length between interface checks, trying again");
+                continue;
+            }
+
+            // Clear old interfaces
+            self.default_route_interfaces.clear();
+
+            // Process each routing message
+            let mut mib_ptr = rt_buf.as_ptr();
+            let mib_end = unsafe { mib_ptr.add(rt_buf_len) };
+            while mib_ptr < mib_end {
+                let rt = mib_ptr as *const rt_msghdr;
+                let mut sa = unsafe { rt.add(1) } as *const sockaddr;
+                let rtm_addrs = unsafe { (*rt).rtm_addrs };
+                let intf_index = unsafe { (*rt).rtm_index } as u32;
+
+                // Fill in sockaddr table
+                (0..(RTAX_MAX as usize)).for_each(|i| {
+                    if rtm_addrs & (1 << i) != 0 {
+                        sa_tab[i] = sa;
+                        sa = unsafe {
+                            let sa_len = (*sa).sa_len;
+                            sa = ((sa as *const u8).add(round_up!(sa_len as usize)))
+                                as *const sockaddr;
+                            sa
+                        };
+                    }
+                });
+
+                // Look for gateways
+                if rtm_addrs & (RTA_DST | RTA_GATEWAY) == (RTA_DST | RTA_GATEWAY) {
+                    // Only interested in AF_INET and AF_INET6 address families
+                    // SockAddr::new() takes care of this for us
+                    let saddr_dst = match SockAddr::new(sa_tab[RTAX_DST as usize]) {
+                        Some(a) => a,
+                        None => continue,
+                    };
+                    let _saddr_gateway = match SockAddr::new(sa_tab[RTAX_GATEWAY as usize]) {
+                        Some(a) => a,
+                        None => continue,
+                    };
+
+                    // Look for default gateways
+                    let dst_ipaddr = match saddr_dst.as_ipaddr() {
+                        Some(a) => a,
+                        None => continue,
+                    };
+                    if dst_ipaddr.is_unspecified() {
+                        self.default_route_interfaces.insert(intf_index);
+                    }
+                }
+
+                mib_ptr = unsafe { mib_ptr.add((*rt).rtm_msglen.into()) };
+            }
+
+            break;
         }
     }
 
@@ -485,7 +491,10 @@ impl PlatformSupportApple {
                     ) {
                         Ok(v) => v,
                         Err(e) => {
-                            log_net!(debug "failed to get address flags for ifname={}, ifaddr={:?} : {}", ifname, ifaddr.ifa_addr, e);
+                            debug!(
+                                "failed to get address flags for ifname={}, ifaddr={:?} : {}",
+                                ifname, ifaddr.ifa_addr, e
+                            );
                             continue;
                         }
                     };
diff --git a/veilid-tools/src/network_interfaces/mod.rs b/veilid-tools/src/network_interfaces/mod.rs
index 9b3b994f..373a53b5 100644
--- a/veilid-tools/src/network_interfaces/mod.rs
+++ b/veilid-tools/src/network_interfaces/mod.rs
@@ -14,7 +14,7 @@ cfg_if::cfg_if! {
         use self::windows::PlatformSupportWindows as PlatformSupport;
     } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
         use self::apple::PlatformSupportApple as PlatformSupport;
-    } else if #[cfg(any(target_os = "openbsd"))] {
+    } else if #[cfg(target_os = "openbsd")] {
         use self::openbsd::PlatformSupportOpenBSD as PlatformSupport;
     } else {
         compile_error!("No network interfaces support for this platform!");
diff --git a/veilid-tools/src/network_interfaces/netlink.rs b/veilid-tools/src/network_interfaces/netlink.rs
index b8e3579a..ae4eb044 100644
--- a/veilid-tools/src/network_interfaces/netlink.rs
+++ b/veilid-tools/src/network_interfaces/netlink.rs
@@ -26,7 +26,7 @@ cfg_if! {
 use std::convert::TryInto;
 use std::ffi::CStr;
 use std::io;
-use std::os::raw::{c_int, c_char};
+use std::os::raw::{c_char, c_int};
 use tools::*;
 
 fn get_interface_name(index: u32) -> io::Result<String> {
@@ -91,7 +91,7 @@ impl PlatformSupportNetlink {
             .execute();
         while let Some(routev4) = routesv4.try_next().await.unwrap_or_default() {
             if let Some(index) = routev4.output_interface() {
-                //println!("*** ipv4 route: {:#?}", routev4);
+                //info!("*** ipv4 route: {:#?}", routev4);
                 if routev4.header.destination_prefix_length == 0 {
                     self.default_route_interfaces.insert(index);
                 }
@@ -106,7 +106,7 @@ impl PlatformSupportNetlink {
             .execute();
         while let Some(routev6) = routesv6.try_next().await.unwrap_or_default() {
             if let Some(index) = routev6.output_interface() {
-                //println!("*** ipv6 route: {:#?}", routev6);
+                //info!("*** ipv6 route: {:#?}", routev6);
                 if routev6.header.destination_prefix_length == 0 {
                     self.default_route_interfaces.insert(index);
                 }
@@ -187,9 +187,9 @@ impl PlatformSupportNetlink {
         Some(InterfaceAddress::new(
             IfAddr::V4(Ifv4Addr {
                 ip,
-                /// The netmask of the interface.
+                // The netmask of the interface.
                 netmask,
-                /// The broadcast address of the interface.
+                // The broadcast address of the interface.
                 broadcast,
             }),
             flags_to_address_flags(flags),
@@ -234,9 +234,9 @@ impl PlatformSupportNetlink {
         Some(InterfaceAddress::new(
             IfAddr::V6(Ifv6Addr {
                 ip,
-                /// The netmask of the interface.
+                // The netmask of the interface.
                 netmask,
-                /// The broadcast address of the interface.
+                // The broadcast address of the interface.
                 broadcast: None,
             }),
             flags_to_address_flags(flags),
@@ -262,7 +262,7 @@ impl PlatformSupportNetlink {
                     let ifname = match get_interface_name(msg.header.index) {
                         Ok(v) => v,
                         Err(e) => {
-                            log_net!(warn
+                            warn!(target: "net",
                                 "couldn't get interface name for index {}: {}",
                                 msg.header.index,
                                 e
diff --git a/veilid-tools/src/network_interfaces/openbsd.rs b/veilid-tools/src/network_interfaces/openbsd.rs
index bb7d0234..d2f15c04 100644
--- a/veilid-tools/src/network_interfaces/openbsd.rs
+++ b/veilid-tools/src/network_interfaces/openbsd.rs
@@ -1,11 +1,11 @@
-#![cfg(any(target_os = "openbsd"))]
+#![cfg(target_os = "openbsd")]
 #![allow(non_camel_case_types)]
 use super::*;
 
 use libc::{
-    close, freeifaddrs, getifaddrs, if_nametoindex, ifaddrs, ioctl, pid_t, sockaddr, sockaddr_in6, c_short,
-    socket, sysctl, time_t, AF_INET6, CTL_NET, IFF_BROADCAST, IFF_LOOPBACK, IFF_POINTOPOINT,
-    IFF_RUNNING, IFNAMSIZ, NET_RT_FLAGS, PF_ROUTE, SOCK_DGRAM,
+    c_short, close, freeifaddrs, getifaddrs, if_nametoindex, ifaddrs, ioctl, pid_t, sockaddr,
+    sockaddr_in6, socket, sysctl, time_t, AF_INET6, CTL_NET, IFF_BROADCAST, IFF_LOOPBACK,
+    IFF_POINTOPOINT, IFF_RUNNING, IFNAMSIZ, NET_RT_FLAGS, PF_ROUTE, SOCK_DGRAM,
 };
 use sockaddr_tools::SockAddr;
 use std::ffi::CStr;
@@ -29,7 +29,6 @@ const RTA_DST: c_int = 1;
 const RTA_GATEWAY: c_int = 2;
 const RTF_GATEWAY: c_int = 2;
 
-
 macro_rules! set_name {
     ($name_field:expr, $name_str:expr) => {{
         let name_c = &::std::ffi::CString::new($name_str.to_owned()).map_err(|_| {
@@ -364,7 +363,7 @@ impl PlatformSupportOpenBSD {
                     Some(a) => a,
                     None => continue,
                 };
-                 
+
                 let src_ipaddr = match saddr_src.as_ipaddr() {
                     Some(a) => a,
                     None => continue,
diff --git a/veilid-tools/src/network_result.rs b/veilid-tools/src/network_result.rs
index 21f6961a..5fa8f93b 100644
--- a/veilid-tools/src/network_result.rs
+++ b/veilid-tools/src/network_result.rs
@@ -329,41 +329,20 @@ macro_rules! network_result_try {
     };
 }
 
-#[macro_export]
-macro_rules! log_network_result {
-    ($text:expr) => {
-        cfg_if::cfg_if! {
-            if #[cfg(feature="network-result-extra")] {
-                info!(target: "network_result", "{}", format!("{}", $text))
-            } else {
-                debug!(target: "network_result", "{}", format!("{}", $text))
-            }
-        }
-    };
-    ($fmt:literal, $($arg:expr),+) => {
-        cfg_if::cfg_if! {
-            if #[cfg(feature="network-result-extra")] {
-                info!(target: "network_result", "{}", format!($fmt, $($arg),+));
-            } else {
-                debug!(target: "network_result", "{}", format!($fmt, $($arg),+));
-            }
-        }
-    };
-}
-
 #[macro_export]
 macro_rules! network_result_value_or_log {
     ($r:expr => $f:expr) => {
         network_result_value_or_log!($r => [ "" ] $f )
     };
     ($r:expr => [ $d:expr ] $f:expr) => { {
-        #[cfg(feature="network-result-extra")]
-        let __extra_message = $d;
-        #[cfg(not(feature="network-result-extra"))]
-        let __extra_message = "";
+        let __extra_message = if debug_target_enabled!("network_result") {
+            $d.to_string()
+        } else {
+            "".to_string()
+        };
         match $r {
             NetworkResult::Timeout => {
-                log_network_result!(
+                log_network_result!(debug
                     "{} at {}@{}:{} in {}{}",
                     "Timeout",
                     file!(),
@@ -375,7 +354,7 @@ macro_rules! network_result_value_or_log {
                 $f
             }
             NetworkResult::ServiceUnavailable(ref s) => {
-                log_network_result!(
+                log_network_result!(debug
                     "{}({}) at {}@{}:{} in {}{}",
                     "ServiceUnavailable",
                     s,
@@ -388,7 +367,7 @@ macro_rules! network_result_value_or_log {
                 $f
             }
             NetworkResult::NoConnection(ref e) => {
-                log_network_result!(
+                log_network_result!(debug
                     "{}({}) at {}@{}:{} in {}{}",
                     "No connection",
                     e.to_string(),
@@ -401,7 +380,7 @@ macro_rules! network_result_value_or_log {
                 $f
             }
             NetworkResult::AlreadyExists(ref e) => {
-                log_network_result!(
+                log_network_result!(debug
                     "{}({}) at {}@{}:{} in {}{}",
                     "Already exists",
                     e.to_string(),
@@ -414,7 +393,7 @@ macro_rules! network_result_value_or_log {
                 $f
             }
             NetworkResult::InvalidMessage(ref s) => {
-                log_network_result!(
+                log_network_result!(debug
                     "{}({}) at {}@{}:{} in {}{}",
                     "Invalid message",
                     s,
diff --git a/veilid-tools/src/tests/common/mod.rs b/veilid-tools/src/tests/common/mod.rs
index 393bcfa9..0b2d1bd2 100644
--- a/veilid-tools/src/tests/common/mod.rs
+++ b/veilid-tools/src/tests/common/mod.rs
@@ -21,7 +21,7 @@ pub static DEFAULT_LOG_IGNORE_LIST: [&str; 21] = [
     "tungstenite",
     "netlink_proto",
     "netlink_sys",
-    "trust_dns_resolver",
-    "trust_dns_proto",
+    "hickory_resolver",
+    "hickory_proto",
     "attohttpc",
 ];
diff --git a/veilid-tools/src/tests/native/mod.rs b/veilid-tools/src/tests/native/mod.rs
index 7fcf2e9e..da61dfff 100644
--- a/veilid-tools/src/tests/native/mod.rs
+++ b/veilid-tools/src/tests/native/mod.rs
@@ -53,23 +53,25 @@ cfg_if! {
 
                 cfg_if! {
                     if #[cfg(feature = "tracing")] {
-                        use tracing_subscriber::{filter, fmt, prelude::*};
-                        let mut filters = filter::Targets::new().with_default(filter::LevelFilter::TRACE);
+                        use tracing_subscriber::{EnvFilter, fmt, prelude::*};
+                        let mut env_filter = EnvFilter::builder().from_env_lossy();
                         for ig in DEFAULT_LOG_IGNORE_LIST {
-                            filters = filters.with_target(ig, filter::LevelFilter::OFF);
+                            env_filter = env_filter.add_directive(format!("{}=off", ig).parse().unwrap());
                         }
                         let fmt_layer = fmt::layer();
                         tracing_subscriber::registry()
                             .with(fmt_layer)
-                            .with(filters)
+                            .with(env_filter)
                             .init();
                     } else {
                         use simplelog::*;
-                        let mut cb = ConfigBuilder::new();
-                        for ig in DEFAULT_LOG_IGNORE_LIST {
-                            cb.add_filter_ignore_str(ig);
+                        if let Ok(level_filter) = LevelFilter::from_str(&std::env::var("RUST_LOG").unwrap_or_default()) {
+                            let mut cb = ConfigBuilder::new();
+                            for ig in DEFAULT_LOG_IGNORE_LIST {
+                                cb.add_filter_ignore_str(ig);
+                            }
+                            TestLogger::init(level_filter, cb.build()).unwrap();
                         }
-                        TestLogger::init(LevelFilter::Trace, cb.build()).unwrap();
                     }
                 }
 
diff --git a/veilid-tools/src/tests/native/test_assembly_buffer.rs b/veilid-tools/src/tests/native/test_assembly_buffer.rs
index b717a5a8..094bee73 100644
--- a/veilid-tools/src/tests/native/test_assembly_buffer.rs
+++ b/veilid-tools/src/tests/native/test_assembly_buffer.rs
@@ -84,7 +84,7 @@ pub async fn test_one_frag_out_in() {
     let mut all_sent = HashSet::new();
 
     // Sending
-    println!("sending");
+    info!("sending");
     for _ in 0..10000 {
         let random_len = (get_random_u32() % 1000) as usize + FRAGMENT_LEN;
         let mut message = vec![1u8; random_len];
@@ -101,14 +101,14 @@ pub async fn test_one_frag_out_in() {
         ));
     }
 
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
-    println!("fragments sent = {}", net_rx.len());
+    info!("fragments sent = {}", net_rx.len());
 
     drop(net_tx);
 
     // Receiving
-    println!("receiving");
+    info!("receiving");
 
     while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
         // Send to input
@@ -122,7 +122,7 @@ pub async fn test_one_frag_out_in() {
             assert!(all_sent.remove(&(r_message, r_remote_addr)));
         }
     }
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
     // Shoud have dropped no packets
     assert_eq!(all_sent.len(), 0);
@@ -148,7 +148,7 @@ pub async fn test_many_frags_out_in() {
 
     // Sending
     let mut total_sent_size = 0usize;
-    println!("sending");
+    info!("sending");
     for _ in 0..1000 {
         let random_len = (get_random_u32() % 65536) as usize;
         total_sent_size += random_len;
@@ -166,14 +166,14 @@ pub async fn test_many_frags_out_in() {
         ));
     }
 
-    println!("all_sent len={}", all_sent.len());
-    println!("total_sent_size = {}", total_sent_size);
-    println!("fragments sent = {}", net_rx.len());
+    info!("all_sent len={}", all_sent.len());
+    info!("total_sent_size = {}", total_sent_size);
+    info!("fragments sent = {}", net_rx.len());
 
     drop(net_tx);
 
     // Receiving
-    println!("receiving");
+    info!("receiving");
 
     while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
         // Send to input
@@ -187,7 +187,7 @@ pub async fn test_many_frags_out_in() {
             assert!(all_sent.remove(&(r_message, r_remote_addr)));
         }
     }
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
     // Shoud have dropped no packets
     assert_eq!(all_sent.len(), 0);
@@ -213,7 +213,7 @@ pub async fn test_many_frags_out_in_single_host() {
 
     // Sending
     let mut total_sent_size = 0usize;
-    println!("sending");
+    info!("sending");
     for _ in 0..1000 {
         let random_len = (get_random_u32() % 65536) as usize;
         total_sent_size += random_len;
@@ -231,14 +231,14 @@ pub async fn test_many_frags_out_in_single_host() {
         ));
     }
 
-    println!("all_sent len={}", all_sent.len());
-    println!("total_sent_size = {}", total_sent_size);
-    println!("fragments sent = {}", net_rx.len());
+    info!("all_sent len={}", all_sent.len());
+    info!("total_sent_size = {}", total_sent_size);
+    info!("fragments sent = {}", net_rx.len());
 
     drop(net_tx);
 
     // Receiving
-    println!("receiving");
+    info!("receiving");
 
     while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
         // Send to input
@@ -252,7 +252,7 @@ pub async fn test_many_frags_out_in_single_host() {
             assert!(all_sent.remove(&(r_message, r_remote_addr)));
         }
     }
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
     // Shoud have dropped no packets
     assert_eq!(all_sent.len(), 0);
@@ -286,7 +286,7 @@ pub async fn test_many_frags_with_drops() {
     // Sending
     let mut total_sent_size = 0usize;
     let mut total_fragged = 0usize;
-    println!("sending");
+    info!("sending");
     for _ in 0..1000 {
         let random_len = (get_random_u32() % 65536) as usize;
         if random_len > FRAGMENT_LEN {
@@ -309,14 +309,14 @@ pub async fn test_many_frags_with_drops() {
         first.store(true, Ordering::Release);
     }
 
-    println!("all_sent len={}", all_sent.len());
-    println!("total_sent_size = {}", total_sent_size);
-    println!("fragments sent = {}", net_rx.len());
-    println!("total_fragged = {}", total_fragged);
+    info!("all_sent len={}", all_sent.len());
+    info!("total_sent_size = {}", total_sent_size);
+    info!("fragments sent = {}", net_rx.len());
+    info!("total_fragged = {}", total_fragged);
     drop(net_tx);
 
     // Receiving
-    println!("receiving");
+    info!("receiving");
 
     while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
         // Send to input
@@ -330,7 +330,7 @@ pub async fn test_many_frags_with_drops() {
             assert!(all_sent.remove(&(r_message, r_remote_addr)));
         }
     }
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
     // Shoud have dropped all fragged packets
     assert_eq!(all_sent.len(), total_fragged);
@@ -356,7 +356,7 @@ pub async fn test_many_frags_reordered() {
     // Sending
     let mut total_sent_size = 0usize;
     let mut rng = rand::thread_rng();
-    println!("sending");
+    info!("sending");
     for _ in 0..1000 {
         let random_len = (get_random_u32() % 65536) as usize;
         total_sent_size += random_len;
@@ -386,14 +386,14 @@ pub async fn test_many_frags_reordered() {
         }
     }
 
-    println!("all_sent len={}", all_sent.len());
-    println!("total_sent_size = {}", total_sent_size);
-    println!("fragments sent = {}", net_rx.len());
+    info!("all_sent len={}", all_sent.len());
+    info!("total_sent_size = {}", total_sent_size);
+    info!("fragments sent = {}", net_rx.len());
 
     drop(net_tx);
 
     // Receiving
-    println!("receiving");
+    info!("receiving");
 
     while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
         // Send to input
@@ -407,7 +407,7 @@ pub async fn test_many_frags_reordered() {
             assert!(all_sent.remove(&(r_message, r_remote_addr)));
         }
     }
-    println!("all_sent len={}", all_sent.len());
+    info!("all_sent len={}", all_sent.len());
 
     // Shoud have dropped no packets
     assert_eq!(all_sent.len(), 0);
diff --git a/veilid-tools/src/tests/native/test_async_peek_stream.rs b/veilid-tools/src/tests/native/test_async_peek_stream.rs
index 0d6bb881..1fde13f5 100644
--- a/veilid-tools/src/tests/native/test_async_peek_stream.rs
+++ b/veilid-tools/src/tests/native/test_async_peek_stream.rs
@@ -23,7 +23,7 @@ async fn make_tcp_loopback() -> Result<(TcpStream, TcpStream), io::Error> {
 
     let accept_future = async {
         let (accepted_stream, peer_address) = listener.accept().await?;
-        trace!("connection from {}", peer_address);
+        trace!(target: "net", "connection from {}", peer_address);
         accepted_stream.set_nodelay(true)?;
         Result::<TcpStream, io::Error>::Ok(accepted_stream)
     };
diff --git a/veilid-tools/src/tick_task.rs b/veilid-tools/src/tick_task.rs
index 4c2b5a5a..339bd49d 100644
--- a/veilid-tools/src/tick_task.rs
+++ b/veilid-tools/src/tick_task.rs
@@ -77,13 +77,13 @@ impl<E: Send + 'static> TickTask<E> {
         let opt_stop_source = &mut *self.stop_source.lock().await;
         if opt_stop_source.is_none() {
             // already stopped, just return
-            trace!("tick task already stopped");
+            trace!(target: "veilid_tools", "tick task already stopped");
             return Ok(());
         }
         drop(opt_stop_source.take());
 
         // wait for completion of the tick task
-        trace!("stopping single future");
+        trace!(target: "veilid_tools", "stopping single future");
         match self.single_future.join().await {
             Ok(Some(Err(err))) => Err(err),
             _ => Ok(()),
diff --git a/veilid-tools/src/tools.rs b/veilid-tools/src/tools.rs
index e87679ca..02c050e1 100644
--- a/veilid-tools/src/tools.rs
+++ b/veilid-tools/src/tools.rs
@@ -465,3 +465,7 @@ pub fn is_debug_backtrace_enabled() -> bool {
 pub fn type_name_of_val<T: ?Sized>(_val: &T) -> &'static str {
     std::any::type_name::<T>()
 }
+
+pub fn map_to_string<X: ToString>(arg: X) -> String {
+    arg.to_string()
+}
diff --git a/veilid-wasm/src/lib.rs b/veilid-wasm/src/lib.rs
index 3e72be6c..53d48b21 100644
--- a/veilid-wasm/src/lib.rs
+++ b/veilid-wasm/src/lib.rs
@@ -5,6 +5,9 @@
 #![cfg(target_arch = "wasm32")]
 #![no_std]
 
+/// Veilid WASM Bindings for Flutter/Dart, as well as Native Javascript
+/// The Flutter/Dart bindings are in this lib.rs directly
+/// The Native Javascript bindings are in the other files.
 extern crate alloc;
 use alloc::string::String;
 use alloc::sync::Arc;
@@ -145,6 +148,7 @@ pub struct VeilidWASMConfigLoggingPerformance {
     pub level: veilid_core::VeilidConfigLogLevel,
     pub logs_in_timings: bool,
     pub logs_in_console: bool,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -152,6 +156,7 @@ pub struct VeilidWASMConfigLoggingPerformance {
 pub struct VeilidWASMConfigLoggingAPI {
     pub enabled: bool,
     pub level: veilid_core::VeilidConfigLogLevel,
+    pub ignore_log_targets: Vec<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -204,8 +209,10 @@ pub fn initialize_veilid_core(platform_config: String) {
 
     // Performance logger
     if platform_config.logging.performance.enabled {
-        let filter =
-            veilid_core::VeilidLayerFilter::new(platform_config.logging.performance.level, None);
+        let filter = veilid_core::VeilidLayerFilter::new(
+            platform_config.logging.performance.level,
+            &platform_config.logging.performance.ignore_log_targets,
+        );
         let layer = WASMLayer::new(
             WASMLayerConfigBuilder::new()
                 .set_report_logs_in_timings(platform_config.logging.performance.logs_in_timings)
@@ -223,7 +230,10 @@ pub fn initialize_veilid_core(platform_config: String) {
 
     // API logger
     if platform_config.logging.api.enabled {
-        let filter = veilid_core::VeilidLayerFilter::new(platform_config.logging.api.level, None);
+        let filter = veilid_core::VeilidLayerFilter::new(
+            platform_config.logging.api.level,
+            &platform_config.logging.api.ignore_log_targets,
+        );
         let layer = veilid_core::ApiTracingLayer::get().with_filter(filter.clone());
         filters.insert("api", filter);
         layers.push(layer.boxed());
@@ -253,6 +263,46 @@ pub fn change_log_level(layer: String, log_level: String) {
     }
 }
 
+fn apply_ignore_change(ignore_list: Vec<String>, target_change: String) -> Vec<String> {
+    let mut ignore_list = ignore_list.clone();
+
+    for change in target_change.split(',').map(|c| c.trim().to_owned()) {
+        if change.is_empty() {
+            continue;
+        }
+        if let Some(target) = change.strip_prefix('-') {
+            ignore_list.retain(|x| x != target);
+        } else if !ignore_list.contains(&change) {
+            ignore_list.push(change.to_string());
+        }
+    }
+
+    ignore_list
+}
+
+#[wasm_bindgen()]
+pub fn change_log_ignore(layer: String, log_ignore: String) {
+    let layer = if layer == "all" { "".to_owned() } else { layer };
+
+    let filters = (*FILTERS).borrow();
+    if layer.is_empty() {
+        // Change all layers
+        for f in filters.values() {
+            f.set_ignore_list(Some(apply_ignore_change(
+                f.ignore_list(),
+                log_ignore.clone(),
+            )));
+        }
+    } else {
+        // Change a specific layer
+        let f = filters.get(layer.as_str()).unwrap();
+        f.set_ignore_list(Some(apply_ignore_change(
+            f.ignore_list(),
+            log_ignore.clone(),
+        )));
+    }
+}
+
 #[wasm_bindgen()]
 pub fn startup_veilid_core(update_callback_js: Function, json_config: String) -> Promise {
     let update_callback_js = SendWrapper::new(update_callback_js);
@@ -391,20 +441,20 @@ pub fn routing_context_with_sequencing(id: u32, sequencing: String) -> u32 {
     add_routing_context(routing_context)
 }
 
+fn get_routing_context(id: u32, func_name: &str) -> APIResult<veilid_core::RoutingContext> {
+    let rc = (*ROUTING_CONTEXTS).borrow();
+    let Some(routing_context) = rc.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(routing_context.clone())
+}
+
 #[wasm_bindgen()]
 pub fn routing_context_safety(id: u32) -> Promise {
     wrap_api_future_json(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_safety",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_safety")?;
 
         let safety_selection = routing_context.safety();
         APIResult::Ok(safety_selection)
@@ -417,17 +467,7 @@ pub fn routing_context_app_call(id: u32, target_string: String, request: String)
         .decode(request.as_bytes())
         .unwrap();
     wrap_api_future_plain(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_app_call",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_app_call")?;
 
         let veilid_api = get_veilid_api()?;
         let target = veilid_api.parse_as_target(target_string).await?;
@@ -443,17 +483,7 @@ pub fn routing_context_app_message(id: u32, target_string: String, message: Stri
         .decode(message.as_bytes())
         .unwrap();
     wrap_api_future_void(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_app_message",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_app_message")?;
 
         let veilid_api = get_veilid_api()?;
         let target = veilid_api.parse_as_target(target_string).await?;
@@ -472,17 +502,7 @@ pub fn routing_context_create_dht_record(id: u32, schema: String, kind: u32) ->
     let schema: veilid_core::DHTSchema = veilid_core::deserialize_json(&schema).unwrap();
 
     wrap_api_future_json(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_create_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_create_dht_record")?;
 
         let dht_record_descriptor = routing_context
             .create_dht_record(schema, crypto_kind)
@@ -497,17 +517,8 @@ pub fn routing_context_open_dht_record(id: u32, key: String, writer: Option<Stri
     let writer: Option<veilid_core::KeyPair> =
         writer.map(|s| veilid_core::deserialize_json(&s).unwrap());
     wrap_api_future_json(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_open_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_open_dht_record")?;
+
         let dht_record_descriptor = routing_context.open_dht_record(key, writer).await?;
         APIResult::Ok(dht_record_descriptor)
     })
@@ -517,17 +528,8 @@ pub fn routing_context_open_dht_record(id: u32, key: String, writer: Option<Stri
 pub fn routing_context_close_dht_record(id: u32, key: String) -> Promise {
     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
     wrap_api_future_void(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_close_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_close_dht_record")?;
+
         routing_context.close_dht_record(key).await?;
         APIRESULT_UNDEFINED
     })
@@ -537,17 +539,8 @@ pub fn routing_context_close_dht_record(id: u32, key: String) -> Promise {
 pub fn routing_context_delete_dht_record(id: u32, key: String) -> Promise {
     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
     wrap_api_future_void(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_delete_dht_record",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_delete_dht_record")?;
+
         routing_context.delete_dht_record(key).await?;
         APIRESULT_UNDEFINED
     })
@@ -562,17 +555,8 @@ pub fn routing_context_get_dht_value(
 ) -> Promise {
     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
     wrap_api_future_json(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_get_dht_value",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_get_dht_value")?;
+
         let res = routing_context
             .get_dht_value(key, subkey, force_refresh)
             .await?;
@@ -581,25 +565,26 @@ pub fn routing_context_get_dht_value(
 }
 
 #[wasm_bindgen()]
-pub fn routing_context_set_dht_value(id: u32, key: String, subkey: u32, data: String) -> Promise {
+pub fn routing_context_set_dht_value(
+    id: u32,
+    key: String,
+    subkey: u32,
+    data: String,
+    writer: Option<String>,
+) -> Promise {
     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
     let data: Vec<u8> = data_encoding::BASE64URL_NOPAD
         .decode(data.as_bytes())
         .unwrap();
+    let writer: Option<veilid_core::KeyPair> =
+        writer.map(|s| veilid_core::deserialize_json(&s).unwrap());
 
     wrap_api_future_json(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_set_dht_value",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
-        let res = routing_context.set_dht_value(key, subkey, data).await?;
+        let routing_context = get_routing_context(id, "routing_context_set_dht_value")?;
+
+        let res = routing_context
+            .set_dht_value(key, subkey, data, writer)
+            .await?;
         APIResult::Ok(res)
     })
 }
@@ -618,17 +603,8 @@ pub fn routing_context_watch_dht_values(
     let expiration = veilid_core::Timestamp::from_str(&expiration).unwrap();
 
     wrap_api_future_plain(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_watch_dht_values",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_watch_dht_values")?;
+
         let res = routing_context
             .watch_dht_values(key, subkeys, expiration, count)
             .await?;
@@ -643,22 +619,36 @@ pub fn routing_context_cancel_dht_watch(id: u32, key: String, subkeys: String) -
         veilid_core::deserialize_json(&subkeys).unwrap();
 
     wrap_api_future_plain(async move {
-        let routing_context = {
-            let rc = (*ROUTING_CONTEXTS).borrow();
-            let Some(routing_context) = rc.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "routing_context_cancel_dht_watch",
-                    "id",
-                    id,
-                ));
-            };
-            routing_context.clone()
-        };
+        let routing_context = get_routing_context(id, "routing_context_cancel_dht_watch")?;
+
         let res = routing_context.cancel_dht_watch(key, subkeys).await?;
         APIResult::Ok(res)
     })
 }
 
+#[wasm_bindgen()]
+pub fn routing_context_inspect_dht_record(
+    id: u32,
+    key: String,
+    subkeys: String,
+    scope: String,
+) -> Promise {
+    let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
+    let subkeys: veilid_core::ValueSubkeyRangeSet =
+        veilid_core::deserialize_json(&subkeys).unwrap();
+    let scope: veilid_core::DHTReportScope = veilid_core::deserialize_json(&scope).unwrap();
+
+    wrap_api_future_json(async move {
+        let routing_context = get_routing_context(id, "routing_context_inspect_dht_record")?;
+
+        let res = routing_context
+            .inspect_dht_record(key, subkeys, scope)
+            .await?;
+
+        APIResult::Ok(res)
+    })
+}
+
 #[wasm_bindgen()]
 pub fn new_private_route() -> Promise {
     wrap_api_future_json(async move {
@@ -706,7 +696,7 @@ pub fn import_remote_private_route(blob: String) -> Promise {
 
 #[wasm_bindgen()]
 pub fn release_private_route(route_id: String) -> Promise {
-    let route_id: veilid_core::RouteId = veilid_core::deserialize_json(&route_id).unwrap();
+    let route_id: veilid_core::RouteId = veilid_core::RouteId::try_decode(&route_id).unwrap();
     wrap_api_future_void(async move {
         let veilid_api = get_veilid_api()?;
         veilid_api.release_private_route(route_id)?;
@@ -792,20 +782,20 @@ pub fn table_db_get_column_count(id: u32) -> u32 {
     cc
 }
 
+fn get_table_db(id: u32, func_name: &str) -> APIResult<veilid_core::TableDB> {
+    let table_dbs = (*TABLE_DBS).borrow();
+    let Some(table_db) = table_dbs.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(table_db.clone())
+}
+
 #[wasm_bindgen()]
 pub fn table_db_get_keys(id: u32, col: u32) -> Promise {
     wrap_api_future_json(async move {
-        let table_db = {
-            let table_dbs = (*TABLE_DBS).borrow();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_store",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_get_keys")?;
 
         let keys = table_db.clone().get_keys(col).await?;
         let out: Vec<String> = keys
@@ -845,20 +835,23 @@ pub fn release_table_db_transaction(id: u32) -> i32 {
     1
 }
 
+fn get_table_db_transaction(
+    id: u32,
+    func_name: &str,
+) -> APIResult<veilid_core::TableDBTransaction> {
+    let tdbts = (*TABLE_DB_TRANSACTIONS).borrow();
+    let Some(tdbt) = tdbts.get(&id) else {
+        return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
+            func_name, "id", id,
+        ));
+    };
+    Ok(tdbt.clone())
+}
+
 #[wasm_bindgen()]
 pub fn table_db_transaction_commit(id: u32) -> Promise {
     wrap_api_future_void(async move {
-        let tdbt = {
-            let tdbts = (*TABLE_DB_TRANSACTIONS).borrow();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_commit",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_commit")?;
 
         tdbt.commit().await?;
         APIRESULT_UNDEFINED
@@ -868,17 +861,7 @@ pub fn table_db_transaction_commit(id: u32) -> Promise {
 #[wasm_bindgen()]
 pub fn table_db_transaction_rollback(id: u32) -> Promise {
     wrap_api_future_void(async move {
-        let tdbt = {
-            let tdbts = (*TABLE_DB_TRANSACTIONS).borrow();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_rollback",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_rollback")?;
 
         tdbt.rollback();
         APIRESULT_UNDEFINED
@@ -894,17 +877,7 @@ pub fn table_db_transaction_store(id: u32, col: u32, key: String, value: String)
         .decode(value.as_bytes())
         .unwrap();
     wrap_api_future_void(async move {
-        let tdbt = {
-            let tdbts = (*TABLE_DB_TRANSACTIONS).borrow();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_store",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_store")?;
 
         tdbt.store(col, &key, &value)?;
         APIRESULT_UNDEFINED
@@ -917,17 +890,7 @@ pub fn table_db_transaction_delete(id: u32, col: u32, key: String) -> Promise {
         .decode(key.as_bytes())
         .unwrap();
     wrap_api_future_void(async move {
-        let tdbt = {
-            let tdbts = (*TABLE_DB_TRANSACTIONS).borrow();
-            let Some(tdbt) = tdbts.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_transaction_delete",
-                    "id",
-                    id,
-                ));
-            };
-            tdbt.clone()
-        };
+        let tdbt = get_table_db_transaction(id, "table_db_transaction_delete")?;
 
         tdbt.delete(col, &key)?;
         APIRESULT_UNDEFINED
@@ -943,17 +906,7 @@ pub fn table_db_store(id: u32, col: u32, key: String, value: String) -> Promise
         .decode(value.as_bytes())
         .unwrap();
     wrap_api_future_void(async move {
-        let table_db = {
-            let table_dbs = (*TABLE_DBS).borrow();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_store",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_store")?;
 
         table_db.store(col, &key, &value).await?;
         APIRESULT_UNDEFINED
@@ -966,17 +919,7 @@ pub fn table_db_load(id: u32, col: u32, key: String) -> Promise {
         .decode(key.as_bytes())
         .unwrap();
     wrap_api_future_plain(async move {
-        let table_db = {
-            let table_dbs = (*TABLE_DBS).borrow();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_load",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_load")?;
 
         let out = table_db.load(col, &key).await?;
         let out = out.map(|x| data_encoding::BASE64URL_NOPAD.encode(&x));
@@ -990,17 +933,7 @@ pub fn table_db_delete(id: u32, col: u32, key: String) -> Promise {
         .decode(key.as_bytes())
         .unwrap();
     wrap_api_future_plain(async move {
-        let table_db = {
-            let table_dbs = (*TABLE_DBS).borrow();
-            let Some(table_db) = table_dbs.get(&id) else {
-                return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument(
-                    "table_db_delete",
-                    "id",
-                    id,
-                ));
-            };
-            table_db.clone()
-        };
+        let table_db = get_table_db(id, "table_db_delete")?;
 
         let out = table_db.delete(col, &key).await?;
         let out = out.map(|x| data_encoding::BASE64URL_NOPAD.encode(&x));
@@ -1115,6 +1048,36 @@ pub fn crypto_compute_dh(kind: u32, key: String, secret: String) -> Promise {
     })
 }
 
+#[wasm_bindgen()]
+pub fn crypto_generate_shared_secret(
+    kind: u32,
+    key: String,
+    secret: String,
+    domain: String,
+) -> Promise {
+    let kind: veilid_core::CryptoKind = veilid_core::FourCC::from(kind);
+
+    let key: veilid_core::PublicKey = veilid_core::deserialize_json(&key).unwrap();
+    let secret: veilid_core::SecretKey = veilid_core::deserialize_json(&secret).unwrap();
+    let domain: Vec<u8> = data_encoding::BASE64URL_NOPAD
+        .decode(domain.as_bytes())
+        .unwrap();
+
+    wrap_api_future_json(async move {
+        let veilid_api = get_veilid_api()?;
+        let crypto = veilid_api.crypto()?;
+        let csv = crypto.get(kind).ok_or_else(|| {
+            veilid_core::VeilidAPIError::invalid_argument(
+                "crypto_generate_shared_secret",
+                "kind",
+                kind.to_string(),
+            )
+        })?;
+        let out = csv.generate_shared_secret(&key, &secret, &domain)?;
+        APIResult::Ok(out)
+    })
+}
+
 #[wasm_bindgen()]
 pub fn crypto_random_bytes(kind: u32, len: u32) -> Promise {
     let kind: veilid_core::CryptoKind = veilid_core::FourCC::from(kind);
@@ -1607,3 +1570,8 @@ pub fn veilid_version() -> JsValue {
     };
     <JsValue as JsValueSerdeExt>::from_serde(&vv).unwrap()
 }
+
+#[wasm_bindgen()]
+pub fn default_veilid_config() -> String {
+    veilid_core::default_veilid_config()
+}
diff --git a/veilid-wasm/src/veilid_client_js.rs b/veilid-wasm/src/veilid_client_js.rs
index 6c52372a..8f061e14 100644
--- a/veilid-wasm/src/veilid_client_js.rs
+++ b/veilid-wasm/src/veilid_client_js.rs
@@ -42,8 +42,10 @@ impl VeilidClient {
 
         // Performance logger
         if platformConfig.logging.performance.enabled {
-            let filter =
-                veilid_core::VeilidLayerFilter::new(platformConfig.logging.performance.level, None);
+            let filter = veilid_core::VeilidLayerFilter::new(
+                platformConfig.logging.performance.level,
+                &platformConfig.logging.performance.ignore_log_targets,
+            );
             let layer = WASMLayer::new(
                 WASMLayerConfigBuilder::new()
                     .set_report_logs_in_timings(platformConfig.logging.performance.logs_in_timings)
@@ -61,8 +63,10 @@ impl VeilidClient {
 
         // API logger
         if platformConfig.logging.api.enabled {
-            let filter =
-                veilid_core::VeilidLayerFilter::new(platformConfig.logging.api.level, None);
+            let filter = veilid_core::VeilidLayerFilter::new(
+                platformConfig.logging.api.level,
+                &platformConfig.logging.api.ignore_log_targets,
+            );
             let layer = veilid_core::ApiTracingLayer::get().with_filter(filter.clone());
             filters.insert("api", filter);
             layers.push(layer.boxed());
@@ -125,6 +129,44 @@ impl VeilidClient {
         }
     }
 
+    fn apply_ignore_change(ignore_list: Vec<String>, changes: Vec<String>) -> Vec<String> {
+        let mut ignore_list = ignore_list.clone();
+
+        for change in changes.iter().map(|c| c.trim().to_owned()) {
+            if change.is_empty() {
+                continue;
+            }
+            if let Some(target) = change.strip_prefix('-') {
+                ignore_list.retain(|x| x != target);
+            } else if !ignore_list.contains(&change) {
+                ignore_list.push(change.to_string());
+            }
+        }
+
+        ignore_list
+    }
+
+    // TODO: can we refine the TS type of `layer`?
+    pub fn changeLogIgnore(layer: String, changes: Vec<String>) {
+        let layer = if layer == "all" { "".to_owned() } else { layer };
+        let filters = (*FILTERS).borrow();
+        if layer.is_empty() {
+            // Change all layers
+            for f in filters.values() {
+                f.set_ignore_list(Some(Self::apply_ignore_change(
+                    f.ignore_list(),
+                    changes.clone(),
+                )));
+            }
+        } else {
+            // Change a specific layer
+            let f = filters.get(layer.as_str()).unwrap();
+            f.set_ignore_list(Some(Self::apply_ignore_change(
+                f.ignore_list(),
+                changes.clone(),
+            )));
+        }
+    }
     /// Shut down Veilid and terminate the API.
     pub async fn shutdownCore() -> APIResult<()> {
         let veilid_api = take_veilid_api()?;
@@ -153,6 +195,11 @@ impl VeilidClient {
         APIRESULT_UNDEFINED
     }
 
+    /// Get the current timestamp, in string format
+    pub fn now() -> String {
+        veilid_core::get_aligned_timestamp().as_u64().to_string()
+    }
+
     /// Execute an 'internal debug command'.
     pub async fn debug(command: String) -> APIResult<String> {
         let veilid_api = get_veilid_api()?;
@@ -174,4 +221,9 @@ impl VeilidClient {
     pub fn versionString() -> String {
         veilid_core::veilid_version_string()
     }
+
+    /// Return the default veilid configuration, in string format
+    pub fn defaultConfig() -> String {
+        veilid_core::default_veilid_config()
+    }
 }
diff --git a/veilid-wasm/src/veilid_crypto_js.rs b/veilid-wasm/src/veilid_crypto_js.rs
index b3cd536b..5933f39b 100644
--- a/veilid-wasm/src/veilid_crypto_js.rs
+++ b/veilid-wasm/src/veilid_crypto_js.rs
@@ -58,6 +58,30 @@ impl VeilidCrypto {
         APIResult::Ok(out.to_string())
     }
 
+    pub fn generateSharedSecret(
+        kind: String,
+        key: String,
+        secret: String,
+        domain: Box<[u8]>,
+    ) -> APIResult<String> {
+        let kind: veilid_core::CryptoKind = veilid_core::FourCC::from_str(&kind)?;
+
+        let key: veilid_core::PublicKey = veilid_core::PublicKey::from_str(&key)?;
+        let secret: veilid_core::SecretKey = veilid_core::SecretKey::from_str(&secret)?;
+
+        let veilid_api = get_veilid_api()?;
+        let crypto = veilid_api.crypto()?;
+        let crypto_system = crypto.get(kind).ok_or_else(|| {
+            veilid_core::VeilidAPIError::invalid_argument(
+                "crypto_generate_shared_secret",
+                "kind",
+                kind.to_string(),
+            )
+        })?;
+        let out = crypto_system.generate_shared_secret(&key, &secret, &domain)?;
+        APIResult::Ok(out.to_string())
+    }
+
     pub fn randomBytes(kind: String, len: u32) -> APIResult<Box<[u8]>> {
         let kind: veilid_core::CryptoKind = veilid_core::FourCC::from_str(&kind)?;
 
diff --git a/veilid-wasm/src/veilid_routing_context_js.rs b/veilid-wasm/src/veilid_routing_context_js.rs
index 362fe65a..4a7201d7 100644
--- a/veilid-wasm/src/veilid_routing_context_js.rs
+++ b/veilid-wasm/src/veilid_routing_context_js.rs
@@ -101,6 +101,7 @@ impl VeilidRoutingContext {
     // --------------------------------
     // Instance methods
     // --------------------------------
+
     fn getRoutingContext(&self) -> APIResult<RoutingContext> {
         APIResult::Ok(self.inner_routing_context.clone())
     }
@@ -265,13 +266,13 @@ impl VeilidRoutingContext {
     pub async fn getDhtValue(
         &self,
         key: String,
-        subKey: u32,
+        subkey: u32,
         forceRefresh: bool,
     ) -> APIResult<Option<ValueData>> {
         let key = TypedKey::from_str(&key)?;
         let routing_context = self.getRoutingContext()?;
         let res = routing_context
-            .get_dht_value(key, subKey, forceRefresh)
+            .get_dht_value(key, subkey, forceRefresh)
             .await?;
         APIResult::Ok(res)
     }
@@ -283,55 +284,140 @@ impl VeilidRoutingContext {
     pub async fn setDhtValue(
         &self,
         key: String,
-        subKey: u32,
+        subkey: u32,
         data: Box<[u8]>,
+        writer: Option<String>,
     ) -> APIResult<Option<ValueData>> {
         let key = TypedKey::from_str(&key)?;
         let data = data.into_vec();
+        let writer = writer
+            .map(|writer| KeyPair::from_str(&writer))
+            .map_or(APIResult::Ok(None), |r| r.map(Some))?;
 
         let routing_context = self.getRoutingContext()?;
-        let res = routing_context.set_dht_value(key, subKey, data).await?;
+        let res = routing_context
+            .set_dht_value(key, subkey, data, writer)
+            .await?;
         APIResult::Ok(res)
     }
 
-    // pub async fn watchDhtValues(
-    //     &self,
-    //     key: String,
-    //     subKeys: ValueSubkeyRangeSet,
-    //     expiration: Timestamp,
-    //     count: u32,
-    // ) -> APIResult<String> {
-    //     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
-    //     let subkeys: veilid_core::ValueSubkeyRangeSet =
-    //         veilid_core::deserialize_json(&subkeys).unwrap();
-    //     let expiration = veilid_core::Timestamp::from_str(&expiration).unwrap();
+    /// Add or update a watch to a DHT value that informs the user via an VeilidUpdate::ValueChange callback when the record has subkeys change.
+    /// One remote node will be selected to perform the watch and it will offer an expiration time based on a suggestion, and make an attempt to
+    /// continue to report changes via the callback. Nodes that agree to doing watches will be put on our 'ping' list to ensure they are still around
+    /// otherwise the watch will be cancelled and will have to be re-watched.
+    ///
+    /// There is only one watch permitted per record. If a change to a watch is desired, the previous one will be overwritten.
+    /// * `key` is the record key to watch. it must first be opened for reading or writing.
+    /// * `subkeys` is the the range of subkeys to watch. The range must not exceed 512 discrete non-overlapping or adjacent subranges. If no range is specified, this is equivalent to watching the entire range of subkeys.
+    /// * `expiration` is the desired timestamp of when to automatically terminate the watch, in microseconds. If this value is less than `network.rpc.timeout_ms` milliseconds in the future, this function will return an error immediately.
+    /// * `count` is the number of times the watch will be sent, maximum. A zero value here is equivalent to a cancellation.
+    ///
+    /// Returns a timestamp of when the watch will expire. All watches are guaranteed to expire at some point in the future,
+    /// and the returned timestamp will be no later than the requested expiration, but -may- be before the requested expiration.
+    /// If the returned timestamp is zero it indicates that the watch creation or update has failed. In the case of a faild update, the watch is considered cancelled.
+    ///
+    /// DHT watches are accepted with the following conditions:
+    /// * First-come first-served basis for arbitrary unauthenticated readers, up to network.dht.public_watch_limit per record
+    /// * If a member (either the owner or a SMPL schema member) has opened the key for writing (even if no writing is performed) then the watch will be signed and guaranteed network.dht.member_watch_limit per writer
+    ///
+    /// Members can be specified via the SMPL schema and do not need to allocate writable subkeys in order to offer a member watch capability.
+    pub async fn watchDhtValues(
+        &self,
+        key: String,
+        subkeys: Option<ValueSubkeyRangeSet>,
+        expiration: Option<String>,
+        count: Option<u32>,
+    ) -> APIResult<String> {
+        let key = TypedKey::from_str(&key)?;
+        let subkeys = subkeys.unwrap_or_default();
+        let expiration = if let Some(expiration) = expiration {
+            veilid_core::Timestamp::from_str(&expiration).map_err(VeilidAPIError::generic)?
+        } else {
+            veilid_core::Timestamp::default()
+        };
+        let count = count.unwrap_or(u32::MAX);
 
-    //     let routing_context = {
-    //         let rc = (*ROUTING_CONTEXTS).borrow();
-    //         let Some(routing_context) = rc.get(&id) else {
-    //             return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument("routing_context_watch_dht_values", "id", self.id));
-    //         };
-    //         routing_context.clone()
-    //     };
-    //     let res = routing_context
-    //         .watch_dht_values(key, subkeys, expiration, count)
-    //         .await?;
-    //     APIResult::Ok(res.to_string())
-    // }
+        let routing_context = self.getRoutingContext()?;
+        let res = routing_context
+            .watch_dht_values(key, subkeys, expiration, count)
+            .await?;
+        APIResult::Ok(res.to_string())
+    }
 
-    // pub async fn cancelDhtWatch(id: u32, key: String, subkeys: String) -> Promise {
-    //     let key: veilid_core::TypedKey = veilid_core::deserialize_json(&key).unwrap();
-    //     let subkeys: veilid_core::ValueSubkeyRangeSet =
-    //         veilid_core::deserialize_json(&subkeys).unwrap();
+    /// Cancels a watch early
+    ///
+    /// This is a convenience function that cancels watching all subkeys in a range. The subkeys specified here
+    /// are subtracted from the watched subkey range. If no range is specified, this is equivalent to cancelling the entire range of subkeys.
+    /// Only the subkey range is changed, the expiration and count remain the same.
+    /// If no subkeys remain, the watch is entirely cancelled and will receive no more updates.
+    /// Returns true if there is any remaining watch for this record
+    /// Returns false if the entire watch has been cancelled
+    pub async fn cancelDhtWatch(
+        &self,
+        key: String,
+        subkeys: Option<ValueSubkeyRangeSet>,
+    ) -> APIResult<bool> {
+        let key = TypedKey::from_str(&key)?;
+        let subkeys = subkeys.unwrap_or_default();
 
-    //     let routing_context = {
-    //         let rc = (*ROUTING_CONTEXTS).borrow();
-    //         let Some(routing_context) = rc.get(&id) else {
-    //                 return APIResult::Err(veilid_core::VeilidAPIError::invalid_argument("routing_context_cancel_dht_watch", "id", self.id));
-    //             };
-    //         routing_context.clone()
-    //     };
-    //     let res = routing_context.cancel_dht_watch(key, subkeys).await?;
-    //     APIResult::Ok(res)
-    // }
+        let routing_context = self.getRoutingContext()?;
+        let res = routing_context.cancel_dht_watch(key, subkeys).await?;
+        APIResult::Ok(res)
+    }
+
+    /// Inspects a DHT record for subkey state.
+    /// This is useful for checking if you should push new subkeys to the network, or retrieve the current state of a record from the network
+    /// to see what needs updating locally.
+    ///
+    /// * `key` is the record key to watch. it must first be opened for reading or writing.
+    /// * `subkeys` is the the range of subkeys to inspect. The range must not exceed 512 discrete non-overlapping or adjacent subranges.
+    ///    If no range is specified, this is equivalent to inspecting the entire range of subkeys. In total, the list of subkeys returned will be truncated at 512 elements.
+    /// * `scope` is what kind of range the inspection has:
+    ///
+    ///   - DHTReportScope::Local
+    ///     Results will be only for a locally stored record.
+    ///     Useful for seeing what subkeys you have locally and which ones have not been retrieved
+    ///
+    ///   - DHTReportScope::SyncGet
+    ///     Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    ///     Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if the local copy did not exist locally.
+    ///     Useful for determining if the current local copy should be updated from the network.
+    ///
+    ///   - DHTReportScope::SyncSet
+    ///     Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    ///     Provides an independent view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if the local copy did not exist locally.
+    ///     Useful for determining if the unchanged local copy should be pushed to the network.
+    ///
+    ///   - DHTReportScope::UpdateGet
+    ///     Return the local sequence numbers and the network sequence numbers with GetValue fanout parameters
+    ///     Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if a GetValue operation were being performed, including accepting newer values from the network.
+    ///     Useful for determining which subkeys would change with a GetValue operation
+    ///
+    ///   - DHTReportScope::UpdateSet
+    ///     Return the local sequence numbers and the network sequence numbers with SetValue fanout parameters
+    ///     Provides an view of both the local sequence numbers and the network sequence numbers for nodes that
+    ///     would be reached as if a SetValue operation were being performed, including accepting newer values from the network.
+    ///     This simulates a SetValue with the initial sequence number incremented by 1, like a real SetValue would when updating.
+    ///     Useful for determine which subkeys would change with an SetValue operation
+    ///
+    /// Returns a DHTRecordReport with the subkey ranges that were returned that overlapped the schema, and sequence numbers for each of the subkeys in the range.
+    pub async fn inspectDhtRecord(
+        &self,
+        key: String,
+        subkeys: Option<ValueSubkeyRangeSet>,
+        scope: Option<DHTReportScope>,
+    ) -> APIResult<DHTRecordReport> {
+        let key = TypedKey::from_str(&key)?;
+        let subkeys = subkeys.unwrap_or_default();
+        let scope = scope.unwrap_or_default();
+
+        let routing_context = self.getRoutingContext()?;
+        let res = routing_context
+            .inspect_dht_record(key, subkeys, scope)
+            .await?;
+        APIResult::Ok(res)
+    }
 }
diff --git a/veilid-wasm/src/wasm_helpers.rs b/veilid-wasm/src/wasm_helpers.rs
index d3b65e16..6fe034a5 100644
--- a/veilid-wasm/src/wasm_helpers.rs
+++ b/veilid-wasm/src/wasm_helpers.rs
@@ -2,7 +2,6 @@ use super::*;
 
 cfg_if::cfg_if! {
   if #[cfg(target_arch = "wasm32")] {
-      pub use tsify::*;
       pub use wasm_bindgen::prelude::*;
 
       macro_rules! from_impl_to_jsvalue {
diff --git a/veilid-wasm/tests/package-lock.json b/veilid-wasm/tests/package-lock.json
index 34ec1655..a0082466 100644
--- a/veilid-wasm/tests/package-lock.json
+++ b/veilid-wasm/tests/package-lock.json
@@ -4726,9 +4726,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
       "dev": true
     },
     "node_modules/is-arguments": {
@@ -7836,9 +7836,9 @@
       }
     },
     "node_modules/socks/node_modules/ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
+      "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==",
       "dev": true
     },
     "node_modules/source-map": {
@@ -8489,9 +8489,9 @@
       "link": true
     },
     "node_modules/vite": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
-      "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.18.10",
diff --git a/veilid-wasm/tests/src/VeilidRoutingContext.test.ts b/veilid-wasm/tests/src/VeilidRoutingContext.test.ts
index c7b7e55b..cb9e4795 100644
--- a/veilid-wasm/tests/src/VeilidRoutingContext.test.ts
+++ b/veilid-wasm/tests/src/VeilidRoutingContext.test.ts
@@ -12,7 +12,7 @@ import {
   veilidCrypto,
 } from 'veilid-wasm';
 import { textEncoder, textDecoder } from './utils/marshalling-utils';
-import { waitForMs } from './utils/wait-utils';
+import { asyncCallWithTimeout, waitForPublicAttachment } from './utils/wait-utils';
 
 describe('VeilidRoutingContext', () => {
   before('veilid startup', async () => {
@@ -23,10 +23,12 @@ describe('VeilidRoutingContext', () => {
       // }
     }, JSON.stringify(veilidCoreStartupConfig));
     await veilidClient.attach();
-    await waitForMs(2000);
+    await asyncCallWithTimeout(waitForPublicAttachment(), 10000);
+    //console.log("---Started Up---");
   });
 
   after('veilid shutdown', async () => {
+    //console.log("---Shutting Down---");
     await veilidClient.detach();
     await veilidClient.shutdownCore();
   });
@@ -35,22 +37,16 @@ describe('VeilidRoutingContext', () => {
     it('should create using .create()', async () => {
       const routingContext = VeilidRoutingContext.create();
       expect(routingContext instanceof VeilidRoutingContext).toBe(true);
-
-      routingContext.free();
     });
 
     it('should create using new', async () => {
       const routingContext = new VeilidRoutingContext();
       expect(routingContext instanceof VeilidRoutingContext).toBe(true);
-
-      routingContext.free();
     });
 
     it('should create with default safety', async () => {
       const routingContext = VeilidRoutingContext.create().withDefaultSafety();
       expect(routingContext instanceof VeilidRoutingContext).toBe(true);
-
-      routingContext.free();
     });
 
     it('should create with safety', async () => {
@@ -62,16 +58,12 @@ describe('VeilidRoutingContext', () => {
         },
       });
       expect(routingContext instanceof VeilidRoutingContext).toBe(true);
-
-      routingContext.free();
     });
 
     it('should create with sequencing', async () => {
       const routingContext =
         VeilidRoutingContext.create().withSequencing('EnsureOrdered');
       expect(routingContext instanceof VeilidRoutingContext).toBe(true);
-
-      routingContext.free();
     });
   });
 
@@ -79,19 +71,16 @@ describe('VeilidRoutingContext', () => {
     let routingContext: VeilidRoutingContext;
 
     before('create routing context', () => {
-      routingContext = VeilidRoutingContext.create()
-        .withSequencing('EnsureOrdered');
+      routingContext = VeilidRoutingContext.create().withSafety({
+        Unsafe: 'EnsureOrdered',
+      });
     });
 
-    after('free routing context', () => {
-      routingContext.free();
-    });
-
-    describe('DHT kitchen sink', async () => {
+    describe('DHT kitchen sink', () => {
       let dhtRecord: DHTRecordDescriptor;
       const data = '🚀 This example DHT data with unicode a Ā 𐀀 文 🚀';
 
-      before('create dht record', async () => {
+      beforeEach('create dht record', async () => {
         const bestKind = veilidCrypto.bestCryptoKind();
         dhtRecord = await routingContext.createDhtRecord(
           {
@@ -107,8 +96,8 @@ describe('VeilidRoutingContext', () => {
         expect(dhtRecord.schema).toEqual({ kind: 'DFLT', o_cnt: 1 });
       });
 
-      after('free dht record', async () => {
-        await routingContext.closeDhtRecord(dhtRecord.key);
+      afterEach('free dht record', async () => {
+        await routingContext.deleteDhtRecord(dhtRecord.key);
       });
 
       it('should set value', async () => {
@@ -121,6 +110,14 @@ describe('VeilidRoutingContext', () => {
       });
 
       it('should get value with force refresh', async () => {
+
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(data)
+        );
+        expect(setValueRes).toBeUndefined();
+
         const getValueRes = await routingContext.getDhtValue(
           dhtRecord.key,
           0,
@@ -167,6 +164,130 @@ describe('VeilidRoutingContext', () => {
         );
         expect(setValueRes).toBeUndefined();
       });
+
+      it('should open readonly record and specify writer during the set', async () => {
+        await routingContext.closeDhtRecord(dhtRecord.key);
+
+        const writeableDhtRecord = await routingContext.openDhtRecord(
+          dhtRecord.key,
+        );
+        expect(writeableDhtRecord).toBeDefined();
+        const setValueResFail = routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(`${data}👋`),
+        );
+        await expect(setValueResFail).rejects.toEqual({
+          kind: 'Generic',
+          message: 'value is not writable',
+        });
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(`${data}👋`),
+          `${dhtRecord.owner}:${dhtRecord.owner_secret}`
+        );
+        expect(setValueRes).toBeUndefined();
+      });
+
+      it('should watch value and cancel watch', async () => {
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(data)
+        );
+        expect(setValueRes).toBeUndefined();
+
+        // With typical values
+        const watchValueRes = await routingContext.watchDhtValues(
+          dhtRecord.key,
+          [[0, 0]],
+          "0",
+          0xFFFFFFFF,
+        );
+        expect(watchValueRes).toBeDefined();
+        expect(watchValueRes).not.toEqual("");
+        expect(watchValueRes).not.toEqual("0");
+
+        const cancelValueRes = await routingContext.cancelDhtWatch(
+          dhtRecord.key,
+          [],
+        )
+
+        expect(cancelValueRes).toEqual(false);
+
+      });
+
+      it('should watch value and cancel watch with default values', async () => {
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(data)
+        );
+        expect(setValueRes).toBeUndefined();
+
+        // Again with default values
+        const watchValueRes = await routingContext.watchDhtValues(
+          dhtRecord.key,
+        );
+        expect(watchValueRes).toBeDefined();
+        expect(watchValueRes).not.toEqual("");
+        expect(watchValueRes).not.toEqual("0");
+
+        const cancelValueRes = await routingContext.cancelDhtWatch(
+          dhtRecord.key,
+        )
+        expect(cancelValueRes).toEqual(false);
+      });
+
+      it('should set a value and inspect it', async () => {
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(data)
+        );
+        expect(setValueRes).toBeUndefined();
+
+        // Inspect locally
+        const inspectRes = await routingContext.inspectDhtRecord(
+          dhtRecord.key,
+          [[0, 0]],
+          "Local",
+        );
+        expect(inspectRes).toBeDefined();
+        expect(inspectRes.subkeys).toEqual([[0, 0]]);
+        expect(inspectRes.local_seqs).toEqual([0]);
+        expect(inspectRes.network_seqs).toEqual([]);
+
+        // Inspect network
+        const inspectRes2 = await routingContext.inspectDhtRecord(
+          dhtRecord.key,
+          [[0, 0]],
+          "SyncGet",
+        );
+        expect(inspectRes2).toBeDefined();
+        expect(inspectRes2.subkeys).toEqual([[0, 0]]);
+        expect(inspectRes2.local_seqs).toEqual([0]);
+        expect(inspectRes2.network_seqs).toEqual([0]);
+      });
+
+      it('should set a value and inspect it with defaults', async () => {
+        const setValueRes = await routingContext.setDhtValue(
+          dhtRecord.key,
+          0,
+          textEncoder.encode(data)
+        );
+        expect(setValueRes).toBeUndefined();
+
+        // Inspect locally
+        const inspectRes = await routingContext.inspectDhtRecord(
+          dhtRecord.key,
+        );
+        expect(inspectRes).toBeDefined();
+        expect(inspectRes.subkeys).toEqual([[0, 0]]);
+        expect(inspectRes.local_seqs).toEqual([0]);
+        expect(inspectRes.network_seqs).toEqual([]);
+      });
     });
   });
 });
diff --git a/veilid-wasm/tests/src/utils/veilid-config.ts b/veilid-wasm/tests/src/utils/veilid-config.ts
index 44eed767..fd4ef898 100644
--- a/veilid-wasm/tests/src/utils/veilid-config.ts
+++ b/veilid-wasm/tests/src/utils/veilid-config.ts
@@ -1,143 +1,25 @@
 import type { VeilidWASMConfig } from 'veilid-wasm';
+import { veilidClient } from 'veilid-wasm';
 
 export const veilidCoreInitConfig: VeilidWASMConfig = {
   logging: {
     api: {
       enabled: true,
       level: 'Debug',
+      ignore_log_targets: [],
     },
     performance: {
       enabled: false,
       level: 'Info',
       logs_in_timings: false,
       logs_in_console: false,
+      ignore_log_targets: [],
     },
   },
 };
 
-export const veilidCoreStartupConfig = {
-  program_name: 'veilid-wasm-test',
-  namespace: '',
-  capabilities: {
-    disable: [],
-  },
-  protected_store: {
-    allow_insecure_fallback: true,
-    always_use_insecure_storage: true,
-    directory: '',
-    delete: false,
-    device_encryption_key_password: 'some-user-secret-value',
-    // "new_device_encryption_key_password": "an-updated-user-secret-value"
-  },
-  table_store: {
-    directory: '',
-    delete: false,
-  },
-  block_store: {
-    directory: '',
-    delete: false,
-  },
-  network: {
-    connection_initial_timeout_ms: 2000,
-    connection_inactivity_timeout_ms: 60000,
-    max_connections_per_ip4: 32,
-    max_connections_per_ip6_prefix: 32,
-    max_connections_per_ip6_prefix_size: 56,
-    max_connection_frequency_per_min: 128,
-    client_allowlist_timeout_ms: 300000,
-    reverse_connection_receipt_time_ms: 5000,
-    hole_punch_receipt_time_ms: 5000,
-    network_key_password: '',
-    disable_capabilites: [],
-    routing_table: {
-      node_id: [],
-      node_id_secret: [],
-      bootstrap: ['ws://bootstrap.veilid.net:5150/ws'],
-      limit_over_attached: 64,
-      limit_fully_attached: 32,
-      limit_attached_strong: 16,
-      limit_attached_good: 8,
-      limit_attached_weak: 4,
-    },
-    rpc: {
-      concurrency: 0,
-      queue_size: 1024,
-      max_timestamp_behind_ms: 10000,
-      max_timestamp_ahead_ms: 10000,
-      timeout_ms: 5000,
-      max_route_hop_count: 4,
-      default_route_hop_count: 1,
-    },
-    dht: {
-      max_find_node_count: 20,
-      resolve_node_timeout_ms: 10000,
-      resolve_node_count: 1,
-      resolve_node_fanout: 4,
-      get_value_timeout_ms: 10000,
-      get_value_count: 3,
-      get_value_fanout: 4,
-      set_value_timeout_ms: 10000,
-      set_value_count: 5,
-      set_value_fanout: 4,
-      min_peer_count: 20,
-      min_peer_refresh_time_ms: 60000,
-      validate_dial_info_receipt_time_ms: 2000,
-      local_subkey_cache_size: 128,
-      local_max_subkey_cache_memory_mb: 256,
-      remote_subkey_cache_size: 1024,
-      remote_max_records: 65536,
-      remote_max_subkey_cache_memory_mb: 256,
-      remote_max_storage_space_mb: 0,
-      public_watch_limit: 32,
-      member_watch_limit: 8,
-      max_watch_expiration_ms: 600000,
-    },
-    upnp: true,
-    detect_address_changes: true,
-    restricted_nat_retries: 0,
-    tls: {
-      certificate_path: '',
-      private_key_path: '',
-      connection_initial_timeout_ms: 2000,
-    },
-    application: {
-      https: {
-        enabled: false,
-        listen_address: ':5150',
-        path: 'app',
-      },
-      http: {
-        enabled: false,
-        listen_address: ':5150',
-        path: 'app',
-      },
-    },
-    protocol: {
-      udp: {
-        enabled: false,
-        socket_pool_size: 0,
-        listen_address: '',
-      },
-      tcp: {
-        connect: false,
-        listen: false,
-        max_connections: 32,
-        listen_address: '',
-      },
-      ws: {
-        connect: true,
-        listen: true,
-        max_connections: 16,
-        listen_address: ':5150',
-        path: 'ws',
-      },
-      wss: {
-        connect: true,
-        listen: false,
-        max_connections: 16,
-        listen_address: '',
-        path: 'ws',
-      },
-    },
-  },
-};
+export var veilidCoreStartupConfig = (() => {
+  var defaultConfig = JSON.parse(veilidClient.defaultConfig());
+  defaultConfig.program_name = 'veilid-wasm-test';
+  return defaultConfig;
+})(); 
diff --git a/veilid-wasm/tests/src/utils/wait-utils.ts b/veilid-wasm/tests/src/utils/wait-utils.ts
index f32b3969..4b69bd09 100644
--- a/veilid-wasm/tests/src/utils/wait-utils.ts
+++ b/veilid-wasm/tests/src/utils/wait-utils.ts
@@ -1,3 +1,61 @@
+import { veilidClient } from 'veilid-wasm';
+
 export const waitForMs = (milliseconds: number) => {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
+
+export const asyncCallWithTimeout = async<T>(asyncPromise: Promise<T>, timeLimit: number) => {
+  let timeoutHandle: ReturnType<typeof setTimeout>;
+
+  const timeoutPromise = new Promise((_resolve, reject) => {
+    timeoutHandle = setTimeout(
+      () => reject(new Error('Async call timeout limit reached')),
+      timeLimit
+    );
+  });
+
+  return Promise.race([asyncPromise, timeoutPromise]).then(result => {
+    clearTimeout(timeoutHandle);
+    return result;
+  })
+}
+
+export const waitForPublicAttachment = async () => {
+  while (true) {
+    let state = await veilidClient.getState();
+    if (state.attachment.public_internet_ready) {
+      var attached = false
+      switch (state.attachment.state) {
+        case "Detached":
+        case "Detaching":
+        case "Attaching":
+          break;
+        default:
+          attached = true;
+          break;
+      }
+      if (attached) {
+        break;
+      }
+    }
+    await waitForMs(1000);
+  }
+}
+
+export const waitForDetached = async () => {
+  while (true) {
+    let state = await veilidClient.getState();
+    var detached = false
+    switch (state.attachment.state) {
+      case "Detached":
+        detached = true;
+        break;
+      default:
+        break;
+    }
+    if (detached) {
+      break;
+    }
+    await waitForMs(1000);
+  }
+}
diff --git a/veilid-wasm/tests/src/veilidClient.test.ts b/veilid-wasm/tests/src/veilidClient.test.ts
index c3d04059..61c9204f 100644
--- a/veilid-wasm/tests/src/veilidClient.test.ts
+++ b/veilid-wasm/tests/src/veilidClient.test.ts
@@ -6,51 +6,67 @@ import {
 } from './utils/veilid-config';
 
 import { VeilidState, veilidClient } from 'veilid-wasm';
-import { waitForMs } from './utils/wait-utils';
+import { asyncCallWithTimeout, waitForPublicAttachment } from './utils/wait-utils';
 
-describe('veilidClient', () => {
-  before('veilid startup', async () => {
+describe('veilidClient', function () {
+  before('veilid startup', async function () {
     veilidClient.initializeCore(veilidCoreInitConfig);
-    await veilidClient.startupCore((_update) => {
+    await veilidClient.startupCore(function (_update) {
       // if (_update.kind === 'Log') {
       //   console.log(_update.message);
       // }
     }, JSON.stringify(veilidCoreStartupConfig));
   });
 
-  after('veilid shutdown', async () => {
+  after('veilid shutdown', async function () {
     await veilidClient.shutdownCore();
   });
 
-  it('should print version', async () => {
+  it('should print version', async function () {
     const version = veilidClient.versionString();
     expect(typeof version).toBe('string');
     expect(version.length).toBeGreaterThan(0);
   });
 
-  it('should attach and detach', async () => {
+  it('should get config string', async function () {
+    const defaultConfig = veilidClient.defaultConfig();
+    expect(typeof defaultConfig).toBe('string');
+    expect(defaultConfig.length).toBeGreaterThan(0);
+
+    const cfgObject1 = JSON.parse(defaultConfig);
+    const defaultConfigStr = JSON.stringify(cfgObject1);
+    const cfgObject2 = JSON.parse(defaultConfigStr);
+    const defaultConfigStr2 = JSON.stringify(cfgObject2);
+
+    expect(defaultConfigStr).toEqual(defaultConfigStr2);
+  });
+
+  it('should attach and detach', async function () {
     await veilidClient.attach();
-    await waitForMs(2000);
+    await asyncCallWithTimeout(waitForPublicAttachment(), 10000);
     await veilidClient.detach();
   });
 
-  describe('kitchen sink', () => {
-    before('attach', async () => {
+  describe('kitchen sink', function () {
+    before('attach', async function () {
       await veilidClient.attach();
-      await waitForMs(2000);
+      await waitForPublicAttachment();
+
+    });
+    after('detach', async function () {
+      await veilidClient.detach();
     });
-    after('detach', () => veilidClient.detach());
 
     let state: VeilidState;
 
-    it('should get state', async () => {
+    it('should get state', async function () {
       state = await veilidClient.getState();
       expect(state.attachment).toBeDefined();
       expect(state.config.config).toBeDefined();
       expect(state.network).toBeDefined();
     });
 
-    it('should call debug command', async () => {
+    it('should call debug command', async function () {
       const response = await veilidClient.debug('txtrecord');
       expect(response).toBeDefined();
       expect(response.length).toBeGreaterThan(0);
diff --git a/veilid-wasm/tests/src/veilidCrypto.test.ts b/veilid-wasm/tests/src/veilidCrypto.test.ts
index da2a0190..c325e052 100644
--- a/veilid-wasm/tests/src/veilidCrypto.test.ts
+++ b/veilid-wasm/tests/src/veilidCrypto.test.ts
@@ -142,7 +142,7 @@ describe('veilidCrypto', () => {
     }).not.toThrow();
   });
 
-  describe('contants', () => {
+  describe('constants', () => {
     it('CRYPTO_KEY_LENGTH', () => {
       expect(typeof veilidCrypto.CRYPTO_KEY_LENGTH).toBe('number');
     });