diff --git a/.gitignore b/.gitignore
index c9a7c427..6103291d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ node_modules
 .env.test.local
 .env.production.local
 
+.idea/
+
 # Testing
 coverage
 
diff --git a/.patches/connectcheckskip.patch b/.patches/connectcheckskip.patch
deleted file mode 100644
index 01b25ad2..00000000
--- a/.patches/connectcheckskip.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/utils.c b/src/utils.c
-index e00f3c5..4f1f0bf 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -71,7 +71,7 @@ void for_each_active_monitor_output_x11(Display *display, active_monitor_callbac
-     char display_name[256];
-     for(int i = 0; i < screen_res->noutput; ++i) {
-         XRROutputInfo *out_info = XRRGetOutputInfo(display, screen_res, screen_res->outputs[i]);
--        if(out_info && out_info->crtc && out_info->connection == RR_Connected) {
-+        if(out_info && out_info->crtc) {
-             XRRCrtcInfo *crt_info = XRRGetCrtcInfo(display, screen_res, out_info->crtc);
-             if(crt_info && crt_info->mode) {
-                 const XRRModeInfo *mode_info = get_mode_info(screen_res, crt_info->mode);
-@@ -218,10 +218,10 @@ static void for_each_active_monitor_output_drm(const gsr_egl *egl, active_monito
-             if(connector_type)
-                 ++connector_type->count;
- 
--            if(connector->connection != DRM_MODE_CONNECTED) {
--                drmModeFreeConnector(connector);
--                continue;
--            }
-+            //if(connector->connection != DRM_MODE_CONNECTED) {
-+            //    drmModeFreeConnector(connector);
-+            //    continue;
-+            //}
- 
-             if(connector_type)
-                 ++connector_type->count_active;
diff --git a/.patches/devicearg.patch b/.patches/devicearg.patch
deleted file mode 100644
index 12fd803c..00000000
--- a/.patches/devicearg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 112a6ac..57bd9bf 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -1906,6 +1906,7 @@ int main(int argc, char **argv) {
-         { "-gopm", Arg { {}, true, false } }, // deprecated, used keyint instead
-         { "-keyint", Arg { {}, true, false } },
-         { "-encoder", Arg { {}, true, false } },
-+        { "-device", Arg { {}, true, false } },
-     };
- 
-     for(int i = 1; i < argc; i += 2) {
-@@ -2226,6 +2227,10 @@ int main(int argc, char **argv) {
-         overclock = false;
-     }
- 
-+    const char *dri_device = args["-device"].value();
-+    if (dri_device)
-+        egl.dri_card_path = dri_device;
-+
-     egl.card_path[0] = '\0';
-     if(wayland || egl.gpu_info.vendor != GSR_GPU_VENDOR_NVIDIA) {
-         // TODO: Allow specifying another card, and in other places
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000..b28e9ec9
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,3750 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "asn1-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+dependencies = [
+ "asn1-rs-derive 0.4.0",
+ "asn1-rs-impl 0.1.0",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 1.0.66",
+]
+
+[[package]]
+name = "asn1-rs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
+dependencies = [
+ "asn1-rs-derive 0.5.1",
+ "asn1-rs-impl 0.2.0",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 1.0.66",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure 0.12.6",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45"
+dependencies = [
+ "aws-lc-sys",
+ "mirai-annotations",
+ "paste",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+ "libc",
+ "paste",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.87",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "ccm"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847"
+dependencies = [
+ "aead",
+ "cipher",
+ "ctr",
+ "subtle",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c360837f8f19e2e4468275138f1c0dec1647d1e17bb7c0215fe3cd7530e93c25"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+
+[[package]]
+name = "cmake"
+version = "0.1.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "der-parser"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+dependencies = [
+ "asn1-rs 0.5.2",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "der-parser"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
+dependencies = [
+ "asn1-rs 0.6.2",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "dev"
+version = "0.1.0"
+dependencies = [
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tokio",
+ "webrtc",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[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 = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
+[[package]]
+name = "flate2"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "gio-sys"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "glib"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+dependencies = [
+ "bitflags 2.6.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+dependencies = [
+ "heck",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gobject-sys"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "gstreamer"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "cfg-if",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "glib",
+ "gstreamer-sys",
+ "itertools 0.13.0",
+ "kstring",
+ "libc",
+ "muldiv",
+ "num-integer",
+ "num-rational",
+ "option-operations",
+ "paste",
+ "pin-project-lite",
+ "smallvec",
+ "thiserror 2.0.3",
+]
+
+[[package]]
+name = "gstreamer-app"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "glib",
+ "gstreamer",
+ "gstreamer-app-sys",
+ "gstreamer-base",
+ "libc",
+]
+
+[[package]]
+name = "gstreamer-app-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "glib-sys",
+ "gstreamer-base-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-base"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "atomic_refcell",
+ "cfg-if",
+ "glib",
+ "gstreamer",
+ "gstreamer-base-sys",
+ "libc",
+]
+
+[[package]]
+name = "gstreamer-base-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+dependencies = [
+ "cfg-if",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+
+[[package]]
+name = "hyper"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "interceptor"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4705c00485029e738bea8c9505b5ddb1486a8f3627a953e1e77e6abdf5eef90c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "log",
+ "portable-atomic",
+ "rand",
+ "rtcp",
+ "rtp",
+ "thiserror 1.0.66",
+ "tokio",
+ "waitgroup",
+ "webrtc-srtp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kstring"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "mirai-annotations"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
+
+[[package]]
+name = "muldiv"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nestri-server"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "clap",
+ "flate2",
+ "futures-util",
+ "gstreamer",
+ "gstreamer-app",
+ "log",
+ "num-derive",
+ "num-traits",
+ "rand",
+ "regex",
+ "rustls",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-tungstenite",
+ "tokio-util",
+ "webrtc",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.36.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
+dependencies = [
+ "asn1-rs 0.6.2",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "openssl"
+version = "0.10.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-operations"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
+dependencies = [
+ "paste",
+]
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "p384"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+dependencies = [
+ "pem",
+ "ring",
+ "rustls-pki-types",
+ "time",
+ "x509-parser",
+ "yasna",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[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.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rtcp"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
+dependencies = [
+ "bytes",
+ "thiserror 1.0.66",
+ "webrtc-util",
+]
+
+[[package]]
+name = "rtp"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6870f09b5db96f8b9e7290324673259fd15519ebb7d55acf8e7eb044a9ead6af"
+dependencies = [
+ "bytes",
+ "portable-atomic",
+ "rand",
+ "serde",
+ "thiserror 1.0.66",
+ "webrtc-util",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
+dependencies = [
+ "aws-lc-rs",
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "aws-lc-rs",
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "schannel"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sdp"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
+dependencies = [
+ "rand",
+ "substring",
+ "thiserror 1.0.66",
+ "url",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "smol_str"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "stun"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b"
+dependencies = [
+ "base64 0.21.7",
+ "crc",
+ "lazy_static",
+ "md-5",
+ "rand",
+ "ring",
+ "subtle",
+ "thiserror 1.0.66",
+ "tokio",
+ "url",
+ "webrtc-util",
+]
+
+[[package]]
+name = "substring"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-xid",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+dependencies = [
+ "thiserror-impl 1.0.66",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.41.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[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.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
+dependencies = [
+ "futures-util",
+ "log",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tungstenite",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[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.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "native-tls",
+ "rand",
+ "sha1",
+ "thiserror 1.0.66",
+ "utf-8",
+]
+
+[[package]]
+name = "turn"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b000cebd930420ac1ed842c8128e3b3412512dfd5b82657eab035a3f5126acc"
+dependencies = [
+ "async-trait",
+ "base64 0.21.7",
+ "futures",
+ "log",
+ "md-5",
+ "portable-atomic",
+ "rand",
+ "ring",
+ "stun",
+ "thiserror 1.0.66",
+ "tokio",
+ "tokio-util",
+ "webrtc-util",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "waitgroup"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292"
+dependencies = [
+ "atomic-waker",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "web-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webrtc"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b3a840e31c969844714f93b5a87e73ee49f3bc2a4094ab9132c69497eb31db"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "cfg-if",
+ "hex",
+ "interceptor",
+ "lazy_static",
+ "log",
+ "portable-atomic",
+ "rand",
+ "rcgen",
+ "regex",
+ "ring",
+ "rtcp",
+ "rtp",
+ "rustls",
+ "sdp",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smol_str",
+ "stun",
+ "thiserror 1.0.66",
+ "time",
+ "tokio",
+ "turn",
+ "url",
+ "waitgroup",
+ "webrtc-data",
+ "webrtc-dtls",
+ "webrtc-ice",
+ "webrtc-mdns",
+ "webrtc-media",
+ "webrtc-sctp",
+ "webrtc-srtp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-data"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b7c550f8d35867b72d511640adf5159729b9692899826fe00ba7fa74f0bf70"
+dependencies = [
+ "bytes",
+ "log",
+ "portable-atomic",
+ "thiserror 1.0.66",
+ "tokio",
+ "webrtc-sctp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-dtls"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86e5eedbb0375aa04da93fc3a189b49ed3ed9ee844b6997d5aade14fc3e2c26e"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "async-trait",
+ "bincode",
+ "byteorder",
+ "cbc",
+ "ccm",
+ "der-parser 8.2.0",
+ "hkdf",
+ "hmac",
+ "log",
+ "p256",
+ "p384",
+ "portable-atomic",
+ "rand",
+ "rand_core",
+ "rcgen",
+ "ring",
+ "rustls",
+ "sec1",
+ "serde",
+ "sha1",
+ "sha2",
+ "subtle",
+ "thiserror 1.0.66",
+ "tokio",
+ "webrtc-util",
+ "x25519-dalek",
+ "x509-parser",
+]
+
+[[package]]
+name = "webrtc-ice"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4f0ca6d4df8d1bdd34eece61b51b62540840b7a000397bcfb53a7bfcf347c8"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "crc",
+ "log",
+ "portable-atomic",
+ "rand",
+ "serde",
+ "serde_json",
+ "stun",
+ "thiserror 1.0.66",
+ "tokio",
+ "turn",
+ "url",
+ "uuid",
+ "waitgroup",
+ "webrtc-mdns",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-mdns"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
+dependencies = [
+ "log",
+ "socket2",
+ "thiserror 1.0.66",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-media"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c15b20e98167b22949abc1c20eca7c6d814307d187068fe7a48f0b87a4f6d46"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "rand",
+ "rtp",
+ "thiserror 1.0.66",
+]
+
+[[package]]
+name = "webrtc-sctp"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d850daa68639b9d7bb16400676e97525d1e52b15b4928240ae2ba0e849817a5"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "crc",
+ "log",
+ "portable-atomic",
+ "rand",
+ "thiserror 1.0.66",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-srtp"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbec5da43a62c228d321d93fb12cc9b4d9c03c9b736b0c215be89d8bd0774cfe"
+dependencies = [
+ "aead",
+ "aes",
+ "aes-gcm",
+ "byteorder",
+ "bytes",
+ "ctr",
+ "hmac",
+ "log",
+ "rtcp",
+ "rtp",
+ "sha1",
+ "subtle",
+ "thiserror 1.0.66",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-util"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e"
+dependencies = [
+ "async-trait",
+ "bitflags 1.3.2",
+ "bytes",
+ "ipnet",
+ "lazy_static",
+ "libc",
+ "log",
+ "nix",
+ "portable-atomic",
+ "rand",
+ "thiserror 1.0.66",
+ "tokio",
+ "winapi",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core",
+ "serde",
+ "zeroize",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
+dependencies = [
+ "asn1-rs 0.6.2",
+ "data-encoding",
+ "der-parser 9.0.0",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "ring",
+ "rusticata-macros",
+ "thiserror 1.0.66",
+ "time",
+]
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..c99fb87b
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,16 @@
+[workspace]
+resolver = "2"
+members = [
+    "packages/server",
+    "packages/relay/dev"
+]
+
+[workspace.package]
+version = "0.1.0-alpha.1"
+repository = "https://github.com/nestriness/nestri"
+edition = "2021"
+rust-version = "1.80"
+
+[workspace.dependencies]
+gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", version = "0.24.0" }
+gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", version = "0.24.0" }
diff --git a/Containerfile.master b/Containerfile.master
new file mode 100644
index 00000000..14777233
--- /dev/null
+++ b/Containerfile.master
@@ -0,0 +1,206 @@
+#! Runs the docker server that handles everything else
+#******************************************************************************
+#                                                                          base
+#******************************************************************************
+FROM archlinux:base-20241027.0.273886 AS base
+# How to run -  docker run -it --rm --device /dev/dri nestri /bin/bash - DO NOT forget the ports
+# TODO: Migrate XDG_RUNTIME_DIR to /run/user/1000
+# TODO: Add nestri-server to pulseaudio.conf
+# TODO: Add our own entrypoint, with our very own zombie ripper 🧟🏾‍♀️
+# FIXME: Add user root to `pulse-access` group as well :D
+# TODO: Test the whole damn thing
+
+# Update the pacman repo
+RUN \
+    pacman -Syu --noconfirm
+
+#******************************************************************************
+#                                                                       builder
+#******************************************************************************
+
+FROM base AS builder
+
+RUN \
+    pacman -Su --noconfirm \
+    base-devel \
+    git \
+    sudo \
+    vim
+
+WORKDIR /scratch
+
+# Allow nobody user to invoke pacman to install packages (as part of makepkg) and modify the system.
+# This should never exist in a running image, just used by *-build Docker stages.
+RUN \
+  echo "nobody ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers;
+
+ENV ARTIFACTS=/artifacts \
+    CARGO_TARGET_DIR=/build
+
+RUN \
+  mkdir -p /artifacts \
+  && mkdir -p /build
+  
+RUN \
+  chgrp nobody /scratch /artifacts /build \
+  && chmod g+ws /scratch /artifacts /build
+
+#******************************************************************************
+#                                                                  rust-builder
+#******************************************************************************
+
+FROM builder AS rust-builder
+
+RUN \
+    pacman -Su --noconfirm \
+    rustup
+
+RUN \
+    rustup default stable
+
+#******************************************************************************
+#                                                         nestri-server-builder
+#******************************************************************************
+# Builds nestri server binary
+FROM rust-builder AS nestri-server-builder
+
+RUN \
+    pacman -Su --noconfirm \
+    wayland \
+	vpl-gpu-rt \
+	gstreamer \
+	gst-plugin-va \
+	gst-plugins-base \
+	gst-plugins-good \
+	mesa-utils \
+	weston \
+	xorg-xwayland
+
+
+#******************************************************************************
+#                                                          nestri-server-build
+#******************************************************************************
+
+FROM nestri-server-builder AS nestri-server-build
+
+#Allow makepkg to be run as nobody.
+RUN chgrp -R nobody /scratch && chmod -R g+ws /scratch
+
+# USER nobody
+
+# Perform the server build.
+WORKDIR /scratch/server
+
+RUN \
+    git clone https://github.com/nestriness/nestri
+
+WORKDIR /scratch/server/nestri
+
+RUN \
+    git checkout feat/stream \
+    && cargo build -j$(nproc) --release
+
+# COPY packages/server/build/ /scratch/server/
+
+# RUN makepkg && cp *.zst "$ARTIFACTS"
+#******************************************************************************
+#                                                             runtime_base_pkgs
+#******************************************************************************
+
+FROM base AS runtime_base_pkgs
+
+COPY --from=nestri-server-build /build/release/nestri-server /usr/bin/
+
+#******************************************************************************
+#                                                                  runtime_base
+#******************************************************************************
+
+FROM runtime_base_pkgs AS runtime_base
+
+RUN \
+    pacman -Su --noconfirm \
+    weston \
+    sudo \
+    xorg-xwayland \
+    gstreamer \
+    gst-plugins-base \
+    gst-plugins-good \
+    gst-plugin-qsv \
+    gst-plugin-va \
+    gst-plugin-fmp4 \
+    mesa \
+    # Grab GPU encoding packages
+    # Intel (modern VPL + VA-API)
+    vpl-gpu-rt \
+    intel-media-driver \
+    # AMD/ATI (VA-API)
+    libva-mesa-driver \
+    # NVIDIA (proprietary)
+    nvidia-utils \
+    # Audio
+    pulseaudio \
+    # Supervisor
+    supervisor
+    
+RUN \
+    # Set up our non-root user $(nestri)
+    groupadd -g 1000 nestri \
+    && useradd -ms /bin/bash nestri -u 1000 -g 1000  \
+    && passwd -d nestri \
+    # Setup Pulseaudio
+    && useradd -d /var/run/pulse -s /usr/bin/nologin -G audio pulse \
+    && groupadd pulse-access \
+    && usermod -aG audio,input,render,video,pulse-access nestri \
+    && echo "nestri ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
+    && echo "Users created" \
+    # Create an empty machine-id file
+    && touch /etc/machine-id
+
+ENV \
+    XDG_RUNTIME_DIR=/tmp
+
+#******************************************************************************
+#                                                                       runtime
+#******************************************************************************
+
+FROM runtime_base AS runtime
+# Setup supervisor #
+RUN <<-EOF
+    echo -e "
+        [supervisord]
+        user=root
+        nodaemon=true
+        loglevel=info
+        logfile=/tmp/supervisord.log
+        pidfile=/tmp/supervisord.pid
+
+        [program:dbus]
+        user=root
+        command=dbus-daemon --system --nofork
+        logfile=/tmp/dbus.log
+        pidfile=/tmp/dbus.pid
+        stopsignal=INT
+        autostart=true
+        autorestart=true
+        priority=1
+
+        [program:pulseaudio]
+        user=root
+        command=pulseaudio --daemonize=no --system --disallow-module-loading --disallow-exit --exit-idle-time=-1
+        logfile=/tmp/pulseaudio.log
+        pidfile=/tmp/pulseaudio.pid
+        stopsignal=INT
+        autostart=true
+        autorestart=true
+        priority=10
+    " | tee /etc/supervisord.conf
+EOF
+
+RUN \
+    chown -R nestri:nestri /tmp /etc/supervisord.conf
+
+ENV USER=nestri
+USER 1000
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+# Debug - pactl list
\ No newline at end of file
diff --git a/Containerfile.relay b/Containerfile.relay
new file mode 100644
index 00000000..ee36a64e
--- /dev/null
+++ b/Containerfile.relay
@@ -0,0 +1,20 @@
+FROM docker.io/golang:1.23-alpine AS go-build
+WORKDIR /builder
+COPY packages/relay/ /builder/
+RUN go build
+
+FROM docker.io/golang:1.23-alpine
+COPY --from=go-build /builder/relay /relay/relay
+WORKDIR /relay
+
+# ENV flags
+ENV VERBOSE=false
+ENV ENDPOINT_PORT=8088
+ENV WEBRTC_UDP_START=10000
+ENV WEBRTC_UDP_END=20000
+ENV STUN_SERVER="stun.l.google.com:19302"
+
+EXPOSE $ENDPOINT_PORT
+EXPOSE $WEBRTC_UDP_START-$WEBRTC_UDP_END/udp
+
+ENTRYPOINT ["/relay/relay"]
\ No newline at end of file
diff --git a/Containerfile.runner b/Containerfile.runner
new file mode 100644
index 00000000..db0bfb0b
--- /dev/null
+++ b/Containerfile.runner
@@ -0,0 +1,219 @@
+# Container build arguments #
+ARG BASE_IMAGE=docker.io/cachyos/cachyos-v3:latest
+
+#******************************************************************************
+#                                                                   gst-builder
+#******************************************************************************
+FROM ${BASE_IMAGE} AS gst-builder
+WORKDIR /builder/
+
+# Grab build and rust packages #
+RUN pacman -Syu --noconfirm meson pkgconf cmake git gcc make rustup \
+	gstreamer gst-plugins-base gst-plugins-good
+
+# Setup stable rust toolchain #
+RUN rustup default stable
+# Clone nestri source #
+RUN git clone -b feat/stream https://github.com/nestriness/nestri.git
+
+# Build nestri #
+RUN cd nestri/packages/server/ && \
+    cargo build --release
+
+#******************************************************************************
+#                                                            gstwayland-builder
+#******************************************************************************
+FROM ${BASE_IMAGE} AS gstwayland-builder
+WORKDIR /builder/
+
+# Grab build and rust packages #
+RUN pacman -Syu --noconfirm meson pkgconf cmake git gcc make rustup \
+	libxkbcommon wayland gstreamer gst-plugins-base gst-plugins-good libinput
+
+# Setup stable rust toolchain #
+RUN rustup default stable
+# Build required cargo-c package #
+RUN cargo install cargo-c
+# Clone gst plugin source #
+RUN git clone https://github.com/games-on-whales/gst-wayland-display.git
+
+# Build gst plugin #
+RUN mkdir plugin && \
+	cd gst-wayland-display && \
+	cargo cinstall --prefix=/builder/plugin/
+
+
+#******************************************************************************
+#                                                                       runtime
+#******************************************************************************
+FROM ${BASE_IMAGE} AS runtime
+
+## Nestri Env Variables ##
+ENV NESTRI_PARAMS=""
+ENV RESOLUTION="1280x720"
+
+## Install Graphics, Media, and Audio packages ##
+RUN pacman -Syu --noconfirm --needed \
+    # Graphics packages
+    sudo mesa mesa-utils xorg-xwayland labwc wlr-randr mangohud \
+    # Vulkan drivers
+    vulkan-intel vulkan-radeon nvidia-utils \
+    # Media encoding packages
+    vpl-gpu-rt intel-media-driver libva-utils \
+    # GStreamer plugins
+    gstreamer gst-plugins-base gst-plugins-good \
+    gst-plugin-va gst-plugins-bad gst-plugin-fmp4 \
+    gst-plugin-qsv gst-plugin-pipewire gst-plugin-rswebrtc \
+    gst-plugins-ugly gst-plugin-rsrtp \
+    # Audio packages
+    pipewire pipewire-pulse pipewire-alsa wireplumber \
+    # Other requirements
+    supervisor \
+    # Custom
+    umu-launcher && \
+    # Clean up pacman cache and unnecessary files
+    pacman -Scc --noconfirm && \
+    rm -rf /var/cache/pacman/pkg/* /tmp/* /var/tmp/* && \
+    # Optionally clean documentation, man pages, and locales
+    find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name "en*" -exec rm -rf {} + && \
+    rm -rf /usr/share/doc /usr/share/man /usr/share/info
+
+
+## User ##
+# Create and setup user #
+ENV USER="nestri" \
+	UID=99 \
+	GID=100 \
+	USER_PASSWORD="nestri1234" \
+	USER_HOME="/home/nestri"
+
+RUN mkdir -p ${USER_HOME} && \
+	useradd -d ${USER_HOME} -u ${UID} -s /bin/bash ${USER} && \
+	chown -R ${USER} ${USER_HOME} && \
+	echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+	echo "${USER}:${USER_PASSWORD}" | chpasswd
+
+# Run directory #
+RUN mkdir -p /run/user/${UID} && \
+	chown ${USER}:${USER} /run/user/${UID}
+
+# Home config directory #
+RUN mkdir -p ${USER_HOME}/.config && \
+    chown ${USER}:${USER} ${USER_HOME}/.config
+
+# Groups #
+RUN usermod -aG input root && usermod -aG input ${USER} && \
+    usermod -aG video root && usermod -aG video ${USER} && \
+    usermod -aG render root && usermod -aG render ${USER}
+
+## Copy files from builders ##
+# this is done here at end to not trigger full rebuild on changes to builder
+# nestri
+COPY --from=gst-builder /builder/nestri/target/release/nestri-server /usr/bin/nestri-server
+# gstwayland
+COPY --from=gstwayland-builder /builder/plugin/include/libgstwaylanddisplay /usr/include/
+COPY --from=gstwayland-builder /builder/plugin/lib/*libgstwayland* /usr/lib/
+COPY --from=gstwayland-builder /builder/plugin/lib/gstreamer-1.0/libgstwayland* /usr/lib/gstreamer-1.0/
+COPY --from=gstwayland-builder /builder/plugin/lib/pkgconfig/gstwayland* /usr/lib/pkgconfig/
+COPY --from=gstwayland-builder /builder/plugin/lib/pkgconfig/libgstwayland* /usr/lib/pkgconfig/
+
+## Copy scripts ##
+COPY packages/scripts/ /etc/nestri/
+
+## Startup ##
+# Setup supervisor #
+RUN <<-EOF
+echo -e "
+[supervisord]
+user=root
+nodaemon=true
+loglevel=info
+logfile=/tmp/supervisord.log
+
+[program:dbus]
+user=root
+command=dbus-daemon --system --nofork --nopidfile
+logfile=/tmp/dbus.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=1
+
+[program:seatd]
+user=root
+command=seatd
+logfile=/tmp/seatd.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=2
+
+[program:pipewire]
+user=nestri
+command=dbus-launch pipewire
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\"
+logfile=/tmp/pipewire.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=10
+
+[program:pipewire-pulse]
+user=nestri
+command=dbus-launch pipewire-pulse
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\"
+logfile=/tmp/pipewire-pulse.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=20
+
+[program:wireplumber]
+user=nestri
+command=dbus-launch wireplumber
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\"
+logfile=/tmp/wireplumber.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=30
+
+[program:nestri-server]
+user=nestri
+command=sh -c 'nestri-server \$NESTRI_PARAMS'
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\"
+logfile=/tmp/nestri-server.log
+autoerestart=true
+autostart=true
+startretries=3
+priority=50
+
+[program:labwc]
+user=nestri
+command=sh -c 'sleep 4 && rm -rf /tmp/.X11-unix && mkdir -p /tmp/.X11-unix && chown nestri:nestri /tmp/.X11-unix && labwc'
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\",WAYLAND_DISPLAY=\"wayland-1\",WLR_BACKENDS=\"wayland\",WLR_RENDERER=\"vulkan\"
+logfile=/tmp/labwc.log
+autoerestart=true
+autostart=true
+startretries=5
+priority=60
+
+[program:wlrrandr]
+user=nestri
+command=sh -c 'sleep 6 && wlr-randr --output WL-1 --custom-mode \$RESOLUTION && read -n 1'
+environment=XDG_RUNTIME_DIR=\"/run/user/${UID}\",HOME=\"${USER_HOME}\",WAYLAND_DISPLAY=\"wayland-0\"
+logfile=/tmp/wlrrandr.log
+autoerestart=true
+autostart=true
+startretries=10
+priority=70
+" | tee /etc/supervisord.conf
+EOF
+
+# Wireplumber disable suspend #
+# Remove suspend node
+RUN sed -z -i 's/{[[:space:]]*name = node\/suspend-node\.lua,[[:space:]]*type = script\/lua[[:space:]]*provides = hooks\.node\.suspend[[:space:]]*}[[:space:]]*//g' /usr/share/wireplumber/wireplumber.conf
+# Remove "hooks.node.suspend" want
+RUN sed -i '/wants = \[/{s/hooks\.node\.suspend\s*//; s/,\s*\]/]/}' /usr/share/wireplumber/wireplumber.conf
+
+ENTRYPOINT ["supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/apps/docs/README.md b/apps/docs/README.md
deleted file mode 100644
index 95051065..00000000
--- a/apps/docs/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Docus
-
-## Setup
-
-Install dependencies:
-
-```bash
-npm install
-```
-
-## Development
-
-```bash
-npm run dev
-```
-
-## Edge Side Rendering
-
-Can be deployed to Vercel Functions, Netlify Functions, AWS, and most Node-compatible environments.
-
-Look at all the available presets [here](https://v3.nuxtjs.org/guide/deploy/presets).
-
-```bash
-npm build
-```
-
-## Static Generation
-
-Use the `generate` command to build your application.
-
-The HTML files will be generated in the .output/public directory and ready to be deployed to any static compatible hosting.
-
-```bash
-npm run generate
-```
-
-## Preview build
-
-You might want to preview the result of your build locally, to do so, run the following command:
-
-```bash
-yarn preview
-```
-
----
-
-For a detailed explanation of how things work, check out [Docus](https://docus.dev).
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 261a83cc..27f773e5 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "nuxi dev",
+    "nestri.dev": "nuxi dev",
     "build": "nuxi build",
     "generate": "nuxi generate",
     "preview": "nuxi preview",
diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json
index ad2f8d27..59e048dc 100644
--- a/apps/docs/tsconfig.json
+++ b/apps/docs/tsconfig.json
@@ -1,4 +1,4 @@
 {
-  "extends": "./.nuxt/tsconfig.json",
+  // "extends": "./.nuxt/tsconfig.json",
   "ignoreConfigErrors": true
 }
diff --git a/apps/www/adapters/deno/vite.config.ts b/apps/www/adapters/deno/vite.config.ts
new file mode 100644
index 00000000..bc45d6aa
--- /dev/null
+++ b/apps/www/adapters/deno/vite.config.ts
@@ -0,0 +1,23 @@
+import { denoServerAdapter } from "@builder.io/qwik-city/adapters/deno-server/vite";
+import { extendConfig } from "@builder.io/qwik-city/vite";
+import baseConfig from "../../vite.config";
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ["src/entry.deno.ts", "@qwik-city-plan"],
+      },
+      minify: false,
+    },
+    plugins: [
+      denoServerAdapter({
+        ssg: {
+          include: ["/*"],
+          origin: "https://yoursite.dev",
+        },
+      }),
+    ],
+  };
+});
diff --git a/apps/www/package.json b/apps/www/package.json
index 7e56b847..b4d9828e 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -16,6 +16,7 @@
     "build.client": "vite build",
     "build.preview": "vite build --ssr src/entry.preview.tsx",
     "build.server": "vite build -c adapters/cloudflare-pages/vite.config.ts",
+    "deno:build.server": "vite build -c adapters/deno/vite.config.ts",
     "build.types": "tsc --incremental --noEmit",
     "deploy": "wrangler pages deploy ./dist",
     "dev": "vite --mode ssr",
@@ -25,6 +26,7 @@
     "lint": "eslint \"src/**/*.ts*\"",
     "preview": "qwik build preview && vite preview --open",
     "serve": "wrangler pages dev ./dist --compatibility-flags=nodejs_als",
+    "deno:serve": "deno run --allow-net --allow-read --allow-env server/entry.deno.js",
     "start": "vite --open --mode ssr",
     "qwik": "qwik"
   },
@@ -34,7 +36,8 @@
     "@builder.io/qwik-react": "0.5.0",
     "@modular-forms/qwik": "^0.27.0",
     "@nestri/eslint-config": "*",
-    "@nestri/moq": "*",
+    "@nestri/input": "*",
+    "@nestri/libmoq": "*",
     "@nestri/typescript-config": "*",
     "@nestri/ui": "*",
     "@types/eslint": "8.56.10",
@@ -54,5 +57,9 @@
     "vite": "5.3.5",
     "vite-tsconfig-paths": "^4.2.1",
     "wrangler": "^3.0.0"
+  },
+  "dependencies": {
+    "@types/pako": "^2.0.3",
+    "pako": "^2.1.0"
   }
 }
diff --git a/apps/www/src/entry.deno.ts b/apps/www/src/entry.deno.ts
new file mode 100644
index 00000000..96a4d5d2
--- /dev/null
+++ b/apps/www/src/entry.deno.ts
@@ -0,0 +1,45 @@
+/*
+ * WHAT IS THIS FILE?
+ *
+ * It's the entry point for the Deno HTTP server when building for production.
+ *
+ * Learn more about the Deno integration here:
+ * - https://qwik.dev/docs/deployments/deno/
+ * - https://docs.deno.com/runtime/tutorials/http_server
+ *
+ */
+import { createQwikCity } from "@builder.io/qwik-city/middleware/deno";
+import qwikCityPlan from "@qwik-city-plan";
+import { manifest } from "@qwik-client-manifest";
+import render from "./entry.ssr";
+
+// Create the Qwik City Deno middleware
+const { router, notFound, staticFile } = createQwikCity({
+  render,
+  qwikCityPlan,
+  manifest,
+});
+
+// Allow for dynamic port
+const port = Number(Deno.env.get("PORT") ?? 3009);
+
+/* eslint-disable */
+console.log(`Server starter: http://localhost:${port}/app/`);
+
+Deno.serve({ port }, async (request: Request, info: any) => {
+  const staticResponse = await staticFile(request);
+  if (staticResponse) {
+    return staticResponse;
+  }
+
+  // Server-side render this request with Qwik City
+  const qwikCityResponse = await router(request, info);
+  if (qwikCityResponse) {
+    return qwikCityResponse;
+  }
+
+  // Path not found
+  return notFound(request);
+});
+
+declare const Deno: any;
diff --git a/apps/www/src/root.tsx b/apps/www/src/root.tsx
index b9f71f3a..b7851bae 100644
--- a/apps/www/src/root.tsx
+++ b/apps/www/src/root.tsx
@@ -34,7 +34,7 @@ export default component$(() => {
           <RouterHead />
         </head>
         <body
-          class="bg-gray-100 text-gray-950 dark:bg-gray-900 dark:text-gray-50 font-body flex min-h-[100dvh] flex-col overflow-x-hidden antialiased"
+          class="bg-gray-100 text-gray-950 dark:bg-gray-900 dark:text-gray-50 font-body flex flex-col items-center justify-center overflow-x-hidden antialiased"
           lang="en">
           <RouterOutlet />
           {/* {!isDev && <ServiceWorkerRegister />} */}
diff --git a/apps/www/src/routes/(moq)/moq/checker/index.tsx b/apps/www/src/routes/(moq)/moq/checker/index.tsx
index aee03dc5..612f2666 100644
--- a/apps/www/src/routes/(moq)/moq/checker/index.tsx
+++ b/apps/www/src/routes/(moq)/moq/checker/index.tsx
@@ -1,5 +1,6 @@
 import * as v from "valibot"
-import { Broadcast } from "./tester";
+//FIXME: Make sure this works
+// import { Broadcast } from "./tester";
 import { cn } from "@nestri/ui/design";
 import { routeLoader$ } from "@builder.io/qwik-city";
 import { component$, $, useSignal } from "@builder.io/qwik";
@@ -36,11 +37,11 @@ export default component$(() => {
 
     const handleSubmit = $<SubmitHandler<Form>>(async (values) => {
         const randomNamespace = generateRandomWord(6);
-        const sub = await Broadcast.init({ url: values.url, fingerprint: undefined, namespace: randomNamespace })
+        // const sub = await Broadcast.init({ url: values.url, fingerprint: undefined, namespace: randomNamespace })
 
-        setTimeout(() => {
-            broadcasterOk.value = sub.isSubscribed()
-        }, 1000);
+        // setTimeout(() => {
+        //     broadcasterOk.value = sub.isSubscribed()
+        // }, 1000);
     });
 
     return (
diff --git a/apps/www/src/routes/(moq)/moq/checker/tester.ts b/apps/www/src/routes/(moq)/moq/checker/tester.ts
index 11446ea8..09cca337 100644
--- a/apps/www/src/routes/(moq)/moq/checker/tester.ts
+++ b/apps/www/src/routes/(moq)/moq/checker/tester.ts
@@ -1,208 +1,208 @@
-import type { Connection, SubscribeRecv } from "@nestri/moq/transport"
-import { asError } from "@nestri/moq/common/error"
-import { Client } from "@nestri/moq/transport/client"
-import * as Catalog from "@nestri/moq/media/catalog"
-import { type GroupWriter } from "@nestri/moq/transport/objects"
-
-export interface BroadcastConfig {
-    namespace: string
-    connection: Connection
-}
-export interface BroadcasterConfig {
-    url: string
-    namespace: string
-    fingerprint?: string // URL to fetch TLS certificate fingerprint
-}
-
-export interface BroadcastConfigTrack {
-    input: string
-    bitrate: number
-}
+// import type { Connection, SubscribeRecv } from "@nestri/libmoq/transport"
+// import { asError } from "@nestri/moq/common/error"
+// import { Client } from "@nestri/moq/transport/client"
+// import * as Catalog from "@nestri/moq/media/catalog"
+// import { type GroupWriter } from "@nestri/moq/transport/objects"
+
+// export interface BroadcastConfig {
+//     namespace: string
+//     connection: Connection
+// }
+// export interface BroadcasterConfig {
+//     url: string
+//     namespace: string
+//     fingerprint?: string // URL to fetch TLS certificate fingerprint
+// }
+
+// export interface BroadcastConfigTrack {
+//     input: string
+//     bitrate: number
+// }
 
-export class Broadcast {
-    stream: GroupWriter | null
-    subscriber: SubscribeRecv | null
-    subscribed: boolean;
+// export class Broadcast {
+//     stream: GroupWriter | null
+//     subscriber: SubscribeRecv | null
+//     subscribed: boolean;
 
 
-    readonly config: BroadcastConfig
-    readonly catalog: Catalog.Root
-    readonly connection: Connection
-    readonly namespace: string
+//     readonly config: BroadcastConfig
+//     readonly catalog: Catalog.Root
+//     readonly connection: Connection
+//     readonly namespace: string
 
-    #running: Promise<void>
+//     #running: Promise<void>
 
-    constructor(config: BroadcastConfig) {
-        this.subscribed = false
-        this.namespace = config.namespace
-        this.connection = config.connection
-        this.config = config
-        //Arbitrary values, just to keep TypeScript happy :)
-        this.catalog = {
-            version: 1,
-            streamingFormat: 1,
-            streamingFormatVersion: "0.2",
-            supportsDeltaUpdates: false,
-            commonTrackFields: {
-                packaging: "loc",
-                renderGroup: 1,
-            },
-            tracks: [{
-                name: "tester",
-                namespace: "tester",
-                selectionParams: {}
-            }],
-        }
-        this.stream = null
-        this.subscriber = null
+//     constructor(config: BroadcastConfig) {
+//         this.subscribed = false
+//         this.namespace = config.namespace
+//         this.connection = config.connection
+//         this.config = config
+//         //Arbitrary values, just to keep TypeScript happy :)
+//         this.catalog = {
+//             version: 1,
+//             streamingFormat: 1,
+//             streamingFormatVersion: "0.2",
+//             supportsDeltaUpdates: false,
+//             commonTrackFields: {
+//                 packaging: "loc",
+//                 renderGroup: 1,
+//             },
+//             tracks: [{
+//                 name: "tester",
+//                 namespace: "tester",
+//                 selectionParams: {}
+//             }],
+//         }
+//         this.stream = null
+//         this.subscriber = null
 
-        this.#running = this.#run()
-    }
+//         this.#running = this.#run()
+//     }
 
-    static async init(config: BroadcasterConfig): Promise<Broadcast> {
-        const client = new Client({ url: config.url, fingerprint: config.fingerprint, role: "publisher" })
-        const connection = await client.connect();
+//     static async init(config: BroadcasterConfig): Promise<Broadcast> {
+//         const client = new Client({ url: config.url, fingerprint: config.fingerprint, role: "publisher" })
+//         const connection = await client.connect();
 
-        return new Broadcast({ connection, namespace: config.namespace })
-    }
+//         return new Broadcast({ connection, namespace: config.namespace })
+//     }
 
-    async #run() {
-        try {
-            await this.connection.announce(this.namespace)
-            this.subscribed = true
-        } catch (error) {
+//     async #run() {
+//         try {
+//             await this.connection.announce(this.namespace)
+//             this.subscribed = true
+//         } catch (error) {
 
-            this.subscribed = false
-        }
+//             this.subscribed = false
+//         }
 
-        for (; ;) {
-            const subscriber = await this.connection.subscribed()
+//         for (; ;) {
+//             const subscriber = await this.connection.subscribed()
 
-            if (!subscriber) {
-                this.subscribed = false
+//             if (!subscriber) {
+//                 this.subscribed = false
 
-                break
-            }
+//                 break
+//             }
 
-            await subscriber.ack()
+//             await subscriber.ack()
 
-            this.subscriber = subscriber
+//             this.subscriber = subscriber
 
-            this.subscribed = true
+//             this.subscribed = true
 
-            const bytes = Catalog.encode(this.catalog);
+//             const bytes = Catalog.encode(this.catalog);
 
-            const stream = await subscriber.group({ group: 0 });
+//             const stream = await subscriber.group({ group: 0 });
 
-            await stream.write({ object: 0, payload: bytes })
+//             await stream.write({ object: 0, payload: bytes })
 
-            this.stream = stream
-        }
-    }
+//             this.stream = stream
+//         }
+//     }
 
-    isSubscribed(): boolean {
-        return this.subscribed;
-    }
+//     isSubscribed(): boolean {
+//         return this.subscribed;
+//     }
 
-    // async #serveSubscribe(subscriber: SubscribeRecv) {
-    //     try {
+//     // async #serveSubscribe(subscriber: SubscribeRecv) {
+//     //     try {
 
-    //         // Send a SUBSCRIBE_OK
-    //         await subscriber.ack()
+//     //         // Send a SUBSCRIBE_OK
+//     //         await subscriber.ack()
 
-    //         console.log("catalog track name:", subscriber.track)
+//     //         console.log("catalog track name:", subscriber.track)
 
-    //         const stream = await subscriber.group({ group: 0 });
+//     //         const stream = await subscriber.group({ group: 0 });
 
-    //         // const bytes = this.catalog.encode("Hello World")
+//     //         // const bytes = this.catalog.encode("Hello World")
 
-    //         await stream.write({ object: 0, payload: bytes })
+//     //         await stream.write({ object: 0, payload: bytes })
 
 
 
-    //     } catch (e) {
-    //         const err = asError(e)
-    //         await subscriber.close(1n, `failed to process publish: ${err.message}`)
-    //     } finally {
-    //         // TODO we can't close subscribers because there's no support for clean termination
-    //         // await subscriber.close()
-    //     }
-    // }
+//     //     } catch (e) {
+//     //         const err = asError(e)
+//     //         await subscriber.close(1n, `failed to process publish: ${err.message}`)
+//     //     } finally {
+//     //         // TODO we can't close subscribers because there's no support for clean termination
+//     //         // await subscriber.close()
+//     //     }
+//     // }
 
-    // async mouseUpdatePosition({ x, y }: { x: number, y: number }, stream: GroupWriter) {
+//     // async mouseUpdatePosition({ x, y }: { x: number, y: number }, stream: GroupWriter) {
 
-    //     const mouse_move = {
-    //         input_type: "mouse_move",
-    //         delta_y: y,
-    //         delta_x: x,
-    //     }
+//     //     const mouse_move = {
+//     //         input_type: "mouse_move",
+//     //         delta_y: y,
+//     //         delta_x: x,
+//     //     }
 
-    //     const bytes = Catalog.encode(this.catalog)
+//     //     const bytes = Catalog.encode(this.catalog)
 
-    //     await stream.write({ object: 0, payload: bytes });
-    // }
+//     //     await stream.write({ object: 0, payload: bytes });
+//     // }
 
-    // async mouseUpdateButtons(e: MouseEvent, stream: GroupWriter) {
-    //     const data: { input_type?: "mouse_key_down" | "mouse_key_up"; button: number; } = { button: e.button };
+//     // async mouseUpdateButtons(e: MouseEvent, stream: GroupWriter) {
+//     //     const data: { input_type?: "mouse_key_down" | "mouse_key_up"; button: number; } = { button: e.button };
 
-    //     if (e.type === "mousedown") {
-    //         data["input_type"] = "mouse_key_down"
-    //     } else if (e.type === "mouseup") {
-    //         data["input_type"] = "mouse_key_up"
-    //     }
+//     //     if (e.type === "mousedown") {
+//     //         data["input_type"] = "mouse_key_down"
+//     //     } else if (e.type === "mouseup") {
+//     //         data["input_type"] = "mouse_key_up"
+//     //     }
 
-    //     const bytes = Catalog.encode(this.catalog)
+//     //     const bytes = Catalog.encode(this.catalog)
 
-    //     await stream.write({ object: 0, payload: bytes });
-    // }
+//     //     await stream.write({ object: 0, payload: bytes });
+//     // }
 
-    // async mouseUpdateWheel(e: WheelEvent, stream: GroupWriter) {
-    //     const data: { input_type?: "mouse_wheel_up" | "mouse_wheel_down" } = {}
+//     // async mouseUpdateWheel(e: WheelEvent, stream: GroupWriter) {
+//     //     const data: { input_type?: "mouse_wheel_up" | "mouse_wheel_down" } = {}
 
-    //     if (e.deltaY < 0.0) {
-    //         data["input_type"] = "mouse_wheel_up"
-    //     } else {
-    //         data["input_type"] = "mouse_wheel_down"
-    //     }
+//     //     if (e.deltaY < 0.0) {
+//     //         data["input_type"] = "mouse_wheel_up"
+//     //     } else {
+//     //         data["input_type"] = "mouse_wheel_down"
+//     //     }
 
-    //     const bytes = Catalog.encode(this.catalog)
+//     //     const bytes = Catalog.encode(this.catalog)
 
-    //     await stream.write({ object: 0, payload: bytes });
-    // }
+//     //     await stream.write({ object: 0, payload: bytes });
+//     // }
 
-    // async updateKeyUp(e: KeyboardEvent, stream: GroupWriter) {
-    //     const data = {
-    //         input_type: "key_up",
-    //         key_code: e.keyCode
-    //     }
+//     // async updateKeyUp(e: KeyboardEvent, stream: GroupWriter) {
+//     //     const data = {
+//     //         input_type: "key_up",
+//     //         key_code: e.keyCode
+//     //     }
 
-    //     const bytes = Catalog.encode(this.catalog)
+//     //     const bytes = Catalog.encode(this.catalog)
 
-    //     await stream.write({ object: 0, payload: bytes });
-    // }
+//     //     await stream.write({ object: 0, payload: bytes });
+//     // }
 
-    // async updateKeyDown(e: KeyboardEvent, stream: GroupWriter) {
-    //     const data = {
-    //         input_type: "key_down",
-    //         key_code: e.keyCode
-    //     }
+//     // async updateKeyDown(e: KeyboardEvent, stream: GroupWriter) {
+//     //     const data = {
+//     //         input_type: "key_down",
+//     //         key_code: e.keyCode
+//     //     }
 
-    //     const bytes = Catalog.encode(this.catalog)
+//     //     const bytes = Catalog.encode(this.catalog)
 
-    //     await stream.write({ object: 0, payload: bytes });
-    // }
+//     //     await stream.write({ object: 0, payload: bytes });
+//     // }
 
-    close() {
-        // TODO implement publish close
-    }
+//     close() {
+//         // TODO implement publish close
+//     }
 
-    // Returns the error message when the connection is closed
-    async closed(): Promise<Error> {
-        try {
-            await this.#running
-            return new Error("closed") // clean termination
-        } catch (e) {
-            return asError(e)
-        }
-    }
-}
\ No newline at end of file
+//     // Returns the error message when the connection is closed
+//     async closed(): Promise<Error> {
+//         try {
+//             await this.#running
+//             return new Error("closed") // clean termination
+//         } catch (e) {
+//             return asError(e)
+//         }
+//     }
+// }
\ No newline at end of file
diff --git a/apps/www/src/routes/home/index.tsx b/apps/www/src/routes/home/index.tsx
index 4e772a01..b1e2ba9e 100644
--- a/apps/www/src/routes/home/index.tsx
+++ b/apps/www/src/routes/home/index.tsx
@@ -12,13 +12,39 @@ export default component$(() => {
     return (
         <>
             <HomeNavBar />
-            <section class="flex flex-col gap-4 justify-center pt-20 items-center w-full text-left pb-4">
+            {/* <div class="bg-red-500 h-[66px] w-screen"></div> */}
+            {/* <section class="absolute flex mx-auto my-0 inset-[0_0_20%] overflow-hidden -z-[1] before:inset-0 before:absolute before:z-[1] after:absolute after:inset-0 after:[background:linear-gradient(180deg,transparent_60%,#000)] before:[background:linear-gradient(90deg,transparent_85%,#000),linear-gradient(-90deg,transparent_85%,#000)]" >
+                <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/1172470/library_hero_2x.jpg" height={200} width={300} class="max-w-full min-w-full max-h-full min-h-full object-cover absolute top-0 bottom-0 left-0 right-0 w-0 h-0"/>
+            </section> */}
+
+            <section class="w-full top-[70px] pb-5 ring-gray-300 ring-2 max-w-3xl rounded-xl overflow-hidden relative h-auto shadow-xl">
+                <div class="w-full h-auto relative">
+                    <img src="https://media.rawg.io/media/games/511/5118aff5091cb3efec399c808f8c598f.jpg" height={200} width={300} class="w-full aspect-[16/9]  object-cover" />
+                    <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/1174180/logo_2x.png?t=1671484934" height={200} width={300} class="w-[40%] aspect-[16/9] absolute bottom-4 left-1/2 -translate-x-1/2  object-cover" />
+                </div>
+                <div class="px-6 pt-2">
+                    <div class="flex  gap-2 items-center h-max">
+                        {/* <img src="https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/apps/1174180/5bf6edd7efb1110b457da905e7ac696c6c619ed1.ico" height={20} width={20} class="size-10 bg-black aspect-square rounded-xl ring-2 ring-gray-700" /> */}
+                        <p class="text-2xl font-title font-bold">Red Dead Redemption 2</p>
+                    </div>
+                </div>
+            </section>
+            {/* <section class="w-full before:inset-0 before:absolute before:z-[1] relative after:bg-gradient-to-b after:from-transparent after:from-60% after:to-black before:[background:linear-gradient(90deg,transparent_70%,#000),linear-gradient(-90deg,transparent_70%,#000)]" >
+                <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/359550/library_hero_2x.jpg" height={200} width={300} class="w-full aspect-[96/31]"/>
+            </section><section class="w-full before:inset-0 before:absolute before:z-[1] relative after:bg-gradient-to-b after:from-transparent after:from-60% after:to-black before:[background:linear-gradient(90deg,transparent_70%,#000),linear-gradient(-90deg,transparent_70%,#000)]" >
+                <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/359550/library_hero_2x.jpg" height={200} width={300} class="w-full aspect-[96/31]"/>
+            </section><section class="w-full before:inset-0 before:absolute before:z-[1] relative after:bg-gradient-to-b after:from-transparent after:from-60% after:to-black before:[background:linear-gradient(90deg,transparent_70%,#000),linear-gradient(-90deg,transparent_70%,#000)]" >
+                <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/359550/library_hero_2x.jpg" height={200} width={300} class="w-full aspect-[96/31]"/>
+            </section><section class="w-full before:inset-0 before:absolute before:z-[1] relative after:bg-gradient-to-b after:from-transparent after:from-60% after:to-black before:[background:linear-gradient(90deg,transparent_70%,#000),linear-gradient(-90deg,transparent_70%,#000)]" >
+                <img src="https://shared.cloudflare.steamstatic.com/store_item_assets/steam/apps/359550/library_hero_2x.jpg" height={200} width={300} class="w-full aspect-[96/31]"/>
+            </section> */}
+            {/* <section class="flex flex-col gap-4 justify-center pt-20 items-center w-full text-left pb-4">
                 <div class="flex flex-col gap-4 mx-auto max-w-2xl w-full">
                     <h1 class="text-5xl font-bold font-title">{getGreeting()},&nbsp;<span>Wanjohi</span></h1>
                     <p class="dark:text-gray-50/70 text-gray-950/70 text-xl">What will you play today?</p>
                 </div>
-            </section>
-            <section class="flex flex-col gap-4 justify-center pt-10 items-center w-full text-left pb-4">
+            </section> */}
+            {/* <section class="flex flex-col gap-4 justify-center pt-10 items-center w-full text-left pb-4">
                 <ul class="gap-4 relative list-none w-full max-w-xl lg:max-w-4xl grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 after:pointer-events-none after:select-none after:bg-gradient-to-b after:from-transparent after:dark:to-gray-900 after:to-gray-100 after:fixed after:left-0 after:-bottom-[1px] after:z-10 after:backdrop-blur-sm after:h-[100px] after:w-full after:[-webkit-mask-image:linear-gradient(to_top,theme(colors.primary.100)_50%,transparent)] after:dark:[-webkit-mask-image:linear-gradient(to_top,theme(colors.primary.900)_50%,transparent)]">
                     <li class="col-span-full">
                         <Card
@@ -87,21 +113,7 @@ export default component$(() => {
                         />
                     </li>
                 </ul>
-            </section>
-            <nav class="w-full flex justify-center h-[100px] z-50 items-center gap-4 bg-transparent fixed -bottom-[1px] left-0 right-0">
-                {/* <nav class="flex gap-4 w-max px-4 py-2 rounded-full shadow-2xl shadow-gray-950 bg-neutral-200 text-gray-900 dark:text-gray-100 dark:bg-neutral-800 ring-gray-300 dark:ring-gray-700 ring-1">
-                    <button class="text-xl font-title">
-                        <span class="material-symbols-outlined">
-                            home
-                        </span>
-                    </button>
-                    <button class="text-xl font-title">
-                        <span class="material-symbols-outlined">
-                            home
-                        </span>
-                    </button>
-                </nav> */}
-            </nav>
+            </section> */}
         </>
     )
 })
\ No newline at end of file
diff --git a/apps/www/src/routes/play/[id]/index.tsx b/apps/www/src/routes/play/[id]/index.tsx
new file mode 100644
index 00000000..03d71add
--- /dev/null
+++ b/apps/www/src/routes/play/[id]/index.tsx
@@ -0,0 +1,287 @@
+import {useLocation} from "@builder.io/qwik-city";
+import {Keyboard, Mouse, WebRTCStream} from "@nestri/input"
+import {component$, useSignal, useVisibleTask$} from "@builder.io/qwik";
+
+export default component$(() => {
+  const id = useLocation().params.id;
+  const canvas = useSignal<HTMLCanvasElement>();
+
+  useVisibleTask$(({track}) => {
+    track(() => canvas.value);
+
+    if (!canvas.value) return; // Ensure canvas is available
+
+    // Create video element and make it output to canvas (TODO: improve this)
+    let video = document.getElementById("webrtc-video-player");
+    if (!video) {
+      video = document.createElement("video");
+      video.id = "stream-video-player";
+      video.style.visibility = "hidden";
+      const webrtc = new WebRTCStream("https://relay.dathorse.com", id, (mediaStream) => {
+        if (video && mediaStream && (video as HTMLVideoElement).srcObject === null) {
+          console.log("Setting mediastream");
+          (video as HTMLVideoElement).srcObject = mediaStream;
+
+          // @ts-ignore
+          window.hasstream = true;
+          // @ts-ignore
+          window.roomOfflineElement?.remove();
+
+          const playbtn = document.createElement("button");
+          playbtn.style.position = "absolute";
+          playbtn.style.left = "50%";
+          playbtn.style.top = "50%";
+          playbtn.style.transform = "translateX(-50%) translateY(-50%)";
+          playbtn.style.width = "12rem";
+          playbtn.style.height = "6rem";
+          playbtn.style.borderRadius = "1rem";
+          playbtn.style.backgroundColor = "rgb(175, 50, 50)";
+          playbtn.style.color = "black";
+          playbtn.style.fontSize = "1.5em";
+          playbtn.textContent = "< Start >";
+
+          playbtn.onclick = () => {
+            playbtn.remove();
+            (video as HTMLVideoElement).play().then(() => {
+              if (canvas.value) {
+                canvas.value.width = (video as HTMLVideoElement).videoWidth;
+                canvas.value.height = (video as HTMLVideoElement).videoHeight;
+
+                const ctx = canvas.value.getContext("2d");
+                const renderer = () => {
+                  // @ts-ignore
+                  if (ctx && window.hasstream) {
+                    ctx.drawImage((video as HTMLVideoElement), 0, 0);
+                    (video as HTMLVideoElement).requestVideoFrameCallback(renderer);
+                  }
+                }
+                (video as HTMLVideoElement).requestVideoFrameCallback(renderer);
+              }
+            });
+
+            document.addEventListener("pointerlockchange", () => {
+              if (!canvas.value) return; // Ensure canvas is available
+              // @ts-ignore
+              if (document.pointerLockElement && !window.nestrimouse && !window.nestrikeyboard) {
+                // @ts-ignore
+                window.nestrimouse = new Mouse({canvas: canvas.value, webrtc});
+                // @ts-ignore
+                window.nestrikeyboard = new Keyboard({canvas: canvas.value, webrtc});
+                // @ts-ignore
+              } else if (!document.pointerLockElement && window.nestrimouse && window.nestrikeyboard) {
+                // @ts-ignore
+                window.nestrimouse.dispose();
+                // @ts-ignore
+                window.nestrimouse = undefined;
+                // @ts-ignore
+                window.nestrikeyboard.dispose();
+                // @ts-ignore
+                window.nestrikeyboard = undefined;
+              }
+            });
+          };
+          document.body.append(playbtn);
+        } else if (mediaStream === null) {
+          console.log("MediaStream is null, Room is offline");
+          // Add a message to the screen
+          const offline = document.createElement("div");
+          offline.style.position = "absolute";
+          offline.style.left = "50%";
+          offline.style.top = "50%";
+          offline.style.transform = "translateX(-50%) translateY(-50%)";
+          offline.style.width = "auto";
+          offline.style.height = "auto";
+          offline.style.color = "lightgray";
+          offline.style.fontSize = "2em";
+          offline.textContent = "Offline";
+          document.body.append(offline);
+          // @ts-ignore
+          window.roomOfflineElement = offline;
+          // @ts-ignore
+          window.hasstream = false;
+          // Clear canvas if it has been set
+          if (canvas.value) {
+            const ctx = canvas.value.getContext("2d");
+            if (ctx) ctx.clearRect(0, 0, canvas.value.width, canvas.value.height);
+          }
+        }
+      });
+    }
+  })
+
+  return (
+    <canvas
+      ref={canvas}
+      onClick$={async () => {
+        // @ts-ignore
+        if (canvas.value && window.hasstream) {
+          // Do not use - unadjustedMovement: true - breaks input on linux
+          await canvas.value.requestPointerLock();
+          await canvas.value.requestFullscreen()
+          if (document.fullscreenElement !== null) {
+            // @ts-ignore
+            if ('keyboard' in window.navigator && 'lock' in window.navigator.keyboard) {
+              const keys = [
+                "AltLeft",
+                "AltRight",
+                "Tab",
+                "Escape",
+                "ContextMenu",
+                "MetaLeft",
+                "MetaRight"
+              ];
+              console.log("requesting keyboard lock");
+              // @ts-ignore
+              window.navigator.keyboard.lock(keys).then(
+                () => {
+                  console.log("keyboard lock success");
+                }
+              ).catch(
+                (e: any) => {
+                  console.log("keyboard lock failed: ", e);
+                }
+              )
+            } else {
+              console.log("keyboard lock not supported, navigator is: ", window.navigator, navigator);
+            }
+          }
+        }
+      }}
+      //TODO: go full screen, then lock on "landscape" screen-orientation on mobile
+      class="aspect-video h-full w-full object-contain max-h-screen"/>
+  )
+})
+
+{/**
+ .spinningCircleInner_b6db20 {
+ transform: rotate(280deg);
+ }
+ .inner_b6db20 {
+ position: relative;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 32px;
+ height: 32px;
+ contain: paint;
+ } */
+}
+
+{/* <div class="loadingPopout_a8c724" role="dialog" tabindex="-1" aria-modal="true"><div class="spinner_b6db20 spinningCircle_b6db20" role="img" aria-label="Loading"><div class="spinningCircleInner_b6db20 inner_b6db20"><svg class="circular_b6db20" viewBox="25 25 50 50"><circle class="path_b6db20 path3_b6db20" cx="50" cy="50" r="20"></circle><circle class="path_b6db20 path2_b6db20" cx="50" cy="50" r="20"></circle><circle class="path_b6db20" cx="50" cy="50" r="20"></circle></svg></div></div></div> */
+}
+// .loadingPopout_a8c724 {
+//     background-color: var(--background-secondary);
+//     display: flex;
+//     justify-content: center;
+//     padding: 8px;
+// }
+
+// .circular_b6db20 {
+//     animation: spinner-spinning-circle-rotate_b6db20 2s linear infinite;
+//     height: 100%;
+//     width: 100%;
+// }
+
+// 100% {
+//     transform: rotate(360deg);
+// }
+
+
+{/* .path3_b6db20 {
+    animation-delay: .23s;
+    stroke: var(--text-brand);
+}
+.path_b6db20 {
+    animation: spinner-spinning-circle-dash_b6db20 2s ease-in-out infinite;
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
+    fill: none;
+    stroke-width: 6;
+    stroke-miterlimit: 10;
+    stroke-linecap: round;
+    stroke: var(--brand-500);
+}
+circle[Attributes Style] {
+    cx: 50;
+    cy: 50;
+    r: 20;
+}
+user agent stylesheet
+:not(svg) {
+    transform-origin: 0px 0px;
+} */
+}
+
+
+// .path2_b6db20 {
+//     animation-delay: .15s;
+//     stroke: var(--text-brand);
+//     opacity: .6;
+// }
+// .path_b6db20 {
+//     animation: spinner-spinning-circle-dash_b6db20 2s ease-in-out infinite;
+//     stroke-dasharray: 1, 200;
+//     stroke-dashoffset: 0;
+//     fill: none;
+//     stroke-width: 6;
+//     stroke-miterlimit: 10;
+//     stroke-linecap: round;
+//     stroke: var(--brand-500);
+// }
+// circle[Attributes Style] {
+//     cx: 50;
+//     cy: 50;
+//     r: 20;
+
+
+// function throttle(func, limit) {
+//     let inThrottle;
+//     return function(...args) {
+//         if (!inThrottle) {
+//             func.apply(this, args);
+//             inThrottle = true;
+//             setTimeout(() => inThrottle = false, limit);
+//         }
+//     }
+// }
+
+// // Use it like this:
+// const throttledMouseMove = throttle((x, y) => {
+//     websocket.send(JSON.stringify({
+//         type: 'mousemove',
+//         x: x,
+//         y: y
+//     }));
+// }, 16); // ~60fps
+
+// use std::time::Instant;
+
+// // Add these to your AppState
+// struct AppState {
+//     pipeline: Arc<Mutex<gst::Pipeline>>,
+//     last_mouse_move: Arc<Mutex<(i32, i32, Instant)>>, // Add this
+// }
+
+// // Then in your MouseMove handler:
+// InputMessage::MouseMove { x, y } => {
+//     let mut last_move = state.last_mouse_move.lock().unwrap();
+//     let now = Instant::now();
+
+//     // Only process if coordinates are different or enough time has passed
+//     if (last_move.0 != x || last_move.1 != y) && 
+//        (now.duration_since(last_move.2).as_millis() > 16) { // ~60fps
+
+//         println!("Mouse moved to x: {}, y: {}", x, y);
+
+//         let structure = gst::Structure::builder("MouseMoveRelative")
+//             .field("pointer_x", x as f64)
+//             .field("pointer_y", y as f64)
+//             .build();
+
+//         let event = gst::event::CustomUpstream::new(structure);
+//         pipeline.send_event(event);
+
+//         // Update last position and time
+//         *last_move = (x, y, now);
+//     }
+// }
diff --git a/apps/www/tsconfig.json b/apps/www/tsconfig.json
index ab18d603..6a9efe3a 100644
--- a/apps/www/tsconfig.json
+++ b/apps/www/tsconfig.json
@@ -41,5 +41,5 @@
     "./*.config.ts",
     "./*.config.js",
     "content-collections.ts"
-  ]
+, "../../packages/input/src/webrtc-stream.ts"  ]
 }
\ No newline at end of file
diff --git a/bun.lockb b/bun.lockb
index 0a3752ae..58c988d8 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..47aa7c46
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1 @@
+#FIXME: A simple docker-compose file for running the MoQ relay and the cachyos server
\ No newline at end of file
diff --git a/.certs/.gitignore b/packages/certs/.gitignore
similarity index 100%
rename from .certs/.gitignore
rename to packages/certs/.gitignore
diff --git a/.certs/.terraform.lock.hcl b/packages/certs/.terraform.lock.hcl
similarity index 100%
rename from .certs/.terraform.lock.hcl
rename to packages/certs/.terraform.lock.hcl
diff --git a/.certs/README.md b/packages/certs/README.md
similarity index 100%
rename from .certs/README.md
rename to packages/certs/README.md
diff --git a/.certs/input.tf b/packages/certs/input.tf
similarity index 100%
rename from .certs/input.tf
rename to packages/certs/input.tf
diff --git a/.certs/main.tf b/packages/certs/main.tf
similarity index 100%
rename from .certs/main.tf
rename to packages/certs/main.tf
diff --git a/.certs/terraform.tfvars b/packages/certs/terraform.tfvars
similarity index 100%
rename from .certs/terraform.tfvars
rename to packages/certs/terraform.tfvars
diff --git a/packages/eslint-config/qwik.js b/packages/eslint-config/qwik.js
index 3ee14854..374e759a 100644
--- a/packages/eslint-config/qwik.js
+++ b/packages/eslint-config/qwik.js
@@ -43,6 +43,7 @@ module.exports = {
     "prefer-spread": "off",
     "no-case-declarations": "off",
     "no-console": "off",
+    "qwik/no-use-visible-task": "off",
     "@typescript-eslint/consistent-type-imports": "warn",
     "@typescript-eslint/no-unnecessary-condition": "warn",
   },
diff --git a/packages/input/package.json b/packages/input/package.json
new file mode 100644
index 00000000..7a0f8c51
--- /dev/null
+++ b/packages/input/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "@nestri/input",
+    "version": "0.0.0",
+    "private": true,
+    "sideEffects": false,
+    "exports": {
+        ".": "./src/index.ts"
+    }
+}
\ No newline at end of file
diff --git a/packages/input/src/codes.ts b/packages/input/src/codes.ts
new file mode 100644
index 00000000..c3e5a8d7
--- /dev/null
+++ b/packages/input/src/codes.ts
@@ -0,0 +1,113 @@
+export const keyCodeToLinuxEventCode: { [key: string]: number } = {
+    'KeyA': 30,
+    'KeyB': 48,
+    'KeyC': 46,
+    'KeyD': 32,
+    'KeyE': 18,
+    'KeyF': 33,
+    'KeyG': 34,
+    'KeyH': 35,
+    'KeyI': 23,
+    'KeyJ': 36,
+    'KeyK': 37,
+    'KeyL': 38,
+    'KeyM': 50,
+    'KeyN': 49,
+    'KeyO': 24,
+    'KeyP': 25,
+    'KeyQ': 16,
+    'KeyR': 19,
+    'KeyS': 31,
+    'KeyT': 20,
+    'KeyU': 22,
+    'KeyV': 47,
+    'KeyW': 17,
+    'KeyX': 45,
+    'KeyY': 21,
+    'KeyZ': 44,
+    'Digit1': 2,
+    'Digit2': 3,
+    'Digit3': 4,
+    'Digit4': 5,
+    'Digit5': 6,
+    'Digit6': 7,
+    'Digit7': 8,
+    'Digit8': 9,
+    'Digit9': 10,
+    'Digit0': 11,
+    'Enter': 28,
+    'Escape': 1,
+    'Backspace': 14,
+    'Tab': 15,
+    'Space': 57,
+    'Minus': 12,
+    'Equal': 13,
+    'BracketLeft': 26,
+    'BracketRight': 27,
+    'Backslash': 43,
+    'Semicolon': 39,
+    'Quote': 40,
+    'Backquote': 41,
+    'Comma': 51,
+    'Period': 52,
+    'Slash': 53,
+    'CapsLock': 58,
+    'F1': 59,
+    'F2': 60,
+    'F3': 61,
+    'F4': 62,
+    'F5': 63,
+    'F6': 64,
+    'F7': 65,
+    'F8': 66,
+    'F9': 67,
+    'F10': 68,
+    'F11': 87,
+    'F12': 88,
+    'Insert': 110,
+    'Delete': 111,
+    'ArrowUp': 103,
+    'ArrowDown': 108,
+    'ArrowLeft': 105,
+    'ArrowRight': 106,
+    'Home': 102,
+    'End': 107,
+    'PageUp': 104,
+    'PageDown': 109,
+    'NumLock': 69,
+    'ScrollLock': 70,
+    'Pause': 119,
+    'Numpad0': 82,
+    'Numpad1': 79,
+    'Numpad2': 80,
+    'Numpad3': 81,
+    'Numpad4': 75,
+    'Numpad5': 76,
+    'Numpad6': 77,
+    'Numpad7': 71,
+    'Numpad8': 72,
+    'Numpad9': 73,
+    'NumpadDivide': 98,
+    'NumpadMultiply': 55,
+    'NumpadSubtract': 74,
+    'NumpadAdd': 78,
+    'NumpadEnter': 96,
+    'NumpadDecimal': 83,
+    'ControlLeft': 29,
+    'ControlRight': 97,
+    'ShiftLeft': 42,
+    'ShiftRight': 54,
+    'AltLeft': 56,
+    'AltRight': 100,
+    //'MetaLeft': 125, // Disabled as will break input
+    //'MetaRight': 126, // Disabled as will break input
+    'ContextMenu': 127,
+};
+
+export const mouseButtonToLinuxEventCode: { [button: number]: number } = {
+    0: 272,
+    2: 273,
+    1: 274,
+    3: 275,
+    4: 276
+};
diff --git a/packages/input/src/index.ts b/packages/input/src/index.ts
new file mode 100644
index 00000000..4ead3120
--- /dev/null
+++ b/packages/input/src/index.ts
@@ -0,0 +1,3 @@
+export * from "./keyboard"
+export * from "./mouse"
+export * from "./webrtc-stream"
\ No newline at end of file
diff --git a/packages/input/src/keyboard.ts b/packages/input/src/keyboard.ts
new file mode 100644
index 00000000..a5541e3d
--- /dev/null
+++ b/packages/input/src/keyboard.ts
@@ -0,0 +1,96 @@
+import {type Input} from "./types"
+import {keyCodeToLinuxEventCode} from "./codes"
+import {MessageInput, encodeMessage} from "./messages";
+import {WebRTCStream} from "./webrtc-stream";
+import {LatencyTracker} from "./latency";
+
+interface Props {
+  webrtc: WebRTCStream;
+  canvas: HTMLCanvasElement;
+}
+
+export class Keyboard {
+  protected wrtc: WebRTCStream;
+  protected canvas: HTMLCanvasElement;
+  protected connected!: boolean;
+
+  // Store references to event listeners
+  private keydownListener: (e: KeyboardEvent) => void;
+  private keyupListener: (e: KeyboardEvent) => void;
+
+  constructor({webrtc, canvas}: Props) {
+    this.wrtc = webrtc;
+    this.canvas = canvas;
+    this.keydownListener = this.createKeyboardListener("keydown", (e: any) => ({
+      type: "KeyDown",
+      key: this.keyToVirtualKeyCode(e.code)
+    }));
+    this.keyupListener = this.createKeyboardListener("keyup", (e: any) => ({
+      type: "KeyUp",
+      key: this.keyToVirtualKeyCode(e.code)
+    }));
+    this.run()
+  }
+
+  private run() {
+    //calls all the other functions
+    if (!document.pointerLockElement) {
+      if (this.connected) {
+        this.stop()
+      }
+      return;
+    }
+
+    if (document.pointerLockElement == this.canvas) {
+      this.connected = true
+      document.addEventListener("keydown", this.keydownListener, {passive: false});
+      document.addEventListener("keyup", this.keyupListener, {passive: false});
+    } else {
+      if (this.connected) {
+        this.stop()
+      }
+    }
+  }
+
+  private stop() {
+    document.removeEventListener("keydown", this.keydownListener);
+    document.removeEventListener("keyup", this.keyupListener);
+    this.connected = false;
+  }
+
+  // Helper function to create and return mouse listeners
+  private createKeyboardListener(type: string, dataCreator: (e: Event) => Partial<Input>): (e: Event) => void {
+    return (e: Event) => {
+      e.preventDefault();
+      e.stopPropagation();
+      // Prevent repeated key events from being sent (important for games)
+      if ((e as any).repeat)
+        return;
+
+      const data = dataCreator(e as any); // type assertion because of the way dataCreator is used
+      const dataString = JSON.stringify({...data, type} as Input);
+
+      // Latency tracking
+      const tracker = new LatencyTracker("input-keyboard");
+      tracker.addTimestamp("client_send");
+      const message: MessageInput = {
+        payload_type: "input",
+        data: dataString,
+        latency: tracker,
+      };
+      this.wrtc.sendBinary(encodeMessage(message));
+    };
+  }
+
+  public dispose() {
+    document.exitPointerLock();
+    this.stop();
+    this.connected = false;
+  }
+
+  private keyToVirtualKeyCode(code: string) {
+    // Treat Home key as Escape - TODO: Make user-configurable
+    if (code === "Home") return 1;
+    return keyCodeToLinuxEventCode[code] || undefined;
+  }
+}
\ No newline at end of file
diff --git a/packages/input/src/latency.ts b/packages/input/src/latency.ts
new file mode 100644
index 00000000..3a556896
--- /dev/null
+++ b/packages/input/src/latency.ts
@@ -0,0 +1,54 @@
+type TimestampEntry = {
+  stage: string;
+  time: Date;
+};
+
+export class LatencyTracker {
+  sequence_id: string;
+  timestamps: TimestampEntry[];
+  metadata?: Record<string, any>;
+
+  constructor(sequence_id: string, timestamps: TimestampEntry[] = [], metadata: Record<string, any> = {}) {
+    this.sequence_id = sequence_id;
+    this.timestamps = timestamps;
+    this.metadata = metadata;
+  }
+
+  addTimestamp(stage: string): void {
+    const timestamp: TimestampEntry = {
+      stage,
+      time: new Date(),
+    };
+    this.timestamps.push(timestamp);
+  }
+
+  // Calculates the total time between the first and last recorded timestamps.
+  getTotalLatency(): number {
+    if (this.timestamps.length < 2) return 0;
+
+    const times = this.timestamps.map((entry) => entry.time.getTime());
+    const minTime = Math.min(...times);
+    const maxTime = Math.max(...times);
+    return maxTime - minTime;
+  }
+
+  toJSON(): Record<string, any> {
+    return {
+      sequence_id: this.sequence_id,
+      timestamps: this.timestamps.map((entry) => ({
+        stage: entry.stage,
+        // Fill nanoseconds with zeros to match the expected format
+        time: entry.time.toISOString().replace(/\.(\d+)Z$/, ".$1000000Z"),
+      })),
+      metadata: this.metadata,
+    };
+  }
+
+  static fromJSON(json: any): LatencyTracker {
+    const timestamps: TimestampEntry[] = json.timestamps.map((ts: any) => ({
+      stage: ts.stage,
+      time: new Date(ts.time),
+    }));
+    return new LatencyTracker(json.sequence_id, timestamps, json.metadata);
+  }
+}
diff --git a/packages/input/src/messages.ts b/packages/input/src/messages.ts
new file mode 100644
index 00000000..5d60bf07
--- /dev/null
+++ b/packages/input/src/messages.ts
@@ -0,0 +1,73 @@
+import {gzip, ungzip} from "pako";
+import {LatencyTracker} from "./latency";
+
+export interface MessageBase {
+  payload_type: string;
+}
+
+export interface MessageInput extends MessageBase {
+  payload_type: "input";
+  data: string;
+  latency?: LatencyTracker;
+}
+
+export interface MessageICE extends MessageBase {
+  payload_type: "ice";
+  candidate: RTCIceCandidateInit;
+}
+
+export interface MessageSDP extends MessageBase {
+  payload_type: "sdp";
+  sdp: RTCSessionDescriptionInit;
+}
+
+export enum JoinerType {
+  JoinerNode = 0,
+  JoinerClient = 1,
+}
+
+export interface MessageJoin extends MessageBase {
+  payload_type: "join";
+  joiner_type: JoinerType;
+}
+
+export enum AnswerType {
+  AnswerOffline = 0,
+  AnswerInUse,
+  AnswerOK
+}
+
+export interface MessageAnswer extends MessageBase {
+  payload_type: "answer";
+  answer_type: AnswerType;
+}
+
+function blobToUint8Array(blob: Blob): Promise<Uint8Array> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onloadend = () => {
+      const arrayBuffer = reader.result as ArrayBuffer;
+      resolve(new Uint8Array(arrayBuffer));
+    };
+    reader.onerror = reject;
+    reader.readAsArrayBuffer(blob);
+  });
+}
+
+export function encodeMessage<T>(message: T): Uint8Array {
+  // Convert the message to JSON string
+  const json = JSON.stringify(message);
+  // Compress the JSON string using gzip
+  return gzip(json);
+}
+
+export async function decodeMessage<T>(data: Blob): Promise<T> {
+  // Convert the Blob to Uint8Array
+  const array = await blobToUint8Array(data);
+  // Decompress the gzip data
+  const decompressed = ungzip(array);
+  // Convert the Uint8Array to JSON string
+  const json = new TextDecoder().decode(decompressed);
+  // Parse the JSON string
+  return JSON.parse(json);
+}
diff --git a/packages/input/src/mouse.ts b/packages/input/src/mouse.ts
new file mode 100644
index 00000000..0345a522
--- /dev/null
+++ b/packages/input/src/mouse.ts
@@ -0,0 +1,112 @@
+import {type Input} from "./types"
+import {mouseButtonToLinuxEventCode} from "./codes"
+import {MessageInput, encodeMessage} from "./messages";
+import {WebRTCStream} from "./webrtc-stream";
+import {LatencyTracker} from "./latency";
+
+interface Props {
+  webrtc: WebRTCStream;
+  canvas: HTMLCanvasElement;
+}
+
+export class Mouse {
+  protected wrtc: WebRTCStream;
+  protected canvas: HTMLCanvasElement;
+  protected connected!: boolean;
+
+  // Store references to event listeners
+  private mousemoveListener: (e: MouseEvent) => void;
+  private mousedownListener: (e: MouseEvent) => void;
+  private mouseupListener: (e: MouseEvent) => void;
+  private mousewheelListener: (e: WheelEvent) => void;
+
+  constructor({webrtc, canvas}: Props) {
+    this.wrtc = webrtc;
+    this.canvas = canvas;
+
+    this.mousemoveListener = this.createMouseListener("mousemove", (e: any) => ({
+      type: "MouseMove",
+      x: e.movementX,
+      y: e.movementY
+    }));
+    this.mousedownListener = this.createMouseListener("mousedown", (e: any) => ({
+      type: "MouseKeyDown",
+      key: this.keyToVirtualKeyCode(e.button)
+    }));
+
+    this.mouseupListener = this.createMouseListener("mouseup", (e: any) => ({
+      type: "MouseKeyUp",
+      key: this.keyToVirtualKeyCode(e.button)
+    }));
+    this.mousewheelListener = this.createMouseListener("wheel", (e: any) => ({
+      type: "MouseWheel",
+      x: e.deltaX,
+      y: e.deltaY
+    }));
+
+    this.run()
+  }
+
+  private run() {
+    //calls all the other functions
+    if (!document.pointerLockElement) {
+      console.log("no pointerlock")
+      if (this.connected) {
+        this.stop()
+      }
+      return;
+    }
+
+    if (document.pointerLockElement == this.canvas) {
+      this.connected = true
+      this.canvas.addEventListener("mousemove", this.mousemoveListener, { passive: false });
+      this.canvas.addEventListener("mousedown", this.mousedownListener, { passive: false });
+      this.canvas.addEventListener("mouseup", this.mouseupListener, { passive: false });
+      this.canvas.addEventListener("wheel", this.mousewheelListener, { passive: false });
+
+    } else {
+      if (this.connected) {
+        this.stop()
+      }
+    }
+
+  }
+
+  private stop() {
+    this.canvas.removeEventListener("mousemove", this.mousemoveListener);
+    this.canvas.removeEventListener("mousedown", this.mousedownListener);
+    this.canvas.removeEventListener("mouseup", this.mouseupListener);
+    this.canvas.removeEventListener("wheel", this.mousewheelListener);
+    this.connected = false;
+  }
+
+  // Helper function to create and return mouse listeners
+  private createMouseListener(type: string, dataCreator: (e: Event) => Partial<Input>): (e: Event) => void {
+    return (e: Event) => {
+      e.preventDefault();
+      e.stopPropagation();
+      const data = dataCreator(e as any); // type assertion because of the way dataCreator is used
+      const dataString = JSON.stringify({...data, type} as Input);
+
+      // Latency tracking
+      const tracker = new LatencyTracker("input-mouse");
+      tracker.addTimestamp("client_send");
+      const message: MessageInput = {
+        payload_type: "input",
+        data: dataString,
+        latency: tracker,
+      };
+      this.wrtc.sendBinary(encodeMessage(message));
+    };
+  }
+
+  public dispose() {
+    document.exitPointerLock();
+    this.stop();
+    this.connected = false;
+  }
+
+  private keyToVirtualKeyCode(code: number) {
+    return mouseButtonToLinuxEventCode[code] || undefined;
+  }
+}
\ No newline at end of file
diff --git a/packages/input/src/types.ts b/packages/input/src/types.ts
new file mode 100644
index 00000000..b733b499
--- /dev/null
+++ b/packages/input/src/types.ts
@@ -0,0 +1,52 @@
+interface BaseInput {
+    timestamp?: number; // Add a timestamp for better context (optional)
+}
+
+interface MouseMove extends BaseInput {
+    type: "MouseMove";
+    x: number;
+    y: number;
+}
+
+interface MouseMoveAbs extends BaseInput {
+    type: "MouseMoveAbs";
+    x: number;
+    y: number;
+}
+
+interface MouseWheel extends BaseInput {
+    type: "MouseWheel";
+    x: number;
+    y: number;
+}
+
+interface MouseKeyDown extends BaseInput {
+    type: "MouseKeyDown";
+    key: number;
+}
+
+interface MouseKeyUp extends BaseInput {
+    type: "MouseKeyUp";
+    key: number;
+}
+
+interface KeyDown extends BaseInput {
+    type: "KeyDown";
+    key: number;
+}
+
+interface KeyUp extends BaseInput {
+    type: "KeyUp";
+    key: number;
+}
+
+
+export type Input =
+    | MouseMove
+    | MouseMoveAbs
+    | MouseWheel
+    | MouseKeyDown
+    | MouseKeyUp
+    | KeyDown
+    | KeyUp;
+
diff --git a/packages/input/src/webrtc-stream.ts b/packages/input/src/webrtc-stream.ts
new file mode 100644
index 00000000..09a404c0
--- /dev/null
+++ b/packages/input/src/webrtc-stream.ts
@@ -0,0 +1,166 @@
+import {
+  MessageBase,
+  MessageICE,
+  MessageJoin,
+  MessageSDP,
+  MessageAnswer,
+  JoinerType,
+  AnswerType,
+  decodeMessage,
+  encodeMessage
+} from "./messages";
+
+export class WebRTCStream {
+  private _ws: WebSocket | undefined = undefined;
+  private _pc: RTCPeerConnection | undefined = undefined;
+  private _mediaStream: MediaStream | undefined = undefined;
+  private _dataChannel: RTCDataChannel | undefined = undefined;
+  private _onConnected: ((stream: MediaStream | null) => void) | undefined = undefined;
+
+  constructor(serverURL: string, roomName: string, connectedCallback: (stream: MediaStream | null) => void) {
+    // If roomName is not provided, return
+    if (roomName.length <= 0) {
+      console.error("Room name not provided");
+      return;
+    }
+
+    this._onConnected = connectedCallback;
+
+    console.log("Setting up WebSocket");
+    // Replace http/https with ws/wss
+    const wsURL = serverURL.replace(/^http/, "ws");
+    this._ws = new WebSocket(`${wsURL}/api/ws/${roomName}`);
+    this._ws.onopen = async () => {
+      console.log("WebSocket opened");
+
+      console.log("Setting up PeerConnection");
+      this._pc = new RTCPeerConnection({
+        iceServers: [
+          {
+            urls: "stun:stun.l.google.com:19302"
+          }
+        ],
+      });
+
+      this._pc.ontrack = (e) => {
+        console.log("Track received: ", e.track);
+        this._mediaStream = e.streams[e.streams.length - 1];
+      };
+
+      this._pc.onconnectionstatechange = () => {
+        console.log("Connection state: ", this._pc!.connectionState);
+        if (this._pc!.connectionState === "connected") {
+          if (this._onConnected && this._mediaStream)
+            this._onConnected(this._mediaStream);
+        }
+      };
+
+      this._pc.onicecandidate = (e) => {
+        if (e.candidate) {
+          const message: MessageICE = {
+            payload_type: "ice",
+            candidate: e.candidate
+          };
+          this._ws!.send(encodeMessage(message));
+        }
+      }
+
+      this._pc.ondatachannel = (e) => {
+        this._dataChannel = e.channel;
+        this._setupDataChannelEvents();
+      }
+
+      // Send join message
+      const joinMessage: MessageJoin = {
+        payload_type: "join",
+        joiner_type: JoinerType.JoinerClient
+      };
+      this._ws!.send(encodeMessage(joinMessage));
+    }
+
+    let iceHolder: RTCIceCandidateInit[] = [];
+
+    this._ws.onmessage = async (e) => {
+      // allow only binary
+      if (typeof e.data !== "object") return;
+      if (!e.data) return;
+      const message = await decodeMessage<MessageBase>(e.data);
+      switch (message.payload_type) {
+        case "sdp":
+          await this._pc!.setRemoteDescription((message as MessageSDP).sdp);
+          // Create our answer
+          const answer = await this._pc!.createAnswer();
+          // Force stereo in Chromium browsers
+          answer.sdp = this.forceOpusStereo(answer.sdp!);
+          await this._pc!.setLocalDescription(answer);
+          this._ws!.send(encodeMessage({
+            payload_type: "sdp",
+            sdp: answer
+          }));
+          break;
+        case "ice":
+          // If remote description is not set yet, hold the ICE candidates
+          if (this._pc!.remoteDescription) {
+            await this._pc!.addIceCandidate((message as MessageICE).candidate);
+            // Add held ICE candidates
+            for (const ice of iceHolder) {
+              await this._pc!.addIceCandidate(ice);
+            }
+            iceHolder = [];
+          } else {
+            iceHolder.push((message as MessageICE).candidate);
+          }
+          break;
+        case "answer":
+          switch ((message as MessageAnswer).answer_type) {
+            case AnswerType.AnswerOffline:
+              console.log("Room is offline");
+              // Call callback with null stream
+              if (this._onConnected)
+                this._onConnected(null);
+
+              break;
+            case AnswerType.AnswerInUse:
+              console.warn("Room is in use, we shouldn't even be getting this message");
+              break;
+            case AnswerType.AnswerOK:
+              console.log("Joining Room was successful");
+              break;
+          }
+          break;
+        default:
+          console.error("Unknown message type: ", message);
+      }
+    }
+
+    this._ws.onclose = () => {
+      console.log("WebSocket closed");
+    }
+
+    this._ws.onerror = (e) => {
+      console.error("WebSocket error: ", e);
+    }
+  }
+
+  // Forces opus to stereo in Chromium browsers, because of course
+  private forceOpusStereo(SDP: string): string {
+    // Look for "minptime=10;useinbandfec=1" and replace with "minptime=10;useinbandfec=1;stereo=1;sprop-stereo=1;"
+    return SDP.replace(/(minptime=10;useinbandfec=1)/, "$1;stereo=1;sprop-stereo=1;");
+  }
+
+  private _setupDataChannelEvents() {
+    if (!this._dataChannel) return;
+
+    this._dataChannel.onclose = () => console.log('sendChannel has closed')
+    this._dataChannel.onopen = () => console.log('sendChannel has opened')
+    this._dataChannel.onmessage = e => console.log(`Message from DataChannel '${this._dataChannel?.label}' payload '${e.data}'`)
+  }
+
+  // Send binary message through the data channel
+  public sendBinary(data: Uint8Array) {
+    if (this._dataChannel && this._dataChannel.readyState === "open")
+      this._dataChannel.send(data);
+    else
+      console.log("Data channel not open or not established.");
+  }
+}
diff --git a/packages/master/go.mod b/packages/master/go.mod
new file mode 100644
index 00000000..7565b333
--- /dev/null
+++ b/packages/master/go.mod
@@ -0,0 +1,32 @@
+module master
+
+go 1.23.3
+
+require github.com/docker/docker v27.3.1+incompatible
+
+require (
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/time v0.8.0 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
+)
diff --git a/packages/master/go.sum b/packages/master/go.sum
new file mode 100644
index 00000000..4acbdbf3
--- /dev/null
+++ b/packages/master/go.sum
@@ -0,0 +1,123 @@
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
+github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
+github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
+go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
+golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
diff --git a/packages/master/main.go b/packages/master/main.go
new file mode 100644
index 00000000..13164f8f
--- /dev/null
+++ b/packages/master/main.go
@@ -0,0 +1,80 @@
+package main
+
+import (
+	"context"
+	"io"
+	"os"
+
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/stdcopy"
+)
+
+func main() {
+	ctx := context.Background()
+
+	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	if err != nil {
+		panic(err)
+	}
+	defer cli.Close()
+
+	// Try to get the Docker version
+	_, err = cli.ServerVersion(ctx)
+	if err != nil {
+		// If an error occurs (e.g., Docker is not running), return false
+		panic(err)
+	}
+
+	// Download the image
+	containerName := "hello-world"
+
+	reader, err := cli.ImagePull(ctx, containerName, image.PullOptions{})
+	if err != nil {
+		panic(err)
+	}
+
+	defer reader.Close()
+
+	// cli.ImagePull is asynchronous.
+	// The reader needs to be read completely for the pull operation to complete.
+	// If stdout is not required, consider using io.Discard instead of os.Stdout.
+	io.Copy(os.Stdout, reader)
+
+	resp, err := cli.ContainerCreate(ctx, &container.Config{
+		Image: "hello-world",
+	},
+		nil, nil, nil, containerName)
+	if err != nil {
+		panic(err)
+	}
+
+	// Start the container
+	if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
+		panic(err)
+	}
+
+	// Wait for the container to finish and get its logs
+	statusCh, errCh := cli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
+	select {
+	case err := <-errCh:
+		if err != nil {
+			panic(err)
+		}
+	case <-statusCh:
+	}
+
+	out, err := cli.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
+	if err != nil {
+		panic(err)
+	}
+
+	stdcopy.StdCopy(os.Stdout, os.Stderr, out)
+
+	// Remove the container
+	if err := cli.ContainerRemove(ctx, resp.ID, container.RemoveOptions{}); err != nil {
+		panic(err)
+	}
+
+}
diff --git a/packages/moq/.eslintrc.cjs b/packages/moq/.eslintrc.cjs
index 89e59ace..49848456 100644
--- a/packages/moq/.eslintrc.cjs
+++ b/packages/moq/.eslintrc.cjs
@@ -8,7 +8,7 @@ module.exports = {
 		"prettier",
 	],
 	parser: "@typescript-eslint/parser",
-	plugins: ["@typescript-eslint", "prettier"],
+	plugins: ["@typescript-eslint", "prettier", "solid"],
 	root: true,
 	env: {
 		browser: true,
diff --git a/packages/moq/common/async.ts b/packages/moq/common/async.ts
index a0fa0b4e..2f91bbbf 100644
--- a/packages/moq/common/async.ts
+++ b/packages/moq/common/async.ts
@@ -1,7 +1,7 @@
 export class Deferred<T> {
 	promise: Promise<T>
 	resolve!: (value: T | PromiseLike<T>) => void
-	reject!: (reason: any) => void
+	reject!: (reason: unknown) => void
 	pending = true
 
 	constructor() {
@@ -35,16 +35,19 @@ export class Watch<T> {
 
 	update(v: T | ((v: T) => T)) {
 		if (!this.#next.pending) {
-			throw new Error("already closed")
+			throw new Error("closed")
 		}
 
 		// If we're given a function, call it with the current value
+		let value: T
 		if (v instanceof Function) {
-			v = v(this.#current[0])
+			value = v(this.#current[0])
+		} else {
+			value = v
 		}
 
 		const next = new Deferred<WatchNext<T>>()
-		this.#current = [v, next.promise]
+		this.#current = [value, next.promise]
 		this.#next.resolve(this.#current)
 		this.#next = next
 	}
@@ -53,6 +56,10 @@ export class Watch<T> {
 		this.#current[1] = undefined
 		this.#next.resolve(this.#current)
 	}
+
+	closed() {
+		return !this.#next.pending
+	}
 }
 
 // Wakes up a multiple consumers.
@@ -88,6 +95,7 @@ export class Queue<T> {
 	}
 
 	async push(v: T) {
+		if (this.#closed) throw new Error("closed")
 		const w = this.#stream.writable.getWriter()
 		await w.write(v)
 		w.releaseLock()
diff --git a/packages/moq/common/error.ts b/packages/moq/common/error.ts
index c627a0b9..d4171799 100644
--- a/packages/moq/common/error.ts
+++ b/packages/moq/common/error.ts
@@ -1,14 +1,14 @@
 // I hate javascript
-export function asError(e: any): Error {
+export function asError(e: unknown): Error {
 	if (e instanceof Error) {
 		return e
-	} else if (typeof e === "string") {
+	}
+	if (typeof e === "string") {
 		return new Error(e)
-	} else {
-		return new Error(String(e))
 	}
+	return new Error(String(e))
 }
 
-export function isError(e: any): e is Error {
+export function isError(e: unknown): e is Error {
 	return e instanceof Error
 }
diff --git a/packages/moq/common/hex.ts b/packages/moq/common/hex.ts
new file mode 100644
index 00000000..ca833dbc
--- /dev/null
+++ b/packages/moq/common/hex.ts
@@ -0,0 +1,11 @@
+export function decode(str: string): Uint8Array {
+	const bytes = new Uint8Array(str.length / 2)
+	for (let i = 0; i < bytes.length; i += 1) {
+		bytes[i] = Number.parseInt(str.slice(2 * i, 2 * i + 2), 16)
+	}
+	return bytes
+}
+
+export function encode(_bytes: Uint8Array): string {
+	throw "todo"
+}
diff --git a/packages/moq/common/ring.ts b/packages/moq/common/ring.ts
index 97a73e65..8a805059 100644
--- a/packages/moq/common/ring.ts
+++ b/packages/moq/common/ring.ts
@@ -2,8 +2,8 @@
 
 enum STATE {
 	READ_POS = 0, // The current read position
-	WRITE_POS, // The current write position
-	LENGTH, // Clever way of saving the total number of enums values.
+	WRITE_POS = 1, // The current write position
+	LENGTH = 2, // Clever way of saving the total number of enums values.
 }
 
 interface FrameCopyToOptions {
@@ -62,16 +62,12 @@ export class Ring {
 		const readPos = Atomics.load(this.state, STATE.READ_POS)
 		const writePos = Atomics.load(this.state, STATE.WRITE_POS)
 
-		const startPos = writePos
-		let endPos = writePos + frame.numberOfFrames
+		const available = this.capacity - (writePos - readPos)
+		if (available <= 0) return 0
 
-		if (endPos > readPos + this.capacity) {
-			endPos = readPos + this.capacity
-			if (endPos <= startPos) {
-				// No space to write
-				return 0
-			}
-		}
+		const toWrite = Math.min(frame.numberOfFrames, available)
+		const startPos = writePos
+		const endPos = writePos + toWrite
 
 		const startIndex = startPos % this.capacity
 		const endIndex = endPos % this.capacity
@@ -114,7 +110,7 @@ export class Ring {
 
 		Atomics.store(this.state, STATE.WRITE_POS, endPos)
 
-		return endPos - startPos
+		return toWrite
 	}
 
 	read(dst: Float32Array[]): number {
diff --git a/packages/moq/contribute/audio.ts b/packages/moq/contribute/audio.ts
index d42fe288..e170b59f 100644
--- a/packages/moq/contribute/audio.ts
+++ b/packages/moq/contribute/audio.ts
@@ -1,15 +1,67 @@
+import { Deferred } from "../common/async"
+import type { Frame } from "../karp/frame"
+import type { Group, Track } from "../transfork"
+import { Closed } from "../transfork/error"
+
 const SUPPORTED = [
 	// TODO support AAC
 	// "mp4a"
 	"Opus",
 ]
 
+export class Packer {
+	#source: MediaStreamTrackProcessor<AudioData>
+	#encoder: Encoder
+
+	#data: Track
+	#current?: Group
+
+	constructor(track: MediaStreamAudioTrack, encoder: Encoder, data: Track) {
+		this.#source = new MediaStreamTrackProcessor({ track })
+		this.#encoder = encoder
+		this.#data = data
+	}
+
+	async run() {
+		const output = new WritableStream({
+			write: (chunk) => this.#write(chunk),
+			close: () => this.#close(),
+			abort: (e) => this.#close(e),
+		})
+
+		return this.#source.readable.pipeThrough(this.#encoder.frames).pipeTo(output)
+	}
+
+	#write(frame: Frame) {
+		// TODO use a fixed interval instead of keyframes (audio)
+		// TODO actually just align with video
+		if (!this.#current || frame.type === "key") {
+			if (this.#current) {
+				this.#current.close()
+			}
+
+			this.#current = this.#data.appendGroup()
+		}
+
+		this.#current.writeFrame(frame.data)
+	}
+
+	#close(err?: unknown) {
+		const closed = Closed.from(err)
+		if (this.#current) {
+			this.#current.close(closed)
+		}
+
+		this.#data.close(closed)
+	}
+}
+
 export class Encoder {
 	#encoder!: AudioEncoder
 	#encoderConfig: AudioEncoderConfig
-	#decoderConfig?: AudioDecoderConfig
+	#decoderConfig = new Deferred<AudioDecoderConfig>()
 
-	frames: TransformStream<AudioData, AudioDecoderConfig | EncodedAudioChunk>
+	frames: TransformStream<AudioData, EncodedAudioChunk>
 
 	constructor(config: AudioEncoderConfig) {
 		this.#encoderConfig = config
@@ -21,7 +73,7 @@ export class Encoder {
 		})
 	}
 
-	#start(controller: TransformStreamDefaultController<AudioDecoderConfig | EncodedAudioChunk>) {
+	#start(controller: TransformStreamDefaultController<EncodedAudioChunk>) {
 		this.#encoder = new AudioEncoder({
 			output: (frame, metadata) => {
 				this.#enqueue(controller, frame, metadata)
@@ -40,17 +92,16 @@ export class Encoder {
 	}
 
 	#enqueue(
-		controller: TransformStreamDefaultController<AudioDecoderConfig | EncodedAudioChunk>,
+		controller: TransformStreamDefaultController<EncodedAudioChunk>,
 		frame: EncodedAudioChunk,
 		metadata?: EncodedAudioChunkMetadata,
 	) {
 		const config = metadata?.decoderConfig
-		if (config && !this.#decoderConfig) {
+		if (config && !this.#decoderConfig.pending) {
 			const config = metadata.decoderConfig
 			if (!config) throw new Error("missing decoder config")
 
-			controller.enqueue(config)
-			this.#decoderConfig = config
+			this.#decoderConfig.resolve(config)
 		}
 
 		controller.enqueue(frame)
@@ -72,4 +123,8 @@ export class Encoder {
 	get config() {
 		return this.#encoderConfig
 	}
+
+	async decoderConfig(): Promise<AudioDecoderConfig> {
+		return await this.#decoderConfig.promise
+	}
 }
diff --git a/packages/moq/contribute/broadcast.ts b/packages/moq/contribute/broadcast.ts
index 2f8224fb..f0b61e46 100644
--- a/packages/moq/contribute/broadcast.ts
+++ b/packages/moq/contribute/broadcast.ts
@@ -1,15 +1,14 @@
-import { Connection, SubscribeRecv } from "../transport"
-import { asError } from "../common/error"
-import { Segment } from "./segment"
-import { Track } from "./track"
-import * as Catalog from "../media/catalog"
+import * as Catalog from "../karp/catalog"
+import * as Transfork from "../transfork"
+import * as Audio from "./audio"
+import * as Video from "./video"
 
 import { isAudioTrackSettings, isVideoTrackSettings } from "../common/settings"
 
 export interface BroadcastConfig {
-	namespace: string
-	connection: Connection
+	path: string[]
 	media: MediaStream
+	id?: number
 
 	audio?: AudioEncoderConfig
 	video?: VideoEncoderConfig
@@ -21,221 +20,89 @@ export interface BroadcastConfigTrack {
 }
 
 export class Broadcast {
-	#tracks = new Map<string, Track>()
-
-	readonly config: BroadcastConfig
-	readonly catalog: Catalog.Root
-	readonly connection: Connection
-	readonly namespace: string
-
-	#running: Promise<void>
+	#config: BroadcastConfig
+	#path: string[]
 
 	constructor(config: BroadcastConfig) {
-		this.connection = config.connection
-		this.config = config
-		this.namespace = config.namespace
+		const id = config.id || new Date().getTime() / 1000
 
-		const tracks: Catalog.Track[] = []
+		this.#config = config
+		this.#path = config.path.concat(id.toString())
+	}
 
-		for (const media of this.config.media.getTracks()) {
-			const track = new Track(media, config)
-			this.#tracks.set(track.name, track)
+	async publish(connection: Transfork.Connection) {
+		const broadcast: Catalog.Broadcast = {
+			path: this.#config.path,
+			audio: [],
+			video: [],
+		}
 
+		for (const media of this.#config.media.getTracks()) {
 			const settings = media.getSettings()
 
+			const info = {
+				name: media.id, // TODO way too verbose
+				priority: media.kind === "video" ? 1 : 2,
+			}
+
+			const track = new Transfork.Track(this.#config.path.concat(info.name), info.priority)
+
 			if (isVideoTrackSettings(settings)) {
-				if (!config.video) {
+				if (!this.#config.video) {
 					throw new Error("no video configuration provided")
 				}
 
-				const video: Catalog.VideoTrack = {
-					namespace: this.namespace,
-					name: `${track.name}.m4s`,
-					initTrack: `${track.name}.mp4`,
-					selectionParams: {
-						mimeType: "video/mp4",
-						codec: config.video.codec,
-						width: settings.width,
-						height: settings.height,
-						framerate: settings.frameRate,
-						bitrate: config.video.bitrate,
-					},
+				const encoder = new Video.Encoder(this.#config.video)
+				const packer = new Video.Packer(media as MediaStreamVideoTrack, encoder, track)
+
+				// TODO handle error
+				packer.run().catch((err) => console.error("failed to run video packer: ", err))
+
+				const decoder = await encoder.decoderConfig()
+				const description = decoder.description ? new Uint8Array(decoder.description as ArrayBuffer) : undefined
+
+				const video: Catalog.Video = {
+					track: info,
+					codec: decoder.codec,
+					description: description,
+					resolution: { width: settings.width, height: settings.height },
+					frame_rate: settings.frameRate,
+					bitrate: this.#config.video.bitrate,
 				}
 
-				tracks.push(video)
+				broadcast.video.push(video)
 			} else if (isAudioTrackSettings(settings)) {
-				if (!config.audio) {
+				if (!this.#config.audio) {
 					throw new Error("no audio configuration provided")
 				}
 
-				const audio: Catalog.AudioTrack = {
-					namespace: this.namespace,
-					name: `${track.name}.m4s`,
-					initTrack: `${track.name}.mp4`,
-					selectionParams: {
-						mimeType: "audio/ogg",
-						codec: config.audio.codec,
-						samplerate: settings.sampleRate,
-						//sampleSize: settings.sampleSize,
-						channelConfig: `${settings.channelCount}`,
-						bitrate: config.audio.bitrate,
-					},
+				const encoder = new Audio.Encoder(this.#config.audio)
+				const packer = new Audio.Packer(media as MediaStreamAudioTrack, encoder, track)
+				packer.run().catch((err) => console.error("failed to run audio packer: ", err)) // TODO handle error
+
+				const decoder = await encoder.decoderConfig()
+
+				const audio: Catalog.Audio = {
+					track: info,
+					codec: decoder.codec,
+					sample_rate: settings.sampleRate,
+					channel_count: settings.channelCount,
+					bitrate: this.#config.audio.bitrate,
 				}
 
-				tracks.push(audio)
+				broadcast.audio.push(audio)
 			} else {
 				throw new Error(`unknown track type: ${media.kind}`)
 			}
-		}
-
-		this.catalog = {
-			version: 1,
-			streamingFormat: 1,
-			streamingFormatVersion: "0.2",
-			supportsDeltaUpdates: false,
-			commonTrackFields: {
-				packaging: "cmaf",
-				renderGroup: 1,
-			},
-			tracks,
-		}
-
-		this.#running = this.#run()
-	}
-
-	async #run() {
-		await this.connection.announce(this.namespace)
-
-		for (;;) {
-			const subscriber = await this.connection.subscribed()
-			if (!subscriber) break
-
-			// Run an async task to serve each subscription.
-			this.#serveSubscribe(subscriber).catch((e) => {
-				const err = asError(e)
-				console.warn("failed to serve subscribe", err)
-			})
-		}
-	}
 
-	async #serveSubscribe(subscriber: SubscribeRecv) {
-		try {
-			const [base, ext] = splitExt(subscriber.track)
-			if (ext === "catalog") {
-				await this.#serveCatalog(subscriber, base)
-			} else if (ext === "mp4") {
-				await this.#serveInit(subscriber, base)
-			} else if (ext === "m4s") {
-				await this.#serveTrack(subscriber, base)
-			} else {
-				throw new Error(`unknown subscription: ${subscriber.track}`)
-			}
-		} catch (e) {
-			const err = asError(e)
-			await subscriber.close(1n, `failed to process subscribe: ${err.message}`)
-		} finally {
-			// TODO we can't close subscribers because there's no support for clean termination
-			// await subscriber.close()
+			connection.publish(track.reader())
 		}
-	}
 
-	async #serveCatalog(subscriber: SubscribeRecv, name: string) {
-		// We only support ".catalog"
-		if (name !== "") throw new Error(`unknown catalog: ${name}`)
+		const track = new Transfork.Track(this.#config.path.concat("catalog.json"), 0)
+		track.appendGroup().writeFrames(Catalog.encode(broadcast))
 
-		const bytes = Catalog.encode(this.catalog)
-
-		// Send a SUBSCRIBE_OK
-		await subscriber.ack()
-
-		const stream = await subscriber.group({ group: 0 })
-		await stream.write({ object: 0, payload: bytes })
-		await stream.close()
+		connection.publish(track.reader())
 	}
 
-	async #serveInit(subscriber: SubscribeRecv, name: string) {
-		const track = this.#tracks.get(name)
-		if (!track) throw new Error(`no track with name ${subscriber.track}`)
-
-		// Send a SUBSCRIBE_OK
-		await subscriber.ack()
-
-		const init = await track.init()
-
-		const stream = await subscriber.group({ group: 0 })
-		await stream.write({ object: 0, payload: init })
-		await stream.close()
-	}
-
-	async #serveTrack(subscriber: SubscribeRecv, name: string) {
-		const track = this.#tracks.get(name)
-		if (!track) throw new Error(`no track with name ${subscriber.track}`)
-
-		// Send a SUBSCRIBE_OK
-		await subscriber.ack()
-
-		const segments = track.segments().getReader()
-
-		for (;;) {
-			const { value: segment, done } = await segments.read()
-			if (done) break
-
-			// Serve the segment and log any errors that occur.
-			this.#serveSegment(subscriber, segment).catch((e) => {
-				const err = asError(e)
-				console.warn("failed to serve segment", err)
-			})
-		}
-	}
-
-	async #serveSegment(subscriber: SubscribeRecv, segment: Segment) {
-		// Create a new stream for each segment.
-		const stream = await subscriber.group({
-			group: segment.id,
-			priority: 0, // TODO
-		})
-
-		let object = 0
-
-		// Pipe the segment to the stream.
-		const chunks = segment.chunks().getReader()
-		for (;;) {
-			const { value, done } = await chunks.read()
-			if (done) break
-
-			await stream.write({
-				object,
-				payload: value,
-			})
-
-			object += 1
-		}
-
-		await stream.close()
-	}
-
-	// Attach the captured video stream to the given video element.
-	attach(video: HTMLVideoElement) {
-		video.srcObject = this.config.media
-	}
-
-	close() {
-		// TODO implement publish close
-	}
-
-	// Returns the error message when the connection is closed
-	async closed(): Promise<Error> {
-		try {
-			await this.#running
-			return new Error("closed") // clean termination
-		} catch (e) {
-			return asError(e)
-		}
-	}
-}
-
-function splitExt(s: string): [string, string] {
-	const i = s.lastIndexOf(".")
-	if (i < 0) throw new Error(`no extension found`)
-	return [s.substring(0, i), s.substring(i + 1)]
+	close() {}
 }
diff --git a/packages/moq/contribute/chunk.ts b/packages/moq/contribute/chunk.ts
deleted file mode 100644
index 2fcfe334..00000000
--- a/packages/moq/contribute/chunk.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Extends EncodedVideoChunk, allowing a new "init" type
-export interface Chunk {
-	type: "init" | "key" | "delta"
-	timestamp: number // microseconds
-	duration: number // microseconds
-	data: Uint8Array
-}
diff --git a/packages/moq/contribute/container.ts b/packages/moq/contribute/container.ts
deleted file mode 100644
index ab1b4f1d..00000000
--- a/packages/moq/contribute/container.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import * as MP4 from "../media/mp4"
-import { Chunk } from "./chunk"
-
-type DecoderConfig = AudioDecoderConfig | VideoDecoderConfig
-type EncodedChunk = EncodedAudioChunk | EncodedVideoChunk
-
-export class Container {
-	#mp4: MP4.ISOFile
-	#frame?: EncodedAudioChunk | EncodedVideoChunk // 1 frame buffer
-	#track?: number
-	#segment = 0
-
-	encode: TransformStream<DecoderConfig | EncodedChunk, Chunk>
-
-	constructor() {
-		this.#mp4 = new MP4.ISOFile()
-		this.#mp4.init()
-
-		this.encode = new TransformStream({
-			transform: (frame, controller) => {
-				if (isDecoderConfig(frame)) {
-					return this.#init(frame, controller)
-				} else {
-					return this.#enqueue(frame, controller)
-				}
-			},
-		})
-	}
-
-	#init(frame: DecoderConfig, controller: TransformStreamDefaultController<Chunk>) {
-		if (this.#track) throw new Error("duplicate decoder config")
-
-		let codec = frame.codec.substring(0, 4)
-		if (codec == "opus") {
-			codec = "Opus"
-		}
-
-		const options: MP4.TrackOptions = {
-			type: codec,
-			timescale: 1_000_000,
-		}
-
-		if (isVideoConfig(frame)) {
-			options.width = frame.codedWidth
-			options.height = frame.codedHeight
-		} else {
-			options.channel_count = frame.numberOfChannels
-			options.samplerate = frame.sampleRate
-		}
-
-		if (!frame.description) throw new Error("missing frame description")
-		const desc = frame.description as ArrayBufferLike
-
-		if (codec === "avc1") {
-			options.avcDecoderConfigRecord = desc
-		} else if (codec === "hev1") {
-			options.hevcDecoderConfigRecord = desc
-		} else if (codec === "Opus") {
-			// description is an identification header: https://datatracker.ietf.org/doc/html/rfc7845#section-5.1
-			// The first 8 bytes are the magic string "OpusHead", followed by what we actually want.
-			const dops = new MP4.BoxParser.dOpsBox(undefined)
-
-			// Annoyingly, the header is little endian while MP4 is big endian, so we have to parse.
-			const data = new MP4.Stream(desc, 8, MP4.Stream.LITTLE_ENDIAN)
-			dops.parse(data)
-
-			dops.Version = 0
-			options.description = dops
-			options.hdlr = "soun"
-		} else {
-			throw new Error(`unsupported codec: ${codec}`)
-		}
-
-		this.#track = this.#mp4.addTrack(options)
-		if (!this.#track) throw new Error("failed to initialize MP4 track")
-
-		const buffer = MP4.ISOFile.writeInitializationSegment(this.#mp4.ftyp!, this.#mp4.moov!, 0, 0)
-		const data = new Uint8Array(buffer)
-
-		controller.enqueue({
-			type: "init",
-			timestamp: 0,
-			duration: 0,
-			data,
-		})
-	}
-
-	#enqueue(frame: EncodedChunk, controller: TransformStreamDefaultController<Chunk>) {
-		// Check if we should create a new segment
-		if (frame.type == "key") {
-			this.#segment += 1
-		} else if (this.#segment == 0) {
-			throw new Error("must start with keyframe")
-		}
-
-		// We need a one frame buffer to compute the duration
-		if (!this.#frame) {
-			this.#frame = frame
-			return
-		}
-
-		const duration = frame.timestamp - this.#frame.timestamp
-
-		// TODO avoid this extra copy by writing to the mdat directly
-		// ...which means changing mp4box.js to take an offset instead of ArrayBuffer
-		const buffer = new Uint8Array(this.#frame.byteLength)
-		this.#frame.copyTo(buffer)
-
-		if (!this.#track) throw new Error("missing decoder config")
-
-		// Add the sample to the container
-		this.#mp4.addSample(this.#track, buffer, {
-			duration,
-			dts: this.#frame.timestamp,
-			cts: this.#frame.timestamp,
-			is_sync: this.#frame.type == "key",
-		})
-
-		const stream = new MP4.Stream(undefined, 0, MP4.Stream.BIG_ENDIAN)
-
-		// Moof and mdat atoms are written in pairs.
-		// TODO remove the moof/mdat from the Box to reclaim memory once everything works
-		for (;;) {
-			const moof = this.#mp4.moofs.shift()
-			const mdat = this.#mp4.mdats.shift()
-
-			if (!moof && !mdat) break
-			if (!moof) throw new Error("moof missing")
-			if (!mdat) throw new Error("mdat missing")
-
-			moof.write(stream)
-			mdat.write(stream)
-		}
-
-		// TODO avoid this extra copy by writing to the buffer provided in copyTo
-		const data = new Uint8Array(stream.buffer)
-
-		controller.enqueue({
-			type: this.#frame.type,
-			timestamp: this.#frame.timestamp,
-			duration: this.#frame.duration ?? 0,
-			data,
-		})
-
-		this.#frame = frame
-	}
-
-	/* TODO flush the last frame
-	#flush(controller: TransformStreamDefaultController<Chunk>) {
-		if (this.#frame) {
-			// TODO guess the duration
-			this.#enqueue(this.#frame, 0, controller)
-		}
-	}
-	*/
-}
-
-function isDecoderConfig(frame: DecoderConfig | EncodedChunk): frame is DecoderConfig {
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-	return (frame as DecoderConfig).codec !== undefined
-}
-
-function isVideoConfig(frame: DecoderConfig): frame is VideoDecoderConfig {
-	return (frame as VideoDecoderConfig).codedWidth !== undefined
-}
diff --git a/packages/moq/contribute/segment.ts b/packages/moq/contribute/segment.ts
index f0aa8195..fa5a65e6 100644
--- a/packages/moq/contribute/segment.ts
+++ b/packages/moq/contribute/segment.ts
@@ -1,10 +1,10 @@
-import { Chunk } from "./chunk"
+import type { Frame } from "../karp/frame"
 
 export class Segment {
 	id: number
 
-	// Take in a stream of chunks
-	input: WritableStream<Chunk>
+	// Take in a stream of frames
+	input: WritableStream<Frame>
 
 	// Output a stream of bytes, which we fork for each new subscriber.
 	#cache: ReadableStream<Uint8Array>
@@ -16,16 +16,18 @@ export class Segment {
 
 		// Set a max size for each segment, dropping the tail if it gets too long.
 		// We tee the reader, so this limit applies to the FASTEST reader.
-		const backpressure = new ByteLengthQueuingStrategy({ highWaterMark: 8_000_000 })
+		const backpressure = new ByteLengthQueuingStrategy({
+			highWaterMark: 8_000_000,
+		})
 
-		const transport = new TransformStream<Chunk, Uint8Array>(
+		const transport = new TransformStream<Frame, Uint8Array>(
 			{
-				transform: (chunk: Chunk, controller) => {
+				transform: (frame: Frame, controller) => {
 					// Compute the max timestamp of the segment
-					this.timestamp = Math.max(chunk.timestamp + chunk.duration)
+					this.timestamp = Math.max(this.timestamp, frame.timestamp)
 
 					// Push the chunk to any listeners.
-					controller.enqueue(chunk.data)
+					controller.enqueue(frame.data)
 				},
 			},
 			undefined,
diff --git a/packages/moq/contribute/track.ts b/packages/moq/contribute/track.ts
index cec70d81..d2a050ee 100644
--- a/packages/moq/contribute/track.ts
+++ b/packages/moq/contribute/track.ts
@@ -1,9 +1,8 @@
-import { Segment } from "./segment"
 import { Notify } from "../common/async"
-import { Chunk } from "./chunk"
-import { Container } from "./container"
-import { BroadcastConfig } from "./broadcast"
+import type { BroadcastConfig } from "./broadcast"
+import { Segment } from "./segment"
 
+import type { Frame } from "../karp/frame"
 import * as Audio from "./audio"
 import * as Video from "./video"
 
@@ -36,7 +35,6 @@ export class Track {
 	async #runAudio(track: MediaStreamAudioTrack, config: AudioEncoderConfig) {
 		const source = new MediaStreamTrackProcessor({ track })
 		const encoder = new Audio.Encoder(config)
-		const container = new Container()
 
 		// Split the container at keyframe boundaries
 		const segments = new WritableStream({
@@ -45,13 +43,12 @@ export class Track {
 			abort: (e) => this.#close(e),
 		})
 
-		return source.readable.pipeThrough(encoder.frames).pipeThrough(container.encode).pipeTo(segments)
+		return source.readable.pipeThrough(encoder.frames).pipeTo(segments)
 	}
 
 	async #runVideo(track: MediaStreamVideoTrack, config: VideoEncoderConfig) {
 		const source = new MediaStreamTrackProcessor({ track })
 		const encoder = new Video.Encoder(config)
-		const container = new Container()
 
 		// Split the container at keyframe boundaries
 		const segments = new WritableStream({
@@ -60,18 +57,12 @@ export class Track {
 			abort: (e) => this.#close(e),
 		})
 
-		return source.readable.pipeThrough(encoder.frames).pipeThrough(container.encode).pipeTo(segments)
+		return source.readable.pipeThrough(encoder.frames).pipeTo(segments)
 	}
 
-	async #write(chunk: Chunk) {
-		if (chunk.type === "init") {
-			this.#init = chunk.data
-			this.#notify.wake()
-			return
-		}
-
+	async #write(frame: Frame) {
 		let current = this.#segments.at(-1)
-		if (!current || chunk.type === "key") {
+		if (!current || frame.type === "key") {
 			if (current) {
 				await current.input.close()
 			}
@@ -88,7 +79,7 @@ export class Track {
 				const first = this.#segments[0]
 
 				// Expire after 10s
-				if (chunk.timestamp - first.timestamp < 10_000_000) break
+				if (frame.timestamp - first.timestamp < 10_000_000) break
 				this.#segments.shift()
 				this.#offset += 1
 
@@ -99,7 +90,7 @@ export class Track {
 		const writer = current.input.getWriter()
 
 		if ((writer.desiredSize || 0) > 0) {
-			await writer.write(chunk)
+			await writer.write(frame)
 		} else {
 			console.warn("dropping chunk", writer.desiredSize)
 		}
@@ -147,7 +138,8 @@ export class Track {
 					if (this.#error) {
 						controller.error(this.#error)
 						return
-					} else if (this.#closed) {
+					}
+					if (this.#closed) {
 						controller.close()
 						return
 					}
diff --git a/packages/moq/contribute/tsconfig.json b/packages/moq/contribute/tsconfig.json
index 70899a7f..693a7071 100644
--- a/packages/moq/contribute/tsconfig.json
+++ b/packages/moq/contribute/tsconfig.json
@@ -9,10 +9,10 @@
 			"path": "../common"
 		},
 		{
-			"path": "../transport"
+			"path": "../transfork"
 		},
 		{
-			"path": "../media"
+			"path": "../karp"
 		}
 	]
 }
diff --git a/packages/moq/contribute/video.ts b/packages/moq/contribute/video.ts
index 747c7659..fa25876c 100644
--- a/packages/moq/contribute/video.ts
+++ b/packages/moq/contribute/video.ts
@@ -1,3 +1,8 @@
+import { Deferred } from "../common/async"
+import type { Frame } from "../karp/frame"
+import type { Group, Track } from "../transfork"
+import { Closed } from "../transfork/error"
+
 const SUPPORTED = [
 	"avc1", // H.264
 	"hev1", // HEVC (aka h.265)
@@ -8,10 +13,55 @@ export interface EncoderSupported {
 	codecs: string[]
 }
 
+export class Packer {
+	#source: MediaStreamTrackProcessor<VideoFrame>
+	#encoder: Encoder
+
+	#data: Track
+	#current?: Group
+
+	constructor(track: MediaStreamVideoTrack, encoder: Encoder, data: Track) {
+		this.#source = new MediaStreamTrackProcessor({ track })
+		this.#encoder = encoder
+		this.#data = data
+	}
+
+	async run() {
+		const output = new WritableStream({
+			write: (chunk) => this.#write(chunk),
+			close: () => this.#close(),
+			abort: (e) => this.#close(e),
+		})
+
+		return this.#source.readable.pipeThrough(this.#encoder.frames).pipeTo(output)
+	}
+
+	#write(frame: Frame) {
+		if (!this.#current || frame.type === "key") {
+			if (this.#current) {
+				this.#current.close()
+			}
+
+			this.#current = this.#data.appendGroup()
+		}
+
+		frame.encode(this.#current)
+	}
+
+	#close(err?: unknown) {
+		const closed = Closed.from(err)
+		if (this.#current) {
+			this.#current.close(closed)
+		}
+
+		this.#data.close(closed)
+	}
+}
+
 export class Encoder {
 	#encoder!: VideoEncoder
 	#encoderConfig: VideoEncoderConfig
-	#decoderConfig?: VideoDecoderConfig
+	#decoderConfig = new Deferred<VideoDecoderConfig>()
 
 	// true if we should insert a keyframe, undefined when the encoder should decide
 	#keyframeNext: true | undefined = true
@@ -20,7 +70,7 @@ export class Encoder {
 	#keyframeCounter = 0
 
 	// Converts raw rames to encoded frames.
-	frames: TransformStream<VideoFrame, VideoDecoderConfig | EncodedVideoChunk>
+	frames: TransformStream<VideoFrame, EncodedVideoChunk>
 
 	constructor(config: VideoEncoderConfig) {
 		config.bitrateMode ??= "constant"
@@ -53,12 +103,17 @@ export class Encoder {
 		return !!res.supported
 	}
 
+	async decoderConfig(): Promise<VideoDecoderConfig> {
+		return await this.#decoderConfig.promise
+	}
+
 	#start(controller: TransformStreamDefaultController<EncodedVideoChunk>) {
 		this.#encoder = new VideoEncoder({
 			output: (frame, metadata) => {
 				this.#enqueue(controller, frame, metadata)
 			},
 			error: (err) => {
+				this.#decoderConfig.reject(err)
 				throw err
 			},
 		})
@@ -77,23 +132,22 @@ export class Encoder {
 	}
 
 	#enqueue(
-		controller: TransformStreamDefaultController<VideoDecoderConfig | EncodedVideoChunk>,
+		controller: TransformStreamDefaultController<EncodedVideoChunk>,
 		frame: EncodedVideoChunk,
 		metadata?: EncodedVideoChunkMetadata,
 	) {
-		if (!this.#decoderConfig) {
+		if (this.#decoderConfig.pending) {
 			const config = metadata?.decoderConfig
 			if (!config) throw new Error("missing decoder config")
-
-			controller.enqueue(config)
-			this.#decoderConfig = config
+			this.#decoderConfig.resolve(config)
 		}
 
 		if (frame.type === "key") {
 			this.#keyframeCounter = 0
 		} else {
 			this.#keyframeCounter += 1
-			if (this.#keyframeCounter + this.#encoder.encodeQueueSize >= 2 * this.#encoderConfig.framerate!) {
+			const framesPerGop = this.#encoderConfig.framerate ? 2 * this.#encoderConfig.framerate : 60
+			if (this.#keyframeCounter + this.#encoder.encodeQueueSize >= framesPerGop) {
 				this.#keyframeNext = true
 			}
 		}
diff --git a/packages/moq/karp/catalog/audio.ts b/packages/moq/karp/catalog/audio.ts
new file mode 100644
index 00000000..00738479
--- /dev/null
+++ b/packages/moq/karp/catalog/audio.ts
@@ -0,0 +1,20 @@
+import { type Track, decodeTrack } from "./track"
+
+export interface Audio {
+	track: Track
+	codec: string
+	sample_rate: number
+	channel_count: number
+	bitrate?: number
+}
+
+export function decodeAudio(o: unknown): o is Audio {
+	if (typeof o !== "object" || o === null) return false
+
+	const obj = o as Partial<Audio>
+	if (!decodeTrack(obj.track)) return false
+	if (typeof obj.codec !== "string") return false
+	if (typeof obj.sample_rate !== "number") return false
+	if (typeof obj.channel_count !== "number") return false
+	return true
+}
diff --git a/packages/moq/karp/catalog/broadcast.ts b/packages/moq/karp/catalog/broadcast.ts
new file mode 100644
index 00000000..dca77336
--- /dev/null
+++ b/packages/moq/karp/catalog/broadcast.ts
@@ -0,0 +1,62 @@
+import * as Transfork from "../../transfork"
+import { type Audio, decodeAudio } from "./audio"
+import { type Video, decodeVideo } from "./video"
+
+export interface Broadcast {
+	path: string[]
+	video: Video[]
+	audio: Audio[]
+}
+
+export function encode(catalog: Broadcast): Uint8Array {
+	const encoder = new TextEncoder()
+	console.debug("encoding catalog", catalog)
+	const str = JSON.stringify(catalog)
+	return encoder.encode(str)
+}
+
+export function decode(path: string[], raw: Uint8Array): Broadcast {
+	const decoder = new TextDecoder()
+	const str = decoder.decode(raw)
+
+	const catalog = JSON.parse(str)
+	if (!decodeBroadcast(catalog)) {
+		console.error("invalid catalog", catalog)
+		throw new Error("invalid catalog")
+	}
+
+	catalog.path = path
+	return catalog
+}
+
+export async function fetch(connection: Transfork.Connection, path: string[]): Promise<Broadcast> {
+	const track = new Transfork.Track(path.concat("catalog.json"), 0)
+	const sub = await connection.subscribe(track)
+	try {
+		const segment = await sub.nextGroup()
+		if (!segment) throw new Error("no catalog data")
+
+		const frame = await segment.readFrame()
+		if (!frame) throw new Error("no catalog frame")
+
+		segment.close()
+		return decode(path, frame)
+	} finally {
+		sub.close()
+	}
+}
+
+export function decodeBroadcast(o: unknown): o is Broadcast {
+	if (typeof o !== "object" || o === null) return false
+
+	const catalog = o as Partial<Broadcast>
+	if (catalog.audio === undefined) catalog.audio = []
+	if (!Array.isArray(catalog.audio)) return false
+	if (!catalog.audio.every((track: unknown) => decodeAudio(track))) return false
+
+	if (catalog.video === undefined) catalog.video = []
+	if (!Array.isArray(catalog.video)) return false
+	if (!catalog.video.every((track: unknown) => decodeVideo(track))) return false
+
+	return true
+}
diff --git a/packages/moq/karp/catalog/index.ts b/packages/moq/karp/catalog/index.ts
new file mode 100644
index 00000000..b7ee4699
--- /dev/null
+++ b/packages/moq/karp/catalog/index.ts
@@ -0,0 +1,7 @@
+import type { Audio } from "./audio"
+import { type Broadcast, decode, encode, fetch } from "./broadcast"
+import type { Track } from "./track"
+import type { Video } from "./video"
+
+export type { Audio, Video, Track, Broadcast }
+export { encode, decode, fetch }
diff --git a/packages/moq/karp/catalog/track.ts b/packages/moq/karp/catalog/track.ts
new file mode 100644
index 00000000..d32b1922
--- /dev/null
+++ b/packages/moq/karp/catalog/track.ts
@@ -0,0 +1,15 @@
+export type GroupOrder = "desc" | "asc"
+
+export interface Track {
+	name: string
+	priority: number
+}
+
+export function decodeTrack(o: unknown): o is Track {
+	if (typeof o !== "object" || o === null) return false
+
+	const obj = o as Partial<Track>
+	if (typeof obj.name !== "string") return false
+	if (typeof obj.priority !== "number") return false
+	return true
+}
diff --git a/packages/moq/karp/catalog/video.ts b/packages/moq/karp/catalog/video.ts
new file mode 100644
index 00000000..2a803f5e
--- /dev/null
+++ b/packages/moq/karp/catalog/video.ts
@@ -0,0 +1,29 @@
+import * as Hex from "../../common/hex"
+import { type Track, decodeTrack } from "./track"
+
+export interface Video {
+	track: Track
+	codec: string
+	description?: Uint8Array
+	bitrate?: number
+	frame_rate?: number
+	resolution: Dimensions
+}
+
+export interface Dimensions {
+	width: number
+	height: number
+}
+
+export function decodeVideo(o: unknown): o is Video {
+	if (typeof o !== "object" || o === null) return false
+
+	const obj = o as Partial<Video>
+	if (!decodeTrack(obj.track)) return false
+	if (typeof obj.codec !== "string") return false
+	if (typeof obj.description !== "string") return false
+
+	obj.description = Hex.decode(obj.description)
+
+	return true
+}
diff --git a/packages/moq/karp/frame.ts b/packages/moq/karp/frame.ts
new file mode 100644
index 00000000..dcd6e7ab
--- /dev/null
+++ b/packages/moq/karp/frame.ts
@@ -0,0 +1,64 @@
+import type { Group, GroupReader } from "../transfork/model"
+import { setVint62 } from "../transfork/stream"
+
+export type FrameType = "key" | "delta"
+
+export class Frame {
+	type: FrameType
+	timestamp: number
+	data: Uint8Array
+
+	constructor(type: FrameType, timestamp: number, data: Uint8Array) {
+		this.type = type
+		this.timestamp = timestamp
+		this.data = data
+	}
+
+	static async decode(group: GroupReader): Promise<Frame | undefined> {
+		const kind = group.index === 0 ? "key" : "delta"
+		const payload = await group.readFrame()
+		if (!payload) {
+			return undefined
+		}
+
+		const [timestamp, data] = decode_timestamp(payload)
+		return new Frame(kind, timestamp, data)
+	}
+
+	encode(group: Group) {
+		if ((group.length === 0) !== (this.type === "key")) {
+			throw new Error(`invalid ${this.type} position`)
+		}
+
+		let frame = new Uint8Array(8 + this.data.byteLength)
+		const size = setVint62(frame, BigInt(this.timestamp)).byteLength
+		frame.set(this.data, size)
+		frame = new Uint8Array(frame.buffer, 0, this.data.byteLength + size)
+
+		group.writeFrame(frame)
+	}
+}
+
+// QUIC VarInt
+function decode_timestamp(buf: Uint8Array): [number, Uint8Array] {
+	const size = 1 << ((buf[0] & 0xc0) >> 6)
+
+	const view = new DataView(buf.buffer, buf.byteOffset, size)
+	const remain = new Uint8Array(buf.buffer, buf.byteOffset + size, buf.byteLength - size)
+	let v: number
+
+	if (size === 1) {
+		v = buf[0] & 0x3f
+	} else if (size === 2) {
+		v = view.getInt16(0) & 0x3fff
+	} else if (size === 4) {
+		v = view.getUint32(0) & 0x3fffffff
+	} else if (size === 8) {
+		// NOTE: Precision loss above 2^52
+		v = Number(view.getBigUint64(0) & 0x3fffffffffffffffn)
+	} else {
+		throw new Error("impossible")
+	}
+
+	return [v, remain]
+}
diff --git a/packages/moq/media/tsconfig.json b/packages/moq/karp/tsconfig.json
similarity index 60%
rename from packages/moq/media/tsconfig.json
rename to packages/moq/karp/tsconfig.json
index 2e4ee287..99227964 100644
--- a/packages/moq/media/tsconfig.json
+++ b/packages/moq/karp/tsconfig.json
@@ -1,12 +1,10 @@
 {
 	"extends": "../tsconfig.json",
 	"include": ["."],
-	"compilerOptions": {
-		"types": ["mp4box"]
-	},
+	"compilerOptions": {},
 	"references": [
 		{
-			"path": "../transport"
+			"path": "../transfork"
 		},
 		{
 			"path": "../common"
diff --git a/packages/moq/media/catalog/index.ts b/packages/moq/media/catalog/index.ts
deleted file mode 100644
index 41170a52..00000000
--- a/packages/moq/media/catalog/index.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import { Connection } from "../../transport"
-import { asError } from "../../common/error"
-
-export interface CommonTrackFields {
-	namespace?: string
-	packaging?: string
-	renderGroup?: number
-	altGroup?: number
-}
-
-export interface Root {
-	version: number
-	streamingFormat: number
-	streamingFormatVersion: string
-	supportsDeltaUpdates: boolean
-	commonTrackFields: CommonTrackFields
-	tracks: Track[]
-}
-
-export function encode(catalog: Root): Uint8Array {
-	const encoder = new TextEncoder()
-	const str = JSON.stringify(catalog)
-	return encoder.encode(str)
-}
-
-export function decode(raw: Uint8Array): Root {
-	const decoder = new TextDecoder()
-	const str = decoder.decode(raw)
-
-	const catalog = JSON.parse(str)
-	if (!isRoot(catalog)) {
-		throw new Error("invalid catalog")
-	}
-
-	// Merge common track fields into each track.
-	for (const track of catalog.tracks) {
-		track.altGroup ??= catalog.commonTrackFields.altGroup
-		track.namespace ??= catalog.commonTrackFields.namespace
-		track.packaging ??= catalog.commonTrackFields.packaging
-		track.renderGroup ??= catalog.commonTrackFields.renderGroup
-	}
-
-	return catalog
-}
-
-export async function fetch(connection: Connection, namespace: string): Promise<Root> {
-	const subscribe = await connection.subscribe(namespace, ".catalog")
-	try {
-		const segment = await subscribe.data()
-		if (!segment) throw new Error("no catalog data")
-
-		const chunk = await segment.read()
-		if (!chunk) throw new Error("no catalog chunk")
-
-		await segment.close()
-		await subscribe.close() // we done
-
-		if (chunk.payload instanceof Uint8Array) {
-			return decode(chunk.payload)
-		} else {
-			throw new Error("invalid catalog chunk")
-		}
-	} catch (e) {
-		const err = asError(e)
-
-		// Close the subscription after we're done.
-		await subscribe.close(1n, err.message)
-
-		throw err
-	}
-}
-
-export function isRoot(catalog: any): catalog is Root {
-	if (!isCatalogFieldValid(catalog, "packaging")) return false
-	if (!isCatalogFieldValid(catalog, "namespace")) return false
-	if (!Array.isArray(catalog.tracks)) return false
-	return catalog.tracks.every((track: any) => isTrack(track))
-}
-
-export interface Track {
-	namespace?: string
-	name: string
-	depends?: any[]
-	packaging?: string
-	renderGroup?: number
-	selectionParams: SelectionParams // technically optional but not really
-	altGroup?: number
-	initTrack?: string
-	initData?: string
-}
-
-export interface Mp4Track extends Track {
-	initTrack?: string
-	initData?: string
-	selectionParams: Mp4SelectionParams
-}
-
-export interface SelectionParams {
-	codec?: string
-	mimeType?: string
-	bitrate?: number
-	lang?: string
-}
-
-export interface Mp4SelectionParams extends SelectionParams {
-	mimeType: "video/mp4"
-}
-
-export interface AudioTrack extends Track {
-	name: string
-	selectionParams: AudioSelectionParams
-}
-
-export interface AudioSelectionParams extends SelectionParams {
-	samplerate: number
-	channelConfig: string
-}
-
-export interface VideoTrack extends Track {
-	name: string
-	selectionParams: VideoSelectionParams
-	temporalId?: number
-	spatialId?: number
-}
-
-export interface VideoSelectionParams extends SelectionParams {
-	width: number
-	height: number
-	displayWidth?: number
-	displayHeight?: number
-	framerate?: number
-}
-
-export function isTrack(track: any): track is Track {
-	if (typeof track.name !== "string") return false
-	return true
-}
-
-export function isMp4Track(track: any): track is Mp4Track {
-	if (!isTrack(track)) return false
-	if (typeof track.initTrack !== "string" && typeof track.initData !== "string") return false
-	if (typeof track.selectionParams.mimeType !== "string") return false
-	return true
-}
-
-export function isVideoTrack(track: any): track is VideoTrack {
-	if (!isTrack(track)) return false
-	return isVideoSelectionParams(track.selectionParams)
-}
-
-export function isVideoSelectionParams(params: any): params is VideoSelectionParams {
-	if (typeof params.width !== "number") return false
-	if (typeof params.height !== "number") return false
-	return true
-}
-
-export function isAudioTrack(track: any): track is AudioTrack {
-	if (!isTrack(track)) return false
-	return isAudioSelectionParams(track.selectionParams)
-}
-
-export function isAudioSelectionParams(params: any): params is AudioSelectionParams {
-	if (typeof params.channelConfig !== "string") return false
-	if (typeof params.samplerate !== "number") return false
-	return true
-}
-
-function isCatalogFieldValid(catalog: any, field: string): boolean {
-	//packaging,namespace if common would be listed in commonTrackFields but if fields
-	//in commonTrackFields are mentiond in Tracks , the fields in Tracks precedes
-
-	function isValidPackaging(packaging: any): boolean {
-		return packaging === "cmaf" || packaging === "loc"
-	}
-
-	function isValidNamespace(namespace: any): boolean {
-		return typeof namespace === "string"
-	}
-
-	let isValidField: (value: any) => boolean
-	if (field === "packaging") {
-		isValidField = isValidPackaging
-	} else if (field === "namespace") {
-		isValidField = isValidNamespace
-	} else {
-		throw new Error(`Invalid field: ${field}`)
-	}
-
-	if (catalog.commonTrackFields[field] !== undefined && !isValidField(catalog.commonTrackFields[field])) {
-		return false
-	}
-
-	for (const track of catalog.tracks) {
-		if (track[field] !== undefined && !isValidField(track[field])) {
-			return false
-		}
-	}
-
-	return true
-}
-
-export function isMediaTrack(track: any): track is Track {
-	if (track.name.toLowerCase().includes("audio") || track.name.toLowerCase().includes("video")) {
-		return true
-	}
-
-	if (track.selectionParams && track.selectionParams.codec) {
-		const codec = track.selectionParams.codec.toLowerCase()
-		const acceptedCodecs = ["mp4a", "avc1"]
-
-		for (const acceptedCodec of acceptedCodecs) {
-			if (codec.includes(acceptedCodec)) {
-				return true
-			}
-		}
-	}
-	return false
-}
diff --git a/packages/moq/media/mp4/index.ts b/packages/moq/media/mp4/index.ts
deleted file mode 100644
index 5301db33..00000000
--- a/packages/moq/media/mp4/index.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Rename some stuff so it's on brand.
-// We need a separate file so this file can use the rename too.
-import * as MP4 from "./rename"
-export * from "./rename"
-
-export * from "./parser"
-
-export function isAudioTrack(track: MP4.Track): track is MP4.AudioTrack {
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-	return (track as MP4.AudioTrack).audio !== undefined
-}
-
-export function isVideoTrack(track: MP4.Track): track is MP4.VideoTrack {
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-	return (track as MP4.VideoTrack).video !== undefined
-}
-
-// TODO contribute to mp4box
-MP4.BoxParser.dOpsBox.prototype.write = function (stream: MP4.Stream) {
-	this.size = this.ChannelMappingFamily === 0 ? 11 : 13 + this.ChannelMapping!.length
-	this.writeHeader(stream)
-
-	stream.writeUint8(this.Version)
-	stream.writeUint8(this.OutputChannelCount)
-	stream.writeUint16(this.PreSkip)
-	stream.writeUint32(this.InputSampleRate)
-	stream.writeInt16(this.OutputGain)
-	stream.writeUint8(this.ChannelMappingFamily)
-
-	if (this.ChannelMappingFamily !== 0) {
-		stream.writeUint8(this.StreamCount!)
-		stream.writeUint8(this.CoupledCount!)
-		for (const mapping of this.ChannelMapping!) {
-			stream.writeUint8(mapping)
-		}
-	}
-}
diff --git a/packages/moq/media/mp4/parser.ts b/packages/moq/media/mp4/parser.ts
deleted file mode 100644
index 7cc78d08..00000000
--- a/packages/moq/media/mp4/parser.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import * as MP4 from "./index"
-
-export interface Frame {
-	track: MP4.Track // The track this frame belongs to
-	sample: MP4.Sample // The actual sample contain the frame data
-}
-
-// Decode a MP4 container into individual samples.
-export class Parser {
-	info!: MP4.Info
-
-	#mp4 = MP4.New()
-	#offset = 0
-
-	#samples: Array<Frame> = []
-
-	constructor(init: Uint8Array) {
-		this.#mp4.onError = (err) => {
-			console.error("MP4 error", err)
-		}
-
-		this.#mp4.onReady = (info: MP4.Info) => {
-			this.info = info
-
-			// Extract all of the tracks, because we don't know if it's audio or video.
-			for (const track of info.tracks) {
-				this.#mp4.setExtractionOptions(track.id, track, { nbSamples: 1 })
-			}
-		}
-
-		this.#mp4.onSamples = (_track_id: number, track: MP4.Track, samples: MP4.Sample[]) => {
-			for (const sample of samples) {
-				this.#samples.push({ track, sample })
-			}
-		}
-
-		this.#mp4.start()
-
-		// For some reason we need to modify the underlying ArrayBuffer with offset
-		const copy = new Uint8Array(init)
-		const buffer = copy.buffer as MP4.ArrayBuffer
-		buffer.fileStart = this.#offset
-
-		this.#mp4.appendBuffer(buffer)
-		this.#offset += buffer.byteLength
-		this.#mp4.flush()
-
-		if (!this.info) {
-			throw new Error("could not parse MP4 info")
-		}
-	}
-
-	decode(chunk: Uint8Array): Array<Frame> {
-		const copy = new Uint8Array(chunk)
-
-		// For some reason we need to modify the underlying ArrayBuffer with offset
-		const buffer = copy.buffer as MP4.ArrayBuffer
-		buffer.fileStart = this.#offset
-
-		// Parse the data
-		this.#mp4.appendBuffer(buffer)
-		this.#mp4.flush()
-
-		this.#offset += buffer.byteLength
-
-		const samples = [...this.#samples]
-		this.#samples.length = 0
-
-		return samples
-	}
-}
diff --git a/packages/moq/media/mp4/rename.ts b/packages/moq/media/mp4/rename.ts
deleted file mode 100644
index 36f8fc88..00000000
--- a/packages/moq/media/mp4/rename.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Rename some stuff so it's on brand.
-export { createFile as New, DataStream as Stream, ISOFile, BoxParser, Log } from "mp4box"
-
-export type {
-	MP4ArrayBuffer as ArrayBuffer,
-	MP4Info as Info,
-	MP4Track as Track,
-	MP4AudioTrack as AudioTrack,
-	MP4VideoTrack as VideoTrack,
-	Sample,
-	TrackOptions,
-	SampleOptions,
-} from "mp4box"
diff --git a/packages/moq/package.json b/packages/moq/package.json
index 30535dd2..09f2568e 100644
--- a/packages/moq/package.json
+++ b/packages/moq/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@nestri/moq",
+	"name": "@nestri/libmoq",
 	"type": "module",
 	"version": "0.1.4",
 	"description": "Media over QUIC library",
@@ -7,23 +7,14 @@
 	"repository": "github:kixelated/moq-js",
 	"scripts": {
 		"build": "tsc -b && cp ../LICENSE* ./dist && cp ./README.md ./dist && cp ./package.json ./dist",
-		"lint": "eslint .",
-		"fmt": "prettier --write ."
+		"check": "biome check",
+		"fix": "biome check --write"
 	},
 	"devDependencies": {
 		"@types/audioworklet": "^0.0.50",
 		"@types/dom-mediacapture-transform": "^0.1.6",
 		"@types/dom-webcodecs": "^0.1.8",
 		"@typescript/lib-dom": "npm:@types/web@^0.0.115",
-		"@typescript-eslint/eslint-plugin": "^6.4.0",
-		"@typescript-eslint/parser": "^6.4.0",
-		"eslint": "^8.47.0",
-		"eslint-config-prettier": "^9.0.0",
-		"eslint-plugin-prettier": "^5.0.0",
-		"prettier": "^3.0.1",
 		"typescript": "^5.1.6"
-	},
-	"dependencies": {
-		"mp4box": "^0.5.2"
 	}
 }
diff --git a/packages/moq/playback/audio.ts b/packages/moq/playback/audio.ts
index 687885a7..5f0565a8 100644
--- a/packages/moq/playback/audio.ts
+++ b/packages/moq/playback/audio.ts
@@ -1,34 +1,57 @@
 /// <reference types="vite/client" />
 
-import * as Message from "./worker/message"
+import { Ring, RingShared } from "../common/ring"
+import type * as Catalog from "../karp/catalog"
+import type { Frame } from "../karp/frame"
+import type { Component } from "./timeline"
 
 // This is a non-standard way of importing worklet/workers.
 // Unfortunately, it's the only option because of a Vite bug: https://github.com/vitejs/vite/issues/11823
 import workletURL from "./worklet/index.ts?worker&url"
 
-// NOTE: This must be on the main thread
-export class Audio {
-	context: AudioContext
-	worklet: Promise<AudioWorkletNode>
+export class Renderer {
+	#context: AudioContext
+	#worklet: Promise<AudioWorkletNode>
 
-	constructor(config: Message.ConfigAudio) {
-		this.context = new AudioContext({
+	#ring: Ring
+	#ringShared: RingShared
+
+	#timeline: Component
+	#track: Catalog.Audio
+
+	#decoder!: AudioDecoder
+	#stream: TransformStream<Frame, AudioData>
+
+	constructor(track: Catalog.Audio, timeline: Component) {
+		this.#track = track
+		this.#context = new AudioContext({
 			latencyHint: "interactive",
-			sampleRate: config.sampleRate,
+			sampleRate: track.sample_rate,
+		})
+
+		this.#worklet = this.load(track)
+
+		this.#timeline = timeline
+		this.#ringShared = new RingShared(2, track.sample_rate / 10) // 100ms
+		this.#ring = new Ring(this.#ringShared)
+
+		this.#stream = new TransformStream({
+			start: this.#start.bind(this),
+			transform: this.#transform.bind(this),
 		})
 
-		this.worklet = this.load(config)
+		this.#run().catch((err) => console.error("failed to run audio renderer: ", err))
 	}
 
-	private async load(config: Message.ConfigAudio): Promise<AudioWorkletNode> {
+	private async load(catalog: Catalog.Audio): Promise<AudioWorkletNode> {
 		// Load the worklet source code.
-		await this.context.audioWorklet.addModule(workletURL)
+		await this.#context.audioWorklet.addModule(workletURL)
 
-		const volume = this.context.createGain()
+		const volume = this.#context.createGain()
 		volume.gain.value = 2.0
 
 		// Create the worklet
-		const worklet = new AudioWorkletNode(this.context, "renderer")
+		const worklet = new AudioWorkletNode(this.#context, "renderer")
 
 		worklet.port.addEventListener("message", this.on.bind(this))
 		worklet.onprocessorerror = (e: Event) => {
@@ -37,7 +60,13 @@ export class Audio {
 
 		// Connect the worklet to the volume node and then to the speakers
 		worklet.connect(volume)
-		volume.connect(this.context.destination)
+		volume.connect(this.#context.destination)
+
+		const config = {
+			sampleRate: catalog.sample_rate,
+			channelCount: catalog.channel_count,
+			ring: this.#ringShared,
+		}
 
 		worklet.port.postMessage({ config })
 
@@ -47,4 +76,58 @@ export class Audio {
 	private on(_event: MessageEvent) {
 		// TODO
 	}
+
+	play() {
+		this.#context.resume().catch((err) => console.warn("failed to resume audio context: ", err))
+	}
+
+	close() {
+		this.#context.close().catch((err) => console.warn("failed to close audio context: ", err))
+	}
+
+	#start(controller: TransformStreamDefaultController) {
+		this.#decoder = new AudioDecoder({
+			output: (frame: AudioData) => {
+				controller.enqueue(frame)
+			},
+			error: console.warn,
+		})
+
+		// We only support OPUS right now which doesn't need a description.
+		this.#decoder.configure({
+			codec: this.#track.codec,
+			sampleRate: this.#track.sample_rate,
+			numberOfChannels: this.#track.channel_count,
+		})
+	}
+
+	#transform(frame: Frame) {
+		const chunk = new EncodedAudioChunk({
+			type: frame.type,
+			timestamp: frame.timestamp,
+			data: frame.data,
+		})
+
+		this.#decoder.decode(chunk)
+	}
+
+	async #run() {
+		const reader = this.#timeline.frames.pipeThrough(this.#stream).getReader()
+
+		for (;;) {
+			const { value: frame, done } = await reader.read()
+			if (done) break
+
+			// Write audio samples to the ring buffer, dropping when there's no space.
+			const written = this.#ring.write(frame)
+
+			if (written < frame.numberOfFrames) {
+				/*
+				console.warn(
+					`droppped ${frame.numberOfFrames - written} audio samples`,
+				);
+				*/
+			}
+		}
+	}
 }
diff --git a/packages/moq/playback/backend.ts b/packages/moq/playback/backend.ts
deleted file mode 100644
index 2b336ce1..00000000
--- a/packages/moq/playback/backend.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/// <reference types="vite/client" />
-
-import * as Message from "./worker/message"
-import { Audio } from "./audio"
-
-import MediaWorker from "./worker?worker"
-import { RingShared } from "../common/ring"
-import { Root, isAudioTrack } from "../media/catalog"
-import { GroupHeader } from "../transport/objects"
-
-export interface PlayerConfig {
-	canvas: OffscreenCanvas
-	catalog: Root
-}
-
-// This is a non-standard way of importing worklet/workers.
-// Unfortunately, it's the only option because of a Vite bug: https://github.com/vitejs/vite/issues/11823
-
-// Responsible for sending messages to the worker and worklet.
-export default class Backend {
-	// General worker
-	#worker: Worker
-
-	// The audio context, which must be created on the main thread.
-	#audio?: Audio
-
-	constructor(config: PlayerConfig) {
-		// TODO does this block the main thread? If so, make this async
-		// @ts-expect-error: The Vite typing is wrong https://github.com/vitejs/vite/blob/22bd67d70a1390daae19ca33d7de162140d533d6/packages/vite/client.d.ts#L182
-		this.#worker = new MediaWorker({ format: "es" })
-		this.#worker.addEventListener("message", this.on.bind(this))
-
-		let sampleRate: number | undefined
-		let channels: number | undefined
-
-		for (const track of config.catalog.tracks) {
-			if (isAudioTrack(track)) {
-				if (sampleRate && track.selectionParams.samplerate !== sampleRate) {
-					throw new Error(`TODO multiple audio tracks with different sample rates`)
-				}
-
-				sampleRate = track.selectionParams.samplerate
-
-				// TODO properly handle weird channel configs
-				channels = Math.max(+track.selectionParams.channelConfig, channels ?? 0)
-			}
-		}
-
-		const msg: Message.Config = {}
-
-		// Only configure audio is we have an audio track
-		if (sampleRate && channels) {
-			msg.audio = {
-				channels: channels,
-				sampleRate: sampleRate,
-				ring: new RingShared(2, sampleRate / 10), // 100ms
-			}
-
-			this.#audio = new Audio(msg.audio)
-		}
-
-		// TODO only send the canvas if we have a video track
-		msg.video = {
-			canvas: config.canvas,
-		}
-
-		this.send({ config: msg }, msg.video.canvas)
-	}
-
-	async play() {
-		await this.#audio?.context.resume()
-	}
-
-	init(init: Init) {
-		this.send({ init })
-	}
-
-	segment(segment: Segment) {
-		this.send({ segment }, segment.stream)
-	}
-
-	async close() {
-		this.#worker.terminate()
-		await this.#audio?.context.close()
-	}
-
-	// Enforce we're sending valid types to the worker
-	private send(msg: Message.ToWorker, ...transfer: Transferable[]) {
-		//console.log("sent message from main to worker", msg)
-		this.#worker.postMessage(msg, transfer)
-	}
-
-	private on(e: MessageEvent) {
-		const msg = e.data as Message.FromWorker
-
-		// Don't print the verbose timeline message.
-		if (!msg.timeline) {
-			//console.log("received message from worker to main", msg)
-		}
-	}
-}
-
-export interface Init {
-	name: string // name of the init track
-	data: Uint8Array
-}
-
-export interface Segment {
-	init: string // name of the init track
-	kind: "audio" | "video"
-	header: GroupHeader
-	buffer: Uint8Array
-	stream: ReadableStream<Uint8Array>
-}
diff --git a/packages/moq/playback/broadcast.ts b/packages/moq/playback/broadcast.ts
new file mode 100644
index 00000000..690572f6
--- /dev/null
+++ b/packages/moq/playback/broadcast.ts
@@ -0,0 +1,148 @@
+import type * as Catalog from "../karp/catalog"
+import type { Connection } from "../transfork/connection"
+
+import { Track } from "../transfork"
+
+import { Frame } from "../karp/frame"
+import type { GroupReader } from "../transfork/model"
+import * as Audio from "./audio"
+import { Timeline } from "./timeline"
+import * as Video from "./video"
+
+// This class must be created on the main thread due to AudioContext.
+export class Broadcast {
+	#connection: Connection
+	#catalog: Catalog.Broadcast
+
+	// Running is a promise that resolves when the player is closed.
+	// #close is called with no error, while #abort is called with an error.
+	#running: Promise<void>
+
+	// Timeline receives samples, buffering them and choosing the timestamp to render.
+	#timeline = new Timeline()
+
+	#audio?: Audio.Renderer
+	#video?: Video.Renderer
+
+	constructor(connection: Connection, catalog: Catalog.Broadcast, canvas: HTMLCanvasElement) {
+		this.#connection = connection
+		this.#catalog = catalog
+
+		const running = []
+
+		// Only configure audio is we have an audio track
+		const audio = (catalog.audio || []).at(0)
+		if (audio) {
+			this.#audio = new Audio.Renderer(audio, this.#timeline.audio)
+			running.push(this.#runAudio(audio))
+		}
+
+		const video = (catalog.video || []).at(0)
+		if (video) {
+			this.#video = new Video.Renderer(video, canvas, this.#timeline.video)
+			running.push(this.#runVideo(video))
+		}
+
+		// Async work
+		this.#running = Promise.race([...running])
+	}
+
+	async #runAudio(audio: Catalog.Audio) {
+		const track = new Track(this.#catalog.path.concat(audio.track.name), audio.track.priority)
+		const sub = await this.#connection.subscribe(track)
+
+		try {
+			for (;;) {
+				const group = await Promise.race([sub.nextGroup(), this.#running])
+				if (!group) break
+
+				this.#runAudioGroup(audio, group)
+					.catch(() => {})
+					.finally(() => group.close())
+			}
+		} finally {
+			sub.close()
+		}
+	}
+
+	async #runVideo(video: Catalog.Video) {
+		const track = new Track(this.#catalog.path.concat(video.track.name), video.track.priority)
+		const sub = await this.#connection.subscribe(track)
+
+		try {
+			for (;;) {
+				const group = await Promise.race([sub.nextGroup(), this.#running])
+				if (!group) break
+
+				this.#runVideoGroup(video, group)
+					.catch(() => {})
+					.finally(() => group.close())
+			}
+		} finally {
+			sub.close()
+		}
+	}
+
+	async #runAudioGroup(audio: Catalog.Audio, group: GroupReader) {
+		const timeline = this.#timeline.audio
+
+		// Create a queue that will contain each frame
+		const queue = new TransformStream<Frame>({})
+		const segment = queue.writable.getWriter()
+
+		// Add the segment to the timeline
+		const segments = timeline.segments.getWriter()
+		await segments.write({
+			sequence: group.id,
+			frames: queue.readable,
+		})
+		segments.releaseLock()
+
+		// Read each chunk, decoding the MP4 frames and adding them to the queue.
+		for (;;) {
+			const frame = await Frame.decode(group)
+			if (!frame) break
+
+			await segment.write(frame)
+		}
+
+		// We done.
+		await segment.close()
+	}
+
+	async #runVideoGroup(video: Catalog.Video, group: GroupReader) {
+		const timeline = this.#timeline.video
+
+		// Create a queue that will contain each MP4 frame.
+		const queue = new TransformStream<Frame>({})
+		const segment = queue.writable.getWriter()
+
+		// Add the segment to the timeline
+		const segments = timeline.segments.getWriter()
+		await segments.write({
+			sequence: group.id,
+			frames: queue.readable,
+		})
+		segments.releaseLock()
+
+		for (;;) {
+			const frame = await Frame.decode(group)
+			if (!frame) break
+
+			await segment.write(frame)
+		}
+
+		// We done.
+		await segment.close()
+	}
+
+	unmute() {
+		console.debug("unmuting audio")
+		this.#audio?.play()
+	}
+
+	close() {
+		this.#audio?.close()
+		this.#video?.close()
+	}
+}
diff --git a/packages/moq/playback/index.ts b/packages/moq/playback/index.ts
index 706b2f2c..68cc5738 100644
--- a/packages/moq/playback/index.ts
+++ b/packages/moq/playback/index.ts
@@ -1,190 +1,2 @@
-import * as Message from "./worker/message"
-
-import { Connection } from "../transport/connection"
-import * as Catalog from "../media/catalog"
-import { asError } from "../common/error"
-
-import Backend from "./backend"
-
-import { Client } from "../transport/client"
-import { GroupReader } from "../transport/objects"
-
-export type Range = Message.Range
-export type Timeline = Message.Timeline
-
-export interface PlayerConfig {
-	url: string
-	namespace: string
-	fingerprint?: string // URL to fetch TLS certificate fingerprint
-	canvas: HTMLCanvasElement
-}
-
-// This class must be created on the main thread due to AudioContext.
-export class Player {
-	#backend: Backend
-
-	// A periodically updated timeline
-	//#timeline = new Watch<Timeline | undefined>(undefined)
-
-	#connection: Connection
-	#catalog: Catalog.Root
-
-	// Running is a promise that resolves when the player is closed.
-	// #close is called with no error, while #abort is called with an error.
-	#running: Promise<void>
-	#close!: () => void
-	#abort!: (err: Error) => void
-
-	private constructor(connection: Connection, catalog: Catalog.Root, backend: Backend) {
-		this.#connection = connection
-		this.#catalog = catalog
-		this.#backend = backend
-
-		const abort = new Promise<void>((resolve, reject) => {
-			this.#close = resolve
-			this.#abort = reject
-		})
-
-		// Async work
-		this.#running = Promise.race([this.#run(), abort]).catch(this.#close)
-	}
-
-	static async create(config: PlayerConfig): Promise<Player> {
-		const client = new Client({ url: config.url, fingerprint: config.fingerprint, role: "subscriber" })
-		const connection = await client.connect()
-
-		const catalog = await Catalog.fetch(connection, config.namespace)
-		console.log("catalog", catalog)
-
-		const canvas = config.canvas.transferControlToOffscreen()
-		const backend = new Backend({ canvas, catalog })
-
-		return new Player(connection, catalog, backend)
-	}
-
-	async #run() {
-		const inits = new Set<[string, string]>()
-		const tracks = new Array<Catalog.Track>()
-
-		for (const track of this.#catalog.tracks) {
-			if (!track.namespace) throw new Error("track has no namespace")
-			if (track.initTrack) inits.add([track.namespace, track.initTrack])
-			tracks.push(track)
-		}
-
-		// Call #runInit on each unique init track
-		// TODO do this in parallel with #runTrack to remove a round trip
-		await Promise.all(Array.from(inits).map((init) => this.#runInit(...init)))
-
-		// Call #runTrack on each track
-		await Promise.all(tracks.map((track) => this.#runTrack(track)))
-	}
-
-	async #runInit(namespace: string, name: string) {
-		const sub = await this.#connection.subscribe(namespace, name)
-		try {
-			const init = await Promise.race([sub.data(), this.#running])
-			if (!init) throw new Error("no init data")
-
-			// We don't care what type of reader we get, we just want the payload.
-			const chunk = await init.read()
-			if (!chunk) throw new Error("no init chunk")
-			if (!(chunk.payload instanceof Uint8Array)) throw new Error("invalid init chunk")
-
-			this.#backend.init({ data: chunk.payload, name })
-		} finally {
-			await sub.close()
-		}
-	}
-
-	async #runTrack(track: Catalog.Track) {
-		if (!track.namespace) throw new Error("track has no namespace")
-		const sub = await this.#connection.subscribe(track.namespace, track.name)
-
-		try {
-			for (;;) {
-				const segment = await Promise.race([sub.data(), this.#running])
-				if (!segment) break
-
-				if (!(segment instanceof GroupReader)) {
-					throw new Error(`expected group reader for segment: ${track.name}`)
-				}
-
-				const kind = Catalog.isVideoTrack(track) ? "video" : Catalog.isAudioTrack(track) ? "audio" : "unknown"
-				if (kind == "unknown") {
-					throw new Error(`unknown track kind: ${track.name}`)
-				}
-
-				if (!track.initTrack) {
-					throw new Error(`no init track for segment: ${track.name}`)
-				}
-
-				const [buffer, stream] = segment.stream.release()
-
-				this.#backend.segment({
-					init: track.initTrack,
-					kind,
-					header: segment.header,
-					buffer,
-					stream,
-				})
-			}
-		} catch (error) {
-			console.error("Error in #runTrack:", error)
-		} finally {
-			await sub.close()
-		}
-	}
-
-	getCatalog() {
-		return this.#catalog
-	}
-
-	#onMessage(msg: Message.FromWorker) {
-		if (msg.timeline) {
-			//this.#timeline.update(msg.timeline)
-		}
-	}
-
-	async close(err?: Error) {
-		if (err) this.#abort(err)
-		else this.#close()
-
-		if (this.#connection) this.#connection.close()
-		if (this.#backend) await this.#backend.close()
-	}
-
-	async closed(): Promise<Error | undefined> {
-		try {
-			await this.#running
-		} catch (e) {
-			return asError(e)
-		}
-	}
-
-	/*
-	play() {
-		this.#backend.play({ minBuffer: 0.5 }) // TODO configurable
-	}
-
-	seek(timestamp: number) {
-		this.#backend.seek({ timestamp })
-	}
-	*/
-
-	async play() {
-		await this.#backend.play()
-	}
-
-	/*
-	async *timeline() {
-		for (;;) {
-			const [timeline, next] = this.#timeline.value()
-			if (timeline) yield timeline
-			if (!next) break
-
-			await next
-		}
-	}
-	*/
-}
+export { Player } from "./player"
+export type { PlayerConfig } from "./player"
diff --git a/packages/moq/playback/player.ts b/packages/moq/playback/player.ts
new file mode 100644
index 00000000..b7ba1c61
--- /dev/null
+++ b/packages/moq/playback/player.ts
@@ -0,0 +1,63 @@
+import * as Catalog from "../karp/catalog"
+import type { Connection } from "../transfork/connection"
+import { Broadcast } from "./broadcast"
+
+export interface PlayerConfig {
+	connection: Connection
+	path: string[]
+	canvas: HTMLCanvasElement
+}
+
+// This class must be created on the main thread due to AudioContext.
+export class Player {
+	#config: PlayerConfig
+	#running: Promise<void>
+	#active?: Broadcast
+
+	constructor(config: PlayerConfig) {
+		this.#config = config
+		this.#running = this.#run()
+	}
+
+	async #run() {
+		const announced = await this.#config.connection.announced(this.#config.path)
+
+		let activeId = -1
+
+		for (;;) {
+			const announce = await announced.next()
+			if (!announce) break
+
+			if (announce.path.length === this.#config.path.length) {
+				throw new Error("expected resumable broadcast")
+			}
+
+			const path = announce.path.slice(0, this.#config.path.length + 1)
+
+			const id = Number.parseInt(path[path.length - 1])
+			if (id <= activeId) continue
+
+			const catalog = await Catalog.fetch(this.#config.connection, path)
+
+			this.#active?.close()
+			this.#active = new Broadcast(this.#config.connection, catalog, this.#config.canvas)
+			activeId = id
+		}
+
+		this.#active?.close()
+	}
+
+	close() {
+		this.#config.connection.close()
+		this.#active?.close()
+		this.#active = undefined
+	}
+
+	async closed() {
+		await Promise.any([this.#running, this.#config.connection.closed()])
+	}
+
+	unmute() {
+		this.#active?.unmute()
+	}
+}
diff --git a/packages/moq/playback/worker/timeline.ts b/packages/moq/playback/timeline.ts
similarity index 85%
rename from packages/moq/playback/worker/timeline.ts
rename to packages/moq/playback/timeline.ts
index 2eaac02f..49cfafe3 100644
--- a/packages/moq/playback/worker/timeline.ts
+++ b/packages/moq/playback/timeline.ts
@@ -1,5 +1,4 @@
-import type { Frame } from "../../media/mp4"
-export type { Frame }
+import type { Frame } from "../karp/frame"
 
 export interface Range {
 	start: number
@@ -48,7 +47,7 @@ export class Component {
 			// Get the next segment to render.
 			const segments = this.#segments.readable.getReader()
 
-			let res
+			let res: ReadableStreamReadResult<Segment> | ReadableStreamReadResult<Frame>
 			if (this.#current) {
 				// Get the next frame to render.
 				const frames = this.#current.frames.getReader()
@@ -85,17 +84,17 @@ export class Component {
 					// Our segment is older than the current, abandon it.
 					await value.frames.cancel("skipping segment; too old")
 					continue
-				} else {
-					// Our segment is newer than the current, cancel the old one.
-					await this.#current.frames.cancel("skipping segment; too slow")
 				}
+
+				// Our segment is newer than the current, cancel the old one.
+				await this.#current.frames.cancel("skipping segment; too slow")
 			}
 
 			this.#current = value
 		}
 	}
 
-	async #cancel(reason: any) {
+	async #cancel(reason: Error) {
 		if (this.#current) {
 			await this.#current.frames.cancel(reason)
 		}
@@ -111,8 +110,6 @@ export class Component {
 }
 
 // Return if a type is a segment or frame
-// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
 function isSegment(value: Segment | Frame): value is Segment {
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	return (value as Segment).frames !== undefined
 }
diff --git a/packages/moq/playback/tsconfig.json b/packages/moq/playback/tsconfig.json
index 77318e89..cfa267c2 100644
--- a/packages/moq/playback/tsconfig.json
+++ b/packages/moq/playback/tsconfig.json
@@ -10,10 +10,10 @@
 			"path": "../common"
 		},
 		{
-			"path": "../transport"
+			"path": "../transfork"
 		},
 		{
-			"path": "../media"
+			"path": "../karp"
 		}
 	],
 	"paths": {
diff --git a/packages/moq/playback/worker/video.ts b/packages/moq/playback/video.ts
similarity index 50%
rename from packages/moq/playback/worker/video.ts
rename to packages/moq/playback/video.ts
index 3c0fd11d..77218037 100644
--- a/packages/moq/playback/worker/video.ts
+++ b/packages/moq/playback/video.ts
@@ -1,16 +1,18 @@
-import { Frame, Component } from "./timeline"
-import * as MP4 from "../../media/mp4"
-import * as Message from "./message"
+import type * as Catalog from "../karp/catalog"
+import type { Frame } from "../karp/frame"
+import type { Component } from "./timeline"
 
 export class Renderer {
-	#canvas: OffscreenCanvas
+	#track: Catalog.Video
+	#canvas: HTMLCanvasElement
 	#timeline: Component
 
 	#decoder!: VideoDecoder
 	#queue: TransformStream<Frame, VideoFrame>
 
-	constructor(config: Message.ConfigVideo, timeline: Component) {
-		this.#canvas = config.canvas
+	constructor(track: Catalog.Video, canvas: HTMLCanvasElement, timeline: Component) {
+		this.#track = track
+		this.#canvas = canvas
 		this.#timeline = timeline
 
 		this.#queue = new TransformStream({
@@ -18,7 +20,11 @@ export class Renderer {
 			transform: this.#transform.bind(this),
 		})
 
-		this.#run().catch(console.error)
+		this.#run().catch((err) => console.error("failed to run video renderer: ", err))
+	}
+
+	close() {
+		// TODO
 	}
 
 	async #run() {
@@ -47,36 +53,21 @@ export class Renderer {
 			},
 			error: console.error,
 		})
+
+		this.#decoder.configure({
+			codec: this.#track.codec,
+			codedHeight: this.#track.resolution.height,
+			codedWidth: this.#track.resolution.width,
+			description: this.#track.description,
+			optimizeForLatency: true,
+		})
 	}
 
 	#transform(frame: Frame) {
-		// Configure the decoder with the first frame
-		if (this.#decoder.state !== "configured") {
-			const { sample, track } = frame
-
-			const desc = sample.description
-			const box = desc.avcC ?? desc.hvcC ?? desc.vpcC ?? desc.av1C
-			if (!box) throw new Error(`unsupported codec: ${track.codec}`)
-
-			const buffer = new MP4.Stream(undefined, 0, MP4.Stream.BIG_ENDIAN)
-			box.write(buffer)
-			const description = new Uint8Array(buffer.buffer, 8) // Remove the box header.
-
-			if (!MP4.isVideoTrack(track)) throw new Error("expected video track")
-
-			this.#decoder.configure({
-				codec: track.codec,
-				codedHeight: track.video.height,
-				codedWidth: track.video.width,
-				description,
-				// optimizeForLatency: true
-			})
-		}
-
 		const chunk = new EncodedVideoChunk({
-			type: frame.sample.is_sync ? "key" : "delta",
-			data: frame.sample.data,
-			timestamp: frame.sample.dts / frame.track.timescale,
+			type: frame.type,
+			data: frame.data,
+			timestamp: frame.timestamp,
 		})
 
 		this.#decoder.decode(chunk)
diff --git a/packages/moq/playback/worker/audio.ts b/packages/moq/playback/worker/audio.ts
deleted file mode 100644
index de57e364..00000000
--- a/packages/moq/playback/worker/audio.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as Message from "./message"
-import { Ring } from "../../common/ring"
-import { Component, Frame } from "./timeline"
-import * as MP4 from "../../media/mp4"
-
-// This is run in a worker.
-export class Renderer {
-	#ring: Ring
-	#timeline: Component
-
-	#decoder!: AudioDecoder
-	#stream: TransformStream<Frame, AudioData>
-
-	constructor(config: Message.ConfigAudio, timeline: Component) {
-		this.#timeline = timeline
-		this.#ring = new Ring(config.ring)
-
-		this.#stream = new TransformStream({
-			start: this.#start.bind(this),
-			transform: this.#transform.bind(this),
-		})
-
-		this.#run().catch(console.error)
-	}
-
-	#start(controller: TransformStreamDefaultController) {
-		this.#decoder = new AudioDecoder({
-			output: (frame: AudioData) => {
-				controller.enqueue(frame)
-			},
-			error: console.warn,
-		})
-	}
-
-	#transform(frame: Frame) {
-		if (this.#decoder.state !== "configured") {
-			const track = frame.track
-			if (!MP4.isAudioTrack(track)) throw new Error("expected audio track")
-
-			// We only support OPUS right now which doesn't need a description.
-			this.#decoder.configure({
-				codec: track.codec,
-				sampleRate: track.audio.sample_rate,
-				numberOfChannels: track.audio.channel_count,
-			})
-		}
-
-		const chunk = new EncodedAudioChunk({
-			type: frame.sample.is_sync ? "key" : "delta",
-			timestamp: frame.sample.dts / frame.track.timescale,
-			duration: frame.sample.duration,
-			data: frame.sample.data,
-		})
-
-		this.#decoder.decode(chunk)
-	}
-
-	async #run() {
-		const reader = this.#timeline.frames.pipeThrough(this.#stream).getReader()
-
-		for (;;) {
-			const { value: frame, done } = await reader.read()
-			if (done) break
-
-			// Write audio samples to the ring buffer, dropping when there's no space.
-			const written = this.#ring.write(frame)
-
-			if (written < frame.numberOfFrames) {
-				console.warn(`droppped ${frame.numberOfFrames - written} audio samples`)
-			}
-		}
-	}
-}
diff --git a/packages/moq/playback/worker/index.ts b/packages/moq/playback/worker/index.ts
deleted file mode 100644
index 1275b3f5..00000000
--- a/packages/moq/playback/worker/index.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Timeline } from "./timeline"
-
-import * as Audio from "./audio"
-import * as Video from "./video"
-
-import * as MP4 from "../../media/mp4"
-import * as Message from "./message"
-import { asError } from "../../common/error"
-import { Deferred } from "../../common/async"
-import { GroupReader, Reader } from "../../transport/objects"
-
-class Worker {
-	// Timeline receives samples, buffering them and choosing the timestamp to render.
-	#timeline = new Timeline()
-
-	// A map of init tracks.
-	#inits = new Map<string, Deferred<Uint8Array>>()
-
-	// Renderer requests samples, rendering video frames and emitting audio frames.
-	#audio?: Audio.Renderer
-	#video?: Video.Renderer
-
-	on(e: MessageEvent) {
-		const msg = e.data as Message.ToWorker
-
-		if (msg.config) {
-			this.#onConfig(msg.config)
-		} else if (msg.init) {
-			// TODO buffer the init segmnet so we don't hold the stream open.
-			this.#onInit(msg.init)
-		} else if (msg.segment) {
-			this.#onSegment(msg.segment).catch(console.warn)
-		} else {
-			throw new Error(`unknown message: + ${JSON.stringify(msg)}`)
-		}
-	}
-
-	#onConfig(msg: Message.Config) {
-		if (msg.audio) {
-			this.#audio = new Audio.Renderer(msg.audio, this.#timeline.audio)
-		}
-
-		if (msg.video) {
-			this.#video = new Video.Renderer(msg.video, this.#timeline.video)
-		}
-	}
-
-	#onInit(msg: Message.Init) {
-		let init = this.#inits.get(msg.name)
-		if (!init) {
-			init = new Deferred()
-			this.#inits.set(msg.name, init)
-		}
-
-		init.resolve(msg.data)
-	}
-
-	async #onSegment(msg: Message.Segment) {
-		let init = this.#inits.get(msg.init)
-		if (!init) {
-			init = new Deferred()
-			this.#inits.set(msg.init, init)
-		}
-
-		// Create a new stream that we will use to decode.
-		const container = new MP4.Parser(await init.promise)
-
-		const timeline = msg.kind === "audio" ? this.#timeline.audio : this.#timeline.video
-		const reader = new GroupReader(msg.header, new Reader(msg.buffer, msg.stream))
-
-		// Create a queue that will contain each MP4 frame.
-		const queue = new TransformStream<MP4.Frame>({})
-		const segment = queue.writable.getWriter()
-
-		// Add the segment to the timeline
-		const segments = timeline.segments.getWriter()
-		await segments.write({
-			sequence: msg.header.group,
-			frames: queue.readable,
-		})
-		segments.releaseLock()
-
-		// Read each chunk, decoding the MP4 frames and adding them to the queue.
-		for (;;) {
-			const chunk = await reader.read()
-			if (!chunk) {
-				break
-			}
-
-			if (!(chunk.payload instanceof Uint8Array)) {
-				throw new Error(`invalid payload: ${chunk.payload}`)
-			}
-
-			const frames = container.decode(chunk.payload)
-			for (const frame of frames) {
-				await segment.write(frame)
-			}
-		}
-
-		// We done.
-		await segment.close()
-	}
-}
-
-// Pass all events to the worker
-const worker = new Worker()
-self.addEventListener("message", (msg) => {
-	try {
-		worker.on(msg)
-	} catch (e) {
-		const err = asError(e)
-		console.warn("worker error:", err)
-	}
-})
-
-// Validates this is an expected message
-function _send(msg: Message.FromWorker) {
-	postMessage(msg)
-}
diff --git a/packages/moq/playback/worker/message.ts b/packages/moq/playback/worker/message.ts
deleted file mode 100644
index e6a19181..00000000
--- a/packages/moq/playback/worker/message.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { GroupHeader } from "../../transport/objects"
-import { RingShared } from "../../common/ring"
-
-export interface Config {
-	audio?: ConfigAudio
-	video?: ConfigVideo
-}
-
-export interface ConfigAudio {
-	channels: number
-	sampleRate: number
-
-	ring: RingShared
-}
-
-export interface ConfigVideo {
-	canvas: OffscreenCanvas
-}
-
-export interface Init {
-	name: string // name of the init object
-	data: Uint8Array
-}
-
-export interface Segment {
-	init: string // name of the init object
-	kind: "audio" | "video"
-	header: GroupHeader
-	buffer: Uint8Array
-	stream: ReadableStream<Uint8Array>
-}
-
-/*
-export interface Play {
-	// Start playback once the minimum buffer size has been reached.
-	minBuffer: number
-}
-
-export interface Seek {
-	timestamp: number
-}
-*/
-
-// Sent periodically with the current timeline info.
-export interface Timeline {
-	// The current playback position
-	timestamp?: number
-
-	// Audio specific information
-	audio: TimelineAudio
-
-	// Video specific information
-	video: TimelineVideo
-}
-
-export interface TimelineAudio {
-	buffer: Range[]
-}
-
-export interface TimelineVideo {
-	buffer: Range[]
-}
-
-export interface Range {
-	start: number
-	end: number
-}
-
-// Used to validate that only the correct messages can be sent.
-
-// Any top level messages that can be sent to the worker.
-export interface ToWorker {
-	// Sent to configure on startup.
-	config?: Config
-
-	// Sent on each init/data stream
-	init?: Init
-	segment?: Segment
-
-	/*
-	// Sent to control playback
-	play?: Play
-	seek?: Seek
-	*/
-}
-
-// Any top-level messages that can be sent from the worker.
-export interface FromWorker {
-	// Sent back to the main thread regularly to update the UI
-	timeline?: Timeline
-}
-
-/*
-interface ToWorklet {
-	config?: Audio.Config
-}
-
-*/
diff --git a/packages/moq/playback/worklet/index.ts b/packages/moq/playback/worklet/index.ts
index afe485df..bb07a6c7 100644
--- a/packages/moq/playback/worklet/index.ts
+++ b/packages/moq/playback/worklet/index.ts
@@ -1,6 +1,6 @@
 // TODO add support for @/ to avoid relative imports
 import { Ring } from "../../common/ring"
-import * as Message from "./message"
+import type * as Message from "./message"
 
 class Renderer extends AudioWorkletProcessor {
 	ring?: Ring
@@ -26,17 +26,17 @@ class Renderer extends AudioWorkletProcessor {
 	}
 
 	// Inputs and outputs in groups of 128 samples.
-	process(inputs: Float32Array[][], outputs: Float32Array[][], _parameters: Record<string, Float32Array>): boolean {
+	process(_inputs: Float32Array[][], outputs: Float32Array[][], _parameters: Record<string, Float32Array>): boolean {
 		if (!this.ring) {
 			// Paused
 			return true
 		}
 
-		if (inputs.length != 1 && outputs.length != 1) {
+		if (outputs.length !== 1) {
 			throw new Error("only a single track is supported")
 		}
 
-		if (this.ring.size() == this.ring.capacity) {
+		if (this.ring.size() === this.ring.capacity) {
 			// This is a hack to clear any latency in the ring buffer.
 			// The proper solution is to play back slightly faster?
 			console.warn("resyncing ring buffer")
diff --git a/packages/moq/playback/worklet/message.ts b/packages/moq/playback/worklet/message.ts
index e55ebdd8..02fe1389 100644
--- a/packages/moq/playback/worklet/message.ts
+++ b/packages/moq/playback/worklet/message.ts
@@ -1,4 +1,4 @@
-import { RingShared } from "../../common/ring"
+import type { RingShared } from "../../common/ring"
 
 export interface From {
 	config?: Config
@@ -7,6 +7,5 @@ export interface From {
 export interface Config {
 	channels: number
 	sampleRate: number
-
 	ring: RingShared
 }
diff --git a/packages/moq/transport/client.ts b/packages/moq/transfork/client.ts
similarity index 53%
rename from packages/moq/transport/client.ts
rename to packages/moq/transfork/client.ts
index 1ae51021..345483cf 100644
--- a/packages/moq/transport/client.ts
+++ b/packages/moq/transfork/client.ts
@@ -1,15 +1,11 @@
-import * as Stream from "./stream"
-import * as Setup from "./setup"
-import * as Control from "./control"
-import { Objects } from "./objects"
+import * as Hex from "../common/hex"
 import { Connection } from "./connection"
+import * as Message from "./message"
+import { Stream } from "./stream"
 
 export interface ClientConfig {
 	url: string
 
-	// Parameters used to create the MoQ session
-	role: Setup.Role
-
 	// If set, the server fingerprint will be fetched from this URL.
 	// This is required to use self-signed certificates with Chrome (May 2023)
 	fingerprint?: string
@@ -39,28 +35,17 @@ export class Client {
 		const quic = new WebTransport(this.config.url, options)
 		await quic.ready
 
-		const stream = await quic.createBidirectionalStream()
-
-		const writer = new Stream.Writer(stream.writable)
-		const reader = new Stream.Reader(new Uint8Array(), stream.readable)
-
-		const setup = new Setup.Stream(reader, writer)
-
-		// Send the setup message.
-		await setup.send.client({ versions: [Setup.Version.DRAFT_04], role: this.config.role })
+		const client = new Message.SessionClient([Message.Version.FORK_02])
+		const stream = await Stream.open(quic, client)
 
-		// Receive the setup message.
-		// TODO verify the SETUP response.
-		const server = await setup.recv.server()
-
-		if (server.version != Setup.Version.DRAFT_04) {
+		const server = await Message.SessionServer.decode(stream.reader)
+		if (server.version !== Message.Version.FORK_02) {
 			throw new Error(`unsupported server version: ${server.version}`)
 		}
 
-		const control = new Control.Stream(reader, writer)
-		const objects = new Objects(quic)
+		console.log(`established connection: version=${server.version}`)
 
-		return new Connection(quic, control, objects)
+		return new Connection(quic, stream)
 	}
 
 	async #fetchFingerprint(url?: string): Promise<WebTransportHash | undefined> {
@@ -68,16 +53,11 @@ export class Client {
 
 		// TODO remove this fingerprint when Chrome WebTransport accepts the system CA
 		const response = await fetch(url)
-		const hexString = await response.text()
-
-		const hexBytes = new Uint8Array(hexString.length / 2)
-		for (let i = 0; i < hexBytes.length; i += 1) {
-			hexBytes[i] = parseInt(hexString.slice(2 * i, 2 * i + 2), 16)
-		}
+		const bytes = Hex.decode(await response.text())
 
 		return {
 			algorithm: "sha-256",
-			value: hexBytes,
+			value: bytes,
 		}
 	}
 }
diff --git a/packages/moq/transfork/connection.ts b/packages/moq/transfork/connection.ts
new file mode 100644
index 00000000..8c0b51b8
--- /dev/null
+++ b/packages/moq/transfork/connection.ts
@@ -0,0 +1,158 @@
+import { asError } from "../common/error"
+import * as Message from "./message"
+import { Reader, Stream } from "./stream"
+
+import type { Queue } from "../common/async"
+import { Closed } from "./error"
+import type { Track, TrackReader } from "./model"
+import { Publisher } from "./publisher"
+import { type Announced, Subscriber } from "./subscriber"
+
+export class Connection {
+	// The established WebTransport session.
+	#quic: WebTransport
+
+	// Use to receive/send session messages.
+	#session: Stream
+
+	// Module for contributing tracks.
+	#publisher: Publisher
+
+	// Module for distributing tracks.
+	#subscriber: Subscriber
+
+	// Async work running in the background
+	#running: Promise<void>
+
+	constructor(quic: WebTransport, session: Stream) {
+		this.#quic = quic
+		this.#session = session
+
+		this.#publisher = new Publisher(this.#quic)
+		this.#subscriber = new Subscriber(this.#quic)
+
+		this.#running = this.#run()
+	}
+
+	close(code = 0, reason = "") {
+		this.#quic.close({ closeCode: code, reason })
+	}
+
+	async #run(): Promise<void> {
+		const session = this.#runSession().catch((err) => new Error("failed to run session: ", err))
+		const bidis = this.#runBidis().catch((err) => new Error("failed to run bidis: ", err))
+		const unis = this.#runUnis().catch((err) => new Error("failed to run unis: ", err))
+
+		await Promise.all([session, bidis, unis])
+	}
+
+	publish(track: TrackReader) {
+		this.#publisher.publish(track)
+	}
+
+	async announced(prefix: string[] = []): Promise<Queue<Announced>> {
+		return this.#subscriber.announced(prefix)
+	}
+
+	async subscribe(track: Track): Promise<TrackReader> {
+		return await this.#subscriber.subscribe(track)
+	}
+
+	async #runSession() {
+		// Receive messages until the connection is closed.
+		for (;;) {
+			const msg = await Message.SessionInfo.decode_maybe(this.#session.reader)
+			if (!msg) break
+			// TODO use the session info
+		}
+	}
+
+	async #runBidis() {
+		for (;;) {
+			const next = await Stream.accept(this.#quic)
+			if (!next) {
+				break
+			}
+
+			const [msg, stream] = next
+			this.#runBidi(msg, stream).catch((err) => stream.writer.reset(Closed.extract(err)))
+		}
+	}
+
+	async #runBidi(msg: Message.Bi, stream: Stream) {
+		console.debug("received bi stream: ", msg)
+
+		if (msg instanceof Message.SessionClient) {
+			throw new Error("duplicate session stream")
+		}
+
+		if (msg instanceof Message.AnnounceInterest) {
+			if (!this.#subscriber) {
+				throw new Error("not a subscriber")
+			}
+
+			return await this.#publisher.runAnnounce(msg, stream)
+		}
+		if (msg instanceof Message.Subscribe) {
+			if (!this.#publisher) {
+				throw new Error("not a publisher")
+			}
+
+			return await this.#publisher.runSubscribe(msg, stream)
+		}
+		if (msg instanceof Message.Datagrams) {
+			if (!this.#publisher) {
+				throw new Error("not a publisher")
+			}
+
+			return await this.#publisher.runDatagrams(msg, stream)
+		}
+		if (msg instanceof Message.Fetch) {
+			if (!this.#publisher) {
+				throw new Error("not a publisher")
+			}
+
+			return await this.#publisher.runFetch(msg, stream)
+		}
+		if (msg instanceof Message.InfoRequest) {
+			if (!this.#publisher) {
+				throw new Error("not a publisher")
+			}
+
+			return await this.#publisher.runInfo(msg, stream)
+		}
+	}
+
+	async #runUnis() {
+		for (;;) {
+			const next = await Reader.accept(this.#quic)
+			if (!next) {
+				break
+			}
+
+			const [msg, stream] = next
+			this.#runUni(msg, stream).catch((err) => stream.stop(Closed.extract(err)))
+		}
+	}
+
+	async #runUni(msg: Message.Uni, stream: Reader) {
+		console.debug("received uni stream: ", msg)
+
+		if (msg instanceof Message.Group) {
+			if (!this.#subscriber) {
+				throw new Error("not a subscriber")
+			}
+
+			return this.#subscriber.runGroup(msg, stream)
+		}
+	}
+
+	async closed(): Promise<Error> {
+		try {
+			await this.#running
+			return new Error("closed")
+		} catch (e) {
+			return asError(e)
+		}
+	}
+}
diff --git a/packages/moq/transfork/error.ts b/packages/moq/transfork/error.ts
new file mode 100644
index 00000000..e9be92af
--- /dev/null
+++ b/packages/moq/transfork/error.ts
@@ -0,0 +1,20 @@
+export class Closed extends Error {
+	readonly code?: number
+
+	constructor(code?: number) {
+		super(`closed code=${code}`)
+		this.code = code
+	}
+
+	static from(err: unknown): Closed {
+		return new Closed(Closed.extract(err))
+	}
+
+	static extract(err: unknown): number {
+		if (err instanceof WebTransportError && err.streamErrorCode !== null) {
+			return err.streamErrorCode
+		}
+
+		return 0
+	}
+}
diff --git a/packages/moq/transfork/frame.ts b/packages/moq/transfork/frame.ts
new file mode 100644
index 00000000..5b22ac76
--- /dev/null
+++ b/packages/moq/transfork/frame.ts
@@ -0,0 +1,45 @@
+import type { Reader, Writer } from "./stream"
+
+export class FrameReader {
+	#stream: Reader
+
+	constructor(stream: Reader) {
+		this.#stream = stream
+	}
+
+	// Returns the next frame
+	async read(): Promise<Uint8Array | undefined> {
+		if (await this.#stream.done()) return
+
+		const size = await this.#stream.u53()
+		const payload = await this.#stream.read(size)
+
+		return payload
+	}
+
+	async stop(code: number) {
+		await this.#stream.stop(code)
+	}
+}
+
+export class FrameWriter {
+	#stream: Writer
+
+	constructor(stream: Writer) {
+		this.#stream = stream
+	}
+
+	// Writes the next frame
+	async write(payload: Uint8Array) {
+		await this.#stream.u53(payload.byteLength)
+		await this.#stream.write(payload)
+	}
+
+	async close() {
+		await this.#stream.close()
+	}
+
+	async reset(code: number) {
+		await this.#stream.reset(code)
+	}
+}
diff --git a/packages/moq/transport/index.ts b/packages/moq/transfork/index.ts
similarity index 51%
rename from packages/moq/transport/index.ts
rename to packages/moq/transfork/index.ts
index ca86a6c5..343da3e5 100644
--- a/packages/moq/transport/index.ts
+++ b/packages/moq/transfork/index.ts
@@ -3,5 +3,5 @@ export type { ClientConfig } from "./client"
 
 export { Connection } from "./connection"
 
-export { SubscribeRecv, AnnounceSend } from "./publisher"
-export { AnnounceRecv, SubscribeSend } from "./subscriber"
+export { Track, Group } from "./model"
+export { Announced } from "./subscriber"
diff --git a/packages/moq/transfork/message.ts b/packages/moq/transfork/message.ts
new file mode 100644
index 00000000..880ed063
--- /dev/null
+++ b/packages/moq/transfork/message.ts
@@ -0,0 +1,428 @@
+import type { Reader, Writer } from "./stream"
+
+export enum Version {
+	DRAFT_00 = 0xff000000,
+	DRAFT_01 = 0xff000001,
+	DRAFT_02 = 0xff000002,
+	DRAFT_03 = 0xff000003,
+	FORK_00 = 0xff0bad00,
+	FORK_01 = 0xff0bad01,
+	FORK_02 = 0xff0bad02,
+}
+
+export class Extensions {
+	entries: Map<bigint, Uint8Array>
+
+	constructor() {
+		this.entries = new Map()
+	}
+
+	set(id: bigint, value: Uint8Array) {
+		this.entries.set(id, value)
+	}
+
+	get(id: bigint): Uint8Array | undefined {
+		return this.entries.get(id)
+	}
+
+	remove(id: bigint): Uint8Array | undefined {
+		const value = this.entries.get(id)
+		this.entries.delete(id)
+		return value
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.entries.size)
+		for (const [id, value] of this.entries) {
+			await w.u62(id)
+			await w.u53(value.length)
+			await w.write(value)
+		}
+	}
+
+	static async decode(r: Reader): Promise<Extensions> {
+		const count = await r.u53()
+		const params = new Extensions()
+
+		for (let i = 0; i < count; i++) {
+			const id = await r.u62()
+			const size = await r.u53()
+			const value = await r.read(size)
+
+			if (params.entries.has(id)) {
+				throw new Error(`duplicate parameter id: ${id}`)
+			}
+
+			params.entries.set(id, value)
+		}
+
+		return params
+	}
+}
+
+export enum Order {
+	Any = 0,
+	Ascending = 1,
+	Descending = 2,
+}
+
+export class SessionClient {
+	versions: Version[]
+	extensions: Extensions
+
+	static StreamID = 0x0
+
+	constructor(versions: Version[], extensions = new Extensions()) {
+		this.versions = versions
+		this.extensions = extensions
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.versions.length)
+		for (const v of this.versions) {
+			await w.u53(v)
+		}
+
+		await this.extensions.encode(w)
+	}
+
+	static async decode(r: Reader): Promise<SessionClient> {
+		const versions = []
+		const count = await r.u53()
+		for (let i = 0; i < count; i++) {
+			versions.push(await r.u53())
+		}
+
+		const extensions = await Extensions.decode(r)
+		return new SessionClient(versions, extensions)
+	}
+}
+
+export class SessionServer {
+	version: Version
+	extensions: Extensions
+
+	constructor(version: Version, extensions = new Extensions()) {
+		this.version = version
+		this.extensions = extensions
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.version)
+		await this.extensions.encode(w)
+	}
+
+	static async decode(r: Reader): Promise<SessionServer> {
+		const version = await r.u53()
+		const extensions = await Extensions.decode(r)
+		return new SessionServer(version, extensions)
+	}
+}
+
+export class SessionInfo {
+	bitrate: number
+
+	constructor(bitrate: number) {
+		this.bitrate = bitrate
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.bitrate)
+	}
+
+	static async decode(r: Reader): Promise<SessionInfo> {
+		const bitrate = await r.u53()
+		return new SessionInfo(bitrate)
+	}
+
+	static async decode_maybe(r: Reader): Promise<SessionInfo | undefined> {
+		if (await r.done()) return
+		return await SessionInfo.decode(r)
+	}
+}
+
+export type AnnounceStatus = "active" | "closed"
+
+export class Announce {
+	suffix: string[]
+	status: AnnounceStatus
+
+	constructor(suffix: string[], status: AnnounceStatus) {
+		this.suffix = suffix
+		this.status = status
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.status === "active" ? 1 : 0)
+		await w.path(this.suffix)
+	}
+
+	static async decode(r: Reader): Promise<Announce> {
+		const status = (await r.u53()) === 1 ? "active" : "closed"
+		const suffix = await r.path()
+		return new Announce(suffix, status)
+	}
+
+	static async decode_maybe(r: Reader): Promise<Announce | undefined> {
+		if (await r.done()) return
+		return await Announce.decode(r)
+	}
+}
+
+export class AnnounceInterest {
+	static StreamID = 0x1
+
+	constructor(public prefix: string[]) {}
+
+	async encode(w: Writer) {
+		await w.path(this.prefix)
+	}
+
+	static async decode(r: Reader): Promise<AnnounceInterest> {
+		const prefix = await r.path()
+		return new AnnounceInterest(prefix)
+	}
+}
+
+export class SubscribeUpdate {
+	priority: number
+	order = Order.Any
+	expires = 0 // ms
+
+	start?: bigint
+	end?: bigint
+
+	constructor(priority: number) {
+		this.priority = priority
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.priority)
+		await w.u53(this.order)
+		await w.u53(this.expires)
+		await w.u62(this.start ? this.start + 1n : 0n)
+		await w.u62(this.end ? this.end + 1n : 0n)
+	}
+
+	static async decode(r: Reader): Promise<SubscribeUpdate> {
+		const priority = await r.u53()
+		const order = await r.u53()
+		if (order > 2) {
+			throw new Error(`invalid order: ${order}`)
+		}
+
+		const expires = await r.u53()
+		const start = await r.u62()
+		const end = await r.u62()
+
+		const update = new SubscribeUpdate(priority)
+		update.order = order
+		update.expires = expires
+		update.start = start === 0n ? undefined : start - 1n
+		update.end = end === 0n ? undefined : end - 1n
+
+		return update
+	}
+
+	static async decode_maybe(r: Reader): Promise<SubscribeUpdate | undefined> {
+		if (await r.done()) return
+		return await SubscribeUpdate.decode(r)
+	}
+}
+
+export class Subscribe extends SubscribeUpdate {
+	id: bigint
+	path: string[]
+
+	static StreamID = 0x2
+
+	constructor(id: bigint, path: string[], priority: number) {
+		super(priority)
+
+		this.id = id
+		this.path = path
+	}
+
+	async encode(w: Writer) {
+		await w.u62(this.id)
+		await w.path(this.path)
+		await super.encode(w)
+	}
+
+	static async decode(r: Reader): Promise<Subscribe> {
+		const id = await r.u62()
+		const path = await r.path()
+		const update = await SubscribeUpdate.decode(r)
+
+		const subscribe = new Subscribe(id, path, update.priority)
+		subscribe.order = update.order
+		subscribe.expires = update.expires
+		subscribe.start = update.start
+		subscribe.end = update.end
+
+		return subscribe
+	}
+}
+
+export class Datagrams extends Subscribe {
+	static StreamID = 0x3
+}
+
+export class Info {
+	priority: number
+	order = Order.Descending
+	expires = 0
+	latest?: number
+
+	constructor(priority: number) {
+		this.priority = priority
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.priority)
+		await w.u53(this.order)
+		await w.u53(this.expires)
+		await w.u53(this.latest ? this.latest + 1 : 0)
+	}
+
+	static async decode(r: Reader): Promise<Info> {
+		const priority = await r.u53()
+		const order = await r.u53()
+		const latest = await r.u53()
+
+		const info = new Info(priority)
+		info.latest = latest === 0 ? undefined : latest - 1
+		info.order = order
+
+		return info
+	}
+}
+
+export class InfoRequest {
+	path: string[]
+
+	static StreamID = 0x5
+
+	constructor(path: string[]) {
+		this.path = path
+	}
+
+	async encode(w: Writer) {
+		await w.path(this.path)
+	}
+
+	static async decode(r: Reader): Promise<InfoRequest> {
+		const path = await r.path()
+		return new InfoRequest(path)
+	}
+}
+
+export class FetchUpdate {
+	priority: number
+
+	constructor(priority: number) {
+		this.priority = priority
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.priority)
+	}
+
+	static async decode(r: Reader): Promise<FetchUpdate> {
+		return new FetchUpdate(await r.u53())
+	}
+
+	static async decode_maybe(r: Reader): Promise<FetchUpdate | undefined> {
+		if (await r.done()) return
+		return await FetchUpdate.decode(r)
+	}
+}
+
+export class Fetch extends FetchUpdate {
+	path: string[]
+
+	static StreamID = 0x4
+
+	constructor(path: string[], priority: number) {
+		super(priority)
+		this.path = path
+	}
+
+	async encode(w: Writer) {
+		await w.path(this.path)
+		await super.encode(w)
+	}
+
+	static async decode(r: Reader): Promise<Fetch> {
+		const path = await r.path()
+		const update = await FetchUpdate.decode(r)
+
+		const fetch = new Fetch(path, update.priority)
+		return fetch
+	}
+}
+
+export class Group {
+	subscribe: bigint
+	sequence: number
+
+	static StreamID = 0x0
+
+	constructor(subscribe: bigint, sequence: number) {
+		this.subscribe = subscribe
+		this.sequence = sequence
+	}
+
+	async encode(w: Writer) {
+		await w.u62(this.subscribe)
+		await w.u53(this.sequence)
+	}
+
+	static async decode(r: Reader): Promise<Group> {
+		return new Group(await r.u62(), await r.u53())
+	}
+}
+
+export class GroupDrop {
+	sequence: number
+	count: number
+	error: number
+
+	constructor(sequence: number, count: number, error: number) {
+		this.sequence = sequence
+		this.count = count
+		this.error = error
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.sequence)
+		await w.u53(this.count)
+		await w.u53(this.error)
+	}
+
+	static async decode(r: Reader): Promise<GroupDrop> {
+		return new GroupDrop(await r.u53(), await r.u53(), await r.u53())
+	}
+}
+
+export class Frame {
+	payload: Uint8Array
+
+	constructor(payload: Uint8Array) {
+		this.payload = payload
+	}
+
+	async encode(w: Writer) {
+		await w.u53(this.payload.byteLength)
+		await w.write(this.payload)
+	}
+
+	static async decode(r: Reader): Promise<Frame> {
+		const size = await r.u53()
+		const payload = await r.read(size)
+		return new Frame(payload)
+	}
+}
+
+export type Bi = SessionClient | AnnounceInterest | Subscribe | Datagrams | Fetch | InfoRequest
+export type Uni = Group
diff --git a/packages/moq/transfork/model.ts b/packages/moq/transfork/model.ts
new file mode 100644
index 00000000..0e541938
--- /dev/null
+++ b/packages/moq/transfork/model.ts
@@ -0,0 +1,170 @@
+import { Watch } from "../common/async"
+import { Closed } from "./error"
+import { Order } from "./message"
+
+export class Track {
+	readonly path: string[]
+	readonly priority: number
+	order = Order.Any
+
+	// TODO use an array
+	latest = new Watch<GroupReader | undefined>(undefined)
+
+	readers = 0
+	closed?: Closed
+
+	constructor(path: string[], priority: number) {
+		this.path = path
+		this.priority = priority
+	}
+
+	appendGroup(): Group {
+		const next = this.latest.value()[0]?.id ?? 0
+		return this.createGroup(next)
+	}
+
+	createGroup(sequence: number): Group {
+		if (this.closed) throw this.closed
+
+		const group = new Group(sequence)
+		const [current, _] = this.latest.value()
+
+		// TODO use an array
+		if (!current || current.id < sequence) {
+			const reader = new GroupReader(group)
+			this.latest.update(reader)
+		}
+
+		return group
+	}
+
+	close(closed = new Closed()) {
+		if (this.closed) return
+		this.closed = closed
+		this.latest.close()
+	}
+
+	reader(): TrackReader {
+		// VERY important that readers are closed to decrement the count
+		this.readers += 1
+		return new TrackReader(this)
+	}
+}
+
+export class TrackReader {
+	latest?: number
+	#track: Track
+
+	constructor(track: Track) {
+		this.#track = track
+	}
+
+	async nextGroup(): Promise<GroupReader | undefined> {
+		let [current, next] = this.#track.latest.value()
+
+		for (;;) {
+			if (current && this.latest !== current.id) {
+				this.latest = current.id
+				return current
+			}
+
+			if (this.#track.closed) throw this.#track.closed
+
+			if (!next) return
+			;[current, next] = await next
+		}
+	}
+
+	get path() {
+		return this.#track.path
+	}
+
+	get order() {
+		return this.#track.order
+	}
+
+	get priority() {
+		return this.#track.priority
+	}
+
+	close() {
+		this.#track.readers -= 1
+		if (this.#track.readers <= 0) this.#track.close()
+	}
+}
+
+export class Group {
+	readonly id: number
+
+	chunks = new Watch<Uint8Array[]>([])
+	readers = 0
+	closed?: Closed
+
+	constructor(id: number) {
+		this.id = id
+	}
+
+	writeFrame(frame: Uint8Array) {
+		if (this.closed) throw this.closed
+		this.chunks.update((chunks) => [...chunks, frame])
+	}
+
+	writeFrames(...frames: Uint8Array[]) {
+		if (this.closed) throw this.closed
+		this.chunks.update((chunks) => [...chunks, ...frames])
+		this.close()
+	}
+
+	reader(): GroupReader {
+		this.readers += 1
+		return new GroupReader(this)
+	}
+
+	get length(): number {
+		return this.chunks.value()[0].length
+	}
+
+	close(closed = new Closed()) {
+		if (this.closed) return
+		this.closed = closed
+		this.chunks.close()
+	}
+}
+
+export class GroupReader {
+	#group: Group
+	#index = 0
+
+	constructor(group: Group) {
+		this.#group = group
+	}
+
+	async readFrame(): Promise<Uint8Array | undefined> {
+		let [chunks, next] = this.#group.chunks.value()
+
+		for (;;) {
+			if (this.#index < chunks.length) {
+				this.#index += 1
+				return chunks[this.#index - 1]
+			}
+
+			if (this.#group.closed) throw this.#group.closed
+
+			if (!next) return
+			;[chunks, next] = await next
+		}
+	}
+
+	get index(): number {
+		return this.#index
+	}
+
+	get id(): number {
+		return this.#group.id
+	}
+
+	close() {
+		this.#group.readers -= 1
+		if (this.#group.readers <= 0) this.#group.close()
+	}
+}
diff --git a/packages/moq/transfork/publisher.ts b/packages/moq/transfork/publisher.ts
new file mode 100644
index 00000000..2e9f9863
--- /dev/null
+++ b/packages/moq/transfork/publisher.ts
@@ -0,0 +1,173 @@
+import { Watch } from "../common/async"
+import { Closed } from "./error"
+import * as Message from "./message"
+import type { GroupReader, TrackReader } from "./model"
+import { type Stream, Writer } from "./stream"
+
+export class Publisher {
+	#quic: WebTransport
+
+	// Our announced broadcasts.
+	#announce = new Map<string[], TrackReader>()
+
+	// Their subscribed tracks.
+	#subscribe = new Map<bigint, Subscribed>()
+
+	constructor(quic: WebTransport) {
+		this.#quic = quic
+	}
+
+	// Publish a track
+	publish(track: TrackReader) {
+		if (this.#announce.has(track.path)) {
+			throw new Error(`already announced: ${track.path.toString()}`)
+		}
+
+		this.#announce.set(track.path, track)
+
+		// TODO: clean up announcements
+		// track.closed().then(() => this.#announce.delete(track.path))
+	}
+
+	#get(path: string[]): TrackReader | undefined {
+		return this.#announce.get(path)
+	}
+
+	async runAnnounce(msg: Message.AnnounceInterest, stream: Stream) {
+		for (const announce of this.#announce.values()) {
+			if (announce.path.length < msg.prefix.length) continue
+
+			const prefix = announce.path.slice(0, msg.prefix.length)
+			if (prefix !== msg.prefix) continue
+
+			const suffix = announce.path.slice(msg.prefix.length)
+
+			const active = new Message.Announce(suffix, "active")
+			await active.encode(stream.writer)
+		}
+
+		// TODO support updates.
+		// Until then, just keep the stream open.
+		await stream.reader.closed()
+	}
+
+	async runSubscribe(msg: Message.Subscribe, stream: Stream) {
+		if (this.#subscribe.has(msg.id)) {
+			throw new Error(`duplicate subscribe for id: ${msg.id}`)
+		}
+
+		const track = this.#get(msg.path)
+		if (!track) {
+			await stream.writer.reset(404)
+			return
+		}
+
+		const subscribe = new Subscribed(msg, track, this.#quic)
+
+		// TODO close the stream when done
+		subscribe.run().catch((err) => console.warn("failed to run subscribe: ", err))
+
+		try {
+			const info = new Message.Info(track.priority)
+			info.order = track.order
+			info.latest = track.latest
+			await info.encode(stream.writer)
+
+			for (;;) {
+				// TODO try_decode
+				const update = await Message.SubscribeUpdate.decode_maybe(stream.reader)
+				if (!update) {
+					subscribe.close()
+					break
+				}
+
+				// TODO use the update
+			}
+		} catch (err) {
+			subscribe.close(Closed.from(err))
+		}
+	}
+
+	async runDatagrams(msg: Message.Datagrams, stream: Stream) {
+		await stream.writer.reset(501)
+		throw new Error("datagrams not implemented")
+	}
+
+	async runFetch(msg: Message.Fetch, stream: Stream) {
+		await stream.writer.reset(501)
+		throw new Error("fetch not implemented")
+	}
+
+	async runInfo(msg: Message.InfoRequest, stream: Stream) {
+		const track = this.#get(msg.path)
+		if (!track) {
+			await stream.writer.reset(404)
+			return
+		}
+
+		const info = new Message.Info(track.priority)
+		info.order = track.order
+		info.latest = track.latest
+
+		await info.encode(stream.writer)
+
+		throw new Error("info not implemented")
+	}
+}
+
+class Subscribed {
+	#id: bigint
+	#track: TrackReader
+	#quic: WebTransport
+
+	#closed = new Watch<Closed | undefined>(undefined)
+
+	constructor(msg: Message.Subscribe, track: TrackReader, quic: WebTransport) {
+		this.#id = msg.id
+		this.#track = track
+		this.#quic = quic
+	}
+
+	async run() {
+		const closed = this.closed()
+
+		for (;;) {
+			const [group, done] = await Promise.all([this.#track.nextGroup(), closed])
+			if (done) return
+			if (!group) break
+
+			this.#runGroup(group).catch((err) => console.warn("failed to run group: ", err))
+		}
+
+		// TODO wait until all groups are done
+		this.close()
+	}
+
+	async #runGroup(group: GroupReader) {
+		const msg = new Message.Group(this.#id, group.id)
+		const stream = await Writer.open(this.#quic, msg)
+
+		for (;;) {
+			const frame = await group.readFrame()
+			if (!frame) break
+
+			await stream.u53(frame.byteLength)
+			await stream.write(frame)
+		}
+	}
+
+	close(err = new Closed()) {
+		this.#closed.update(err)
+		this.#track.close()
+	}
+
+	async closed(): Promise<Closed> {
+		let [closed, next] = this.#closed.value()
+
+		for (;;) {
+			if (closed !== undefined) return closed
+			if (!next) return new Closed()
+			;[closed, next] = await next
+		}
+	}
+}
diff --git a/packages/moq/transport/stream.ts b/packages/moq/transfork/stream.ts
similarity index 52%
rename from packages/moq/transport/stream.ts
rename to packages/moq/transfork/stream.ts
index e8ad59c8..2a2a190f 100644
--- a/packages/moq/transport/stream.ts
+++ b/packages/moq/transfork/stream.ts
@@ -1,10 +1,93 @@
-const MAX_U6 = Math.pow(2, 6) - 1
-const MAX_U14 = Math.pow(2, 14) - 1
-const MAX_U30 = Math.pow(2, 30) - 1
-const MAX_U31 = Math.pow(2, 31) - 1
+import * as Message from "./message"
+
+const MAX_U6 = 2 ** 6 - 1
+const MAX_U14 = 2 ** 14 - 1
+const MAX_U30 = 2 ** 30 - 1
+const MAX_U31 = 2 ** 31 - 1
 const MAX_U53 = Number.MAX_SAFE_INTEGER
 const MAX_U62: bigint = 2n ** 62n - 1n
 
+export class Stream {
+	reader: Reader
+	writer: Writer
+
+	constructor(props: {
+		writable: WritableStream<Uint8Array>
+		readable: ReadableStream<Uint8Array>
+	}) {
+		this.writer = new Writer(props.writable)
+		this.reader = new Reader(props.readable)
+	}
+
+	static async accept(quic: WebTransport): Promise<[Message.Bi, Stream] | undefined> {
+		const reader = quic.incomingBidirectionalStreams.getReader()
+		const next = await reader.read()
+		reader.releaseLock()
+
+		if (next.done) return
+		const stream = new Stream(next.value)
+		let msg: Message.Bi
+
+		const typ = await stream.reader.u8()
+		if (typ === Message.SessionClient.StreamID) {
+			msg = await Message.SessionClient.decode(stream.reader)
+		} else if (typ === Message.AnnounceInterest.StreamID) {
+			msg = await Message.AnnounceInterest.decode(stream.reader)
+		} else if (typ === Message.Subscribe.StreamID) {
+			msg = await Message.Subscribe.decode(stream.reader)
+		} else if (typ === Message.Datagrams.StreamID) {
+			msg = await Message.Datagrams.decode(stream.reader)
+		} else if (typ === Message.Fetch.StreamID) {
+			msg = await Message.Fetch.decode(stream.reader)
+		} else if (typ === Message.InfoRequest.StreamID) {
+			msg = await Message.InfoRequest.decode(stream.reader)
+		} else {
+			throw new Error(`unknown stream type: ${typ}`)
+		}
+
+		console.debug("accepted stream", msg)
+
+		return [msg, stream]
+	}
+
+	static async open(quic: WebTransport, msg: Message.Bi): Promise<Stream> {
+		const stream = new Stream(await quic.createBidirectionalStream())
+
+		if (msg instanceof Message.SessionClient) {
+			await stream.writer.u8(Message.SessionClient.StreamID)
+		} else if (msg instanceof Message.AnnounceInterest) {
+			await stream.writer.u8(Message.AnnounceInterest.StreamID)
+		} else if (msg instanceof Message.Subscribe) {
+			await stream.writer.u8(Message.Subscribe.StreamID)
+		} else if (msg instanceof Message.Datagrams) {
+			await stream.writer.u8(Message.Datagrams.StreamID)
+		} else if (msg instanceof Message.Fetch) {
+			await stream.writer.u8(Message.Fetch.StreamID)
+		} else if (msg instanceof Message.InfoRequest) {
+			await stream.writer.u8(Message.InfoRequest.StreamID)
+		} else {
+			// Make sure we're not missing any types.
+			const _: never = msg
+			throw new Error("invalid message type")
+		}
+
+		await msg.encode(stream.writer)
+
+		console.debug("opened stream", msg)
+
+		return stream
+	}
+
+	async close(code?: number) {
+		if (code === undefined) {
+			await this.writer.close()
+		} else {
+			await this.writer.reset(code)
+			await this.reader.stop(code)
+		}
+	}
+}
+
 // Reader wraps a stream and provides convience methods for reading pieces from a stream
 // Unfortunately we can't use a BYOB reader because it's not supported with WebTransport+WebWorkers yet.
 export class Reader {
@@ -12,7 +95,7 @@ export class Reader {
 	#stream: ReadableStream<Uint8Array>
 	#reader: ReadableStreamDefaultReader<Uint8Array>
 
-	constructor(buffer: Uint8Array, stream: ReadableStream<Uint8Array>) {
+	constructor(stream: ReadableStream<Uint8Array>, buffer = new Uint8Array()) {
 		this.#buffer = buffer
 		this.#stream = stream
 		this.#reader = this.#stream.getReader()
@@ -27,7 +110,7 @@ export class Reader {
 
 		const buffer = new Uint8Array(result.value)
 
-		if (this.#buffer.byteLength == 0) {
+		if (this.#buffer.byteLength === 0) {
 			this.#buffer = buffer
 		} else {
 			const temp = new Uint8Array(this.#buffer.byteLength + buffer.byteLength)
@@ -57,14 +140,13 @@ export class Reader {
 	}
 
 	async read(size: number): Promise<Uint8Array> {
-		if (size == 0) return new Uint8Array()
+		if (size === 0) return new Uint8Array()
 
 		await this.#fillTo(size)
 		return this.#slice(size)
 	}
 
 	async readAll(): Promise<Uint8Array> {
-		// eslint-disable-next-line no-empty
 		while (await this.#fill()) {}
 		return this.#slice(this.#buffer.byteLength)
 	}
@@ -79,6 +161,17 @@ export class Reader {
 		return new TextDecoder().decode(buffer)
 	}
 
+	async path(): Promise<string[]> {
+		const parts = await this.u53()
+		const path = []
+
+		for (let i = 0; i < parts; i++) {
+			path.push(await this.string())
+		}
+
+		return path
+	}
+
 	async u8(): Promise<number> {
 		await this.#fillTo(1)
 		return this.#slice(1)[0]
@@ -99,30 +192,29 @@ export class Reader {
 		await this.#fillTo(1)
 		const size = (this.#buffer[0] & 0xc0) >> 6
 
-		if (size == 0) {
+		if (size === 0) {
 			const first = this.#slice(1)[0]
 			return BigInt(first) & 0x3fn
-		} else if (size == 1) {
+		}
+		if (size === 1) {
 			await this.#fillTo(2)
 			const slice = this.#slice(2)
 			const view = new DataView(slice.buffer, slice.byteOffset, slice.byteLength)
 
 			return BigInt(view.getInt16(0)) & 0x3fffn
-		} else if (size == 2) {
+		}
+		if (size === 2) {
 			await this.#fillTo(4)
 			const slice = this.#slice(4)
 			const view = new DataView(slice.buffer, slice.byteOffset, slice.byteLength)
 
 			return BigInt(view.getUint32(0)) & 0x3fffffffn
-		} else if (size == 3) {
-			await this.#fillTo(8)
-			const slice = this.#slice(8)
-			const view = new DataView(slice.buffer, slice.byteOffset, slice.byteLength)
-
-			return view.getBigUint64(0) & 0x3fffffffffffffffn
-		} else {
-			throw new Error("impossible")
 		}
+		await this.#fillTo(8)
+		const slice = this.#slice(8)
+		const view = new DataView(slice.buffer, slice.byteOffset, slice.byteLength)
+
+		return view.getBigUint64(0) & 0x3fffffffffffffffn
 	}
 
 	async done(): Promise<boolean> {
@@ -130,15 +222,38 @@ export class Reader {
 		return !(await this.#fill())
 	}
 
-	async close() {
+	async stop(code: number) {
 		this.#reader.releaseLock()
-		await this.#stream.cancel()
+		await this.#stream.cancel(code)
+	}
+
+	async closed() {
+		return this.#reader.closed
 	}
 
 	release(): [Uint8Array, ReadableStream<Uint8Array>] {
 		this.#reader.releaseLock()
 		return [this.#buffer, this.#stream]
 	}
+
+	static async accept(quic: WebTransport): Promise<[Message.Group, Reader] | undefined> {
+		const reader = quic.incomingUnidirectionalStreams.getReader()
+		const next = await reader.read()
+		reader.releaseLock()
+
+		if (next.done) return
+		const stream = new Reader(next.value)
+		let msg: Message.Uni
+
+		const typ = await stream.u8()
+		if (typ === Message.Group.StreamID) {
+			msg = await Message.Group.decode(stream)
+		} else {
+			throw new Error(`unknown stream type: ${typ}`)
+		}
+
+		return [msg, stream]
+	}
 }
 
 // Writer wraps a stream and writes chunks of data
@@ -170,7 +285,8 @@ export class Writer {
 	async u53(v: number) {
 		if (v < 0) {
 			throw new Error(`underflow, value is negative: ${v}`)
-		} else if (v > MAX_U53) {
+		}
+		if (v > MAX_U53) {
 			throw new Error(`overflow, value larger than 53-bits: ${v}`)
 		}
 
@@ -180,7 +296,8 @@ export class Writer {
 	async u62(v: bigint) {
 		if (v < 0) {
 			throw new Error(`underflow, value is negative: ${v}`)
-		} else if (v >= MAX_U62) {
+		}
+		if (v >= MAX_U62) {
 			throw new Error(`overflow, value larger than 62-bits: ${v}`)
 		}
 
@@ -197,72 +314,102 @@ export class Writer {
 		await this.write(data)
 	}
 
+	async path(path: string[]) {
+		await this.u53(path.length)
+		for (const part of path) {
+			await this.string(part)
+		}
+	}
+
 	async close() {
 		this.#writer.releaseLock()
 		await this.#stream.close()
 	}
 
+	async reset(code: number) {
+		this.#writer.releaseLock()
+		await this.#stream.abort(code)
+	}
+
 	release(): WritableStream<Uint8Array> {
 		this.#writer.releaseLock()
 		return this.#stream
 	}
+
+	static async open(quic: WebTransport, msg: Message.Uni): Promise<Writer> {
+		const stream = new Writer(await quic.createUnidirectionalStream())
+
+		if (msg instanceof Message.Group) {
+			await stream.u8(Message.Group.StreamID)
+		} else {
+			// Make sure we're not missing any types.
+			const _: never = msg
+			throw new Error("invalid message type")
+		}
+
+		return stream
+	}
 }
 
-function setUint8(dst: Uint8Array, v: number): Uint8Array {
+export function setUint8(dst: Uint8Array, v: number): Uint8Array {
 	dst[0] = v
 	return dst.slice(0, 1)
 }
 
-function setUint16(dst: Uint8Array, v: number): Uint8Array {
+export function setUint16(dst: Uint8Array, v: number): Uint8Array {
 	const view = new DataView(dst.buffer, dst.byteOffset, 2)
 	view.setUint16(0, v)
 
 	return new Uint8Array(view.buffer, view.byteOffset, view.byteLength)
 }
 
-function setInt32(dst: Uint8Array, v: number): Uint8Array {
+export function setInt32(dst: Uint8Array, v: number): Uint8Array {
 	const view = new DataView(dst.buffer, dst.byteOffset, 4)
 	view.setInt32(0, v)
 
 	return new Uint8Array(view.buffer, view.byteOffset, view.byteLength)
 }
 
-function setUint32(dst: Uint8Array, v: number): Uint8Array {
+export function setUint32(dst: Uint8Array, v: number): Uint8Array {
 	const view = new DataView(dst.buffer, dst.byteOffset, 4)
 	view.setUint32(0, v)
 
 	return new Uint8Array(view.buffer, view.byteOffset, view.byteLength)
 }
 
-function setVint53(dst: Uint8Array, v: number): Uint8Array {
+export function setVint53(dst: Uint8Array, v: number): Uint8Array {
 	if (v <= MAX_U6) {
 		return setUint8(dst, v)
-	} else if (v <= MAX_U14) {
+	}
+	if (v <= MAX_U14) {
 		return setUint16(dst, v | 0x4000)
-	} else if (v <= MAX_U30) {
+	}
+	if (v <= MAX_U30) {
 		return setUint32(dst, v | 0x80000000)
-	} else if (v <= MAX_U53) {
+	}
+	if (v <= MAX_U53) {
 		return setUint64(dst, BigInt(v) | 0xc000000000000000n)
-	} else {
-		throw new Error(`overflow, value larger than 53-bits: ${v}`)
 	}
+	throw new Error(`overflow, value larger than 53-bits: ${v}`)
 }
 
-function setVint62(dst: Uint8Array, v: bigint): Uint8Array {
+export function setVint62(dst: Uint8Array, v: bigint): Uint8Array {
 	if (v < MAX_U6) {
 		return setUint8(dst, Number(v))
-	} else if (v < MAX_U14) {
+	}
+	if (v < MAX_U14) {
 		return setUint16(dst, Number(v) | 0x4000)
-	} else if (v <= MAX_U30) {
+	}
+	if (v <= MAX_U30) {
 		return setUint32(dst, Number(v) | 0x80000000)
-	} else if (v <= MAX_U62) {
+	}
+	if (v <= MAX_U62) {
 		return setUint64(dst, BigInt(v) | 0xc000000000000000n)
-	} else {
-		throw new Error(`overflow, value larger than 62-bits: ${v}`)
 	}
+	throw new Error(`overflow, value larger than 62-bits: ${v}`)
 }
 
-function setUint64(dst: Uint8Array, v: bigint): Uint8Array {
+export function setUint64(dst: Uint8Array, v: bigint): Uint8Array {
 	const view = new DataView(dst.buffer, dst.byteOffset, 8)
 	view.setBigUint64(0, v)
 
diff --git a/packages/moq/transfork/subscriber.ts b/packages/moq/transfork/subscriber.ts
new file mode 100644
index 00000000..fd5f6640
--- /dev/null
+++ b/packages/moq/transfork/subscriber.ts
@@ -0,0 +1,169 @@
+import { Queue, Watch } from "../common/async"
+import { Closed } from "./error"
+import { FrameReader } from "./frame"
+import * as Message from "./message"
+import type { Track, TrackReader } from "./model"
+import { type Reader, Stream } from "./stream"
+
+export class Subscriber {
+	#quic: WebTransport
+
+	// Our subscribed tracks.
+	#subscribe = new Map<bigint, Subscribe>()
+	#subscribeNext = 0n
+
+	constructor(quic: WebTransport) {
+		this.#quic = quic
+	}
+
+	async announced(prefix: string[]): Promise<Queue<Announced>> {
+		const announced = new Queue<Announced>()
+
+		const msg = new Message.AnnounceInterest(prefix)
+		const stream = await Stream.open(this.#quic, msg)
+
+		this.runAnnounced(stream, announced, prefix)
+			.then(() => announced.close())
+			.catch((err) => announced.abort(err))
+
+		return announced
+	}
+
+	async runAnnounced(stream: Stream, announced: Queue<Announced>, prefix: string[]) {
+		const toggle: Map<string[], Announced> = new Map()
+
+		try {
+			for (;;) {
+				const announce = await Message.Announce.decode_maybe(stream.reader)
+				if (!announce) {
+					break
+				}
+
+				const existing = toggle.get(announce.suffix)
+				if (existing) {
+					if (announce.status === "active") {
+						throw new Error("duplicate announce")
+					}
+
+					existing.close()
+					toggle.delete(announce.suffix)
+				} else {
+					if (announce.status === "closed") {
+						throw new Error("unknown announce")
+					}
+
+					const path = prefix.concat(announce.suffix)
+					const item = new Announced(path)
+					await announced.push(item)
+					toggle.set(announce.suffix, item)
+				}
+			}
+		} finally {
+			for (const item of toggle.values()) {
+				item.close()
+			}
+		}
+	}
+
+	// TODO: Deduplicate identical subscribes
+	async subscribe(track: Track): Promise<TrackReader> {
+		const id = this.#subscribeNext++
+		const msg = new Message.Subscribe(id, track.path, track.priority)
+
+		const stream = await Stream.open(this.#quic, msg)
+		const subscribe = new Subscribe(id, stream, track)
+
+		this.#subscribe.set(subscribe.id, subscribe)
+
+		try {
+			const ok = await Message.Info.decode(stream.reader)
+
+			/*
+			for (;;) {
+				const dropped = await Message.GroupDrop.decode(stream.reader)
+				console.debug("dropped", dropped)
+			}
+				*/
+
+			return subscribe.track.reader()
+		} catch (err) {
+			console.error(err)
+			this.#subscribe.delete(subscribe.id)
+			await subscribe.close(Closed.from(err))
+			throw err
+		}
+	}
+
+	async runGroup(group: Message.Group, stream: Reader) {
+		const subscribe = this.#subscribe.get(group.subscribe)
+		if (!subscribe) return
+
+		const writer = subscribe.track.createGroup(group.sequence)
+
+		const reader = new FrameReader(stream)
+		for (;;) {
+			const frame = await reader.read()
+			if (!frame) break
+
+			writer.writeFrame(frame)
+		}
+
+		writer.close()
+	}
+}
+
+export class Announced {
+	readonly path: string[]
+
+	#closed = new Watch<Closed | undefined>(undefined)
+
+	constructor(path: string[]) {
+		this.path = path
+	}
+
+	close(err = new Closed()) {
+		this.#closed.update(err)
+	}
+
+	async closed(): Promise<Closed> {
+		let [closed, next] = this.#closed.value()
+		for (;;) {
+			if (closed !== undefined) return closed
+			if (!next) return new Closed()
+			;[closed, next] = await next
+		}
+	}
+}
+
+export class Subscribe {
+	readonly id: bigint
+	readonly track: Track
+	readonly stream: Stream
+
+	// A queue of received streams for this subscription.
+	#closed = new Watch<Closed | undefined>(undefined)
+
+	constructor(id: bigint, stream: Stream, track: Track) {
+		this.id = id
+		this.track = track
+		this.stream = stream
+	}
+
+	async run() {
+		try {
+			await this.closed()
+			await this.close()
+		} catch (err) {
+			await this.close(Closed.from(err))
+		}
+	}
+
+	async close(closed?: Closed) {
+		this.track.close(closed)
+		await this.stream.close(closed?.code)
+	}
+
+	async closed() {
+		await this.stream.reader.closed()
+	}
+}
diff --git a/packages/moq/transport/tsconfig.json b/packages/moq/transfork/tsconfig.json
similarity index 100%
rename from packages/moq/transport/tsconfig.json
rename to packages/moq/transfork/tsconfig.json
diff --git a/packages/moq/transport/connection.ts b/packages/moq/transport/connection.ts
deleted file mode 100644
index 55e5c77b..00000000
--- a/packages/moq/transport/connection.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import * as Control from "./control"
-import { Objects } from "./objects"
-import { asError } from "../common/error"
-
-import { Publisher } from "./publisher"
-import { Subscriber } from "./subscriber"
-
-export class Connection {
-	// The established WebTransport session.
-	#quic: WebTransport
-
-	// Use to receive/send control messages.
-	#control: Control.Stream
-
-	// Use to receive/send objects.
-	#objects: Objects
-
-	// Module for contributing tracks.
-	#publisher: Publisher
-
-	// Module for distributing tracks.
-	#subscriber: Subscriber
-
-	// Async work running in the background
-	#running: Promise<void>
-
-	constructor(quic: WebTransport, control: Control.Stream, objects: Objects) {
-		this.#quic = quic
-		this.#control = control
-		this.#objects = objects
-
-		this.#publisher = new Publisher(this.#control, this.#objects)
-		this.#subscriber = new Subscriber(this.#control, this.#objects)
-
-		this.#running = this.#run()
-	}
-
-	close(code = 0, reason = "") {
-		this.#quic.close({ closeCode: code, reason })
-	}
-
-	async #run(): Promise<void> {
-		await Promise.all([this.#runControl(), this.#runObjects()])
-	}
-
-	announce(namespace: string) {
-		return this.#publisher.announce(namespace)
-	}
-
-	announced() {
-		return this.#subscriber.announced()
-	}
-
-	subscribe(namespace: string, track: string) {
-		return this.#subscriber.subscribe(namespace, track)
-	}
-
-	subscribed() {
-		return this.#publisher.subscribed()
-	}
-
-	async #runControl() {
-		// Receive messages until the connection is closed.
-		for (;;) {
-			const msg = await this.#control.recv()
-			await this.#recv(msg)
-		}
-	}
-
-	async #runObjects() {
-		for (;;) {
-			const obj = await this.#objects.recv()
-			if (!obj) break
-
-			await this.#subscriber.recvObject(obj)
-		}
-	}
-
-	async #recv(msg: Control.Message) {
-		if (Control.isPublisher(msg)) {
-			await this.#subscriber.recv(msg)
-		} else {
-			await this.#publisher.recv(msg)
-		}
-	}
-
-	async closed(): Promise<Error> {
-		try {
-			await this.#running
-			return new Error("closed")
-		} catch (e) {
-			return asError(e)
-		}
-	}
-}
diff --git a/packages/moq/transport/control.ts b/packages/moq/transport/control.ts
deleted file mode 100644
index e4cd93dc..00000000
--- a/packages/moq/transport/control.ts
+++ /dev/null
@@ -1,550 +0,0 @@
-import { Reader, Writer } from "./stream"
-
-export type Message = Subscriber | Publisher
-
-// Sent by subscriber
-export type Subscriber = Subscribe | Unsubscribe | AnnounceOk | AnnounceError
-
-export function isSubscriber(m: Message): m is Subscriber {
-	return (
-		m.kind == Msg.Subscribe || m.kind == Msg.Unsubscribe || m.kind == Msg.AnnounceOk || m.kind == Msg.AnnounceError
-	)
-}
-
-// Sent by publisher
-export type Publisher = SubscribeOk | SubscribeError | SubscribeDone | Announce | Unannounce
-
-export function isPublisher(m: Message): m is Publisher {
-	return (
-		m.kind == Msg.SubscribeOk ||
-		m.kind == Msg.SubscribeError ||
-		m.kind == Msg.SubscribeDone ||
-		m.kind == Msg.Announce ||
-		m.kind == Msg.Unannounce
-	)
-}
-
-// I wish we didn't have to split Msg and Id into separate enums.
-// However using the string in the message makes it easier to debug.
-// We'll take the tiny performance hit until I'm better at Typescript.
-export enum Msg {
-	// NOTE: object and setup are in other modules
-	Subscribe = "subscribe",
-	SubscribeOk = "subscribe_ok",
-	SubscribeError = "subscribe_error",
-	SubscribeDone = "subscribe_done",
-	Unsubscribe = "unsubscribe",
-	Announce = "announce",
-	AnnounceOk = "announce_ok",
-	AnnounceError = "announce_error",
-	Unannounce = "unannounce",
-	GoAway = "go_away",
-}
-
-enum Id {
-	// NOTE: object and setup are in other modules
-	// Object = 0,
-	// Setup = 1,
-
-	Subscribe = 0x3,
-	SubscribeOk = 0x4,
-	SubscribeError = 0x5,
-	SubscribeDone = 0xb,
-	Unsubscribe = 0xa,
-	Announce = 0x6,
-	AnnounceOk = 0x7,
-	AnnounceError = 0x8,
-	Unannounce = 0x9,
-	GoAway = 0x10,
-}
-
-export interface Subscribe {
-	kind: Msg.Subscribe
-
-	id: bigint
-	trackId: bigint
-	namespace: string
-	name: string
-
-	location: Location
-
-	params?: Parameters
-}
-
-export type Location = LatestGroup | LatestObject | AbsoluteStart | AbsoluteRange
-
-export interface LatestGroup {
-	mode: "latest_group"
-}
-
-export interface LatestObject {
-	mode: "latest_object"
-}
-
-export interface AbsoluteStart {
-	mode: "absolute_start"
-	start_group: number
-	start_object: number
-}
-
-export interface AbsoluteRange {
-	mode: "absolute_range"
-	start_group: number
-	start_object: number
-	end_group: number
-	end_object: number
-}
-
-export type Parameters = Map<bigint, Uint8Array>
-
-export interface SubscribeOk {
-	kind: Msg.SubscribeOk
-	id: bigint
-	expires: bigint
-	latest?: [number, number]
-}
-
-export interface SubscribeDone {
-	kind: Msg.SubscribeDone
-	id: bigint
-	code: bigint
-	reason: string
-	final?: [number, number]
-}
-
-export interface SubscribeError {
-	kind: Msg.SubscribeError
-	id: bigint
-	code: bigint
-	reason: string
-}
-
-export interface Unsubscribe {
-	kind: Msg.Unsubscribe
-	id: bigint
-}
-
-export interface Announce {
-	kind: Msg.Announce
-	namespace: string
-	params?: Parameters
-}
-
-export interface AnnounceOk {
-	kind: Msg.AnnounceOk
-	namespace: string
-}
-
-export interface AnnounceError {
-	kind: Msg.AnnounceError
-	namespace: string
-	code: bigint
-	reason: string
-}
-
-export interface Unannounce {
-	kind: Msg.Unannounce
-	namespace: string
-}
-
-export class Stream {
-	private decoder: Decoder
-	private encoder: Encoder
-
-	#mutex = Promise.resolve()
-
-	constructor(r: Reader, w: Writer) {
-		this.decoder = new Decoder(r)
-		this.encoder = new Encoder(w)
-	}
-
-	// Will error if two messages are read at once.
-	async recv(): Promise<Message> {
-		const msg = await this.decoder.message()
-		console.log("received message", msg)
-		return msg
-	}
-
-	async send(msg: Message) {
-		const unlock = await this.#lock()
-		try {
-			console.log("sending message", msg)
-			await this.encoder.message(msg)
-		} finally {
-			unlock()
-		}
-	}
-
-	async #lock() {
-		// Make a new promise that we can resolve later.
-		let done: () => void
-		const p = new Promise<void>((resolve) => {
-			done = () => resolve()
-		})
-
-		// Wait until the previous lock is done, then resolve our our lock.
-		const lock = this.#mutex.then(() => done)
-
-		// Save our lock as the next lock.
-		this.#mutex = p
-
-		// Return the lock.
-		return lock
-	}
-}
-
-export class Decoder {
-	r: Reader
-
-	constructor(r: Reader) {
-		this.r = r
-	}
-
-	private async msg(): Promise<Msg> {
-		const t = await this.r.u53()
-		switch (t) {
-			case Id.Subscribe:
-				return Msg.Subscribe
-			case Id.SubscribeOk:
-				return Msg.SubscribeOk
-			case Id.SubscribeDone:
-				return Msg.SubscribeDone
-			case Id.SubscribeError:
-				return Msg.SubscribeError
-			case Id.Unsubscribe:
-				return Msg.Unsubscribe
-			case Id.Announce:
-				return Msg.Announce
-			case Id.AnnounceOk:
-				return Msg.AnnounceOk
-			case Id.AnnounceError:
-				return Msg.AnnounceError
-			case Id.Unannounce:
-				return Msg.Unannounce
-			case Id.GoAway:
-				return Msg.GoAway
-		}
-
-		throw new Error(`unknown control message type: ${t}`)
-	}
-
-	async message(): Promise<Message> {
-		const t = await this.msg()
-		switch (t) {
-			case Msg.Subscribe:
-				return this.subscribe()
-			case Msg.SubscribeOk:
-				return this.subscribe_ok()
-			case Msg.SubscribeError:
-				return this.subscribe_error()
-			case Msg.SubscribeDone:
-				return this.subscribe_done()
-			case Msg.Unsubscribe:
-				return this.unsubscribe()
-			case Msg.Announce:
-				return this.announce()
-			case Msg.AnnounceOk:
-				return this.announce_ok()
-			case Msg.Unannounce:
-				return this.unannounce()
-			case Msg.AnnounceError:
-				return this.announce_error()
-			case Msg.GoAway:
-				throw new Error("TODO: implement go away")
-		}
-	}
-
-	private async subscribe(): Promise<Subscribe> {
-		return {
-			kind: Msg.Subscribe,
-			id: await this.r.u62(),
-			trackId: await this.r.u62(),
-			namespace: await this.r.string(),
-			name: await this.r.string(),
-			location: await this.location(),
-			params: await this.parameters(),
-		}
-	}
-
-	private async location(): Promise<Location> {
-		const mode = await this.r.u62()
-		if (mode == 1n) {
-			return {
-				mode: "latest_group",
-			}
-		} else if (mode == 2n) {
-			return {
-				mode: "latest_object",
-			}
-		} else if (mode == 3n) {
-			return {
-				mode: "absolute_start",
-				start_group: await this.r.u53(),
-				start_object: await this.r.u53(),
-			}
-		} else if (mode == 4n) {
-			return {
-				mode: "absolute_range",
-				start_group: await this.r.u53(),
-				start_object: await this.r.u53(),
-				end_group: await this.r.u53(),
-				end_object: await this.r.u53(),
-			}
-		} else {
-			throw new Error(`invalid filter type: ${mode}`)
-		}
-	}
-
-	private async parameters(): Promise<Parameters | undefined> {
-		const count = await this.r.u53()
-		if (count == 0) return undefined
-
-		const params = new Map<bigint, Uint8Array>()
-
-		for (let i = 0; i < count; i++) {
-			const id = await this.r.u62()
-			const size = await this.r.u53()
-			const value = await this.r.read(size)
-
-			if (params.has(id)) {
-				throw new Error(`duplicate parameter id: ${id}`)
-			}
-
-			params.set(id, value)
-		}
-
-		return params
-	}
-
-	private async subscribe_ok(): Promise<SubscribeOk> {
-		const id = await this.r.u62()
-		const expires = await this.r.u62()
-
-		let latest: [number, number] | undefined
-
-		const flag = await this.r.u8()
-		if (flag === 1) {
-			latest = [await this.r.u53(), await this.r.u53()]
-		} else if (flag !== 0) {
-			throw new Error(`invalid final flag: ${flag}`)
-		}
-
-		return {
-			kind: Msg.SubscribeOk,
-			id,
-			expires,
-			latest,
-		}
-	}
-
-	private async subscribe_done(): Promise<SubscribeDone> {
-		const id = await this.r.u62()
-		const code = await this.r.u62()
-		const reason = await this.r.string()
-
-		let final: [number, number] | undefined
-
-		const flag = await this.r.u8()
-		if (flag === 1) {
-			final = [await this.r.u53(), await this.r.u53()]
-		} else if (flag !== 0) {
-			throw new Error(`invalid final flag: ${flag}`)
-		}
-
-		return {
-			kind: Msg.SubscribeDone,
-			id,
-			code,
-			reason,
-			final,
-		}
-	}
-
-	private async subscribe_error(): Promise<SubscribeError> {
-		return {
-			kind: Msg.SubscribeError,
-			id: await this.r.u62(),
-			code: await this.r.u62(),
-			reason: await this.r.string(),
-		}
-	}
-
-	private async unsubscribe(): Promise<Unsubscribe> {
-		return {
-			kind: Msg.Unsubscribe,
-			id: await this.r.u62(),
-		}
-	}
-
-	private async announce(): Promise<Announce> {
-		const namespace = await this.r.string()
-
-		return {
-			kind: Msg.Announce,
-			namespace,
-			params: await this.parameters(),
-		}
-	}
-
-	private async announce_ok(): Promise<AnnounceOk> {
-		return {
-			kind: Msg.AnnounceOk,
-			namespace: await this.r.string(),
-		}
-	}
-
-	private async announce_error(): Promise<AnnounceError> {
-		return {
-			kind: Msg.AnnounceError,
-			namespace: await this.r.string(),
-			code: await this.r.u62(),
-			reason: await this.r.string(),
-		}
-	}
-
-	private async unannounce(): Promise<Unannounce> {
-		return {
-			kind: Msg.Unannounce,
-			namespace: await this.r.string(),
-		}
-	}
-}
-
-export class Encoder {
-	w: Writer
-
-	constructor(w: Writer) {
-		this.w = w
-	}
-
-	async message(m: Message) {
-		switch (m.kind) {
-			case Msg.Subscribe:
-				return this.subscribe(m)
-			case Msg.SubscribeOk:
-				return this.subscribe_ok(m)
-			case Msg.SubscribeError:
-				return this.subscribe_error(m)
-			case Msg.SubscribeDone:
-				return this.subscribe_done(m)
-			case Msg.Unsubscribe:
-				return this.unsubscribe(m)
-			case Msg.Announce:
-				return this.announce(m)
-			case Msg.AnnounceOk:
-				return this.announce_ok(m)
-			case Msg.AnnounceError:
-				return this.announce_error(m)
-			case Msg.Unannounce:
-				return this.unannounce(m)
-		}
-	}
-
-	async subscribe(s: Subscribe) {
-		await this.w.u53(Id.Subscribe)
-		await this.w.u62(s.id)
-		await this.w.u62(s.trackId)
-		await this.w.string(s.namespace)
-		await this.w.string(s.name)
-		await this.location(s.location)
-		await this.parameters(s.params)
-	}
-
-	private async location(l: Location) {
-		switch (l.mode) {
-			case "latest_group":
-				await this.w.u62(1n)
-				break
-			case "latest_object":
-				await this.w.u62(2n)
-				break
-			case "absolute_start":
-				await this.w.u62(3n)
-				await this.w.u53(l.start_group)
-				await this.w.u53(l.start_object)
-				break
-			case "absolute_range":
-				await this.w.u62(3n)
-				await this.w.u53(l.start_group)
-				await this.w.u53(l.start_object)
-				await this.w.u53(l.end_group)
-				await this.w.u53(l.end_object)
-		}
-	}
-
-	private async parameters(p: Parameters | undefined) {
-		if (!p) {
-			await this.w.u8(0)
-			return
-		}
-
-		await this.w.u53(p.size)
-		for (const [id, value] of p) {
-			await this.w.u62(id)
-			await this.w.u53(value.length)
-			await this.w.write(value)
-		}
-	}
-
-	async subscribe_ok(s: SubscribeOk) {
-		await this.w.u53(Id.SubscribeOk)
-		await this.w.u62(s.id)
-		await this.w.u62(s.expires)
-
-		if (s.latest !== undefined) {
-			await this.w.u8(1)
-			await this.w.u53(s.latest[0])
-			await this.w.u53(s.latest[1])
-		} else {
-			await this.w.u8(0)
-		}
-	}
-
-	async subscribe_done(s: SubscribeDone) {
-		await this.w.u53(Id.SubscribeDone)
-		await this.w.u62(s.id)
-		await this.w.u62(s.code)
-		await this.w.string(s.reason)
-
-		if (s.final !== undefined) {
-			await this.w.u8(1)
-			await this.w.u53(s.final[0])
-			await this.w.u53(s.final[1])
-		} else {
-			await this.w.u8(0)
-		}
-	}
-
-	async subscribe_error(s: SubscribeError) {
-		await this.w.u53(Id.SubscribeError)
-		await this.w.u62(s.id)
-	}
-
-	async unsubscribe(s: Unsubscribe) {
-		await this.w.u53(Id.Unsubscribe)
-		await this.w.u62(s.id)
-	}
-
-	async announce(a: Announce) {
-		await this.w.u53(Id.Announce)
-		await this.w.string(a.namespace)
-		await this.w.u53(0) // parameters
-	}
-
-	async announce_ok(a: AnnounceOk) {
-		await this.w.u53(Id.AnnounceOk)
-		await this.w.string(a.namespace)
-	}
-
-	async announce_error(a: AnnounceError) {
-		await this.w.u53(Id.AnnounceError)
-		await this.w.string(a.namespace)
-		await this.w.u62(a.code)
-		await this.w.string(a.reason)
-	}
-
-	async unannounce(a: Unannounce) {
-		await this.w.u53(Id.Unannounce)
-		await this.w.string(a.namespace)
-	}
-}
diff --git a/packages/moq/transport/objects.ts b/packages/moq/transport/objects.ts
deleted file mode 100644
index 05c9ed4d..00000000
--- a/packages/moq/transport/objects.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import { Reader, Writer } from "./stream"
-export { Reader, Writer }
-
-export enum StreamType {
-	Object = 0x0,
-	Track = 0x50,
-	Group = 0x51,
-}
-
-export enum Status {
-	OBJECT_NULL = 1,
-	GROUP_NULL = 2,
-	GROUP_END = 3,
-	TRACK_END = 4,
-}
-
-export interface TrackHeader {
-	type: StreamType.Track
-	sub: bigint
-	track: bigint
-	priority: number // VarInt with a u32 maximum value
-}
-
-export interface TrackChunk {
-	group: number // The group sequence, as a number because 2^53 is enough.
-	object: number
-	payload: Uint8Array | Status
-}
-
-export interface GroupHeader {
-	type: StreamType.Group
-	sub: bigint
-	track: bigint
-	group: number // The group sequence, as a number because 2^53 is enough.
-	priority: number // VarInt with a u32 maximum value
-}
-
-export interface GroupChunk {
-	object: number
-	payload: Uint8Array | Status
-}
-
-export interface ObjectHeader {
-	type: StreamType.Object
-	sub: bigint
-	track: bigint
-	group: number
-	object: number
-	priority: number
-	status: number
-}
-
-export interface ObjectChunk {
-	payload: Uint8Array
-}
-
-type WriterType<T> = T extends TrackHeader
-	? TrackWriter
-	: T extends GroupHeader
-	? GroupWriter
-	: T extends ObjectHeader
-	? ObjectWriter
-	: never
-
-export class Objects {
-	private quic: WebTransport
-
-	constructor(quic: WebTransport) {
-		this.quic = quic
-	}
-
-	async send<T extends TrackHeader | GroupHeader | ObjectHeader>(h: T): Promise<WriterType<T>> {
-		const stream = await this.quic.createUnidirectionalStream()
-		const w = new Writer(stream)
-
-		await w.u53(h.type)
-		await w.u62(h.sub)
-		await w.u62(h.track)
-
-		let res: WriterType<T>
-
-		if (h.type == StreamType.Object) {
-			await w.u53(h.group)
-			await w.u53(h.object)
-			await w.u53(h.priority)
-			await w.u53(h.status)
-
-			res = new ObjectWriter(h, w) as WriterType<T>
-		} else if (h.type === StreamType.Group) {
-			await w.u53(h.group)
-			await w.u53(h.priority)
-
-			res = new GroupWriter(h, w) as WriterType<T>
-		} else if (h.type === StreamType.Track) {
-			await w.u53(h.priority)
-
-			res = new TrackWriter(h, w) as WriterType<T>
-		} else {
-			throw new Error("unknown header type")
-		}
-
-		// console.trace("send object", res.header)
-
-		return res
-	}
-
-	async recv(): Promise<TrackReader | GroupReader | ObjectReader | undefined> {
-		const streams = this.quic.incomingUnidirectionalStreams.getReader()
-
-		const { value, done } = await streams.read()
-		streams.releaseLock()
-
-		if (done) return
-
-		const r = new Reader(new Uint8Array(), value)
-		const type = (await r.u53()) as StreamType
-		let res: TrackReader | GroupReader | ObjectReader
-
-		if (type == StreamType.Track) {
-			const h: TrackHeader = {
-				type,
-				sub: await r.u62(),
-				track: await r.u62(),
-				priority: await r.u53(),
-			}
-
-			res = new TrackReader(h, r)
-		} else if (type == StreamType.Group) {
-			const h: GroupHeader = {
-				type,
-				sub: await r.u62(),
-				track: await r.u62(),
-				group: await r.u53(),
-				priority: await r.u53(),
-			}
-			res = new GroupReader(h, r)
-		} else if (type == StreamType.Object) {
-			const h = {
-				type,
-				sub: await r.u62(),
-				track: await r.u62(),
-				group: await r.u53(),
-				object: await r.u53(),
-				status: await r.u53(),
-				priority: await r.u53(),
-			}
-
-			res = new ObjectReader(h, r)
-		} else {
-			throw new Error("unknown stream type")
-		}
-
-		// console.trace("receive object", res.header)
-
-		return res
-	}
-}
-
-export class TrackWriter {
-	constructor(
-		public header: TrackHeader,
-		public stream: Writer,
-	) {}
-
-	async write(c: TrackChunk) {
-		await this.stream.u53(c.group)
-		await this.stream.u53(c.object)
-
-		if (c.payload instanceof Uint8Array) {
-			await this.stream.u53(c.payload.byteLength)
-			await this.stream.write(c.payload)
-		} else {
-			// empty payload with status
-			await this.stream.u53(0)
-			await this.stream.u53(c.payload as number)
-		}
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
-
-export class GroupWriter {
-	constructor(
-		public header: GroupHeader,
-		public stream: Writer,
-	) {}
-
-	async write(c: GroupChunk) {
-		await this.stream.u53(c.object)
-		if (c.payload instanceof Uint8Array) {
-			await this.stream.u53(c.payload.byteLength)
-			await this.stream.write(c.payload)
-		} else {
-			await this.stream.u53(0)
-			await this.stream.u53(c.payload as number)
-		}
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
-
-export class ObjectWriter {
-	constructor(
-		public header: ObjectHeader,
-		public stream: Writer,
-	) {}
-
-	async write(c: ObjectChunk) {
-		await this.stream.write(c.payload)
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
-
-export class TrackReader {
-	constructor(
-		public header: TrackHeader,
-		public stream: Reader,
-	) {}
-
-	async read(): Promise<TrackChunk | undefined> {
-		if (await this.stream.done()) {
-			return
-		}
-
-		const group = await this.stream.u53()
-		const object = await this.stream.u53()
-		const size = await this.stream.u53()
-
-		let payload
-		if (size == 0) {
-			payload = (await this.stream.u53()) as Status
-		} else {
-			payload = await this.stream.read(size)
-		}
-
-		return {
-			group,
-			object,
-			payload,
-		}
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
-
-export class GroupReader {
-	constructor(
-		public header: GroupHeader,
-		public stream: Reader,
-	) {}
-
-	async read(): Promise<GroupChunk | undefined> {
-		if (await this.stream.done()) {
-			return
-		}
-
-		const object = await this.stream.u53()
-		const size = await this.stream.u53()
-
-		let payload
-		if (size == 0) {
-			payload = (await this.stream.u53()) as Status
-		} else {
-			payload = await this.stream.read(size)
-		}
-
-		return {
-			object,
-			payload,
-		}
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
-
-export class ObjectReader {
-	constructor(
-		public header: ObjectHeader,
-		public stream: Reader,
-	) {}
-
-	// NOTE: Can only be called once.
-	async read(): Promise<ObjectChunk | undefined> {
-		if (await this.stream.done()) {
-			return
-		}
-
-		return {
-			payload: await this.stream.readAll(),
-		}
-	}
-
-	async close() {
-		await this.stream.close()
-	}
-}
diff --git a/packages/moq/transport/publisher.ts b/packages/moq/transport/publisher.ts
deleted file mode 100644
index 547344d7..00000000
--- a/packages/moq/transport/publisher.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import * as Control from "./control"
-import { Queue, Watch } from "../common/async"
-import { Objects, GroupWriter, ObjectWriter, StreamType, TrackWriter } from "./objects"
-
-export class Publisher {
-	// Used to send control messages
-	#control: Control.Stream
-
-	// Use to send objects.
-	#objects: Objects
-
-	// Our announced tracks.
-	#announce = new Map<string, AnnounceSend>()
-
-	// Their subscribed tracks.
-	#subscribe = new Map<bigint, SubscribeRecv>()
-	#subscribeQueue = new Queue<SubscribeRecv>(Number.MAX_SAFE_INTEGER) // Unbounded queue in case there's no receiver
-
-	constructor(control: Control.Stream, objects: Objects) {
-		this.#control = control
-		this.#objects = objects
-	}
-
-	// Announce a track namespace.
-	async announce(namespace: string): Promise<AnnounceSend> {
-		if (this.#announce.has(namespace)) {
-			throw new Error(`already announce: ${namespace}`)
-		}
-
-		const announce = new AnnounceSend(this.#control, namespace)
-		this.#announce.set(namespace, announce)
-
-		await this.#control.send({
-			kind: Control.Msg.Announce,
-			namespace,
-		})
-
-		return announce
-	}
-
-	// Receive the next new subscription
-	async subscribed() {
-		return await this.#subscribeQueue.next()
-	}
-
-	async recv(msg: Control.Subscriber) {
-		if (msg.kind == Control.Msg.Subscribe) {
-			await this.recvSubscribe(msg)
-		} else if (msg.kind == Control.Msg.Unsubscribe) {
-			this.recvUnsubscribe(msg)
-		} else if (msg.kind == Control.Msg.AnnounceOk) {
-			this.recvAnnounceOk(msg)
-		} else if (msg.kind == Control.Msg.AnnounceError) {
-			this.recvAnnounceError(msg)
-		} else {
-			throw new Error(`unknown control message`) // impossible
-		}
-	}
-
-	recvAnnounceOk(msg: Control.AnnounceOk) {
-		const announce = this.#announce.get(msg.namespace)
-		if (!announce) {
-			throw new Error(`announce OK for unknown announce: ${msg.namespace}`)
-		}
-
-		announce.onOk()
-	}
-
-	recvAnnounceError(msg: Control.AnnounceError) {
-		const announce = this.#announce.get(msg.namespace)
-		if (!announce) {
-			// TODO debug this
-			console.warn(`announce error for unknown announce: ${msg.namespace}`)
-			return
-		}
-
-		announce.onError(msg.code, msg.reason)
-	}
-
-	async recvSubscribe(msg: Control.Subscribe) {
-		if (this.#subscribe.has(msg.id)) {
-			throw new Error(`duplicate subscribe for id: ${msg.id}`)
-		}
-
-		const subscribe = new SubscribeRecv(this.#control, this.#objects, msg)
-		this.#subscribe.set(msg.id, subscribe)
-		await this.#subscribeQueue.push(subscribe)
-
-		await this.#control.send({ kind: Control.Msg.SubscribeOk, id: msg.id, expires: 0n })
-	}
-
-	recvUnsubscribe(_msg: Control.Unsubscribe) {
-		throw new Error("TODO unsubscribe")
-	}
-}
-
-export class AnnounceSend {
-	#control: Control.Stream
-
-	readonly namespace: string
-
-	// The current state, updated by control messages.
-	#state = new Watch<"init" | "ack" | Error>("init")
-
-	constructor(control: Control.Stream, namespace: string) {
-		this.#control = control
-		this.namespace = namespace
-	}
-
-	async ok() {
-		for (;;) {
-			const [state, next] = this.#state.value()
-			if (state === "ack") return
-			if (state instanceof Error) throw state
-			if (!next) throw new Error("closed")
-
-			await next
-		}
-	}
-
-	async active() {
-		for (;;) {
-			const [state, next] = this.#state.value()
-			if (state instanceof Error) throw state
-			if (!next) return
-
-			await next
-		}
-	}
-
-	async close() {
-		// TODO implement unsubscribe
-		// await this.#inner.sendUnsubscribe()
-	}
-
-	closed() {
-		const [state, next] = this.#state.value()
-		return state instanceof Error || next == undefined
-	}
-
-	onOk() {
-		if (this.closed()) return
-		this.#state.update("ack")
-	}
-
-	onError(code: bigint, reason: string) {
-		if (this.closed()) return
-
-		const err = new Error(`ANNOUNCE_ERROR (${code})` + reason ? `: ${reason}` : "")
-		this.#state.update(err)
-	}
-}
-
-export class SubscribeRecv {
-	#control: Control.Stream
-	#objects: Objects
-	#id: bigint
-	#trackId: bigint
-
-	readonly namespace: string
-	readonly track: string
-
-	// The current state of the subscription.
-	#state: "init" | "ack" | "closed" = "init"
-
-	constructor(control: Control.Stream, objects: Objects, msg: Control.Subscribe) {
-		this.#control = control // so we can send messages
-		this.#objects = objects // so we can send objects
-		this.#id = msg.id
-		this.#trackId = msg.trackId
-		this.namespace = msg.namespace
-		this.track = msg.name
-	}
-
-	// Acknowledge the subscription as valid.
-	async ack() {
-		if (this.#state !== "init") return
-		this.#state = "ack"
-
-		// Send the control message.
-		return this.#control.send({ kind: Control.Msg.SubscribeOk, id: this.#id, expires: 0n })
-	}
-
-	// Close the subscription with an error.
-	async close(code = 0n, reason = "") {
-		if (this.#state === "closed") return
-		this.#state = "closed"
-
-		return this.#control.send({
-			kind: Control.Msg.SubscribeDone,
-			id: this.#id,
-			code,
-			reason,
-		})
-	}
-
-	// Create a writable data stream for the entire track
-	async serve(props?: { priority: number }): Promise<TrackWriter> {
-		return this.#objects.send({
-			type: StreamType.Track,
-			sub: this.#id,
-			track: this.#trackId,
-			priority: props?.priority ?? 0,
-		})
-	}
-
-	// Create a writable data stream for a group within the track
-	async group(props: { group: number; priority?: number }): Promise<GroupWriter> {
-		return this.#objects.send({
-			type: StreamType.Group,
-			sub: this.#id,
-			track: this.#trackId,
-			group: props.group,
-			priority: props.priority ?? 0,
-		})
-	}
-
-	// Create a writable data stream for a single object within the track
-	async object(props: { group: number; object: number; priority?: number }): Promise<ObjectWriter> {
-		return this.#objects.send({
-			type: StreamType.Object,
-			sub: this.#id,
-			track: this.#trackId,
-			group: props.group,
-			object: props.object,
-			priority: props.priority ?? 0,
-			status: 0,
-		})
-	}
-}
diff --git a/packages/moq/transport/setup.ts b/packages/moq/transport/setup.ts
deleted file mode 100644
index ac813925..00000000
--- a/packages/moq/transport/setup.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { Reader, Writer } from "./stream"
-
-export type Message = Client | Server
-export type Role = "publisher" | "subscriber" | "both"
-
-export enum Version {
-	DRAFT_00 = 0xff000000,
-	DRAFT_01 = 0xff000001,
-	DRAFT_02 = 0xff000002,
-	DRAFT_03 = 0xff000003,
-	DRAFT_04 = 0xff000004,
-	KIXEL_00 = 0xbad00,
-	KIXEL_01 = 0xbad01,
-}
-
-// NOTE: These are forked from moq-transport-00.
-//   1. messages lack a sized length
-//   2. parameters are not optional and written in order (role + path)
-//   3. role indicates local support only, not remote support
-
-export interface Client {
-	versions: Version[]
-	role: Role
-	params?: Parameters
-}
-
-export interface Server {
-	version: Version
-	params?: Parameters
-}
-
-export class Stream {
-	recv: Decoder
-	send: Encoder
-
-	constructor(r: Reader, w: Writer) {
-		this.recv = new Decoder(r)
-		this.send = new Encoder(w)
-	}
-}
-
-export type Parameters = Map<bigint, Uint8Array>
-
-export class Decoder {
-	r: Reader
-
-	constructor(r: Reader) {
-		this.r = r
-	}
-
-	async client(): Promise<Client> {
-		const type = await this.r.u53()
-		if (type !== 0x40) throw new Error(`client SETUP type must be 0x40, got ${type}`)
-
-		const count = await this.r.u53()
-
-		const versions = []
-		for (let i = 0; i < count; i++) {
-			const version = await this.r.u53()
-			versions.push(version)
-		}
-
-		const params = await this.parameters()
-		const role = this.role(params?.get(0n))
-
-		return {
-			versions,
-			role,
-			params,
-		}
-	}
-
-	async server(): Promise<Server> {
-		const type = await this.r.u53()
-		if (type !== 0x41) throw new Error(`server SETUP type must be 0x41, got ${type}`)
-
-		const version = await this.r.u53()
-		const params = await this.parameters()
-
-		return {
-			version,
-			params,
-		}
-	}
-
-	private async parameters(): Promise<Parameters | undefined> {
-		const count = await this.r.u53()
-		if (count == 0) return undefined
-
-		const params = new Map<bigint, Uint8Array>()
-
-		for (let i = 0; i < count; i++) {
-			const id = await this.r.u62()
-			const size = await this.r.u53()
-			const value = await this.r.read(size)
-
-			if (params.has(id)) {
-				throw new Error(`duplicate parameter id: ${id}`)
-			}
-
-			params.set(id, value)
-		}
-
-		return params
-	}
-
-	role(raw: Uint8Array | undefined): Role {
-		if (!raw) throw new Error("missing role parameter")
-		if (raw.length != 1) throw new Error("multi-byte varint not supported")
-
-		switch (raw[0]) {
-			case 1:
-				return "publisher"
-			case 2:
-				return "subscriber"
-			case 3:
-				return "both"
-			default:
-				throw new Error(`invalid role: ${raw[0]}`)
-		}
-	}
-}
-
-export class Encoder {
-	w: Writer
-
-	constructor(w: Writer) {
-		this.w = w
-	}
-
-	async client(c: Client) {
-		await this.w.u53(0x40)
-		await this.w.u53(c.versions.length)
-		for (const v of c.versions) {
-			await this.w.u53(v)
-		}
-
-		// I hate it
-		const params = c.params ?? new Map()
-		params.set(0n, new Uint8Array([c.role == "publisher" ? 1 : c.role == "subscriber" ? 2 : 3]))
-		await this.parameters(params)
-	}
-
-	async server(s: Server) {
-		await this.w.u53(0x41)
-		await this.w.u53(s.version)
-		await this.parameters(s.params)
-	}
-
-	private async parameters(p: Parameters | undefined) {
-		if (!p) {
-			await this.w.u8(0)
-			return
-		}
-
-		await this.w.u53(p.size)
-		for (const [id, value] of p) {
-			await this.w.u62(id)
-			await this.w.u53(value.length)
-			await this.w.write(value)
-		}
-	}
-}
diff --git a/packages/moq/transport/subscriber.ts b/packages/moq/transport/subscriber.ts
deleted file mode 100644
index bd1db717..00000000
--- a/packages/moq/transport/subscriber.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import * as Control from "./control"
-import { Queue, Watch } from "../common/async"
-import { Objects } from "./objects"
-import type { TrackReader, GroupReader, ObjectReader } from "./objects"
-
-export class Subscriber {
-	// Use to send control messages.
-	#control: Control.Stream
-
-	// Use to send objects.
-	#objects: Objects
-
-	// Announced broadcasts.
-	#announce = new Map<string, AnnounceRecv>()
-	#announceQueue = new Watch<AnnounceRecv[]>([])
-
-	// Our subscribed tracks.
-	#subscribe = new Map<bigint, SubscribeSend>()
-	#subscribeNext = 0n
-
-	constructor(control: Control.Stream, objects: Objects) {
-		this.#control = control
-		this.#objects = objects
-	}
-
-	announced(): Watch<AnnounceRecv[]> {
-		return this.#announceQueue
-	}
-
-	async recv(msg: Control.Publisher) {
-		if (msg.kind == Control.Msg.Announce) {
-			await this.recvAnnounce(msg)
-		} else if (msg.kind == Control.Msg.Unannounce) {
-			this.recvUnannounce(msg)
-		} else if (msg.kind == Control.Msg.SubscribeOk) {
-			this.recvSubscribeOk(msg)
-		} else if (msg.kind == Control.Msg.SubscribeError) {
-			await this.recvSubscribeError(msg)
-		} else if (msg.kind == Control.Msg.SubscribeDone) {
-			await this.recvSubscribeDone(msg)
-		} else {
-			throw new Error(`unknown control message`) // impossible
-		}
-	}
-
-	async recvAnnounce(msg: Control.Announce) {
-		if (this.#announce.has(msg.namespace)) {
-			throw new Error(`duplicate announce for namespace: ${msg.namespace}`)
-		}
-
-		await this.#control.send({ kind: Control.Msg.AnnounceOk, namespace: msg.namespace })
-
-		const announce = new AnnounceRecv(this.#control, msg.namespace)
-		this.#announce.set(msg.namespace, announce)
-
-		this.#announceQueue.update((queue) => [...queue, announce])
-	}
-
-	recvUnannounce(_msg: Control.Unannounce) {
-		throw new Error(`TODO Unannounce`)
-	}
-
-	async subscribe(namespace: string, track: string) {
-		const id = this.#subscribeNext++
-
-		const subscribe = new SubscribeSend(this.#control, id, namespace, track)
-		this.#subscribe.set(id, subscribe)
-
-		await this.#control.send({
-			kind: Control.Msg.Subscribe,
-			id,
-			trackId: id,
-			namespace,
-			name: track,
-			location: {
-				mode: "latest_group",
-			},
-		})
-
-		return subscribe
-	}
-
-	recvSubscribeOk(msg: Control.SubscribeOk) {
-		const subscribe = this.#subscribe.get(msg.id)
-		if (!subscribe) {
-			throw new Error(`subscribe ok for unknown id: ${msg.id}`)
-		}
-
-		subscribe.onOk()
-	}
-
-	async recvSubscribeError(msg: Control.SubscribeError) {
-		const subscribe = this.#subscribe.get(msg.id)
-		if (!subscribe) {
-			throw new Error(`subscribe error for unknown id: ${msg.id}`)
-		}
-
-		await subscribe.onError(msg.code, msg.reason)
-	}
-
-	async recvSubscribeDone(msg: Control.SubscribeDone) {
-		const subscribe = this.#subscribe.get(msg.id)
-		if (!subscribe) {
-			throw new Error(`subscribe error for unknown id: ${msg.id}`)
-		}
-
-		await subscribe.onError(msg.code, msg.reason)
-	}
-
-	async recvObject(reader: TrackReader | GroupReader | ObjectReader) {
-		const subscribe = this.#subscribe.get(reader.header.track)
-		if (!subscribe) {
-			throw new Error(`data for for unknown track: ${reader.header.track}`)
-		}
-
-		await subscribe.onData(reader)
-	}
-}
-
-export class AnnounceRecv {
-	#control: Control.Stream
-
-	readonly namespace: string
-
-	// The current state of the announce
-	#state: "init" | "ack" | "closed" = "init"
-
-	constructor(control: Control.Stream, namespace: string) {
-		this.#control = control // so we can send messages
-		this.namespace = namespace
-	}
-
-	// Acknowledge the subscription as valid.
-	async ok() {
-		if (this.#state !== "init") return
-		this.#state = "ack"
-
-		// Send the control message.
-		return this.#control.send({ kind: Control.Msg.AnnounceOk, namespace: this.namespace })
-	}
-
-	async close(code = 0n, reason = "") {
-		if (this.#state === "closed") return
-		this.#state = "closed"
-
-		return this.#control.send({ kind: Control.Msg.AnnounceError, namespace: this.namespace, code, reason })
-	}
-}
-
-export class SubscribeSend {
-	#control: Control.Stream
-	#id: bigint
-
-	readonly namespace: string
-	readonly track: string
-
-	// A queue of received streams for this subscription.
-	#data = new Queue<TrackReader | GroupReader | ObjectReader>()
-
-	constructor(control: Control.Stream, id: bigint, namespace: string, track: string) {
-		this.#control = control // so we can send messages
-		this.#id = id
-		this.namespace = namespace
-		this.track = track
-	}
-
-	async close(_code = 0n, _reason = "") {
-		// TODO implement unsubscribe
-		// await this.#inner.sendReset(code, reason)
-	}
-
-	onOk() {
-		// noop
-	}
-
-	async onError(code: bigint, reason: string) {
-		if (code == 0n) {
-			return await this.#data.close()
-		}
-
-		if (reason !== "") {
-			reason = `: ${reason}`
-		}
-
-		const err = new Error(`SUBSCRIBE_ERROR (${code})${reason}`)
-		return await this.#data.abort(err)
-	}
-
-	async onData(reader: TrackReader | GroupReader | ObjectReader) {
-		if (!this.#data.closed()) await this.#data.push(reader)
-	}
-
-	// Receive the next a readable data stream
-	async data() {
-		return await this.#data.next()
-	}
-}
diff --git a/packages/moq/tsconfig.json b/packages/moq/tsconfig.json
index 2ab7124f..c5441748 100644
--- a/packages/moq/tsconfig.json
+++ b/packages/moq/tsconfig.json
@@ -14,7 +14,7 @@
 		"isolatedModules": true,
 		"types": [], // Don't automatically import any @types modules.
 		"lib": ["es2022", "dom"],
-		"typeRoots": ["./types", "../node_modules/@types"]
+		"typeRoots": ["../node_modules/@types"]
 	},
 	"references": [
 		{
@@ -30,10 +30,10 @@
 			"path": "./contribute"
 		},
 		{
-			"path": "./transport"
+			"path": "./transfork"
 		},
 		{
-			"path": "./media"
+			"path": "./karp"
 		}
 	],
 	"paths": {
diff --git a/packages/moq/types/mp4box.d.ts b/packages/moq/types/mp4box.d.ts
deleted file mode 100644
index 923887ad..00000000
--- a/packages/moq/types/mp4box.d.ts
+++ /dev/null
@@ -1,1848 +0,0 @@
-// https://github.com/gpac/mp4box.js/issues/233
-
-declare module "mp4box" {
-	export interface MP4MediaTrack {
-		id: number
-		created: Date
-		modified: Date
-		movie_duration: number
-		layer: number
-		alternate_group: number
-		volume: number
-		track_width: number
-		track_height: number
-		timescale: number
-		duration: number
-		bitrate: number
-		codec: string
-		language: string
-		nb_samples: number
-	}
-
-	export interface MP4VideoData {
-		width: number
-		height: number
-	}
-
-	export interface MP4VideoTrack extends MP4MediaTrack {
-		video: MP4VideoData
-	}
-
-	export interface MP4AudioData {
-		sample_rate: number
-		channel_count: number
-		sample_size: number
-	}
-
-	export interface MP4AudioTrack extends MP4MediaTrack {
-		audio: MP4AudioData
-	}
-
-	export type MP4Track = MP4VideoTrack | MP4AudioTrack
-
-	export interface MP4Info {
-		duration: number
-		timescale: number
-		fragment_duration: number
-		isFragmented: boolean
-		isProgressive: boolean
-		hasIOD: boolean
-		brands: string[]
-		created: Date
-		modified: Date
-		tracks: MP4Track[]
-		mime: string
-		audioTracks: MP4AudioTrack[]
-		videoTracks: MP4VideoTrack[]
-	}
-
-	export type MP4ArrayBuffer = ArrayBuffer & { fileStart: number }
-
-	export function createFile(): ISOFile
-
-	export interface Sample {
-		number: number
-		track_id: number
-		timescale: number
-		description_index: number
-		description: {
-			avcC?: BoxParser.avcCBox // h.264
-			hvcC?: BoxParser.hvcCBox // hevc
-			vpcC?: BoxParser.vpcCBox // vp9
-			av1C?: BoxParser.av1CBox // av1
-		}
-		data: Uint8Array
-		size: number
-		alreadyRead?: number
-		duration: number
-		cts: number
-		dts: number
-		is_sync: boolean
-		is_leading?: number
-		depends_on?: number
-		is_depended_on?: number
-		has_redundancy?: number
-		degradation_priority?: number
-		offset?: number
-		subsamples?: any
-	}
-
-	export interface ExtractionOptions {
-		nbSamples: number
-	}
-
-	export class DataStream {
-		// WARNING, the default is little endian, which is not what MP4 uses.
-		constructor(buffer?: ArrayBuffer, byteOffset?: number, endianness?: boolean)
-		getPosition(): number
-
-		get byteLength(): number
-		get buffer(): ArrayBuffer
-		set buffer(v: ArrayBuffer)
-		get byteOffset(): number
-		set byteOffset(v: number)
-		get dataView(): DataView
-		set dataView(v: DataView)
-
-		seek(pos: number): void
-		isEof(): boolean
-
-		mapFloat32Array(length: number, e?: boolean): any
-		mapFloat64Array(length: number, e?: boolean): any
-		mapInt16Array(length: number, e?: boolean): any
-		mapInt32Array(length: number, e?: boolean): any
-		mapInt8Array(length: number): any
-		mapUint16Array(length: number, e?: boolean): any
-		mapUint32Array(length: number, e?: boolean): any
-		mapUint8Array(length: number): any
-
-		readInt32Array(length: number, endianness?: boolean): Int32Array
-		readInt16Array(length: number, endianness?: boolean): Int16Array
-		readInt8Array(length: number): Int8Array
-		readUint32Array(length: number, endianness?: boolean): Uint32Array
-		readUint16Array(length: number, endianness?: boolean): Uint16Array
-		readUint8Array(length: number): Uint8Array
-		readFloat64Array(length: number, endianness?: boolean): Float64Array
-		readFloat32Array(length: number, endianness?: boolean): Float32Array
-
-		readInt32(endianness?: boolean): number
-		readInt16(endianness?: boolean): number
-		readInt8(): number
-		readUint32(endianness?: boolean): number
-		//readUint32Array(length: any, e: any): any
-		readUint24(): number
-		readUint16(endianness?: boolean): number
-		readUint8(): number
-		//readUint64(): any
-		readFloat32(endianness?: boolean): number
-		readFloat64(endianness?: boolean): number
-		//readCString(length: number): any
-		//readString(length: number, encoding: any): any
-
-		static endianness: boolean
-
-		memcpy(
-			dst: ArrayBufferLike,
-			dstOffset: number,
-			src: ArrayBufferLike,
-			srcOffset: number,
-			byteLength: number,
-		): void
-
-		// TODO I got bored porting all functions
-
-		save(filename: string): void
-		shift(offset: number): void
-
-		writeInt32Array(arr: Int32Array, endianness?: boolean): void
-		writeInt16Array(arr: Int16Array, endianness?: boolean): void
-		writeInt8Array(arr: Int8Array): void
-		writeUint32Array(arr: Uint32Array, endianness?: boolean): void
-		writeUint16Array(arr: Uint16Array, endianness?: boolean): void
-		writeUint8Array(arr: Uint8Array): void
-		writeFloat64Array(arr: Float64Array, endianness?: boolean): void
-		writeFloat32Array(arr: Float32Array, endianness?: boolean): void
-		writeInt32(v: number, endianness?: boolean): void
-		writeInt16(v: number, endianness?: boolean): void
-		writeInt8(v: number): void
-		writeUint32(v: number, endianness?: boolean): void
-		writeUint16(v: number, endianness?: boolean): void
-		writeUint8(v: number): void
-		writeFloat32(v: number, endianness?: boolean): void
-		writeFloat64(v: number, endianness?: boolean): void
-		writeUCS2String(s: string, endianness?: boolean, length?: number): void
-		writeString(s: string, encoding?: string, length?: number): void
-		writeCString(s: string, length?: number): void
-		writeUint64(v: number): void
-		writeUint24(v: number): void
-		adjustUint32(pos: number, v: number): void
-
-		static LITTLE_ENDIAN: boolean
-		static BIG_ENDIAN: boolean
-
-		// TODO add correct types; these are exported by dts-gen
-		readCString(length: any): any
-		readInt64(): any
-		readString(length: any, encoding: any): any
-		readUint64(): any
-		writeStruct(structDefinition: any, struct: any): void
-		writeType(t: any, v: any, struct: any): any
-
-		static arrayToNative(array: any, arrayIsLittleEndian: any): any
-		static flipArrayEndianness(array: any): any
-		static memcpy(dst: any, dstOffset: any, src: any, srcOffset: any, byteLength: any): void
-		static nativeToEndian(array: any, littleEndian: any): any
-	}
-
-	export interface TrackOptions {
-		id?: number
-		type?: string
-		width?: number
-		height?: number
-		duration?: number
-		layer?: number
-		timescale?: number
-		media_duration?: number
-		language?: string
-		hdlr?: string
-
-		// video
-		avcDecoderConfigRecord?: any
-		hevcDecoderConfigRecord?: any
-
-		// audio
-		balance?: number
-		channel_count?: number
-		samplesize?: number
-		samplerate?: number
-
-		//captions
-		namespace?: string
-		schema_location?: string
-		auxiliary_mime_types?: string
-
-		description?: BoxParser.Box
-		description_boxes?: BoxParser.Box[]
-
-		default_sample_description_index_id?: number
-		default_sample_duration?: number
-		default_sample_size?: number
-		default_sample_flags?: number
-	}
-
-	export interface FileOptions {
-		brands?: string[]
-		timescale?: number
-		rate?: number
-		duration?: number
-		width?: number
-	}
-
-	export interface SampleOptions {
-		sample_description_index?: number
-		duration?: number
-		cts?: number
-		dts?: number
-		is_sync?: boolean
-		is_leading?: number
-		depends_on?: number
-		is_depended_on?: number
-		has_redundancy?: number
-		degradation_priority?: number
-		subsamples?: any
-	}
-
-	// TODO add the remaining functions
-	// TODO move to another module
-	export class ISOFile {
-		constructor(stream?: DataStream)
-
-		init(options?: FileOptions): ISOFile
-		addTrack(options?: TrackOptions): number
-		addSample(track: number, data: Uint8Array, options?: SampleOptions): Sample
-
-		createSingleSampleMoof(sample: Sample): BoxParser.moofBox
-
-		// helpers
-		getTrackById(id: number): BoxParser.trakBox | undefined
-		getTrexById(id: number): BoxParser.trexBox | undefined
-
-		// boxes that are added to the root
-		boxes: BoxParser.Box[]
-		mdats: BoxParser.mdatBox[]
-		moofs: BoxParser.moofBox[]
-
-		ftyp?: BoxParser.ftypBox
-		moov?: BoxParser.moovBox
-
-		static writeInitializationSegment(
-			ftyp: BoxParser.ftypBox,
-			moov: BoxParser.moovBox,
-			total_duration: number,
-			sample_duration: number,
-		): ArrayBuffer
-
-		// TODO add correct types; these are exported by dts-gen
-		add(name: any): any
-		addBox(box: any): any
-		appendBuffer(ab: any, last: any): any
-		buildSampleLists(): void
-		buildTrakSampleLists(trak: any): void
-		checkBuffer(ab: any): any
-		createFragment(track_id: any, sampleNumber: any, stream_: any): any
-		equal(b: any): any
-		flattenItemInfo(): void
-		flush(): void
-		getAllocatedSampleDataSize(): any
-		getBox(type: any): any
-		getBoxes(type: any, returnEarly: any): any
-		getBuffer(): any
-		getCodecs(): any
-		getInfo(): any
-		getItem(item_id: any): any
-		getMetaHandler(): any
-		getPrimaryItem(): any
-		getSample(trak: any, sampleNum: any): any
-		getTrackSample(track_id: any, number: any): any
-		getTrackSamplesInfo(track_id: any): any
-		hasIncompleteMdat(): any
-		hasItem(name: any): any
-		initializeSegmentation(): any
-		itemToFragmentedTrackFile(_options: any): any
-		parse(): void
-		print(output: any): void
-		processIncompleteBox(ret: any): any
-		processIncompleteMdat(): any
-		processItems(callback: any): void
-		processSamples(last: any): void
-		releaseItem(item_id: any): any
-		releaseSample(trak: any, sampleNum: any): any
-		releaseUsedSamples(id: any, sampleNum: any): void
-		resetTables(): void
-		restoreParsePosition(): any
-		save(name: any): void
-		saveParsePosition(): void
-		seek(time: any, useRap: any): any
-		seekTrack(time: any, useRap: any, trak: any): any
-		setExtractionOptions(id: any, user: any, options: any): void
-		setSegmentOptions(id: any, user: any, options: any): void
-		start(): void
-		stop(): void
-		unsetExtractionOptions(id: any): void
-		unsetSegmentOptions(id: any): void
-		updateSampleLists(): void
-		updateUsedBytes(box: any, ret: any): void
-		write(outstream: any): void
-
-		static initSampleGroups(trak: any, traf: any, sbgps: any, trak_sgpds: any, traf_sgpds: any): void
-		static process_sdtp(sdtp: any, sample: any, number: any): void
-		static setSampleGroupProperties(trak: any, sample: any, sample_number: any, sample_groups_info: any): void
-
-		// TODO Expand public API; it's difficult to tell what should be public
-		onMoovStart?: () => void
-		onReady?: (info: MP4Info) => void
-		onError?: (e: string) => void
-		onSamples?: (id: number, user: any, samples: Sample[]) => void
-
-		appendBuffer(data: MP4ArrayBuffer): number
-		start(): void
-		stop(): void
-		flush(): void
-
-		setExtractionOptions(id: number, user: any, options: ExtractionOptions): void
-	}
-
-	export namespace BoxParser {
-		export class Box {
-			size?: number
-			flags?: number // Do these go here?
-			data?: Uint8Array
-
-			constructor(type?: string, size?: number)
-
-			add(name: string): Box
-			addBox(box: Box): Box
-			set(name: string, value: any): void
-			addEntry(value: string, prop?: string): void
-			printHeader(output: any): void
-			write(stream: DataStream): void
-			writeHeader(stream: DataStream, msg?: string): void
-			computeSize(): void
-
-			// TODO add types for these
-			parse(stream: any): void
-			parseDataAndRewind(stream: any): void
-			parseLanguage(stream: any): void
-			print(output: any): void
-		}
-
-		// TODO finish add types for these classes
-		export class AudioSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-
-			getChannelCount(): any
-			getSampleRate(): any
-			getSampleSize(): any
-			isAudio(): any
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class CoLLBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class ContainerBox extends Box {
-			constructor(type: any, size?: number, uuid?: any)
-
-			parse(stream: any): void
-			print(output: any): void
-			write(stream: any): void
-		}
-
-		export class FullBox extends Box {
-			constructor(type: any, size?: number, uuid?: any)
-
-			parse(stream: any): void
-			parseDataAndRewind(stream: any): void
-			parseFullHeader(stream: any): void
-			printHeader(output: any): void
-			writeHeader(stream: any): void
-		}
-
-		export class HintSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-		}
-
-		export class MetadataSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-
-			isMetadata(): any
-		}
-
-		export class OpusSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class SampleEntry extends Box {
-			constructor(type: any, size?: number, hdr_size?: number, start?: number)
-
-			getChannelCount(): any
-			getCodec(): any
-			getHeight(): any
-			getSampleRate(): any
-			getSampleSize(): any
-			getWidth(): any
-			isAudio(): any
-			isHint(): any
-			isMetadata(): any
-			isSubtitle(): any
-			isVideo(): any
-			parse(stream: any): void
-			parseDataAndRewind(stream: any): void
-			parseFooter(stream: any): void
-			parseHeader(stream: any): void
-			write(stream: any): void
-			writeFooter(stream: any): void
-			writeHeader(stream: any): void
-		}
-
-		export class SampleGroupEntry {
-			constructor(type: any)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class SingleItemTypeReferenceBox extends ContainerBox {
-			constructor(type: any, size?: number, hdr_size?: number, start?: number)
-
-			parse(stream: any): void
-		}
-
-		export class SingleItemTypeReferenceBoxLarge {
-			constructor(type: any, size?: number, hdr_size?: number, start?: number)
-
-			parse(stream: any): void
-		}
-
-		export class SmDmBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class SubtitleSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-
-			isSubtitle(): any
-		}
-
-		export class SystemSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-		}
-
-		export class TextSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-		}
-
-		export class TrackGroupTypeBox extends FullBox {
-			constructor(type: any, size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class TrackReferenceTypeBox extends ContainerBox {
-			constructor(type: any, size?: number, hdr_size?: number, start?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class VisualSampleEntry extends SampleEntry {
-			constructor(type: any, size?: number)
-
-			getHeight(): any
-			getWidth(): any
-			isVideo(): any
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class a1lxBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class a1opBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class alstSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class auxCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class av01SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class av1CBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class avc1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class avc2SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class avc3SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class avc4SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class avcCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class avllSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class avssSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class btrtBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class bxmlBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class clapBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class clefBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class clliBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class co64Box extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class colrBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class cprtBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class cslgBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class cttsBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			unpack(samples: any): void
-			write(stream: any): void
-		}
-
-		export class dOpsBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: DataStream): void
-
-			Version: number
-			OutputChannelCount: number
-			PreSkip: number
-			InputSampleRate: number
-			OutputGain: number
-			ChannelMappingFamily: number
-
-			// When channelMappingFamily != 0
-			StreamCount?: number
-			CoupledCount?: number
-			ChannelMapping?: number[]
-		}
-
-		export class dac3Box extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dec3Box extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dfLaBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dimmBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dinfBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class dmaxBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dmedBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class drefBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class drepBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class dtrtSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class edtsBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class elngBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class elstBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class emsgBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class encaSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class encmSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class encsSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class enctSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class encuSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class encvSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class enofBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class esdsBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class fielBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class freeBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class frmaBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class ftypBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class hdlrBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class hev1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class hinfBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class hmhdBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class hntiBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class hvc1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class hvcCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class idatBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class iinfBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class ilocBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class imirBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class infeBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class iodsBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class ipcoBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class ipmaBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class iproBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class iprpBox extends ContainerBox {
-			constructor(size?: number)
-			ipmas: ipmaBox[]
-		}
-
-		export class irefBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class irotBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class ispeBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class kindBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class levaBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class lselBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class maxrBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class mdatBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class mdcvBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class mdhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class mdiaBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class mecoBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class mehdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class mereBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class metaBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class mettSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class metxSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class mfhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class mfraBox extends ContainerBox {
-			constructor(size?: number)
-			tfras: tfraBox[]
-		}
-
-		export class mfroBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class minfBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class moofBox extends ContainerBox {
-			constructor(size?: number)
-			trafs: trafBox[]
-		}
-
-		export class moovBox extends ContainerBox {
-			constructor(size?: number)
-			traks: trakBox[]
-			psshs: psshBox[]
-		}
-
-		export class mp4aSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class msrcTrackGroupTypeBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class mvexBox extends ContainerBox {
-			constructor(size?: number)
-
-			trexs: trexBox[]
-		}
-
-		export class mvhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			print(output: any): void
-			write(stream: any): void
-		}
-
-		export class mvifSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class nmhdBox extends FullBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class npckBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class numpBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class padbBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class paspBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class paylBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class paytBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class pdinBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class pitmBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class pixiBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class pmaxBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class prftBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class profBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class prolSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class psshBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class rashSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class rinfBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class rollSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class saioBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class saizBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class sbgpBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-
-			write(stream: any): void
-		}
-
-		export class sbttSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class schiBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class schmBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class scifSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class scnmSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class sdtpBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class seigSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class sencBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class sgpdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class sidxBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class sinfBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class skipBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class smhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class ssixBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stblBox extends ContainerBox {
-			constructor(size?: number)
-
-			sgpds: sgpdBox[]
-			sbgps: sbgpBox[]
-		}
-
-		export class stcoBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			unpack(samples: any): void
-			write(stream: any): void
-		}
-
-		export class stdpBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class sthdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stppSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class strdBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class striBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class strkBox extends Box {
-			constructor(size?: number)
-		}
-
-		export class stsaSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stscBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			unpack(samples: any): void
-			write(stream: any): void
-		}
-
-		export class stsdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class stsgBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stshBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class stssBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class stszBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			unpack(samples: any): void
-			write(stream: any): void
-		}
-
-		export class sttsBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			unpack(samples: any): void
-			write(stream: any): void
-		}
-
-		export class stviBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stxtSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-			parse(stream: any): void
-		}
-
-		export class stypBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class stz2Box extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class subsBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class syncSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class taptBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class teleSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tencBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tfdtBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class tfhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class tfraBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tkhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			print(output: any): void
-			write(stream: any): void
-		}
-
-		export class tmaxBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tminBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class totlBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tpayBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tpylBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class trafBox extends ContainerBox {
-			constructor(size?: number)
-			truns: trunBox[]
-			sgpd: sgpdBox[]
-			sbgp: sbgpBox[]
-		}
-
-		export class trakBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class trefBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class trepBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class trexBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class trgrBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class trpyBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class trunBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-
-			sample_count: number
-
-			sample_duration?: number[]
-			sample_size?: number[]
-			sample_flags?: number[]
-			sample_composition_time_offset?: number[]
-
-			data_offset?: number
-			data_offset_position?: number
-		}
-
-		export class tsasSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tsclSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tselBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class tx3gSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class txtCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class udtaBox extends ContainerBox {
-			constructor(size?: number)
-			kinds: kindBox[]
-		}
-
-		export class viprSampleGroupEntry extends SampleGroupEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class vmhdBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-			write(stream: any): void
-		}
-
-		export class vp08SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class vp09SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class vpcCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class vttCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class vttcBox extends ContainerBox {
-			constructor(size?: number)
-		}
-
-		export class vvc1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class vvcCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class vvcNSampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class vvi1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			getCodec(): any
-		}
-
-		export class vvnCBox extends ContainerBox {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export class vvs1SampleEntry extends SampleEntry {
-			constructor(size?: number)
-		}
-
-		export class wvttSampleEntry extends SampleEntry {
-			constructor(size?: number)
-
-			parse(stream: any): void
-		}
-
-		export const BASIC_BOXES: string[]
-		export const CONTAINER_BOXES: string[][]
-		export const DIFF_BOXES_PROP_NAMES: string[]
-		export const DIFF_PRIMITIVE_ARRAY_PROP_NAMES: string[]
-		export const ERR_INVALID_DATA: number
-		export const ERR_NOT_ENOUGH_DATA: number
-		export const FULL_BOXES: string[]
-		export const OK: number
-		export const SAMPLE_ENTRY_TYPE_AUDIO: string
-		export const SAMPLE_ENTRY_TYPE_HINT: string
-		export const SAMPLE_ENTRY_TYPE_METADATA: string
-		export const SAMPLE_ENTRY_TYPE_SUBTITLE: string
-		export const SAMPLE_ENTRY_TYPE_SYSTEM: string
-		export const SAMPLE_ENTRY_TYPE_TEXT: string
-		export const SAMPLE_ENTRY_TYPE_VISUAL: string
-		export const TFHD_FLAG_BASE_DATA_OFFSET: number
-		export const TFHD_FLAG_DEFAULT_BASE_IS_MOOF: number
-		export const TFHD_FLAG_DUR_EMPTY: number
-		export const TFHD_FLAG_SAMPLE_DESC: number
-		export const TFHD_FLAG_SAMPLE_DUR: number
-		export const TFHD_FLAG_SAMPLE_FLAGS: number
-		export const TFHD_FLAG_SAMPLE_SIZE: number
-		export const TKHD_FLAG_ENABLED: number
-		export const TKHD_FLAG_IN_MOVIE: number
-		export const TKHD_FLAG_IN_PREVIEW: number
-		export const TRUN_FLAGS_CTS_OFFSET: number
-		export const TRUN_FLAGS_DATA_OFFSET: number
-		export const TRUN_FLAGS_DURATION: number
-		export const TRUN_FLAGS_FIRST_FLAG: number
-		export const TRUN_FLAGS_FLAGS: number
-		export const TRUN_FLAGS_SIZE: number
-		export const UUIDs: string[]
-		export const boxCodes: string[]
-		export const containerBoxCodes: any[]
-		export const fullBoxCodes: any[]
-
-		export const sampleEntryCodes: {
-			Audio: string[]
-			Hint: any[]
-			Metadata: string[]
-			Subtitle: string[]
-			System: string[]
-			Text: string[]
-			Visual: string[]
-		}
-
-		export const sampleGroupEntryCodes: any[]
-
-		export const trackGroupTypes: any[]
-
-		export function addSubBoxArrays(subBoxNames: any): void
-		export function boxEqual(box_a: any, box_b: any): any
-		export function boxEqualFields(box_a: any, box_b: any): any
-		export function createBoxCtor(type: any, parseMethod: any): void
-		export function createContainerBoxCtor(type: any, parseMethod: any, subBoxNames: any): void
-		export function createEncryptedSampleEntryCtor(mediaType: any, type: any, parseMethod: any): void
-		export function createFullBoxCtor(type: any, parseMethod: any): void
-		export function createMediaSampleEntryCtor(mediaType: any, parseMethod: any, subBoxNames: any): void
-		export function createSampleEntryCtor(mediaType: any, type: any, parseMethod: any, subBoxNames: any): void
-		export function createSampleGroupCtor(type: any, parseMethod: any): void
-		export function createTrackGroupCtor(type: any, parseMethod: any): void
-		export function createUUIDBox(uuid: any, isFullBox: any, isContainerBox: any, parseMethod: any): void
-		export function decimalToHex(d: any, padding: any): any
-		export function initialize(): void
-		export function parseHex16(stream: any): any
-		export function parseOneBox(stream: any, headerOnly: any, parentsize?: number): any
-		export function parseUUID(stream: any): any
-
-		/* ???
-		namespace UUIDBoxes {
-			export class a2394f525a9b4f14a2446c427c648df4 {
-				constructor(size?: number)
-			}
-
-			export class a5d40b30e81411ddba2f0800200c9a66 {
-				constructor(size?: number)
-
-				parse(stream: any): void
-			}
-
-			export class d08a4f1810f34a82b6c832d8aba183d3 {
-				constructor(size?: number)
-
-				parse(stream: any): void
-			}
-
-			export class d4807ef2ca3946958e5426cb9e46a79f {
-				constructor(size?: number)
-
-				parse(stream: any): void
-			}
-		}
-		*/
-	}
-
-	// TODO Add types for the remaining classes found via dts-gen
-	export class MP4BoxStream {
-		constructor(arrayBuffer: any)
-
-		getEndPosition(): any
-		getLength(): any
-		getPosition(): any
-		isEos(): any
-		readAnyInt(size?: number, signed?: boolean): any
-		readCString(): any
-		readInt16(): any
-		readInt16Array(length: any): any
-		readInt32(): any
-		readInt32Array(length: any): any
-		readInt64(): any
-		readInt8(): any
-		readString(length: any): any
-		readUint16(): any
-		readUint16Array(length: any): any
-		readUint24(): any
-		readUint32(): any
-		readUint32Array(length: any): any
-		readUint64(): any
-		readUint8(): any
-		readUint8Array(length: any): any
-		seek(pos: any): any
-	}
-
-	export class MultiBufferStream {
-		constructor(buffer: any)
-
-		addUsedBytes(nbBytes: any): void
-		cleanBuffers(): void
-		findEndContiguousBuf(inputindex: any): any
-		findPosition(fromStart: any, filePosition: any, markAsUsed: any): any
-		getEndFilePositionAfter(pos: any): any
-		getEndPosition(): any
-		getLength(): any
-		getPosition(): any
-		initialized(): any
-		insertBuffer(ab: any): void
-		logBufferLevel(info: any): void
-		mergeNextBuffer(): any
-		reduceBuffer(buffer: any, offset: any, newLength: any): any
-		seek(filePosition: any, fromStart: any, markAsUsed: any): any
-		setAllUsedBytes(): void
-	}
-
-	export class Textin4Parser {
-		constructor()
-
-		parseConfig(data: any): any
-		parseSample(sample: any): any
-	}
-
-	export class XMLSubtitlein4Parser {
-		constructor()
-
-		parseSample(sample: any): any
-	}
-
-	export function MPEG4DescriptorParser(): any
-
-	export namespace BoxParser {}
-
-	export namespace Log {
-		export const LOG_LEVEL_ERROR = 4
-		export const LOG_LEVEL_WARNING = 3
-		export const LOG_LEVEL_INFO = 2
-		export const LOG_LEVEL_DEBUG = 1
-
-		export function debug(module: any, msg: any): void
-		export function error(module: any, msg: any): void
-		export function getDurationString(duration: any, _timescale: any): any
-		export function info(module: any, msg: any): void
-		export function log(module: any, msg: any): void
-		export function printRanges(ranges: any): any
-		export function setLogLevel(level: any): void
-		export function warn(module: any, msg: any): void
-	}
-}
diff --git a/packages/moq/types/tsconfig.json b/packages/moq/types/tsconfig.json
deleted file mode 100644
index 784e2190..00000000
--- a/packages/moq/types/tsconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"extends": "../tsconfig.json",
-	"include": ["."]
-}
diff --git a/packages/relay/dev/Cargo.toml b/packages/relay/dev/Cargo.toml
new file mode 100644
index 00000000..3659f92b
--- /dev/null
+++ b/packages/relay/dev/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "dev"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "nestri-test-server"
+path = "src/main.rs"
+
+[dependencies]
+webrtc = "0.11.0"
+tokio = { version = "1.41.1", features = ["full"] }
+reqwest = { version = "0.12", features = ["json"] }
+serde = { version = "1.0.215", features = ["derive"]}
+serde_json = "1.0.133"
+
diff --git a/packages/relay/dev/Containerfile b/packages/relay/dev/Containerfile
new file mode 100644
index 00000000..9f7bb9c0
--- /dev/null
+++ b/packages/relay/dev/Containerfile
@@ -0,0 +1,11 @@
+FROM archlinux:latest
+
+RUN pacman -Syu --noconfirm
+
+RUN pacman -Su --noconfirm \
+   gstreamer gst-plugins-base gst-plugins-good gst-plugin-rswebrtc
+
+RUN pacman -Syu --noconfirm \
+    mesa mesa-utils xorg-xwayland vulkan-intel vpl-gpu-rt intel-media-driver gst-plugin-va gst-plugins-bad gst-plugin-fmp4 gst-plugin-qsv gst-plugin-pipewire
+
+CMD [ "bash","-c", "gst-launch-1.0  videotestsrc ! openh264enc ! whip0. audiotestsrc ! opusenc ! whip0. whipclientsink name=whip0 signaller::whip-endpoint=http://localhost:8088/api/whip/test" ]
diff --git a/packages/relay/dev/server.sh b/packages/relay/dev/server.sh
new file mode 100755
index 00000000..f99ac392
--- /dev/null
+++ b/packages/relay/dev/server.sh
@@ -0,0 +1,17 @@
+#! /bin/bash -e
+
+# sudo apt install build-essential -y
+
+# To run tests, run the relay first - go run main.go.
+# Run the docker container next - docker run --rm --init -d --device /dev/dri --network=host test-server 
+# Then run the nestri-test-server - cd packages/relay/dev cargo run 
+# Then run the frontend site, and navigate to http://localhost:5713/play/test
+
+# Expected behavior, see some random messages on the browser's console tab
+# And if you input works correctly, it should be logged to the console on the server-side of things
+
+# docker build -t test-server -f Containerfile .
+
+# docker run --rm --init -d --device /dev/dri --network=host test-server 
+
+# echo -e "Navigate to http://localhost:5713/play/test"
\ No newline at end of file
diff --git a/packages/relay/dev/src/main.rs b/packages/relay/dev/src/main.rs
new file mode 100644
index 00000000..84156062
--- /dev/null
+++ b/packages/relay/dev/src/main.rs
@@ -0,0 +1,11 @@
+mod room;
+
+#[tokio::main]
+async fn main() -> std::io::Result<()> {
+    let room = "test";
+    let base_url = "http://localhost:8088";
+    let mut room_handler = room::Room::new(room, base_url).await?;
+    room_handler.run().await?;
+
+    Ok(())
+}
diff --git a/packages/relay/dev/src/room.rs b/packages/relay/dev/src/room.rs
new file mode 100644
index 00000000..77671840
--- /dev/null
+++ b/packages/relay/dev/src/room.rs
@@ -0,0 +1,292 @@
+use reqwest;
+use std::collections::HashSet;
+use std::io;
+use std::sync::Arc;
+use tokio::sync::mpsc;
+use tokio::sync::Mutex;
+use tokio::time::Duration;
+use webrtc::api::interceptor_registry::register_default_interceptors;
+// use std::collections::HashSet;
+use serde::{Deserialize, Serialize};
+use serde_json::from_str;
+use webrtc::api::media_engine::MediaEngine;
+use webrtc::api::APIBuilder;
+use webrtc::data_channel::data_channel_message::DataChannelMessage;
+use webrtc::ice_transport::ice_server::RTCIceServer;
+use webrtc::interceptor::registry::Registry;
+use webrtc::peer_connection::configuration::RTCConfiguration;
+use webrtc::peer_connection::math_rand_alpha;
+use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
+use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "type")]
+enum InputMessage {
+    #[serde(rename = "mousemove")]
+    MouseMove { x: i32, y: i32 },
+
+    #[serde(rename = "mousemoveabs")]
+    MouseMoveAbs { x: i32, y: i32 },
+
+    #[serde(rename = "wheel")]
+    Wheel { x: f64, y: f64 },
+
+    #[serde(rename = "mousedown")]
+    MouseDown { key: i32 },
+    // Add other variants as needed
+    #[serde(rename = "mouseup")]
+    MouseUp { key: i32 },
+
+    #[serde(rename = "keydown")]
+    KeyDown { key: i32 },
+
+    #[serde(rename = "keyup")]
+    KeyUp { key: i32 },
+}
+
+pub struct Room {
+    peer_connection: Arc<webrtc::peer_connection::RTCPeerConnection>,
+    data_channel: Arc<webrtc::data_channel::RTCDataChannel>,
+    done_tx: mpsc::Sender<()>,
+    done_rx: mpsc::Receiver<()>,
+    base_url: String,
+    stream_name: String,
+    // pipeline: Arc<Mutex<gst::Pipeline>>,
+}
+
+impl Room {
+    pub async fn new(
+        stream_name: &str,
+        base_url: &str,
+        // pipeline: Arc<Mutex<gst::Pipeline>>,
+    ) -> io::Result<Self> {
+        // Create a MediaEngine object to configure the supported codec
+        let mut m = MediaEngine::default();
+
+        // Register default codecs
+        let _ = m.register_default_codecs().map_err(map_to_io_error)?;
+
+        let mut registry = Registry::new();
+
+        // Use the default set of Interceptors
+        registry = register_default_interceptors(registry, &mut m).map_err(map_to_io_error)?;
+
+        // Create the API object with the MediaEngine
+        let api = APIBuilder::new()
+            .with_media_engine(m)
+            .with_interceptor_registry(registry)
+            .build();
+
+        // Prepare the configuration
+        let config = RTCConfiguration {
+            ice_servers: vec![RTCIceServer {
+                urls: vec!["stun:stun.l.google.com:19302".to_owned()],
+                ..Default::default()
+            }],
+            ..Default::default()
+        };
+
+        // Create a new RTCPeerConnection
+        let peer_connection = Arc::new(
+            api.new_peer_connection(config)
+                .await
+                .map_err(map_to_io_error)?,
+        );
+
+        // Create a datachannel with label 'data'
+        let data_channel = peer_connection
+            .create_data_channel("input", None)
+            .await
+            .map_err(map_to_io_error)?;
+
+        let (done_tx, done_rx) = mpsc::channel::<()>(1);
+
+        let done_tx_clone = done_tx.clone();
+        // Peer connection state change handler
+        peer_connection.on_peer_connection_state_change(Box::new(
+            move |s: RTCPeerConnectionState| {
+                println!("Peer Connection State has changed: {s}");
+
+                if s == RTCPeerConnectionState::Failed {
+                    println!("Peer Connection has gone to failed exiting");
+                    let _ = done_tx_clone.try_send(());
+                }
+
+                Box::pin(async {})
+            },
+        ));
+
+        Ok(Self {
+            peer_connection,
+            // pipeline,
+            data_channel,
+            done_tx,
+            done_rx,
+            base_url: base_url.to_string(),
+            stream_name: stream_name.to_string(),
+        })
+    }
+
+    pub async fn run(&mut self) -> io::Result<()> {
+        // Create an async channel for sending events to the pipeline
+        let (event_tx, mut event_rx) = mpsc::channel(10);
+
+        // A shared state to track currently pressed keys
+        let pressed_keys = Arc::new(tokio::sync::Mutex::new(HashSet::new()));
+
+        // Spawn a task to process events for the pipeline
+        let pipeline_task = {
+            // let pipeline = Arc::clone(self.pipeline);
+            // let pipeline_clone = self.pipeline.clone();
+            tokio::spawn(async move {
+                while let Some(event) = event_rx.recv().await {
+                    // let pipeline = pipeline_clone.lock().await;
+                    // pipeline.send_event(event);
+                    println!("Invoked an event: {}", event)
+                }
+            })
+        };
+
+        let data_channel = self.data_channel.clone();
+        //TODO: Handle heartbeats here
+        let d1 = Arc::clone(&self.data_channel);
+        data_channel.on_open(Box::new(move || {
+            println!("Data channel '{}'-'{}' open. Random messages will now be sent to any connected DataChannels every 5 seconds", d1.label(), d1.id());
+
+            let d2 = Arc::clone(&d1);
+            Box::pin(async move {
+                let mut result = std::io::Result::<usize>::Ok(0);
+                while result.is_ok() {
+                    let timeout = tokio::time::sleep(Duration::from_secs(5));
+                    tokio::pin!(timeout);
+
+                    tokio::select! {
+                        _ = timeout.as_mut() =>{
+                            let message = math_rand_alpha(15);
+                            println!("Sending '{message}'");
+                            result = d2.send_text(message).await.map_err(map_to_io_error);
+                        }
+                    };
+                }
+            })
+        }));
+
+        // Data channel message handler
+        let d_label = data_channel.label().to_owned();
+        data_channel.on_message(Box::new(move |msg: DataChannelMessage| {
+            let msg_str = String::from_utf8(msg.data.to_vec()).unwrap();
+            println!("Message from DataChannel '{d_label}': '{msg_str}'");
+
+            let event_tx = event_tx.clone();
+            let pressed_keys = Arc::clone(&pressed_keys);
+
+            tokio::spawn(async move {
+                if let Ok(input_msg) = from_str::<InputMessage>(&msg_str) {
+                    if let Some(event) = handle_input_message(input_msg, &pressed_keys).await {
+                        event_tx.send(event).await.unwrap();
+                    }
+                }
+            });
+
+            Box::pin(async {})
+        }));
+
+        // Create an offer to send to the browser
+        let offer = self
+            .peer_connection
+            .create_offer(None)
+            .await
+            .map_err(map_to_io_error)?;
+
+        // Create channel that is blocked until ICE Gathering is complete
+        let mut gather_complete = self.peer_connection.gathering_complete_promise().await;
+
+        // Sets the LocalDescription, and starts our UDP listeners
+        self.peer_connection
+            .set_local_description(offer)
+            .await
+            .map_err(map_to_io_error)?;
+
+        // Block until ICE Gathering is complete, disabling trickle ICE
+        // we do this because we only can exchange one signaling message
+        // in a production application you should exchange ICE Candidates via OnICECandidate
+        let _ = gather_complete.recv().await;
+
+        if let Some(local_description) = self.peer_connection.local_description().await {
+            let url = format!("{}/api/whep/{}", self.base_url, self.stream_name);
+            let response = reqwest::Client::new()
+                .post(&url)
+                .header("Content-Type", "application/sdp")
+                .body(local_description.sdp.clone()) // clone if you don't want to move offer.sdp
+                .send()
+                .await
+                .map_err(map_to_io_error)?;
+
+            let answer = response
+                .json::<RTCSessionDescription>()
+                .await
+                .map_err(map_to_io_error)?;
+
+            self.peer_connection
+                .set_remote_description(answer)
+                .await
+                .map_err(map_to_io_error)?;
+        } else {
+            println!("generate local_description failed!");
+        };
+
+        println!("Press ctrl-c to stop");
+
+        tokio::select! {
+            _ = self.done_rx.recv() => {
+                println!("received done signal!");
+            }
+            _ = tokio::signal::ctrl_c() => {
+                println!();
+            }
+        };
+        self.peer_connection
+            .close()
+            .await
+            .map_err(map_to_io_error)?;
+
+        //FIXME: Ctr + C is not working... i suspect it has something to do with this guy -- Do not forget to fix packages/server/room.rs as well
+
+        pipeline_task.await?;
+        Ok(())
+    }
+}
+
+fn map_to_io_error<E: std::fmt::Display>(e: E) -> io::Error {
+    io::Error::new(io::ErrorKind::Other, format!("{}", e))
+}
+
+async fn handle_input_message(
+    input_msg: InputMessage,
+    pressed_keys: &Arc<tokio::sync::Mutex<HashSet<i32>>>,
+) -> Option<String> {
+    match input_msg {
+        InputMessage::MouseMove { x, y } => Some("MouseMoved".to_string()),
+        InputMessage::MouseMoveAbs { x, y } => Some("MouseMoveAbsolute".to_string()),
+        InputMessage::KeyDown { key } => {
+            let mut keys = pressed_keys.lock().await;
+            // If the key is already pressed, return to prevent key lockup
+            if keys.contains(&key) {
+                return None;
+            }
+            keys.insert(key);
+
+            Some("KeyDown".to_string())
+        }
+        InputMessage::KeyUp { key } => {
+            let mut keys = pressed_keys.lock().await;
+            // Remove the key from the pressed state when released
+            keys.remove(&key);
+
+            Some("KeyUp".to_string())
+        }
+        InputMessage::Wheel { x, y } => Some("Wheel".to_string()),
+        InputMessage::MouseDown { key } => Some("MouseDown".to_string()),
+        InputMessage::MouseUp { key } => Some("MouseUp".to_string()),
+    }
+}
diff --git a/packages/relay/go.mod b/packages/relay/go.mod
new file mode 100644
index 00000000..f18946a8
--- /dev/null
+++ b/packages/relay/go.mod
@@ -0,0 +1,31 @@
+module relay
+
+go 1.23
+
+require (
+	github.com/google/uuid v1.6.0
+	github.com/gorilla/websocket v1.5.3
+	github.com/pion/interceptor v0.1.37
+	github.com/pion/webrtc/v4 v4.0.2
+)
+
+require (
+	github.com/pion/datachannel v1.5.9 // indirect
+	github.com/pion/dtls/v3 v3.0.4 // indirect
+	github.com/pion/ice/v4 v4.0.2 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/mdns/v2 v2.0.7 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.14 // indirect
+	github.com/pion/rtp v1.8.9 // indirect
+	github.com/pion/sctp v1.8.34 // indirect
+	github.com/pion/sdp/v3 v3.0.9 // indirect
+	github.com/pion/srtp/v3 v3.0.4 // indirect
+	github.com/pion/stun/v3 v3.0.0 // indirect
+	github.com/pion/transport/v3 v3.0.7 // indirect
+	github.com/pion/turn/v4 v4.0.0 // indirect
+	github.com/wlynxg/anet v0.0.5 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+)
diff --git a/packages/relay/go.sum b/packages/relay/go.sum
new file mode 100644
index 00000000..6d71e8f0
--- /dev/null
+++ b/packages/relay/go.sum
@@ -0,0 +1,62 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/pion/datachannel v1.5.9 h1:LpIWAOYPyDrXtU+BW7X0Yt/vGtYxtXQ8ql7dFfYUVZA=
+github.com/pion/datachannel v1.5.9/go.mod h1:kDUuk4CU4Uxp82NH4LQZbISULkX/HtzKa4P7ldf9izE=
+github.com/pion/dtls/v3 v3.0.4 h1:44CZekewMzfrn9pmGrj5BNnTMDCFwr+6sLH+cCuLM7U=
+github.com/pion/dtls/v3 v3.0.4/go.mod h1:R373CsjxWqNPf6MEkfdy3aSe9niZvL/JaKlGeFphtMg=
+github.com/pion/ice/v4 v4.0.2 h1:1JhBRX8iQLi0+TfcavTjPjI6GO41MFn4CeTBX+Y9h5s=
+github.com/pion/ice/v4 v4.0.2/go.mod h1:DCdqyzgtsDNYN6/3U8044j3U7qsJ9KFJC92VnOWHvXg=
+github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI=
+github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y=
+github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
+github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
+github.com/pion/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM=
+github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA=
+github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
+github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
+github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
+github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk=
+github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/sctp v1.8.34 h1:rCuD3m53i0oGxCSp7FLQKvqVx0Nf5AUAHhMRXTTQjBc=
+github.com/pion/sctp v1.8.34/go.mod h1:yWkCClkXlzVW7BXfI2PjrUGBwUI0CjXJBkhLt+sdo4U=
+github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY=
+github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M=
+github.com/pion/srtp/v3 v3.0.4 h1:2Z6vDVxzrX3UHEgrUyIGM4rRouoC7v+NiF1IHtp9B5M=
+github.com/pion/srtp/v3 v3.0.4/go.mod h1:1Jx3FwDoxpRaTh1oRV8A/6G1BnFL+QI82eK4ms8EEJQ=
+github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
+github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
+github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
+github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
+github.com/pion/turn/v4 v4.0.0 h1:qxplo3Rxa9Yg1xXDxxH8xaqcyGUtbHYw4QSCvmFWvhM=
+github.com/pion/turn/v4 v4.0.0/go.mod h1:MuPDkm15nYSklKpN8vWJ9W2M0PlyQZqYt1McGuxG7mA=
+github.com/pion/webrtc/v4 v4.0.2 h1:fBwm5/hqSUybrCWl0DDBSTDrpbkcgkqpeLmXw9CsBQA=
+github.com/pion/webrtc/v4 v4.0.2/go.mod h1:moylBT2A4dNoEaYBCdV1nThM3TLwRHzWszIG+eSPaqQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
+github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
+golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/packages/relay/internal/common.go b/packages/relay/internal/common.go
new file mode 100644
index 00000000..95eaa790
--- /dev/null
+++ b/packages/relay/internal/common.go
@@ -0,0 +1,100 @@
+package relay
+
+import (
+	"github.com/pion/interceptor"
+	"github.com/pion/webrtc/v4"
+	"log"
+)
+
+var globalWebRTCAPI *webrtc.API
+var globalWebRTCConfig = webrtc.Configuration{
+	ICETransportPolicy: webrtc.ICETransportPolicyAll,
+	BundlePolicy:       webrtc.BundlePolicyBalanced,
+	SDPSemantics:       webrtc.SDPSemanticsUnifiedPlan,
+}
+
+func InitWebRTCAPI() error {
+	var err error
+	flags := GetFlags()
+
+	// Media engine
+	mediaEngine := &webrtc.MediaEngine{}
+
+	// Default codecs cover most of our needs
+	err = mediaEngine.RegisterDefaultCodecs()
+	if err != nil {
+		return err
+	}
+
+	// Add H.265 for special cases
+	videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}}
+	for _, codec := range []webrtc.RTPCodecParameters{
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeH265, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback},
+			PayloadType:        48,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeRTX, ClockRate: 90000, SDPFmtpLine: "apt=48"},
+			PayloadType:        49,
+		},
+	} {
+		if err := mediaEngine.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil {
+			return err
+		}
+	}
+
+	// Interceptor registry
+	interceptorRegistry := &interceptor.Registry{}
+
+	// Use default set
+	err = webrtc.RegisterDefaultInterceptors(mediaEngine, interceptorRegistry)
+	if err != nil {
+		return err
+	}
+
+	// Setting engine
+	settingEngine := webrtc.SettingEngine{}
+
+	// New in v4, reduces CPU usage and latency when enabled
+	settingEngine.EnableSCTPZeroChecksum(true)
+
+	// Set the UDP port range used by WebRTC
+	err = settingEngine.SetEphemeralUDPPortRange(uint16(flags.WebRTCUDPStart), uint16(flags.WebRTCUDPEnd))
+	if err != nil {
+		return err
+	}
+
+	// Create a new API object with our customized settings
+	globalWebRTCAPI = webrtc.NewAPI(webrtc.WithMediaEngine(mediaEngine), webrtc.WithSettingEngine(settingEngine), webrtc.WithInterceptorRegistry(interceptorRegistry))
+
+	return nil
+}
+
+// GetWebRTCAPI returns the global WebRTC API
+func GetWebRTCAPI() *webrtc.API {
+	return globalWebRTCAPI
+}
+
+// CreatePeerConnection sets up a new peer connection
+func CreatePeerConnection(onClose func()) (*webrtc.PeerConnection, error) {
+	pc, err := globalWebRTCAPI.NewPeerConnection(globalWebRTCConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	// Log connection state changes and handle failed/disconnected connections
+	pc.OnConnectionStateChange(func(connectionState webrtc.PeerConnectionState) {
+		// Close PeerConnection in cases
+		if connectionState == webrtc.PeerConnectionStateFailed ||
+			connectionState == webrtc.PeerConnectionStateDisconnected ||
+			connectionState == webrtc.PeerConnectionStateClosed {
+			err := pc.Close()
+			if err != nil {
+				log.Printf("Error closing PeerConnection: %s\n", err.Error())
+			}
+			onClose()
+		}
+	})
+
+	return pc, nil
+}
diff --git a/packages/relay/internal/datachannel.go b/packages/relay/internal/datachannel.go
new file mode 100644
index 00000000..ba59fff8
--- /dev/null
+++ b/packages/relay/internal/datachannel.go
@@ -0,0 +1,72 @@
+package relay
+
+import (
+	"github.com/pion/webrtc/v4"
+	"log"
+)
+
+// NestriDataChannel is a custom data channel with callbacks
+type NestriDataChannel struct {
+	*webrtc.DataChannel
+	binaryCallbacks map[string]OnMessageCallback // MessageBase type -> callback
+}
+
+// NewNestriDataChannel creates a new NestriDataChannel from *webrtc.DataChannel
+func NewNestriDataChannel(dc *webrtc.DataChannel) *NestriDataChannel {
+	ndc := &NestriDataChannel{
+		DataChannel:     dc,
+		binaryCallbacks: make(map[string]OnMessageCallback),
+	}
+
+	// Handler for incoming messages
+	ndc.OnMessage(func(msg webrtc.DataChannelMessage) {
+		// If string type message, ignore
+		if msg.IsString {
+			return
+		}
+
+		// Decode message
+		var base MessageBase
+		if err := DecodeMessage(msg.Data, &base); err != nil {
+			log.Printf("Failed to decode binary DataChannel message, reason: %s\n", err)
+			return
+		}
+
+		// Handle message type callback
+		if callback, ok := ndc.binaryCallbacks[base.PayloadType]; ok {
+			go callback(msg.Data)
+		} // TODO: Log unknown message type?
+	})
+
+	return ndc
+}
+
+// SendBinary sends a binary message to the data channel
+func (ndc *NestriDataChannel) SendBinary(data []byte) error {
+	return ndc.Send(data)
+}
+
+// RegisterMessageCallback registers a callback for a given binary message type
+func (ndc *NestriDataChannel) RegisterMessageCallback(msgType string, callback OnMessageCallback) {
+	if ndc.binaryCallbacks == nil {
+		ndc.binaryCallbacks = make(map[string]OnMessageCallback)
+	}
+	ndc.binaryCallbacks[msgType] = callback
+}
+
+// UnregisterMessageCallback removes the callback for a given binary message type
+func (ndc *NestriDataChannel) UnregisterMessageCallback(msgType string) {
+	if ndc.binaryCallbacks != nil {
+		delete(ndc.binaryCallbacks, msgType)
+	}
+}
+
+// RegisterOnOpen registers a callback for the data channel opening
+func (ndc *NestriDataChannel) RegisterOnOpen(callback func()) {
+	ndc.OnOpen(callback)
+}
+
+// RegisterOnClose registers a callback for the data channel closing
+func (ndc *NestriDataChannel) RegisterOnClose(callback func()) {
+	ndc.OnClose(callback)
+}
diff --git a/packages/relay/internal/egress.go b/packages/relay/internal/egress.go
new file mode 100644
index 00000000..c72ce201
--- /dev/null
+++ b/packages/relay/internal/egress.go
@@ -0,0 +1,189 @@
+package relay
+
+import (
+	"github.com/pion/webrtc/v4"
+	"log"
+)
+
+func participantHandler(participant *Participant, room *Room) {
+	// Callback for closing PeerConnection
+	onPCClose := func() {
+		if GetFlags().Verbose {
+			log.Printf("Closed PeerConnection for participant: '%s'\n", participant.ID)
+		}
+		room.removeParticipantByID(participant.ID)
+	}
+
+	var err error
+	participant.PeerConnection, err = CreatePeerConnection(onPCClose)
+	if err != nil {
+		log.Printf("Failed to create PeerConnection for participant: '%s' - reason: %s\n", participant.ID, err)
+		return
+	}
+
+	// Data channel settings
+	settingOrdered := false
+	settingMaxRetransmits := uint16(0)
+	dc, err := participant.PeerConnection.CreateDataChannel("data", &webrtc.DataChannelInit{
+		Ordered:        &settingOrdered,
+		MaxRetransmits: &settingMaxRetransmits,
+	})
+	if err != nil {
+		log.Printf("Failed to create data channel for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+		return
+	}
+	participant.DataChannel = NewNestriDataChannel(dc)
+
+	// Register channel opening handling
+	participant.DataChannel.RegisterOnOpen(func() {
+		if GetFlags().Verbose {
+			log.Printf("DataChannel open for participant: %s\n", participant.ID)
+		}
+	})
+
+	// Register channel closing handling
+	participant.DataChannel.RegisterOnClose(func() {
+		if GetFlags().Verbose {
+			log.Printf("DataChannel closed for participant: %s\n", participant.ID)
+		}
+	})
+
+	// Register text message handling
+	participant.DataChannel.RegisterMessageCallback("input", func(data []byte) {
+		// Send to room if it has a DataChannel
+		if room.DataChannel != nil {
+			// If debug mode, decode and add our timestamp, otherwise just send to room
+			if GetFlags().Debug {
+				var inputMsg MessageInput
+				if err = DecodeMessage(data, &inputMsg); err != nil {
+					log.Printf("Failed to decode input message from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+					return
+				}
+				inputMsg.LatencyTracker.AddTimestamp("relay_to_node")
+				// Encode and send
+				if data, err = EncodeMessage(inputMsg); err != nil {
+					log.Printf("Failed to encode input message for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+					return
+				}
+				if err = room.DataChannel.SendBinary(data); err != nil {
+					log.Printf("Failed to send input message to room: '%s' - reason: %s\n", room.Name, err)
+				}
+			} else {
+				if err = room.DataChannel.SendBinary(data); err != nil {
+					log.Printf("Failed to send input message to room: '%s' - reason: %s\n", room.Name, err)
+				}
+			}
+		}
+	})
+
+	participant.PeerConnection.OnICECandidate(func(candidate *webrtc.ICECandidate) {
+		if candidate == nil {
+			return
+		}
+		if GetFlags().Verbose {
+			log.Printf("ICE candidate for participant: '%s' in room: '%s'\n", participant.ID, room.Name)
+		}
+		err = participant.WebSocket.SendICECandidateMessageWS(candidate.ToJSON())
+		if err != nil {
+			log.Printf("Failed to send ICE candidate for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+		}
+	})
+
+	iceHolder := make([]webrtc.ICECandidateInit, 0)
+
+	// ICE callback
+	participant.WebSocket.RegisterMessageCallback("ice", func(data []byte) {
+		var iceMsg MessageICECandidate
+		if err = DecodeMessage(data, &iceMsg); err != nil {
+			log.Printf("Failed to decode ICE message from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			return
+		}
+		candidate := webrtc.ICECandidateInit{
+			Candidate: iceMsg.Candidate.Candidate,
+		}
+		if participant.PeerConnection.RemoteDescription() != nil {
+			if err = participant.PeerConnection.AddICECandidate(candidate); err != nil {
+				log.Printf("Failed to add ICE candidate from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			}
+			// Add held ICE candidates
+			for _, heldCandidate := range iceHolder {
+				if err = participant.PeerConnection.AddICECandidate(heldCandidate); err != nil {
+					log.Printf("Failed to add held ICE candidate from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+				}
+			}
+			iceHolder = nil
+		} else {
+			iceHolder = append(iceHolder, candidate)
+		}
+	})
+
+	// SDP answer callback
+	participant.WebSocket.RegisterMessageCallback("sdp", func(data []byte) {
+		var sdpMsg MessageSDP
+		if err = DecodeMessage(data, &sdpMsg); err != nil {
+			log.Printf("Failed to decode SDP message from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			return
+		}
+		handleParticipantSDP(participant, sdpMsg)
+	})
+
+	// Log callback
+	participant.WebSocket.RegisterMessageCallback("log", func(data []byte) {
+		var logMsg MessageLog
+		if err = DecodeMessage(data, &logMsg); err != nil {
+			log.Printf("Failed to decode log message from participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			return
+		}
+		// TODO: Handle log message sending to metrics server
+	})
+
+	// Metrics callback
+	participant.WebSocket.RegisterMessageCallback("metrics", func(data []byte) {
+		// Ignore for now
+	})
+
+	participant.WebSocket.RegisterOnClose(func() {
+		if GetFlags().Verbose {
+			log.Printf("WebSocket closed for participant: '%s' in room: '%s'\n", participant.ID, room.Name)
+		}
+		// Remove from Room
+		room.removeParticipantByID(participant.ID)
+	})
+
+	log.Printf("Participant: '%s' in room: '%s' is now ready, sending an OK\n", participant.ID, room.Name)
+	if err = participant.WebSocket.SendAnswerMessageWS(AnswerOK); err != nil {
+		log.Printf("Failed to send OK answer for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+	}
+
+	// If room is already online, send also offer
+	if room.Online {
+		if room.AudioTrack != nil {
+			if err = participant.addTrack(&room.AudioTrack); err != nil {
+				log.Printf("Failed to add audio track for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			}
+		}
+		if room.VideoTrack != nil {
+			if err = participant.addTrack(&room.VideoTrack); err != nil {
+				log.Printf("Failed to add video track for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+			}
+		}
+		if err = participant.signalOffer(); err != nil {
+			log.Printf("Failed to signal offer for participant: '%s' in room: '%s' - reason: %s\n", participant.ID, room.Name, err)
+		}
+	}
+}
+
+// SDP answer handler for participants
+func handleParticipantSDP(participant *Participant, answerMsg MessageSDP) {
+	// Get SDP offer
+	sdpAnswer := answerMsg.SDP.SDP
+
+	// Set remote description
+	err := participant.PeerConnection.SetRemoteDescription(webrtc.SessionDescription{
+		Type: webrtc.SDPTypeAnswer,
+		SDP:  sdpAnswer,
+	})
+	if err != nil {
+		log.Printf("Failed to set remote description for participant: '%s' - reason: %s\n", participant.ID, err)
+	}
+}
diff --git a/packages/relay/internal/flags.go b/packages/relay/internal/flags.go
new file mode 100644
index 00000000..6a1c0398
--- /dev/null
+++ b/packages/relay/internal/flags.go
@@ -0,0 +1,82 @@
+package relay
+
+import (
+	"flag"
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/pion/webrtc/v4"
+)
+
+var globalFlags *Flags
+
+type Flags struct {
+	Verbose        bool
+	Debug          bool
+	EndpointPort   int
+	WebRTCUDPStart int
+	WebRTCUDPEnd   int
+	STUNServer     string
+}
+
+func (flags *Flags) DebugLog() {
+	log.Println("Relay Flags:")
+	log.Println("> Verbose: ", flags.Verbose)
+	log.Println("> Debug: ", flags.Debug)
+	log.Println("> Endpoint Port: ", flags.EndpointPort)
+	log.Println("> WebRTC UDP Range Start: ", flags.WebRTCUDPStart)
+	log.Println("> WebRTC UDP Range End: ", flags.WebRTCUDPEnd)
+	log.Println("> WebRTC STUN Server: ", flags.STUNServer)
+}
+
+func getEnvAsInt(name string, defaultVal int) int {
+	valueStr := os.Getenv(name)
+	if value, err := strconv.Atoi(valueStr); err != nil {
+		return defaultVal
+	} else {
+		return value
+	}
+}
+
+func getEnvAsBool(name string, defaultVal bool) bool {
+	valueStr := os.Getenv(name)
+	val, err := strconv.ParseBool(valueStr)
+	if err != nil {
+		return defaultVal
+	}
+	return val
+}
+
+func getEnvAsString(name string, defaultVal string) string {
+	valueStr := os.Getenv(name)
+	if len(valueStr) == 0 {
+		return defaultVal
+	}
+	return valueStr
+}
+
+func InitFlags() {
+	// Create Flags struct
+	globalFlags = &Flags{}
+	// Get flags
+	flag.BoolVar(&globalFlags.Verbose, "verbose", getEnvAsBool("VERBOSE", false), "Verbose mode")
+	flag.BoolVar(&globalFlags.Debug, "debug", getEnvAsBool("DEBUG", false), "Debug mode")
+	flag.IntVar(&globalFlags.EndpointPort, "endpointPort", getEnvAsInt("ENDPOINT_PORT", 8088), "HTTP endpoint port")
+	flag.IntVar(&globalFlags.WebRTCUDPStart, "webrtcUDPStart", getEnvAsInt("WEBRTC_UDP_START", 10000), "WebRTC UDP port range start")
+	flag.IntVar(&globalFlags.WebRTCUDPEnd, "webrtcUDPEnd", getEnvAsInt("WEBRTC_UDP_END", 20000), "WebRTC UDP port range end")
+	flag.StringVar(&globalFlags.STUNServer, "stunServer", getEnvAsString("STUN_SERVER", "stun.l.google.com:19302"), "WebRTC STUN server")
+	// Parse flags
+	flag.Parse()
+
+	// ICE STUN servers
+	globalWebRTCConfig.ICEServers = []webrtc.ICEServer{
+		{
+			URLs: []string{"stun:" + globalFlags.STUNServer},
+		},
+	}
+}
+
+func GetFlags() *Flags {
+	return globalFlags
+}
diff --git a/packages/relay/internal/http.go b/packages/relay/internal/http.go
new file mode 100644
index 00000000..7ab89d0b
--- /dev/null
+++ b/packages/relay/internal/http.go
@@ -0,0 +1,123 @@
+package relay
+
+import (
+	"github.com/gorilla/websocket"
+	"log"
+	"net/http"
+	"strconv"
+)
+
+var httpMux *http.ServeMux
+
+func InitHTTPEndpoint() {
+	// Create HTTP mux which serves our WS endpoint
+	httpMux = http.NewServeMux()
+
+	// Endpoints themselves
+	httpMux.Handle("/", http.NotFoundHandler())
+	httpMux.HandleFunc("/api/ws/{roomName}", corsAnyHandler(wsHandler))
+
+	// Get our serving port
+	port := GetFlags().EndpointPort
+
+	// Log and start the endpoint server
+	log.Println("Starting HTTP endpoint server on :", strconv.Itoa(port))
+	go func() {
+		log.Fatal((&http.Server{
+			Handler: httpMux,
+			Addr:    ":" + strconv.Itoa(port),
+		}).ListenAndServe())
+	}()
+}
+
+// logHTTPError logs (if verbose) and sends an error code to requester
+func logHTTPError(w http.ResponseWriter, err string, code int) {
+	if GetFlags().Verbose {
+		log.Println(err)
+	}
+	http.Error(w, err, code)
+}
+
+// corsAnyHandler allows any origin to access the endpoint
+func corsAnyHandler(next func(w http.ResponseWriter, r *http.Request)) http.HandlerFunc {
+	return func(res http.ResponseWriter, req *http.Request) {
+		// Allow all origins
+		res.Header().Set("Access-Control-Allow-Origin", "*")
+		res.Header().Set("Access-Control-Allow-Methods", "*")
+		res.Header().Set("Access-Control-Allow-Headers", "*")
+
+		if req.Method != http.MethodOptions {
+			next(res, req)
+		}
+	}
+}
+
+// wsHandler is the handler for the /api/ws/{roomName} endpoint
+func wsHandler(w http.ResponseWriter, r *http.Request) {
+	// Get given room name now
+	roomName := r.PathValue("roomName")
+	if len(roomName) <= 0 {
+		logHTTPError(w, "no room name given", http.StatusBadRequest)
+		return
+	}
+
+	// Get or create room in any case
+	room := GetOrCreateRoom(roomName)
+
+	// Upgrade to WebSocket
+	upgrader := websocket.Upgrader{
+		CheckOrigin: func(r *http.Request) bool {
+			return true
+		},
+	}
+	wsConn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		logHTTPError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Create SafeWebSocket
+	ws := NewSafeWebSocket(wsConn)
+	// Assign message handler for join request
+	ws.RegisterMessageCallback("join", func(data []byte) {
+		var joinMsg MessageJoin
+		if err = DecodeMessage(data, &joinMsg); err != nil {
+			log.Printf("Failed to decode join message: %s\n", err)
+			return
+		}
+
+		if GetFlags().Verbose {
+			log.Printf("Join request for room: '%s' from: '%s'\n", room.Name, joinMsg.JoinerType.String())
+		}
+
+		// Handle join request, depending if it's from ingest/node or participant/client
+		switch joinMsg.JoinerType {
+		case JoinerNode:
+			// If room already online, send InUse answer
+			if room.Online {
+				if err = ws.SendAnswerMessageWS(AnswerInUse); err != nil {
+					log.Printf("Failed to send InUse answer for Room: '%s' - reason: %s\n", room.Name, err)
+				}
+				return
+			}
+			room.assignWebSocket(ws)
+			go ingestHandler(room)
+		case JoinerClient:
+			// Create participant and add to room regardless of online status
+			participant := NewParticipant(ws)
+			room.addParticipant(participant)
+			// If room not online, send Offline answer
+			if !room.Online {
+				if err = ws.SendAnswerMessageWS(AnswerOffline); err != nil {
+					log.Printf("Failed to send Offline answer for Room: '%s' - reason: %s\n", room.Name, err)
+				}
+			}
+			go participantHandler(participant, room)
+		default:
+			log.Printf("Unknown joiner type: %d\n", joinMsg.JoinerType)
+		}
+
+		// Unregister ourselves, if something happens on the other side they should just reconnect?
+		ws.UnregisterMessageCallback("join")
+	})
+}
diff --git a/packages/relay/internal/ingest.go b/packages/relay/internal/ingest.go
new file mode 100644
index 00000000..cb2d4d1c
--- /dev/null
+++ b/packages/relay/internal/ingest.go
@@ -0,0 +1,251 @@
+package relay
+
+import (
+	"errors"
+	"fmt"
+	"github.com/pion/webrtc/v4"
+	"io"
+	"log"
+	"strings"
+)
+
+func ingestHandler(room *Room) {
+	// Callback for closing PeerConnection
+	onPCClose := func() {
+		if GetFlags().Verbose {
+			log.Printf("Closed PeerConnection for room: '%s'\n", room.Name)
+		}
+		room.Online = false
+		DeleteRoomIfEmpty(room)
+	}
+
+	var err error
+	room.PeerConnection, err = CreatePeerConnection(onPCClose)
+	if err != nil {
+		log.Printf("Failed to create PeerConnection for room: '%s' - reason: %s\n", room.Name, err)
+		return
+	}
+
+	room.PeerConnection.OnTrack(func(remoteTrack *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) {
+		var localTrack *webrtc.TrackLocalStaticRTP
+		if remoteTrack.Kind() == webrtc.RTPCodecTypeVideo {
+			if GetFlags().Verbose {
+				log.Printf("Received video track for room: '%s'\n", room.Name)
+			}
+			localTrack, err = webrtc.NewTrackLocalStaticRTP(remoteTrack.Codec().RTPCodecCapability, "video", fmt.Sprint("nestri-", room.Name))
+			if err != nil {
+				log.Printf("Failed to create local video track for room: '%s' - reason: %s\n", room.Name, err)
+				return
+			}
+			room.VideoTrack = localTrack
+		} else if remoteTrack.Kind() == webrtc.RTPCodecTypeAudio {
+			if GetFlags().Verbose {
+				log.Printf("Received audio track for room: '%s'\n", room.Name)
+			}
+			localTrack, err = webrtc.NewTrackLocalStaticRTP(remoteTrack.Codec().RTPCodecCapability, "audio", fmt.Sprint("nestri-", room.Name))
+			if err != nil {
+				log.Printf("Failed to create local audio track for room: '%s' - reason: %s\n", room.Name, err)
+				return
+			}
+			room.AudioTrack = localTrack
+		}
+
+		// If both audio and video tracks are set, set online state
+		if room.AudioTrack != nil && room.VideoTrack != nil {
+			room.Online = true
+			if GetFlags().Verbose {
+				log.Printf("Room online and receiving: '%s' - signaling participants\n", room.Name)
+			}
+			room.signalParticipantsWithTracks()
+		}
+
+		rtpBuffer := make([]byte, 1400)
+		for {
+			read, _, err := remoteTrack.Read(rtpBuffer)
+			if err != nil {
+				// EOF is expected when stopping room
+				if !errors.Is(err, io.EOF) {
+					log.Printf("RTP read error from room: '%s' - reason: %s\n", room.Name, err)
+				}
+				break
+			}
+
+			_, err = localTrack.Write(rtpBuffer[:read])
+			if err != nil && !errors.Is(err, io.ErrClosedPipe) {
+				log.Printf("Failed to write RTP to local track for room: '%s' - reason: %s\n", room.Name, err)
+				break
+			}
+		}
+
+		if remoteTrack.Kind() == webrtc.RTPCodecTypeVideo {
+			room.VideoTrack = nil
+		} else if remoteTrack.Kind() == webrtc.RTPCodecTypeAudio {
+			room.AudioTrack = nil
+		}
+
+		if room.VideoTrack == nil && room.AudioTrack == nil {
+			room.Online = false
+			if GetFlags().Verbose {
+				log.Printf("Room offline and not receiving: '%s'\n", room.Name)
+			}
+			// Signal participants of room offline
+			room.signalParticipantsOffline()
+			DeleteRoomIfEmpty(room)
+		}
+	})
+
+	room.PeerConnection.OnDataChannel(func(dc *webrtc.DataChannel) {
+		room.DataChannel = NewNestriDataChannel(dc)
+		if GetFlags().Verbose {
+			log.Printf("New DataChannel for room: '%s' - '%s'\n", room.Name, room.DataChannel.Label())
+		}
+
+		// Register channel opening handling
+		room.DataChannel.RegisterOnOpen(func() {
+			if GetFlags().Verbose {
+				log.Printf("DataChannel for room: '%s' - '%s' open\n", room.Name, room.DataChannel.Label())
+			}
+		})
+
+		room.DataChannel.OnClose(func() {
+			if GetFlags().Verbose {
+				log.Printf("DataChannel for room: '%s' - '%s' closed\n", room.Name, room.DataChannel.Label())
+			}
+		})
+
+		// We do not handle any messages from ingest via DataChannel yet
+	})
+
+	room.PeerConnection.OnICECandidate(func(candidate *webrtc.ICECandidate) {
+		if candidate == nil {
+			return
+		}
+		if GetFlags().Verbose {
+			log.Printf("ICE candidate for room: '%s'\n", room.Name)
+		}
+		err = room.WebSocket.SendICECandidateMessageWS(candidate.ToJSON())
+		if err != nil {
+			log.Printf("Failed to send ICE candidate for room: '%s' - reason: %s\n", room.Name, err)
+		}
+	})
+
+	iceHolder := make([]webrtc.ICECandidateInit, 0)
+
+	// ICE callback
+	room.WebSocket.RegisterMessageCallback("ice", func(data []byte) {
+		var iceMsg MessageICECandidate
+		if err = DecodeMessage(data, &iceMsg); err != nil {
+			log.Printf("Failed to decode ICE candidate message from ingest for room: '%s' - reason: %s\n", room.Name, err)
+			return
+		}
+		candidate := webrtc.ICECandidateInit{
+			Candidate: iceMsg.Candidate.Candidate,
+		}
+		if room.PeerConnection != nil {
+			// If remote isn't set yet, store ICE candidates
+			if room.PeerConnection.RemoteDescription() != nil {
+				if err = room.PeerConnection.AddICECandidate(candidate); err != nil {
+					log.Printf("Failed to add ICE candidate for room: '%s' - reason: %s\n", room.Name, err)
+				}
+				// Add any held ICE candidates
+				for _, heldCandidate := range iceHolder {
+					if err = room.PeerConnection.AddICECandidate(heldCandidate); err != nil {
+						log.Printf("Failed to add held ICE candidate for room: '%s' - reason: %s\n", room.Name, err)
+					}
+				}
+				iceHolder = nil
+			} else {
+				iceHolder = append(iceHolder, candidate)
+			}
+		} else {
+			log.Printf("ICE candidate received before PeerConnection for room: '%s'\n", room.Name)
+		}
+	})
+
+	// SDP offer callback
+	room.WebSocket.RegisterMessageCallback("sdp", func(data []byte) {
+		var sdpMsg MessageSDP
+		if err = DecodeMessage(data, &sdpMsg); err != nil {
+			log.Printf("Failed to decode SDP message from ingest for room: '%s' - reason: %s\n", room.Name, err)
+			return
+		}
+		answer := handleIngestSDP(room, sdpMsg)
+		if answer != nil {
+			if err = room.WebSocket.SendSDPMessageWS(*answer); err != nil {
+				log.Printf("Failed to send SDP answer to ingest for room: '%s' - reason: %s\n", room.Name, err)
+			}
+		} else {
+			log.Printf("Failed to handle SDP message from ingest for room: '%s'\n", room.Name)
+		}
+	})
+
+	// Log callback
+	room.WebSocket.RegisterMessageCallback("log", func(data []byte) {
+		var logMsg MessageLog
+		if err = DecodeMessage(data, &logMsg); err != nil {
+			log.Printf("Failed to decode log message from ingest for room: '%s' - reason: %s\n", room.Name, err)
+			return
+		}
+		// TODO: Handle log message sending to metrics server
+	})
+
+	// Metrics callback
+	room.WebSocket.RegisterMessageCallback("metrics", func(data []byte) {
+		var metricsMsg MessageMetrics
+		if err = DecodeMessage(data, &metricsMsg); err != nil {
+			log.Printf("Failed to decode metrics message from ingest for room: '%s' - reason: %s\n", room.Name, err)
+			return
+		}
+		// TODO: Handle metrics message sending to metrics server
+	})
+
+	room.WebSocket.RegisterOnClose(func() {
+		// If PeerConnection is not open or does not exist, delete room
+		if (room.PeerConnection != nil && room.PeerConnection.ConnectionState() != webrtc.PeerConnectionStateConnected) ||
+			room.PeerConnection == nil {
+			DeleteRoomIfEmpty(room)
+		}
+	})
+
+	log.Printf("Room: '%s' is ready, sending an OK\n", room.Name)
+	if err = room.WebSocket.SendAnswerMessageWS(AnswerOK); err != nil {
+		log.Printf("Failed to send OK answer for room: '%s' - reason: %s\n", room.Name, err)
+	}
+}
+
+// SDP offer handler, returns SDP answer
+func handleIngestSDP(room *Room, offerMsg MessageSDP) *webrtc.SessionDescription {
+	var err error
+
+	// Get SDP offer
+	sdpOffer := offerMsg.SDP.SDP
+
+	// Modify SDP offer to remove opus "sprop-maxcapturerate=24000" (fixes opus bad quality issue, present in GStreamer)
+	sdpOffer = strings.Replace(sdpOffer, ";sprop-maxcapturerate=24000", "", -1)
+
+	// Set new remote description
+	err = room.PeerConnection.SetRemoteDescription(webrtc.SessionDescription{
+		Type: webrtc.SDPTypeOffer,
+		SDP:  sdpOffer,
+	})
+	if err != nil {
+		log.Printf("Failed to set remote description for room: '%s' - reason: %s\n", room.Name, err)
+		return nil
+	}
+
+	// Create SDP answer
+	answer, err := room.PeerConnection.CreateAnswer(nil)
+	if err != nil {
+		log.Printf("Failed to create SDP answer for room: '%s' - reason: %s\n", room.Name, err)
+		return nil
+	}
+
+	// Set local description
+	err = room.PeerConnection.SetLocalDescription(answer)
+	if err != nil {
+		log.Printf("Failed to set local description for room: '%s' - reason: %s\n", room.Name, err)
+		return nil
+	}
+
+	return &answer
+}
diff --git a/packages/relay/internal/latency.go b/packages/relay/internal/latency.go
new file mode 100644
index 00000000..9ebc31e1
--- /dev/null
+++ b/packages/relay/internal/latency.go
@@ -0,0 +1,114 @@
+package relay
+
+import (
+	"fmt"
+	"time"
+)
+
+type TimestampEntry struct {
+	Stage string `json:"stage"`
+	Time  string `json:"time"` // ISO 8601 string
+}
+
+// LatencyTracker provides a generic structure for measuring time taken at various stages in message processing.
+// It can be embedded in message structs for tracking the flow of data and calculating round-trip latency.
+type LatencyTracker struct {
+	SequenceID string            `json:"sequence_id"`
+	Timestamps []TimestampEntry  `json:"timestamps"`
+	Metadata   map[string]string `json:"metadata,omitempty"`
+}
+
+// NewLatencyTracker initializes a new LatencyTracker with the given sequence ID
+func NewLatencyTracker(sequenceID string) *LatencyTracker {
+	return &LatencyTracker{
+		SequenceID: sequenceID,
+		Timestamps: make([]TimestampEntry, 0),
+		Metadata:   make(map[string]string),
+	}
+}
+
+// AddTimestamp adds a new timestamp for a specific stage
+func (lt *LatencyTracker) AddTimestamp(stage string) {
+	lt.Timestamps = append(lt.Timestamps, TimestampEntry{
+		Stage: stage,
+		// Ensure extremely precise UTC RFC3339 timestamps (down to nanoseconds)
+		Time: time.Now().UTC().Format(time.RFC3339Nano),
+	})
+}
+
+// TotalLatency calculates the total latency from the earliest to the latest timestamp
+func (lt *LatencyTracker) TotalLatency() (int64, error) {
+	if len(lt.Timestamps) < 2 {
+		return 0, nil // Not enough timestamps to calculate latency
+	}
+
+	var earliest, latest time.Time
+	for _, ts := range lt.Timestamps {
+		t, err := time.Parse(time.RFC3339, ts.Time)
+		if err != nil {
+			return 0, err
+		}
+		if earliest.IsZero() || t.Before(earliest) {
+			earliest = t
+		}
+		if latest.IsZero() || t.After(latest) {
+			latest = t
+		}
+	}
+
+	return latest.Sub(earliest).Milliseconds(), nil
+}
+
+// PainPoints returns a list of stages where the duration exceeds the given threshold.
+func (lt *LatencyTracker) PainPoints(threshold time.Duration) []string {
+	var painPoints []string
+	var lastStage string
+	var lastTime time.Time
+
+	for _, ts := range lt.Timestamps {
+		stage := ts.Stage
+		t := ts.Time
+		if lastStage == "" {
+			lastStage = stage
+			lastTime, _ = time.Parse(time.RFC3339, t)
+			continue
+		}
+
+		currentTime, _ := time.Parse(time.RFC3339, t)
+		if currentTime.Sub(lastTime) > threshold {
+			painPoints = append(painPoints, fmt.Sprintf("%s -> %s", lastStage, stage))
+		}
+
+		lastStage = stage
+		lastTime = currentTime
+	}
+	return painPoints
+}
+
+// StageLatency calculates the time taken between two specific stages.
+func (lt *LatencyTracker) StageLatency(startStage, endStage string) (time.Duration, error) {
+	startTime, endTime := "", ""
+	for _, ts := range lt.Timestamps {
+		if ts.Stage == startStage {
+			startTime = ts.Time
+		}
+		if ts.Stage == endStage {
+			endTime = ts.Time
+		}
+	}
+
+	if startTime == "" || endTime == "" {
+		return 0, fmt.Errorf("missing timestamps for stages: %s -> %s", startStage, endStage)
+	}
+
+	start, err := time.Parse(time.RFC3339, startTime)
+	if err != nil {
+		return 0, err
+	}
+	end, err := time.Parse(time.RFC3339, endTime)
+	if err != nil {
+		return 0, err
+	}
+
+	return end.Sub(start), nil
+}
diff --git a/packages/relay/internal/messages.go b/packages/relay/internal/messages.go
new file mode 100644
index 00000000..2f102bd8
--- /dev/null
+++ b/packages/relay/internal/messages.go
@@ -0,0 +1,227 @@
+package relay
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
+	"fmt"
+	"github.com/pion/webrtc/v4"
+	"time"
+)
+
+// OnMessageCallback is a callback for binary messages of given type
+type OnMessageCallback func(data []byte)
+
+// MessageBase is the base type for WS/DC messages.
+type MessageBase struct {
+	PayloadType    string         `json:"payload_type"`
+	LatencyTracker LatencyTracker `json:"latency_tracker,omitempty"`
+}
+
+// MessageInput represents an input message.
+type MessageInput struct {
+	MessageBase
+	Data string `json:"data"`
+}
+
+// MessageLog represents a log message.
+type MessageLog struct {
+	MessageBase
+	Level   string `json:"level"`
+	Message string `json:"message"`
+	Time    string `json:"time"`
+}
+
+// MessageMetrics represents a metrics/heartbeat message.
+type MessageMetrics struct {
+	MessageBase
+	UsageCPU        float64 `json:"usage_cpu"`
+	UsageMemory     float64 `json:"usage_memory"`
+	Uptime          uint64  `json:"uptime"`
+	PipelineLatency float64 `json:"pipeline_latency"`
+}
+
+// MessageICECandidate represents an ICE candidate message.
+type MessageICECandidate struct {
+	MessageBase
+	Candidate webrtc.ICECandidateInit `json:"candidate"`
+}
+
+// MessageSDP represents an SDP message.
+type MessageSDP struct {
+	MessageBase
+	SDP webrtc.SessionDescription `json:"sdp"`
+}
+
+// JoinerType is an enum for the type of incoming room joiner
+type JoinerType int
+
+const (
+	JoinerNode JoinerType = iota
+	JoinerClient
+)
+
+func (jt *JoinerType) String() string {
+	switch *jt {
+	case JoinerNode:
+		return "node"
+	case JoinerClient:
+		return "client"
+	default:
+		return "unknown"
+	}
+}
+
+// MessageJoin is used to tell us that either participant or ingest wants to join the room
+type MessageJoin struct {
+	MessageBase
+	JoinerType JoinerType `json:"joiner_type"`
+}
+
+// AnswerType is an enum for the type of answer, signaling Room state for a joiner
+type AnswerType int
+
+const (
+	AnswerOffline AnswerType = iota // For participant/client, when the room is offline without stream
+	AnswerInUse                     // For ingest/node joiner, when the room is already in use by another ingest/node
+	AnswerOK                        // For both, when the join request is handled successfully
+)
+
+// MessageAnswer is used to send the answer to a join request
+type MessageAnswer struct {
+	MessageBase
+	AnswerType AnswerType `json:"answer_type"`
+}
+
+// EncodeMessage encodes a message to be sent with gzip compression
+func EncodeMessage(msg interface{}) ([]byte, error) {
+	// Marshal the message to JSON
+	data, err := json.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("failed to encode message: %w", err)
+	}
+
+	// Gzip compress the JSON
+	var compressedData bytes.Buffer
+	writer := gzip.NewWriter(&compressedData)
+	_, err = writer.Write(data)
+	if err != nil {
+		return nil, fmt.Errorf("failed to compress message: %w", err)
+	}
+	if err := writer.Close(); err != nil {
+		return nil, fmt.Errorf("failed to finalize compression: %w", err)
+	}
+
+	return compressedData.Bytes(), nil
+}
+
+// DecodeMessage decodes a message received with gzip decompression
+func DecodeMessage(data []byte, target interface{}) error {
+	// Gzip decompress the data
+	reader, err := gzip.NewReader(bytes.NewReader(data))
+	if err != nil {
+		return fmt.Errorf("failed to initialize decompression: %w", err)
+	}
+	defer func(reader *gzip.Reader) {
+		if err = reader.Close(); err != nil {
+			fmt.Printf("failed to close reader: %v\n", err)
+		}
+	}(reader)
+
+	// Decode the JSON
+	err = json.NewDecoder(reader).Decode(target)
+	if err != nil {
+		return fmt.Errorf("failed to decode message: %w", err)
+	}
+
+	return nil
+}
+
+// SendLogMessageWS sends a log message to the given WebSocket connection.
+func (ws *SafeWebSocket) SendLogMessageWS(level, message string) error {
+	msg := MessageLog{
+		MessageBase: MessageBase{PayloadType: "log"},
+		Level:       level,
+		Message:     message,
+		Time:        time.Now().Format(time.RFC3339),
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode log message: %w", err)
+	}
+
+	return ws.SendBinary(encoded)
+}
+
+// SendMetricsMessageWS sends a metrics message to the given WebSocket connection.
+func (ws *SafeWebSocket) SendMetricsMessageWS(usageCPU, usageMemory float64, uptime uint64, pipelineLatency float64) error {
+	msg := MessageMetrics{
+		MessageBase:     MessageBase{PayloadType: "metrics"},
+		UsageCPU:        usageCPU,
+		UsageMemory:     usageMemory,
+		Uptime:          uptime,
+		PipelineLatency: pipelineLatency,
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode metrics message: %w", err)
+	}
+
+	return ws.SendBinary(encoded)
+}
+
+// SendICECandidateMessageWS sends an ICE candidate message to the given WebSocket connection.
+func (ws *SafeWebSocket) SendICECandidateMessageWS(candidate webrtc.ICECandidateInit) error {
+	msg := MessageICECandidate{
+		MessageBase: MessageBase{PayloadType: "ice"},
+		Candidate:   candidate,
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode ICE candidate message: %w", err)
+	}
+
+	return ws.SendBinary(encoded)
+}
+
+// SendSDPMessageWS sends an SDP message to the given WebSocket connection.
+func (ws *SafeWebSocket) SendSDPMessageWS(sdp webrtc.SessionDescription) error {
+	msg := MessageSDP{
+		MessageBase: MessageBase{PayloadType: "sdp"},
+		SDP:         sdp,
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode SDP message: %w", err)
+	}
+
+	return ws.SendBinary(encoded)
+}
+
+// SendAnswerMessageWS sends an answer message to the given WebSocket connection.
+func (ws *SafeWebSocket) SendAnswerMessageWS(answer AnswerType) error {
+	msg := MessageAnswer{
+		MessageBase: MessageBase{PayloadType: "answer"},
+		AnswerType:  answer,
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode answer message: %w", err)
+	}
+
+	return ws.SendBinary(encoded)
+}
+
+// SendInputMessageDC sends an input message to the given DataChannel connection.
+func (ndc *NestriDataChannel) SendInputMessageDC(data string) error {
+	msg := MessageInput{
+		MessageBase: MessageBase{PayloadType: "input"},
+		Data:        data,
+	}
+	encoded, err := EncodeMessage(msg)
+	if err != nil {
+		return fmt.Errorf("failed to encode input message: %w", err)
+	}
+
+	return ndc.SendBinary(encoded)
+}
diff --git a/packages/relay/internal/participant.go b/packages/relay/internal/participant.go
new file mode 100644
index 00000000..3e5ae6db
--- /dev/null
+++ b/packages/relay/internal/participant.go
@@ -0,0 +1,69 @@
+package relay
+
+import (
+	"fmt"
+	"github.com/google/uuid"
+	"github.com/pion/webrtc/v4"
+	"math/rand"
+)
+
+type Participant struct {
+	ID             uuid.UUID //< Internal IDs are useful to keeping unique internal track and not have conflicts later
+	Name           string
+	WebSocket      *SafeWebSocket
+	PeerConnection *webrtc.PeerConnection
+	DataChannel    *NestriDataChannel
+}
+
+func NewParticipant(ws *SafeWebSocket) *Participant {
+	return &Participant{
+		ID:        uuid.New(),
+		Name:      createRandomName(),
+		WebSocket: ws,
+	}
+}
+
+func (vw *Participant) addTrack(trackLocal *webrtc.TrackLocal) error {
+	rtpSender, err := vw.PeerConnection.AddTrack(*trackLocal)
+	if err != nil {
+		return err
+	}
+
+	go func() {
+		rtcpBuffer := make([]byte, 1400)
+		for {
+			if _, _, rtcpErr := rtpSender.Read(rtcpBuffer); rtcpErr != nil {
+				return
+			}
+		}
+	}()
+
+	return nil
+}
+
+func (vw *Participant) signalOffer() error {
+	if vw.PeerConnection == nil {
+		return fmt.Errorf("peer connection is nil for participant: '%s' - cannot signal offer", vw.ID)
+	}
+
+	offer, err := vw.PeerConnection.CreateOffer(nil)
+	if err != nil {
+		return err
+	}
+
+	err = vw.PeerConnection.SetLocalDescription(offer)
+	if err != nil {
+		return err
+	}
+
+	return vw.WebSocket.SendSDPMessageWS(offer)
+}
+
+var namesFirst = []string{"Happy", "Sad", "Angry", "Calm", "Excited", "Bored", "Confused", "Confident", "Curious", "Depressed", "Disappointed", "Embarrassed", "Energetic", "Fearful", "Frustrated", "Glad", "Guilty", "Hopeful", "Impatient", "Jealous", "Lonely", "Motivated", "Nervous", "Optimistic", "Pessimistic", "Proud", "Relaxed", "Shy", "Stressed", "Surprised", "Tired", "Worried"}
+var namesSecond = []string{"Dragon", "Unicorn", "Troll", "Goblin", "Elf", "Dwarf", "Ogre", "Gnome", "Mermaid", "Siren", "Vampire", "Ghoul", "Werewolf", "Minotaur", "Centaur", "Griffin", "Phoenix", "Wyvern", "Hydra", "Kraken"}
+
+func createRandomName() string {
+	randomFirst := namesFirst[rand.Intn(len(namesFirst))]
+	randomSecond := namesSecond[rand.Intn(len(namesSecond))]
+	return randomFirst + " " + randomSecond
+}
diff --git a/packages/relay/internal/room.go b/packages/relay/internal/room.go
new file mode 100644
index 00000000..29ab850f
--- /dev/null
+++ b/packages/relay/internal/room.go
@@ -0,0 +1,179 @@
+package relay
+
+import (
+	"github.com/google/uuid"
+	"github.com/pion/webrtc/v4"
+	"log"
+	"sync"
+)
+
+var Rooms = make(map[uuid.UUID]*Room) //< Room ID -> Room
+var RoomsMutex = sync.RWMutex{}
+
+func GetRoomByID(id uuid.UUID) *Room {
+	RoomsMutex.RLock()
+	defer RoomsMutex.RUnlock()
+	if room, ok := Rooms[id]; ok {
+		return room
+	}
+	return nil
+}
+
+func GetRoomByName(name string) *Room {
+	RoomsMutex.RLock()
+	defer RoomsMutex.RUnlock()
+	for _, room := range Rooms {
+		if room.Name == name {
+			return room
+		}
+	}
+	return nil
+}
+
+func GetOrCreateRoom(name string) *Room {
+	if room := GetRoomByName(name); room != nil {
+		return room
+	}
+	RoomsMutex.Lock()
+	room := NewRoom(name)
+	Rooms[room.ID] = room
+	if GetFlags().Verbose {
+		log.Printf("New room: '%s'\n", room.Name)
+	}
+	RoomsMutex.Unlock()
+	return room
+}
+
+func DeleteRoomIfEmpty(room *Room) {
+	room.ParticipantsMutex.RLock()
+	defer room.ParticipantsMutex.RUnlock()
+	if !room.Online && len(room.Participants) <= 0 {
+		RoomsMutex.Lock()
+		delete(Rooms, room.ID)
+		RoomsMutex.Unlock()
+	}
+}
+
+type Room struct {
+	ID                uuid.UUID //< Internal IDs are useful to keeping unique internal track
+	Name              string
+	Online            bool //< Whether the room is currently online, i.e. receiving data from a nestri-server
+	WebSocket         *SafeWebSocket
+	PeerConnection    *webrtc.PeerConnection
+	AudioTrack        webrtc.TrackLocal
+	VideoTrack        webrtc.TrackLocal
+	DataChannel       *NestriDataChannel
+	Participants      map[uuid.UUID]*Participant
+	ParticipantsMutex sync.RWMutex
+}
+
+func NewRoom(name string) *Room {
+	return &Room{
+		ID:           uuid.New(),
+		Name:         name,
+		Online:       false,
+		Participants: make(map[uuid.UUID]*Participant),
+	}
+}
+
+// Assigns a WebSocket connection to a Room
+func (r *Room) assignWebSocket(ws *SafeWebSocket) {
+	// If WS already assigned, warn
+	if r.WebSocket != nil {
+		log.Printf("Warning: Room '%s' already has a WebSocket assigned\n", r.Name)
+	}
+	r.WebSocket = ws
+}
+
+// Adds a Participant to a Room
+func (r *Room) addParticipant(participant *Participant) {
+	r.ParticipantsMutex.Lock()
+	r.Participants[participant.ID] = participant
+	r.ParticipantsMutex.Unlock()
+}
+
+// Removes a Participant from a Room by participant's ID.
+// If Room is offline and this is the last participant, the room is deleted
+func (r *Room) removeParticipantByID(pID uuid.UUID) {
+	r.ParticipantsMutex.Lock()
+	delete(r.Participants, pID)
+	r.ParticipantsMutex.Unlock()
+	DeleteRoomIfEmpty(r)
+}
+
+// Removes a Participant from a Room by participant's name.
+// If Room is offline and this is the last participant, the room is deleted
+func (r *Room) removeParticipantByName(pName string) {
+	r.ParticipantsMutex.Lock()
+	for id, p := range r.Participants {
+		if p.Name == pName {
+			delete(r.Participants, id)
+			break
+		}
+	}
+	r.ParticipantsMutex.Unlock()
+	DeleteRoomIfEmpty(r)
+}
+
+// Signals all participants with offer and add tracks to their PeerConnections
+func (r *Room) signalParticipantsWithTracks() {
+	r.ParticipantsMutex.RLock()
+	for _, participant := range r.Participants {
+		// Add tracks to participant's PeerConnection
+		if r.AudioTrack != nil {
+			if err := participant.addTrack(&r.AudioTrack); err != nil {
+				log.Printf("Failed to add audio track to participant: '%s' - reason: %s\n", participant.ID, err)
+			}
+		}
+		if r.VideoTrack != nil {
+			if err := participant.addTrack(&r.VideoTrack); err != nil {
+				log.Printf("Failed to add video track to participant: '%s' - reason: %s\n", participant.ID, err)
+			}
+		}
+		// Signal participant with offer
+		if err := participant.signalOffer(); err != nil {
+			log.Printf("Error signaling participant: %v\n", err)
+		}
+	}
+	r.ParticipantsMutex.RUnlock()
+}
+
+// Signals all participants that the Room is offline
+func (r *Room) signalParticipantsOffline() {
+	r.ParticipantsMutex.RLock()
+	for _, participant := range r.Participants {
+		if err := participant.WebSocket.SendAnswerMessageWS(AnswerOffline); err != nil {
+			log.Printf("Failed to send Offline answer for participant: '%s' - reason: %s\n", participant.ID, err)
+		}
+	}
+	r.ParticipantsMutex.RUnlock()
+}
+
+// Broadcasts a message to Room's Participant's - excluding one given ID of
+func (r *Room) broadcastMessage(msg webrtc.DataChannelMessage, excludeID uuid.UUID) {
+	r.ParticipantsMutex.RLock()
+	for d, participant := range r.Participants {
+		if participant.DataChannel != nil {
+			if d != excludeID { // Don't send back to the sender
+				if err := participant.DataChannel.SendText(string(msg.Data)); err != nil {
+					log.Printf("Error broadcasting to %s: %v\n", participant.Name, err)
+				}
+			}
+		}
+	}
+	if r.DataChannel != nil {
+		if err := r.DataChannel.SendText(string(msg.Data)); err != nil {
+			log.Printf("Error broadcasting to Room: %v\n", err)
+		}
+	}
+	r.ParticipantsMutex.RUnlock()
+}
+
+// Sends message to Room (nestri-server)
+func (r *Room) sendToRoom(msg webrtc.DataChannelMessage) {
+	if r.DataChannel != nil {
+		if err := r.DataChannel.SendText(string(msg.Data)); err != nil {
+			log.Printf("Error broadcasting to Room: %v\n", err)
+		}
+	}
+}
diff --git a/packages/relay/internal/websocket.go b/packages/relay/internal/websocket.go
new file mode 100644
index 00000000..a9c1d503
--- /dev/null
+++ b/packages/relay/internal/websocket.go
@@ -0,0 +1,114 @@
+package relay
+
+import (
+	"github.com/gorilla/websocket"
+	"log"
+	"sync"
+)
+
+// SafeWebSocket is a websocket with a mutex
+type SafeWebSocket struct {
+	*websocket.Conn
+	sync.Mutex
+	binaryCallbacks map[string]OnMessageCallback // MessageBase type -> callback
+}
+
+// NewSafeWebSocket creates a new SafeWebSocket from *websocket.Conn
+func NewSafeWebSocket(conn *websocket.Conn) *SafeWebSocket {
+	ws := &SafeWebSocket{
+		Conn:            conn,
+		binaryCallbacks: make(map[string]OnMessageCallback),
+	}
+
+	// Launch a goroutine to handle binary messages
+	go func() {
+		for {
+			// Read binary message
+			kind, data, err := ws.Conn.ReadMessage()
+			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure, websocket.CloseNoStatusReceived) {
+				// If unexpected close error, break
+				if GetFlags().Verbose {
+					log.Printf("Unexpected WebSocket close error, reason: %s\n", err)
+				}
+				break
+			} else if websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseAbnormalClosure, websocket.CloseNoStatusReceived) {
+				// If closing, just break
+				if GetFlags().Verbose {
+					log.Printf("WebSocket closing\n")
+				}
+				break
+			} else if err != nil {
+				log.Printf("Failed to read WebSocket message, reason: %s\n", err)
+				break
+			}
+
+			switch kind {
+			case websocket.TextMessage:
+				// Ignore, we use binary messages
+				continue
+			case websocket.BinaryMessage:
+				// Decode message
+				var msg MessageBase
+				if err = DecodeMessage(data, &msg); err != nil {
+					log.Printf("Failed to decode binary WebSocket message, reason: %s\n", err)
+					continue
+				}
+
+				// Handle message type callback
+				if callback, ok := ws.binaryCallbacks[msg.PayloadType]; ok {
+					callback(data)
+				} // TODO: Log unknown message type?
+			default:
+				log.Printf("Unknown WebSocket message type: %d\n", kind)
+			}
+		}
+	}()
+
+	return ws
+}
+
+// SendJSON writes JSON to a websocket with a mutex
+func (ws *SafeWebSocket) SendJSON(v interface{}) error {
+	ws.Lock()
+	defer ws.Unlock()
+	return ws.Conn.WriteJSON(v)
+}
+
+// SendBinary writes binary to a websocket with a mutex
+func (ws *SafeWebSocket) SendBinary(data []byte) error {
+	ws.Lock()
+	defer ws.Unlock()
+	return ws.Conn.WriteMessage(websocket.BinaryMessage, data)
+}
+
+// RegisterMessageCallback sets the callback for binary message of given type
+func (ws *SafeWebSocket) RegisterMessageCallback(msgType string, callback OnMessageCallback) {
+	ws.Lock()
+	defer ws.Unlock()
+	if ws.binaryCallbacks == nil {
+		ws.binaryCallbacks = make(map[string]OnMessageCallback)
+	}
+	ws.binaryCallbacks[msgType] = callback
+}
+
+// UnregisterMessageCallback removes the callback for binary message of given type
+func (ws *SafeWebSocket) UnregisterMessageCallback(msgType string) {
+	ws.Lock()
+	defer ws.Unlock()
+	if ws.binaryCallbacks != nil {
+		delete(ws.binaryCallbacks, msgType)
+	}
+}
+
+// RegisterOnClose sets the callback for websocket closing
+func (ws *SafeWebSocket) RegisterOnClose(callback func()) {
+	ws.SetCloseHandler(func(code int, text string) error {
+		// Clear our callbacks
+		ws.Lock()
+		ws.binaryCallbacks = nil
+		ws.Unlock()
+		// Call the callback
+		callback()
+		return nil
+	})
+}
diff --git a/packages/relay/main.go b/packages/relay/main.go
new file mode 100644
index 00000000..45951b00
--- /dev/null
+++ b/packages/relay/main.go
@@ -0,0 +1,32 @@
+package main
+
+import (
+	"log"
+	"os"
+	"os/signal"
+	relay "relay/internal"
+	"syscall"
+)
+
+func main() {
+	var err error
+	stopCh := make(chan os.Signal, 1)
+	signal.Notify(stopCh, os.Interrupt, syscall.SIGTERM)
+
+	// Get flags and log them
+	relay.InitFlags()
+	relay.GetFlags().DebugLog()
+
+	// Init WebRTC API
+	err = relay.InitWebRTCAPI()
+	if err != nil {
+		log.Fatal("Failed to initialize WebRTC API: ", err)
+	}
+
+	// Start our HTTP endpoints
+	relay.InitHTTPEndpoint()
+
+	// Wait for exit signal
+	<-stopCh
+	log.Println("Shutting down gracefully by signal...")
+}
diff --git a/packages/scripts/envs.sh b/packages/scripts/envs.sh
new file mode 100644
index 00000000..b9d08af5
--- /dev/null
+++ b/packages/scripts/envs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+export XDG_RUNTIME_DIR=/run/user/${UID}/
+export WAYLAND_DISPLAY=wayland-0
+export DISPLAY=:0
+export $(dbus-launch)
+
+# Fixes freezing issue
+export PROTON_NO_FSYNC=1
+
+# Our preferred prefix
+export WINEPREFIX=${USER_HOME}/.nestripfx/
diff --git a/.scripts/gpu_helpers.sh b/packages/scripts/gpu_helpers.sh
similarity index 100%
rename from .scripts/gpu_helpers.sh
rename to packages/scripts/gpu_helpers.sh
diff --git a/packages/server/.gitignore b/packages/server/.gitignore
new file mode 100644
index 00000000..a53d9628
--- /dev/null
+++ b/packages/server/.gitignore
@@ -0,0 +1 @@
+*.mp4
\ No newline at end of file
diff --git a/packages/server/Cargo.toml b/packages/server/Cargo.toml
new file mode 100644
index 00000000..93b7d214
--- /dev/null
+++ b/packages/server/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "nestri-server"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "nestri-server"
+path = "src/main.rs"
+
+[dependencies]
+gst.workspace = true
+gst-app.workspace = true
+serde = {version = "1.0.214", features = ["derive"] }
+tokio = { version = "1.41.0", features = ["full"] }
+clap = { version = "4.5.20", features = ["env"] }
+serde_json = "1.0.132"
+webrtc = "0.11.0"
+regex = "1.11.1"
+rand = "0.8.5"
+rustls = { version = "0.23.17", features = ["ring"] }
+tokio-util = "0.7.12"
+flate2 = "1.0.35"
+tokio-tungstenite = { version = "0.24.0", features = ["native-tls"] }
+log = { version = "0.4.22", features = ["std"] }
+chrono = "0.4.38"
+futures-util = "0.3.31"
+num-derive = "0.4.2"
+num-traits = "0.2.19"
diff --git a/packages/server/pkg/PKGBUILD b/packages/server/pkg/PKGBUILD
new file mode 100644
index 00000000..c172511e
--- /dev/null
+++ b/packages/server/pkg/PKGBUILD
@@ -0,0 +1,32 @@
+pkgname=nestri-git
+pkgver=0.0.1
+pkgrel=1
+pkgdesc='[Experimental] An open-source, self-hosted Geforce Now alternative'
+arch=('x86_64')
+url='https://github.com/nestriness/nestri'
+license=('AGPL-3.0')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+depends=('rust' 'git' 'rustup' 'pkgconf' 'wayland')
+source=("nestri::git+https://github.com/nestriness/nestri.git")
+sha512sums=('SKIP')
+pkgver() {
+        cd "$srcdir/${pkgname%-git}"
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+        cd "$srcdir/${pkgname%-git}"
+}
+
+build() {
+        cd "$srcdir/${pkgname%-git}/packages/server"
+        
+        CARGO_TARGET_DIR="./build" sudo cargo build -j$(nproc)
+}
+
+package() {
+        cd "$srcdir/${pkgname%-git}/packages/server"
+
+        install -m755 -Dt "${pkgdir}/usr/bin" build/release/nestri
+}
\ No newline at end of file
diff --git a/packages/server/src/args.rs b/packages/server/src/args.rs
new file mode 100644
index 00000000..445f99ed
--- /dev/null
+++ b/packages/server/src/args.rs
@@ -0,0 +1,205 @@
+use clap::{Arg, Command};
+
+pub mod app_args;
+pub mod device_args;
+pub mod encoding_args;
+
+pub struct Args {
+    pub app: app_args::AppArgs,
+    pub device: device_args::DeviceArgs,
+    pub encoding: encoding_args::EncodingArgs,
+}
+
+impl Args {
+    pub fn new() -> Self {
+        let matches = Command::new("nestri-server")
+            .arg(
+                Arg::new("verbose")
+                    .short('v')
+                    .long("verbose")
+                    .env("VERBOSE")
+                    .help("Enable verbose output")
+                    .default_value("false"),
+            )
+            .arg(
+                Arg::new("debug-feed")
+                    .short('d')
+                    .long("debug-feed")
+                    .env("DEBUG_FEED")
+                    .help("Debug by showing a window on host")
+                    .default_value("false"),
+            )
+            .arg(
+                Arg::new("debug-latency")
+                    .short('l')
+                    .long("debug-latency")
+                    .env("DEBUG_LATENCY")
+                    .help("Debug latency by showing time on feed")
+                    .default_value("false"),
+            )
+            .arg(
+                Arg::new("relay-url")
+                    .short('u')
+                    .long("relay-url")
+                    .env("RELAY_URL")
+                    .help("Nestri relay URL")
+            )
+            .arg(
+                Arg::new("resolution")
+                    .short('r')
+                    .long("resolution")
+                    .env("RESOLUTION")
+                    .help("Display/stream resolution in 'WxH' format")
+                    .default_value("1280x720"),
+            )
+            .arg(
+                Arg::new("framerate")
+                    .short('f')
+                    .long("framerate")
+                    .env("FRAMERATE")
+                    .help("Display/stream framerate")
+                    .default_value("60"),
+            )
+            .arg(
+                Arg::new("room")
+                    .long("room")
+                    .env("NESTRI_ROOM")
+                    .help("Nestri room name/identifier")
+            )
+            .arg(
+                Arg::new("gpu-vendor")
+                    .short('g')
+                    .long("gpu-vendor")
+                    .env("GPU_VENDOR")
+                    .help("GPU to find by vendor (e.g. 'nvidia')")
+                    .required(false),
+            )
+            .arg(
+                Arg::new("gpu-name")
+                    .short('n')
+                    .long("gpu-name")
+                    .env("GPU_NAME")
+                    .help("GPU to find by name (e.g. 'rtx 3060')")
+                    .required(false),
+            )
+            .arg(
+                Arg::new("gpu-index")
+                    .short('i')
+                    .long("gpu-index")
+                    .env("GPU_INDEX")
+                    .help("GPU index, if multiple similar GPUs are present")
+                    .default_value("0"),
+            )
+            .arg(
+                Arg::new("gpu-card-path")
+                    .long("gpu-card-path")
+                    .env("GPU_CARD_PATH")
+                    .help("Force a specific GPU by card/render path (e.g. '/dev/dri/card0')")
+                    .required(false)
+                    .conflicts_with_all(["gpu-vendor", "gpu-name", "gpu-index"]),
+            )
+            .arg(
+                Arg::new("video-codec")
+                    .short('c')
+                    .long("video-codec")
+                    .env("VIDEO_CODEC")
+                    .help("Preferred video codec ('h264', 'h265', 'av1')")
+                    .default_value("h264"),
+            )
+            .arg(
+                Arg::new("video-encoder")
+                    .long("video-encoder")
+                    .env("VIDEO_ENCODER")
+                    .help("Override video encoder (e.g. 'vah264enc')")
+            )
+            .arg(
+                Arg::new("video-rate-control")
+                    .long("video-rate-control")
+                    .env("VIDEO_RATE_CONTROL")
+                    .help("Rate control method ('cqp', 'vbr', 'cbr')")
+                    .default_value("vbr"),
+            )
+            .arg(
+                Arg::new("video-cqp")
+                    .long("video-cqp")
+                    .env("VIDEO_CQP")
+                    .help("Constant Quantization Parameter (CQP) quality")
+                    .default_value("26"),
+            )
+            .arg(
+                Arg::new("video-bitrate")
+                    .long("video-bitrate")
+                    .env("VIDEO_BITRATE")
+                    .help("Target bitrate in kbps")
+                    .default_value("6000"),
+            )
+            .arg(
+                Arg::new("video-bitrate-max")
+                    .long("video-bitrate-max")
+                    .env("VIDEO_BITRATE_MAX")
+                    .help("Maximum bitrate in kbps")
+                    .default_value("8000"),
+            )
+            .arg(
+                Arg::new("video-encoder-type")
+                    .long("video-encoder-type")
+                    .env("VIDEO_ENCODER_TYPE")
+                    .help("Encoder type ('hardware', 'software')")
+                    .default_value("hardware"),
+            )
+            .arg(
+                Arg::new("audio-capture-method")
+                    .long("audio-capture-method")
+                    .env("AUDIO_CAPTURE_METHOD")
+                    .help("Audio capture method ('pipewire', 'pulseaudio', 'alsa')")
+                    .default_value("pulseaudio"),
+            )
+            .arg(
+                Arg::new("audio-codec")
+                    .long("audio-codec")
+                    .env("AUDIO_CODEC")
+                    .help("Preferred audio codec ('opus', 'aac')")
+                    .default_value("opus"),
+            )
+            .arg(
+                Arg::new("audio-encoder")
+                    .long("audio-encoder")
+                    .env("AUDIO_ENCODER")
+                    .help("Override audio encoder (e.g. 'opusenc')")
+            )
+            .arg(
+                Arg::new("audio-rate-control")
+                    .long("audio-rate-control")
+                    .env("AUDIO_RATE_CONTROL")
+                    .help("Rate control method ('cqp', 'vbr', 'cbr')")
+                    .default_value("vbr"),
+            )
+            .arg(
+                Arg::new("audio-bitrate")
+                    .long("audio-bitrate")
+                    .env("AUDIO_BITRATE")
+                    .help("Target bitrate in kbps")
+                    .default_value("128"),
+            )
+            .arg(
+                Arg::new("audio-bitrate-max")
+                    .long("audio-bitrate-max")
+                    .env("AUDIO_BITRATE_MAX")
+                    .help("Maximum bitrate in kbps")
+                    .default_value("192"),
+            )
+            .get_matches();
+
+        Self {
+            app: app_args::AppArgs::from_matches(&matches),
+            device: device_args::DeviceArgs::from_matches(&matches),
+            encoding: encoding_args::EncodingArgs::from_matches(&matches),
+        }
+    }
+
+    pub fn debug_print(&self) {
+        self.app.debug_print();
+        self.device.debug_print();
+        self.encoding.debug_print();
+    }
+}
diff --git a/packages/server/src/args/app_args.rs b/packages/server/src/args/app_args.rs
new file mode 100644
index 00000000..479d537b
--- /dev/null
+++ b/packages/server/src/args/app_args.rs
@@ -0,0 +1,59 @@
+pub struct AppArgs {
+    /// Verbose output mode
+    pub verbose: bool,
+    /// Debug the pipeline by showing a window on host
+    pub debug_feed: bool,
+    /// Debug the latency by showing time in stream
+    pub debug_latency: bool,
+
+    /// Virtual display resolution
+    pub resolution: (u32, u32),
+    /// Virtual display framerate
+    pub framerate: u32,
+
+    /// Nestri relay url
+    pub relay_url: String,
+    /// Nestri room name/identifier
+    pub room: String,
+}
+impl AppArgs {
+    pub fn from_matches(matches: &clap::ArgMatches) -> Self {
+        Self {
+            verbose: matches.get_one::<String>("verbose").unwrap() == "true"
+                || matches.get_one::<String>("verbose").unwrap() == "1",
+            debug_feed: matches.get_one::<String>("debug-feed").unwrap() == "true"
+                || matches.get_one::<String>("debug-feed").unwrap() == "1",
+            debug_latency: matches.get_one::<String>("debug-latency").unwrap() == "true"
+                || matches.get_one::<String>("debug-latency").unwrap() == "1",
+            resolution: {
+                let res = matches.get_one::<String>("resolution").unwrap().clone();
+                let parts: Vec<&str> = res.split('x').collect();
+                (
+                    parts[0].parse::<u32>().unwrap(),
+                    parts[1].parse::<u32>().unwrap(),
+                )
+            },
+            framerate: matches
+                .get_one::<String>("framerate")
+                .unwrap()
+                .parse::<u32>()
+                .unwrap(),
+            relay_url: matches.get_one::<String>("relay-url").unwrap().clone(),
+            // Generate random room name if not provided
+            room: matches.get_one::<String>("room")
+                .unwrap_or(&rand::random::<u32>().to_string())
+                .clone(),
+        }
+    }
+
+    pub fn debug_print(&self) {
+        println!("AppArgs:");
+        println!("> verbose: {}", self.verbose);
+        println!("> debug_feed: {}", self.debug_feed);
+        println!("> debug_latency: {}", self.debug_latency);
+        println!("> resolution: {}x{}", self.resolution.0, self.resolution.1);
+        println!("> framerate: {}", self.framerate);
+        println!("> relay_url: {}", self.relay_url);
+        println!("> room: {}", self.room);
+    }
+}
diff --git a/packages/server/src/args/device_args.rs b/packages/server/src/args/device_args.rs
new file mode 100644
index 00000000..2a55d8ad
--- /dev/null
+++ b/packages/server/src/args/device_args.rs
@@ -0,0 +1,41 @@
+pub struct DeviceArgs {
+    /// GPU vendor (e.g. "intel")
+    pub gpu_vendor: String,
+    /// GPU name (e.g. "a770")
+    pub gpu_name: String,
+    /// GPU index, if multiple same GPUs are present
+    pub gpu_index: u32,
+    /// GPU card/render path, sets card explicitly from such path
+    pub gpu_card_path: String,
+}
+impl DeviceArgs {
+    pub fn from_matches(matches: &clap::ArgMatches) -> Self {
+        Self {
+            gpu_vendor: matches
+                .get_one::<String>("gpu-vendor")
+                .unwrap_or(&"".to_string())
+                .clone(),
+            gpu_name: matches
+                .get_one::<String>("gpu-name")
+                .unwrap_or(&"".to_string())
+                .clone(),
+            gpu_index: matches
+                .get_one::<String>("gpu-index")
+                .unwrap()
+                .parse::<u32>()
+                .unwrap(),
+            gpu_card_path: matches
+                .get_one::<String>("gpu-card-path")
+                .unwrap_or(&"".to_string())
+                .clone(),
+        }
+    }
+
+    pub fn debug_print(&self) {
+        println!("DeviceArgs:");
+        println!("> gpu_vendor: {}", self.gpu_vendor);
+        println!("> gpu_name: {}", self.gpu_name);
+        println!("> gpu_index: {}", self.gpu_index);
+        println!("> gpu_card_path: {}", self.gpu_card_path);
+    }
+}
\ No newline at end of file
diff --git a/packages/server/src/args/encoding_args.rs b/packages/server/src/args/encoding_args.rs
new file mode 100644
index 00000000..ae891a2a
--- /dev/null
+++ b/packages/server/src/args/encoding_args.rs
@@ -0,0 +1,190 @@
+use std::ops::Deref;
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct RateControlCQP {
+    /// Constant Quantization Parameter (CQP) quality level
+    pub quality: u32,
+}
+#[derive(Debug, PartialEq, Eq)]
+pub struct RateControlVBR {
+    /// Target bitrate in kbps
+    pub target_bitrate: i32,
+    /// Maximum bitrate in kbps
+    pub max_bitrate: i32,
+}
+#[derive(Debug, PartialEq, Eq)]
+pub struct RateControlCBR {
+    /// Target bitrate in kbps
+    pub target_bitrate: i32,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum RateControl {
+    /// Constant Quantization Parameter
+    CQP(RateControlCQP),
+    /// Variable Bitrate
+    VBR(RateControlVBR),
+    /// Constant Bitrate
+    CBR(RateControlCBR),
+}
+
+pub struct EncodingOptionsBase {
+    /// Codec (e.g. "h264", "opus" etc.)
+    pub codec: String,
+    /// Overridable encoder (e.g. "vah264lpenc", "opusenc" etc.)
+    pub encoder: String,
+    /// Rate control method (e.g. "cqp", "vbr", "cbr")
+    pub rate_control: RateControl,
+}
+impl EncodingOptionsBase {
+    pub fn debug_print(&self) {
+        println!("> Codec: {}", self.codec);
+        println!("> Encoder: {}", self.encoder);
+        match &self.rate_control {
+            RateControl::CQP(cqp) => {
+                println!("> Rate Control: CQP");
+                println!("-> Quality: {}", cqp.quality);
+            }
+            RateControl::VBR(vbr) => {
+                println!("> Rate Control: VBR");
+                println!("-> Target Bitrate: {}", vbr.target_bitrate);
+                println!("-> Max Bitrate: {}", vbr.max_bitrate);
+            }
+            RateControl::CBR(cbr) => {
+                println!("> Rate Control: CBR");
+                println!("-> Target Bitrate: {}", cbr.target_bitrate);
+            }
+        }
+    }
+}
+
+pub struct VideoEncodingOptions {
+    pub base: EncodingOptionsBase,
+    /// Encoder type (e.g. "hardware", "software")
+    pub encoder_type: String,
+}
+impl VideoEncodingOptions {
+    pub fn from_matches(matches: &clap::ArgMatches) -> Self {
+        Self {
+            base: EncodingOptionsBase {
+                codec: matches.get_one::<String>("video-codec").unwrap().clone(),
+                encoder: matches
+                    .get_one::<String>("video-encoder")
+                    .unwrap_or(&"".to_string())
+                    .clone(),
+                rate_control: match matches.get_one::<String>("video-rate-control").unwrap().as_str() {
+                    "cqp" => RateControl::CQP(RateControlCQP {
+                        quality: matches.get_one::<String>("video-cqp").unwrap().parse::<u32>().unwrap(),
+                    }),
+                    "cbr" => RateControl::CBR(RateControlCBR {
+                        target_bitrate: matches.get_one::<String>("video-bitrate").unwrap().parse::<i32>().unwrap(),
+                    }),
+                    "vbr" => RateControl::VBR(RateControlVBR {
+                        target_bitrate: matches.get_one::<String>("video-bitrate").unwrap().parse::<i32>().unwrap(),
+                        max_bitrate: matches.get_one::<String>("video-bitrate-max").unwrap().parse::<i32>().unwrap(),
+                    }),
+                    _ => panic!("Invalid rate control method for video"),
+                },
+            },
+            encoder_type: matches.get_one::<String>("video-encoder-type").unwrap_or(&"hardware".to_string()).clone(),
+        }
+    }
+
+    pub fn debug_print(&self) {
+        println!("Video Encoding Options:");
+        self.base.debug_print();
+        println!("> Encoder Type: {}", self.encoder_type);
+    }
+}
+impl Deref for VideoEncodingOptions {
+    type Target = EncodingOptionsBase;
+
+    fn deref(&self) -> &Self::Target {
+        &self.base
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum AudioCaptureMethod {
+    PulseAudio,
+    PipeWire,
+    ALSA,
+}
+impl AudioCaptureMethod {
+    pub fn as_str(&self) -> &str {
+        match self {
+            AudioCaptureMethod::PulseAudio => "pulseaudio",
+            AudioCaptureMethod::PipeWire => "pipewire",
+            AudioCaptureMethod::ALSA => "alsa",
+        }
+    }
+}
+
+pub struct AudioEncodingOptions {
+    pub base: EncodingOptionsBase,
+    pub capture_method: AudioCaptureMethod,
+}
+impl AudioEncodingOptions {
+    pub fn from_matches(matches: &clap::ArgMatches) -> Self {
+        Self {
+            base: EncodingOptionsBase {
+                codec: matches.get_one::<String>("audio-codec").unwrap().clone(),
+                encoder: matches
+                    .get_one::<String>("audio-encoder")
+                    .unwrap_or(&"".to_string())
+                    .clone(),
+                rate_control: match matches.get_one::<String>("audio-rate-control").unwrap().as_str() {
+                    "cbr" => RateControl::CBR(RateControlCBR {
+                        target_bitrate: matches.get_one::<String>("audio-bitrate").unwrap().parse::<i32>().unwrap(),
+                    }),
+                    "vbr" => RateControl::VBR(RateControlVBR {
+                        target_bitrate: matches.get_one::<String>("audio-bitrate").unwrap().parse::<i32>().unwrap(),
+                        max_bitrate: matches.get_one::<String>("audio-bitrate-max").unwrap().parse::<i32>().unwrap(),
+                    }),
+                    _ => panic!("Invalid rate control method for audio"),
+                },
+            },
+            capture_method: match matches.get_one::<String>("audio-capture-method").unwrap().as_str() {
+                "pulseaudio" => AudioCaptureMethod::PulseAudio,
+                "pipewire" => AudioCaptureMethod::PipeWire,
+                "alsa" => AudioCaptureMethod::ALSA,
+                // Default to PulseAudio
+                _ => AudioCaptureMethod::PulseAudio,
+            },
+        }
+    }
+
+    pub fn debug_print(&self) {
+        println!("Audio Encoding Options:");
+        self.base.debug_print();
+        println!("> Capture Method: {}", self.capture_method.as_str());
+    }
+}
+impl Deref for AudioEncodingOptions {
+    type Target = EncodingOptionsBase;
+
+    fn deref(&self) -> &Self::Target {
+        &self.base
+    }
+}
+
+pub struct EncodingArgs {
+    /// Video encoder options
+    pub video: VideoEncodingOptions,
+    /// Audio encoder options
+    pub audio: AudioEncodingOptions,
+}
+impl EncodingArgs {
+    pub fn from_matches(matches: &clap::ArgMatches) -> Self {
+        Self {
+            video: VideoEncodingOptions::from_matches(matches),
+            audio: AudioEncodingOptions::from_matches(matches),
+        }
+    }
+
+    pub fn debug_print(&self) {
+        println!("Encoding Arguments:");
+        self.video.debug_print();
+        self.audio.debug_print();
+    }
+}
diff --git a/packages/server/src/enc_helper.rs b/packages/server/src/enc_helper.rs
new file mode 100644
index 00000000..8f3dfd4a
--- /dev/null
+++ b/packages/server/src/enc_helper.rs
@@ -0,0 +1,598 @@
+use gst::prelude::*;
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum VideoCodec {
+    H264,
+    H265,
+    AV1,
+    UNKNOWN,
+}
+impl VideoCodec {
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            VideoCodec::H264 => "H.264",
+            VideoCodec::H265 => "H.265",
+            VideoCodec::AV1 => "AV1",
+            VideoCodec::UNKNOWN => "Unknown",
+        }
+    }
+
+    // unlike to_str, converts to gstreamer friendly codec name
+    pub fn to_gst_str(&self) -> &'static str {
+        match self {
+            VideoCodec::H264 => "h264",
+            VideoCodec::H265 => "h265",
+            VideoCodec::AV1 => "av1",
+            VideoCodec::UNKNOWN => "unknown",
+        }
+    }
+
+    // returns mime-type string
+    pub fn to_mime_str(&self) -> &'static str {
+        match self {
+            VideoCodec::H264 => "video/H264",
+            VideoCodec::H265 => "video/H265",
+            VideoCodec::AV1 => "video/AV1",
+            VideoCodec::UNKNOWN => "unknown",
+        }
+    }
+
+    pub fn from_str(s: &str) -> Self {
+        match s.to_lowercase().as_str() {
+            "h264" => VideoCodec::H264,
+            "h.264" => VideoCodec::H264,
+            "avc" => VideoCodec::H264,
+            "h265" => VideoCodec::H265,
+            "h.265" => VideoCodec::H265,
+            "hevc" => VideoCodec::H265,
+            "hev1" => VideoCodec::H265,
+            "av1" => VideoCodec::AV1,
+            _ => VideoCodec::UNKNOWN,
+        }
+    }
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum EncoderAPI {
+    QSV,
+    VAAPI,
+    NVENC,
+    AMF,
+    SOFTWARE,
+    UNKNOWN,
+}
+impl EncoderAPI {
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            EncoderAPI::QSV => "Intel QuickSync Video",
+            EncoderAPI::VAAPI => "Video Acceleration API",
+            EncoderAPI::NVENC => "NVIDIA NVENC",
+            EncoderAPI::AMF => "AMD Media Framework",
+            EncoderAPI::SOFTWARE => "Software",
+            EncoderAPI::UNKNOWN => "Unknown",
+        }
+    }
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum EncoderType {
+    SOFTWARE,
+    HARDWARE,
+    UNKNOWN,
+}
+impl EncoderType {
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            EncoderType::SOFTWARE => "Software",
+            EncoderType::HARDWARE => "Hardware",
+            EncoderType::UNKNOWN => "Unknown",
+        }
+    }
+
+    pub fn from_str(s: &str) -> Self {
+        match s.to_lowercase().as_str() {
+            "software" => EncoderType::SOFTWARE,
+            "hardware" => EncoderType::HARDWARE,
+            _ => EncoderType::UNKNOWN,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct VideoEncoderInfo {
+    pub name: String,
+    pub codec: VideoCodec,
+    pub encoder_type: EncoderType,
+    pub encoder_api: EncoderAPI,
+    pub parameters: Vec<(String, String)>,
+}
+
+impl VideoEncoderInfo {
+    pub fn new(
+        name: String,
+        codec: VideoCodec,
+        encoder_type: EncoderType,
+        encoder_api: EncoderAPI,
+    ) -> Self {
+        Self {
+            name,
+            codec,
+            encoder_type,
+            encoder_api,
+            parameters: Vec::new(),
+        }
+    }
+
+    pub fn get_parameters_string(&self) -> String {
+        self.parameters
+            .iter()
+            .map(|(key, value)| format!("{}={}", key, value))
+            .collect::<Vec<String>>()
+            .join(" ")
+    }
+
+    pub fn set_parameter(&mut self, key: &str, value: &str) {
+        self.parameters.push((key.to_string(), value.to_string()));
+    }
+
+    pub fn apply_parameters(&self, element: &gst::Element, verbose: &bool) {
+        for (key, value) in &self.parameters {
+            if element.has_property(key) {
+                // If verbose, log property sets
+                if *verbose {
+                    println!("Setting property {} to {}", key, value);
+                }
+                element.set_property_from_str(key, value);
+            }
+        }
+    }
+}
+
+/// Converts VA-API encoder name to low-power variant.
+/// # Arguments
+/// * `encoder` - The name of the VA-API encoder.
+/// # Returns
+/// * `&str` - The name of the low-power variant of the encoder.
+fn get_low_power_encoder(encoder: &String) -> String {
+    if encoder.starts_with("va") && !encoder.ends_with("enc") && !encoder.ends_with("lpenc") {
+        // Replace "enc" substring at end with "lpenc"
+        let mut encoder = encoder.to_string();
+        encoder.truncate(encoder.len() - 3);
+        encoder.push_str("lpenc");
+        encoder
+    } else {
+        encoder.to_string()
+    }
+}
+
+/// Returns best guess for encoder API based on the encoder name.
+/// # Arguments
+/// * `encoder` - The name of the encoder.
+/// # Returns
+/// * `EncoderAPI` - The best guess for the encoder API.
+fn get_encoder_api(encoder: &String, encoder_type: &EncoderType) -> EncoderAPI {
+    if *encoder_type == EncoderType::HARDWARE {
+        if encoder.starts_with("qsv") {
+            EncoderAPI::QSV
+        } else if encoder.starts_with("va") {
+            EncoderAPI::VAAPI
+        } else if encoder.starts_with("nv") {
+            EncoderAPI::NVENC
+        } else if encoder.starts_with("amf") {
+            EncoderAPI::AMF
+        } else {
+            EncoderAPI::UNKNOWN
+        }
+    } else if *encoder_type == EncoderType::SOFTWARE {
+        EncoderAPI::SOFTWARE
+    } else {
+        EncoderAPI::UNKNOWN
+    }
+}
+
+/// Returns true if system supports given encoder.
+/// # Returns
+/// * `bool` - True if encoder is supported, false otherwise.
+fn is_encoder_supported(encoder: &String) -> bool {
+    gst::ElementFactory::find(encoder.as_str()).is_some()
+}
+
+/// Helper to set CQP value of known encoder
+/// # Arguments
+/// * `encoder` - Information about the encoder.
+/// * `quality` - Constant quantization parameter (CQP) quality, recommended values are between 20-30.
+/// # Returns
+/// * `EncoderInfo` - Encoder with maybe updated parameters.
+pub fn encoder_cqp_params(encoder: &VideoEncoderInfo, quality: u32) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder.clone();
+
+    // Look for known keys by factory creation
+    let encoder = gst::ElementFactory::make(encoder_optz.name.as_str())
+        .build()
+        .unwrap();
+
+    // Get properties of the encoder
+    for prop in encoder.list_properties() {
+        let prop_name = prop.name();
+
+        // Look for known keys
+        if prop_name.to_lowercase().contains("qp")
+            && (prop_name.to_lowercase().contains("i") || prop_name.to_lowercase().contains("min"))
+        {
+            encoder_optz.set_parameter(prop_name, &quality.to_string());
+        } else if prop_name.to_lowercase().contains("qp")
+            && (prop_name.to_lowercase().contains("p") || prop_name.to_lowercase().contains("max"))
+        {
+            encoder_optz.set_parameter(prop_name, &(quality + 2).to_string());
+        }
+    }
+
+    encoder_optz
+}
+
+/// Helper to set VBR values of known encoder
+/// # Arguments
+/// * `encoder` - Information about the encoder.
+/// * `bitrate` - Target bitrate in bits per second.
+/// * `max_bitrate` - Maximum bitrate in bits per second.
+/// # Returns
+/// * `EncoderInfo` - Encoder with maybe updated parameters.
+pub fn encoder_vbr_params(encoder: &VideoEncoderInfo, bitrate: u32, max_bitrate: u32) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder.clone();
+
+    // Look for known keys by factory creation
+    let encoder = gst::ElementFactory::make(encoder_optz.name.as_str())
+        .build()
+        .unwrap();
+
+    // Get properties of the encoder
+    for prop in encoder.list_properties() {
+        let prop_name = prop.name();
+
+        // Look for known keys
+        if prop_name.to_lowercase().contains("bitrate")
+            && !prop_name.to_lowercase().contains("max")
+        {
+            encoder_optz.set_parameter(prop_name, &bitrate.to_string());
+        } else if prop_name.to_lowercase().contains("bitrate")
+            && prop_name.to_lowercase().contains("max")
+        {
+            // If SVT-AV1, don't set max bitrate
+            if encoder_optz.name == "svtav1enc" {
+                continue;
+            }
+            encoder_optz.set_parameter(prop_name, &max_bitrate.to_string());
+        }
+    }
+
+    encoder_optz
+}
+
+/// Helper to set CBR value of known encoder
+/// # Arguments
+/// * `encoder` - Information about the encoder.
+/// * `bitrate` - Target bitrate in bits per second.
+/// # Returns
+/// * `EncoderInfo` - Encoder with maybe updated parameters.
+pub fn encoder_cbr_params(encoder: &VideoEncoderInfo, bitrate: u32) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder.clone();
+
+    // Look for known keys by factory creation
+    let encoder = gst::ElementFactory::make(encoder_optz.name.as_str())
+        .build()
+        .unwrap();
+
+    // Get properties of the encoder
+    for prop in encoder.list_properties() {
+        let prop_name = prop.name();
+
+        // Look for known keys
+        if prop_name.to_lowercase().contains("bitrate")
+            && !prop_name.to_lowercase().contains("max")
+        {
+            encoder_optz.set_parameter(prop_name, &bitrate.to_string());
+        }
+    }
+
+    encoder_optz
+}
+
+/// Helper to set GOP size of known encoder
+/// # Arguments
+/// * `encoder` - Information about the encoder.
+/// * `gop_size` - Group of pictures (GOP) size.
+/// # Returns
+/// * `EncoderInfo` - Encoder with maybe updated parameters.
+pub fn encoder_gop_params(encoder: &VideoEncoderInfo, gop_size: u32) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder.clone();
+
+    // Look for known keys by factory creation
+    let encoder = gst::ElementFactory::make(encoder_optz.name.as_str())
+        .build()
+        .unwrap();
+
+    // Get properties of the encoder
+    for prop in encoder.list_properties() {
+        let prop_name = prop.name();
+
+        // Look for known keys
+        if prop_name.to_lowercase().contains("gop")
+            || prop_name.to_lowercase().contains("int-max")
+            || prop_name.to_lowercase().contains("max-dist")
+            || prop_name.to_lowercase().contains("intra-period-length")
+        {
+            encoder_optz.set_parameter(prop_name, &gop_size.to_string());
+        }
+    }
+
+    encoder_optz
+}
+
+/// Sets parameters of known encoders for low latency operation.
+/// # Arguments
+/// * `encoder` - Information about the encoder.
+/// # Returns
+/// * `EncoderInfo` - Encoder with maybe updated parameters.
+pub fn encoder_low_latency_params(encoder: &VideoEncoderInfo) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder.clone();
+    encoder_optz = encoder_gop_params(&encoder_optz, 30);
+    match encoder_optz.encoder_api {
+        EncoderAPI::QSV => {
+            encoder_optz.set_parameter("low-latency", "true");
+            encoder_optz.set_parameter("target-usage", "7");
+        }
+        EncoderAPI::VAAPI => {
+            encoder_optz.set_parameter("target-usage", "7");
+        }
+        EncoderAPI::NVENC => {
+            match encoder_optz.codec {
+                // nvcudah264enc supports newer presets and tunes
+                VideoCodec::H264 => {
+                    encoder_optz.set_parameter("multi-pass", "disabled");
+                    encoder_optz.set_parameter("preset", "p1");
+                    encoder_optz.set_parameter("tune", "ultra-low-latency");
+                }
+                // same goes for nvcudah265enc
+                VideoCodec::H265 => {
+                    encoder_optz.set_parameter("multi-pass", "disabled");
+                    encoder_optz.set_parameter("preset", "p1");
+                    encoder_optz.set_parameter("tune", "ultra-low-latency");
+                }
+                // nvav1enc only supports older presets
+                VideoCodec::AV1 => {
+                    encoder_optz.set_parameter("preset", "low-latency-hp");
+                }
+                _ => {}
+            }
+        }
+        EncoderAPI::AMF => {
+            encoder_optz.set_parameter("preset", "speed");
+            match encoder_optz.codec {
+                // Only H.264 supports "ultra-low-latency" usage
+                VideoCodec::H264 => {
+                    encoder_optz.set_parameter("usage", "ultra-low-latency");
+                }
+                // Same goes for H.265
+                VideoCodec::H265 => {
+                    encoder_optz.set_parameter("usage", "ultra-low-latency");
+                }
+                VideoCodec::AV1 => {
+                    encoder_optz.set_parameter("usage", "low-latency");
+                }
+                _ => {}
+            }
+        }
+        EncoderAPI::SOFTWARE => {
+            // Check encoder name for software encoders
+            match encoder_optz.name.as_str() {
+                "openh264enc" => {
+                    encoder_optz.set_parameter("complexity", "low");
+                    encoder_optz.set_parameter("usage-type", "screen");
+                }
+                "x264enc" => {
+                    encoder_optz.set_parameter("rc-lookahead", "0");
+                    encoder_optz.set_parameter("speed-preset", "ultrafast");
+                    encoder_optz.set_parameter("tune", "zerolatency");
+                }
+                "svtav1enc" => {
+                    encoder_optz.set_parameter("preset", "12");
+                    // Add ":pred-struct=1" only in CBR mode
+                    let params_string = format!(
+                        "lookahead=0{}",
+                        if encoder_optz.get_parameters_string().contains("cbr") {
+                            ":pred-struct=1"
+                        } else {
+                            ""
+                        }
+                    );
+                    encoder_optz.set_parameter("parameters-string", params_string.as_str());
+                }
+                "av1enc" => {
+                    encoder_optz.set_parameter("usage-profile", "realtime");
+                    encoder_optz.set_parameter("cpu-used", "10");
+                    encoder_optz.set_parameter("lag-in-frames", "0");
+                }
+                _ => {}
+            }
+        }
+        _ => {}
+    }
+
+    encoder_optz
+}
+
+/// Returns all compatible encoders for the system.
+/// # Returns
+/// * `Vec<EncoderInfo>` - List of compatible encoders.
+pub fn get_compatible_encoders() -> Vec<VideoEncoderInfo> {
+    let mut encoders: Vec<VideoEncoderInfo> = Vec::new();
+
+    let registry = gst::Registry::get();
+    let plugins = registry.plugins();
+    for plugin in plugins {
+        let features = registry.features_by_plugin(plugin.plugin_name().as_str());
+        for feature in features {
+            let encoder = feature.name().to_string();
+            let factory = gst::ElementFactory::find(encoder.as_str());
+            if factory.is_some() {
+                let factory = factory.unwrap();
+                // Get klass metadata
+                let klass = factory.metadata("klass");
+                if klass.is_some() {
+                    // Make sure klass contains "Encoder/Video/..."
+                    let klass = klass.unwrap().to_string();
+                    if !klass.to_lowercase().contains("encoder/video") {
+                        continue;
+                    }
+
+                    // If contains "/hardware" in klass, it's a hardware encoder
+                    let encoder_type = if klass.to_lowercase().contains("/hardware") {
+                        EncoderType::HARDWARE
+                    } else {
+                        EncoderType::SOFTWARE
+                    };
+
+                    let api = get_encoder_api(&encoder, &encoder_type);
+                    if is_encoder_supported(&encoder) {
+                        // Match codec by looking for "264" or "av1" in encoder name
+                        let codec = if encoder.contains("264") {
+                            VideoCodec::H264
+                        } else if encoder.contains("265") {
+                            VideoCodec::H265
+                        } else if encoder.contains("av1") {
+                            VideoCodec::AV1
+                        } else {
+                            continue;
+                        };
+                        let encoder_info = VideoEncoderInfo::new(encoder, codec, encoder_type, api);
+                        encoders.push(encoder_info);
+                    } else if api == EncoderAPI::VAAPI {
+                        // Try low-power variant of VA-API encoder
+                        let low_power_encoder = get_low_power_encoder(&encoder);
+                        if is_encoder_supported(&low_power_encoder) {
+                            let codec = if low_power_encoder.contains("264") {
+                                VideoCodec::H264
+                            } else if low_power_encoder.contains("265") {
+                                VideoCodec::H265
+                            } else if low_power_encoder.contains("av1") {
+                                VideoCodec::AV1
+                            } else {
+                                continue;
+                            };
+                            let encoder_info =
+                                VideoEncoderInfo::new(low_power_encoder, codec, encoder_type, api);
+                            encoders.push(encoder_info);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    encoders
+}
+
+/// Helper to return encoder from vector by name (case-insensitive).
+/// # Arguments
+/// * `encoders` - A vector containing information about each encoder.
+/// * `name` - A string slice that holds the encoder name.
+/// # Returns
+/// * `Option<EncoderInfo>` - A reference to an EncoderInfo struct if found.
+pub fn get_encoder_by_name(
+    encoders: &Vec<VideoEncoderInfo>,
+    name: &str,
+) -> Option<VideoEncoderInfo> {
+    let name = name.to_lowercase();
+    encoders
+        .iter()
+        .find(|encoder| encoder.name.to_lowercase() == name)
+        .cloned()
+}
+
+/// Helper to get encoders from vector by video codec.
+/// # Arguments
+/// * `encoders` - A vector containing information about each encoder.
+/// * `codec` - The codec of the encoder.
+/// # Returns
+/// * `Vec<EncoderInfo>` - A vector containing EncoderInfo structs if found.
+pub fn get_encoders_by_videocodec(
+    encoders: &Vec<VideoEncoderInfo>,
+    codec: &VideoCodec,
+) -> Vec<VideoEncoderInfo> {
+    encoders
+        .iter()
+        .filter(|encoder| encoder.codec == *codec)
+        .cloned()
+        .collect()
+}
+
+/// Helper to get encoders from vector by encoder type.
+/// # Arguments
+/// * `encoders` - A vector containing information about each encoder.
+/// * `encoder_type` - The type of the encoder.
+/// # Returns
+/// * `Vec<EncoderInfo>` - A vector containing EncoderInfo structs if found.
+pub fn get_encoders_by_type(
+    encoders: &Vec<VideoEncoderInfo>,
+    encoder_type: &EncoderType,
+) -> Vec<VideoEncoderInfo> {
+    encoders
+        .iter()
+        .filter(|encoder| encoder.encoder_type == *encoder_type)
+        .cloned()
+        .collect()
+}
+
+/// Returns best-case compatible encoder given desired codec and encoder type.
+/// # Arguments
+/// * `encoders` - List of encoders to pick from.
+/// * `codec` - Desired codec.
+/// * `encoder_type` - Desired encoder type.
+/// # Returns
+/// * `Option<EncoderInfo>` - Best-case compatible encoder.
+pub fn get_best_compatible_encoder(
+    encoders: &Vec<VideoEncoderInfo>,
+    codec: VideoCodec,
+    encoder_type: EncoderType,
+) -> Option<VideoEncoderInfo> {
+    let mut best_encoder: Option<VideoEncoderInfo> = None;
+    let mut best_score: i32 = 0;
+
+    // Filter by codec and type first
+    let encoders = get_encoders_by_videocodec(encoders, &codec);
+    let encoders = get_encoders_by_type(&encoders, &encoder_type);
+
+    for encoder in encoders {
+        // Local score
+        let mut score = 0;
+
+        // API score
+        score += match encoder.encoder_api {
+            EncoderAPI::NVENC => 3,
+            EncoderAPI::QSV => 3,
+            EncoderAPI::AMF => 3,
+            EncoderAPI::VAAPI => 2,
+            EncoderAPI::SOFTWARE => 1,
+            EncoderAPI::UNKNOWN => 0,
+        };
+
+        // If software, score also based on name to get most compatible software encoder for low latency
+        if encoder.encoder_type == EncoderType::SOFTWARE {
+            score += match encoder.name.as_str() {
+                "openh264enc" => 2,
+                "x264enc" => 1,
+                "svtav1enc" => 2,
+                "av1enc" => 1,
+                _ => 0,
+            };
+        }
+
+        // Update best encoder based on score
+        if score > best_score {
+            best_encoder = Some(encoder.clone());
+            best_score = score;
+        }
+    }
+
+    best_encoder
+}
diff --git a/packages/server/src/gpu.rs b/packages/server/src/gpu.rs
new file mode 100644
index 00000000..8b33799b
--- /dev/null
+++ b/packages/server/src/gpu.rs
@@ -0,0 +1,233 @@
+use regex::Regex;
+use std::fs;
+use std::path::Path;
+use std::process::Command;
+use std::str;
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum GPUVendor {
+    UNKNOWN,
+    INTEL,
+    NVIDIA,
+    AMD,
+}
+
+#[derive(Debug, Clone)]
+pub struct GPUInfo {
+    vendor: GPUVendor,
+    card_path: String,
+    render_path: String,
+    device_name: String,
+}
+
+impl GPUInfo {
+    pub fn vendor(&self) -> &GPUVendor {
+        &self.vendor
+    }
+
+    pub fn vendor_string(&self) -> &str {
+        match self.vendor {
+            GPUVendor::INTEL => "Intel",
+            GPUVendor::NVIDIA => "NVIDIA",
+            GPUVendor::AMD => "AMD",
+            GPUVendor::UNKNOWN => "Unknown",
+        }
+    }
+
+    pub fn card_path(&self) -> &str {
+        &self.card_path
+    }
+
+    pub fn render_path(&self) -> &str {
+        &self.render_path
+    }
+
+    pub fn device_name(&self) -> &str {
+        &self.device_name
+    }
+}
+
+fn get_gpu_vendor(vendor_id: &str) -> GPUVendor {
+    match vendor_id {
+        "8086" => GPUVendor::INTEL,  // Intel
+        "10de" => GPUVendor::NVIDIA, // NVIDIA
+        "1002" => GPUVendor::AMD,    // AMD/ATI
+        _ => GPUVendor::UNKNOWN,
+    }
+}
+
+/// Retrieves a list of GPUs available on the system.
+/// # Returns
+/// * `Vec<GPUInfo>` - A vector containing information about each GPU.
+pub fn get_gpus() -> Vec<GPUInfo> {
+    let mut gpus = Vec::new();
+
+    // Run lspci to get PCI devices related to GPUs
+    let lspci_output = Command::new("lspci")
+        .arg("-mmnn") // Get machine-readable output with IDs
+        .output()
+        .expect("Failed to execute lspci");
+
+    let output = str::from_utf8(&lspci_output.stdout).unwrap();
+
+    // Filter lines that mention VGA or 3D controller
+    for line in output.lines() {
+        if line.to_lowercase().contains("vga compatible controller")
+            || line.to_lowercase().contains("3d controller")
+            || line.to_lowercase().contains("display controller")
+        {
+            if let Some((pci_addr, vendor_id, device_name)) = parse_pci_device(line) {
+                // Run udevadm to get the device path
+                if let Some((card_path, render_path)) = get_dri_device_path(&pci_addr) {
+                    let vendor = get_gpu_vendor(&vendor_id);
+                    gpus.push(GPUInfo {
+                        vendor,
+                        card_path,
+                        render_path,
+                        device_name,
+                    });
+                }
+            }
+        }
+    }
+
+    gpus
+}
+
+/// Parses a line from the lspci output to extract PCI device information.
+/// # Arguments
+/// * `line` - A string slice that holds a line from the 'lspci -mmnn' output.
+/// # Returns
+/// * `Option<(String, String, String)>` - A tuple containing the PCI address, vendor ID, and device name if parsing is successful.
+fn parse_pci_device(line: &str) -> Option<(String, String, String)> {
+    // Define a regex pattern to match PCI device lines
+    let re = Regex::new(r#"(?P<pci_addr>[0-9a-fA-F]{1,2}:[0-9a-fA-F]{2}\.[0-9]) "[^"]+" "(?P<vendor_name>[^"]+)" "(?P<device_name>[^"]+)"#).unwrap();
+
+    // Collect all matched groups
+    let parts: Vec<(String, String, String)> = re
+        .captures_iter(line)
+        .filter_map(|cap| {
+            Some((
+                cap["pci_addr"].to_string(),
+                cap["vendor_name"].to_string(),
+                cap["device_name"].to_string(),
+            ))
+        })
+        .collect();
+
+    if let Some((pci_addr, vendor_name, device_name)) = parts.first() {
+        // Create a mutable copy of the device name to modify
+        let mut device_name = device_name.clone();
+
+        // If more than 1 square-bracketed item is found, remove last one, otherwise remove all
+        if let Some(start) = device_name.rfind('[') {
+            if let Some(_) = device_name.rfind(']') {
+                device_name = device_name[..start].trim().to_string();
+            }
+        }
+
+        // Extract vendor ID from vendor name (e.g., "Intel Corporation [8086]" or "Advanced Micro Devices, Inc. [AMD/ATI] [1002]")
+        let vendor_id = vendor_name
+            .split_whitespace()
+            .last()
+            .unwrap_or_default()
+            .trim_matches(|c: char| !c.is_ascii_hexdigit())
+            .to_string();
+
+        return Some((pci_addr.clone(), vendor_id, device_name));
+    }
+
+    None
+}
+
+/// Retrieves the DRI device paths for a given PCI address.
+/// Doubles as a way to verify the device is a GPU.
+/// # Arguments
+/// * `pci_addr` - A string slice that holds the PCI address.
+/// # Returns
+/// * `Option<(String, String)>` - A tuple containing the card path and render path if found.
+fn get_dri_device_path(pci_addr: &str) -> Option<(String, String)> {
+    // Construct the base directory in /sys/bus/pci/devices to start the search
+    let base_dir = Path::new("/sys/bus/pci/devices");
+
+    // Define the target PCI address with "0000:" prefix
+    let target_addr = format!("0000:{}", pci_addr);
+
+    // Search for a matching directory that contains the target PCI address
+    for entry in fs::read_dir(base_dir).ok()?.flatten() {
+        let path = entry.path();
+
+        // Check if the path matches the target PCI address
+        if path.to_string_lossy().contains(&target_addr) {
+            // Look for any files under the 'drm' subdirectory, like 'card0' or 'renderD128'
+            let drm_path = path.join("drm");
+            if drm_path.exists() {
+                let mut card_path = String::new();
+                let mut render_path = String::new();
+                for drm_entry in fs::read_dir(drm_path).ok()?.flatten() {
+                    let file_name = drm_entry.file_name();
+                    if let Some(name) = file_name.to_str() {
+                        if name.starts_with("card") {
+                            card_path = format!("/dev/dri/{}", name);
+                        }
+                        if name.starts_with("renderD") {
+                            render_path = format!("/dev/dri/{}", name);
+                        }
+                        // If both paths are found, break the loop
+                        if !card_path.is_empty() && !render_path.is_empty() {
+                            break;
+                        }
+                    }
+                }
+                return Some((card_path, render_path));
+            }
+        }
+    }
+
+    None
+}
+
+/// Helper method to get GPUs from vector by vendor name (case-insensitive).
+/// # Arguments
+/// * `gpus` - A vector containing information about each GPU.
+/// * `vendor` - A string slice that holds the vendor name.
+/// # Returns
+/// * `Vec<GPUInfo>` - A vector containing GPUInfo structs if found.
+pub fn get_gpus_by_vendor(gpus: &Vec<GPUInfo>, vendor: &str) -> Vec<GPUInfo> {
+    let vendor = vendor.to_lowercase();
+    gpus.iter()
+        .filter(|gpu| gpu.vendor_string().to_lowercase().contains(&vendor))
+        .cloned()
+        .collect()
+}
+
+/// Helper method to get GPUs from vector by device name substring (case-insensitive).
+/// # Arguments
+/// * `gpus` - A vector containing information about each GPU.
+/// * `device_name` - A string slice that holds the device name substring.
+/// # Returns
+/// * `Vec<GPUInfo>` - A vector containing GPUInfo structs if found.
+pub fn get_gpus_by_device_name(gpus: &Vec<GPUInfo>, device_name: &str) -> Vec<GPUInfo> {
+    let device_name = device_name.to_lowercase();
+    gpus.iter()
+        .filter(|gpu| gpu.device_name.to_lowercase().contains(&device_name))
+        .cloned()
+        .collect()
+}
+
+/// Helper method to get a GPU from vector of GPUInfo by card path (either /dev/dri/cardX or /dev/dri/renderDX, case-insensitive).
+/// # Arguments
+/// * `gpus` - A vector containing information about each GPU.
+/// * `card_path` - A string slice that holds the card path.
+/// # Returns
+/// * `Option<GPUInfo>` - A reference to a GPUInfo struct if found.
+pub fn get_gpu_by_card_path(gpus: &Vec<GPUInfo>, card_path: &str) -> Option<GPUInfo> {
+    for gpu in gpus {
+        if gpu.card_path().to_lowercase() == card_path.to_lowercase()
+            || gpu.render_path().to_lowercase() == card_path.to_lowercase()
+        {
+            return Some(gpu.clone());
+        }
+    }
+    None
+}
diff --git a/packages/server/src/latency.rs b/packages/server/src/latency.rs
new file mode 100644
index 00000000..659c35d0
--- /dev/null
+++ b/packages/server/src/latency.rs
@@ -0,0 +1,60 @@
+use std::collections::HashMap;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct TimestampEntry {
+    pub stage: String,
+    pub time: String, // ISO 8601 timestamp
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct LatencyTracker {
+    pub sequence_id: String,
+    pub timestamps: Vec<TimestampEntry>,
+    pub metadata: Option<HashMap<String, String>>, // Optional metadata
+}
+
+impl LatencyTracker {
+    // Creates a new LatencyTracker
+    pub fn new(sequence_id: String) -> Self {
+        Self {
+            sequence_id,
+            timestamps: Vec::new(),
+            metadata: None,
+        }
+    }
+
+    // Returns the sequence ID
+    pub fn sequence_id(&self) -> &str {
+        &self.sequence_id
+    }
+
+    // Adds a timestamp for a specific stage
+    pub fn add_timestamp(&mut self, stage: &str) {
+        // Ensure extremely precise UTC format (YYYY-MM-DDTHH:MM:SS.658548387Z)
+        let now = chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Nanos, true);
+        self.timestamps.push(TimestampEntry {
+            stage: stage.to_string(),
+            time: now,
+        });
+    }
+
+    // Calculate total latency (first to last timestamp)
+    pub fn total_latency(&self) -> Option<i64> {
+        if self.timestamps.len() < 2 {
+            return None;
+        }
+        let parsed_times: Result<Vec<_>, _> = self
+            .timestamps
+            .iter()
+            .map(|entry| chrono::DateTime::parse_from_rfc3339(&entry.time))
+            .collect();
+        if let Ok(parsed_times) = parsed_times {
+            let min_time = parsed_times.iter().min().unwrap();
+            let max_time = parsed_times.iter().max().unwrap();
+            Some((*max_time - *min_time).num_milliseconds())
+        } else {
+            None
+        }
+    }
+}
diff --git a/packages/server/src/main.rs b/packages/server/src/main.rs
new file mode 100644
index 00000000..9e856589
--- /dev/null
+++ b/packages/server/src/main.rs
@@ -0,0 +1,526 @@
+mod args;
+mod enc_helper;
+mod gpu;
+mod room;
+mod websocket;
+mod latency;
+mod messages;
+
+use crate::args::encoding_args;
+use gst::prelude::*;
+use gst_app::AppSink;
+use std::error::Error;
+use std::str::FromStr;
+use std::sync::Arc;
+use futures_util::StreamExt;
+use gst_app::app_sink::AppSinkStream;
+use tokio::sync::{Mutex};
+use crate::websocket::{NestriWebSocket};
+
+// Handles gathering GPU information and selecting the most suitable GPU
+fn handle_gpus(args: &args::Args) -> Option<gpu::GPUInfo> {
+    println!("Gathering GPU information..");
+    let gpus = gpu::get_gpus();
+    if gpus.is_empty() {
+        println!("No GPUs found");
+        return None;
+    }
+    for gpu in &gpus {
+        println!(
+            "> [GPU] Vendor: '{}', Card Path: '{}', Render Path: '{}', Device Name: '{}'",
+            gpu.vendor_string(),
+            gpu.card_path(),
+            gpu.render_path(),
+            gpu.device_name()
+        );
+    }
+
+    // Based on available arguments, pick a GPU
+    let gpu;
+    if !args.device.gpu_card_path.is_empty() {
+        gpu = gpu::get_gpu_by_card_path(&gpus, &args.device.gpu_card_path);
+    } else {
+        // Run all filters that are not empty
+        let mut filtered_gpus = gpus.clone();
+        if !args.device.gpu_vendor.is_empty() {
+            filtered_gpus = gpu::get_gpus_by_vendor(&filtered_gpus, &args.device.gpu_vendor);
+        }
+        if !args.device.gpu_name.is_empty() {
+            filtered_gpus = gpu::get_gpus_by_device_name(&filtered_gpus, &args.device.gpu_name);
+        }
+        if args.device.gpu_index != 0 {
+            // get single GPU by index
+            gpu = filtered_gpus.get(args.device.gpu_index as usize).cloned();
+        } else {
+            // get first GPU
+            gpu = filtered_gpus.get(0).cloned();
+        }
+    }
+    if gpu.is_none() {
+        println!("No GPU found with the specified parameters: vendor='{}', name='{}', index='{}', card_path='{}'",
+                 args.device.gpu_vendor, args.device.gpu_name, args.device.gpu_index, args.device.gpu_card_path);
+        return None;
+    }
+    let gpu = gpu.unwrap();
+    println!("Selected GPU: '{}'", gpu.device_name());
+    Some(gpu)
+}
+
+// Handles picking video encoder
+fn handle_encoder_video(args: &args::Args) -> Option<enc_helper::VideoEncoderInfo> {
+    println!("Getting compatible video encoders..");
+    let video_encoders = enc_helper::get_compatible_encoders();
+    if video_encoders.is_empty() {
+        println!("No compatible video encoders found");
+        return None;
+    }
+    for encoder in &video_encoders {
+        println!(
+            "> [Video Encoder] Name: '{}', Codec: '{}', API: '{}', Type: '{}'",
+            encoder.name,
+            encoder.codec.to_str(),
+            encoder.encoder_api.to_str(),
+            encoder.encoder_type.to_str()
+        );
+    }
+    // Pick most suitable video encoder based on given arguments
+    let video_encoder;
+    if !args.encoding.video.encoder.is_empty() {
+        video_encoder =
+            enc_helper::get_encoder_by_name(&video_encoders, &args.encoding.video.encoder);
+    } else {
+        video_encoder = enc_helper::get_best_compatible_encoder(
+            &video_encoders,
+            enc_helper::VideoCodec::from_str(&args.encoding.video.codec),
+            enc_helper::EncoderType::from_str(&args.encoding.video.encoder_type),
+        );
+    }
+    if video_encoder.is_none() {
+        println!("No video encoder found with the specified parameters: name='{}', vcodec='{}', type='{}'",
+                 args.encoding.video.encoder, args.encoding.video.codec, args.encoding.video.encoder_type);
+        return None;
+    }
+    let video_encoder = video_encoder.unwrap();
+    println!("Selected video encoder: '{}'", video_encoder.name);
+    Some(video_encoder)
+}
+
+// Handles picking preferred settings for video encoder
+fn handle_encoder_video_settings(
+    args: &args::Args,
+    video_encoder: &enc_helper::VideoEncoderInfo,
+) -> enc_helper::VideoEncoderInfo {
+    let mut optimized_encoder = enc_helper::encoder_low_latency_params(&video_encoder);
+    // Handle rate-control method
+    match &args.encoding.video.rate_control {
+        encoding_args::RateControl::CQP(cqp) => {
+            optimized_encoder = enc_helper::encoder_cqp_params(&optimized_encoder, cqp.quality);
+        }
+        encoding_args::RateControl::VBR(vbr) => {
+            optimized_encoder = enc_helper::encoder_vbr_params(
+                &optimized_encoder,
+                vbr.target_bitrate as u32,
+                vbr.max_bitrate as u32,
+            );
+        }
+        encoding_args::RateControl::CBR(cbr) => {
+            optimized_encoder =
+                enc_helper::encoder_cbr_params(&optimized_encoder, cbr.target_bitrate as u32);
+        }
+    }
+    println!(
+        "Selected video encoder settings: '{}'",
+        optimized_encoder.get_parameters_string()
+    );
+    optimized_encoder
+}
+
+// Handles picking audio encoder
+// TODO: Expand enc_helper with audio types, for now just opus
+fn handle_encoder_audio(args: &args::Args) -> String {
+    let audio_encoder = if args.encoding.audio.encoder.is_empty() {
+        "opusenc".to_string()
+    } else {
+        args.encoding.audio.encoder.clone()
+    };
+    println!("Selected audio encoder: '{}'", audio_encoder);
+    audio_encoder
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    // Parse command line arguments
+    let args = args::Args::new();
+    if args.app.verbose {
+        args.debug_print();
+    }
+
+    rustls::crypto::ring::default_provider()
+        .install_default()
+        .expect("Failed to install ring crypto provider");
+
+    // Begin connection attempt to the relay WebSocket endpoint
+    // replace any http/https with ws/wss
+    let replaced_relay_url
+        = args.app.relay_url.replace("http://", "ws://").replace("https://", "wss://");
+    let ws_url = format!(
+        "{}/api/ws/{}",
+        replaced_relay_url,
+        args.app.room,
+    );
+
+    // Setup our websocket
+    let nestri_ws = Arc::new(NestriWebSocket::new(ws_url).await?);
+    log::set_max_level(log::LevelFilter::Info);
+    log::set_boxed_logger(Box::new(nestri_ws.clone())).unwrap();
+
+    let _ = gst::init();
+
+    // Handle GPU selection
+    let gpu = handle_gpus(&args);
+    if gpu.is_none() {
+        log::error!("Failed to find a suitable GPU. Exiting..");
+        return Err("Failed to find a suitable GPU. Exiting..".into());
+    }
+    let gpu = gpu.unwrap();
+
+    // Handle video encoder selection
+    let video_encoder_info = handle_encoder_video(&args);
+    if video_encoder_info.is_none() {
+        log::error!("Failed to find a suitable video encoder. Exiting..");
+        return Err("Failed to find a suitable video encoder. Exiting..".into());
+    }
+    let mut video_encoder_info = video_encoder_info.unwrap();
+    // Handle video encoder settings
+    video_encoder_info = handle_encoder_video_settings(&args, &video_encoder_info);
+
+    // Handle audio encoder selection
+    let audio_encoder = handle_encoder_audio(&args);
+
+    /*** ROOM SETUP ***/
+    let room = Arc::new(Mutex::new(
+        room::Room::new(nestri_ws.clone()).await?,
+    ));
+
+    /*** PIPELINE CREATION ***/
+    /* Audio */
+    // Audio Source Element
+    let audio_source = match args.encoding.audio.capture_method {
+        encoding_args::AudioCaptureMethod::PulseAudio => {
+            gst::ElementFactory::make("pulsesrc").build()?
+        }
+        encoding_args::AudioCaptureMethod::PipeWire => {
+            gst::ElementFactory::make("pipewiresrc").build()?
+        }
+        _ => gst::ElementFactory::make("alsasrc").build()?,
+    };
+
+    // Audio Converter Element
+    let audio_converter = gst::ElementFactory::make("audioconvert").build()?;
+
+    // Audio Rate Element
+    let audio_rate = gst::ElementFactory::make("audiorate").build()?;
+    
+    // Required to fix gstreamer opus issue, where quality sounds off (due to wrong sample rate)
+    let audio_capsfilter = gst::ElementFactory::make("capsfilter").build()?;
+    let audio_caps = gst::Caps::from_str("audio/x-raw,rate=48000,channels=2").unwrap();
+    audio_capsfilter.set_property("caps", &audio_caps);
+
+    // Audio Encoder Element
+    let audio_encoder = gst::ElementFactory::make(audio_encoder.as_str()).build()?;
+    audio_encoder.set_property(
+        "bitrate",
+        &match &args.encoding.audio.rate_control {
+            encoding_args::RateControl::CBR(cbr) => cbr.target_bitrate * 1000i32,
+            encoding_args::RateControl::VBR(vbr) => vbr.target_bitrate * 1000i32,
+            _ => 128i32,
+        },
+    );
+
+    // Audio RTP Payloader Element
+    let audio_rtp_payloader = gst::ElementFactory::make("rtpopuspay").build()?;
+
+    /* Video */
+    // Video Source Element
+    let video_source = gst::ElementFactory::make("waylanddisplaysrc").build()?;
+    video_source.set_property("render-node", &gpu.render_path());
+
+    // Caps Filter Element (resolution, fps)
+    let caps_filter = gst::ElementFactory::make("capsfilter").build()?;
+    let caps = gst::Caps::from_str(&format!(
+        "video/x-raw,width={},height={},framerate={}/1,format=RGBx",
+        args.app.resolution.0, args.app.resolution.1, args.app.framerate
+    ))?;
+    caps_filter.set_property("caps", &caps);
+
+    // Video Tee Element
+    let video_tee = gst::ElementFactory::make("tee").build()?;
+
+    // Video Converter Element
+    let video_converter = gst::ElementFactory::make("videoconvert").build()?;
+
+    // Video Encoder Element
+    let video_encoder = gst::ElementFactory::make(video_encoder_info.name.as_str()).build()?;
+    video_encoder_info.apply_parameters(&video_encoder, &args.app.verbose);
+
+    // Required for AV1 - av1parse
+    let av1_parse = gst::ElementFactory::make("av1parse").build()?;
+
+    // Video RTP Payloader Element
+    let video_rtp_payloader = gst::ElementFactory::make(
+        format!("rtp{}pay", video_encoder_info.codec.to_gst_str()).as_str(),
+    )
+    .build()?;
+
+    /* Output */
+    // Audio AppSink Element
+    let audio_appsink = gst::ElementFactory::make("appsink").build()?;
+    audio_appsink.set_property("emit-signals", &true);
+    let audio_appsink = audio_appsink.downcast_ref::<AppSink>().unwrap();
+
+    // Video AppSink Element
+    let video_appsink = gst::ElementFactory::make("appsink").build()?;
+    video_appsink.set_property("emit-signals", &true);
+    let video_appsink = video_appsink.downcast_ref::<AppSink>().unwrap();
+
+    /* Debug */
+    // Debug Feed Element
+    let debug_latency = gst::ElementFactory::make("timeoverlay").build()?;
+    debug_latency.set_property_from_str("halignment", &"right");
+    debug_latency.set_property_from_str("valignment", &"bottom");
+
+    // Debug Sink Element
+    let debug_sink = gst::ElementFactory::make("ximagesink").build()?;
+
+    // Debug video converter
+    let debug_video_converter = gst::ElementFactory::make("videoconvert").build()?;
+
+    // Queues with max 2ms latency
+    let debug_queue = gst::ElementFactory::make("queue2").build()?;
+    debug_queue.set_property("max-size-time", &1000000u64);
+    let main_video_queue = gst::ElementFactory::make("queue2").build()?;
+    main_video_queue.set_property("max-size-time", &1000000u64);
+    let main_audio_queue = gst::ElementFactory::make("queue2").build()?;
+    main_audio_queue.set_property("max-size-time", &1000000u64);
+
+    // Create the pipeline
+    let pipeline = gst::Pipeline::new();
+
+    // Add elements to the pipeline
+    pipeline.add_many(&[
+        &video_appsink.upcast_ref(),
+        &video_rtp_payloader,
+        &video_encoder,
+        &video_converter,
+        &video_tee,
+        &caps_filter,
+        &video_source,
+        &audio_appsink.upcast_ref(),
+        &audio_rtp_payloader,
+        &audio_encoder,
+        &audio_capsfilter,
+        &audio_rate,
+        &audio_converter,
+        &audio_source,
+        &main_video_queue,
+        &main_audio_queue,
+    ])?;
+
+    // Add debug elements if debug is enabled
+    if args.app.debug_feed {
+        pipeline.add_many(&[&debug_sink, &debug_queue, &debug_video_converter])?;
+    }
+
+    // Add debug latency element if debug latency is enabled
+    if args.app.debug_latency {
+        pipeline.add(&debug_latency)?;
+    }
+
+    // Add AV1 parse element if AV1 is selected
+    if video_encoder_info.codec == enc_helper::VideoCodec::AV1 {
+        pipeline.add(&av1_parse)?;
+    }
+
+    // Link main audio branch
+    gst::Element::link_many(&[
+        &audio_source,
+        &audio_converter,
+        &audio_rate,
+        &audio_capsfilter,
+        &audio_encoder,
+        &audio_rtp_payloader,
+        &main_audio_queue,
+        &audio_appsink.upcast_ref(),
+    ])?;
+
+    // If debug latency, add time overlay before tee
+    if args.app.debug_latency {
+        gst::Element::link_many(&[&video_source, &caps_filter, &debug_latency, &video_tee])?;
+    } else {
+        gst::Element::link_many(&[&video_source, &caps_filter, &video_tee])?;
+    }
+
+    // Link debug branch if debug is enabled
+    if args.app.debug_feed {
+        gst::Element::link_many(&[
+            &video_tee,
+            &debug_video_converter,
+            &debug_queue,
+            &debug_sink,
+        ])?;
+    }
+
+    // Link main video branch, if AV1, add av1_parse
+    if video_encoder_info.codec == enc_helper::VideoCodec::AV1 {
+        gst::Element::link_many(&[
+            &video_tee,
+            &video_converter,
+            &video_encoder,
+            &av1_parse,
+            &video_rtp_payloader,
+            &main_video_queue,
+            &video_appsink.upcast_ref(),
+        ])?;
+    } else {
+        gst::Element::link_many(&[
+            &video_tee,
+            &video_converter,
+            &video_encoder,
+            &video_rtp_payloader,
+            &main_video_queue,
+            &video_appsink.upcast_ref(),
+        ])?;
+    }
+
+    // Optimize latency of pipeline
+    video_source.set_property("do-timestamp", &true);
+    audio_source.set_property("do-timestamp", &true);
+    pipeline.set_property("latency", &0u64);
+
+    // Wrap the pipeline in Arc<Mutex> to safely share it
+    let pipeline = Arc::new(Mutex::new(pipeline));
+
+    // Run both pipeline and websocket tasks concurrently
+    let result = tokio::try_join!(
+        run_room(
+            room.clone(),
+            "audio/opus",
+            video_encoder_info.codec.to_mime_str(),
+            pipeline.clone(),
+            Arc::new(Mutex::new(audio_appsink.stream())),
+            Arc::new(Mutex::new(video_appsink.stream()))
+        ),
+        run_pipeline(pipeline.clone())
+    );
+
+    match result {
+        Ok(_) => log::info!("All tasks completed successfully"),
+        Err(e) => {
+            log::error!("Error occurred in one of the tasks: {}", e);
+            return Err("Error occurred in one of the tasks".into());
+        }
+    }
+
+    Ok(())
+}
+
+async fn run_room(
+    room: Arc<Mutex<room::Room>>,
+    audio_codec: &str,
+    video_codec: &str,
+    pipeline: Arc<Mutex<gst::Pipeline>>,
+    audio_stream: Arc<Mutex<AppSinkStream>>,
+    video_stream: Arc<Mutex<AppSinkStream>>,
+) -> Result<(), Box<dyn Error>> {
+    // Run loop, with recovery on error
+    loop {
+        let mut room = room.lock().await;
+        tokio::select! {
+            _ = tokio::signal::ctrl_c() => {
+                log::info!("Room interrupted via Ctrl+C");
+                return Ok(());
+            }
+            result = room.run(
+                audio_codec,
+                video_codec,
+                pipeline.clone(),
+                audio_stream.clone(),
+                video_stream.clone(),
+            ) => {
+                if let Err(e) = result {
+                    log::error!("Room error: {}", e);
+                    // Sleep for a while before retrying
+                    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                } else {
+                    return Ok(());
+                }
+            }
+        }
+    }
+}
+
+async fn run_pipeline(
+    pipeline: Arc<Mutex<gst::Pipeline>>,
+) -> Result<(), Box<dyn Error>> {
+    // Take ownership of the bus without holding the lock
+    let bus = {
+        let pipeline = pipeline.lock().await;
+        pipeline.bus().ok_or("Pipeline has no bus")?
+    };
+
+    {
+        // Temporarily lock the pipeline to change state
+        let pipeline = pipeline.lock().await;
+        if let Err(e) = pipeline.set_state(gst::State::Playing) {
+            log::error!("Failed to start pipeline: {}", e);
+            return Err("Failed to start pipeline".into());
+        }
+    }
+
+    // Wait for EOS or error (don't lock the pipeline indefinitely)
+    tokio::select! {
+        _ = tokio::signal::ctrl_c() => {
+            log::info!("Pipeline interrupted via Ctrl+C");
+        }
+        result = listen_for_gst_messages(bus) => {
+            match result {
+                Ok(_) => log::info!("Pipeline finished with EOS"),
+                Err(err) => log::error!("Pipeline error: {}", err),
+            }
+        }
+    }
+
+    {
+        // Temporarily lock the pipeline to reset state
+        let pipeline = pipeline.lock().await;
+        pipeline.set_state(gst::State::Null)?;
+    }
+
+    Ok(())
+}
+
+async fn listen_for_gst_messages(bus: gst::Bus) -> Result<(), Box<dyn Error>> {
+    let bus_stream = bus.stream();
+
+    tokio::pin!(bus_stream);
+
+    while let Some(msg) = bus_stream.next().await {
+        match msg.view() {
+            gst::MessageView::Eos(_) => {
+                log::info!("Received EOS");
+                break;
+            }
+            gst::MessageView::Error(err) => {
+                let err_msg = format!(
+                    "Error from {:?}: {:?}",
+                    err.src().map(|s| s.path_string()),
+                    err.error()
+                );
+                return Err(err_msg.into());
+            }
+            _ => (),
+        }
+    }
+
+    Ok(())
+}
diff --git a/packages/server/src/messages.rs b/packages/server/src/messages.rs
new file mode 100644
index 00000000..0f474537
--- /dev/null
+++ b/packages/server/src/messages.rs
@@ -0,0 +1,144 @@
+use std::error::Error;
+use std::io::{Read, Write};
+use flate2::Compression;
+use flate2::read::GzDecoder;
+use flate2::write::GzEncoder;
+use num_derive::{FromPrimitive, ToPrimitive};
+use num_traits::{FromPrimitive, ToPrimitive};
+use serde::{Deserialize, Serialize};
+use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
+use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
+use crate::latency::LatencyTracker;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageBase {
+    pub payload_type: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageInput {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub data: String,
+    pub latency: Option<LatencyTracker>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageLog {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub level: String,
+    pub message: String,
+    pub time: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageMetrics {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub usage_cpu: f64,
+    pub usage_memory: f64,
+    pub uptime: u64,
+    pub pipeline_latency: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageICE {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub candidate: RTCIceCandidateInit,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageSDP {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub sdp: RTCSessionDescription,
+}
+
+#[repr(i32)]
+#[derive(Debug, FromPrimitive, ToPrimitive, Copy, Clone, Serialize, Deserialize)]
+#[serde(try_from = "i32", into = "i32")]
+pub enum JoinerType {
+    JoinerNode = 0,
+    JoinerClient = 1,
+}
+impl TryFrom<i32> for JoinerType {
+    type Error = &'static str;
+
+    fn try_from(value: i32) -> Result<Self, Self::Error> {
+        JoinerType::from_i32(value).ok_or("Invalid value for JoinerType")
+    }
+}
+impl From<JoinerType> for i32 {
+    fn from(joiner_type: JoinerType) -> Self {
+        joiner_type.to_i32().unwrap()
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageJoin {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub joiner_type: JoinerType,
+}
+
+#[repr(i32)]
+#[derive(Debug, FromPrimitive, ToPrimitive, Copy, Clone, Serialize, Deserialize)]
+#[serde(try_from = "i32", into = "i32")]
+pub enum AnswerType {
+    AnswerOffline = 0,
+    AnswerInUse = 1,
+    AnswerOK = 2,
+}
+impl TryFrom<i32> for AnswerType {
+    type Error = &'static str;
+
+    fn try_from(value: i32) -> Result<Self, Self::Error> {
+        AnswerType::from_i32(value).ok_or("Invalid value for AnswerType")
+    }
+}
+impl From<AnswerType> for i32 {
+    fn from(answer_type: AnswerType) -> Self {
+        answer_type.to_i32().unwrap()
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageAnswer {
+    #[serde(flatten)]
+    pub base: MessageBase,
+    pub answer_type: AnswerType,
+}
+
+pub fn encode_message<T: Serialize>(message: &T) -> Result<Vec<u8>, Box<dyn Error>> {
+    // Serialize the message to JSON
+    let json = serde_json::to_string(message)?;
+
+    // Compress the JSON using gzip
+    let mut encoder = GzEncoder::new(Vec::new(), Compression::default());
+    encoder.write_all(json.as_bytes())?;
+    let compressed_data = encoder.finish()?;
+
+    Ok(compressed_data)
+}
+
+pub fn decode_message(data: &[u8]) -> Result<MessageBase, Box<dyn Error + Send + Sync>> {
+    let mut decoder = GzDecoder::new(data);
+    let mut decompressed_data = String::new();
+    decoder.read_to_string(&mut decompressed_data)?;
+
+    let base_message: MessageBase = serde_json::from_str(&decompressed_data)?;
+    Ok(base_message)
+}
+
+pub fn decode_message_as<T: for<'de> Deserialize<'de>>(
+    data: Vec<u8>,
+) -> Result<T, Box<dyn Error + Send + Sync>> {
+    let mut decoder = GzDecoder::new(data.as_slice());
+    let mut decompressed_data = String::new();
+    decoder.read_to_string(&mut decompressed_data)?;
+
+    let message: T = serde_json::from_str(&decompressed_data)?;
+    Ok(message)
+}
\ No newline at end of file
diff --git a/packages/server/src/room.rs b/packages/server/src/room.rs
new file mode 100644
index 00000000..ae670421
--- /dev/null
+++ b/packages/server/src/room.rs
@@ -0,0 +1,540 @@
+use serde::{Deserialize, Serialize};
+use serde_json::from_str;
+use std::collections::{HashSet};
+use std::error::Error;
+use std::sync::Arc;
+use futures_util::StreamExt;
+use gst::prelude::ElementExtManual;
+use gst_app::app_sink::AppSinkStream;
+use tokio::sync::{oneshot, Mutex};
+use tokio::sync::{mpsc};
+use webrtc::api::interceptor_registry::register_default_interceptors;
+use webrtc::api::media_engine::MediaEngine;
+use webrtc::api::APIBuilder;
+use webrtc::data_channel::data_channel_init::RTCDataChannelInit;
+use webrtc::data_channel::data_channel_message::DataChannelMessage;
+use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
+use webrtc::ice_transport::ice_gathering_state::RTCIceGatheringState;
+use webrtc::ice_transport::ice_server::RTCIceServer;
+use webrtc::interceptor::registry::Registry;
+use webrtc::peer_connection::configuration::RTCConfiguration;
+use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
+use webrtc::rtp_transceiver::rtp_codec::RTCRtpCodecCapability;
+use webrtc::track::track_local::track_local_static_rtp::TrackLocalStaticRTP;
+use webrtc::track::track_local::TrackLocalWriter;
+use crate::messages::*;
+use crate::websocket::NestriWebSocket;
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "type")]
+enum InputMessage {
+    #[serde(rename = "mousemove")]
+    MouseMove { x: i32, y: i32 },
+
+    #[serde(rename = "mousemoveabs")]
+    MouseMoveAbs { x: i32, y: i32 },
+
+    #[serde(rename = "wheel")]
+    Wheel { x: f64, y: f64 },
+
+    #[serde(rename = "mousedown")]
+    MouseDown { key: i32 },
+    // Add other variants as needed
+    #[serde(rename = "mouseup")]
+    MouseUp { key: i32 },
+
+    #[serde(rename = "keydown")]
+    KeyDown { key: i32 },
+
+    #[serde(rename = "keyup")]
+    KeyUp { key: i32 },
+}
+
+pub struct Room {
+    nestri_ws: Arc<NestriWebSocket>,
+    webrtc_api: webrtc::api::API,
+    webrtc_config: RTCConfiguration,
+}
+
+impl Room {
+    pub async fn new(
+        nestri_ws: Arc<NestriWebSocket>,
+    ) -> Result<Room, Box<dyn Error>> {
+        // Create media engine and register default codecs
+        let mut media_engine = MediaEngine::default();
+        media_engine.register_default_codecs()?;
+
+        // Registry
+        let mut registry = Registry::new();
+        registry = register_default_interceptors(registry, &mut media_engine)?;
+
+        // Create the API object with the MediaEngine
+        let api = APIBuilder::new()
+            .with_media_engine(media_engine)
+            .with_interceptor_registry(registry)
+            .build();
+
+        // Prepare the configuration
+        let config = RTCConfiguration {
+            ice_servers: vec![RTCIceServer {
+                urls: vec!["stun:stun.l.google.com:19302".to_owned()],
+                ..Default::default()
+            }],
+            ..Default::default()
+        };
+
+        Ok(Self {
+            nestri_ws,
+            webrtc_api: api,
+            webrtc_config: config,
+        })
+    }
+
+    pub async fn run(
+        &mut self,
+        audio_codec: &str,
+        video_codec: &str,
+        pipeline: Arc<Mutex<gst::Pipeline>>,
+        audio_sink: Arc<Mutex<AppSinkStream>>,
+        video_sink: Arc<Mutex<AppSinkStream>>,
+    ) -> Result<(), Box<dyn Error>> {
+        let (tx, rx) = oneshot::channel();
+        let tx = Arc::new(std::sync::Mutex::new(Some(tx)));
+        self.nestri_ws
+            .register_callback("answer",  {
+                let tx = tx.clone();
+                move |data| {
+                    if let Ok(answer) = decode_message_as::<MessageAnswer>(data) {
+                        log::info!("Received answer: {:?}", answer);
+                        match answer.answer_type {
+                            AnswerType::AnswerOffline => {
+                                log::warn!("Room is offline, we shouldn't be receiving this");
+                            }
+                            AnswerType::AnswerInUse => {
+                                log::error!("Room is in use by another node!");
+                            }
+                            AnswerType::AnswerOK => {
+                                // Notify that we got an OK answer
+                                if let Some(tx) = tx.lock().unwrap().take() {
+                                    if let Err(_) = tx.send(()) {
+                                        log::error!("Failed to send OK answer signal");
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        log::error!("Failed to decode answer");
+                    }
+                }
+            })
+            .await;
+
+        // Send a request to join the room
+        let join_msg = MessageJoin {
+            base: MessageBase {
+                payload_type: "join".to_string(),
+            },
+            joiner_type: JoinerType::JoinerNode,
+        };
+        if let Ok(encoded) = encode_message(&join_msg) {
+            self.nestri_ws.send_message(encoded).await?;
+        } else {
+            log::error!("Failed to encode join message");
+            return Err("Failed to encode join message".into());
+        }
+
+        // Wait for the signal indicating that we have received an OK answer
+        match rx.await {
+            Ok(()) => {
+                log::info!("Received OK answer, proceeding...");
+            }
+            Err(_) => {
+                log::error!("Oneshot channel closed unexpectedly");
+                return Err("Unexpected error while waiting for OK answer".into());
+            }
+        }
+
+        // Create a new RTCPeerConnection
+        let config = self.webrtc_config.clone();
+        let peer_connection = Arc::new(self.webrtc_api.new_peer_connection(config).await?);
+
+        // Create audio track
+        let audio_track = Arc::new(TrackLocalStaticRTP::new(
+            RTCRtpCodecCapability {
+                mime_type: audio_codec.to_owned(),
+                ..Default::default()
+            },
+            "audio".to_owned(),
+            "audio-nestri-server".to_owned(),
+        ));
+
+        // Create video track
+        let video_track = Arc::new(TrackLocalStaticRTP::new(
+            RTCRtpCodecCapability {
+                mime_type: video_codec.to_owned(),
+                ..Default::default()
+            },
+            "video".to_owned(),
+            "video-nestri-server".to_owned(),
+        ));
+
+        // Cancellation token to stop spawned tasks after peer connection is closed
+        let cancel_token = tokio_util::sync::CancellationToken::new();
+
+        // Add audio track to peer connection
+        let audio_sender = peer_connection.add_track(audio_track.clone()).await?;
+        let audio_sender_token = cancel_token.child_token();
+        tokio::spawn(async move {
+            loop {
+                let mut rtcp_buf = vec![0u8; 1500];
+                tokio::select! {
+                    _ = audio_sender_token.cancelled() => {
+                        break;
+                    }
+                    _ = audio_sender.read(&mut rtcp_buf) => {}
+                }
+            }
+        });
+
+        // Add video track to peer connection
+        let video_sender = peer_connection.add_track(video_track.clone()).await?;
+        let video_sender_token = cancel_token.child_token();
+        tokio::spawn(async move {
+            loop {
+                let mut rtcp_buf = vec![0u8; 1500];
+                tokio::select! {
+                    _ = video_sender_token.cancelled() => {
+                        break;
+                    }
+                    _ = video_sender.read(&mut rtcp_buf) => {}
+                }
+            }
+        });
+
+        // Create a datachannel with label 'input'
+        let data_channel_opts = Some(RTCDataChannelInit {
+            ordered: Some(false),
+            max_retransmits: Some(0),
+            ..Default::default()
+        });
+        let data_channel
+            = peer_connection.create_data_channel("input", data_channel_opts).await?;
+
+        // PeerConnection state change tracker
+        let (pc_sndr, mut pc_recv) = mpsc::channel(1);
+
+        // Peer connection state change handler
+        peer_connection.on_peer_connection_state_change(Box::new(
+            move |s: RTCPeerConnectionState| {
+                let pc_sndr = pc_sndr.clone();
+                Box::pin(async move {
+                    log::info!("PeerConnection State has changed: {s}");
+
+                    if s == RTCPeerConnectionState::Failed
+                        || s == RTCPeerConnectionState::Disconnected
+                        || s == RTCPeerConnectionState::Closed
+                    {
+                        // Notify pc_state that the peer connection has closed
+                        if let Err(e) = pc_sndr.send(s).await {
+                            log::error!("Failed to send PeerConnection state: {}", e);
+                        }
+                    }
+                })
+            },
+        ));
+
+        peer_connection.on_ice_gathering_state_change(Box::new(move |s| {
+            Box::pin(async move {
+                log::info!("ICE Gathering State has changed: {s}");
+            })
+        }));
+
+        peer_connection.on_ice_connection_state_change(Box::new(move |s| {
+            Box::pin(async move {
+                log::info!("ICE Connection State has changed: {s}");
+            })
+        }));
+
+        // Trickle ICE over WebSocket
+        let ws = self.nestri_ws.clone();
+        peer_connection.on_ice_candidate(Box::new(move |c| {
+            let nestri_ws = ws.clone();
+            Box::pin(async move {
+                if let Some(candidate) = c {
+                    let candidate_json = candidate.to_json().unwrap();
+                    let ice_msg = MessageICE {
+                        base: MessageBase {
+                            payload_type: "ice".to_string(),
+                        },
+                        candidate: candidate_json,
+                    };
+                    if let Ok(encoded) = encode_message(&ice_msg) {
+                        let _ = nestri_ws.send_message(encoded);
+                    }
+                }
+            })
+        }));
+
+        // Temporary ICE candidate buffer until remote description is set
+        let ice_holder: Arc<Mutex<Vec<RTCIceCandidateInit>>> = Arc::new(Mutex::new(Vec::new()));
+        // Register set_response_callback for ICE candidate
+        let pc = peer_connection.clone();
+        let ice_clone = ice_holder.clone();
+        self.nestri_ws.register_callback("ice", move |data| {
+            match decode_message_as::<MessageICE>(data) {
+                Ok(message) => {
+                    log::info!("Received ICE message");
+                    let candidate = RTCIceCandidateInit::from(message.candidate);
+                    let pc = pc.clone();
+                    let ice_clone = ice_clone.clone();
+                    tokio::spawn(async move {
+                        // If remote description is not set, buffer ICE candidates
+                        if pc.remote_description().await.is_none() {
+                            let mut ice_holder = ice_clone.lock().await;
+                            ice_holder.push(candidate);
+                        } else {
+                            if let Err(e) = pc.add_ice_candidate(candidate).await {
+                                log::error!("Failed to add ICE candidate: {}", e);
+                            } else {
+                                // Add any held ICE candidates
+                                let mut ice_holder = ice_clone.lock().await;
+                                for candidate in ice_holder.drain(..) {
+                                    if let Err(e) = pc.add_ice_candidate(candidate).await {
+                                        log::error!("Failed to add ICE candidate: {}", e);
+                                    }
+                                }
+                            }
+                        }
+                    });
+                }
+                Err(e) => eprintln!("Failed to decode callback message: {:?}", e),
+            }
+        }).await;
+
+        // A shared state to track currently pressed keys
+        let pressed_keys = Arc::new(Mutex::new(HashSet::new()));
+        let pressed_buttons = Arc::new(Mutex::new(HashSet::new()));
+
+        // Data channel message handler
+        data_channel.on_message(Box::new(move |msg: DataChannelMessage| {
+            let pipeline = pipeline.clone();
+            let pressed_keys = pressed_keys.clone();
+            let pressed_buttons = pressed_buttons.clone();
+            Box::pin({
+                async move {
+                    // We don't care about string messages for now
+                    if !msg.is_string {
+                        // Decode the message as an MessageInput (binary encoded gzip)
+                        match decode_message_as::<MessageInput>(msg.data.to_vec()) {
+                            Ok(message_input) => {
+                                // Handle the input message
+                                if let Ok(input_msg) = from_str::<InputMessage>(&message_input.data) {
+                                    if let Some(event) =
+                                        handle_input_message(input_msg, &pressed_keys, &pressed_buttons).await
+                                    {
+                                        let _ = pipeline.lock().await.send_event(event);
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                log::error!("Failed to decode input message: {:?}", e);
+                            }
+                        }
+                    }
+                }
+            })
+        }));
+
+        log::info!("Creating offer...");
+
+        // Create an offer to send to the browser
+        let offer = peer_connection.create_offer(None).await?;
+
+        log::info!("Setting local description...");
+
+        // Sets the LocalDescription, and starts our UDP listeners
+        peer_connection.set_local_description(offer).await?;
+
+        log::info!("Local description set...");
+
+        if let Some(local_description) = peer_connection.local_description().await {
+            // Wait until we have gathered all ICE candidates
+            while peer_connection.ice_gathering_state() != RTCIceGatheringState::Complete {
+                tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+            }
+
+            // Register set_response_callback for SDP answer
+            let pc = peer_connection.clone();
+            self.nestri_ws.register_callback("sdp", move |data| {
+                match decode_message_as::<MessageSDP>(data) {
+                    Ok(message) => {
+                        log::info!("Received SDP message");
+                        let sdp = message.sdp;
+                        let pc = pc.clone();
+                        tokio::spawn(async move {
+                            if let Err(e) = pc.set_remote_description(sdp).await {
+                                log::error!("Failed to set remote description: {}", e);
+                            }
+                        });
+                    }
+                    Err(e) => eprintln!("Failed to decode callback message: {:?}", e),
+                }
+            }).await;
+
+            log::info!("Sending local description to remote...");
+            // Encode and send the local description via WebSocket
+            let sdp_msg = MessageSDP {
+                base: MessageBase {
+                    payload_type: "sdp".to_string(),
+                },
+                sdp: local_description,
+            };
+            let encoded = encode_message(&sdp_msg)?;
+            self.nestri_ws.send_message(encoded).await?;
+        } else {
+            log::error!("generate local_description failed!");
+            cancel_token.cancel();
+            return Err("generate local_description failed!".into());
+        };
+
+        // Send video and audio data
+        let audio_track = audio_track.clone();
+        tokio::spawn(async move {
+            let mut audio_sink = audio_sink.lock().await;
+            while let Some(sample) = audio_sink.next().await {
+                if let Some(buffer) = sample.buffer() {
+                    if let Ok(map) = buffer.map_readable() {
+                        if let Err(e) = audio_track.write(map.as_slice()).await {
+                            if webrtc::Error::ErrClosedPipe == e {
+                                break;
+                            } else {
+                                log::error!("Failed to write audio track: {}", e);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        let video_track = video_track.clone();
+        tokio::spawn(async move {
+            let mut video_sink = video_sink.lock().await;
+            while let Some(sample) = video_sink.next().await {
+                if let Some(buffer) = sample.buffer() {
+                    if let Ok(map) = buffer.map_readable() {
+                        if let Err(e) = video_track.write(map.as_slice()).await {
+                            if webrtc::Error::ErrClosedPipe == e {
+                                break;
+                            } else {
+                                log::error!("Failed to write video track: {}", e);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        // Block until closed or error
+        tokio::select! {
+            _ = pc_recv.recv() => {
+                log::info!("Peer connection closed with state: {:?}", peer_connection.connection_state());
+            }
+        }
+
+        cancel_token.cancel();
+
+        // Make double-sure to close the peer connection
+        if let Err(e) = peer_connection.close().await {
+            log::error!("Failed to close peer connection: {}", e);
+        }
+
+        Ok(())
+    }
+}
+
+async fn handle_input_message(
+    input_msg: InputMessage,
+    pressed_keys: &Arc<Mutex<HashSet<i32>>>,
+    pressed_buttons: &Arc<Mutex<HashSet<i32>>>,
+) -> Option<gst::Event> {
+    match input_msg {
+        InputMessage::MouseMove { x, y } => {
+            let structure = gst::Structure::builder("MouseMoveRelative")
+                .field("pointer_x", x as f64)
+                .field("pointer_y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseMoveAbs { x, y } => {
+            let structure = gst::Structure::builder("MouseMoveAbsolute")
+                .field("pointer_x", x as f64)
+                .field("pointer_y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::KeyDown { key } => {
+            let mut keys = pressed_keys.lock().await;
+            // If the key is already pressed, return to prevent key lockup
+            if keys.contains(&key) {
+                return None;
+            }
+            keys.insert(key);
+
+            let structure = gst::Structure::builder("KeyboardKey")
+                .field("key", key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::KeyUp { key } => {
+            let mut keys = pressed_keys.lock().await;
+            // Remove the key from the pressed state when released
+            keys.remove(&key);
+
+            let structure = gst::Structure::builder("KeyboardKey")
+                .field("key", key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::Wheel { x, y } => {
+            let structure = gst::Structure::builder("MouseAxis")
+                .field("x", x as f64)
+                .field("y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseDown { key } => {
+            let mut buttons = pressed_buttons.lock().await;
+            // If the button is already pressed, return to prevent button lockup
+            if buttons.contains(&key) {
+                return None;
+            }
+            buttons.insert(key);
+
+            let structure = gst::Structure::builder("MouseButton")
+                .field("button", key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseUp { key } => {
+            let mut buttons = pressed_buttons.lock().await;
+            // Remove the button from the pressed state when released
+            buttons.remove(&key);
+
+            let structure = gst::Structure::builder("MouseButton")
+                .field("button", key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+    }
+}
diff --git a/packages/server/src/websocket.rs b/packages/server/src/websocket.rs
new file mode 100644
index 00000000..73c4efe1
--- /dev/null
+++ b/packages/server/src/websocket.rs
@@ -0,0 +1,174 @@
+use futures_util::sink::SinkExt;
+use futures_util::stream::{SplitSink, SplitStream};
+use futures_util::StreamExt;
+use log::{Level, Log, Metadata, Record};
+use std::collections::HashMap;
+use std::error::Error;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::net::TcpStream;
+use tokio::sync::Mutex;
+use tokio::sync::RwLock;
+use tokio::time::sleep;
+use tokio_tungstenite::tungstenite::Message;
+use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
+use crate::messages::{decode_message, encode_message, MessageBase, MessageLog};
+
+type Callback = Box<dyn Fn(Vec<u8>) + Send + Sync>;
+type WSRead = SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>;
+type WSWrite = SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>;
+
+#[derive(Clone)]
+pub struct NestriWebSocket {
+    ws_url: String,
+    reader: Arc<Mutex<WSRead>>,
+    writer: Arc<Mutex<WSWrite>>,
+    callbacks: Arc<RwLock<HashMap<String, Callback>>>,
+}
+impl NestriWebSocket {
+    pub async fn new(
+        ws_url: String,
+    ) -> Result<NestriWebSocket, Box<dyn Error>> {
+        // Attempt to connect to the WebSocket
+        let ws_stream = NestriWebSocket::do_connect(&ws_url).await.unwrap();
+
+        // If the connection is successful, split the stream
+        let (write, read) = ws_stream.split();
+        let mut ws = NestriWebSocket {
+            ws_url,
+            reader: Arc::new(Mutex::new(read)),
+            writer: Arc::new(Mutex::new(write)),
+            callbacks: Arc::new(RwLock::new(HashMap::new())),
+        };
+
+        // Spawn the read loop
+        ws.spawn_read_loop();
+
+        Ok(ws)
+    }
+
+    async fn do_connect(
+        ws_url: &str,
+    ) -> Result<WebSocketStream<MaybeTlsStream<TcpStream>>, Box<dyn Error + Send + Sync>> {
+        loop {
+            match connect_async(ws_url).await {
+                Ok((ws_stream, _)) => {
+                    return Ok(ws_stream);
+                }
+                Err(e) => {
+                    eprintln!("Failed to connect to WebSocket, retrying: {:?}", e);
+                    sleep(Duration::from_secs(1)).await; // Wait before retrying
+                }
+            }
+        }
+    }
+
+    // Handles message -> callback calls and reconnects on error/disconnect
+    fn spawn_read_loop(&mut self) {
+        let reader = self.reader.clone();
+        let callbacks = self.callbacks.clone();
+
+        let mut self_clone = self.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let message = reader.lock().await.next().await;
+                match message {
+                    Some(Ok(message)) => {
+                        let data = message.into_data();
+                        let base_message = match decode_message(&data) {
+                            Ok(base_message) => base_message,
+                            Err(e) => {
+                                eprintln!("Failed to decode message: {:?}", e);
+                                continue;
+                            }
+                        };
+
+                        let callbacks_lock = callbacks.read().await;
+                        if let Some(callback) = callbacks_lock.get(&base_message.payload_type) {
+                            let data = data.clone();
+                            callback(data);
+                        }
+                    }
+                    Some(Err(e)) => {
+                        eprintln!("Error receiving message: {:?}", e);
+                        self_clone.reconnect().await.unwrap();
+                    }
+                    None => {
+                        eprintln!("WebSocket connection closed, reconnecting...");
+                        self_clone.reconnect().await.unwrap();
+                    }
+                }
+            }
+        });
+    }
+
+    async fn reconnect(&mut self) -> Result<(), Box<dyn Error + Send + Sync>> {
+        // Keep trying to reconnect until successful
+        loop {
+            match NestriWebSocket::do_connect(&self.ws_url).await {
+                Ok(ws_stream) => {
+                    let (write, read) = ws_stream.split();
+                    *self.reader.lock().await = read;
+                    *self.writer.lock().await = write;
+                    return Ok(());
+                }
+                Err(e) => {
+                    eprintln!("Failed to reconnect to WebSocket: {:?}", e);
+                    sleep(Duration::from_secs(2)).await; // Wait before retrying
+                }
+            }
+        }
+    }
+
+    pub async fn send_message(&self, message: Vec<u8>) -> Result<(), Box<dyn Error>> {
+        let mut writer_lock = self.writer.lock().await;
+        writer_lock
+            .send(Message::Binary(message))
+            .await
+            .map_err(|e| format!("Error sending message: {:?}", e).into())
+    }
+
+    pub async fn register_callback<F>(&self, response_type: &str, callback: F)
+    where
+        F: Fn(Vec<u8>) + Send + Sync + 'static,
+    {
+        let mut callbacks_lock = self.callbacks.write().await;
+        callbacks_lock.insert(response_type.to_string(), Box::new(callback));
+    }
+}
+impl Log for NestriWebSocket {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        // Filter logs by level
+        metadata.level() <= Level::Info
+    }
+
+    fn log(&self, record: &Record) {
+        if self.enabled(record.metadata()) {
+            let level = record.level().to_string();
+            let message = record.args().to_string();
+            let time = chrono::Local::now().to_rfc3339();
+
+            // Print to console as well
+            println!("{}: {}", level, message);
+
+            // Encode and send the log message
+            let log_message = MessageLog {
+                base: MessageBase {
+                    payload_type: "log".to_string(),
+                },
+                level,
+                message,
+                time,
+            };
+            if let Ok(encoded_message) = encode_message(&log_message) {
+                let _ = self.send_message(encoded_message);
+            }
+        }
+    }
+
+    fn flush(&self) {
+        // No-op for this logger
+    }
+}
+
diff --git a/packages/ui/globals.css b/packages/ui/globals.css
index dd583bea..055610bb 100644
--- a/packages/ui/globals.css
+++ b/packages/ui/globals.css
@@ -5,6 +5,11 @@
 
 @layer base {
 
+    html {
+        width: 100%;
+        height: 100%;
+    }
+
     html,
     html * {
         scrollbar-color: theme("colors.gray.700") theme("colors.gray.300");
diff --git a/packages/ui/src/home-nav-bar.tsx b/packages/ui/src/home-nav-bar.tsx
index 6195650a..11c68cf4 100644
--- a/packages/ui/src/home-nav-bar.tsx
+++ b/packages/ui/src/home-nav-bar.tsx
@@ -10,36 +10,49 @@ export const HomeNavBar = component$(() => {
             hasScrolled.value = window.scrollY > 0;
         })
     );
-
+//
     return (
-        <nav class={cn("sticky justify-between top-0 z-50 px-2 sm:px-6 text-xs sm:text-sm leading-[1] text-gray-950/70 dark:text-gray-50/70 h-[66px] dark:bg-gray-900/70 bg-gray-100/70 before:backdrop-blur-[15px] before:absolute before:-z-[1] before:top-0 before:left-0 before:w-full before:h-full flex items-center", hasScrolled.value && "shadow-[0_2px_20px_1px] shadow-gray-300 dark:shadow-gray-700")} >
-            <div class="w-6 h-6 flex-shrink-0 md:mr-2">
-                <svg
-                    class="h-full w-full"
-                    width="100%"
-                    height="100%"
-                    viewBox="0 0 12.8778 9.7377253"
-                    version="1.1"
-                    id="svg1"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path
-                        d="m 2.093439,1.7855532 h 8.690922 V 2.2639978 H 2.093439 Z m 0,2.8440874 h 8.690922 V 5.1080848 H 2.093439 Z m 0,2.8440866 h 8.690922 V 7.952172 H 2.093439 Z"
-                        style="font-size:12px;fill:#ff4f01;fill-opacity:1;fill-rule:evenodd;stroke:#ff4f01;stroke-width:1.66201;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" />
-                </svg>
+        <nav class={cn("fixed w-full justify-between top-0 z-50 px-2 sm:px-6 text-xs sm:text-sm leading-[1] text-gray-950/70 dark:text-gray-50/70 h-[66px] before:backdrop-blur-[15px] before:absolute before:-z-[1] before:top-0 before:left-0 before:w-full before:h-full flex items-center", hasScrolled.value && "shadow-[0_2px_20px_1px] shadow-gray-700")} >
+            <div class="flex flex-row justify-center absolute items-center top-0 bottom-0">
+                <div class="flex-shrink-0 gap-2 flex justify-center items-center">
+                    <svg
+                        class="size-8 "
+                        width="100%"
+                        height="100%"
+                        viewBox="0 0 12.8778 9.7377253"
+                        version="1.1"
+                        id="svg1"
+                        xmlns="http://www.w3.org/2000/svg">
+                        <path
+                            d="m 2.093439,1.7855532 h 8.690922 V 2.2639978 H 2.093439 Z m 0,2.8440874 h 8.690922 V 5.1080848 H 2.093439 Z m 0,2.8440866 h 8.690922 V 7.952172 H 2.093439 Z"
+                            style="font-size:12px;fill:#ff4f01;fill-opacity:1;fill-rule:evenodd;stroke:#ff4f01;stroke-width:1.66201;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" />
+                    </svg>
+                    <svg viewBox="0 0 498.05 70.508" xmlns="http://www.w3.org/2000/svg"  class="aspect-[498/71] text-gray-600 w-[100px] h-auto" >
+                        <g stroke-linecap="round" fill-rule="evenodd" font-size="9pt" stroke="currentColor" stroke-width="0.25mm" fill="currentColor">
+                            <path
+                                fill="currentColor"
+                                pathLength="1"
+                                stroke="currentColor"
+                                d="M 261.23 41.65 L 212.402 41.65 Q 195.313 41.65 195.313 27.002 L 195.313 14.795 A 17.814 17.814 0 0 1 196.311 8.57 Q 199.443 0.146 212.402 0.146 L 283.203 0.146 L 283.203 14.844 L 217.236 14.844 Q 215.337 14.844 214.945 16.383 A 3.67 3.67 0 0 0 214.844 17.285 L 214.844 24.561 Q 214.844 27.002 217.236 27.002 L 266.113 27.002 Q 283.203 27.002 283.203 41.65 L 283.203 53.857 A 17.814 17.814 0 0 1 282.205 60.083 Q 279.073 68.506 266.113 68.506 L 195.313 68.506 L 195.313 53.809 L 261.23 53.809 A 3.515 3.515 0 0 0 262.197 53.688 Q 263.672 53.265 263.672 51.367 L 263.672 44.092 A 3.515 3.515 0 0 0 263.551 43.126 Q 263.128 41.65 261.23 41.65 Z M 185.547 53.906 L 185.547 68.506 L 114.746 68.506 Q 97.656 68.506 97.656 53.857 L 97.656 14.795 A 17.814 17.814 0 0 1 98.655 8.57 Q 101.787 0.146 114.746 0.146 L 168.457 0.146 Q 185.547 0.146 185.547 14.795 L 185.547 31.885 A 17.827 17.827 0 0 1 184.544 38.124 Q 181.621 45.972 170.174 46.538 A 36.906 36.906 0 0 1 168.457 46.582 L 117.188 46.582 L 117.236 51.465 Q 117.236 53.906 119.629 53.955 L 185.547 53.906 Z M 19.531 14.795 L 19.531 68.506 L 0 68.506 L 0 0.146 L 70.801 0.146 Q 87.891 0.146 87.891 14.795 L 87.891 68.506 L 68.359 68.506 L 68.359 17.236 Q 68.359 14.795 65.967 14.795 L 19.531 14.795 Z M 449.219 68.506 L 430.176 46.533 L 400.391 46.533 L 400.391 68.506 L 380.859 68.506 L 380.859 0.146 L 451.66 0.146 A 24.602 24.602 0 0 1 458.423 0.994 Q 466.007 3.166 468.021 10.907 A 25.178 25.178 0 0 1 468.75 17.236 L 468.75 31.885 A 18.217 18.217 0 0 1 467.887 37.73 Q 465.954 43.444 459.698 45.455 A 23.245 23.245 0 0 1 454.492 46.436 L 473.633 68.506 L 449.219 68.506 Z M 292.969 0 L 371.094 0.098 L 371.094 14.795 L 341.846 14.795 L 341.846 68.506 L 322.266 68.506 L 322.217 14.795 L 292.969 14.844 L 292.969 0 Z M 478.516 0.146 L 498.047 0.146 L 498.047 68.506 L 478.516 68.506 L 478.516 0.146 Z M 400.391 14.844 L 400.391 31.885 L 446.826 31.885 Q 448.726 31.885 449.117 30.345 A 3.67 3.67 0 0 0 449.219 29.443 L 449.219 17.285 Q 449.219 14.844 446.826 14.844 L 400.391 14.844 Z M 117.188 31.836 L 163.574 31.934 Q 165.528 31.895 165.918 30.355 A 3.514 3.514 0 0 0 166.016 29.492 L 166.016 17.236 Q 166.016 15.337 164.476 14.945 A 3.67 3.67 0 0 0 163.574 14.844 L 119.629 14.795 Q 117.188 14.795 117.188 17.188 L 117.188 31.836 Z" />
+                        </g>
+                    </svg>
+                </div>
+            </div>
+            <div class="h-10 rounded-md gap-[1px] px-1 flex flex-row justify-center mx-auto items-center ">
+                <button class="focus:ring-primary-500 focus:ring-2 p-2 flex flex-row gap-1 justify-center items-center outline-none rounded-md transition-all duration-200 select-none cursor-pointer bg-gray-300/70 dark:hover:bg-gray-700/70">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" fill-rule="evenodd" d="M2 21.25a.75.75 0 0 0 0 1.5h20a.75.75 0 0 0 0-1.5h-5V16c0-1.886 0-2.828-.586-3.414S14.886 12 13 12h-2c-1.886 0-2.828 0-3.414.586S7 14.114 7 16v5.25zM9.25 15a.75.75 0 0 1 .75-.75h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.75-.75m0 3a.75.75 0 0 1 .75-.75h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.75-.75" clip-rule="evenodd" /><path fill="currentColor" d="M8 4.5c.943 0 1.414 0 1.707.293S10 5.557 10 6.5v1.792q.234.114.414.294c.404.404.53.978.569 1.914V12c-1.874 0-2.813.002-3.397.586C7 13.172 7 14.114 7 16v5.25H3V12c0-1.886 0-2.828.586-3.414A1.5 1.5 0 0 1 4 8.292V6.5c0-.943 0-1.414.293-1.707S5.057 4.5 6 4.5h.25V3a.75.75 0 0 1 1.5 0v1.5zm12.644.747c-.356-.514-.984-.75-2.24-1.22c-2.455-.921-3.682-1.381-4.543-.785C13 3.84 13 5.15 13 7.772V12c1.886 0 2.828 0 3.414.586S17 14.114 17 16v5.25h4V7.772c0-1.34 0-2.011-.356-2.525" opacity=".5" /></svg>
+                    Home
+                </button>
+                <button class="focus:ring-primary-500 focus:ring-2 p-2 flex flex-row gap-1 justify-center items-center outline-none rounded-md transition-all duration-200 select-none cursor-pointer hover:bg-gray-300/70 dark:hover:bg-gray-700/70">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" d="M4.035 11.573c.462-2.309.693-3.463 1.522-4.143s2.007-.68 4.362-.68h4.162c2.355 0 3.532 0 4.361.68c.83.68 1.06 1.834 1.523 4.143l.6 3c.664 3.32.996 4.98.096 6.079s-2.594 1.098-5.98 1.098H9.32c-3.386 0-5.08 0-5.98-1.098s-.568-2.758.096-6.079z" opacity=".5" /><circle cx="15" cy="9.75" r="1" fill="currentColor" /><circle cx="9" cy="9.75" r="1" fill="currentColor" /><path fill="currentColor" d="M9.75 5.75a2.25 2.25 0 0 1 4.5 0v1h.431q.565 0 1.069.002V5.75a3.75 3.75 0 1 0-7.5 0v1.002q.504-.003 1.069-.002h.431z" /></svg>
+                    Store
+                </button>
             </div>
-            <div class="relative flex items-center">
-                <hr class="w-[1px] h-7 bg-neutral-700 dark:bg-neutral-300 mx-3 rotate-[16deg]" />
-                <button class="rounded-full outline-none focus:ring-primary-500 focus:ring-2 transition-all flex items-center duration-200 px-3 h-8 gap-2 select-none cursor-pointer hover:bg-neutral-300/70 dark:hover:bg-neutral-700/70" >
-                    <img src="https://nexus.nestri.workers.dev/image/avatar/the-avengers.png" height={16} width={16} class="size-4 rounded-full" alt="Avatar" />
-                    <p class="whitespace-nowrap [text-overflow:ellipsis] overflow-hidden max-w-[20ch]">The Avengers</p>
-                    <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} viewBox="0 0 21 21"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m7.5 8.5l3-3l3 3m-6 5l3 3l3-3" /></svg>
+            <div class="gap-4 flex flex-row justify-center h-full items-center">
+                <button class="focus:ring-primary-500 focus:ring-2 outline-none rounded-full transition-all flex items-center duration-200 select-none cursor-pointer hover:bg-gray-300/70 dark:hover:bg-gray-700/70" >
+                    <img src="https://avatars.githubusercontent.com/u/71614375?v=4" height={24} width={24} class="size-[28px] rounded-full" alt="Avatar" />
                 </button>
             </div>
-            <button class="ml-auto focus:ring-primary-500 focus:ring-2 outline-none rounded-full transition-all flex items-center duration-200 px-3 h-8 gap-1 select-none cursor-pointer hover:bg-gray-300/70 dark:hover:bg-gray-700/70" >
-                <img src="https://nexus.nestri.workers.dev/image/avatar/wanjohi.png" height={16} width={16} class="size-4 rounded-full" alt="Avatar" />
-                <p class="whitespace-nowrap [text-overflow:ellipsis] overflow-hidden max-w-[20ch]">Wanjohi</p>
-                <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} viewBox="0 0 21 21"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m7.5 8.5l3-3l3 3m-6 5l3 3l3-3" /></svg>
-            </button>
         </nav>
     )
 })
\ No newline at end of file
diff --git a/packages/ui/src/nav-bar.tsx b/packages/ui/src/nav-bar.tsx
index 52d94806..6bcb1452 100644
--- a/packages/ui/src/nav-bar.tsx
+++ b/packages/ui/src/nav-bar.tsx
@@ -29,7 +29,7 @@ export const NavBar = component$(() => {
     );
 
     return (
-        <nav class={cn("sticky top-0 z-50 px-4 text-sm font-extrabold bg-gray-100/70 dark:bg-gray-900/70 before:backdrop-blur-[15px] before:absolute before:-z-[1] before:top-0 before:left-0 before:w-full before:h-full", hasScrolled.value && "shadow-[0_2px_20px_1px] shadow-gray-300 dark:shadow-gray-700")} >
+        <nav class={cn("w-full sticky top-0 z-50 px-4 text-sm font-extrabold bg-gray-100/70 dark:bg-gray-900/70 before:backdrop-blur-[15px] before:absolute before:-z-[1] before:top-0 before:left-0 before:w-full before:h-full", hasScrolled.value && "shadow-[0_2px_20px_1px] shadow-gray-300 dark:shadow-gray-700")} >
             <div class="mx-auto flex max-w-xl items-center border-b-2 dark:border-gray-50/50 border-gray-950/50" >
                 <Link class="outline-none focus:ring-2 py-1 px-3 -ml-3 rounded-lg focus:ring-primary-500 duration-200 transition-all" href="/" >
                     <h1 class="text-lg font-title" >