diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
deleted file mode 100644
index d4d7443..0000000
--- a/.woodpecker/build.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-matrix:
-  platform:
-    - linux/amd64
-    - linux/arm64
-
-labels:
-  platform: ${platform}
-
-when:
-  - event: push
-    branch: main
-
-steps:
-  - name: "PKGBUILD"
-    image: git.hydrar.de/jmarya/pacco:latest
-    commands:
-      - pacco build --ci --push navos
-    environment:
-      PACCO_HOST: "https://pac.hydrar.de"
-      PACCO_TOKEN:
-        from_secret: pacco_token
-      SIGN_KEY:
-        from_secret: navos_key
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 8a0545a..dba945c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -233,6 +233,39 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-tungstenite"
 version = "0.25.1"
@@ -271,6 +304,21 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "atomic"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -285,19 +333,19 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "axum"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
 dependencies = [
  "axum-core",
  "axum-macros",
  "bytes",
  "form_urlencoded",
  "futures-util",
- "http",
- "http-body",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper",
+ "hyper 1.6.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -310,7 +358,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
  "tokio",
  "tower",
  "tower-layer",
@@ -337,42 +385,18 @@ checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
 dependencies = [
  "bytes",
  "futures-core",
- "http",
- "http-body",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
-[[package]]
-name = "axum-extra"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d"
-dependencies = [
- "axum",
- "axum-core",
- "bytes",
- "cookie",
- "futures-util",
- "headers",
- "http",
- "http-body",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "serde",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum-macros"
 version = "0.5.0"
@@ -418,22 +442,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 
 [[package]]
-name = "based_auth"
+name = "based"
 version = "0.1.0"
-source = "git+https://git.hydrar.de/jmarya/based_auth#bab73914bdddc53cbec5c1d2fabdcfe857838aa8"
+source = "git+https://git.hydrar.de/jmarya/based?branch=owl#2f2d77ec4897bfe0b5aeaf908c8ec2231fbd5c15"
 dependencies = [
- "axum",
- "axum-extra",
+ "async-stream",
  "bcrypt",
  "chrono",
+ "dashmap",
  "data-encoding",
  "env_logger 0.10.2",
+ "futures",
  "hex",
  "log",
+ "maud",
  "owl",
  "rand 0.8.5",
+ "rayon",
+ "regex",
+ "reqwest",
+ "ring 0.16.20",
+ "rocket",
+ "rocket_cors",
  "serde",
+ "serde_json",
+ "sqlx",
+ "tokio",
  "uuid",
+ "walkdir",
 ]
 
 [[package]]
@@ -475,6 +511,12 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
 
+[[package]]
+name = "binascii"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -524,6 +566,12 @@ version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
+[[package]]
+name = "bytemuck"
+version = "1.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -547,9 +595,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.21"
+version = "1.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
+checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
 dependencies = [
  "shlex",
 ]
@@ -783,31 +831,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crossterm"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -821,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.5"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0d274c65cbc1c34703d2fc2ce0fb892ff68f4516b677671a2f238a30b9b2b2"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -900,6 +923,39 @@ dependencies = [
  "powerfmt",
 ]
 
+[[package]]
+name = "devise"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d90b0c4c777a2cad215e3c7be59ac7c15adf45cf76317009b7d096d46f651d"
+dependencies = [
+ "devise_codegen",
+ "devise_core",
+]
+
+[[package]]
+name = "devise_codegen"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71b28680d8be17a570a2334922518be6adc3f58ecc880cbb404eaeb8624fd867"
+dependencies = [
+ "devise_core",
+ "quote",
+]
+
+[[package]]
+name = "devise_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7"
+dependencies = [
+ "bitflags 2.9.0",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -912,27 +968,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "directories"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -959,12 +994,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
-
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -974,6 +1003,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "env_filter"
 version = "0.1.3"
@@ -1060,6 +1098,20 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "figment"
+version = "0.10.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
+dependencies = [
+ "atomic 0.6.0",
+ "pear",
+ "serde",
+ "toml 0.8.22",
+ "uncased",
+ "version_check",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.25"
@@ -1143,7 +1195,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -1293,21 +1345,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
+name = "generator"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
 dependencies = [
- "thread_local",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
 ]
 
 [[package]]
@@ -1398,6 +1445,31 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1406,9 +1478,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -1421,31 +1493,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.3",
-]
-
-[[package]]
-name = "headers"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "headers-core",
- "http",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
-dependencies = [
- "http",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1456,9 +1504,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.5.1"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
 
 [[package]]
 name = "hex"
@@ -1493,6 +1547,17 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -1504,6 +1569,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-body"
 version = "1.0.1"
@@ -1511,7 +1587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http",
+ "http 1.3.1",
 ]
 
 [[package]]
@@ -1522,8 +1598,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http",
- "http-body",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -1538,7 +1614,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http",
+ "http 1.3.1",
  "indexmap",
  "slab",
  "tokio",
@@ -1563,6 +1639,30 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
+[[package]]
+name = "hyper"
+version = "0.14.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
 [[package]]
 name = "hyper"
 version = "1.6.0"
@@ -1572,8 +1672,8 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http",
- "http-body",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
@@ -1582,6 +1682,19 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper 0.14.32",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.11"
@@ -1590,9 +1703,9 @@ checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "hyper 1.6.0",
  "pin-project-lite",
  "tokio",
  "tower-service",
@@ -1834,9 +1947,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.2",
+ "serde",
 ]
 
+[[package]]
+name = "inlinable_string"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
+
 [[package]]
 name = "inout"
 version = "0.1.4"
@@ -1847,23 +1967,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "inquire"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
-dependencies = [
- "bitflags 2.9.0",
- "crossterm",
- "dyn-clone",
- "fuzzy-matcher",
- "fxhash",
- "newline-converter",
- "once_cell",
- "unicode-segmentation",
- "unicode-width",
-]
-
 [[package]]
 name = "intl-memoizer"
 version = "0.5.2"
@@ -1889,13 +1992,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304"
 
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
 [[package]]
 name = "is-terminal"
 version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.5.0",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -1914,9 +2023,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.13"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
+checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
 dependencies = [
  "jiff-static",
  "log",
@@ -1927,9 +2036,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.13"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
+checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1952,7 +2061,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -1963,9 +2072,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libm"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25169bd5913a4b437588a7e3d127cd6e90127b60e0ffbd834a38f1599e016b8"
+checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72"
 
 [[package]]
 name = "libredox"
@@ -2022,12 +2131,58 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
+[[package]]
+name = "maud"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df518b75016b4289cdddffa1b01f2122f4a49802c93191f3133f6dc2472ebcaa"
+dependencies = [
+ "itoa",
+ "maud_macros",
+]
+
+[[package]]
+name = "maud_macros"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -2077,18 +2232,6 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.3"
@@ -2100,6 +2243,25 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "multer"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http 1.3.1",
+ "httparse",
+ "memchr",
+ "mime",
+ "spin 0.9.8",
+ "tokio",
+ "tokio-util",
+ "version_check",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.14"
@@ -2117,15 +2279,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "newline-converter"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2205,6 +2358,16 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -2260,9 +2423,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
  "cc",
  "libc",
@@ -2270,12 +2433,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2285,9 +2442,8 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "owl"
 version = "0.1.0"
-source = "git+https://git.hydrar.de/red/owl#a858f0838a91ba42f69dd00e5624aac353fb7b69"
+source = "git+https://git.hydrar.de/red/owl#6c54873ca2e01035137cbce425fb346f785f045a"
 dependencies = [
- "arc-swap",
  "argh",
  "chrono",
  "crossbeam",
@@ -2314,7 +2470,7 @@ dependencies = [
 [[package]]
 name = "owl_macro"
 version = "0.1.0"
-source = "git+https://git.hydrar.de/red/owl#a858f0838a91ba42f69dd00e5624aac353fb7b69"
+source = "git+https://git.hydrar.de/red/owl#6c54873ca2e01035137cbce425fb346f785f045a"
 dependencies = [
  "convert_case",
  "heck",
@@ -2368,6 +2524,29 @@ dependencies = [
  "hmac",
 ]
 
+[[package]]
+name = "pear"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467"
+dependencies = [
+ "inlinable_string",
+ "pear_codegen",
+ "yansi",
+]
+
+[[package]]
+name = "pear_codegen"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147"
+dependencies = [
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -2505,6 +2684,29 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro-error-attr2"
 version = "2.0.0"
@@ -2536,6 +2738,19 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+ "yansi",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.40"
@@ -2632,22 +2847,31 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
 dependencies = [
  "bitflags 2.9.0",
 ]
 
 [[package]]
-name = "redox_users"
-version = "0.5.0"
+name = "ref-cast"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
 dependencies = [
- "getrandom 0.2.16",
- "libredox",
- "thiserror 2.0.12",
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -2658,8 +2882,17 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
@@ -2670,15 +2903,76 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.5",
 ]
 
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "reqwest"
+version = "0.11.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -2689,7 +2983,7 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.16",
  "libc",
- "untrusted",
+ "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
 
@@ -2727,6 +3021,105 @@ dependencies = [
  "serde_bytes",
 ]
 
+[[package]]
+name = "rocket"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "atomic 0.5.3",
+ "binascii",
+ "bytes",
+ "either",
+ "figment",
+ "futures",
+ "indexmap",
+ "log",
+ "memchr",
+ "multer",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "ref-cast",
+ "rocket_codegen",
+ "rocket_http",
+ "serde",
+ "serde_json",
+ "state",
+ "tempfile",
+ "time",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "ubyte",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "rocket_codegen"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46"
+dependencies = [
+ "devise",
+ "glob",
+ "indexmap",
+ "proc-macro2",
+ "quote",
+ "rocket_http",
+ "syn",
+ "unicode-xid",
+ "version_check",
+]
+
+[[package]]
+name = "rocket_cors"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfac3a1df83f8d4fc96aa41dba3b86c786417b7fc0f52ec76295df2ba781aa69"
+dependencies = [
+ "http 0.2.12",
+ "log",
+ "regex",
+ "rocket",
+ "serde",
+ "serde_derive",
+ "unicase",
+ "unicase_serde",
+ "url",
+]
+
+[[package]]
+name = "rocket_http"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9"
+dependencies = [
+ "cookie",
+ "either",
+ "futures",
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "indexmap",
+ "log",
+ "memchr",
+ "pear",
+ "percent-encoding",
+ "pin-project-lite",
+ "ref-cast",
+ "serde",
+ "smallvec",
+ "stable-pattern",
+ "state",
+ "time",
+ "tokio",
+ "uncased",
+]
+
 [[package]]
 name = "rpassword"
 version = "7.4.0"
@@ -2778,10 +3171,10 @@ dependencies = [
  "bytes",
  "flume",
  "futures-util",
- "http",
+ "http 1.3.1",
  "log",
  "rustls-native-certs",
- "rustls-pemfile",
+ "rustls-pemfile 2.2.0",
  "rustls-webpki 0.102.8",
  "thiserror 1.0.69",
  "tokio",
@@ -2792,9 +3185,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.7.1"
+version = "8.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e425e204264b144d4c929d126d0de524b40a961686414bab5040f7465c71be"
+checksum = "e5fbc0ee50fcb99af7cebb442e5df7b5b45e9460ffa3f8f549cd26b862bec49d"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -2853,9 +3246,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
@@ -2871,7 +3264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.14",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -2880,15 +3273,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
 dependencies = [
  "log",
  "once_cell",
- "ring",
+ "ring 0.17.14",
  "rustls-pki-types",
- "rustls-webpki 0.103.2",
+ "rustls-webpki 0.103.1",
  "subtle",
  "zeroize",
 ]
@@ -2900,12 +3293,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.2.0"
@@ -2927,20 +3329,20 @@ version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring",
+ "ring 0.17.14",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.2"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
- "ring",
+ "ring 0.17.14",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -2993,6 +3395,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -3148,9 +3556,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3173,14 +3581,10 @@ dependencies = [
  "argh",
  "axum",
  "axum-client-ip",
- "axum-extra",
- "based_auth",
- "chrono",
+ "based",
  "dashmap",
- "directories",
  "hex",
  "http2",
- "inquire",
  "log",
  "owl",
  "rand 0.9.1",
@@ -3192,7 +3596,6 @@ dependencies = [
  "toml 0.8.22",
  "tracing",
  "tracing-subscriber",
- "ulid",
  "ureq",
 ]
 
@@ -3202,27 +3605,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
-dependencies = [
- "libc",
- "mio 0.8.11",
- "signal-hook",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.5"
@@ -3270,6 +3652,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -3319,7 +3707,7 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.2",
  "hashlink",
  "indexmap",
  "log",
@@ -3487,12 +3875,30 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "stable-pattern"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
+[[package]]
+name = "state"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+dependencies = [
+ "loom",
+]
+
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -3527,6 +3933,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -3535,15 +3947,36 @@ checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.19.1"
@@ -3674,14 +4107,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.45.0"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 1.0.3",
+ "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
@@ -3701,6 +4134,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.25.0"
@@ -3795,7 +4238,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3864,14 +4307,24 @@ version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "tungstenite"
 version = "0.21.0"
@@ -3881,7 +4334,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 1.3.1",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -3908,6 +4361,15 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
+[[package]]
+name = "ubyte"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "ulid"
 version = "1.2.1"
@@ -3919,6 +4381,16 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "uncased"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
+dependencies = [
+ "serde",
+ "version_check",
+]
+
 [[package]]
 name = "unic-langid"
 version = "0.9.5"
@@ -3938,6 +4410,22 @@ dependencies = [
  "tinystr",
 ]
 
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicase_serde"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1"
+dependencies = [
+ "serde",
+ "unicase",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
@@ -3972,10 +4460,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
-name = "unicode-width"
-version = "0.1.14"
+name = "unicode-xid"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -3987,6 +4475,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -4004,8 +4498,8 @@ dependencies = [
  "flate2",
  "log",
  "percent-encoding",
- "rustls 0.23.27",
- "rustls-pemfile",
+ "rustls 0.23.26",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -4021,7 +4515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fadf18427d33828c311234884b7ba2afb57143e6e7e69fda7ee883b624661e36"
 dependencies = [
  "base64 0.22.1",
- "http",
+ "http 1.3.1",
  "httparse",
  "log",
 ]
@@ -4108,6 +4602,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -4155,6 +4658,19 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.100"
@@ -4187,6 +4703,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-time"
 version = "1.1.0"
@@ -4199,9 +4725,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.10"
+version = "0.26.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93"
+checksum = "29aad86cec885cafd03e8305fd727c418e970a521322c91688414d5b8efba16b"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -4247,6 +4773,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.0"
@@ -4456,13 +4991,23 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.9"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3"
+checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
@@ -4528,6 +5073,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+dependencies = [
+ "is-terminal",
+]
+
 [[package]]
 name = "yoke"
 version = "0.7.5"
diff --git a/Cargo.toml b/Cargo.toml
index 9406126..bcc8e0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,18 +3,10 @@ name = "sheepd"
 version = "0.1.0"
 edition = "2024"
 
-[lib]
-name = "sheepd"
-path = "src/lib.rs"
-
 [[bin]]
 name = "sheepd"
 path = "src/sheepd.rs"
 
-[[bin]]
-name = "sheepctl"
-path = "src/sheepctl.rs"
-
 [[bin]]
 name = "herd"
 path = "src/herd.rs"
@@ -38,14 +30,9 @@ axum-client-ip = { version = "1.0.0", optional = true }
 toml = "0.8.21"
 hex = "0.4.3"
 rand = "0.9.1"
-based_auth = { git = "https://git.hydrar.de/jmarya/based_auth", features = ["axum"] }
+based = { git = "https://git.hydrar.de/jmarya/based", branch = "owl" }
 http2 = "0.4.21"
 ureq = { version = "3.0.11", features = ["json"] }
 rumqttc = { version = "0.24.0", features = ["url", "websocket"] }
 sage = { git = "https://git.hydrar.de/jmarya/sage" }
 dashmap = "6.1.0"
-ulid = { version = "1.2.1", features = ["serde"] }
-chrono = "0.4.41"
-directories = "6.0.0"
-inquire = "0.7.5"
-axum-extra = { version = "0.10.1", features = ["typed-header"] }
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3635a90..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM rust:buster AS builder
-
-RUN rustup default nightly
-
-COPY . /app
-WORKDIR /app
-
-RUN cargo build --release --bin herd --features herd
-
-FROM git.hydrar.de/navos/navos:latest
-
-RUN pacman-key --init && pacman-key --populate archlinux && pacman-key --populate navos && pacman -Syu --noconfirm && pacman -Syu --noconfirm openssl-1.1
-
-COPY --from=builder /app/target/release/herd /herd
-
-WORKDIR /
-
-CMD ["/herd"]
diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index 1af5275..0000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgbase=sheep
-pkgname=('sheepd' 'sheepctl')
-pkgver=2025.05.05_b010027
-pkgrel=1
-arch=('x86_64' 'aarch64')
-url="https://git.hydrar.de/navos/sheepd"
-license=('MIT')
-makedepends=('rustup')
-source=("repo::git+https://git.hydrar.de/navos/sheepd.git")
-sha256sums=("SKIP")
-
-pkgver() {
-    cd "$srcdir/repo"
-   	echo "$(date +%Y.%m.%d)_$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-    cd "$srcdir/repo"
-    rustup default nightly
-    cargo fetch
-}
-
-build() {
-  cd "$srcdir/repo"
-  cargo build --release --bin sheepd
-  cargo build --release --bin sheepctl
-}
-
-package_sheepd() {
-  pkgdesc="sheep daemon"
-  depends=('osquery')
-  cd "$srcdir/repo"
-  install -Dm755 "sheepd.service" "$pkgir/etc/systemd/systemd/sheepd.service"
-  install -Dm755 "target/release/sheepd" "$pkgdir/usr/bin/sheepd"
-}
-
-package_sheepctl() {
-  pkgdesc="CLI for controling your herd"
-  cd "$srcdir/repo"
-  install -Dm755 "target/release/sheepctl" "$pkgdir/usr/bin/sheepctl"
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index caf61d4..06250dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,11 +10,3 @@ services:
       - ./mosquitto/data:/mosquitto/data
       - ./mosquitto/log:/mosquitto/log
     restart: unless-stopped
-
-  herd:
-    build: .
-    ports:
-      - 8080:8000
-    volumes:
-      - ./herd:/herd
-    restart: unless-stopped
diff --git a/sheepd.service b/sheepd.service
deleted file mode 100644
index 48a5802..0000000
--- a/sheepd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Sheep Daemon
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/sheepd
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/api.rs b/src/api.rs
index a285fac..32e83f7 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -3,21 +3,7 @@ use rumqttc::{AsyncClient, Event, EventLoop, MqttOptions, Packet, Transport};
 use std::time::Duration;
 use tokio::time::sleep;
 
-pub fn domain(host: &str) -> String {
-    if host.starts_with("http") {
-        return host.to_string();
-    } else {
-        format!("https://{host}")
-    }
-}
-
 #[derive(Deserialize, Serialize)]
-pub struct LoginParam {
-    pub username: String,
-    pub password: String,
-}
-
-#[derive(Deserialize, Serialize, Clone)]
 /// Join Request
 pub struct JoinParams {
     /// Optional join token
@@ -40,24 +26,6 @@ pub struct JoinResponse {
     pub mqtt: String,
 }
 
-#[derive(Deserialize, Serialize)]
-pub struct ShellParam {
-    pub cmd: String,
-    pub cwd: String,
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct QueryParam {
-    pub query: String,
-}
-
-#[derive(Deserialize, Serialize, Debug)]
-pub struct ShellResponse {
-    pub stdout: String,
-    pub stderr: String,
-    pub status: i32,
-}
-
 /// Setup a MQTT connection for `machine_id` on `mqtt`.
 ///
 /// This will connect either over `ws://` or `wss://` depending on the scheme of `mqtt`. By default it will use `wss://`.
@@ -120,99 +88,20 @@ where
     }
 }
 
-#[derive(Deserialize, Serialize)]
-pub struct DeviceList {
-    pub devices: Vec<DeviceEntry>,
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct DeviceEntry {
-    pub id: String,
-    pub hostname: String,
-    pub online: bool,
-}
-
 #[derive(Deserialize, Serialize)]
 /// Generic JSON API result
-pub struct Result<T: Serialize> {
-    pub ok: Option<T>,
-    pub err: Option<String>,
+pub struct Result {
+    pub ok: u32,
 }
 
-impl<T: Serialize> Result<T> {
-    #[allow(non_snake_case)]
-    pub fn OkVal(val: T) -> Self {
-        Self {
-            ok: Some(val),
-            err: None,
-        }
-    }
-
-    pub fn as_result(self) -> std::result::Result<T, String> {
-        if let Some(ok) = self.ok {
-            Ok(ok)
-        } else {
-            Err(self.err.unwrap())
-        }
-    }
-
-    #[allow(non_snake_case)]
-    pub fn Err(msg: &str) -> Self {
-        Self {
-            ok: None,
-            err: Some(msg.to_string()),
-        }
-    }
-}
-
-impl Result<i32> {
+impl Result {
     #[allow(non_snake_case)]
     pub fn Ok() -> Self {
-        Self {
-            ok: Some(1),
-            err: None,
-        }
+        Self { ok: 1 }
+    }
+
+    #[allow(non_snake_case)]
+    pub fn Err() -> Self {
+        Self { ok: 0 }
     }
 }
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ClientAction {
-    pub id: ulid::Ulid,
-    pub action: ClientActions,
-}
-
-impl ClientAction {
-    pub fn new(action: ClientActions) -> Self {
-        Self {
-            id: ulid::Ulid::new(),
-            action,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum ClientActions {
-    OSQuery(String),
-    Shell(String, String),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ServerResponse {
-    pub id: ulid::Ulid,
-    pub response: ServerResponses,
-}
-
-impl ServerResponse {
-    pub fn of(client: &ClientAction, resp: ServerResponses) -> Self {
-        Self {
-            id: client.id,
-            response: resp,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum ServerResponses {
-    OSQuery(String),
-    Shell(ShellResponse),
-}
diff --git a/src/herd.rs b/src/herd.rs
index c45f866..420a16d 100644
--- a/src/herd.rs
+++ b/src/herd.rs
@@ -1,33 +1,25 @@
-use api::ServerResponse;
 use axum::{
     Router,
     routing::{get, post},
 };
 use axum_client_ip::ClientIpSource;
-use dashmap::DashMap;
+use based::auth::User;
 use owl::{prelude::*, set_global_db};
 use rand::RngCore;
 use std::{net::SocketAddr, path::PathBuf};
 mod api;
-use based_auth::User;
 mod herd_core;
 use crate::herd_core::mqtt::{handle_mqtt, listen_to_devices};
+use herd_core::model::Machine;
 use herd_core::{
     config::Config,
-    route::{device_get_api, device_osquery, device_shell_cmd, join_device, login_user},
+    route::{join_device, login_user},
 };
-use herd_core::{model::Machine, route::devices_list};
-use rumqttc::AsyncClient;
 use sage::Identity;
 use tokio::sync::OnceCell;
 
 pub static IDENTITY: OnceCell<Identity> = OnceCell::const_new();
 pub static CONFIG: OnceCell<Config> = OnceCell::const_new();
-pub static MQTT: OnceCell<AsyncClient> = OnceCell::const_new();
-
-pub static ONLINE: OnceCell<DashMap<String, chrono::DateTime<chrono::Utc>>> = OnceCell::const_new();
-pub static DISPATCH: OnceCell<DashMap<String, tokio::sync::oneshot::Sender<ServerResponse>>> =
-    OnceCell::const_new();
 
 fn generate_token() -> String {
     let mut rng = rand::rng();
@@ -52,25 +44,17 @@ async fn main() {
     let config = Config::default();
     let _ = crate::CONFIG.set(config);
 
-    crate::ONLINE.set(DashMap::new()).unwrap();
-    crate::DISPATCH.set(DashMap::new()).unwrap();
-
     let db = Database::filesystem("./herd/db");
     set_global_db!(db);
 
-    let _ = User::create("admin".to_string(), "admin", based_auth::UserRole::Admin).await;
+    let _ = User::create("admin".to_string(), "admin", based::auth::UserRole::Admin).await;
 
     let device = Router::new()
         .route("/join", post(join_device))
         .layer(ClientIpSource::ConnectInfo.into_extension()); // Direct IP
     // .layer(ClientIpSource::XRealIp.into_extension()) // Proxy
 
-    let user = Router::new()
-        .route("/login", post(login_user))
-        .route("/device/{device_id}", get(device_get_api))
-        .route("/device/{device_id}/shell", post(device_shell_cmd))
-        .route("/device/{device_id}/osquery", post(device_osquery))
-        .route("/devices", get(devices_list));
+    let user = Router::new().route("/login", post(login_user));
 
     let app = Router::new().merge(device).merge(user);
 
@@ -79,7 +63,6 @@ async fn main() {
     let (client, eventloop) = api::mqtt_connect("server", &crate::CONFIG.get().unwrap().mqtt);
 
     listen_to_devices(&client).await;
-    crate::MQTT.set(client);
 
     tokio::spawn(async {
         let listener = tokio::net::TcpListener::bind("0.0.0.0:8000").await.unwrap();
diff --git a/src/herd_core/mqtt.rs b/src/herd_core/mqtt.rs
index 2c4b5be..550bac0 100644
--- a/src/herd_core/mqtt.rs
+++ b/src/herd_core/mqtt.rs
@@ -1,17 +1,9 @@
-use std::sync::Arc;
-
 use crate::Machine;
-use crate::api::{ClientAction, ClientActions, ServerResponse};
 use owl::prelude::*;
 use owl::{Serialize, get, query};
 use rumqttc::AsyncClient;
 use sage::PersonaIdentity;
 
-pub fn is_within_80_seconds(time: chrono::DateTime<chrono::Utc>) -> bool {
-    let now = chrono::Utc::now();
-    now.signed_duration_since(time).num_seconds() <= 80
-}
-
 /// Handle herd MQTT
 pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
     log::info!("Received client request from {topic}");
@@ -25,62 +17,18 @@ pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
         .unwrap();
 
     // TODO : check for recency
+    println!("got raw: {}", String::from_utf8(dec.payload).unwrap());
 
     match cat {
         "online" => {
-            if let Some(online) = crate::ONLINE.get().unwrap().get(client) {
-                if !is_within_80_seconds(*online) {
-                    log::info!("Device {client} came back ONLINE");
-                }
-            } else {
-                log::info!("Device {client} went ONLINE");
-            }
-            crate::ONLINE
-                .get()
-                .unwrap()
-                .insert(client.to_string(), chrono::Utc::now());
-        }
-        "respond" => {
-            let resp: ServerResponse = serde_json::from_slice(&dec.payload).unwrap();
-            log::info!("Got response {:?}", resp);
-
-            let (id, entry) = crate::DISPATCH
-                .get()
-                .unwrap()
-                .remove(&resp.id.to_string())
-                .unwrap();
-
-            if entry.send(resp).is_err() {
-                log::error!(
-                    "Could not send back response for action {id}. Probably due to timeout"
-                );
-            }
+            log::info!("Device {client} reported ONLINE");
         }
         _ => {}
     }
 }
 
-pub struct TaskWaiter {
-    pub id: ulid::Ulid,
-    pub recv: tokio::sync::oneshot::Receiver<ServerResponse>,
-}
-
-impl TaskWaiter {
-    pub async fn wait_for(self, timeout: std::time::Duration) -> Option<ServerResponse> {
-        if let Ok(in_time) = tokio::time::timeout(timeout, self.recv).await {
-            return in_time.ok();
-        }
-
-        None
-    }
-}
-
 /// Send a message to a registered `machine`
-pub async fn send_msg(
-    client: &AsyncClient,
-    machine: &Model<Machine>,
-    request: ClientAction,
-) -> TaskWaiter {
+pub async fn send_msg<T: Serialize>(client: &AsyncClient, machine: &Model<Machine>, request: T) {
     let data = serde_json::to_string(&request).unwrap();
     let pk = &machine.read().identity;
     let rec = pk.enc_key().unwrap();
@@ -96,17 +44,6 @@ pub async fn send_msg(
         .publish(topic, rumqttc::QoS::AtMostOnce, true, payload)
         .await
         .unwrap();
-
-    let (sender, recv) = tokio::sync::oneshot::channel();
-    crate::DISPATCH
-        .get()
-        .unwrap()
-        .insert(request.id.to_string(), sender);
-
-    TaskWaiter {
-        id: request.id,
-        recv,
-    }
 }
 
 /// Subscribe to all `device->server` topics
@@ -116,10 +53,6 @@ pub async fn listen_to_device(client: &AsyncClient, machine_id: &str) {
         .subscribe(format!("{machine_id}/online"), rumqttc::QoS::AtMostOnce)
         .await
         .unwrap();
-    client
-        .subscribe(format!("{machine_id}/respond"), rumqttc::QoS::AtMostOnce)
-        .await
-        .unwrap();
 }
 
 /// Subscibe to incoming messages from all registered machines
diff --git a/src/herd_core/route.rs b/src/herd_core/route.rs
index 48e8b54..b9777d1 100644
--- a/src/herd_core/route.rs
+++ b/src/herd_core/route.rs
@@ -1,165 +1,19 @@
-use std::ops::Deref;
-
 use crate::api;
-use crate::api::ClientAction;
-use crate::api::ClientActions;
 use crate::api::JoinResponse;
-use crate::api::LoginParam;
-use crate::api::ShellResponse;
 use crate::herd_core::model::Machine;
-use crate::herd_core::mqtt::listen_to_device;
 use axum::Json;
-use axum::extract::FromRequestParts;
-use axum::extract::Path;
 use axum::http::StatusCode;
 use axum_client_ip::ClientIp;
-use axum_extra::TypedHeader;
-use axum_extra::headers::Authorization;
-use axum_extra::headers::authorization::Bearer;
-use based_auth::APIUser;
-use based_auth::Sessions;
-use based_auth::User;
-use owl::get;
-use owl::prelude::Model;
-use owl::query;
+use based::auth::Sessions;
+use based::auth::User;
 use owl::save;
 use serde::Deserialize;
 use serde_json::json;
-use sheepd::DeviceEntry;
-use sheepd::DeviceList;
 
-use super::mqtt::is_within_80_seconds;
-use super::mqtt::send_msg;
-
-macro_rules! check_admin {
-    ($user:ident) => {
-        if !$user.read().is_admin() {
-            return (
-                StatusCode::UNAUTHORIZED,
-                Json(api::Result::Err("Invalid credentials")),
-            );
-        }
-    };
-}
-
-pub async fn device_osquery(
-    Path(device_id): Path<String>,
-    APIUser(user): APIUser,
-    Json(payload): Json<api::QueryParam>,
-) -> (StatusCode, Json<api::Result<String>>) {
-    check_admin!(user);
-
-    let machine: Option<Model<Machine>> = get!(device_id);
-
-    if let Some(machine) = machine {
-        let resp = send_msg(
-            crate::MQTT.get().unwrap(),
-            &machine,
-            ClientAction::new(ClientActions::OSQuery(payload.query)),
-        )
-        .await;
-        if let Some(resp) = resp.wait_for(std::time::Duration::from_secs(60)).await {
-            let r = match resp.response {
-                api::ServerResponses::OSQuery(res) => res,
-                _ => unreachable!(),
-            };
-            (StatusCode::OK, Json(api::Result::OkVal(r)))
-        } else {
-            (
-                StatusCode::BAD_GATEWAY,
-                Json(api::Result::Err("Did not receive response from device")),
-            )
-        }
-    } else {
-        (StatusCode::NOT_FOUND, Json(api::Result::Err("Not Found")))
-    }
-}
-
-pub async fn device_shell_cmd(
-    Path(device_id): Path<String>,
-    APIUser(user): APIUser,
-    Json(payload): Json<api::ShellParam>,
-) -> (StatusCode, Json<api::Result<ShellResponse>>) {
-    check_admin!(user);
-
-    let machine: Option<Model<Machine>> = get!(device_id);
-
-    if let Some(machine) = machine {
-        let resp = send_msg(
-            crate::MQTT.get().unwrap(),
-            &machine,
-            ClientAction::new(ClientActions::Shell(payload.cmd, payload.cwd)),
-        )
-        .await;
-        if let Some(resp) = resp.wait_for(std::time::Duration::from_secs(60)).await {
-            let r = match resp.response {
-                api::ServerResponses::Shell(shell_response) => shell_response,
-                _ => unreachable!(),
-            };
-            (StatusCode::OK, Json(api::Result::OkVal(r)))
-        } else {
-            (
-                StatusCode::BAD_GATEWAY,
-                Json(api::Result::Err("Did not receive response from device")),
-            )
-        }
-    } else {
-        (StatusCode::NOT_FOUND, Json(api::Result::Err("Not Found")))
-    }
-}
-
-pub async fn device_get_api(
-    Path(device_id): Path<String>,
-    APIUser(user): APIUser,
-) -> (StatusCode, Json<api::Result<DeviceEntry>>) {
-    check_admin!(user);
-
-    let machine: Option<Model<Machine>> = get!(device_id.clone());
-
-    if let Some(machine) = machine {
-        let api = machine.read();
-        let api = DeviceEntry {
-            id: device_id.clone(),
-            hostname: api.hostname.clone(),
-            online: device_online(&device_id),
-        };
-        (StatusCode::OK, Json(api::Result::OkVal(api)))
-    } else {
-        let res = api::Result::<DeviceEntry>::Err("Not Found");
-        (StatusCode::NOT_FOUND, Json(res))
-    }
-}
-
-pub fn device_online(id: &String) -> bool {
-    crate::ONLINE
-        .get()
-        .unwrap()
-        .get(id)
-        .map(|x| is_within_80_seconds(*x.deref()))
-        .unwrap_or(false)
-}
-
-pub async fn devices_list(APIUser(user): APIUser) -> (StatusCode, Json<api::Result<DeviceList>>) {
-    check_admin!(user);
-
-    let machines: Vec<Model<Machine>> = query!(|_| true);
-
-    let mut ret = vec![];
-
-    for mac in machines {
-        let id = mac.read().id.to_string().replace("-", "");
-        let online_state = device_online(&id);
-        ret.push(DeviceEntry {
-            id: id,
-            hostname: mac.read().hostname.clone(),
-            online: online_state,
-        });
-    }
-
-    (
-        StatusCode::OK,
-        Json(api::Result::OkVal(DeviceList { devices: ret })),
-    )
+#[derive(Deserialize)]
+pub struct LoginParam {
+    username: String,
+    password: String,
 }
 
 pub async fn login_user(Json(payload): Json<LoginParam>) -> (StatusCode, Json<serde_json::Value>) {
@@ -167,15 +21,9 @@ pub async fn login_user(Json(payload): Json<LoginParam>) -> (StatusCode, Json<se
     let u = User::find(&payload.username).await.unwrap();
     if u.read().verify_pw(&payload.password) {
         let ses = u.read().session().await;
-        (
-            StatusCode::OK,
-            Json(json!(api::Result::OkVal(ses.read().token.as_str()))),
-        )
+        (StatusCode::OK, Json(json!({"token": ses.read().token})))
     } else {
-        (
-            StatusCode::FORBIDDEN,
-            Json(json!(api::Result::<api::ShellResponse>::Err("invalid"))),
-        )
+        (StatusCode::FORBIDDEN, Json(json!({"error": "invalid"})))
     }
 }
 
@@ -193,11 +41,9 @@ pub async fn join_device(
         payload.machine_id
     );
 
-    let machine = Machine::from_join_param(payload.clone());
+    let machine = Machine::from_join_param(payload);
     let new_token = machine.token.clone();
 
-    listen_to_device(crate::MQTT.get().unwrap(), &payload.machine_id).await;
-
     save!(machine);
 
     let i = crate::IDENTITY.get().unwrap();
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 5614089..0000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod api;
-pub use api::*;
diff --git a/src/sheepctl.rs b/src/sheepctl.rs
deleted file mode 100644
index 2c9bf28..0000000
--- a/src/sheepctl.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use sheepctl_core::{
-    args::{DeviceCommands, SheepctlArgs, SheepctlCommand},
-    cmd::{interactive_shell, list_devices, login, run_osquery},
-};
-
-mod api;
-mod sheepctl_core;
-
-fn main() {
-    let args: SheepctlArgs = argh::from_env();
-
-    match args.command {
-        SheepctlCommand::Device(device_command) => match device_command.command {
-            DeviceCommands::List(list_devices_command) => list_devices(list_devices_command),
-        },
-        SheepctlCommand::Login(login_command) => login(login_command),
-        SheepctlCommand::Shell(shell_command) => interactive_shell(shell_command),
-        SheepctlCommand::Query(query_command) => run_osquery(query_command),
-    }
-}
diff --git a/src/sheepctl_core/args.rs b/src/sheepctl_core/args.rs
deleted file mode 100644
index 09ea27f..0000000
--- a/src/sheepctl_core/args.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use argh::FromArgs;
-
-#[derive(FromArgs)]
-/// Control your herd
-pub struct SheepctlArgs {
-    #[argh(subcommand)]
-    pub command: SheepctlCommand,
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-#[argh(subcommand)]
-pub enum SheepctlCommand {
-    Login(LoginCommand),
-    Device(DeviceCommand),
-    Shell(ShellCommand),
-    Query(QueryCommand),
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-/// Login to a homeserver
-#[argh(subcommand, name = "login")]
-pub struct LoginCommand {
-    #[argh(positional)]
-    /// homeserver
-    pub home: String,
-
-    #[argh(positional)]
-    /// username
-    pub username: String,
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-#[argh(subcommand, name = "device")]
-/// Commands for devices
-pub struct DeviceCommand {
-    #[argh(subcommand)]
-    pub command: DeviceCommands,
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-#[argh(subcommand)]
-pub enum DeviceCommands {
-    List(ListDevicesCommand),
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-/// List devices
-#[argh(subcommand, name = "ls")]
-pub struct ListDevicesCommand {
-    #[argh(switch)]
-    /// only show online devices
-    pub online: bool,
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-#[argh(subcommand, name = "shell")]
-/// Enter interactive shell
-pub struct ShellCommand {
-    #[argh(positional)]
-    /// device ID
-    pub device: String,
-}
-
-#[derive(FromArgs, PartialEq, Debug)]
-#[argh(subcommand, name = "query")]
-/// Run an osquery
-pub struct QueryCommand {
-    #[argh(positional)]
-    /// device ID
-    pub device: String,
-    #[argh(positional)]
-    /// query
-    pub query: String,
-}
diff --git a/src/sheepctl_core/cmd.rs b/src/sheepctl_core/cmd.rs
deleted file mode 100644
index 5812607..0000000
--- a/src/sheepctl_core/cmd.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use std::{io::Write, path::PathBuf};
-
-use owl::{Deserialize, Serialize};
-use sheepd::{DeviceList, LoginParam, ShellResponse};
-
-use super::args::{ListDevicesCommand, LoginCommand, QueryCommand, ShellCommand};
-use crate::api::{DeviceEntry, QueryParam, ShellParam, domain};
-
-/// Make an POST API call to `path` with `data` returning `Result<T>`
-pub fn api_call<T: Serialize + for<'a> Deserialize<'a>, I: Serialize>(
-    server: &str,
-    path: &str,
-    data: I,
-) -> crate::api::Result<T> {
-    let url = format!("{}/{path}", domain(server));
-    let mut res = ureq::post(url).send_json(data).unwrap();
-    let res: crate::api::Result<T> = res.body_mut().read_json().unwrap();
-    res
-}
-
-pub fn api_call_post_auth<T: Serialize + for<'a> Deserialize<'a>, I: Serialize>(
-    server: &str,
-    path: &str,
-    token: &str,
-    data: I,
-) -> crate::api::Result<T> {
-    let url = format!("{}/{path}", domain(server));
-    let mut res = ureq::post(url)
-        .header("Authorization", format!("Bearer {token}"))
-        .send_json(data)
-        .unwrap();
-    let res: crate::api::Result<T> = res.body_mut().read_json().unwrap();
-    res
-}
-
-pub fn api_call_get<T: Serialize + for<'a> Deserialize<'a>>(
-    server: &str,
-    path: &str,
-    token: &str,
-) -> crate::api::Result<T> {
-    let url = format!("{}/{path}", domain(server));
-    let mut res = ureq::get(url)
-        .header("Authorization", format!("Bearer {token}"))
-        .force_send_body()
-        .send_empty()
-        .unwrap();
-    let res: crate::api::Result<T> = res.body_mut().read_json().unwrap();
-    res
-}
-
-fn get_config_path() -> Option<PathBuf> {
-    directories::ProjectDirs::from("de", "Hydrar", "sheepd")
-        .map(|proj_dirs| proj_dirs.config_dir().join("config.toml"))
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CtlConfig {
-    pub home: String,
-    pub token: String,
-}
-
-impl CtlConfig {
-    pub fn load() -> Option<Self> {
-        let c = std::fs::read_to_string(get_config_path()?).ok()?;
-        toml::from_str(&c).ok()
-    }
-
-    pub fn save(&self) {
-        let s = toml::to_string(self).unwrap();
-        let config = get_config_path().unwrap();
-        let _ = std::fs::create_dir_all(config.parent().unwrap());
-        std::fs::write(get_config_path().unwrap(), s).unwrap();
-    }
-}
-
-pub fn get_machine_api(home: &str, token: &str, id: &str) -> Option<DeviceEntry> {
-    let res = api_call_get::<DeviceEntry>(home, &format!("device/{id}"), token);
-    res.as_result().ok()
-}
-
-pub fn list_devices(arg: ListDevicesCommand) {
-    let conf = CtlConfig::load().unwrap();
-
-    if let Ok(devices) = api_call_get::<DeviceList>(&conf.home, "devices", &conf.token).as_result()
-    {
-        println!("Hosts:");
-        for d in devices.devices {
-            println!(
-                "- {} [{}]{}",
-                d.hostname,
-                d.id,
-                if d.online { " [ONLINE]" } else { "" }
-            );
-        }
-    }
-}
-
-pub fn interactive_shell(arg: ShellCommand) {
-    let conf = CtlConfig::load().unwrap();
-    let machine = arg.device;
-
-    if let Some(machine) = get_machine_api(&conf.home, &conf.token, &machine) {
-        if !machine.online {
-            println!("Device not online.");
-            std::process::exit(1);
-        }
-
-        let mut cwd = "/".to_string();
-
-        loop {
-            print!("{} [{}]: {cwd} $ ", machine.hostname, machine.id);
-            std::io::stdout().flush().unwrap();
-            let mut read = String::new();
-            std::io::stdin().read_line(&mut read).unwrap();
-            if read == "exit" {
-                break;
-            }
-
-            if read.starts_with("cd") {
-                let dir = read.trim_start_matches("cd ").trim_end_matches(";");
-                cwd = dir.to_string();
-                continue;
-            }
-
-            let res = api_call_post_auth::<ShellResponse, _>(
-                &conf.home,
-                &format!("device/{}/shell", machine.id),
-                &conf.token,
-                ShellParam {
-                    cmd: read.clone(),
-                    cwd: cwd.clone(),
-                },
-            );
-
-            if let Ok(resp) = res.as_result() {
-                println!("{} #{}\n{}", read, resp.status, resp.stdout);
-
-                if !resp.stderr.is_empty() {
-                    println!("Stderr: {}", resp.stderr);
-                }
-            } else {
-                println!("Command execution failed");
-            }
-        }
-    } else {
-        println!("No device with ID {machine}");
-    }
-}
-
-pub fn run_osquery(args: QueryCommand) {
-    // TODO : sanity checks
-
-    let conf = CtlConfig::load().unwrap();
-    let machine = args.device;
-
-    if let Some(machine) = get_machine_api(&conf.home, &conf.token, &machine) {
-        if !machine.online {
-            println!("Device not online.");
-            std::process::exit(1);
-        }
-
-        let res = api_call_post_auth::<String, _>(
-            &conf.home,
-            &format!("device/{}/osquery", machine.id),
-            &conf.token,
-            QueryParam { query: args.query },
-        );
-
-        if let Ok(res) = res.as_result() {
-            println!("{res}");
-        } else {
-            println!("Error doing query");
-        }
-    } else {
-        println!("No device with ID {machine}");
-    }
-}
-
-pub fn login(arg: LoginCommand) {
-    if let Some(conf) = CtlConfig::load() {
-        println!("You are already logged in to {}", conf.home);
-        std::process::exit(1);
-    }
-
-    let password = inquire::prompt_secret("Password: ").unwrap();
-
-    // login request
-    if let Result::Ok(token) = api_call::<String, _>(
-        &arg.home,
-        "login",
-        LoginParam {
-            username: arg.username,
-            password: password,
-        },
-    )
-    .as_result()
-    {
-        // save token to config
-        CtlConfig {
-            home: arg.home,
-            token,
-        }
-        .save();
-    } else {
-        println!("Login failed");
-    }
-}
diff --git a/src/sheepctl_core/mod.rs b/src/sheepctl_core/mod.rs
deleted file mode 100644
index a786728..0000000
--- a/src/sheepctl_core/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod args;
-pub mod cmd;
diff --git a/src/sheepd_core/cmd.rs b/src/sheepd_core/cmd.rs
index 02f0a0f..8b1c7ec 100644
--- a/src/sheepd_core/cmd.rs
+++ b/src/sheepd_core/cmd.rs
@@ -8,7 +8,14 @@ use crate::{
 };
 
 use super::args::JoinCommand;
-use crate::api::domain;
+
+fn domain(host: &str) -> String {
+    if host.starts_with("http") {
+        return host.to_string();
+    } else {
+        format!("https://{host}")
+    }
+}
 
 /// Join a herd as client
 pub fn join(conf: JoinCommand) {
diff --git a/src/sheepd_core/mqtt.rs b/src/sheepd_core/mqtt.rs
index 59300d0..dea12e6 100644
--- a/src/sheepd_core/mqtt.rs
+++ b/src/sheepd_core/mqtt.rs
@@ -1,11 +1,7 @@
-use std::process::Stdio;
-
 use owl::Serialize;
 use rumqttc::AsyncClient;
 use sage::PersonaIdentity;
 
-use crate::api::{ClientAction, ServerResponse, ServerResponses, ShellResponse};
-
 // Client MQTT
 pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
     //println!("got real raw: {}", String::from_utf8_lossy(&data));
@@ -15,59 +11,15 @@ pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
     );
     let pk = pk.sign_key().unwrap();
     let payload = crate::IDENTITY.get().unwrap().decrypt(&data, &pk).unwrap();
-
-    let action: ClientAction = serde_json::from_slice(&payload.payload).unwrap();
-    log::info!("Got action {action:?}");
-
-    match &action.action {
-        crate::api::ClientActions::OSQuery(query) => {
-            log::info!("Doing osquery with {query}");
-            let res = osquery(&query);
-            send_back(
-                crate::MQTT.get().unwrap(),
-                "respond",
-                ServerResponse::of(&action, ServerResponses::OSQuery(res)),
-            )
-            .await;
-        }
-        crate::api::ClientActions::Shell(cmd, cwd) => {
-            log::info!("Received shell command: {cmd} in {cwd}");
-            let res = std::process::Command::new("sh")
-                .arg("-c")
-                .arg(cmd)
-                .current_dir(cwd)
-                .output()
-                .unwrap();
-            send_back(
-                crate::MQTT.get().unwrap(),
-                "respond",
-                ServerResponse::of(
-                    &action,
-                    ServerResponses::Shell(ShellResponse {
-                        stdout: String::from_utf8_lossy(&res.stdout).to_string(),
-                        stderr: String::from_utf8_lossy(&res.stderr).to_string(),
-                        status: res.status.code().unwrap(),
-                    }),
-                ),
-            )
-            .await;
-        }
-    }
-}
-
-pub fn osquery(query: &str) -> String {
-    let cmd = std::process::Command::new("osqueryi")
-        .arg("--csv")
-        .arg(query)
-        .stdout(Stdio::piped())
-        .output()
-        .unwrap();
-    String::from_utf8(cmd.stdout).unwrap()
+    println!(
+        "got payload {}",
+        String::from_utf8(payload.payload).unwrap()
+    );
 }
 
 /// Send something back to the server on `topic`
-pub async fn send_back<T: Serialize>(client: &AsyncClient, topic: &str, data: T) {
-    let data = serde_json::to_string(&data).unwrap();
+pub async fn send_back<T: Serialize>(client: &AsyncClient, topic: &str, request: T) {
+    let data = serde_json::to_string(&request).unwrap();
 
     let pk = crate::AGENT.get().unwrap();
     let pk = (pk.server_age.clone(), String::new());
@@ -83,7 +35,7 @@ pub async fn send_back<T: Serialize>(client: &AsyncClient, topic: &str, data: T)
         .encrypt(data.as_bytes(), &rec);
     let topic = format!("{machine_id}/{topic}");
 
-    log::info!("Publish to {topic}");
+    log::info!("Publish to {machine_id}{topic}");
     client
         .publish(topic, rumqttc::QoS::AtMostOnce, true, payload)
         .await