diff --git a/Cargo.lock b/Cargo.lock
index a4d2005b6..29012132f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -830,7 +830,7 @@ dependencies = [
  "alloy-sol-types",
  "anyhow",
  "bincode",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "serde",
@@ -1195,7 +1195,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "hex",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "rmp-serde",
@@ -1546,7 +1546,7 @@ dependencies = [
  "anyhow",
  "bincode",
  "hex",
- "hyperware_process_lib 2.2.1",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "serde",
@@ -2477,7 +2477,7 @@ name = "download"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -2489,7 +2489,7 @@ name = "downloads"
 version = "0.5.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "serde",
@@ -2673,6 +2673,7 @@ name = "explorer"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "file_explorer_caller_utils",
  "hyperapp_macro 0.1.1",
  "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=1a6ad9d)",
  "md5",
@@ -2770,6 +2771,22 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "file_explorer_caller_utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "futures",
+ "futures-util",
+ "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=1a6ad9d)",
+ "once_cell",
+ "process_macros",
+ "serde",
+ "serde_json",
+ "uuid 1.17.0",
+ "wit-bindgen 0.41.0",
+]
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -2855,7 +2872,7 @@ version = "0.2.0"
 dependencies = [
  "anyhow",
  "bincode",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "serde",
@@ -3031,7 +3048,7 @@ dependencies = [
 name = "get-block"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "serde",
  "serde_json",
  "wit-bindgen 0.42.1",
@@ -3343,7 +3360,7 @@ dependencies = [
  "alloy-sol-types",
  "anyhow",
  "hex",
- "hyperware_process_lib 2.2.1",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rmp-serde",
  "serde",
@@ -3648,7 +3665,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "hex",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "rand 0.8.5",
  "rmp-serde",
@@ -3744,8 +3761,9 @@ dependencies = [
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.2.1"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=4e91521#4e915218b382e4b3f7f93cddeec30415f02a504b"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe2b6795488c3f7d3410808cf7e29404725f862ad42a3822886464b92451a21"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -3755,6 +3773,8 @@ dependencies = [
  "base64 0.22.1",
  "bincode",
  "color-eyre",
+ "futures-channel",
+ "futures-util",
  "http 1.3.1",
  "mime_guess",
  "rand 0.8.5",
@@ -3767,14 +3787,14 @@ dependencies = [
  "tracing-error",
  "tracing-subscriber",
  "url",
+ "uuid 1.17.0",
  "wit-bindgen 0.42.1",
 ]
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe2b6795488c3f7d3410808cf7e29404725f862ad42a3822886464b92451a21"
+version = "3.0.1"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=34b1f1d857f76fb474f7af96f089961445758edb#34b1f1d857f76fb474f7af96f089961445758edb"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -3784,8 +3804,6 @@ dependencies = [
  "base64 0.22.1",
  "bincode",
  "color-eyre",
- "futures-channel",
- "futures-util",
  "http 1.3.1",
  "mime_guess",
  "rand 0.8.5",
@@ -3798,7 +3816,6 @@ dependencies = [
  "tracing-error",
  "tracing-subscriber",
  "url",
- "uuid 1.17.0",
  "wit-bindgen 0.42.1",
 ]
 
@@ -4030,7 +4047,7 @@ name = "install"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -4803,7 +4820,7 @@ dependencies = [
 name = "node-info"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -5841,7 +5858,7 @@ dependencies = [
 name = "reset"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -5852,7 +5869,7 @@ dependencies = [
 name = "reset-cache"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -5864,7 +5881,7 @@ name = "reset-store"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -6378,7 +6395,7 @@ dependencies = [
 name = "set-nodes"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -6623,12 +6640,29 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
+ "spider_caller_utils",
  "url",
  "uuid 1.17.0",
  "wit-bindgen 0.42.1",
  "wit-parser 0.220.1",
 ]
 
+[[package]]
+name = "spider_caller_utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "futures",
+ "futures-util",
+ "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=41f25ce)",
+ "once_cell",
+ "process_macros",
+ "serde",
+ "serde_json",
+ "uuid 1.17.0",
+ "wit-bindgen 0.41.0",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -6671,7 +6705,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "start-providing"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -6682,7 +6716,7 @@ dependencies = [
 name = "state"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -6716,7 +6750,7 @@ dependencies = [
 name = "stop-providing"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
@@ -7569,7 +7603,7 @@ name = "uninstall"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.3.0",
+ "hyperware_process_lib 3.0.1",
  "process_macros",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index ffa7d7559..9f1aa5ee0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperdrive_lib"
 authors = ["Sybil Technologies AG"]
-version = "1.9.2"
+version = "1.9.3"
 edition = "2021"
 description = "A general-purpose sovereign cloud computing platform"
 homepage = "https://hyperware.ai"
diff --git a/hyperdrive/Cargo.toml b/hyperdrive/Cargo.toml
index e430f62e8..a798db974 100644
--- a/hyperdrive/Cargo.toml
+++ b/hyperdrive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperdrive"
 authors = ["Sybil Technologies AG"]
-version = "1.9.2"
+version = "1.9.3"
 edition = "2021"
 description = "A general-purpose sovereign cloud computing platform"
 homepage = "https://hyperware.ai"
@@ -67,7 +67,7 @@ p256 = { version = "0.13", features = ["ecdsa"] }
 public-ip = "0.2.2"
 rand = "0.8.4"
 regex = "1.11.0"
-reqwest = "0.12.4"
+reqwest = { version = "0.12.4", features = ["json"] }
 ring = "0.17.8"
 rmp-serde = "1.1.2"
 rocksdb = { version = "0.22.0", features = ["multi-threaded-cf"] }
diff --git a/hyperdrive/packages/app-store/Cargo.lock b/hyperdrive/packages/app-store/Cargo.lock
index a5db5f05d..730674f6c 100644
--- a/hyperdrive/packages/app-store/Cargo.lock
+++ b/hyperdrive/packages/app-store/Cargo.lock
@@ -585,7 +585,7 @@ dependencies = [
  "alloy-sol-types",
  "anyhow",
  "bincode",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "rand",
  "serde",
@@ -952,7 +952,7 @@ dependencies = [
  "anyhow",
  "bincode",
  "hex",
- "hyperware_process_lib 2.2.1",
+ "hyperware_process_lib",
  "process_macros",
  "rand",
  "serde",
@@ -1156,7 +1156,7 @@ name = "download"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
@@ -1168,7 +1168,7 @@ name = "downloads"
 version = "0.5.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "rand",
  "serde",
@@ -1344,7 +1344,7 @@ version = "0.2.0"
 dependencies = [
  "anyhow",
  "bincode",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "rand",
  "serde",
@@ -1656,35 +1656,8 @@ dependencies = [
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3abd008d22c3b96ee43300c4c8dffbf1d072a680a13635b5f9da11a0ce9395"
-dependencies = [
- "alloy",
- "alloy-primitives",
- "alloy-sol-macro",
- "alloy-sol-types",
- "anyhow",
- "base64",
- "bincode",
- "hex",
- "http",
- "mime_guess",
- "rand",
- "regex",
- "rmp-serde",
- "serde",
- "serde_json",
- "sha3",
- "thiserror 1.0.69",
- "url",
- "wit-bindgen",
-]
-
-[[package]]
-name = "hyperware_process_lib"
-version = "2.2.1"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=4e91521#4e915218b382e4b3f7f93cddeec30415f02a504b"
+version = "3.0.1"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=34b1f1d857f76fb474f7af96f089961445758edb#34b1f1d857f76fb474f7af96f089961445758edb"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -1886,7 +1859,7 @@ name = "install"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
@@ -2580,7 +2553,7 @@ name = "reset-store"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
@@ -3341,7 +3314,7 @@ name = "uninstall"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
diff --git a/hyperdrive/packages/app-store/app-store/Cargo.toml b/hyperdrive/packages/app-store/app-store/Cargo.toml
index a2a2be749..f830c7c91 100644
--- a/hyperdrive/packages/app-store/app-store/Cargo.toml
+++ b/hyperdrive/packages/app-store/app-store/Cargo.toml
@@ -11,7 +11,7 @@ alloy-primitives = "0.8.15"
 alloy-sol-types = "0.8.15"
 anyhow = "1.0"
 bincode = "1.3.3"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/hyperdrive/packages/app-store/app-store/src/lib.rs b/hyperdrive/packages/app-store/app-store/src/lib.rs
index b465f2e05..fc2db616e 100644
--- a/hyperdrive/packages/app-store/app-store/src/lib.rs
+++ b/hyperdrive/packages/app-store/app-store/src/lib.rs
@@ -147,8 +147,13 @@ fn handle_message(
                             response.send().unwrap();
                         }
                     }
-                    http::server::HttpServerRequest::WebSocketOpen { path, channel_id } => {
-                        http_server.handle_websocket_open(&path, channel_id);
+                    http::server::HttpServerRequest::WebSocketOpen {
+                        path,
+                        channel_id,
+                        source_socket_addr,
+                        forwarded_for,
+                    } => {
+                        http_server.handle_websocket_open(&path, channel_id, source_socket_addr, forwarded_for);
                     }
                     http::server::HttpServerRequest::WebSocketClose(channel_id) => {
                         http_server.handle_websocket_close(channel_id);
diff --git a/hyperdrive/packages/app-store/chain/Cargo.toml b/hyperdrive/packages/app-store/chain/Cargo.toml
index fcd1b2904..562dba6d9 100644
--- a/hyperdrive/packages/app-store/chain/Cargo.toml
+++ b/hyperdrive/packages/app-store/chain/Cargo.toml
@@ -12,7 +12,7 @@ alloy-sol-types = "0.8.15"
 anyhow = "1.0"
 hex = "0.4"
 bincode = "1.3.3"
-hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "4e91521" }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/hyperdrive/packages/app-store/download/Cargo.toml b/hyperdrive/packages/app-store/download/Cargo.toml
index 1744ce7bf..3d624d433 100644
--- a/hyperdrive/packages/app-store/download/Cargo.toml
+++ b/hyperdrive/packages/app-store/download/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
 
 [dependencies]
 anyhow = "1.0"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/app-store/downloads/Cargo.toml b/hyperdrive/packages/app-store/downloads/Cargo.toml
index 6f90c7c05..f75f17555 100644
--- a/hyperdrive/packages/app-store/downloads/Cargo.toml
+++ b/hyperdrive/packages/app-store/downloads/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
 
 [dependencies]
 anyhow = "1.0"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/hyperdrive/packages/app-store/ft-worker/Cargo.toml b/hyperdrive/packages/app-store/ft-worker/Cargo.toml
index 9f6ea88d3..1b1c8326f 100644
--- a/hyperdrive/packages/app-store/ft-worker/Cargo.toml
+++ b/hyperdrive/packages/app-store/ft-worker/Cargo.toml
@@ -9,7 +9,7 @@ simulation-mode = []
 [dependencies]
 anyhow = "1.0"
 bincode = "1.3.3"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/hyperdrive/packages/app-store/install/Cargo.toml b/hyperdrive/packages/app-store/install/Cargo.toml
index 1320b5161..4af498c94 100644
--- a/hyperdrive/packages/app-store/install/Cargo.toml
+++ b/hyperdrive/packages/app-store/install/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
 
 [dependencies]
 anyhow = "1.0"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/app-store/reset-store/Cargo.toml b/hyperdrive/packages/app-store/reset-store/Cargo.toml
index 754ae83cb..6ca79c9eb 100644
--- a/hyperdrive/packages/app-store/reset-store/Cargo.toml
+++ b/hyperdrive/packages/app-store/reset-store/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
 
 [dependencies]
 anyhow = "1.0"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/app-store/uninstall/Cargo.toml b/hyperdrive/packages/app-store/uninstall/Cargo.toml
index 8bbd3559b..64c3fccd2 100644
--- a/hyperdrive/packages/app-store/uninstall/Cargo.toml
+++ b/hyperdrive/packages/app-store/uninstall/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
 
 [dependencies]
 anyhow = "1.0"
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/file-explorer/Cargo.lock b/hyperdrive/packages/file-explorer/Cargo.lock
index 16213b04f..b83ada160 100644
--- a/hyperdrive/packages/file-explorer/Cargo.lock
+++ b/hyperdrive/packages/file-explorer/Cargo.lock
@@ -1240,9 +1240,8 @@ name = "explorer"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "file_explorer_caller_utils",
- "hyperprocess_macro",
- "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=4beff93)",
+ "hyperapp_macro",
+ "hyperware_process_lib 2.2.0",
  "md5",
  "process_macros",
  "serde",
@@ -1300,22 +1299,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "file_explorer_caller_utils"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures",
- "futures-util",
- "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=4beff93)",
- "once_cell",
- "process_macros",
- "serde",
- "serde_json",
- "uuid",
- "wit-bindgen 0.41.0",
-]
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -1330,9 +1313,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.9",
@@ -1682,11 +1665,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "hyperprocess_macro"
-version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperprocess-macro?rev=66884c0#66884c0a22b845d1db632f0fb8985a7e5bdad3fb"
+name = "hyperapp_macro"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e694a2a3dd6c4d1ba3ec2110b054dca52834ae10d98630b39efd7a59ed4887c8"
 dependencies = [
- "hyperware_process_lib 2.2.0 (git+https://github.com/hyperware-ai/process_lib?rev=b9f1ead)",
+ "hyperware_process_lib 2.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.100",
@@ -1695,7 +1679,7 @@ dependencies = [
 [[package]]
 name = "hyperware_process_lib"
 version = "2.2.0"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=4beff93#4beff9389598978d2f97e4cd6d1d0f74a7acac0f"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=1a6ad9d#1a6ad9d00e98bd6b268a7d434a7e78a0bb3cce7b"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -1705,6 +1689,7 @@ dependencies = [
  "base64",
  "bincode",
  "color-eyre",
+ "futures-channel",
  "futures-util",
  "http",
  "mime_guess",
@@ -1724,8 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.2.0"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=b9f1ead#b9f1ead63356bfd4b60b337a380fef1be81d81c6"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe2b6795488c3f7d3410808cf7e29404725f862ad42a3822886464b92451a21"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -1735,6 +1721,7 @@ dependencies = [
  "base64",
  "bincode",
  "color-eyre",
+ "futures-channel",
  "futures-util",
  "http",
  "mime_guess",
@@ -3082,9 +3069,9 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
 [[package]]
 name = "slab"
diff --git a/hyperdrive/packages/file-explorer/explorer/Cargo.toml b/hyperdrive/packages/file-explorer/explorer/Cargo.toml
index 33fefce8f..bb289e760 100644
--- a/hyperdrive/packages/file-explorer/explorer/Cargo.toml
+++ b/hyperdrive/packages/file-explorer/explorer/Cargo.toml
@@ -1,13 +1,17 @@
 [dependencies]
 anyhow = "1.0"
-md5 = "0.7"
 hyperapp_macro = "0.1.1"
+md5 = "0.7"
 process_macros = "0.1"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
 tracing = "0.1.37"
 wit-bindgen = "0.42.1"
 
+[dependencies.file_explorer_caller_utils]
+optional = true
+path = "../target/file-explorer-caller-utils"
+
 [dependencies.hyperware_process_lib]
 features = ["hyperapp"]
 git = "https://github.com/hyperware-ai/process_lib"
@@ -17,6 +21,9 @@ rev = "1a6ad9d"
 features = ["derive"]
 version = "1.0"
 
+[features]
+caller-utils = ["file_explorer_caller_utils"]
+
 [lib]
 crate-type = ["cdylib"]
 name = "explorer"
diff --git a/hyperdrive/packages/hns-indexer/Cargo.lock b/hyperdrive/packages/hns-indexer/Cargo.lock
index 111a29fbf..2bf5a6385 100644
--- a/hyperdrive/packages/hns-indexer/Cargo.lock
+++ b/hyperdrive/packages/hns-indexer/Cargo.lock
@@ -1379,7 +1379,7 @@ dependencies = [
 name = "get-block"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "serde",
  "serde_json",
  "wit-bindgen",
@@ -1487,7 +1487,7 @@ dependencies = [
  "alloy-sol-types",
  "anyhow",
  "hex",
- "hyperware_process_lib 2.2.1",
+ "hyperware_process_lib",
  "process_macros",
  "rmp-serde",
  "serde",
@@ -1592,35 +1592,8 @@ dependencies = [
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3abd008d22c3b96ee43300c4c8dffbf1d072a680a13635b5f9da11a0ce9395"
-dependencies = [
- "alloy",
- "alloy-primitives",
- "alloy-sol-macro",
- "alloy-sol-types",
- "anyhow",
- "base64",
- "bincode",
- "hex",
- "http",
- "mime_guess",
- "rand",
- "regex",
- "rmp-serde",
- "serde",
- "serde_json",
- "sha3",
- "thiserror 1.0.69",
- "url",
- "wit-bindgen",
-]
-
-[[package]]
-name = "hyperware_process_lib"
-version = "2.2.1"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=4e91521#4e915218b382e4b3f7f93cddeec30415f02a504b"
+version = "3.0.1"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=34b1f1d857f76fb474f7af96f089961445758edb#34b1f1d857f76fb474f7af96f089961445758edb"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -2032,7 +2005,7 @@ dependencies = [
 name = "node-info"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
@@ -2569,7 +2542,7 @@ dependencies = [
 name = "reset"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
@@ -2973,7 +2946,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "state"
 version = "0.1.0"
 dependencies = [
- "hyperware_process_lib 2.1.0",
+ "hyperware_process_lib",
  "process_macros",
  "serde",
  "serde_json",
diff --git a/hyperdrive/packages/hns-indexer/get-block/Cargo.toml b/hyperdrive/packages/hns-indexer/get-block/Cargo.toml
index fd9a55e5f..d185896a0 100644
--- a/hyperdrive/packages/hns-indexer/get-block/Cargo.toml
+++ b/hyperdrive/packages/hns-indexer/get-block/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 simulation-mode = []
 
 [dependencies]
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 wit-bindgen = "0.42.1"
diff --git a/hyperdrive/packages/hns-indexer/hns-indexer/Cargo.toml b/hyperdrive/packages/hns-indexer/hns-indexer/Cargo.toml
index 1d4c67035..db195099d 100644
--- a/hyperdrive/packages/hns-indexer/hns-indexer/Cargo.toml
+++ b/hyperdrive/packages/hns-indexer/hns-indexer/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0"
 alloy-primitives = "0.8.15"
 alloy-sol-types = "0.8.15"
 hex = "0.4.3"
-hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "4e91521", features = ["logging"] }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb", features = ["logging"] }
 process_macros = "0.1"
 rmp-serde = "1.1.2"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/hyperdrive/packages/hns-indexer/node-info/Cargo.toml b/hyperdrive/packages/hns-indexer/node-info/Cargo.toml
index 09baa1417..552e465d8 100644
--- a/hyperdrive/packages/hns-indexer/node-info/Cargo.toml
+++ b/hyperdrive/packages/hns-indexer/node-info/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 simulation-mode = []
 
 [dependencies]
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 process_macros = "0.1"
diff --git a/hyperdrive/packages/hns-indexer/reset/Cargo.toml b/hyperdrive/packages/hns-indexer/reset/Cargo.toml
index 55e12c42d..58e2b35a6 100644
--- a/hyperdrive/packages/hns-indexer/reset/Cargo.toml
+++ b/hyperdrive/packages/hns-indexer/reset/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 simulation-mode = []
 
 [dependencies]
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 process_macros = "0.1"
diff --git a/hyperdrive/packages/hns-indexer/state/Cargo.toml b/hyperdrive/packages/hns-indexer/state/Cargo.toml
index 70565c3cd..73587fe9b 100644
--- a/hyperdrive/packages/hns-indexer/state/Cargo.toml
+++ b/hyperdrive/packages/hns-indexer/state/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 simulation-mode = []
 
 [dependencies]
-hyperware_process_lib = "2.1.0"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 process_macros = "0.1"
diff --git a/hyperdrive/packages/homepage/homepage/src/lib.rs b/hyperdrive/packages/homepage/homepage/src/lib.rs
index d7a0d901a..eb1af9d58 100644
--- a/hyperdrive/packages/homepage/homepage/src/lib.rs
+++ b/hyperdrive/packages/homepage/homepage/src/lib.rs
@@ -63,6 +63,65 @@ enum NotificationsResponse {
     Err(String),
 }
 
+/// WebSocket message types sent to frontend
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "kind", content = "data")]
+#[serde(rename_all = "snake_case")]
+enum WsMessage {
+    AppsUpdate(Vec<WsApp>),
+}
+
+/// App data sent over WebSocket (mirrors HomepageApp in TypeScript)
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct WsApp {
+    id: String,
+    process: String,
+    package_name: String,
+    publisher: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    path: Option<String>,
+    label: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    base64_icon: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    widget: Option<String>,
+    order: u32,
+    favorite: bool,
+}
+
+impl From<&homepage::App> for WsApp {
+    fn from(app: &homepage::App) -> Self {
+        WsApp {
+            id: app.id.clone(),
+            process: app.process.clone(),
+            package_name: app.package_name.clone(),
+            publisher: app.publisher.clone(),
+            path: app.path.clone(),
+            label: app.label.clone(),
+            base64_icon: app.base64_icon.clone(),
+            widget: app.widget.clone(),
+            order: app.order,
+            favorite: app.favorite,
+        }
+    }
+}
+
+/// Helper function to broadcast app updates to all WebSocket clients
+fn broadcast_apps_update(
+    http_server: &server::HttpServer,
+    app_data: &BTreeMap<String, homepage::App>,
+) {
+    let apps: Vec<WsApp> = app_data.values().map(WsApp::from).collect();
+    let message = WsMessage::AppsUpdate(apps);
+    let json = serde_json::to_string(&message).unwrap();
+
+    http_server.ws_push_all_channels(
+        "/",
+        http::server::WsMessageType::Text,
+        LazyLoadBlob::new(Some("application/json"), json.into_bytes()),
+    );
+}
+
 wit_bindgen::generate!({
     path: "../target/wit",
     world: "homepage-sys-v1",
@@ -295,6 +354,10 @@ fn init(our: Address) {
         .bind_http_path("/api/notifications/test-vapid", http_config)
         .expect("failed to bind /api/notifications/test-vapid");
 
+    http_server
+        .bind_ws_path("/", server::WsBindingConfig::default())
+        .expect("failed to bind ws path");
+
     hyperware_process_lib::homepage::add_to_homepage(
         "Clock",
         None,
@@ -319,6 +382,23 @@ fn init(our: Address) {
                 let Ok(request) = http_server.parse_request(message.body()) else {
                     continue;
                 };
+                // Handle WebSocket events
+                match &request {
+                    http::server::HttpServerRequest::WebSocketOpen { path, channel_id } => {
+                        http_server.handle_websocket_open(path, *channel_id);
+                        continue;
+                    }
+                    http::server::HttpServerRequest::WebSocketClose(channel_id) => {
+                        http_server.handle_websocket_close(*channel_id);
+                        continue;
+                    }
+                    http::server::HttpServerRequest::WebSocketPush { .. } => {
+                        continue;
+                    }
+                    http::server::HttpServerRequest::Http(_) => {
+                        // Fall through to handle_request for HTTP
+                    }
+                }
                 http_server.handle_request(
                     request,
                     |incoming| {
@@ -955,11 +1035,13 @@ fn init(our: Address) {
                                     .contains(&message.source().process.to_string().as_str()),
                             },
                         );
+                        broadcast_apps_update(&http_server, &app_data);
                     }
                     homepage::Request::Remove => {
                         let id = message.source().process.to_string();
                         app_data.remove(&id);
                         persisted_app_order.remove(&id);
+                        broadcast_apps_update(&http_server, &app_data);
                     }
                     homepage::Request::RemoveOther(id) => {
                         // caps check
@@ -973,6 +1055,7 @@ fn init(our: Address) {
                         // end caps check
                         app_data.remove(&id);
                         persisted_app_order.remove(&id);
+                        broadcast_apps_update(&http_server, &app_data);
                     }
                     homepage::Request::GetApps => {
                         let apps = app_data.values().cloned().collect::<Vec<homepage::App>>();
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppContainer.tsx b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppContainer.tsx
index b6ab69a15..95967d5af 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppContainer.tsx
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppContainer.tsx
@@ -10,6 +10,14 @@ export const AppContainer: React.FC<AppContainerProps> = ({ app, isVisible }) =>
   const iframeRef = useRef<HTMLIFrameElement>(null);
   const [hasError, setHasError] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
+  const [hasAnimatedIn, setHasAnimatedIn] = useState(false);
+
+  // Track when the app first becomes visible to trigger entrance animation
+  useEffect(() => {
+    if (isVisible && !hasAnimatedIn) {
+      setHasAnimatedIn(true);
+    }
+  }, [isVisible, hasAnimatedIn]);
 
   // Ensure we have a valid path
   const appUrl = useMemo(() => {
@@ -29,8 +37,13 @@ export const AppContainer: React.FC<AppContainerProps> = ({ app, isVisible }) =>
 
   return (
     <div
-      className={`app-container fixed inset-0 dark:bg-black bg-white z-30 transition-transform duration-300
-        ${isVisible ? 'translate-x-0' : 'translate-x-full'}`}
+      className={`app-container fixed inset-0 dark:bg-black bg-white z-30
+        ${isVisible
+          ? hasAnimatedIn ? 'animate-app-launch' : 'opacity-0'
+          : 'pointer-events-none opacity-0 scale-95'}`}
+      style={{
+        transition: isVisible ? 'none' : 'opacity 0.2s ease-in, transform 0.2s ease-in',
+      }}
     >
       {hasError ? (
         <div className="w-full h-full flex flex-col items-center justify-center bg-gradient-to-b from-gray-100 to-gray-200 dark:from-gray-800 dark:to-gray-900">
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppDrawer.tsx b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppDrawer.tsx
index 6099ae1af..c79d934f3 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppDrawer.tsx
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppDrawer.tsx
@@ -33,7 +33,7 @@ export const AppDrawer: React.FC = () => {
 
   return (
     <div
-      className="app-drawer fixed inset-0 bg-gradient-to-b from-gray-100/20 to-white/20 dark:from-gray-900/20 dark:to-black/20 backdrop-blur-xl z-50 flex flex-col"
+      className="app-drawer fixed inset-0 bg-gradient-to-b from-gray-100/20 to-white/20 dark:from-gray-900/20 dark:to-black/20 backdrop-blur-xl z-50 flex flex-col animate-modal-backdrop"
       onClick={toggleAppDrawer}
     >
       <div className="px-2 py-1 self-stretch flex items-center gap-2">
@@ -59,10 +59,11 @@ export const AppDrawer: React.FC = () => {
           'grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6': filteredApps.length > 0,
           'grid-cols-2': filteredApps.length === 0,
         })}>
-          {filteredApps.map(app => (
+          {filteredApps.map((app, index) => (
             <div
               key={app.id}
-              className="relative group"
+              className="relative group animate-grid-enter"
+              style={{ '--item-index': index } as React.CSSProperties}
               data-app-id={app.id}
             >
               <div onClick={(e) => {
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppIcon.tsx b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppIcon.tsx
index 40263e495..232553672 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/components/AppIcon.tsx
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/components/AppIcon.tsx
@@ -18,6 +18,7 @@ export const AppIcon: React.FC<AppIconProps> = ({
 }) => {
   const { openApp } = useNavigationStore();
   const [isPressed, setIsPressed] = useState(false);
+  const [isHovered, setIsHovered] = useState(false);
 
   const handlePress = () => {
     if (!isEditMode && app.path && app.path !== null) {
@@ -25,19 +26,30 @@ export const AppIcon: React.FC<AppIconProps> = ({
     }
   };
 
+  // Calculate scale based on state priority: pressed > hovered > default
+  const getScale = () => {
+    if (isPressed) return 'scale(0.94)';
+    if (isHovered && !isEditMode && isFloating) return 'scale(1.08)';
+    return 'scale(1)';
+  };
+
   return (
     <div
-      className={classNames('app-icon relative flex gap-1 flex-col items-center justify-center  rounded-2xl cursor-pointer select-none transition-all', {
-        'scale-95': isPressed,
-        'scale-100': !isPressed,
+      className={classNames('app-icon relative flex gap-1 flex-col items-center justify-center rounded-2xl cursor-pointer select-none', {
         'animate-wiggle': isEditMode && isFloating,
-        'hover:scale-110': !isEditMode && isFloating,
         'opacity-50': !app.path && !(app.process && app.publisher) && !app.base64_icon,
         'p-2': isUndocked,
       })}
+      style={{
+        transform: getScale(),
+        transition: 'transform var(--duration-fast, 150ms) var(--ease-spring, cubic-bezier(0.34, 1.56, 0.64, 1))',
+      }}
       onMouseDown={() => setIsPressed(true)}
       onMouseUp={() => setIsPressed(false)}
-      onMouseLeave={() => setIsPressed(false)}
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => { setIsPressed(false); setIsHovered(false); }}
+      onTouchStart={() => setIsPressed(true)}
+      onTouchEnd={() => setIsPressed(false)}
       onClick={handlePress}
       data-app-id={app.id}
       data-app-path={app.path}
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/components/HomeScreen.tsx b/hyperdrive/packages/homepage/ui/src/components/Home/components/HomeScreen.tsx
index 303359612..90a55a9a6 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/components/HomeScreen.tsx
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/components/HomeScreen.tsx
@@ -430,6 +430,7 @@ export const HomeScreen: React.FC = () => {
                 >
                   {app ? (
                     <div
+                      className="dock-icon"
                       draggable
                       onDragStart={(e) => {
                         e.dataTransfer.setData('appId', app.id);
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/components/Modal.tsx b/hyperdrive/packages/homepage/ui/src/components/Home/components/Modal.tsx
index 6f51bd43b..75eec412a 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/components/Modal.tsx
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/components/Modal.tsx
@@ -18,8 +18,8 @@ export const Modal: React.FC<ModalProps> = ({
     title
 }) => {
     return (
-        <div className={classNames("fixed inset-0 backdrop-blur-sm bg-black/10 dark:bg-black/50 flex items-center justify-center z-50", backdropClassName)}>
-            <div className={classNames("bg-white dark:bg-black shadow-lg dark:shadow-white/10 p-4 rounded-lg relative w-full max-w-screen md:max-w-md min-h-0 max-h-screen overflow-y-auto flex flex-col items-stretch gap-4", modalClassName)}    >
+        <div className={classNames("fixed inset-0 backdrop-blur-sm bg-black/10 dark:bg-black/50 flex items-center justify-center z-50 animate-modal-backdrop", backdropClassName)}>
+            <div className={classNames("bg-white dark:bg-black shadow-lg dark:shadow-white/10 p-4 rounded-lg relative w-full max-w-screen md:max-w-md min-h-0 max-h-screen overflow-y-auto flex flex-col items-stretch gap-4 animate-modal-content", modalClassName)}>
                 <div className="flex items-center justify-between">
                     {title && <h2 className="text-lg font-bold prose">{title}</h2>}
                 <button
diff --git a/hyperdrive/packages/homepage/ui/src/components/Home/styles/animations.css b/hyperdrive/packages/homepage/ui/src/components/Home/styles/animations.css
index 12cf2611f..64371fd71 100644
--- a/hyperdrive/packages/homepage/ui/src/components/Home/styles/animations.css
+++ b/hyperdrive/packages/homepage/ui/src/components/Home/styles/animations.css
@@ -21,3 +21,91 @@
 .animate-slide-down {
   animation: slide-down 0.3s ease-out;
 }
+
+/* App launch - scale up with subtle blur clear */
+@keyframes app-launch {
+  0% {
+    transform: scale(0.92);
+    opacity: 0;
+    filter: blur(4px);
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
+    filter: blur(0);
+  }
+}
+
+/* App close - scale down and fade */
+@keyframes app-close {
+  0% {
+    transform: scale(1);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(0.96);
+    opacity: 0;
+  }
+}
+
+/* Staggered grid item entrance */
+@keyframes grid-item-enter {
+  0% {
+    opacity: 0;
+    transform: scale(0.85) translateY(12px);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+/* Modal entrance */
+@keyframes modal-enter {
+  0% {
+    opacity: 0;
+    transform: scale(0.95) translateY(-8px);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+/* Modal backdrop fade with blur */
+@keyframes backdrop-enter {
+  0% {
+    opacity: 0;
+    backdrop-filter: blur(0);
+  }
+  100% {
+    opacity: 1;
+    backdrop-filter: blur(8px);
+  }
+}
+
+/* OmniButton idle pulse with neon glow */
+@keyframes omni-pulse {
+  0%, 100% {
+    box-shadow: 0 0 0 0 var(--neon-green-light, rgba(220, 255, 113, 0.4));
+  }
+  50% {
+    box-shadow: 0 0 0 10px transparent;
+  }
+}
+
+/* Card entrance for RecentApps */
+@keyframes card-enter {
+  0% {
+    opacity: 0;
+    transform: translateY(20px) rotate(-2deg) scale(0.95);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0) rotate(0) scale(1);
+  }
+}
+
+.animate-card-enter {
+  animation: card-enter 0.35s var(--ease-out, cubic-bezier(0.0, 0.0, 0.2, 1)) both;
+}
diff --git a/hyperdrive/packages/homepage/ui/src/index.css b/hyperdrive/packages/homepage/ui/src/index.css
index 37dc7f2f4..183b1156d 100644
--- a/hyperdrive/packages/homepage/ui/src/index.css
+++ b/hyperdrive/packages/homepage/ui/src/index.css
@@ -46,6 +46,21 @@
   --transition-fast: 150ms ease;
   --transition-normal: 250ms ease;
   --button-border-width: 2px;
+
+  /* Motion design system - durations */
+  --duration-instant: 100ms;
+  --duration-fast: 150ms;
+  --duration-normal: 200ms;
+  --duration-medium: 300ms;
+  --duration-slow: 400ms;
+  --duration-emphasis: 500ms;
+
+  /* Motion design system - easing curves */
+  --ease-out: cubic-bezier(0.0, 0.0, 0.2, 1);
+  --ease-in: cubic-bezier(0.4, 0.0, 1, 1);
+  --ease-in-out: cubic-bezier(0.4, 0.0, 0.2, 1);
+  --ease-spring: cubic-bezier(0.34, 1.56, 0.64, 1);
+  --ease-bounce: cubic-bezier(0.68, -0.55, 0.265, 1.55);
 }
 
 
@@ -520,4 +535,60 @@ footer {
 .empty-state p {
   text-align: center;
   font-size: 14px;
+}
+
+/* Dock hover effects */
+.dock-icon {
+  transition: transform var(--duration-fast) var(--ease-spring),
+              box-shadow var(--duration-fast) var(--ease-out);
+}
+
+.dock-icon:hover {
+  transform: translateY(-6px) scale(1.08);
+  box-shadow: 0 10px 20px -6px rgba(0, 0, 0, 0.25);
+}
+
+.dock-icon:active {
+  transform: translateY(-2px) scale(0.98);
+}
+
+/* Staggered grid entrance animation - fast for snappy feel */
+.animate-grid-enter {
+  animation: grid-item-enter var(--duration-fast) var(--ease-out) both;
+  animation-delay: calc(var(--item-index, 0) * 12ms);
+}
+
+/* Modal animations */
+.animate-modal-backdrop {
+  animation: backdrop-enter var(--duration-fast) var(--ease-out) both;
+}
+
+.animate-modal-content {
+  animation: modal-enter var(--duration-medium) var(--ease-out) both;
+  animation-delay: 50ms;
+}
+
+/* OmniButton animations */
+.animate-omni-pulse {
+  animation: omni-pulse 2.5s ease-in-out infinite;
+}
+
+/* App container animations */
+.animate-app-launch {
+  animation: app-launch var(--duration-slow) var(--ease-out) both;
+}
+
+.animate-app-close {
+  animation: app-close var(--duration-normal) var(--ease-in) both;
+}
+
+/* Reduced motion support */
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
 }
\ No newline at end of file
diff --git a/hyperdrive/packages/homepage/ui/src/stores/appStore.ts b/hyperdrive/packages/homepage/ui/src/stores/appStore.ts
index 29abdf777..c047a30c8 100644
--- a/hyperdrive/packages/homepage/ui/src/stores/appStore.ts
+++ b/hyperdrive/packages/homepage/ui/src/stores/appStore.ts
@@ -1,16 +1,49 @@
 import { create } from 'zustand';
 import type { HomepageApp } from '../types/app.types';
+import { isWsMessage } from '../types/app.types';
+
+// Homepage is special - it's served at root, not at a subdomain
+const WS_URL = `${window.location.protocol.replace('http', 'ws')}//${window.location.host}/`;
 
 interface AppStore {
   apps: HomepageApp[];
   setApps: (apps: HomepageApp[]) => void;
   isEditMode: boolean;
   setEditMode: (mode: boolean) => void;
+  ws: WebSocket | null;
 }
 
-export const useAppStore = create<AppStore>((set) => ({
-  apps: [],
-  setApps: (apps) => set({ apps }),
-  isEditMode: false,
-  setEditMode: (isEditMode) => set({ isEditMode }),
-}));
\ No newline at end of file
+// Create WebSocket connection
+function createWebSocket(setApps: (apps: HomepageApp[]) => void): WebSocket {
+  const ws = new WebSocket(WS_URL);
+
+  ws.onmessage = (event: MessageEvent<string>) => {
+    try {
+      const parsed: unknown = JSON.parse(event.data);
+      if (isWsMessage(parsed) && parsed.kind === 'apps_update') {
+        setApps(parsed.data);
+      }
+    } catch (e) {
+      console.error('[Homepage WS] Error parsing message:', e);
+    }
+  };
+
+  ws.onerror = (event: Event) => {
+    console.error('[Homepage WS] Connection error:', event);
+  };
+
+  return ws;
+}
+
+export const useAppStore = create<AppStore>((set) => {
+  // Initialize WebSocket after store is created
+  const ws = createWebSocket((apps) => set({ apps }));
+
+  return {
+    apps: [],
+    setApps: (apps) => set({ apps }),
+    isEditMode: false,
+    setEditMode: (isEditMode) => set({ isEditMode }),
+    ws,
+  };
+});
diff --git a/hyperdrive/packages/homepage/ui/src/types/app.types.ts b/hyperdrive/packages/homepage/ui/src/types/app.types.ts
index 69ffa7c54..049a9f8b2 100644
--- a/hyperdrive/packages/homepage/ui/src/types/app.types.ts
+++ b/hyperdrive/packages/homepage/ui/src/types/app.types.ts
@@ -23,4 +23,19 @@ export interface Position {
 export interface Size {
   width: number;
   height: number;
+}
+
+// WebSocket message types (mirrors Rust WsMessage enum)
+export type WsMessage = WsAppsUpdate;
+
+export interface WsAppsUpdate {
+  kind: 'apps_update';
+  data: HomepageApp[];
+}
+
+// Type guard for WsMessage
+export function isWsMessage(obj: unknown): obj is WsMessage {
+  if (typeof obj !== 'object' || obj === null) return false;
+  const msg = obj as Record<string, unknown>;
+  return msg.kind === 'apps_update' && Array.isArray(msg.data);
 }
\ No newline at end of file
diff --git a/hyperdrive/packages/hypermap-cacher/Cargo.lock b/hyperdrive/packages/hypermap-cacher/Cargo.lock
index 04499b149..93a9d08f9 100644
--- a/hyperdrive/packages/hypermap-cacher/Cargo.lock
+++ b/hyperdrive/packages/hypermap-cacher/Cargo.lock
@@ -1086,6 +1086,25 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "dao-cacher"
+version = "0.1.0"
+dependencies = [
+ "alloy",
+ "alloy-primitives",
+ "alloy-sol-types",
+ "anyhow",
+ "chrono",
+ "hex",
+ "hyperware_process_lib",
+ "process_macros",
+ "rand 0.8.5",
+ "rmp-serde",
+ "serde",
+ "serde_json",
+ "wit-bindgen",
+]
+
 [[package]]
 name = "dashmap"
 version = "6.1.0"
@@ -1680,9 +1699,8 @@ dependencies = [
 
 [[package]]
 name = "hyperware_process_lib"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe2b6795488c3f7d3410808cf7e29404725f862ad42a3822886464b92451a21"
+version = "3.0.1"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=34b1f1d857f76fb474f7af96f089961445758edb#34b1f1d857f76fb474f7af96f089961445758edb"
 dependencies = [
  "alloy",
  "alloy-primitives",
diff --git a/hyperdrive/packages/hypermap-cacher/Cargo.toml b/hyperdrive/packages/hypermap-cacher/Cargo.toml
index ff4a19f1f..ff8510946 100644
--- a/hyperdrive/packages/hypermap-cacher/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/Cargo.toml
@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "binding-cacher",
+    "dao-cacher",
     "hypermap-cacher",
     "reset-cache",
     "set-nodes",
diff --git a/hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v1.wit b/hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v2.wit
similarity index 66%
rename from hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v1.wit
rename to hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v2.wit
index 472e9b6e2..e39a427da 100644
--- a/hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v1.wit
+++ b/hyperdrive/packages/hypermap-cacher/api/hypermap-cacher:sys-v2.wit
@@ -76,6 +76,84 @@ interface binding-cacher {
     }
 }
 
+interface dao-cacher {
+    // Metadata associated with a batch of Ethereum logs.
+    record dao-logs-metadata {
+        chain-id: string,
+        from-block: string,
+        to-block: string,
+        time-created: string,
+        created-by: string,
+        signature: string,
+    }
+
+    // Represents an item in the manifest, detailing a single log cache file.
+    record dao-manifest-item {
+        metadata: dao-logs-metadata,
+        is-empty: bool,
+        file-hash: string,
+        file-name: string,
+    }
+
+    // The main manifest structure, listing all available log cache files.
+    // WIT does not support direct map types, so a list of key-value tuples is used.
+    record dao-manifest {
+        // The key is the filename of the log cache.
+        items: list<tuple<string, dao-manifest-item>>,
+        manifest-filename: string,
+        chain-id: string,
+        protocol-version: string,
+    }
+
+    record dao-get-logs-by-range-request {
+        from-block: u64,
+        to-block: option<u64>, // If None, signifies to the latest available/relevant cached block.
+    }
+
+    variant dao-get-logs-by-range-ok-response {
+        logs(tuple<u64, string>),
+        latest(u64),
+    }
+
+    // Defines the types of requests that can be sent to the Hypermap Cacher process.
+    variant dao-cacher-request {
+        get-manifest,
+        get-log-cache-content(string),
+        get-status,
+        get-logs-by-range(dao-get-logs-by-range-request),
+        start-providing,
+        stop-providing,
+        set-nodes(list<string>),
+        reset(option<list<string>>),
+    }
+
+    // Represents the operational status of the cacher.
+    record dao-cacher-status {
+        last-cached-block: u64,
+        chain-id: string,
+        protocol-version: string,
+        next-cache-attempt-in-seconds: option<u64>,
+        manifest-filename: string,
+        log-files-count: u32,
+        our-address: string,
+        is-providing: bool,
+    }
+
+    // Defines the types of responses the Hypermap Cacher process can send.
+    variant dao-cacher-response {
+        get-manifest(option<dao-manifest>),
+        get-log-cache-content(result<option<string>, string>),
+        get-status(dao-cacher-status),
+        get-logs-by-range(result<dao-get-logs-by-range-ok-response, string>),
+        start-providing(result<string, string>),
+        stop-providing(result<string, string>),
+        set-nodes(result<string, string>),
+        reset(result<string, string>),
+        rejected,
+        is-starting,
+    }
+}
+
 interface hypermap-cacher {
     // Metadata associated with a batch of Ethereum logs.
     record logs-metadata {
@@ -154,9 +232,10 @@ interface hypermap-cacher {
     }
 }
 
-world hypermap-cacher-sys-v1 {
+world hypermap-cacher-sys-v2 {
     import sign;
     import binding-cacher;
+    import dao-cacher;
     import hypermap-cacher;
     include process-v1;
 }
diff --git a/hyperdrive/packages/hypermap-cacher/binding-cacher/Cargo.toml b/hyperdrive/packages/hypermap-cacher/binding-cacher/Cargo.toml
index e0504d478..17b56f30d 100644
--- a/hyperdrive/packages/hypermap-cacher/binding-cacher/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/binding-cacher/Cargo.toml
@@ -18,7 +18,7 @@ alloy = { version = "0.8.1", features = [
 ] }
 chrono = "0.4.41"
 hex = "0.4.3"
-hyperware_process_lib = { version = "2.3.0", features = ["logging"] }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb", features = ["logging"] }
 process_macros = "0.1.0"
 rand = "0.8"
 rmp-serde = "1.1.2"
diff --git a/hyperdrive/packages/hypermap-cacher/binding-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/binding-cacher/src/lib.rs
index d026da31e..6bb9914c9 100644
--- a/hyperdrive/packages/hypermap-cacher/binding-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/binding-cacher/src/lib.rs
@@ -27,7 +27,7 @@ use hyperware_process_lib::{wait_for_process_ready, WaitClassification};
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
diff --git a/hyperdrive/packages/hypermap-cacher/dao-cacher/Cargo.toml b/hyperdrive/packages/hypermap-cacher/dao-cacher/Cargo.toml
new file mode 100644
index 000000000..7acc80ebb
--- /dev/null
+++ b/hyperdrive/packages/hypermap-cacher/dao-cacher/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "dao-cacher"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[features]
+simulation-mode = ["hyperware_process_lib/simulation-mode"]
+
+[dependencies]
+anyhow = "1.0"
+alloy-primitives = "0.8.15"
+alloy-sol-types = "0.8.15"
+alloy = { version = "0.8.1", features = [
+    "json-rpc",
+    "rpc-client",
+    "rpc-types",
+] }
+chrono = "0.4.41"
+hex = "0.4.3"
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb", features = ["logging"] }
+process_macros = "0.1.0"
+rand = "0.8"
+rmp-serde = "1.1.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+wit-bindgen = "0.42.1"
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.component]
+package = "hyperware:process"
diff --git a/hyperdrive/packages/hypermap-cacher/dao-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/dao-cacher/src/lib.rs
new file mode 100644
index 000000000..7def5a6af
--- /dev/null
+++ b/hyperdrive/packages/hypermap-cacher/dao-cacher/src/lib.rs
@@ -0,0 +1,1516 @@
+use std::{
+    cmp::{max, min},
+    collections::HashMap,
+    str::FromStr,
+};
+
+use alloy::hex;
+use alloy_primitives::keccak256;
+use rand::seq::SliceRandom;
+use rand::thread_rng;
+use serde::{Deserialize, Serialize};
+
+use crate::hyperware::process::dao_cacher::{
+    DaoCacherRequest as CacherRequest, DaoCacherResponse as CacherResponse, DaoCacherStatus as CacherStatus,
+    DaoGetLogsByRangeOkResponse as GetLogsByRangeOkResponse, DaoGetLogsByRangeRequest as GetLogsByRangeRequest,
+    DaoLogsMetadata as WitLogsMetadata, DaoManifest as WitManifest, DaoManifestItem as WitManifestItem,
+};
+use hyperware_process_lib::{
+    await_message, call_init, dao, eth, get_state, http,
+    logging::{debug, error, info, init_logging, warn, Level},
+    net::{NetAction, NetResponse},
+    our, set_state, sign, timer, vfs, Address, ProcessId, Request, Response,
+};
+use hyperware_process_lib::{wait_for_process_ready, WaitClassification};
+
+wit_bindgen::generate!({
+    path: "../target/wit",
+    world: "hypermap-cacher-sys-v2",
+    generate_unused_types: true,
+    additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
+});
+
+const PROTOCOL_VERSION: &str = "0";
+const DEFAULT_BLOCK_BATCH_SIZE: u64 = 10;
+// Cache cadence: faster in simulation, slower on real chains.
+#[cfg(feature = "simulation-mode")]
+const DEFAULT_CACHE_INTERVAL_S: u64 = 3_600;
+#[cfg(not(feature = "simulation-mode"))]
+const DEFAULT_CACHE_INTERVAL_S: u64 = 3_600; // 2s / block -> ~1hr (1800 blocks)
+const MAX_LOG_RETRIES: u8 = 3;
+const RETRY_DELAY_S: u64 = 10;
+const LOG_ITERATION_DELAY_MS: u64 = 200;
+
+#[cfg(not(feature = "simulation-mode"))]
+const DEFAULT_NODES: &[&str] = &[
+    "us-cacher-1.hypr",
+    "eu-cacher-1.hypr",
+    "nick.hypr",
+    "nick1udwig.os",
+];
+#[cfg(feature = "simulation-mode")]
+const DEFAULT_NODES: &[&str] = &["fake.os"];
+
+// Internal representation of LogsMetadata, similar to WIT but for Rust logic.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct LogsMetadataInternal {
+    #[serde(rename = "chainId")]
+    chain_id: String,
+    #[serde(rename = "fromBlock")]
+    from_block: String,
+    #[serde(rename = "toBlock")]
+    to_block: String,
+    #[serde(rename = "timeCreated")]
+    time_created: String,
+    #[serde(rename = "createdBy")]
+    created_by: String,
+    signature: String, // Keccak256 hash of the log file content.
+}
+
+// Internal representation of a LogCache, containing metadata and actual logs.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct LogCacheInternal {
+    metadata: LogsMetadataInternal,
+    logs: Vec<eth::Log>, // The actual Ethereum logs.
+}
+
+// Internal representation of a ManifestItem.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct ManifestItemInternal {
+    metadata: LogsMetadataInternal,
+    #[serde(rename = "isEmpty")]
+    is_empty: bool,
+    #[serde(rename = "fileHash")]
+    file_hash: String,
+    #[serde(rename = "fileName")]
+    file_name: String,
+}
+
+// Internal representation of the Manifest.
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
+struct ManifestInternal {
+    items: HashMap<String, ManifestItemInternal>,
+    manifest_filename: String,
+    chain_id: String,
+    protocol_version: String,
+}
+
+// The main state structure for the Hypermap Binding Cacher process.
+#[derive(Serialize, Deserialize, Debug)]
+struct State {
+    hypermap_binding_address: eth::Address,
+    manifest: ManifestInternal,
+    last_cached_block: u64,
+    chain_id: String,
+    protocol_version: String,
+    cache_interval_s: u64,
+    block_batch_size: u64,
+    is_cache_timer_live: bool,
+    drive_path: String,
+    is_providing: bool,
+    nodes: Vec<String>,
+    #[serde(skip)]
+    is_starting: bool,
+}
+
+// Generates a timestamp string.
+fn get_current_timestamp_str() -> String {
+    let datetime = chrono::Utc::now();
+    datetime.format("%Y%m%dT%H%M%SZ").to_string()
+}
+
+fn is_local_request(our: &Address, source: &Address) -> bool {
+    our.node == source.node
+}
+
+impl State {
+    fn new(drive_path: &str) -> Self {
+        let chain_id = dao::DAO_CHAIN_ID.to_string();
+        let hypermap_binding_address = eth::Address::from_str(dao::DAO_GOVERNOR_ADDRESS)
+            .expect("Failed to parse DAO_GOVERNOR_ADDRESS");
+
+        let manifest_filename = format!(
+            "manifest-chain{}-protocol{}.json",
+            chain_id, PROTOCOL_VERSION
+        );
+        let initial_manifest = ManifestInternal {
+            items: HashMap::new(),
+            manifest_filename: manifest_filename.clone(),
+            chain_id: chain_id.clone(),
+            protocol_version: PROTOCOL_VERSION.to_string(),
+        };
+
+        State {
+            hypermap_binding_address,
+            manifest: initial_manifest,
+            last_cached_block: dao::DAO_FIRST_BLOCK,
+            chain_id,
+            protocol_version: PROTOCOL_VERSION.to_string(),
+            cache_interval_s: DEFAULT_CACHE_INTERVAL_S,
+            block_batch_size: 0, // Will be determined dynamically
+            is_cache_timer_live: false,
+            drive_path: drive_path.to_string(),
+            is_providing: false,
+            nodes: DEFAULT_NODES.iter().map(|s| s.to_string()).collect(),
+            is_starting: true,
+        }
+    }
+
+    fn load(drive_path: &str) -> Self {
+        match get_state() {
+            Some(state_bytes) => match serde_json::from_slice::<Self>(&state_bytes) {
+                Ok(mut loaded_state) => {
+                    info!("Successfully loaded state from checkpoint.");
+                    // Always start in starting mode to bootstrap from other nodes
+                    // is_starting is not serialized, so it defaults to false and we set it to true
+                    loaded_state.is_starting = true;
+                    loaded_state.drive_path = drive_path.to_string();
+
+                    // Validate state against manifest file on disk
+                    if let Err(e) = loaded_state.validate_state_against_manifest() {
+                        warn!("State validation failed: {:?}. Clearing drive and creating fresh state.", e);
+                        if let Err(clear_err) = loaded_state.clear_drive() {
+                            error!("Failed to clear drive: {:?}", clear_err);
+                        }
+                        return Self::new(drive_path);
+                    }
+
+                    loaded_state
+                }
+                Err(e) => {
+                    warn!(
+                        "Failed to deserialize saved state: {:?}. Creating new state.",
+                        e
+                    );
+                    Self::new(drive_path)
+                }
+            },
+            None => {
+                info!("No saved state found. Creating new state.");
+                Self::new(drive_path)
+            }
+        }
+    }
+
+    fn save(&self) {
+        match serde_json::to_vec(self) {
+            Ok(state_bytes) => set_state(&state_bytes),
+            Err(e) => error!("Fatal: Failed to serialize state for saving: {:?}", e),
+        }
+        info!(
+            "State checkpoint saved. Last cached block: {}",
+            self.last_cached_block
+        );
+    }
+
+    // Core logic for fetching logs, creating cache files, and updating the manifest.
+    fn cache_logs_and_update_manifest(&mut self, provider: &eth::Provider) -> anyhow::Result<()> {
+        // Ensure batch size is determined
+        if self.block_batch_size == 0 {
+            self.determine_batch_size(provider)?;
+        }
+
+        let current_chain_head = match provider.get_block_number() {
+            Ok(block_num) => block_num,
+            Err(e) => {
+                error!(
+                    "Failed to get current block number: {:?}. Skipping cycle.",
+                    e
+                );
+                return Err(anyhow::anyhow!("Failed to get block number: {:?}", e));
+            }
+        };
+
+        if self.last_cached_block >= current_chain_head {
+            info!(
+                "Already caught up to chain head ({}). Nothing to cache.",
+                current_chain_head
+            );
+            return Ok(());
+        }
+
+        while self.last_cached_block != current_chain_head {
+            self.cache_logs_and_update_manifest_step(provider, Some(current_chain_head))?;
+
+            std::thread::sleep(std::time::Duration::from_millis(LOG_ITERATION_DELAY_MS));
+        }
+
+        Ok(())
+    }
+
+    fn cache_logs_and_update_manifest_step(
+        &mut self,
+        provider: &eth::Provider,
+        to_block: Option<u64>,
+    ) -> anyhow::Result<()> {
+        info!(
+            "Starting caching cycle. From block: {}",
+            self.last_cached_block + 1
+        );
+
+        let current_chain_head = match to_block {
+            Some(b) => b,
+            None => match provider.get_block_number() {
+                Ok(block_num) => block_num,
+                Err(e) => {
+                    error!(
+                        "Failed to get current block number: {:?}. Skipping cycle.",
+                        e
+                    );
+                    return Err(anyhow::anyhow!("Failed to get block number: {:?}", e));
+                }
+            },
+        };
+
+        if self.last_cached_block >= current_chain_head {
+            info!(
+                "Already caught up to chain head ({}). Nothing to cache.",
+                current_chain_head
+            );
+            return Ok(());
+        }
+
+        let from_block = self.last_cached_block + 1;
+        let mut to_block = from_block + self.block_batch_size - 1;
+        if to_block > current_chain_head {
+            to_block = current_chain_head;
+        }
+
+        if from_block > to_block {
+            info!("From_block {} is greater than to_block {}. Chain might not have advanced enough. Skipping.", from_block, to_block);
+            return Ok(());
+        }
+
+        let filter = eth::Filter::new()
+            .address(self.hypermap_binding_address)
+            .from_block(from_block)
+            .to_block(eth::BlockNumberOrTag::Number(to_block));
+
+        let logs = {
+            let mut attempt = 0;
+            loop {
+                match provider.get_logs(&filter) {
+                    Ok(logs) => break logs,
+                    Err(e) => {
+                        attempt += 1;
+                        if attempt >= MAX_LOG_RETRIES {
+                            error!(
+                                "Failed to get logs after {} retries: {:?}",
+                                MAX_LOG_RETRIES, e
+                            );
+                            return Err(anyhow::anyhow!("Failed to get logs: {:?}", e));
+                        }
+                        warn!(
+                            "Error getting logs (attempt {}/{}): {:?}. Retrying in {}s...",
+                            attempt, MAX_LOG_RETRIES, e, RETRY_DELAY_S
+                        );
+                        std::thread::sleep(std::time::Duration::from_secs(RETRY_DELAY_S));
+                    }
+                }
+            }
+        };
+
+        info!(
+            "Fetched {} logs from block {} to {}.",
+            logs.len(),
+            from_block,
+            to_block
+        );
+
+        let our = our();
+
+        let metadata = LogsMetadataInternal {
+            chain_id: self.chain_id.clone(),
+            from_block: from_block.to_string(),
+            to_block: to_block.to_string(),
+            time_created: get_current_timestamp_str(),
+            created_by: our.to_string(),
+            signature: "".to_string(),
+        };
+
+        let mut log_cache = LogCacheInternal {
+            metadata,
+            logs: logs.clone(),
+        };
+
+        let mut logs_bytes_for_sig = serde_json::to_vec(&log_cache.logs).unwrap_or_default();
+        logs_bytes_for_sig.extend_from_slice(&from_block.to_be_bytes());
+        logs_bytes_for_sig.extend_from_slice(&to_block.to_be_bytes());
+        let logs_hash_for_sig = keccak256(&logs_bytes_for_sig);
+
+        let signature = sign::net_key_sign(logs_hash_for_sig.to_vec())?;
+
+        log_cache.metadata.signature = format!("0x{}", hex::encode(signature));
+
+        // Final serialization of LogCacheInternal with the signature.
+        let final_log_cache_bytes = match serde_json::to_vec(&log_cache) {
+            Ok(bytes) => bytes,
+            Err(e) => {
+                error!(
+                    "Failed to re-serialize LogCacheInternal with signature: {:?}",
+                    e
+                );
+                return Err(e.into());
+            }
+        };
+
+        let file_hash_for_manifest =
+            format!("0x{}", hex::encode(keccak256(&final_log_cache_bytes)));
+
+        let log_cache_filename = format!(
+            "{}-chain{}-from{}-to{}-protocol{}.json",
+            log_cache
+                .metadata
+                .time_created
+                .replace(":", "")
+                .replace("-", ""), // Make timestamp filename-safe
+            self.chain_id,
+            from_block,
+            to_block,
+            self.protocol_version
+        );
+
+        if !logs.is_empty() {
+            let log_cache_path = format!("{}/{}", self.drive_path, log_cache_filename);
+            let mut log_cache_file = vfs::open_file(&log_cache_path, true, None)?;
+
+            if let Err(e) = log_cache_file.write_all(&final_log_cache_bytes) {
+                error!("Failed to write log cache file {}: {:?}", log_cache_path, e);
+                return Err(e.into());
+            }
+            info!("Successfully wrote log cache file: {}", log_cache_path);
+        }
+
+        let manifest_item = ManifestItemInternal {
+            metadata: log_cache.metadata.clone(),
+            is_empty: logs.is_empty(),
+            file_hash: file_hash_for_manifest,
+            file_name: if logs.is_empty() {
+                "".to_string()
+            } else {
+                log_cache_filename.clone()
+            },
+        };
+        self.manifest
+            .items
+            .insert(log_cache_filename.clone(), manifest_item);
+        self.manifest.chain_id = self.chain_id.clone();
+        self.manifest.protocol_version = self.protocol_version.clone();
+
+        let manifest_bytes = match serde_json::to_vec(&self.manifest) {
+            Ok(bytes) => bytes,
+            Err(e) => {
+                error!("Failed to serialize manifest: {:?}", e);
+                return Err(e.into());
+            }
+        };
+
+        let manifest_path = format!("{}/{}", self.drive_path, self.manifest.manifest_filename);
+        let manifest_file = vfs::open_file(&manifest_path, true, None)?;
+
+        if let Err(e) = manifest_file.write(&manifest_bytes) {
+            error!("Failed to write manifest file {}: {:?}", manifest_path, e);
+            return Err(e.into());
+        }
+        info!(
+            "Successfully updated and wrote manifest file: {}",
+            manifest_path
+        );
+
+        self.last_cached_block = to_block;
+        self.save();
+
+        Ok(())
+    }
+
+    // Validate that the in-memory state matches the manifest file on disk
+    fn validate_state_against_manifest(&self) -> anyhow::Result<()> {
+        let manifest_path = format!("{}/{}", self.drive_path, self.manifest.manifest_filename);
+
+        // Check if manifest file exists
+        match vfs::open_file(&manifest_path, false, None) {
+            Ok(manifest_file) => {
+                match manifest_file.read() {
+                    Ok(disk_manifest_bytes) => {
+                        match serde_json::from_slice::<ManifestInternal>(&disk_manifest_bytes) {
+                            Ok(disk_manifest) => {
+                                // Compare key aspects of the manifests
+                                if self.manifest.chain_id != disk_manifest.chain_id {
+                                    return Err(anyhow::anyhow!(
+                                        "Chain ID mismatch: state has {}, disk has {}",
+                                        self.manifest.chain_id,
+                                        disk_manifest.chain_id
+                                    ));
+                                }
+
+                                if self.manifest.protocol_version != disk_manifest.protocol_version
+                                {
+                                    return Err(anyhow::anyhow!(
+                                        "Protocol version mismatch: state has {}, disk has {}",
+                                        self.manifest.protocol_version,
+                                        disk_manifest.protocol_version
+                                    ));
+                                }
+
+                                // Check if all files mentioned in state manifest exist on disk
+                                for (_filename, item) in &self.manifest.items {
+                                    if !item.file_name.is_empty() {
+                                        let file_path =
+                                            format!("{}/{}", self.drive_path, item.file_name);
+                                        if vfs::metadata(&file_path, None).is_err() {
+                                            return Err(anyhow::anyhow!(
+                                                "File {} mentioned in state manifest does not exist on disk",
+                                                item.file_name
+                                            ));
+                                        }
+                                    }
+                                }
+
+                                // Check if disk manifest has more recent data than our state
+                                let disk_max_block = disk_manifest
+                                    .items
+                                    .values()
+                                    .filter_map(|item| item.metadata.to_block.parse::<u64>().ok())
+                                    .max()
+                                    .unwrap_or(0);
+
+                                let state_max_block = self
+                                    .manifest
+                                    .items
+                                    .values()
+                                    .filter_map(|item| item.metadata.to_block.parse::<u64>().ok())
+                                    .max()
+                                    .unwrap_or(0);
+
+                                if disk_max_block > state_max_block {
+                                    return Err(anyhow::anyhow!(
+                                        "Disk manifest has more recent data (block {}) than state (block {})",
+                                        disk_max_block, state_max_block
+                                    ));
+                                }
+
+                                info!("State validation passed - state matches manifest file");
+                                Ok(())
+                            }
+                            Err(e) => {
+                                Err(anyhow::anyhow!("Failed to parse manifest file: {:?}", e))
+                            }
+                        }
+                    }
+                    Err(e) => Err(anyhow::anyhow!("Failed to read manifest file: {:?}", e)),
+                }
+            }
+            Err(_) => {
+                // Manifest file doesn't exist - this is okay for new installs
+                if self.manifest.items.is_empty() {
+                    info!("No manifest file found, but state is also empty - validation passed");
+                    Ok(())
+                } else {
+                    Err(anyhow::anyhow!(
+                        "State has manifest items but no manifest file exists on disk"
+                    ))
+                }
+            }
+        }
+    }
+
+    // Clear all files from the drive
+    fn clear_drive(&self) -> anyhow::Result<()> {
+        info!("Clearing all files from drive: {}", self.drive_path);
+
+        // Remove the manifest file
+        let manifest_path = format!("{}/{}", self.drive_path, self.manifest.manifest_filename);
+        match vfs::remove_file(&manifest_path, None) {
+            Ok(_) => info!("Removed manifest file: {}", manifest_path),
+            Err(e) => warn!("Failed to remove manifest file {}: {:?}", manifest_path, e),
+        }
+
+        // Remove all files mentioned in the manifest
+        for (_, item) in &self.manifest.items {
+            if !item.file_name.is_empty() {
+                let file_path = format!("{}/{}", self.drive_path, item.file_name);
+                match vfs::remove_file(&file_path, None) {
+                    Ok(_) => info!("Removed cache file: {}", file_path),
+                    Err(e) => warn!("Failed to remove cache file {}: {:?}", file_path, e),
+                }
+            }
+        }
+
+        info!("Drive clearing completed");
+        Ok(())
+    }
+
+    // Bootstrap state from other nodes, then fallback to RPC
+    fn bootstrap_state(&mut self, provider: &eth::Provider) -> anyhow::Result<()> {
+        info!("Starting state bootstrap process...");
+
+        // Try to bootstrap from other nodes first
+        if let Ok(()) = self.try_bootstrap_from_nodes() {
+            info!("Successfully bootstrapped from other nodes");
+        }
+
+        self.try_bootstrap_from_rpc(provider)?;
+
+        // Mark as no longer starting
+        self.is_starting = false;
+        self.save();
+        info!("Bootstrap process completed, cacher is now ready");
+        Ok(())
+    }
+
+    // Try to bootstrap from other dao-cacher nodes
+    fn try_bootstrap_from_nodes(&mut self) -> anyhow::Result<()> {
+        // Create alternate drive for initfiles and read the test data
+        let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None).unwrap();
+
+        // Try to read the cache_sources file from the initfiles drive
+        match vfs::open_file(&format!("{}/cache_sources", alt_drive_path), false, None) {
+            Ok(file) => {
+                match file.read() {
+                    Ok(contents) => {
+                        let content_str = String::from_utf8_lossy(&contents);
+                        info!("Contents of cache_sources: {}", content_str);
+
+                        // Parse the JSON to get the vector of node names
+                        match serde_json::from_str::<Vec<String>>(&content_str) {
+                            Ok(custom_cache_nodes) => {
+                                if !custom_cache_nodes.is_empty() {
+                                    info!(
+                                        "Loading custom cache source nodes: {:?}",
+                                        custom_cache_nodes
+                                    );
+                                    // Clear existing nodes and add custom ones
+                                    self.nodes.clear();
+                                    for node_name in custom_cache_nodes {
+                                        self.nodes.push(node_name.clone());
+                                    }
+                                } else {
+                                    info!("Custom cache nodes list is empty, keeping existing node configuration");
+                                }
+                            }
+                            Err(e) => {
+                                info!("Failed to parse cache_sources as JSON: {}, keeping existing node configuration", e);
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        info!(
+                            "Failed to read cache_sources: {}, keeping existing node configuration",
+                            e
+                        );
+                    }
+                }
+            }
+            Err(e) => {
+                info!(
+                    "Failed to open cache_sources: {}, keeping existing node configuration",
+                    e
+                );
+            }
+        }
+
+        if self.nodes.is_empty() {
+            info!("No nodes configured for bootstrap, will fallback to RPC");
+            return Err(anyhow::anyhow!("No nodes configured for bootstrap"));
+        }
+
+        info!("Attempting to bootstrap from {} nodes", self.nodes.len());
+
+        let mut nodes = self.nodes.clone();
+
+        // If using default nodes, shuffle them for random order
+        let default_nodes: Vec<String> = DEFAULT_NODES.iter().map(|s| s.to_string()).collect();
+        if nodes == default_nodes {
+            nodes.shuffle(&mut thread_rng());
+        }
+
+        let mut nodes_not_yet_in_net = nodes.clone();
+        let num_retries = 10;
+        for _ in 0..num_retries {
+            nodes_not_yet_in_net.retain(|node| {
+                let Ok(Ok(response)) = Request::new()
+                    .target(("our", "net", "distro", "sys"))
+                    .body(rmp_serde::to_vec(&NetAction::GetPeer(node.clone())).unwrap())
+                    .send_and_await_response(1)
+                else {
+                    return true; // keep the node
+                };
+
+                !matches!(
+                    rmp_serde::from_slice::<NetResponse>(response.body()),
+                    Ok(NetResponse::Peer(Some(_))),
+                )
+            });
+            if nodes_not_yet_in_net.is_empty() {
+                break;
+            }
+            std::thread::sleep(std::time::Duration::from_secs(1));
+        }
+        if !nodes_not_yet_in_net.is_empty() {
+            error!("failed to get peering info for {nodes_not_yet_in_net:?}");
+        }
+
+        for node in nodes {
+            info!("Requesting logs from node: {}", node);
+
+            let cacher_process_address =
+                Address::new(&node, ("dao-cacher", "hypermap-cacher", "sys"));
+
+            if cacher_process_address == our() {
+                continue;
+            }
+
+            // ping node for quicker failure if not online/providing/...
+            let Ok(Ok(response)) = Request::to(cacher_process_address.clone())
+                .body(CacherRequest::GetStatus)
+                .send_and_await_response(3)
+            else {
+                warn!("Node {node} failed to respond to ping; trying next one...");
+                continue;
+            };
+            let Ok(CacherResponse::GetStatus(_)) = response.body().try_into() else {
+                warn!("Node {node} failed to respond to ping with expected GetStatus; trying next one...");
+                continue;
+            };
+
+            // get the logs
+            let get_logs_request = GetLogsByRangeRequest {
+                from_block: self.last_cached_block + 1,
+                to_block: None, // Get all available logs
+            };
+
+            match Request::to(cacher_process_address.clone())
+                .body(CacherRequest::GetLogsByRange(get_logs_request))
+                .send_and_await_response(15)
+            {
+                Ok(Ok(response_msg)) => match response_msg.body().try_into() {
+                    Ok(CacherResponse::GetLogsByRange(Ok(get_logs))) => {
+                        match get_logs {
+                            GetLogsByRangeOkResponse::Logs((block, json_string)) => {
+                                if let Ok(log_caches) =
+                                    serde_json::from_str::<Vec<LogCacheInternal>>(&json_string)
+                                {
+                                    self.process_received_log_caches(log_caches)?;
+                                }
+                                if block > self.last_cached_block {
+                                    self.last_cached_block = block;
+                                }
+                            }
+                            GetLogsByRangeOkResponse::Latest(block) => {
+                                if block > self.last_cached_block {
+                                    self.last_cached_block = block;
+                                }
+                            }
+                        }
+                        return Ok(());
+                    }
+                    Ok(CacherResponse::GetLogsByRange(Err(e))) => {
+                        warn!("Node {} returned error: {}", cacher_process_address, e);
+                    }
+                    Ok(CacherResponse::IsStarting) => {
+                        info!(
+                            "Node {} is still starting, trying next node",
+                            cacher_process_address
+                        );
+                    }
+                    Ok(CacherResponse::Rejected) => {
+                        warn!("Node {} rejected our request", cacher_process_address);
+                    }
+                    Ok(_) => {
+                        warn!(
+                            "Node {} returned unexpected response type",
+                            cacher_process_address
+                        );
+                    }
+                    Err(e) => {
+                        warn!(
+                            "Failed to parse response from {}: {:?}",
+                            cacher_process_address, e
+                        );
+                    }
+                },
+                Ok(Err(e)) => {
+                    warn!("Error response from {}: {:?}", cacher_process_address, e);
+                }
+                Err(e) => {
+                    warn!(
+                        "Failed to send request to {}: {:?}",
+                        cacher_process_address, e
+                    );
+                }
+            }
+        }
+
+        Err(anyhow::anyhow!("Failed to bootstrap from any node"))
+    }
+
+    // Helper function to write nodes to cache_sources file
+    fn write_nodes_to_file(&self) -> anyhow::Result<()> {
+        info!("Beginning of subroutine");
+        let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None)?;
+        info!("drive path defined");
+        let nodes_json = serde_json::to_string(&self.nodes)?;
+        info!("nodes_json defined");
+        let file_path = format!("{}/cache_sources", alt_drive_path);
+        info!("file_path defined");
+
+        // Open file in write mode which should truncate, but to be safe we'll write exact bytes
+        let mut file = vfs::open_file(&file_path, true, None)?;
+
+        // Get the bytes to write
+        let bytes = nodes_json.as_bytes();
+
+        // Write all bytes
+        file.write_all(bytes)?;
+
+        // Explicitly set the file length to the exact size of what we wrote
+        // This ensures any old content beyond this point is truncated
+        file.set_len(bytes.len() as u64)?;
+
+        info!("Updated cache_sources with {} nodes", self.nodes.len());
+        Ok(())
+    }
+
+    // Process received log caches and write them to VFS
+    fn process_received_log_caches(
+        &mut self,
+        log_caches: Vec<LogCacheInternal>,
+    ) -> anyhow::Result<()> {
+        info!("Processing {} received log caches", log_caches.len());
+
+        for log_cache in log_caches {
+            // Validate the log cache signature
+            // TODO Remove or find other method
+            // Temporarily skip
+            /*
+            if !self.validate_log_cache(&log_cache)? {
+                warn!("Invalid log cache signature, skipping");
+                continue;
+            }
+            */
+
+            // Generate filename from metadata
+            let filename = format!(
+                "{}-chain{}-from{}-to{}-protocol{}.json",
+                log_cache
+                    .metadata
+                    .time_created
+                    .replace(":", "")
+                    .replace("-", ""),
+                log_cache.metadata.chain_id,
+                log_cache.metadata.from_block,
+                log_cache.metadata.to_block,
+                PROTOCOL_VERSION
+            );
+
+            // Write log cache to VFS
+            let file_path = format!("{}/{}", self.drive_path, filename);
+            let log_cache_bytes = serde_json::to_vec(&log_cache)?;
+
+            let mut file = vfs::open_file(&file_path, true, None)?;
+            file.write_all(&log_cache_bytes)?;
+
+            info!("Wrote log cache file: {}", file_path);
+
+            // Update manifest
+            let file_hash = format!("0x{}", hex::encode(keccak256(&log_cache_bytes)));
+            let manifest_item = ManifestItemInternal {
+                metadata: log_cache.metadata.clone(),
+                is_empty: log_cache.logs.is_empty(),
+                file_hash,
+                file_name: filename.clone(),
+            };
+
+            self.manifest.items.insert(filename, manifest_item);
+
+            // Update last cached block if this cache goes beyond it
+            if let Ok(to_block) = log_cache.metadata.to_block.parse::<u64>() {
+                if to_block > self.last_cached_block {
+                    self.last_cached_block = to_block;
+                }
+            }
+        }
+
+        // Write updated manifest
+        self.write_manifest()?;
+
+        Ok(())
+    }
+
+    // Validate a log cache signature
+    fn validate_log_cache(&self, log_cache: &LogCacheInternal) -> anyhow::Result<bool> {
+        let from_block = log_cache.metadata.from_block.parse::<u64>()?;
+        let to_block = log_cache.metadata.to_block.parse::<u64>()?;
+
+        let mut bytes_to_verify = serde_json::to_vec(&log_cache.logs)?;
+        bytes_to_verify.extend_from_slice(&from_block.to_be_bytes());
+        bytes_to_verify.extend_from_slice(&to_block.to_be_bytes());
+        let hashed_data = keccak256(&bytes_to_verify);
+
+        let signature_hex = log_cache.metadata.signature.trim_start_matches("0x");
+        let signature_bytes = hex::decode(signature_hex)?;
+
+        let created_by_address = log_cache.metadata.created_by.parse::<Address>()?;
+
+        Ok(sign::net_key_verify(
+            hashed_data.to_vec(),
+            &created_by_address,
+            signature_bytes,
+        )?)
+    }
+
+    // Write manifest to VFS
+    fn write_manifest(&self) -> anyhow::Result<()> {
+        let manifest_bytes = serde_json::to_vec(&self.manifest)?;
+        let manifest_path = format!("{}/{}", self.drive_path, self.manifest.manifest_filename);
+        let manifest_file = vfs::open_file(&manifest_path, true, None)?;
+        manifest_file.write(&manifest_bytes)?;
+        info!("Updated manifest file: {}", manifest_path);
+        Ok(())
+    }
+
+    // Determine optimal batch size dynamically
+    fn determine_batch_size(&mut self, provider: &eth::Provider) -> anyhow::Result<()> {
+        if self.block_batch_size > 0 {
+            // Already determined
+            return Ok(());
+        }
+
+        let current_block = match provider.get_block_number() {
+            Ok(block_num) => block_num,
+            Err(e) => {
+                error!("Failed to get current block number: {:?}", e);
+                // Fall back to default if we can't get the current block
+                self.block_batch_size = DEFAULT_BLOCK_BATCH_SIZE;
+                return Ok(());
+            }
+        };
+
+        // Start with the difference between current block and HYPERMAP_FIRST_BLOCK
+        let mut batch_size = current_block.saturating_sub(dao::DAO_FIRST_BLOCK);
+
+        // Ensure we have at least a minimum batch size
+        if batch_size < 1 {
+            batch_size = DEFAULT_BLOCK_BATCH_SIZE;
+            self.block_batch_size = batch_size;
+            info!("Using default batch size: {batch_size}");
+            return Ok(());
+        }
+
+        info!("Determining optimal batch size starting from {batch_size}");
+
+        // Try progressively smaller batch sizes until we find one that works
+        loop {
+            let from_block = dao::DAO_FIRST_BLOCK;
+            let to_block = from_block + batch_size;
+
+            let filter = eth::Filter::new()
+                .address(self.hypermap_binding_address)
+                .from_block(from_block)
+                .to_block(eth::BlockNumberOrTag::Number(to_block));
+
+            match provider.get_logs(&filter) {
+                Ok(_) => {
+                    // Success! This batch size works
+                    self.block_batch_size = batch_size;
+                    info!("Successfully determined batch size: {}", batch_size);
+                    return Ok(());
+                }
+                Err(e) => {
+                    // Request failed or timed out, try smaller batch
+                    warn!("Batch size {} failed: {:?}, halving...", batch_size, e);
+                    batch_size = batch_size / 2;
+
+                    // Don't go below a minimum threshold
+                    if batch_size < 10 {
+                        warn!("Could not determine optimal batch size, using minimum: {DEFAULT_BLOCK_BATCH_SIZE}");
+                        self.block_batch_size = DEFAULT_BLOCK_BATCH_SIZE;
+                        return Ok(());
+                    }
+                }
+            }
+        }
+    }
+
+    // Fallback to RPC bootstrap - catch up from where we left off
+    fn try_bootstrap_from_rpc(&mut self, provider: &eth::Provider) -> anyhow::Result<()> {
+        info!(
+            "Bootstrapping from RPC, starting from block {}",
+            self.last_cached_block + 1
+        );
+
+        // Catch up remainder (or as fallback) using RPC
+        self.cache_logs_and_update_manifest(provider)?;
+
+        // run it twice for fresh boot case:
+        // - initial bootstrap takes much time
+        // - in that time, the block you are updating to is no longer the head of the chain
+        // - so run again to get to the head of the chain
+        self.cache_logs_and_update_manifest(provider)?;
+
+        Ok(())
+    }
+
+    fn to_wit_manifest(&self) -> WitManifest {
+        let items = self
+            .manifest
+            .items
+            .iter()
+            .map(|(k, v)| {
+                let wit_meta = WitLogsMetadata {
+                    chain_id: v.metadata.chain_id.clone(),
+                    from_block: v.metadata.from_block.clone(),
+                    to_block: v.metadata.to_block.clone(),
+                    time_created: v.metadata.time_created.clone(),
+                    created_by: v.metadata.created_by.clone(),
+                    signature: v.metadata.signature.clone(),
+                };
+                let wit_item = WitManifestItem {
+                    metadata: wit_meta,
+                    is_empty: v.is_empty,
+                    file_hash: v.file_hash.clone(),
+                    file_name: v.file_name.clone(),
+                };
+                (k.clone(), wit_item)
+            })
+            .collect::<Vec<(String, WitManifestItem)>>();
+
+        WitManifest {
+            items,
+            manifest_filename: self.manifest.manifest_filename.clone(),
+            chain_id: self.manifest.chain_id.clone(),
+            protocol_version: self.manifest.protocol_version.clone(),
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+enum HttpApi {
+    GetManifest,
+    GetLogCacheFile(String),
+    GetStatus,
+}
+
+fn http_handler(
+    state: &mut State,
+    path: &str,
+) -> anyhow::Result<(http::server::HttpResponse, Vec<u8>)> {
+    let response = http::server::HttpResponse::new(http::StatusCode::OK)
+        .header("Content-Type", "application/json");
+
+    // Basic routing based on path
+    Ok(if path == "/manifest" || path == "/manifest.json" {
+        let manifest_path = format!("{}/{}", state.drive_path, state.manifest.manifest_filename);
+        let manifest_file = vfs::open_file(&manifest_path, true, None)?;
+        match manifest_file.read() {
+            Ok(content) => (response, content),
+            Err(e) => {
+                error!(
+                    "HTTP: Failed to read manifest file {}: {:?}",
+                    manifest_path, e
+                );
+                (
+                    http::server::HttpResponse::new(http::StatusCode::NOT_FOUND),
+                    b"Manifest not found".to_vec(),
+                )
+            }
+        }
+    } else if path.starts_with("/log-cache/") {
+        let filename = path.trim_start_matches("/log-cache/");
+        if filename.is_empty() || filename.contains("..") {
+            // Basic security check
+            return Ok((
+                http::server::HttpResponse::new(http::StatusCode::BAD_REQUEST),
+                b"Invalid filename".to_vec(),
+            ));
+        }
+        let log_cache_path = format!("{}/{}", state.drive_path, filename);
+        let log_cache_file = vfs::open_file(&log_cache_path, true, None)?;
+        match log_cache_file.read() {
+            Ok(content) => (response, content),
+            Err(e) => {
+                error!(
+                    "HTTP: Failed to read log cache file {}: {:?}",
+                    log_cache_path, e
+                );
+                (
+                    http::server::HttpResponse::new(http::StatusCode::NOT_FOUND),
+                    b"Log cache file not found".to_vec(),
+                )
+            }
+        }
+    } else if path == "/status" {
+        let status_info = CacherStatus {
+            last_cached_block: state.last_cached_block,
+            chain_id: state.chain_id.clone(),
+            protocol_version: state.protocol_version.clone(),
+            next_cache_attempt_in_seconds: if state.is_cache_timer_live {
+                Some(state.cache_interval_s)
+            } else {
+                None
+            },
+            manifest_filename: state.manifest.manifest_filename.clone(),
+            log_files_count: state.manifest.items.len() as u32,
+            our_address: our().to_string(),
+            is_providing: state.is_providing,
+        };
+        match serde_json::to_vec(&status_info) {
+            Ok(body) => (response, body),
+            Err(e) => {
+                error!("HTTP: Failed to serialize status: {:?}", e);
+                (
+                    http::server::HttpResponse::new(http::StatusCode::INTERNAL_SERVER_ERROR),
+                    b"Error serializing status".to_vec(),
+                )
+            }
+        }
+    } else {
+        (
+            http::server::HttpResponse::new(http::StatusCode::NOT_FOUND),
+            b"Not Found".to_vec(),
+        )
+    })
+}
+
+fn handle_request(
+    our: &Address,
+    source: &Address,
+    state: &mut State,
+    request: CacherRequest,
+) -> anyhow::Result<()> {
+    let is_local = is_local_request(our, source);
+
+    // If we're still starting, respond with IsStarting to all requests
+    if state.is_starting {
+        Response::new().body(CacherResponse::IsStarting).send()?;
+        return Ok(());
+    }
+
+    if !is_local && source.process.to_string() != "dao-cacher:hypermap-cacher:sys" {
+        warn!("Rejecting remote request from non-dao-cacher: {source}");
+        Response::new().body(CacherResponse::Rejected).send()?;
+        return Ok(());
+    }
+
+    if !is_local
+        && !state.is_providing
+        && source.process.to_string() == "dao-cacher:hypermap-cacher:sys"
+    {
+        warn!("Rejecting remote request from {source} - not in provider mode");
+        Response::new().body(CacherResponse::Rejected).send()?;
+        return Ok(());
+    }
+    let response_body = match request {
+        CacherRequest::GetManifest => {
+            let manifest_path =
+                format!("{}/{}", state.drive_path, state.manifest.manifest_filename);
+            if state.manifest.items.is_empty() && vfs::metadata(&manifest_path, None).is_err() {
+                CacherResponse::GetManifest(None)
+            } else {
+                // Ensure manifest is loaded from VFS if state is fresh and manifest file exists
+                // This is usually handled by State::load, but as a fallback:
+                if state.manifest.items.is_empty() {
+                    // If manifest in memory is empty, try to load it
+                    let manifest_file = vfs::open_file(&manifest_path, true, None)?;
+                    if let Ok(bytes) = manifest_file.read() {
+                        if let Ok(disk_manifest) =
+                            serde_json::from_slice::<ManifestInternal>(&bytes)
+                        {
+                            state.manifest = disk_manifest;
+                        }
+                    }
+                }
+                CacherResponse::GetManifest(Some(state.to_wit_manifest()))
+            }
+        }
+        CacherRequest::GetLogCacheContent(filename) => {
+            let log_cache_path = format!("{}/{}", state.drive_path, filename);
+            let log_cache_file = vfs::open_file(&log_cache_path, true, None)?;
+            match log_cache_file.read() {
+                Ok(content_bytes) => {
+                    // Content is raw JSON bytes of LogCacheInternal.
+                    // The WIT expects a string.
+                    match String::from_utf8(content_bytes) {
+                        Ok(content_str) => {
+                            CacherResponse::GetLogCacheContent(Ok(Some(content_str)))
+                        }
+                        Err(e) => {
+                            error!("Failed to convert log cache content to UTF-8 string: {}", e);
+                            CacherResponse::GetLogCacheContent(Err(format!(
+                                "File content not valid UTF-8: {}",
+                                e
+                            )))
+                        }
+                    }
+                }
+                Err(_) => CacherResponse::GetLogCacheContent(Ok(None)),
+            }
+        }
+        CacherRequest::GetStatus => {
+            let status = CacherStatus {
+                last_cached_block: state.last_cached_block,
+                chain_id: state.chain_id.clone(),
+                protocol_version: state.protocol_version.clone(),
+                next_cache_attempt_in_seconds: if state.is_cache_timer_live {
+                    Some(state.cache_interval_s)
+                } else {
+                    None
+                },
+                manifest_filename: state.manifest.manifest_filename.clone(),
+                log_files_count: state.manifest.items.len() as u32,
+                our_address: our.to_string(),
+                is_providing: state.is_providing,
+            };
+            CacherResponse::GetStatus(status)
+        }
+        CacherRequest::GetLogsByRange(req_params) => {
+            let mut relevant_caches: Vec<LogCacheInternal> = Vec::new();
+            let req_from_block = req_params.from_block;
+            // If req_params.to_block is None, we effectively want to go up to the highest block available in caches.
+            // For simplicity in overlap calculation, we can treat None as u64::MAX here.
+            let effective_req_to_block = req_params.to_block.unwrap_or(u64::MAX);
+
+            for item in state.manifest.items.values() {
+                // Skip items that don't have an actual file (e.g., empty log ranges not written to disk).
+                if item.file_name.is_empty() {
+                    continue;
+                }
+
+                let cache_from = match item.metadata.from_block.parse::<u64>() {
+                    Ok(b) => b,
+                    Err(_) => {
+                        warn!(
+                            "Could not parse from_block for cache item {}: {}",
+                            item.file_name, item.metadata.from_block
+                        );
+                        continue;
+                    }
+                };
+                let cache_to = match item.metadata.to_block.parse::<u64>() {
+                    Ok(b) => b,
+                    Err(_) => {
+                        warn!(
+                            "Could not parse to_block for cache item {}: {}",
+                            item.file_name, item.metadata.to_block
+                        );
+                        continue;
+                    }
+                };
+
+                // Check for overlap: max(start1, start2) <= min(end1, end2)
+                if max(req_from_block, cache_from) <= min(effective_req_to_block, cache_to) {
+                    // This cache file overlaps with the requested range.
+                    let file_vfs_path = format!("{}/{}", state.drive_path, item.file_name);
+                    match vfs::open_file(&file_vfs_path, false, None) {
+                        Ok(file) => match file.read() {
+                            Ok(content_bytes) => {
+                                match serde_json::from_slice::<LogCacheInternal>(&content_bytes) {
+                                    Ok(log_cache) => relevant_caches.push(log_cache),
+                                    Err(e) => {
+                                        error!(
+                                            "Failed to deserialize LogCacheInternal from {}: {:?}",
+                                            item.file_name, e
+                                        );
+                                        // Decide: return error or skip this cache? For now, skip.
+                                    }
+                                }
+                            }
+                            Err(e) => error!("Failed to read VFS file {}: {:?}", item.file_name, e),
+                        },
+                        Err(e) => error!("Failed to open VFS file {}: {e:?}", item.file_name),
+                    }
+                }
+            }
+
+            // Sort caches by their from_block.
+            relevant_caches
+                .sort_by_key(|cache| cache.metadata.from_block.parse::<u64>().unwrap_or(0));
+
+            if relevant_caches.is_empty() {
+                CacherResponse::GetLogsByRange(Ok(GetLogsByRangeOkResponse::Latest(
+                    state.last_cached_block,
+                )))
+            } else {
+                match serde_json::to_string(&relevant_caches) {
+                    Ok(json_string) => CacherResponse::GetLogsByRange(Ok(
+                        GetLogsByRangeOkResponse::Logs((state.last_cached_block, json_string)),
+                    )),
+                    Err(e) => CacherResponse::GetLogsByRange(Err(format!(
+                        "Failed to serialize relevant caches: {e}"
+                    ))),
+                }
+            }
+        }
+        CacherRequest::StartProviding => {
+            if !is_local {
+                // should never happen: should be caught in check above
+                Response::new().body(CacherResponse::Rejected).send()?;
+                return Ok(());
+            }
+            state.is_providing = true;
+            state.save();
+            info!("Provider mode enabled");
+            CacherResponse::StartProviding(Ok("Provider mode enabled".to_string()))
+        }
+        CacherRequest::StopProviding => {
+            if !is_local {
+                Response::new().body(CacherResponse::Rejected).send()?;
+                warn!("Rejecting remote request from {source} to alter provider mode");
+                return Ok(());
+            }
+            state.is_providing = false;
+            state.save();
+            info!("Provider mode disabled");
+            CacherResponse::StopProviding(Ok("Provider mode disabled".to_string()))
+        }
+        CacherRequest::SetNodes(new_nodes) => {
+            if !is_local {
+                Response::new().body(CacherResponse::Rejected).send()?;
+                warn!("Rejecting remote request from {source} to set nodes");
+                return Ok(());
+            }
+            state.nodes = new_nodes;
+            state.save();
+            if let Err(e) = state.write_nodes_to_file() {
+                error!("Failed to write nodes to cache_sources: {:?}", e);
+            }
+            info!("Nodes updated to: {:?}", state.nodes);
+            CacherResponse::SetNodes(Ok("Nodes updated successfully".to_string()))
+        }
+        CacherRequest::Reset(custom_nodes) => {
+            if !is_local {
+                Response::new().body(CacherResponse::Rejected).send()?;
+                warn!("Rejecting remote request from {source} to reset");
+                return Ok(());
+            }
+
+            info!("Resetting dao-cacher state and clearing VFS...");
+
+            // Clear all files from the drive
+            if let Err(e) = state.clear_drive() {
+                error!("Failed to clear drive during reset: {:?}", e);
+                CacherResponse::Reset(Err(format!("Failed to clear drive: {:?}", e)))
+            } else {
+                // Create new state with custom nodes if provided, otherwise use defaults
+                let nodes = match custom_nodes {
+                    Some(nodes) => nodes,
+                    None => DEFAULT_NODES.iter().map(|s| s.to_string()).collect(),
+                };
+
+                *state = State::new(&state.drive_path);
+                state.nodes = nodes;
+                state.save();
+                if let Err(e) = state.write_nodes_to_file() {
+                    error!("Failed to write nodes to cache_sources: {:?}", e);
+                }
+                info!(
+                    "dao-cacher reset complete. New nodes: {:?}",
+                    state.nodes
+                );
+                CacherResponse::Reset(Ok(
+                    "Reset completed successfully. DAO Cacher will restart with new settings."
+                        .to_string(),
+                ))
+            }
+        }
+    };
+
+    Response::new().body(response_body).send()?;
+    Ok(())
+}
+
+fn main_loop(
+    our: &Address,
+    state: &mut State,
+    provider: &eth::Provider,
+    server: &http::server::HttpServer,
+) -> anyhow::Result<()> {
+    info!(
+        "Hypermap Binding Cacher main_loop started. Our address: {}",
+        our
+    );
+    info!(
+        "Monitoring Binding contract: {}",
+        state.hypermap_binding_address.to_string()
+    );
+    info!(
+        "Chain ID: {}, Protocol Version: {}",
+        state.chain_id, state.protocol_version
+    );
+    info!("Last cached block: {}", state.last_cached_block);
+
+    // Always bootstrap on start to get latest state from other nodes or RPC
+    while state.is_starting {
+        match state.bootstrap_state(provider) {
+            Ok(_) => info!("Bootstrap process completed successfully."),
+            Err(e) => {
+                error!("Error during bootstrap process: {:?}", e);
+                std::thread::sleep(std::time::Duration::from_secs(RETRY_DELAY_S));
+            }
+        }
+    }
+
+    // Set up the main caching timer.
+    info!(
+        "Setting cache timer for {} seconds.",
+        state.cache_interval_s
+    );
+    timer::set_timer(state.cache_interval_s * 1000, Some(b"cache_cycle".to_vec()));
+    state.is_cache_timer_live = true;
+    state.save();
+
+    loop {
+        let Ok(message) = await_message() else {
+            warn!("Failed to get message, continuing loop.");
+            continue;
+        };
+        let source = message.source();
+
+        if message.is_request() {
+            if source.process == ProcessId::from_str("http-server:distro:sys").unwrap() {
+                // HTTP request from the system's HTTP server process
+                let Ok(http::server::HttpServerRequest::Http(http_request)) =
+                    server.parse_request(message.body())
+                else {
+                    error!("Failed to parse HTTP request from http-server:distro:sys");
+                    // Potentially send an error response back if possible/expected
+                    continue;
+                };
+                let (http_response, body) = http_handler(state, &http_request.path()?)?;
+                Response::new()
+                    .body(serde_json::to_vec(&http_response).unwrap())
+                    .blob_bytes(body)
+                    .send()?;
+            } else {
+                // Standard process-to-process request
+                match serde_json::from_slice::<CacherRequest>(message.body()) {
+                    Ok(request) => {
+                        if let Err(e) = handle_request(our, &source, state, request) {
+                            error!("Error handling request from {:?}: {:?}", source, e);
+                        }
+                    }
+                    Err(e) => {
+                        error!(
+                            "Failed to deserialize CacherRequest from {:?}: {:?}",
+                            source, e
+                        );
+                    }
+                }
+            }
+        } else {
+            // It's a Response or other kind of message
+            if source.process == ProcessId::from_str("timer:distro:sys").unwrap() {
+                if message.context() == Some(b"cache_cycle") {
+                    info!("Cache timer triggered.");
+                    state.is_cache_timer_live = false;
+                    match state.cache_logs_and_update_manifest(provider) {
+                        Ok(_) => info!("Periodic cache cycle complete."),
+                        Err(e) => error!("Error during periodic cache cycle: {:?}", e),
+                    }
+                    // Reset the timer for the next cycle
+                    if !state.is_cache_timer_live {
+                        timer::set_timer(
+                            state.cache_interval_s * 1000,
+                            Some(b"cache_cycle".to_vec()),
+                        );
+                        state.is_cache_timer_live = true;
+                        state.save();
+                    }
+                }
+            } else {
+                debug!(
+                    "Received unhandled response or other message from {:?}.",
+                    source
+                );
+            }
+        }
+    }
+}
+
+call_init!(init);
+fn init(our: Address) {
+    init_logging(Level::INFO, Level::DEBUG, None, None, None).unwrap();
+    info!("Hypermap DAO Cacher process starting...");
+
+    let drive_path = vfs::create_drive(our.package_id(), "dao-cache", None).unwrap();
+    // Create alternate drive for initfiles and read the test data
+    let alt_drive_path = vfs::create_drive(our.package_id(), "initfiles", None).unwrap();
+
+    // Try to read the cache_sources file from the initfiles drive
+    match vfs::open_file(&format!("{}/cache_sources", alt_drive_path), false, None) {
+        Ok(file) => match file.read() {
+            Ok(contents) => {
+                let content_str = String::from_utf8_lossy(&contents);
+                info!("Contents of cache_sources: {}", content_str);
+            }
+            Err(e) => {
+                info!("Failed to read cache_sources: {}", e);
+            }
+        },
+        Err(e) => {
+            info!("Failed to open cache_sources: {}", e);
+        }
+    }
+
+    let bind_config = http::server::HttpBindingConfig::default().authenticated(false);
+    let mut server = http::server::HttpServer::new(5);
+
+    let provider = eth::Provider::new(dao::DAO_CHAIN_ID, 60);
+
+    server
+        .bind_http_path("/manifest", bind_config.clone())
+        .expect("Failed to bind /manifest");
+    server
+        .bind_http_path("/manifest.json", bind_config.clone())
+        .expect("Failed to bind /manifest.json");
+    server
+        .bind_http_path("/log-cache/*", bind_config.clone())
+        .expect("Failed to bind /log-cache/*");
+    server
+        .bind_http_path("/status", bind_config.clone())
+        .expect("Failed to bind /status");
+    info!("Bound HTTP paths: /manifest, /log-cache/*, /status");
+
+    let mut state = State::load(&drive_path);
+
+    // Wait for binding-cacher to be ready before entering main loop
+    let cacher_addr = Address::new("our", ("binding-cacher", "hypermap-cacher", "sys"));
+    info!(
+        "Waiting for binding-cacher at {} to report ready before starting dao-cacher...",
+        cacher_addr
+    );
+    wait_for_process_ready(
+        cacher_addr,
+        b"\"GetStatus\"".to_vec(),
+        15,
+        2,
+        |body| {
+            let body_str = String::from_utf8_lossy(body);
+            if body_str.contains("IsStarting") || body_str.contains(r#""IsStarting""#) {
+                WaitClassification::Starting
+            } else if body_str.contains("GetStatus") || body_str.contains("last_cached_block") {
+                WaitClassification::Ready
+            } else {
+                WaitClassification::Unknown
+            }
+        },
+        true,
+        None,
+    );
+    info!("binding-cacher is ready; continuing dao-cacher startup.");
+
+    loop {
+        match main_loop(&our, &mut state, &provider, &server) {
+            Ok(()) => {
+                // main_loop should not exit with Ok in normal operation as it's an infinite loop.
+                error!("main_loop exited unexpectedly with Ok. Restarting.");
+            }
+            Err(e) => {
+                error!("main_loop exited with error: {:?}. Restarting.", e);
+                std::thread::sleep(std::time::Duration::from_secs(5));
+            }
+        }
+        // Reload state in case of restart, or re-initialize if necessary.
+        state = State::load(&drive_path);
+    }
+}
diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/Cargo.toml b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/Cargo.toml
index 1b316cdfb..765548ffc 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/Cargo.toml
@@ -18,7 +18,7 @@ alloy = { version = "0.8.1", features = [
 ] }
 chrono = "0.4.41"
 hex = "0.4.3"
-hyperware_process_lib = { version = "2.3.0", features = ["logging"] }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb", features = ["logging"] }
 process_macros = "0.1.0"
 rand = "0.8"
 rmp-serde = "1.1.2"
diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index cc98c1549..3ccf9bf88 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -24,7 +24,7 @@ use hyperware_process_lib::{
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
diff --git a/hyperdrive/packages/hypermap-cacher/pkg/manifest.json b/hyperdrive/packages/hypermap-cacher/pkg/manifest.json
index e4afacf23..f8034b401 100644
--- a/hyperdrive/packages/hypermap-cacher/pkg/manifest.json
+++ b/hyperdrive/packages/hypermap-cacher/pkg/manifest.json
@@ -7,6 +7,7 @@
         "request_capabilities": [
             "eth:distro:sys",
             "http-server:distro:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys",
             "net:distro:sys",
             "sign:sign:sys",
@@ -17,6 +18,7 @@
         "grant_capabilities": [
             "eth:distro:sys",
             "http-server:distro:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys",
             "net:distro:sys",
             "sign:sign:sys",
@@ -27,6 +29,36 @@
         "public": false,
         "wit_version": 1
     },
+    {
+        "process_name": "dao-cacher",
+        "process_wasm_path": "/dao-cacher.wasm",
+        "on_exit": "Restart",
+        "request_networking": true,
+        "request_capabilities": [
+            "eth:distro:sys",
+            "http-server:distro:sys",
+            "binding-cacher:hypermap-cacher:sys",
+            "hypr-dao:hypr-dao:ware.hypr",
+            "net:distro:sys",
+            "sign:sign:sys",
+            "terminal:terminal:sys",
+            "timer:distro:sys",
+            "vfs:distro:sys"
+        ],
+        "grant_capabilities": [
+            "eth:distro:sys",
+            "http-server:distro:sys",
+            "binding-cacher:hypermap-cacher:sys",
+            "hypr-dao:hypr-dao:ware.hypr",
+            "net:distro:sys",
+            "sign:sign:sys",
+            "terminal:terminal:sys",
+            "timer:distro:sys",
+            "vfs:distro:sys"
+        ],
+        "public": false,
+        "wit_version": 1
+    },
     {
         "process_name": "hypermap-cacher",
         "process_wasm_path": "/hypermap-cacher.wasm",
diff --git a/hyperdrive/packages/hypermap-cacher/pkg/scripts.json b/hyperdrive/packages/hypermap-cacher/pkg/scripts.json
index 5b1bfaefe..fc774921d 100644
--- a/hyperdrive/packages/hypermap-cacher/pkg/scripts.json
+++ b/hyperdrive/packages/hypermap-cacher/pkg/scripts.json
@@ -5,10 +5,12 @@
         "request_networking": false,
         "request_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "grant_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "wit_version": 1
@@ -19,10 +21,12 @@
         "request_networking": false,
         "request_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "grant_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "wit_version": 1
@@ -33,10 +37,12 @@
         "request_networking": false,
         "request_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "grant_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "wit_version": 1
@@ -47,10 +53,12 @@
         "request_networking": false,
         "request_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "grant_capabilities": [
             "binding-cacher:hypermap-cacher:sys",
+            "dao-cacher:hypermap-cacher:sys",
             "hypermap-cacher:hypermap-cacher:sys"
         ],
         "wit_version": 1
diff --git a/hyperdrive/packages/hypermap-cacher/reset-cache/Cargo.toml b/hyperdrive/packages/hypermap-cacher/reset-cache/Cargo.toml
index a796f9b13..3e341f9a2 100644
--- a/hyperdrive/packages/hypermap-cacher/reset-cache/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/reset-cache/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-hyperware_process_lib = { version = "2.3.0" }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/hypermap-cacher/reset-cache/src/lib.rs b/hyperdrive/packages/hypermap-cacher/reset-cache/src/lib.rs
index 495847667..65bf5c865 100644
--- a/hyperdrive/packages/hypermap-cacher/reset-cache/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/reset-cache/src/lib.rs
@@ -13,12 +13,13 @@
 //!     reset:hypermap-cacher:sys alice.os bob.os      # Reset with custom nodes
 
 use crate::hyperware::process::binding_cacher::{BindingCacherRequest, BindingCacherResponse};
+use crate::hyperware::process::dao_cacher::{DaoCacherRequest, DaoCacherResponse};
 use crate::hyperware::process::hypermap_cacher::{CacherRequest, CacherResponse};
 use hyperware_process_lib::{await_next_message_body, call_init, println, Address, Request};
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
@@ -42,6 +43,7 @@ fn init(_our: Address) {
         Some(nodes)
     };
     let binding_custom_nodes = custom_nodes.clone();
+    let dao_custom_nodes = custom_nodes.clone();
 
     let response = Request::to(("our", "hypermap-cacher", "hypermap-cacher", "sys"))
         .body(CacherRequest::Reset(custom_nodes))
@@ -90,4 +92,28 @@ fn init(_our: Address) {
             println!("✗ Communication error: {:?}", err);
         }
     }
+
+    let response = Request::to(("our", "dao-cacher", "hypermap-cacher", "sys"))
+        .body(DaoCacherRequest::Reset(dao_custom_nodes))
+        .send_and_await_response(10); // Give it more time for reset operations
+
+    match response {
+        Ok(Ok(message)) => match message.body().try_into() {
+            Ok(DaoCacherResponse::Reset(Ok(msg))) => {
+                println!("✓ {}", msg);
+            }
+            Ok(DaoCacherResponse::Reset(Err(err))) => {
+                println!("✗ Failed to reset dao-cacher: {}", err);
+            }
+            _ => {
+                println!("✗ Unexpected response from dao-cacher");
+            }
+        },
+        Ok(Err(err)) => {
+            println!("✗ Request failed: {:?}", err);
+        }
+        Err(err) => {
+            println!("✗ Communication error: {:?}", err);
+        }
+    }
 }
diff --git a/hyperdrive/packages/hypermap-cacher/set-nodes/Cargo.toml b/hyperdrive/packages/hypermap-cacher/set-nodes/Cargo.toml
index 1b3538908..97d80aa99 100644
--- a/hyperdrive/packages/hypermap-cacher/set-nodes/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/set-nodes/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-hyperware_process_lib = { version = "2.3.0" }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/hypermap-cacher/set-nodes/src/lib.rs b/hyperdrive/packages/hypermap-cacher/set-nodes/src/lib.rs
index c8479ef9e..d15806b66 100644
--- a/hyperdrive/packages/hypermap-cacher/set-nodes/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/set-nodes/src/lib.rs
@@ -11,12 +11,13 @@
 //!     set-nodes:hypermap-cacher:sys alice.os bob.os charlie.os
 
 use crate::hyperware::process::binding_cacher::{BindingCacherRequest, BindingCacherResponse};
+use crate::hyperware::process::dao_cacher::{DaoCacherRequest, DaoCacherResponse};
 use crate::hyperware::process::hypermap_cacher::{CacherRequest, CacherResponse};
 use hyperware_process_lib::{await_next_message_body, call_init, println, Address, Request};
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
@@ -39,6 +40,7 @@ fn init(_our: Address) {
 
     let nodes: Vec<String> = parts.iter().map(|s| s.to_string()).collect();
     let binding_nodes = nodes.clone();
+    let dao_nodes = nodes.clone();
 
     println!("Setting hypermap-cacher nodes to: {:?}", nodes);
 
@@ -91,4 +93,30 @@ fn init(_our: Address) {
             println!("✗ Communication error: {:?}", err);
         }
     }
+
+    println!("Setting dao-cacher nodes to: {:?}", dao_nodes);
+
+    let response = Request::to(("our", "dao-cacher", "hypermap-cacher", "sys"))
+        .body(DaoCacherRequest::SetNodes(dao_nodes))
+        .send_and_await_response(5);
+
+    match response {
+        Ok(Ok(message)) => match message.body().try_into() {
+            Ok(DaoCacherResponse::SetNodes(Ok(msg))) => {
+                println!("✓ {}", msg);
+            }
+            Ok(DaoCacherResponse::SetNodes(Err(err))) => {
+                println!("✗ Failed to set nodes for dao-cacher: {}", err);
+            }
+            _ => {
+                println!("✗ Unexpected response from dao-cacher");
+            }
+        },
+        Ok(Err(err)) => {
+            println!("✗ Request failed: {:?}", err);
+        }
+        Err(err) => {
+            println!("✗ Communication error: {:?}", err);
+        }
+    }
 }
diff --git a/hyperdrive/packages/hypermap-cacher/start-providing/Cargo.toml b/hyperdrive/packages/hypermap-cacher/start-providing/Cargo.toml
index 3797fb50a..aa2d7b15b 100644
--- a/hyperdrive/packages/hypermap-cacher/start-providing/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/start-providing/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-hyperware_process_lib = { version = "2.3.0" }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/hypermap-cacher/start-providing/src/lib.rs b/hyperdrive/packages/hypermap-cacher/start-providing/src/lib.rs
index f74f7abe7..bc8fc6263 100644
--- a/hyperdrive/packages/hypermap-cacher/start-providing/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/start-providing/src/lib.rs
@@ -1,10 +1,11 @@
 use crate::hyperware::process::binding_cacher::{BindingCacherRequest, BindingCacherResponse};
+use crate::hyperware::process::dao_cacher::{DaoCacherRequest, DaoCacherResponse};
 use crate::hyperware::process::hypermap_cacher::{CacherRequest, CacherResponse};
 use hyperware_process_lib::{call_init, println, Address, Request};
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
@@ -62,4 +63,30 @@ fn init(_our: Address) {
             println!("✗ Communication error: {:?}", err);
         }
     }
+
+    println!("Enabling dao-cacher provider mode...");
+
+    let response = Request::to(("our", "dao-cacher", "hypermap-cacher", "sys"))
+        .body(DaoCacherRequest::StartProviding)
+        .send_and_await_response(5);
+
+    match response {
+        Ok(Ok(message)) => match message.body().try_into() {
+            Ok(DaoCacherResponse::StartProviding(Ok(msg))) => {
+                println!("✓ {}", msg);
+            }
+            Ok(DaoCacherResponse::StartProviding(Err(err))) => {
+                println!("✗ Failed to enable dao-cacher provider mode: {}", err);
+            }
+            _ => {
+                println!("✗ Unexpected response from dao-cacher");
+            }
+        },
+        Ok(Err(err)) => {
+            println!("✗ Request failed: {:?}", err);
+        }
+        Err(err) => {
+            println!("✗ Communication error: {:?}", err);
+        }
+    }
 }
diff --git a/hyperdrive/packages/hypermap-cacher/stop-providing/Cargo.toml b/hyperdrive/packages/hypermap-cacher/stop-providing/Cargo.toml
index 4f75e6add..e16795a4d 100644
--- a/hyperdrive/packages/hypermap-cacher/stop-providing/Cargo.toml
+++ b/hyperdrive/packages/hypermap-cacher/stop-providing/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-hyperware_process_lib = { version = "2.3.0" }
+hyperware_process_lib = { git = "https://github.com/hyperware-ai/process_lib", rev = "34b1f1d857f76fb474f7af96f089961445758edb" }
 process_macros = "0.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/hyperdrive/packages/hypermap-cacher/stop-providing/src/lib.rs b/hyperdrive/packages/hypermap-cacher/stop-providing/src/lib.rs
index e6d55b831..ae39d2972 100644
--- a/hyperdrive/packages/hypermap-cacher/stop-providing/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/stop-providing/src/lib.rs
@@ -1,10 +1,11 @@
 use crate::hyperware::process::binding_cacher::{BindingCacherRequest, BindingCacherResponse};
+use crate::hyperware::process::dao_cacher::{DaoCacherRequest, DaoCacherResponse};
 use crate::hyperware::process::hypermap_cacher::{CacherRequest, CacherResponse};
 use hyperware_process_lib::{call_init, println, Address, Request};
 
 wit_bindgen::generate!({
     path: "../target/wit",
-    world: "hypermap-cacher-sys-v1",
+    world: "hypermap-cacher-sys-v2",
     generate_unused_types: true,
     additional_derives: [serde::Deserialize, serde::Serialize, process_macros::SerdeJsonInto],
 });
@@ -62,4 +63,30 @@ fn init(_our: Address) {
             println!("✗ Communication error: {:?}", err);
         }
     }
+
+    println!("Disabling dao-cacher provider mode...");
+
+    let response = Request::to(("our", "dao-cacher", "hypermap-cacher", "sys"))
+        .body(DaoCacherRequest::StopProviding)
+        .send_and_await_response(5);
+
+    match response {
+        Ok(Ok(message)) => match message.body().try_into() {
+            Ok(DaoCacherResponse::StopProviding(Ok(msg))) => {
+                println!("✓ {}", msg);
+            }
+            Ok(DaoCacherResponse::StopProviding(Err(err))) => {
+                println!("✗ Failed to disable dao-cacher provider mode: {}", err);
+            }
+            _ => {
+                println!("✗ Unexpected response from dao-cacher");
+            }
+        },
+        Ok(Err(err)) => {
+            println!("✗ Request failed: {:?}", err);
+        }
+        Err(err) => {
+            println!("✗ Communication error: {:?}", err);
+        }
+    }
 }
diff --git a/hyperdrive/packages/spider/Cargo.lock b/hyperdrive/packages/spider/Cargo.lock
index a2f073349..3f8fb3310 100644
--- a/hyperdrive/packages/spider/Cargo.lock
+++ b/hyperdrive/packages/spider/Cargo.lock
@@ -1703,9 +1703,9 @@ dependencies = [
 ]
 
 [[package]]
-name = "hyperprocess_macro"
-version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperprocess-macro?rev=98fac21#98fac2177df21a39a0950d48b248e1b12013f7f0"
+name = "hyperapp_macro"
+version = "0.1.2"
+source = "git+https://github.com/hyperware-ai/hyperapp-macro?rev=5c7cc7a#5c7cc7a8dfb366bdc767d9dc3e2b954dc2cc786c"
 dependencies = [
  "hyperware_process_lib",
  "proc-macro2",
@@ -1716,7 +1716,7 @@ dependencies = [
 [[package]]
 name = "hyperware-anthropic-sdk"
 version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperware-anthropic-sdk?rev=607bbc6#607bbc6da2601b06f13729a846ebe2419e1dcf6c"
+source = "git+https://github.com/hyperware-ai/hyperware-anthropic-sdk?rev=1fc7b0c#1fc7b0c1a0a8f6e8f706cf837bea8173c3198b31"
 dependencies = [
  "hyperware_process_lib",
  "rand 0.8.5",
@@ -1729,7 +1729,7 @@ dependencies = [
 [[package]]
 name = "hyperware-elevenlabs-tts"
 version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperware-elevenlabs-tts?rev=65899de#65899dea2b081ff982404c687040dd0bc92ed917"
+source = "git+https://github.com/hyperware-ai/hyperware-elevenlabs-tts?rev=1e15f92#1e15f9299b4c5397e770904f97d23f7db4d68cc5"
 dependencies = [
  "http",
  "hyperware_process_lib",
@@ -1742,7 +1742,7 @@ dependencies = [
 [[package]]
 name = "hyperware-openai-stt"
 version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperware-openai-ttstt?rev=0e6bf83#0e6bf834c39ebe3ab6624829848b50c83f18201f"
+source = "git+https://github.com/hyperware-ai/hyperware-openai-ttstt?rev=0887b2b#0887b2baa619503daa45c9cf07c9bd281c5352c0"
 dependencies = [
  "base64 0.22.1",
  "http",
@@ -1757,7 +1757,7 @@ dependencies = [
 [[package]]
 name = "hyperware-openai-tts"
 version = "0.1.0"
-source = "git+https://github.com/hyperware-ai/hyperware-openai-ttstt?rev=0e6bf83#0e6bf834c39ebe3ab6624829848b50c83f18201f"
+source = "git+https://github.com/hyperware-ai/hyperware-openai-ttstt?rev=0887b2b#0887b2baa619503daa45c9cf07c9bd281c5352c0"
 dependencies = [
  "http",
  "hyperware_process_lib",
@@ -1780,7 +1780,7 @@ dependencies = [
 [[package]]
 name = "hyperware_process_lib"
 version = "2.2.0"
-source = "git+https://github.com/hyperware-ai/process_lib?rev=232fe25#232fe2526f383c88efc2ef3a289deba2e193d68f"
+source = "git+https://github.com/hyperware-ai/process_lib?rev=41f25ce#41f25ceb30935929416137162eb90f101dc720c5"
 dependencies = [
  "alloy",
  "alloy-primitives",
@@ -1790,6 +1790,7 @@ dependencies = [
  "base64 0.22.1",
  "bincode",
  "color-eyre",
+ "futures-channel",
  "futures-util",
  "http",
  "mime_guess",
@@ -3179,7 +3180,7 @@ dependencies = [
  "base64 0.21.7",
  "chrono",
  "http",
- "hyperprocess_macro",
+ "hyperapp_macro",
  "hyperware-anthropic-sdk",
  "hyperware-parse-wit",
  "hyperware_process_lib",
@@ -3188,29 +3189,12 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "spider_caller_utils",
  "url",
  "uuid",
  "wit-bindgen 0.42.1",
  "wit-parser 0.220.1",
 ]
 
-[[package]]
-name = "spider_caller_utils"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures",
- "futures-util",
- "hyperware_process_lib",
- "once_cell",
- "process_macros",
- "serde",
- "serde_json",
- "uuid",
- "wit-bindgen 0.41.0",
-]
-
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -3640,7 +3624,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "chrono",
- "hyperprocess_macro",
+ "hyperapp_macro",
  "hyperware-elevenlabs-tts",
  "hyperware-openai-stt",
  "hyperware-openai-tts",
@@ -3648,7 +3632,6 @@ dependencies = [
  "process_macros",
  "serde",
  "serde_json",
- "spider_caller_utils",
  "uuid",
  "wit-bindgen 0.42.1",
 ]
diff --git a/hyperdrive/packages/spider/spider/Cargo.toml b/hyperdrive/packages/spider/spider/Cargo.toml
index 6f5b2539a..88294fb40 100644
--- a/hyperdrive/packages/spider/spider/Cargo.toml
+++ b/hyperdrive/packages/spider/spider/Cargo.toml
@@ -33,6 +33,10 @@ rev = "41f25ce"
 features = ["derive"]
 version = "1.0"
 
+[dependencies.spider_caller_utils]
+optional = true
+path = "../target/spider-caller-utils"
+
 [dependencies.uuid]
 features = [
     "v4",
@@ -45,6 +49,7 @@ features = ["serde"]
 version = "0.220.0"
 
 [features]
+caller-utils = ["spider_caller_utils"]
 public-mode = []
 simulation-mode = []
 
diff --git a/hyperdrive/packages/spider/ttstt/Cargo.toml b/hyperdrive/packages/spider/ttstt/Cargo.toml
index 76633dee1..78b337fd9 100644
--- a/hyperdrive/packages/spider/ttstt/Cargo.toml
+++ b/hyperdrive/packages/spider/ttstt/Cargo.toml
@@ -35,6 +35,10 @@ rev = "41f25ce"
 features = ["derive"]
 version = "1.0"
 
+[dependencies.spider_caller_utils]
+optional = true
+path = "../target/spider-caller-utils"
+
 [dependencies.uuid]
 features = [
     "v4",
@@ -43,6 +47,7 @@ features = [
 version = "1.0"
 
 [features]
+caller-utils = ["spider_caller_utils"]
 simulation-mode = []
 
 [lib]
diff --git a/hyperdrive/src/eth/mod.rs b/hyperdrive/src/eth/mod.rs
index a549a1898..24f0155c0 100644
--- a/hyperdrive/src/eth/mod.rs
+++ b/hyperdrive/src/eth/mod.rs
@@ -143,8 +143,11 @@ fn spawn_node_worker(
     tokio::spawn(async move {
         let mut next_allowed = Instant::now();
         loop {
-            match tokio::time::timeout(Duration::from_secs(REMOTE_QUEUE_IDLE_TIMEOUT_SECS), rx.recv())
-                .await
+            match tokio::time::timeout(
+                Duration::from_secs(REMOTE_QUEUE_IDLE_TIMEOUT_SECS),
+                rx.recv(),
+            )
+            .await
             {
                 Ok(Some(km)) => {
                     let now = Instant::now();
diff --git a/hyperdrive/src/net/mod.rs b/hyperdrive/src/net/mod.rs
index c55e0c94e..6a240bd35 100644
--- a/hyperdrive/src/net/mod.rs
+++ b/hyperdrive/src/net/mod.rs
@@ -88,11 +88,11 @@ pub async fn networking(
     match &ext.our.routing {
         NodeRouting::Direct { ip, ports } => {
             if *ext.our_ip != *ip {
-                return Err(anyhow::anyhow!(
-                    "net: fatal error: IP address mismatch: {} != {}, update your HNS identity",
-                    ext.our_ip,
-                    ip
-                ));
+                let message = format!(
+                    "IP address mismatch detected. Detected from environment: {}, node's data: {}. Please confirm your node is reachable at {} or restart your node to reset your networking data.",
+                    ext.our_ip, ip, ip
+                );
+                utils::print_loud(&ext.print_tx, &message).await;
             }
             utils::print_debug(&ext.print_tx, "going online as a direct node").await;
             if !ports.contains_key(WS_PROTOCOL) && !ports.contains_key(TCP_PROTOCOL) {
diff --git a/hyperdrive/src/register-ui/src/App.tsx b/hyperdrive/src/register-ui/src/App.tsx
index fbce93750..1c52c1e9d 100644
--- a/hyperdrive/src/register-ui/src/App.tsx
+++ b/hyperdrive/src/register-ui/src/App.tsx
@@ -9,7 +9,7 @@ import Login from './pages/Login'
 import ResetName from './pages/ResetName'
 import HyperdriveHome from "./pages/HyperdriveHome"
 import ImportKeyfile from "./pages/ImportKeyfile";
-import { UnencryptedIdentity } from "./lib/types";
+import { InfoResponse } from "./lib/types";
 import Header from "./components/Header";
 import ProgressBar from "./components/ProgressBar";
 import { LargeBackgroundVector } from "./components/LargeBackgroundVector";
@@ -23,6 +23,7 @@ function App() {
   const [keyFileName, setKeyFileName] = useState<string>('');
   const [reset, setReset] = useState<boolean>(false);
   const [direct, setDirect] = useState<boolean>(false);
+  const [directNodeIp, setDirectNodeIp] = useState<string>('');
   const [upgradable, setUpgradable] = useState<boolean>(false);
   const [hnsName, setHnsName] = useState<string>('');
   const [networkingKey, setNetworkingKey] = useState<string>('');
@@ -44,17 +45,28 @@ function App() {
       try {
         const infoResponse = await fetch('/info', { method: 'GET', credentials: 'include' })
 
+        const info: InfoResponse | null = await infoResponse.json().catch(() => null)
+
         if (infoResponse.status > 399) {
           console.log('no info, unbooted')
-        } else {
-          const info: UnencryptedIdentity = await infoResponse.json()
+        }
 
-          if (initialVisit) {
-            setHnsName(info.name)
-            setRouters(info.allowed_routers)
+        if (info) {
+          if (infoResponse.status < 400 && initialVisit) {
+            if (info.name) {
+              setHnsName(info.name)
+            }
+            if (info.allowed_routers) {
+              setRouters(info.allowed_routers)
+            }
             setNavigateToLogin(true)
             setInitialVisit(false)
           }
+
+          // Set detected IP address if available
+          if (info.detected_ip_address) {
+            setDirectNodeIp(info.detected_ip_address)
+          }
         }
       } catch {
         console.log('no info, unbooted')
@@ -79,11 +91,13 @@ function App() {
   useEffect(() => setNavigateToLogin(false), [initialVisit])
 
 
+
   // just pass all the props each time since components won't mind extras
   // todo, most of these can be removed...
   const props = {
     upgradable, setUpgradable,
     direct, setDirect,
+    directNodeIp, setDirectNodeIp,
     key,
     keyFileName, setKeyFileName,
     reset, setReset,
@@ -99,52 +113,52 @@ function App() {
   }
 
   return (
-    <>
-      <Header />
-      <div id="register-ui--app"
-        className="place-items-center place-content-center h-screen relative flex flex-col gap-4"
-      >
-        <Router>
-          <LargeBackgroundVector />
-          <main className="relative z-10 bg-white/10 p-4 rounded-lg dark:bg-black/10 max-w-md backdrop-blur-xl">
-            <HyperwareLogo className="w-48 h-48 mb-8 mx-auto" />
-            <Routes>
-              <Route path="/" element={navigateToLogin
-                ? <Navigate to="/login" replace />
-                : <HyperdriveHome {...props} />
-              } />
-              <Route path="/commit-os-name" element={
-                <>
-                  <ProgressBar hnsName={hnsName} />
-                  <CommitDotOsName {...props} />
-                </>
-              } />
-              <Route path="/mint-os-name" element={
-                <>
-                  <ProgressBar hnsName={hnsName} />
-                  <MintDotOsName {...props} />
-                </>
-              } />
-              <Route path="/set-password" element={
-                <>
-                  <ProgressBar hnsName={hnsName} />
-                  <SetPassword {...props} />
-                </>
-              } />
-              <Route path="/reset" element={<ResetName {...props} />} />
-              <Route path="/import-keyfile" element={<ImportKeyfile {...props} />} />
-              <Route path="/login" element={<Login {...props} />} />
-              <Route path="/custom-register" element={
-                <>
-                  <ProgressBar hnsName={hnsName} />
-                  <MintCustom {...props} />
-                </>
-              } />
-            </Routes>
-          </main>
-        </Router>
-      </div>
-    </>
+      <>
+        <Header />
+        <div id="register-ui--app"
+             className="place-items-center place-content-center h-screen relative flex flex-col gap-4"
+        >
+          <Router>
+            <LargeBackgroundVector />
+            <main className="relative z-10 bg-white/10 p-4 rounded-lg dark:bg-black/10 max-w-md backdrop-blur-xl">
+              <HyperwareLogo className="w-48 h-48 mb-8 mx-auto" />
+              <Routes>
+                <Route path="/" element={navigateToLogin
+                    ? <Navigate to="/login" replace />
+                    : <HyperdriveHome {...props} />
+                } />
+                <Route path="/commit-os-name" element={
+                  <>
+                    <ProgressBar hnsName={hnsName} />
+                    <CommitDotOsName {...props} />
+                  </>
+                } />
+                <Route path="/mint-os-name" element={
+                  <>
+                    <ProgressBar hnsName={hnsName} />
+                    <MintDotOsName {...props} />
+                  </>
+                } />
+                <Route path="/set-password" element={
+                  <>
+                    <ProgressBar hnsName={hnsName} />
+                    <SetPassword {...props} />
+                  </>
+                } />
+                <Route path="/reset" element={<ResetName {...props} />} />
+                <Route path="/import-keyfile" element={<ImportKeyfile {...props} />} />
+                <Route path="/login" element={<Login {...props} />} />
+                <Route path="/custom-register" element={
+                  <>
+                    <ProgressBar hnsName={hnsName} />
+                    <MintCustom {...props} />
+                  </>
+                } />
+              </Routes>
+            </main>
+          </Router>
+        </div>
+      </>
 
   )
 }
diff --git a/hyperdrive/src/register-ui/src/abis/helpers.ts b/hyperdrive/src/register-ui/src/abis/helpers.ts
index d57479383..09414555b 100644
--- a/hyperdrive/src/register-ui/src/abis/helpers.ts
+++ b/hyperdrive/src/register-ui/src/abis/helpers.ts
@@ -1,4 +1,3 @@
-
 import { NetworkingInfo } from "../lib/types";
 import { hyperhash } from "../utils/hyperhash";
 import { ipToBytes, portToBytes } from "../utils/hns_encoding";
@@ -15,6 +14,7 @@ const encodeRouters = (routers: string[]): `0x${string}` => {
 export const generateNetworkingKeys = async ({
     upgradable,
     direct,
+    directNodeIp,
     setNetworkingKey,
     setWsPort,
     setTcpPort,
@@ -25,6 +25,7 @@ export const generateNetworkingKeys = async ({
 }: {
     upgradable: boolean,
     direct: boolean,
+    directNodeIp?: string,
     label: string,
     our_address: `0x${string}`,
     setNetworkingKey: (networkingKey: string) => void;
@@ -49,7 +50,9 @@ export const generateNetworkingKeys = async ({
         (res) => res.json()
     )) as NetworkingInfo;
 
-    const ipAddress = ipToBytes(ip_address);
+    // Use directNodeIp if provided and direct is true, otherwise use the generated IP
+    const ipToUse = direct && directNodeIp ? directNodeIp : ip_address;
+    const ipAddress = ipToBytes(ipToUse);
 
     const routersToUse = customRouters && customRouters.length > 0 ? customRouters : allowed_routers;
 
@@ -60,6 +63,7 @@ export const generateNetworkingKeys = async ({
     setRouters(routersToUse);
 
     console.log("networking_key: ", networking_key);
+    console.log("IP address being used: ", ipToUse);
     console.log("routers being used: ", routersToUse);
 
     const netkeycall = encodeFunctionData({
diff --git a/hyperdrive/src/register-ui/src/lib/types.ts b/hyperdrive/src/register-ui/src/lib/types.ts
index 5d80f7ede..284149f76 100644
--- a/hyperdrive/src/register-ui/src/lib/types.ts
+++ b/hyperdrive/src/register-ui/src/lib/types.ts
@@ -12,6 +12,8 @@ export interface PageProps {
   setRouters: React.Dispatch<React.SetStateAction<string[]>>,
   direct: boolean,
   setDirect: React.Dispatch<React.SetStateAction<boolean>>,
+  directNodeIp: string,
+  setDirectNodeIp: React.Dispatch<React.SetStateAction<string>>,
   upgradable: boolean,
   setUpgradable: React.Dispatch<React.SetStateAction<boolean>>,
   hnsName: string,
@@ -51,6 +53,13 @@ export type InfoResponse = {
   allowed_routers?: string[];
   initial_cache_sources: string[];
   initial_base_l2_providers: string[];
+  uses_direct_networking?: boolean;
+  hns_ip_address?: string;
+  detected_ip_address?: string;
+}
+
+export type IPv4Response = {
+  ip: string;
 }
 
 export interface RpcProviderConfig {
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index bcbd4ee15..341d18469 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -1,3 +1,4 @@
+
 import { useState, useEffect, FormEvent, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import { toAscii } from "idna-uts46-hx";
@@ -18,16 +19,21 @@ interface RegisterOsNameProps extends PageProps { }
 // Regex for valid router names (domain format)
 const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
 
+// IPv4 validation regex
+const IPV4_REGEX = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+
 function CommitDotOsName({
-    direct,
-    setDirect,
-    setHnsName,
-    setNetworkingKey,
-    setIpAddress,
-    setWsPort,
-    setTcpPort,
-    setRouters,
-}: RegisterOsNameProps) {
+                             direct,
+                             setDirect,
+                            directNodeIp,
+                             setDirectNodeIp,
+                             setHnsName,
+                             setNetworkingKey,
+                             setIpAddress,
+                             setWsPort,
+                             setTcpPort,
+                             setRouters,
+                         }: RegisterOsNameProps) {
     let { address } = useAccount();
     let navigate = useNavigate();
     let { openConnectModal } = useConnectModal();
@@ -53,6 +59,40 @@ function CommitDotOsName({
     const [customRouters, setCustomRouters] = useState('')
     const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
+    // Track the initial IPv4 value to determine if it was auto-detected
+    const [initialDirectNodeIp, setInitialDirectNodeIp] = useState<string>('')
+
+    // Capture the initial directNodeIp value when component mounts
+    useEffect(() => {
+        setInitialDirectNodeIp(directNodeIp);
+    }, []); // Empty dependency array means this runs once on mount
+
+    // Validation function for IPv4
+    const isValidIPv4 = (ip: string): boolean => {
+        return IPV4_REGEX.test(ip);
+    };
+
+    // Check if direct node configuration is valid
+    const isDirectNodeValid = (): boolean => {
+        if (!direct) return true; // Not required if checkbox is unchecked
+        return directNodeIp.trim() !== '' && isValidIPv4(directNodeIp.trim());
+    };
+
+    // Determine the appropriate label for the Direct Node IP field
+    const getDirectNodeIpLabel = (): string => {
+        const hasValidInitialIp = initialDirectNodeIp && isValidIPv4(initialDirectNodeIp);
+
+        if (!hasValidInitialIp) {
+            return "Direct Node IP Address (IPv4)";
+        }
+
+        if (directNodeIp === initialDirectNodeIp) {
+            return "Direct Node IP Address (as detected)";
+        }
+
+        return "Direct Node IP Address (overridden by user)";
+    };
+
     // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
@@ -226,6 +266,35 @@ function CommitDotOsName({
                                     <summary>Advanced Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                                        {direct && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="direct-node-ip" className="text-sm font-medium">
+                                                    {getDirectNodeIpLabel()}: <span className="text-red-500">*</span>
+                                                </label>
+                                                <input
+                                                    type="text"
+                                                    id="direct-node-ip"
+                                                    value={directNodeIp}
+                                                    onChange={(e) => setDirectNodeIp(e.target.value)}
+                                                    placeholder="e.g., 192.168.1.100"
+                                                    className={`input ${
+                                                        direct && !isDirectNodeValid()
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                />
+                                                {direct && directNodeIp.trim() && !isValidIPv4(directNodeIp.trim()) && (
+                                                    <span className="text-xs text-red-500">
+                                                        Please enter a valid IPv4 address
+                                                    </span>
+                                                )}
+                                                {direct && !directNodeIp.trim() && (
+                                                    <span className="text-xs text-red-500">
+                                                        IP address is required for direct nodes
+                                                    </span>
+                                                )}
+                                            </div>
+                                        )}
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
                                         {specifyRouters && (
                                             <div className="flex flex-col gap-2 ml-6">
@@ -272,6 +341,7 @@ function CommitDotOsName({
                                         isPending ||
                                         isConfirming ||
                                         nameValidities.length !== 0 ||
+                                        (direct && !isDirectNodeValid()) ||
                                         (specifyRouters && !isCustomRoutersValid())
                                     }
                                 >
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index 84709693b..c4b78d556 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -1,4 +1,3 @@
-
 import { FormEvent, useCallback, useEffect, useState } from "react";
 import { PageProps, InfoResponse } from "../lib/types";
 import Loader from "../components/Loader";
@@ -40,6 +39,10 @@ function Login({
   const [cacheSourceValidationErrors, setCacheSourceValidationErrors] = useState<string[]>([]);
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
   const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
+  const [usesDirectNetworking, setUsesDirectNetworking] = useState<boolean>(false);
+  const [hnsIpAddress, setHnsIpAddress] = useState<string>("");
+  const [detectedIpAddress, setDetectedIpAddress] = useState<string>("");
+  const [acknowledgeIpMismatch, setAcknowledgeIpMismatch] = useState<boolean>(false);
 
   // Track initial states after data is loaded
   const [initialCacheSourcesChecked, setInitialCacheSourcesChecked] = useState(false);
@@ -64,6 +67,17 @@ function Login({
           setHnsName(infoData.name);
         }
 
+        // Set networking information
+        if (infoData.uses_direct_networking !== undefined) {
+          setUsesDirectNetworking(infoData.uses_direct_networking);
+        }
+        if (infoData.hns_ip_address) {
+          setHnsIpAddress(infoData.hns_ip_address);
+        }
+        if (infoData.detected_ip_address) {
+          setDetectedIpAddress(infoData.detected_ip_address);
+        }
+
         // Prepopulate cache sources
         if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
           setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
@@ -133,6 +147,8 @@ function Login({
     return errors;
   };
 
+  const hasIpMismatch = usesDirectNetworking && hnsIpAddress && detectedIpAddress && hnsIpAddress !== detectedIpAddress;
+
   // Handle custom cache sources change with validation
   const handleCustomCacheSourcesChange = (value: string) => {
     setCustomCacheSources(value);
@@ -253,6 +269,12 @@ function Login({
       rpcProviders.some(p => !p.url.trim() || !validateWebSocketUrl(p.url) || (p.auth && !p.auth.value.trim()))
   );
 
+  // Check if login button should be disabled
+  const isLoginDisabled =
+      (specifyCacheSources && !isCustomCacheSourcesValid()) ||
+      hasInvalidRpcProviders ||
+      (hasIpMismatch && !acknowledgeIpMismatch);
+
   return <div className="relative flex flex-col gap-2 items-stretch self-stretch">
     {loading && <div className="absolute top-0 left-0 w-full h-full flex place-content-center place-items-center">
       <Loader msg={loading} className="text-black dark:text-white" />
@@ -281,6 +303,32 @@ function Login({
             onChange={(e) => setPw(e.target.value)}
             autoFocus
         />
+        {/* IP Mismatch Warning */}
+        {hasIpMismatch && (
+            <div className="mt-2 p-3 bg-orange-50 dark:bg-orange-900/20 border border-orange-200 dark:border-orange-800 rounded text-sm">
+              <div className="font-semibold text-orange-800 dark:text-orange-200 mb-1">
+                ⚠️ IP Address Mismatch Detected
+              </div>
+              <div className="text-orange-700 dark:text-orange-300 space-y-1 mb-3">
+                <div><strong>HNS IP:</strong> {hnsIpAddress} <br />(your node's published Hypermap directory address)</div>
+                <div><strong>Detected IP:</strong> {detectedIpAddress} <br />(your node's likely current address)  </div>
+              </div>
+              <div className="text-orange-700 dark:text-orange-300 space-y-1 mb-3">
+                Please use <strong>Reset Password & Networking Info</strong> to reset your networking information, or acknowledge the following to proceed with login.
+              </div>
+              <label className="flex items-start gap-2 cursor-pointer">
+                <input
+                    type="checkbox"
+                    checked={acknowledgeIpMismatch}
+                    onChange={(e) => setAcknowledgeIpMismatch(e.target.checked)}
+                    className="mt-1"
+                />
+                <span className="text-orange-800 dark:text-orange-200 text-sm">
+                  I know what I'm doing and I want to login despite the IP address mismatch and the possible unreachability of my node.
+                </span>
+              </label>
+            </div>
+        )}
       </div>
 
       {/* Advanced Options Section */}
@@ -356,7 +404,7 @@ function Login({
 
       <button
           type="submit"
-          disabled={specifyCacheSources && !isCustomCacheSourcesValid() || hasInvalidRpcProviders}
+          disabled={isLoginDisabled}
       >Log in</button>
 
       <button
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index 18be9c1eb..26d1fb5d1 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -1,7 +1,8 @@
 import { useState, useEffect, FormEvent, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
-import { PageProps } from "../lib/types";
+import { PageProps, InfoResponse } from "../lib/types";
+
 import DirectNodeCheckbox from "../components/DirectCheckbox";
 import UpgradableCheckbox from "../components/UpgradableCheckbox";
 import { useAccount, useWaitForTransactionReceipt, useSendTransaction, useConfig } from "wagmi";
@@ -14,25 +15,29 @@ import { encodePacked, encodeFunctionData, stringToHex } from "viem";
 import BackButton from "../components/BackButton";
 import { predictTBAAddress } from "../utils/predictTBA";
 import { hyperhash } from "../utils/hyperhash";
-
 interface MintCustomNameProps extends PageProps { }
 
 // Regex for valid router names (domain format)
 const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
 
+// IPv4 validation regex
+const IPV4_REGEX = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+
 function MintCustom({
-    upgradable,
-    setUpgradable,
-    direct,
-    setDirect,
-    hnsName,
-    setHnsName,
-    setNetworkingKey,
-    setIpAddress,
-    setWsPort,
-    setTcpPort,
-    setRouters,
-}: MintCustomNameProps) {
+                        upgradable,
+                        setUpgradable,
+                        direct,
+                        setDirect,
+                        directNodeIp,
+                        setDirectNodeIp,
+                        hnsName,
+                        setHnsName,
+                        setNetworkingKey,
+                        setIpAddress,
+                        setWsPort,
+                        setTcpPort,
+                        setRouters,
+                    }: MintCustomNameProps) {
     const { address } = useAccount();
     const navigate = useNavigate();
     const { openConnectModal } = useConnectModal();
@@ -57,6 +62,52 @@ function MintCustom({
     const [customRouters, setCustomRouters] = useState('')
     const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
+    // Track the initial IPv4 value to determine if it was auto-detected
+    const [initialDirectNodeIp, setInitialDirectNodeIp] = useState<string>('')
+
+    // Fetch and set the detected IP address on mount
+    useEffect(() => {
+        document.title = "Mint";
+
+        (async () => {
+            try {
+                const infoData = await fetch("/info", { method: "GET" }).then((res) => res.json()) as InfoResponse;
+                if (infoData.detected_ip_address) {
+                    setDirectNodeIp(infoData.detected_ip_address);
+                    setInitialDirectNodeIp(infoData.detected_ip_address);
+                }
+            } catch (error) {
+                console.error("Failed to fetch node info:", error);
+            }
+        })();
+    }, [setDirectNodeIp]);
+
+    // Validation function for IPv4
+    const isValidIPv4 = (ip: string): boolean => {
+        return IPV4_REGEX.test(ip);
+    };
+
+    // Check if direct node configuration is valid
+    const isDirectNodeValid = (): boolean => {
+        if (!direct) return true; // Not required if checkbox is unchecked
+        return directNodeIp.trim() !== '' && isValidIPv4(directNodeIp.trim());
+    };
+
+    // Determine the appropriate label for the Direct Node IP field
+    const getDirectNodeIpLabel = (): string => {
+        const hasValidInitialIp = initialDirectNodeIp && isValidIPv4(initialDirectNodeIp);
+
+        if (!hasValidInitialIp) {
+            return "Direct Node IP Address (IPv4)";
+        }
+
+        if (directNodeIp === initialDirectNodeIp) {
+            return "Direct Node IP Address (as detected)";
+        }
+
+        return "Direct Node IP Address (overridden by user)";
+    };
+
     // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
@@ -118,10 +169,6 @@ function MintCustom({
         return validRouters.length > 0 && routerValidationErrors.length === 0;
     };
 
-    useEffect(() => {
-        document.title = "Mint";
-    }, []);
-
     useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address]);
 
     useEffect(() => {
@@ -170,6 +217,7 @@ function MintCustom({
             setRouters([]);
         }
 
+
         try {
             const tokenData = (await readContract(config, {
                 address: tbaAddr,
@@ -189,6 +237,7 @@ function MintCustom({
             const initCall = await generateNetworkingKeys({
                 upgradable,
                 direct,
+                directNodeIp: direct ? directNodeIp : undefined,
                 our_address: address,
                 label: hnsName,
                 setNetworkingKey,
@@ -229,7 +278,7 @@ function MintCustom({
         } catch (error) {
             console.error('Failed to read or write to contract:', error)
         }
-    }, [config, getValidCustomRouters, hnsName, setHnsName, upgradable, direct, specifyRouters, customRouters, address, sendTransaction, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
+    }, [config, getValidCustomRouters, hnsName, setHnsName, upgradable, direct, directNodeIp, specifyRouters, customRouters, address, sendTransaction, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
 
     return (
         <div className="container fade-in">
@@ -253,6 +302,35 @@ function MintCustom({
                                     <div className="flex flex-col gap-3">
                                         <UpgradableCheckbox {...{ upgradable, setUpgradable }} />
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                                        {direct && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="direct-node-ip" className="text-sm font-medium">
+                                                    {getDirectNodeIpLabel()}: <span className="text-red-500">*</span>
+                                                </label>
+                                                <input
+                                                    type="text"
+                                                    id="direct-node-ip"
+                                                    value={directNodeIp}
+                                                    onChange={(e) => setDirectNodeIp(e.target.value)}
+                                                    placeholder="e.g., 192.168.1.100"
+                                                    className={`input ${
+                                                        direct && !isDirectNodeValid()
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                />
+                                                {direct && directNodeIp.trim() && !isValidIPv4(directNodeIp.trim()) && (
+                                                    <span className="text-xs text-red-500">
+                                                        Please enter a valid IPv4 address
+                                                    </span>
+                                                )}
+                                                {direct && !directNodeIp.trim() && (
+                                                    <span className="text-xs text-red-500">
+                                                        IP address is required for direct nodes
+                                                    </span>
+                                                )}
+                                            </div>
+                                        )}
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
                                         {specifyRouters && (
                                             <div className="flex flex-col gap-2 ml-6">
@@ -298,6 +376,7 @@ function MintCustom({
                                     disabled={
                                         isPending ||
                                         isConfirming ||
+                                        (direct && !isDirectNodeValid()) ||
                                         (specifyRouters && !isCustomRoutersValid())
                                     }
                                 >
@@ -324,4 +403,4 @@ function MintCustom({
     );
 }
 
-export default MintCustom;
+export default MintCustom;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
index 333281ecd..42c716ee4 100644
--- a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
@@ -1,4 +1,3 @@
-
 import { useState, useEffect, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
@@ -14,15 +13,16 @@ import { base } from 'viem/chains'
 interface RegisterOsNameProps extends PageProps { }
 
 function MintDotOsName({
-  direct,
-  hnsName,
-  setNetworkingKey,
-  setIpAddress,
-  setWsPort,
-  setTcpPort,
-  setRouters,
-  routers,
-}: RegisterOsNameProps) {
+                         direct,
+                         directNodeIp,
+                         hnsName,
+                         setNetworkingKey,
+                         setIpAddress,
+                         setWsPort,
+                         setTcpPort,
+                         setRouters,
+                         routers,
+                       }: RegisterOsNameProps) {
   let { address } = useAccount();
   let navigate = useNavigate();
   let { openConnectModal } = useConnectModal();
@@ -76,6 +76,7 @@ function MintDotOsName({
     const initCall = await generateNetworkingKeys({
       upgradable: false,
       direct,
+      directNodeIp: direct ? directNodeIp : undefined,
       our_address: address,
       label: hnsName,
       setNetworkingKey,
@@ -120,7 +121,7 @@ function MintDotOsName({
       }
       throw err;
     }
-  }, [direct, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal, hnsName, hasMinted, routers])
+  }, [direct, directNodeIp, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal, hnsName, hasMinted, routers])
 
   useEffect(() => {
     if (address && !isPending && !isConfirming) {
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 54d2f9413..6fd661f2f 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -6,7 +6,7 @@ import {
 } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
-import { PageProps, UnencryptedIdentity } from "../lib/types";
+import { PageProps, InfoResponse } from "../lib/types";
 import { MULTICALL, mechAbi } from "../abis";
 import { generateNetworkingKeys } from "../abis/helpers";
 import DirectNodeCheckbox from "../components/DirectCheckbox";
@@ -24,9 +24,14 @@ interface ResetProps extends PageProps { }
 // Regex for valid router names (domain format)
 const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
 
+// IPv4 validation regex
+const IPV4_REGEX = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+
 function ResetHnsName({
                           direct,
                           setDirect,
+                          directNodeIp,
+                          setDirectNodeIp,
                           setReset,
                           hnsName,
                           setHnsName,
@@ -67,11 +72,90 @@ function ResetHnsName({
     const [initiallyDirect, setInitiallyDirect] = useState<boolean | undefined>(undefined);
     const [initiallySpecifyRouters, setInitiallySpecifyRouters] = useState<boolean | undefined>(undefined);
 
+    // Track the initial IPv4 value to determine if it was auto-detected
+    const [initialDirectNodeIp, setInitialDirectNodeIp] = useState<string>('')
+
+    // Fetch current node info on mount
+    useEffect(() => {
+        document.title = "Reset";
+
+        (async () => {
+            try {
+                // Fetch current node info which includes detected IP address
+                const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
+                    res.json()
+                )) as InfoResponse;
+
+                // Set detected IP if available
+                if (infoData.detected_ip_address) {
+                    setInitialDirectNodeIp(infoData.detected_ip_address);
+                }
+
+                // Determine if node has specified routers (indirect node)
+                const hasRouters = infoData.allowed_routers && infoData.allowed_routers.length > 0;
+
+                // If allowed_routers is empty, the node is direct; if it has routers, it's indirect
+                const isDirect = !hasRouters;
+
+                // Set initial states for checkbox help text
+                setInitiallyDirect(isDirect);
+                setInitiallySpecifyRouters(hasRouters);
+
+                // Set the current state to match the node's current configuration
+                setDirect(isDirect);
+
+                // Set IP address: if direct node and detected IP is available, use it
+                if (isDirect && infoData.detected_ip_address) {
+                    setDirectNodeIp(infoData.detected_ip_address);
+                }
+
+                // Prepopulate customRouters if this is an indirect node with existing routers
+                if (hasRouters) {
+                    const routersText = infoData.allowed_routers.join('\n');
+                    setCustomRouters(routersText);
+                    setSpecifyRouters(true); // Auto-enable the checkbox
+                }
+            } catch (error) {
+                console.log("Could not fetch node info:", error);
+            }
+        })();
+    }, [setDirect, setDirectNodeIp]);
+
+    // Validation function for IPv4
+    const isValidIPv4 = (ip: string): boolean => {
+        return IPV4_REGEX.test(ip);
+    };
+
+    // Check if direct node configuration is valid
+    const isDirectNodeValid = (): boolean => {
+        if (!direct) return true; // Not required if checkbox is unchecked
+        return directNodeIp.trim() !== '' && isValidIPv4(directNodeIp.trim());
+    };
+
+    // Determine the appropriate label for the Direct Node IP field
+    const getDirectNodeIpLabel = (): string => {
+        const hasValidInitialIp = initialDirectNodeIp && isValidIPv4(initialDirectNodeIp);
+
+        if (!hasValidInitialIp) {
+            return "Direct Node IP Address (IPv4)";
+        }
+
+        if (directNodeIp === initialDirectNodeIp) {
+            return "Direct Node IP Address (as detected)";
+        }
+
+        return "Direct Node IP Address (overridden by user)";
+    };
+
     // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
         if (value) {
             setSpecifyRouters(false);
+            // Only set detected IP if directNodeIp is empty (not if user has entered something)
+            if (!directNodeIp && initialDirectNodeIp) {
+                setDirectNodeIp(initialDirectNodeIp);
+            }
         }
     };
 
@@ -215,6 +299,7 @@ function ResetHnsName({
                 const data = await generateNetworkingKeys({
                     upgradable: false,
                     direct,
+                    directNodeIp: direct ? directNodeIp : undefined,
                     label: name,
                     our_address: address,
                     setNetworkingKey,
@@ -242,7 +327,7 @@ function ResetHnsName({
                 console.error("An error occurred:", error);
             }
         },
-        [address, direct, specifyRouters, customRouters, name, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal, getValidCustomRouters, setHnsName]
+        [address, direct, directNodeIp, specifyRouters, customRouters, name, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal, getValidCustomRouters, setHnsName]
     );
 
     useEffect(() => {
@@ -303,6 +388,35 @@ function ResetHnsName({
                                             setDirect={handleSetDirect}
                                             initiallyChecked={initiallyDirect}
                                         />
+                                        {direct && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="direct-node-ip" className="text-sm font-medium">
+                                                    {getDirectNodeIpLabel()}: <span className="text-red-500">*</span>
+                                                </label>
+                                                <input
+                                                    type="text"
+                                                    id="direct-node-ip"
+                                                    value={directNodeIp}
+                                                    onChange={(e) => setDirectNodeIp(e.target.value)}
+                                                    placeholder="e.g., 192.168.1.100"
+                                                    className={`input ${
+                                                        direct && !isDirectNodeValid()
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                />
+                                                {direct && directNodeIp.trim() && !isValidIPv4(directNodeIp.trim()) && (
+                                                    <span className="text-xs text-red-500">
+                                                        Please enter a valid IPv4 address
+                                                    </span>
+                                                )}
+                                                {direct && !directNodeIp.trim() && (
+                                                    <span className="text-xs text-red-500">
+                                                        IP address is required for direct nodes
+                                                    </span>
+                                                )}
+                                            </div>
+                                        )}
                                         <SpecifyRoutersCheckbox
                                             specifyRouters={specifyRouters}
                                             setSpecifyRouters={handleSetSpecifyRouters}
@@ -336,11 +450,11 @@ function ResetHnsName({
                                                     <span className={`text-xs ${
                                                         !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
                                                     }`}>
-                                    {!isCustomRoutersValid()
-                                        ? 'At least one valid router name is required'
-                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
-                                    }
-                                  </span>
+                                                        {!isCustomRoutersValid()
+                                                            ? 'At least one valid router name is required'
+                                                            : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                        }
+                                                    </span>
                                                 )}
                                             </div>
                                         )}
@@ -377,6 +491,7 @@ function ResetHnsName({
                                         isPending ||
                                         isConfirming ||
                                         nameValidities.length !== 0 ||
+                                        (direct && !isDirectNodeValid()) ||
                                         (specifyRouters && !isCustomRoutersValid())
                                     }
                                 >
@@ -398,4 +513,4 @@ function ResetHnsName({
     );
 }
 
-export default ResetHnsName;
+export default ResetHnsName;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 1fc5348a8..705ca94c2 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -11,6 +11,7 @@ import { InfoResponse } from "../lib/types";
 
 type SetPasswordProps = {
   direct: boolean;
+  directNodeIp: string;
   pw: string;
   reset: boolean;
   hnsName: string;
@@ -32,6 +33,7 @@ const validateWebSocketUrl = (url: string): boolean => {
 function SetPassword({
                        hnsName,
                        direct,
+                       directNodeIp,
                        pw,
                        reset,
                        setPw,
@@ -203,6 +205,9 @@ function SetPassword({
             console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
           }
 
+          // Determine the direct value: IP address string if direct is true, null otherwise
+          const directValue = direct ? directNodeIp : null;
+
           // salt is either node name (if node name is longer than 8 characters)
           //  or node name repeated enough times to be longer than 8 characters
           const minSaltL = 8;
@@ -261,7 +266,7 @@ function SetPassword({
                   password_hash: hashed_password_hex,
                   reset,
                   username: hnsName,
-                  direct,
+                  direct: directValue,
                   owner,
                   timestamp,
                   signature,
@@ -286,7 +291,7 @@ function SetPassword({
           });
         }, 500);
       },
-      [direct, pw, pw2, reset, hnsName, routers, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders, address, chainId, signTypedDataAsync]
+      [direct, directNodeIp, pw, pw2, reset, hnsName, routers, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders, address, chainId, signTypedDataAsync]
   );
 
   // Validation for the submit button
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 52a838e86..20a8495d3 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -153,6 +153,7 @@ pub async fn register(
     let boot_providers = providers.clone();
     let login_providers = providers.clone();
     let import_providers = providers.clone();
+    let info_providers = providers.clone();
 
     let initial_cache_sources_arc = Arc::new(initial_cache_sources.clone());
     let initial_base_l2_providers_arc = Arc::new(initial_base_l2_providers.clone());
@@ -163,6 +164,7 @@ pub async fn register(
                 .and(keyfile.clone())
                 .and(warp::any().map(move || initial_cache_sources_arc.clone()))
                 .and(warp::any().map(move || initial_base_l2_providers_arc.clone()))
+                .and(warp::any().map(move || info_providers.clone()))
                 .and_then(get_unencrypted_info),
         )
         .or(warp::path("current-chain")
@@ -344,7 +346,18 @@ async fn get_unencrypted_info(
     keyfile: Option<Vec<u8>>,
     initial_cache_sources: Arc<Option<Vec<String>>>,
     initial_base_l2_providers: Arc<Option<Vec<String>>>,
+    providers: Arc<Vec<RootProvider<PubSubFrontend>>>,
 ) -> Result<impl Reply, Rejection> {
+    let provider = match providers.as_ref().first() {
+        Some(provider) => provider,
+        None => {
+            return Ok(warp::reply::with_status(
+                warp::reply::json(&"no providers available".to_string()),
+                StatusCode::SERVICE_UNAVAILABLE,
+            )
+            .into_response())
+        }
+    };
     let (name, allowed_routers, status_code) = match keyfile {
         Some(encoded_keyfile) => match keygen::get_username_and_routers(&encoded_keyfile) {
             Ok(k) => (Some(k.0), Some(k.1), StatusCode::OK),
@@ -359,6 +372,32 @@ async fn get_unencrypted_info(
         None => (None, None, StatusCode::NOT_FOUND),
     };
 
+    // Use the shared helper function to detect IP
+    let detected_ip_address = detect_ipv4_address().await;
+
+    // Determine networking configuration and HNS IP from chain
+    let (uses_direct_networking, hns_ip_address) = if let Some(ref routers) = allowed_routers {
+        if routers.is_empty() {
+            // This is a direct node - query the chain for its IP
+            if let Some(ref node_name) = name {
+                match query_hns_ip(node_name, &provider).await {
+                    Ok(ip) => (true, Some(ip)),
+                    Err(e) => {
+                        println!("Failed to query HNS IP for {}: {}\r", node_name, e);
+                        (true, None)
+                    }
+                }
+            } else {
+                (true, None)
+            }
+        } else {
+            // This is an indirect node
+            (false, None)
+        }
+    } else {
+        (false, None)
+    };
+
     let response = InfoResponse {
         name,
         allowed_routers,
@@ -367,15 +406,94 @@ async fn get_unencrypted_info(
             .as_ref()
             .clone()
             .unwrap_or_default(),
+        uses_direct_networking,
+        hns_ip_address,
+        detected_ip_address,
     };
 
     return Ok(warp::reply::with_status(warp::reply::json(&response), status_code).into_response());
 }
 
+/// Query the HNS IP address for a given node name from the chain
+async fn query_hns_ip(
+    node_name: &str,
+    provider: &RootProvider<PubSubFrontend>,
+) -> anyhow::Result<String> {
+    let hypermap = EthAddress::from_str(HYPERMAP_ADDRESS)?;
+    let ip_hash = FixedBytes::<32>::from_slice(&keygen::namehash(&format!("~ip.{}", node_name)));
+
+    let get_call = getCall { namehash: ip_hash }.abi_encode();
+    let tx_input = TransactionInput::new(Bytes::from(get_call));
+    let tx = TransactionRequest::default().to(hypermap).input(tx_input);
+
+    let result = provider.call(&tx).await?;
+    let ip_data = getCall::abi_decode_returns(&result, false)?;
+
+    let ip = keygen::bytes_to_ip(&ip_data.data)?;
+    Ok(ip.to_string())
+}
+
 async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Reply, Rejection> {
     Ok(warp::reply::json(our_temp_id.as_ref()))
 }
 
+async fn detect_ipv4_address() -> String {
+    #[cfg(feature = "simulation-mode")]
+    {
+        return std::net::Ipv4Addr::LOCALHOST.to_string();
+    }
+
+    #[cfg(not(feature = "simulation-mode"))]
+    {
+        // Helper function to parse IP from JSON response
+        async fn try_hyperware_endpoint(url: &str) -> Option<String> {
+            match tokio::time::timeout(std::time::Duration::from_secs(3), reqwest::get(url)).await {
+                Ok(Ok(response)) => {
+                    if let Ok(json) = response.json::<serde_json::Value>().await {
+                        if let Some(ip) = json.get("ip").and_then(|v| v.as_str()) {
+                            // Validate it's a proper IPv4 address
+                            if let Ok(parsed_ip) = ip.parse::<std::net::Ipv4Addr>() {
+                                println!("Detected IPv4 address from {}: {}\r", url, parsed_ip);
+                                return Some(parsed_ip.to_string());
+                            }
+                        }
+                    }
+                }
+                Ok(Err(e)) => {
+                    println!("Failed to fetch IP from {}: {}\r", url, e);
+                }
+                Err(_) => {
+                    println!("Timeout fetching IP from {}\r", url);
+                }
+            }
+            None
+        }
+
+        // Try ip-address-2.hyperware.ai first
+        if let Some(ip) = try_hyperware_endpoint("https://ip-address-2.hyperware.ai/").await {
+            return ip;
+        }
+
+        // Try ip-address-1.hyperware.ai as fallback
+        if let Some(ip) = try_hyperware_endpoint("https://ip-address-1.hyperware.ai/").await {
+            return ip;
+        }
+
+        // Final fallback to public_ip crate
+        println!("Falling back to public_ip crate for IP detection\r");
+        match tokio::time::timeout(std::time::Duration::from_secs(5), public_ip::addr_v4()).await {
+            Ok(Some(ip)) => {
+                println!("Detected IPv4 address from public_ip crate: {}\r", ip);
+                ip.to_string()
+            }
+            _ => {
+                println!("Failed to find public IPv4 address for /info endpoint.\r");
+                std::net::Ipv4Addr::LOCALHOST.to_string()
+            }
+        }
+    }
+}
+
 async fn handle_boot(
     info: BootInfo,
     sender: Arc<RegistrationSender>,
@@ -386,12 +504,17 @@ async fn handle_boot(
     let hypermap = EthAddress::from_str(HYPERMAP_ADDRESS).unwrap();
     let mut our = our.as_ref().clone();
 
-    our.name = info.username;
-    if info.direct {
-        our.both_to_direct();
+    our.name = info.username.clone();
+
+    // Check if direct IP address is provided (Some = direct, None = routers)
+    let is_direct = info.direct.is_some();
+
+    if is_direct {
+        let ip_address = info.direct.as_ref().unwrap();
+        our.both_to_direct(ip_address);
     } else {
         // Set custom routers if provided
-        if let Some(custom_routers) = info.custom_routers {
+        if let Some(custom_routers) = info.custom_routers.clone() {
             our.routing = NodeRouting::Routers(custom_routers);
         } else {
             our.both_to_routers(); // Use defaults
@@ -497,14 +620,14 @@ async fn handle_boot(
                         verifying_contract: hypermap,
                     };
 
-                    let boot = Boot {
-                        username: our.name.clone(),
-                        password_hash,
-                        timestamp: U256::from(info.timestamp),
-                        direct: info.direct,
-                        reset: info.reset,
-                        chain_id: U256::from(chain_id),
-                    };
+                let boot = Boot {
+                    username: our.name.clone(),
+                    password_hash,
+                    timestamp: U256::from(info.timestamp),
+                    direct: is_direct, // Convert Option<String> to bool
+                    reset: info.reset,
+                    chain_id: U256::from(chain_id),
+                };
 
                     let hash = boot.eip712_signing_hash(&domain);
                     let sig = Signature::from_str(&info.signature).map_err(|_| warp::reject())?;
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 93258205a..d971a2d7a 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lib"
 authors = ["Sybil Technologies AG"]
-version = "1.9.2"
+version = "1.9.3"
 edition = "2021"
 description = "A general-purpose sovereign cloud computing platform"
 homepage = "https://hyperware.ai"
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index 4a2323473..74e27e1c9 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -45,7 +45,7 @@ pub struct BootInfo {
     pub password_hash: String,
     pub username: String,
     pub reset: bool,
-    pub direct: bool,
+    pub direct: Option<String>,
     pub owner: String,
     pub signature: String,
     pub timestamp: u64,
@@ -150,16 +150,15 @@ impl Identity {
             NodeRouting::Direct { .. } => None,
         }
     }
-    pub fn both_to_direct(&mut self) {
-        if let NodeRouting::Both {
-            ip,
-            ports,
-            routers: _,
-        } = self.routing.clone()
-        {
-            self.routing = NodeRouting::Direct { ip, ports };
+    pub fn both_to_direct(&mut self, ip: &str) {
+        if let NodeRouting::Both { ports, .. } = &self.routing {
+            self.routing = NodeRouting::Direct {
+                ip: ip.to_string(),
+                ports: ports.clone(),
+            };
         }
     }
+
     pub fn both_to_routers(&mut self) {
         if let NodeRouting::Both {
             ip: _,
@@ -184,6 +183,9 @@ pub struct InfoResponse {
     pub allowed_routers: Option<Vec<String>>,
     pub initial_cache_sources: Vec<String>,
     pub initial_base_l2_providers: Vec<String>,
+    pub uses_direct_networking: bool,
+    pub hns_ip_address: Option<String>,
+    pub detected_ip_address: String,
 }
 
 //