diff --git a/.github/workflows/lang-python.yml b/.github/workflows/lang-python.yml
index 349ec65d..c1f1fd33 100644
--- a/.github/workflows/lang-python.yml
+++ b/.github/workflows/lang-python.yml
@@ -4,8 +4,11 @@ on:
   push:
     branches:
       - main
-      - master
+      - release
   pull_request:
+    branches:
+      - main
+      - release
 
 jobs:
   linux:
@@ -54,7 +57,7 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    if: startsWith(github.ref, 'refs/tags/')
     needs: [ macos, windows, linux ]
     steps:
       - uses: actions/download-artifact@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 11b4d5ca..d2c50f2d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,9 @@
 name: 'test tauri on pr'
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - main
+      - release
 
 jobs:
   test-tauri:
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 9c22b6da..9d6ca962 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -1,6 +1,9 @@
 name: 'update'
 
-on: pull_request
+on: 
+  pull_request:
+    branches:
+      - release
 
 jobs:
   create-release:
diff --git a/.gitignore b/.gitignore
index cbaa150f..530c395f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # packages
 /0.9
 /releases
-/watcher
+/resources
 
 # general
 /tags
diff --git a/Cargo.lock b/Cargo.lock
index 04cc6230..cc9829a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -10,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -32,6 +41,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[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"
@@ -41,11 +56,59 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "anymap2"
@@ -55,11 +118,12 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
 [[package]]
 name = "aquamarine"
-version = "0.1.12"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f"
+checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1"
 dependencies = [
- "itertools 0.9.0",
+ "include_dir",
+ "itertools",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -73,7 +137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
 dependencies = [
  "atk-sys",
- "bitflags",
+ "bitflags 1.3.2",
  "glib",
  "libc",
 ]
@@ -87,42 +151,30 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
-name = "attohttpc"
-version = "0.22.0"
+name = "autocfg"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "backtrace"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
- "hermit-abi 0.1.19",
+ "addr2line",
+ "cc",
+ "cfg-if",
  "libc",
- "winapi",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
 ]
 
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -131,9 +183,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bincode"
@@ -150,6 +202,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -173,9 +231,9 @@ checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
 
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -184,9 +242,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -194,9 +252,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.4.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
 dependencies = [
  "memchr",
  "serde",
@@ -204,27 +262,30 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "cairo-rs"
@@ -232,7 +293,7 @@ version = "0.15.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -247,26 +308,27 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
 name = "cargo_toml"
-version = "0.13.3"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a"
+checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
 dependencies = [
  "serde",
- "toml 0.5.11",
+ "toml 0.7.8",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -283,7 +345,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
 dependencies = [
  "byteorder",
  "fnv",
- "uuid 1.3.1",
+ "uuid",
 ]
 
 [[package]]
@@ -297,11 +359,12 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.14.0"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"
+checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
 dependencies = [
  "smallvec",
+ "target-lexicon",
 ]
 
 [[package]]
@@ -312,68 +375,58 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "serde",
- "time 0.1.45",
  "wasm-bindgen",
- "winapi",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "clap"
-version = "3.2.23"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
- "atty",
- "bitflags",
+ "clap_builder",
  "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
+dependencies = [
+ "anstream",
+ "anstyle",
  "clap_lex",
- "indexmap",
- "once_cell",
  "strsim",
- "termcolor",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck 0.4.1",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cluFlock"
-version = "1.2.7"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "cocoa"
@@ -381,7 +434,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "block",
  "cocoa-foundation",
  "core-foundation",
@@ -393,35 +446,30 @@ dependencies = [
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "block",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
  "libc",
  "objc",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "color_quant"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -470,7 +518,7 @@ version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
  "foreign-types",
@@ -479,21 +527,20 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
- "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.6"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -544,14 +591,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.8.0",
+ "memoffset",
  "scopeguard",
 ]
 
@@ -567,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
 dependencies = [
  "cfg-if",
 ]
@@ -603,12 +650,12 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -621,61 +668,11 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
 [[package]]
 name = "darling"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -683,27 +680,37 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
 ]
 
 [[package]]
@@ -730,6 +737,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "deunicode"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6"
+
 [[package]]
 name = "dev_utils"
 version = "0.0.1"
@@ -740,12 +753,6 @@ dependencies = [
  "thot-core",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -754,9 +761,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
@@ -764,9 +771,9 @@ dependencies = [
 
 [[package]]
 name = "dircpy"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b6622b9d0dc20c70e74ff24c56493278d7d9299ac8729deb923703616e5a7e"
+checksum = "8466f8d28ca6da4c9dfbbef6ad4bff6f2fdd5e412d821025b0d3f0a9d74a8c1e"
 dependencies = [
  "jwalk",
  "log",
@@ -775,9 +782,9 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "4.0.1"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
  "dirs-sys",
 ]
@@ -794,13 +801,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -828,30 +836,43 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "dtoa"
-version = "0.4.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
+checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
 dependencies = [
  "dtoa",
 ]
 
 [[package]]
 name = "dunce"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "embed-resource"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2"
+dependencies = [
+ "cc",
+ "rustc_version",
+ "toml 0.8.8",
+ "vswhom",
+ "winreg 0.51.0",
+]
 
 [[package]]
 name = "embed_plist"
@@ -861,137 +882,106 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.9.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
 dependencies = [
- "atty",
  "humantime",
+ "is-terminal",
  "log",
  "regex",
  "termcolor",
 ]
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
 dependencies = [
- "cc",
  "libc",
-]
-
-[[package]]
-name = "extendr-api"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e36d66fa307948c291a6fc5b09d8295dd58e88ab5e8d782d30e23670113e9ab"
-dependencies = [
- "extendr-engine",
- "extendr-macros",
- "lazy_static",
- "libR-sys",
- "paste",
-]
-
-[[package]]
-name = "extendr-engine"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8298d5a2e38bb91820b92bbd7e5aaf1d3b95ed9f096fc66393c50af38ff8155d"
-dependencies = [
- "libR-sys",
-]
-
-[[package]]
-name = "extendr-macros"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09bf0849f0d48209be8163378248137fed5ccb5f464d171cf93a19f31a9e6c67"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "windows-sys",
 ]
 
 [[package]]
 name = "fake"
-version = "2.5.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d68f517805463f3a896a9d29c1d6ff09d3579ded64a7201b4069f8f9c0d52fd"
+checksum = "26221445034074d46b276e13eb97a265ebdb8ed8da705c4dddd3dd20b66b45d2"
 dependencies = [
+ "deunicode",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "field-offset"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset 0.8.0",
+ "memoffset",
  "rustc_version",
 ]
 
+[[package]]
+name = "file-id"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
+dependencies = [
+ "windows-sys",
+]
+
 [[package]]
 name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.48.0",
+ "redox_syscall 0.3.5",
+ "windows-sys",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1026,9 +1016,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1039,6 +1029,15 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -1051,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1066,9 +1065,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1076,15 +1075,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1093,38 +1092,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1153,7 +1152,7 @@ version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-rs",
  "gdk-pixbuf",
  "gdk-sys",
@@ -1169,7 +1168,7 @@ version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "gdk-pixbuf-sys",
  "gio",
  "glib",
@@ -1186,7 +1185,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1203,7 +1202,7 @@ dependencies = [
  "libc",
  "pango-sys",
  "pkg-config",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1217,7 +1216,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pkg-config",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1229,21 +1228,21 @@ dependencies = [
  "gdk-sys",
  "glib-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
  "x11",
 ]
 
 [[package]]
 name = "generator"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
 dependencies = [
  "cc",
  "libc",
  "log",
  "rustversion",
- "windows 0.44.0",
+ "windows 0.48.0",
 ]
 
 [[package]]
@@ -1269,9 +1268,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1280,13 +1279,19 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
 [[package]]
 name = "gio"
 version = "0.15.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -1306,7 +1311,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
  "winapi",
 ]
 
@@ -1316,7 +1321,7 @@ version = "0.15.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -1352,7 +1357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
 dependencies = [
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1363,43 +1368,75 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
 name = "gloo"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4bef6b277b3ab073253d4bca60761240cf8d6998f4bd142211957b69a61b20"
+checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d"
 dependencies = [
- "gloo-console",
- "gloo-dialogs",
- "gloo-events",
- "gloo-file",
- "gloo-history",
- "gloo-net",
- "gloo-render",
- "gloo-storage",
- "gloo-timers",
- "gloo-utils",
- "gloo-worker",
+ "gloo-console 0.2.3",
+ "gloo-dialogs 0.1.1",
+ "gloo-events 0.1.2",
+ "gloo-file 0.2.3",
+ "gloo-history 0.1.5",
+ "gloo-net 0.3.1",
+ "gloo-render 0.1.1",
+ "gloo-storage 0.2.2",
+ "gloo-timers 0.2.6",
+ "gloo-utils 0.1.7",
+ "gloo-worker 0.2.1",
 ]
 
 [[package]]
-name = "gloo-console"
-version = "0.2.3"
+name = "gloo"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f"
+checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249"
 dependencies = [
- "gloo-utils",
+ "gloo-console 0.3.0",
+ "gloo-dialogs 0.2.0",
+ "gloo-events 0.2.0",
+ "gloo-file 0.3.0",
+ "gloo-history 0.2.1",
+ "gloo-net 0.4.0",
+ "gloo-render 0.2.0",
+ "gloo-storage 0.3.0",
+ "gloo-timers 0.3.0",
+ "gloo-utils 0.2.0",
+ "gloo-worker 0.4.0",
+]
+
+[[package]]
+name = "gloo-console"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f"
+dependencies = [
+ "gloo-utils 0.1.7",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-console"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261"
+dependencies = [
+ "gloo-utils 0.2.0",
  "js-sys",
  "serde",
  "wasm-bindgen",
@@ -1416,6 +1453,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-dialogs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-events"
 version = "0.1.2"
@@ -1426,14 +1473,36 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-events"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-file"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7"
+dependencies = [
+ "gloo-events 0.1.2",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-file"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f"
 dependencies = [
  "futures-channel",
- "gloo-events",
+ "gloo-events 0.2.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -1441,14 +1510,31 @@ dependencies = [
 
 [[package]]
 name = "gloo-history"
-version = "0.1.3"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f"
+dependencies = [
+ "gloo-events 0.1.2",
+ "gloo-utils 0.1.7",
+ "serde",
+ "serde-wasm-bindgen 0.5.0",
+ "serde_urlencoded",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-history"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd451019e0b7a2b8a7a7b23e74916601abf1135c54664e57ff71dcc26dfcdeb7"
+checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160"
 dependencies = [
- "gloo-events",
- "gloo-utils",
+ "getrandom 0.2.11",
+ "gloo-events 0.2.0",
+ "gloo-utils 0.2.0",
  "serde",
- "serde-wasm-bindgen",
+ "serde-wasm-bindgen 0.6.1",
  "serde_urlencoded",
  "thiserror",
  "wasm-bindgen",
@@ -1457,14 +1543,36 @@ dependencies = [
 
 [[package]]
 name = "gloo-net"
-version = "0.2.6"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils 0.1.7",
+ "http",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-net"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10"
+checksum = "8ac9e8288ae2c632fa9f8657ac70bfe38a1530f345282d7ba66a1f70b72b7dc4"
 dependencies = [
  "futures-channel",
  "futures-core",
  "futures-sink",
- "gloo-utils",
+ "gloo-utils 0.2.0",
+ "http",
  "js-sys",
  "pin-project",
  "serde",
@@ -1485,13 +1593,38 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-render"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-storage"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480"
 dependencies = [
- "gloo-utils",
+ "gloo-utils 0.1.7",
+ "js-sys",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-storage"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a"
+dependencies = [
+ "gloo-utils 0.2.0",
  "js-sys",
  "serde",
  "serde_json",
@@ -1505,6 +1638,16 @@ name = "gloo-timers"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1514,9 +1657,22 @@ dependencies = [
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.6"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
+dependencies = [
+ "js-sys",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-utils"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
 dependencies = [
  "js-sys",
  "serde",
@@ -1533,8 +1689,8 @@ checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a"
 dependencies = [
  "anymap2",
  "bincode",
- "gloo-console",
- "gloo-utils",
+ "gloo-console 0.2.3",
+ "gloo-utils 0.1.7",
  "js-sys",
  "serde",
  "wasm-bindgen",
@@ -1542,6 +1698,37 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-worker"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400"
+dependencies = [
+ "bincode",
+ "futures",
+ "gloo-utils 0.2.0",
+ "gloo-worker-macros",
+ "js-sys",
+ "pinned",
+ "serde",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-worker-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.15.10"
@@ -1550,7 +1737,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1560,7 +1747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
 dependencies = [
  "atk",
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-rs",
  "field-offset",
  "futures-channel",
@@ -1591,7 +1778,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1608,6 +1795,25 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "h2"
+version = "0.3.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 2.1.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "has_id"
 version = "0.0.1"
@@ -1631,6 +1837,12 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1648,27 +1860,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -1684,7 +1878,21 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
 dependencies = [
  "log",
  "mac",
- "markup5ever",
+ "markup5ever 0.10.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.11.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -1692,13 +1900,24 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.6",
+ "itoa 1.0.9",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1707,34 +1926,82 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
 
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa 1.0.9",
+ "pin-project-lite",
+ "socket2 0.4.10",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows 0.48.0",
+ "windows-core",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -1755,20 +2022,19 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
- "matches",
  "unicode-bidi",
  "unicode-normalization",
 ]
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -1776,27 +2042,25 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.18"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-deque",
  "globset",
- "lazy_static",
  "log",
  "memchr",
- "regex",
+ "regex-automata 0.4.3",
  "same-file",
- "thread_local",
  "walkdir",
  "winapi-util",
 ]
 
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -1807,11 +2071,41 @@ dependencies = [
 
 [[package]]
 name = "implicit-clone"
-version = "0.3.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fc102e70475c320b185cd18c1e48bba2d7210b63970a4d581ef903e4368ef7"
+checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb"
 dependencies = [
- "indexmap",
+ "implicit-clone-derive",
+ "indexmap 2.1.0",
+]
+
+[[package]]
+name = "implicit-clone-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b"
+dependencies = [
+ "quote",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "include_dir"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -1821,15 +2115,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
 [[package]]
-name = "indoc"
-version = "1.0.9"
+name = "indexmap"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+ "serde",
+]
 
 [[package]]
 name = "infer"
@@ -1840,6 +2139,26 @@ dependencies = [
  "cfb",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -1850,23 +2169,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.10"
+name = "ipnet"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
 dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
+ "once_cell",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.9.0"
+name = "is-terminal"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "either",
+ "hermit-abi",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
 ]
 
 [[package]]
@@ -1886,9 +2221,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -1896,7 +2231,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "glib",
  "javascriptcore-rs-sys",
 ]
@@ -1935,53 +2270,62 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "json-patch"
-version = "0.2.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce"
+checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
 dependencies = [
  "serde",
  "serde_json",
- "treediff 3.0.2",
+ "thiserror",
+ "treediff",
 ]
 
 [[package]]
-name = "json-patch"
-version = "1.0.0"
+name = "jwalk"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
+checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56"
 dependencies = [
- "serde",
- "serde_json",
- "thiserror",
- "treediff 4.0.2",
+ "crossbeam",
+ "rayon",
 ]
 
 [[package]]
-name = "jwalk"
-version = "0.6.2"
+name = "kqueue"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dbcda57db8b6dc067e589628b7348639014e793d9e8137d8cf215e8b133a0bd"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
 dependencies = [
- "crossbeam",
- "rayon",
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
 ]
 
 [[package]]
@@ -1991,22 +2335,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
 dependencies = [
  "cssparser",
- "html5ever",
+ "html5ever 0.25.2",
  "matches",
  "selectors",
 ]
 
 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "kuchikiki"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
+dependencies = [
+ "cssparser",
+ "html5ever 0.26.0",
+ "indexmap 1.9.3",
+ "matches",
+ "selectors",
+]
 
 [[package]]
-name = "libR-sys"
-version = "0.4.0"
+name = "lazy_static"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd728a97b9b0975f546bc865a7413e0ce6f98a8f6cea52e77dc5ee0bcea00adf"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libappindicator"
@@ -2034,9 +2385,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libloading"
@@ -2049,34 +2400,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "line-wrap"
-version = "0.1.1"
+name = "libredox"
+version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "safemem",
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall 0.4.1",
 ]
 
 [[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+name = "line-wrap"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
 dependencies = [
- "cc",
+ "safemem",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2084,12 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "loom"
@@ -2112,21 +2462,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
-[[package]]
-name = "macrotest"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7489ae0986ce45414b7b3122c2e316661343ecf396b206e3e15f07c846616f10"
-dependencies = [
- "diff",
- "glob",
- "prettyplease",
- "serde",
- "serde_json",
- "syn 1.0.109",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2144,7 +2479,21 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
 dependencies = [
  "log",
  "phf 0.8.0",
- "phf_codegen",
+ "phf_codegen 0.8.0",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
+dependencies = [
+ "log",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
  "string_cache",
  "string_cache_codegen",
  "tendril",
@@ -2156,7 +2505,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -2167,27 +2516,24 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.8.0"
+name = "mime"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minisign-verify"
@@ -2197,21 +2543,24 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
+ "simd-adler32",
 ]
 
 [[package]]
-name = "miniz_oxide"
-version = "0.7.1"
+name = "mio"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
- "adler",
- "simd-adler32",
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2277,7 +2626,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys",
  "num_enum",
@@ -2318,27 +2667,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
-name = "ntest"
-version = "0.7.5"
+name = "notify"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c544e496c816f0a59645c0bb69097e453df203954ae2ed4b3ac4251fad69d44"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "ntest_proc_macro_helper",
- "ntest_test_cases",
- "ntest_timeout",
+ "bitflags 2.4.1",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "walkdir",
+ "windows-sys",
 ]
 
 [[package]]
-name = "ntest_proc_macro_helper"
-version = "0.7.5"
+name = "notify-debouncer-full"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f52e34b414605b77efc95c3f0ecef01df0c324bcc7f68d9a9cb7a7552777e52"
+checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
+dependencies = [
+ "crossbeam-channel",
+ "file-id",
+ "log",
+ "notify",
+ "parking_lot",
+ "walkdir",
+]
+
+[[package]]
+name = "ntest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da8ec6d2b73d45307e926f5af46809768581044384637af6b3f3fe7c3c88f512"
+dependencies = [
+ "ntest_test_cases",
+ "ntest_timeout",
+]
 
 [[package]]
 name = "ntest_test_cases"
-version = "0.7.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a81eb400abc87063f829560bc5c5c835177703b83d1cd991960db0b2a00abe"
+checksum = "be7d33be719c6f4d09e64e27c1ef4e73485dc4cc1f4d22201f89860a7fe22e22"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2347,11 +2722,10 @@ dependencies = [
 
 [[package]]
 name = "ntest_timeout"
-version = "0.7.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10db009e117aca57cbfb70ac332348f9a89d09ff7204497c283c0f7a0c96323"
+checksum = "066b468120587a402f0b47d8f80035c921f6a46f8209efd0632a89a16f5188a4"
 dependencies = [
- "ntest_proc_macro_helper",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
@@ -2391,20 +2765,20 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
@@ -2429,15 +2803,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -2477,29 +2842,39 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "open"
-version = "3.2.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
 dependencies = [
+ "is-wsl",
+ "libc",
  "pathdiff",
- "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.50"
+version = "0.10.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1"
+checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2516,7 +2891,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2527,9 +2902,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.85"
+version = "0.9.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0"
+checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f"
 dependencies = [
  "cc",
  "libc",
@@ -2537,22 +2912,22 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "os_pipe"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12"
+checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177"
 dependencies = [
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2565,7 +2940,7 @@ version = "0.15.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "glib",
  "libc",
  "once_cell",
@@ -2581,7 +2956,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -2596,23 +2971,17 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
-
 [[package]]
 name = "pathdiff"
 version = "0.2.1"
@@ -2621,9 +2990,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "phf"
@@ -2651,10 +3020,20 @@ dependencies = [
 name = "phf_codegen"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
 dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
 ]
 
 [[package]]
@@ -2725,29 +3104,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -2768,37 +3147,43 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plist"
-version = "1.4.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"
+checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef"
 dependencies = [
- "base64 0.21.0",
- "indexmap",
+ "base64 0.21.5",
+ "indexmap 2.1.0",
  "line-wrap",
  "quick-xml",
  "serde",
- "time 0.3.15",
+ "time",
 ]
 
 [[package]]
 name = "png"
-version = "0.17.8"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
+[[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.17"
@@ -2819,7 +3204,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
 dependencies = [
  "difflib",
  "float-cmp",
- "itertools 0.10.5",
+ "itertools",
  "normalize-line-endings",
  "predicates-core",
  "regex",
@@ -2843,12 +3228,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.1.25"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2858,7 +3243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -2893,9 +3278,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -2907,7 +3292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488"
 dependencies = [
  "futures",
- "gloo",
+ "gloo 0.8.1",
  "num_cpus",
  "once_cell",
  "pin-project",
@@ -2917,91 +3302,20 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "pyo3"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset 0.6.5",
- "parking_lot",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "serde",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pythonize"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7f0c136f5fbc01868185eef462800e49659eb23acca83b9e884367a006acb6"
-dependencies = [
- "pyo3",
- "serde",
-]
-
 [[package]]
 name = "quick-xml"
-version = "0.28.2"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3066,7 +3380,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.11",
 ]
 
 [[package]]
@@ -3089,18 +3403,15 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -3108,54 +3419,53 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.9",
- "redox_syscall 0.2.16",
+ "getrandom 0.2.11",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.3"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3164,7 +3474,18 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3173,6 +3494,52 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "reqwest"
+version = "0.11.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+dependencies = [
+ "base64 0.21.5",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-util",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "winreg 0.50.0",
+]
+
 [[package]]
 name = "rfd"
 version = "0.10.0"
@@ -3203,6 +3570,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -3214,29 +3587,28 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.11"
+version = "0.38.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safemem"
@@ -3255,11 +3627,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -3270,23 +3642,17 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.5"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3295,9 +3661,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3309,14 +3675,14 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cssparser",
  "derive_more",
  "fxhash",
  "log",
  "matches",
  "phf 0.8.0",
- "phf_codegen",
+ "phf_codegen 0.8.0",
  "precomputed-hash",
  "servo_arc",
  "smallvec",
@@ -3325,18 +3691,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
@@ -3352,44 +3718,66 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.12"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -3401,37 +3789,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.6",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_with"
-version = "2.3.3"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.5",
  "chrono",
  "hex",
- "indexmap",
+ "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "serde",
  "serde_json",
  "serde_with_macros",
- "time 0.3.15",
+ "time",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "2.3.3"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3466,50 +3855,11 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "settings_manager"
-version = "0.0.2"
-dependencies = [
- "cluFlock",
- "derivative",
- "dev_utils",
- "directories",
- "fake",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "settings_manager_derive",
- "tempfile",
-]
-
-[[package]]
-name = "settings_manager_change_path"
-version = "0.0.1"
-dependencies = [
- "cluFlock",
- "macrotest",
- "proc-macro2",
- "quote",
- "serde",
- "settings_manager",
- "syn 1.0.109",
- "tempfile",
-]
-
-[[package]]
-name = "settings_manager_derive"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3518,9 +3868,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -3537,30 +3887,50 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
 
 [[package]]
 name = "soup2"
@@ -3568,7 +3938,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "gio",
  "glib",
  "libc",
@@ -3582,7 +3952,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
@@ -3650,15 +4020,36 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "system-deps"
 version = "5.0.0"
@@ -3674,24 +4065,24 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.0.4"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
 dependencies = [
- "cfg-expr 0.14.0",
+ "cfg-expr 0.15.5",
  "heck 0.4.1",
  "pkg-config",
- "toml 0.7.3",
+ "toml 0.8.8",
  "version-compare 0.1.1",
 ]
 
 [[package]]
 name = "tao"
-version = "0.16.2"
+version = "0.16.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31"
+checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-rs",
  "cc",
  "cocoa",
@@ -3728,7 +4119,7 @@ dependencies = [
  "serde",
  "tao-macros",
  "unicode-segmentation",
- "uuid 1.3.1",
+ "uuid",
  "windows 0.39.0",
  "windows-implement",
  "x11-dl",
@@ -3736,9 +4127,9 @@ dependencies = [
 
 [[package]]
 name = "tao-macros"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445"
+checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3747,9 +4138,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
@@ -3758,19 +4149,19 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.6"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
+checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
 
 [[package]]
 name = "tauri"
-version = "1.3.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d42ba3a2e8556722f31336a0750c10dbb6a81396a1c452977f515da83f69f842"
+checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9"
 dependencies = [
  "anyhow",
- "attohttpc",
- "base64 0.21.0",
+ "base64 0.21.5",
+ "bytes",
  "cocoa",
  "dirs-next",
  "embed_plist",
@@ -3791,6 +4182,7 @@ dependencies = [
  "rand 0.8.5",
  "raw-window-handle",
  "regex",
+ "reqwest",
  "rfd",
  "semver",
  "serde",
@@ -3806,10 +4198,10 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
- "time 0.3.15",
+ "time",
  "tokio",
  "url",
- "uuid 1.3.1",
+ "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.39.0",
@@ -3818,30 +4210,33 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "1.2.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4"
+checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
 dependencies = [
  "anyhow",
  "cargo_toml",
+ "dirs-next",
  "heck 0.4.1",
- "json-patch 0.2.7",
+ "json-patch",
  "semver",
+ "serde",
  "serde_json",
  "tauri-utils",
- "winres",
+ "tauri-winres",
+ "walkdir",
 ]
 
 [[package]]
 name = "tauri-codegen"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a2105f807c6f50b2fa2ce5abd62ef207bc6f14c9fcc6b8caec437f6fb13bde"
+checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.5",
  "brotli",
  "ico",
- "json-patch 1.0.0",
+ "json-patch",
  "plist",
  "png",
  "proc-macro2",
@@ -3853,16 +4248,16 @@ dependencies = [
  "sha2",
  "tauri-utils",
  "thiserror",
- "time 0.3.15",
- "uuid 1.3.1",
+ "time",
+ "uuid",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-macros"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8784cfe6f5444097e93c69107d1ac5e8f13d02850efa8d8f2a40fe79674cef46"
+checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -3874,9 +4269,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b80ea3fcd5fefb60739a3b577b277e8fc30434538a2f5bba82ad7d4368c422"
+checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
 dependencies = [
  "gtk",
  "http",
@@ -3888,16 +4283,16 @@ dependencies = [
  "tauri-utils",
  "thiserror",
  "url",
- "uuid 1.3.1",
+ "uuid",
  "webview2-com",
  "windows 0.39.0",
 ]
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c396950b1ba06aee1b4ffe6c7cd305ff433ca0e30acbc5fa1a2f92a4ce70f1"
+checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3906,7 +4301,7 @@ dependencies = [
  "raw-window-handle",
  "tauri-runtime",
  "tauri-utils",
- "uuid 1.3.1",
+ "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.39.0",
@@ -3916,13 +4311,14 @@ dependencies = [
 [[package]]
 name = "tauri-sys"
 version = "0.1.0"
-source = "git+https://github.com/JonasKruckenberg/tauri-sys#904450cffe9687fdd4c5163077550edffa650a68"
+source = "git+https://github.com/JonasKruckenberg/tauri-sys#55fe1d144f30aa5aebeeb8ef937335f094720b4b"
 dependencies = [
  "futures",
  "js-sys",
  "log",
  "serde",
- "serde-wasm-bindgen",
+ "serde-wasm-bindgen 0.4.5",
+ "serde_repr",
  "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3930,18 +4326,20 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6f9c2dafef5cbcf52926af57ce9561bd33bb41d7394f8bb849c0330260d864"
+checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
 dependencies = [
  "brotli",
  "ctor",
+ "dunce",
  "glob",
  "heck 0.4.1",
- "html5ever",
+ "html5ever 0.26.0",
  "infer",
- "json-patch 1.0.0",
- "kuchiki",
+ "json-patch",
+ "kuchikiki",
+ "log",
  "memchr",
  "phf 0.10.1",
  "proc-macro2",
@@ -3956,17 +4354,27 @@ dependencies = [
  "windows 0.39.0",
 ]
 
+[[package]]
+name = "tauri-winres"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
+dependencies = [
+ "embed-resource",
+ "toml 0.7.8",
+]
+
 [[package]]
 name = "tempfile"
-version = "3.5.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -3982,9 +4390,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
 dependencies = [
  "winapi-util",
 ]
@@ -3995,12 +4403,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thin-slice"
 version = "0.1.1"
@@ -4009,27 +4411,27 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "thot-cli"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 dependencies = [
  "clap",
  "env_logger",
@@ -4037,59 +4439,62 @@ dependencies = [
  "log",
  "mockall",
  "rand 0.8.5",
- "settings_manager",
+ "thiserror",
  "thot-core",
  "thot-local",
- "uuid 0.8.2",
 ]
 
 [[package]]
 name = "thot-core"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 dependencies = [
  "aquamarine",
  "chrono",
  "clap",
- "cluFlock",
  "derivative",
  "dev_utils",
  "directories",
- "extendr-api",
  "fake",
  "has_id",
- "indexmap",
+ "indexmap 2.1.0",
  "lazy_static",
  "mockall",
  "mockall_double",
  "ntest",
- "pyo3",
- "pythonize",
  "rand 0.8.5",
  "regex",
  "serde",
  "serde_json",
+ "thiserror",
  "tracing",
- "uuid 1.3.1",
+ "uuid",
  "validator",
  "yew",
 ]
 
-[[package]]
-name = "thot-data"
-version = "0.10.0-intermediate"
-
+[[package]]
+name = "thot-data"
+version = "0.10.0-intermediate"
+dependencies = [
+ "serde",
+ "serde_json",
+ "thot-core",
+ "thot-local",
+ "thot-local-database",
+]
+
 [[package]]
 name = "thot-desktop"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "aquamarine",
  "futures",
- "gloo-storage",
- "gloo-timers",
- "indexmap",
+ "gloo-storage 0.3.0",
+ "gloo-timers 0.3.0",
+ "indexmap 2.1.0",
  "js-sys",
  "serde",
- "serde-wasm-bindgen",
+ "serde-wasm-bindgen 0.6.1",
  "serde_json",
  "tauri-sys",
  "thot-core",
@@ -4097,11 +4502,11 @@ dependencies = [
  "thot-local",
  "thot-local-database",
  "thot-ui",
- "time 0.3.15",
+ "time",
  "tracing",
  "tracing-subscriber",
  "tracing-web",
- "uuid 1.3.1",
+ "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -4114,7 +4519,7 @@ dependencies = [
 name = "thot-desktop-lib"
 version = "0.10.0"
 dependencies = [
- "indexmap",
+ "indexmap 2.1.0",
  "serde",
  "thot-core",
  "thot-local",
@@ -4122,16 +4527,15 @@ dependencies = [
 
 [[package]]
 name = "thot-desktop-tauri"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
- "cluFlock",
  "directories",
  "open",
  "serde",
  "serde_json",
- "settings_manager",
  "tauri",
  "tauri-build",
+ "thiserror",
  "thot-core",
  "thot-desktop-lib",
  "thot-local",
@@ -4140,56 +4544,50 @@ dependencies = [
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
- "uuid 1.3.1",
+ "trash",
+ "uuid",
  "zmq",
 ]
 
-[[package]]
-name = "thot-lang"
-version = "0.10.0"
-dependencies = [
- "serde",
- "serde_json",
- "thot-core",
- "thot-local",
- "thot-local-database",
-]
-
 [[package]]
 name = "thot-local"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 dependencies = [
  "aquamarine",
- "cluFlock",
  "derivative",
  "dev_utils",
  "directories",
  "fake",
+ "glob",
  "has_id",
  "lazy_static",
  "rand 0.8.5",
+ "regex",
  "serde",
  "serde_json",
- "settings_manager",
- "settings_manager_change_path",
+ "thiserror",
  "thot-core",
  "tracing",
- "uuid 1.3.1",
+ "uuid",
  "validator",
 ]
 
 [[package]]
 name = "thot-local-database"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "dev_utils",
  "fake",
+ "futures",
  "has_id",
+ "indexmap 2.1.0",
  "lazy_static",
+ "notify",
+ "notify-debouncer-full",
  "rand 0.8.5",
  "serde",
  "serde_json",
- "settings_manager",
+ "thiserror",
  "thot-core",
  "thot-local",
  "tracing",
@@ -4199,12 +4597,29 @@ dependencies = [
  "zmq",
 ]
 
+[[package]]
+name = "thot-local-database-cli"
+version = "0.0.1"
+dependencies = [
+ "clap",
+ "notify",
+ "notify-debouncer-full",
+ "serde",
+ "serde_json",
+ "thot-core",
+ "thot-local",
+ "thot-local-database",
+ "tracing",
+ "tracing-appender",
+ "tracing-subscriber",
+ "zmq",
+]
+
 [[package]]
 name = "thot-local-runner"
 version = "0.0.1"
 dependencies = [
  "serde_json",
- "settings_manager",
  "thot-core",
  "thot-local",
  "thot-local-database",
@@ -4213,16 +4628,16 @@ dependencies = [
 
 [[package]]
 name = "thot-ui"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fake",
- "indexmap",
+ "indexmap 2.1.0",
  "js-sys",
  "serde_json",
  "tauri-sys",
  "thot-core",
  "tracing",
- "uuid 1.3.1",
+ "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
@@ -4244,26 +4659,32 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.45"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
+ "deranged",
+ "itoa 1.0.9",
+ "js-sys",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
 ]
 
 [[package]]
-name = "time"
-version = "0.3.15"
+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.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
- "itoa 1.0.6",
- "js-sys",
- "libc",
- "num_threads",
- "serde",
+ "time-core",
 ]
 
 [[package]]
@@ -4283,26 +4704,53 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
+ "libc",
+ "mio",
  "num_cpus",
  "pin-project-lite",
- "windows-sys 0.45.0",
+ "socket2 0.5.5",
+ "windows-sys",
+]
+
+[[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-stream"
-version = "0.1.12"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
+ "bytes",
  "futures-core",
+ "futures-sink",
  "pin-project-lite",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -4316,45 +4764,75 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+dependencies = [
+ "indexmap 2.1.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -4362,31 +4840,32 @@ dependencies = [
 
 [[package]]
 name = "tracing-appender"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
+checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
 dependencies = [
  "crossbeam-channel",
- "time 0.3.15",
+ "thiserror",
+ "time",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -4394,12 +4873,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -4415,9 +4894,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -4428,7 +4907,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
- "time 0.3.15",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -4450,9 +4929,9 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "3.0.2"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b782240476bca40f750a7f205510ac1449ab707d3ac3f451c4b356f557c0ecd"
+checksum = "8c646008e5144d988005bec12b1e56f5e0a951e957176686815eba8b025e0418"
 dependencies = [
  "chrono",
  "libc",
@@ -4466,27 +4945,24 @@ dependencies = [
 
 [[package]]
 name = "treediff"
-version = "3.0.2"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff"
+checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
 dependencies = [
  "serde_json",
 ]
 
 [[package]]
-name = "treediff"
-version = "4.0.2"
+name = "try-lock"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
-dependencies = [
- "serde_json",
-]
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
@@ -4496,9 +4972,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -4515,30 +4991,24 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unindent"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
-
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -4546,50 +5016,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
-name = "uuid"
-version = "0.8.2"
+name = "utf8parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom 0.2.9",
- "serde",
-]
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.3.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.11",
  "serde",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "validator"
-version = "0.14.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e"
+checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
 dependencies = [
- "idna 0.2.3",
+ "idna 0.4.0",
  "lazy_static",
  "regex",
  "serde",
  "serde_derive",
  "serde_json",
  "url",
- "validator_types",
-]
-
-[[package]]
-name = "validator_types"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -4622,27 +5077,50 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
 ]
 
 [[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
 
 [[package]]
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasi"
@@ -4652,9 +5130,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "serde",
@@ -4664,24 +5142,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4691,9 +5169,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4701,28 +5179,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.34"
+version = "0.3.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
+checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -4734,19 +5212,33 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.34"
+version = "0.3.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
+checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735"
 dependencies = [
  "proc-macro2",
  "quote",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4758,7 +5250,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-rs",
  "gdk",
  "gdk-sys",
@@ -4783,7 +5275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
 dependencies = [
  "atk-sys",
- "bitflags",
+ "bitflags 1.3.2",
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gdk-sys",
@@ -4796,7 +5288,7 @@ dependencies = [
  "pango-sys",
  "pkg-config",
  "soup2-sys",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -4855,9 +5347,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -4910,7 +5402,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4923,6 +5415,15 @@ dependencies = [
  "windows-tokens",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.39.0"
@@ -4939,37 +5440,13 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4989,17 +5466,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -5016,9 +5493,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5040,9 +5517,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5064,9 +5541,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5088,9 +5565,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5112,9 +5589,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5124,9 +5601,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5148,33 +5625,44 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winres"
-version = "0.1.12"
+name = "winreg"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "toml 0.5.11",
+ "cfg-if",
+ "windows-sys",
+]
+
+[[package]]
+name = "winreg"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
+dependencies = [
+ "cfg-if",
+ "windows-sys",
 ]
 
 [[package]]
 name = "wry"
-version = "0.24.3"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea"
+checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744"
 dependencies = [
  "base64 0.13.1",
  "block",
@@ -5186,7 +5674,7 @@ dependencies = [
  "gio",
  "glib",
  "gtk",
- "html5ever",
+ "html5ever 0.25.2",
  "http",
  "kuchiki",
  "libc",
@@ -5231,24 +5719,24 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "0.2.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "yew"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc"
+checksum = "5f1a03f255c70c7aa3e9c62e15292f142ede0564123543c1cc0c7a4f31660cac"
 dependencies = [
  "console_error_panic_hook",
  "futures",
- "gloo",
+ "gloo 0.10.0",
  "implicit-clone",
- "indexmap",
+ "indexmap 2.1.0",
  "js-sys",
  "prokio",
  "rustversion",
@@ -5265,9 +5753,9 @@ dependencies = [
 
 [[package]]
 name = "yew-macro"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301"
+checksum = "02fd8ca5166d69e59f796500a2ce432ff751edecbbb308ca59fd3fe4d0343de2"
 dependencies = [
  "boolinator",
  "once_cell",
@@ -5275,21 +5763,22 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "yew-router"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426ee0486d2572a6c5e39fbdbc48b58d59bb555f3326f54631025266cf04146e"
+checksum = "4ca1d5052c96e6762b4d6209a8aded597758d442e6c479995faf0c7b5538e0c6"
 dependencies = [
- "gloo",
+ "gloo 0.10.0",
  "js-sys",
  "route-recognizer",
  "serde",
  "serde_urlencoded",
  "tracing",
+ "urlencoding",
  "wasm-bindgen",
  "web-sys",
  "yew",
@@ -5298,29 +5787,29 @@ dependencies = [
 
 [[package]]
 name = "yew-router-macro"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3"
+checksum = "42bfd190a07ca8cfde7cd4c52b3ac463803dc07323db8c34daa697e86365978c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "yew_icons"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b99d89a308cef6c47add715c5c20e381b1001ab74990ba9b66990b33a92f77d"
+checksum = "f97c8e4ff3b77038b96e7a456e9fcbe45ee11387654ff4c4a24461c38b214d1f"
 dependencies = [
  "yew",
 ]
 
 [[package]]
 name = "zeromq-src"
-version = "0.2.5+4.3.4"
+version = "0.2.6+4.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53aaa8119f753d047dc5a9dbcc720bf720b466fdf859aaaae8638f3afc1a3564"
+checksum = "fc120b771270365d5ed0dfb4baf1005f2243ae1ae83703265cb3504070f4160b"
 dependencies = [
  "cc",
  "dircpy",
@@ -5328,9 +5817,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
 dependencies = [
  "byteorder",
  "crc32fast",
@@ -5343,7 +5832,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd3091dd571fb84a9b3e5e5c6a807d186c411c812c8618786c3c30e5349234e7"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "zmq-sys",
 ]
@@ -5355,6 +5844,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e8351dc72494b4d7f5652a681c33634063bbad58046c1689e75270908fdc864"
 dependencies = [
  "libc",
- "system-deps 6.0.4",
+ "system-deps 6.2.0",
  "zeromq-src",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index afd33b6f..e9b203ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-
+resolver = "2"
 members = [
     "cli",
     "core",
@@ -9,17 +9,35 @@ members = [
     "dev_utils",
     "has_id",
     "has_id/has_id_derive",
-    "lang",
     "lang/rust",
     "local",
     "local/database",
+    "local/database/cli",
     "local/runner",
-    "settings_manager",
-    "settings_manager/settings_manager_derive",
-    "settings_manager/settings_manager_change_path",
     "ui",
 ]
 
+[workspace.dependencies]
+aquamarine = "0.3"
+clap = "4.4"
+directories = "5.0"
+indexmap = "2.1"
+js-sys = "0.3"
+serde = "1.0"
+serde_json = "1.0"
+serde-wasm-bindgen = "0.6"
+tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys" }
+thiserror = "1.0.44"
+tracing = "0.1"
+uuid = { version = "1.3", features = ["v4"] }
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4"
+web-sys = "0.3"
+yew = "0.21"
+yew-router = "0.18"
+yew_icons = "0.8"
+zmq = "0.10.0"
+
 [profile.dev]
 opt-level = 0
 debug = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4b49b4ba..f7f7f77c 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-cli"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -16,11 +16,10 @@ categories = [ "science" ]
 
 [dependencies]
 log = { version = "0.4" }
-env_logger = "0.9"
-clap = { version = "3.2", features = ["derive"] }
-uuid = { version = "0.8", features = ["serde", "v4"] }
+env_logger = "0.10"
+clap = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
 
-settings_manager = { path = "../settings_manager" }
 thot-core = { path = "../core", features=["clap"] }
 thot-local = { path = "../local" }
 
diff --git a/cli/src/commands/check.rs b/cli/src/commands/check.rs
new file mode 100644
index 00000000..25e7d125
--- /dev/null
+++ b/cli/src/commands/check.rs
@@ -0,0 +1,63 @@
+//! Check a project's health.
+use crate::Result;
+use clap::Args;
+use std::path::{Path, PathBuf};
+use std::{env, fs, io};
+use thot_local::project::{container, project, resources::Container};
+
+#[derive(Debug, Args)]
+pub struct CheckArgs {
+    #[clap(long)]
+    path: Option<PathBuf>,
+
+    #[clap(long, default_value_t = true)]
+    recurse: bool,
+}
+
+/// Check a path to ensure no files are corrupted.
+pub fn main(args: CheckArgs, verbose: bool) -> Result {
+    let path = match args.path {
+        Some(path) => path.clone(),
+        None => match env::current_dir() {
+            Ok(dir) => dir,
+            Err(err) => return Err(err.into()),
+        },
+    };
+
+    if check_path(path, args.recurse)? {
+        println!("All ok");
+    }
+
+    Ok(())
+}
+
+/// Check the health of the path.
+///
+/// # Returns
+/// + `true` if healthy, `false` otherwise.
+fn check_path(path: impl AsRef<Path>, recurse: bool) -> Result<bool> {
+    let path = path.as_ref();
+    let mut is_healthy = true;
+    if container::path_is_container(path) {
+        match Container::load_from(path) {
+            Ok(_) => {}
+            Err(err) => {
+                is_healthy = false;
+                println!("Could not load {path:?}: {err:?}");
+            }
+        }
+    }
+
+    if recurse {
+        for entry in fs::read_dir(path)? {
+            let entry = entry?;
+            if entry.path().is_dir() {
+                if check_path(entry.path(), recurse)? {
+                    is_healthy = false;
+                }
+            }
+        }
+    }
+
+    Ok(is_healthy)
+}
diff --git a/cli/src/commands/config/commands.rs b/cli/src/commands/config/commands.rs
index 3a0cc25f..fa560d4c 100644
--- a/cli/src/commands/config/commands.rs
+++ b/cli/src/commands/config/commands.rs
@@ -1,4 +1,4 @@
-use crate::result::Result;
+use crate::Result;
 use thot_core::types::UserId;
 use thot_local::system::users;
 
diff --git a/cli/src/commands/config/commands_test.rs b/cli/src/commands/config/commands_test.rs
index e47ed9cb..f7df4ad9 100644
--- a/cli/src/commands/config/commands_test.rs
+++ b/cli/src/commands/config/commands_test.rs
@@ -1,26 +1,24 @@
 use super::*;
-use uuid::Uuid;
-use thot_core::system::users;
 use fake::faker::internet::raw::FreeEmail;
 use fake::locales::EN;
 use fake::Fake;
-use settings_manager::prelude::SystemSettings;
-use thot_core::system::settings::user_settings::UserSettings;
-use thot_core::system::resources::{user::User, user_id::UserId};
+use thot_core::system::User;
+use thot_local::system::settings::UserSettings;
 
 #[test]
 fn set_user_should_work_with_email() {
     let email: String = FreeEmail(EN).fake();
     let e_id = UserId::Email(email.clone());
     let user = User::new(email.clone(), None);
-    let uid = Into::<Uuid>::into(user.rid.clone());
-    users::add_user(user);
-    set_active_user(&e_id);
+    let uid = user.rid.clone();
+    users::add_user(user).unwrap();
+    set_active_user(&e_id).unwrap();
 
     let settings = UserSettings::load().expect("user settings should load");
-    
+
     assert_eq!(
-        Some(uid), settings.active_user,
+        Some(uid),
+        settings.active_user,
         "user should be set as active"
     );
 }
@@ -28,18 +26,18 @@ fn set_user_should_work_with_email() {
 #[test]
 fn set_user_should_work_with_id() {
     let email: String = FreeEmail(EN).fake();
-    let e_id = UserId::Email(email.clone());
     let user = User::new(email.clone(), None);
     let uid = UserId::Id(user.rid.clone());
-    let uuid = Into::<Uuid>::into(user.rid.clone());
+    let uuid = user.rid.clone();
 
-    users::add_user(user);
-    set_active_user(&uid);
+    users::add_user(user).unwrap();
+    set_active_user(&uid).unwrap();
 
     let settings = UserSettings::load().expect("user settings should load");
-    
+
     assert_eq!(
-        Some(uuid), settings.active_user,
+        Some(uuid),
+        settings.active_user,
         "user should be set as active"
     );
 }
@@ -56,13 +54,11 @@ fn set_user_with_id_should_error_if_the_user_does_not_exist() {
     };
 }
 
-
 #[test]
 #[should_panic(expected = "DoesNotExist")]
 fn set_user_with_email_should_error_if_the_user_does_not_exist() {
     let email: String = FreeEmail(EN).fake();
     let e_id = UserId::Email(email.clone());
-    let user = User::new(email.clone(), None);
     match set_active_user(&e_id) {
         Err(err) => panic!("{:?}", err),
         _ => (),
diff --git a/cli/src/commands/config/mod.rs b/cli/src/commands/config/mod.rs
index a534c537..f957af7a 100644
--- a/cli/src/commands/config/mod.rs
+++ b/cli/src/commands/config/mod.rs
@@ -1,4 +1,4 @@
-use crate::result::Result;
+use crate::Result;
 use clap::{Args, Subcommand};
 use std::path::PathBuf;
 use thot_core::types::UserId;
@@ -22,4 +22,4 @@ pub struct ConfigArgs {
 #[derive(Debug, Subcommand)]
 enum Command {
     SetUser(UserId),
-}
+}
\ No newline at end of file
diff --git a/cli/src/commands/container/commands.rs b/cli/src/commands/container/commands.rs
index 5d2bc969..0b5ce9a9 100644
--- a/cli/src/commands/container/commands.rs
+++ b/cli/src/commands/container/commands.rs
@@ -1,12 +1,12 @@
-use super::{AddAssetArgs, AddChildArgs, AddScriptArgs, InitArgs, NewArgs, NewChildArgs};
+use super::{AssociateScriptArgs, InitArgs, NewArgs};
 use crate::common::abs_path;
-use crate::result::Result;
-use settings_manager::local_settings::LocalSettings;
+use crate::Result;
 use std::env;
-use thot_core::result::{Error as CoreError, ProjectError as CoreProjectError};
-use thot_local::project::resources::{Container, ScriptAssociation};
+use thot_core::error::{Error as CoreError, ProjectError as CoreProjectError, ResourceError};
+use thot_core::project::ScriptAssociation;
+use thot_local::error::{ContainerError as LocalContainerError, Error as LocalError};
+use thot_local::project::resources::{Container, Scripts};
 use thot_local::project::{container, project, script};
-use thot_local::result::{ContainerError as LocalContainerError, Error as LocalError};
 
 pub fn init(args: InitArgs, verbose: bool) -> Result {
     let path = match args.path {
@@ -14,78 +14,35 @@ pub fn init(args: InitArgs, verbose: bool) -> Result {
         Some(path) => path,
     };
 
-    let rid = container::init(path.as_path())?;
-    if verbose {
-        println!("Initialized {:?} as a Container with {:?}", &path, &rid);
-    }
-
-    Ok(())
-}
-
-pub fn new(args: NewArgs, verbose: bool) -> Result {
-    let rid = container::new(args.name.as_path())?;
-    if verbose {
-        println!("Created new Container at {:?} with {:?}", &args.name, &rid);
-    }
-
-    Ok(())
-}
-
-pub fn add_child(args: AddChildArgs, verbose: bool) -> Result {
-    let child = abs_path(args.path)?;
-    let parent = match args.parent {
-        None => env::current_dir()?,
-        Some(p) => abs_path(p)?,
-    };
-
-    let _rid = container::init_child(&child, Some(&parent))?;
-    if verbose {
-        println!("Added {:?} as a child to {:?}", &child, &parent);
-    }
-
-    Ok(())
-}
-
-pub fn new_child(args: NewChildArgs, verbose: bool) -> Result {
-    let parent = match args.parent {
-        None => env::current_dir()?,
-        Some(p) => abs_path(p)?,
-    };
-
-    let mut child = args.path;
-    if child.is_relative() {
-        let cwd = env::current_dir()?;
-        child = cwd.join(child);
+    let mut builder = container::InitOptions::init();
+    builder.recurse(!args.no_recurse);
+    if args.no_assets {
+        builder.without_assets();
+    } else {
+        builder.with_assets();
     }
 
-    let _rid = container::new_child(&child, Some(&parent))?;
+    let rid = builder.build(&path)?;
     if verbose {
-        println!("Created {:?} as a child of {:?}", &child, &parent);
+        println!("Initialized {path:?} as a Container with {rid:?}");
     }
 
     Ok(())
 }
 
-pub fn add_asset(args: AddAssetArgs, verbose: bool) -> Result {
-    let asset = abs_path(args.path)?;
-    let parent = match args.parent {
-        None => env::current_dir()?,
-        Some(p) => abs_path(p)?,
-    };
-
-    let mut container = Container::load(&parent)?;
-    container.add_asset(&asset)?;
-    container.save()?;
-
+pub fn new(args: NewArgs, verbose: bool) -> Result {
+    let path = abs_path(args.path)?;
+    let builder = container::InitOptions::new();
+    builder.build(&path)?;
     if verbose {
-        println!("Added {:?} as an Asset to {:?}", &asset, &parent);
+        println!("Initialized `{path:?}` as a Container");
     }
 
     Ok(())
 }
 
 /// Add a script association to the container.
-pub fn add_script(args: AddScriptArgs, verbose: bool) -> Result {
+pub fn associate_script(args: AssociateScriptArgs, verbose: bool) -> Result {
     // validate container and script, if required
     let cont = match args.container {
         None => env::current_dir()?,
@@ -99,28 +56,52 @@ pub fn add_script(args: AddScriptArgs, verbose: bool) -> Result {
     }
 
     let prj_path = project::project_root_path(&cont)?;
-    let script_id;
-    if !script::path_is_registered(&args.path, Some(&prj_path))? {
-        if !args.register {
-            return Err(CoreError::ProjectError(CoreProjectError::NotRegistered(
-                None,
-                Some(args.path),
+    let project = match thot_local::project::project::project_id(&prj_path)? {
+        Some(project) => project,
+        None => {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "path is not a project",
             ))
-            .into());
-        } else {
-            script_id = script::init(&args.path, Some(&prj_path))?;
-            if verbose {
-                println!(
-                    "Path initialized as a Script with {:?} for Project {:?}",
-                    &script_id, &prj_path
-                );
+            .into())
+        }
+    };
+
+    let scripts = Scripts::load_from(&prj_path)?;
+    let script = scripts
+        .values()
+        .filter_map(|script| {
+            if script.path.as_path() == args.path.as_path() {
+                Some(script.rid.clone())
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let script_id = match script.as_slice() {
+        [] => {
+            if !args.register {
+                return Err(CoreError::ProjectError(CoreProjectError::NotRegistered(
+                    None,
+                    Some(args.path),
+                ))
+                .into());
+            } else {
+                let script_id = script::init(project, args.path.clone())?;
+                if verbose {
+                    println!(
+                        "Path initialized as a Script with {script_id:?} for Project {prj_path:?}"
+                    );
+                }
+
+                script_id
             }
         }
-    } else {
-        script_id = script::id_by_path(&args.path, Some(&prj_path))?;
-    }
+        [script_id] => script_id.clone(),
+        _ => panic!("path registered as script multiple times"),
+    };
 
-    let mut container = Container::load(&cont)?;
+    let mut container = Container::load_from(&cont)?;
     let mut assoc = ScriptAssociation::new(script_id);
     if args.priority.is_some() {
         assoc.priority = args.priority.unwrap();
@@ -134,7 +115,3 @@ pub fn add_script(args: AddScriptArgs, verbose: bool) -> Result {
     container.save()?;
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./commands_test.rs"]
-mod commands_test;
diff --git a/cli/src/commands/container/commands_test.rs b/cli/src/commands/container/commands_test.rs
deleted file mode 100644
index 88bd7dec..00000000
--- a/cli/src/commands/container/commands_test.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use super::super::{InitAgs, NewArgs};
-use super::*;
-
-#[test]
-fn init_should_work() {
-    todo!();
-}
-
-#[test]
-fn new_should_work() {
-    todo!();
-}
diff --git a/cli/src/commands/container/mod.rs b/cli/src/commands/container/mod.rs
index a8ff1674..4484f452 100644
--- a/cli/src/commands/container/mod.rs
+++ b/cli/src/commands/container/mod.rs
@@ -1,5 +1,5 @@
-use crate::result::Result;
 use crate::types::ResourcePathType;
+use crate::Result;
 use clap::{Args, Subcommand};
 use std::path::PathBuf;
 mod commands;
@@ -8,10 +8,7 @@ pub fn main(args: ContainerArgs, verbose: bool) -> Result {
     match args.command {
         Command::Init(init_args) => commands::init(init_args, verbose),
         Command::New(new_args) => commands::new(new_args, verbose),
-        Command::AddChild(add_args) => commands::add_child(add_args, verbose),
-        Command::NewChild(new_args) => commands::new_child(new_args, verbose),
-        Command::AddAsset(add_args) => commands::add_asset(add_args, verbose),
-        Command::AddScript(add_args) => commands::add_script(add_args, verbose),
+        Command::AssociateScript(add_args) => commands::associate_script(add_args, verbose),
     }
 }
 
@@ -25,57 +22,33 @@ pub struct ContainerArgs {
 enum Command {
     Init(InitArgs),
     New(NewArgs),
-    AddChild(AddChildArgs),
-    NewChild(NewChildArgs),
-    AddAsset(AddAssetArgs),
-    AddScript(AddScriptArgs),
+    AssociateScript(AssociateScriptArgs),
 }
 
 #[derive(Debug, Args)]
 pub struct InitArgs {
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long)]
     path: Option<PathBuf>,
-}
-
-#[derive(Debug, Args)]
-pub struct NewArgs {
-    #[clap(parse(from_os_str))]
-    name: PathBuf,
-}
 
-#[derive(Debug, Args)]
-pub struct AddChildArgs {
-    #[clap(parse(from_os_str))]
-    path: PathBuf,
-
-    #[clap(short, long, parse(from_os_str))]
-    parent: Option<PathBuf>,
-}
-
-#[derive(Debug, Args)]
-pub struct NewChildArgs {
-    #[clap(parse(from_os_str))]
-    path: PathBuf,
+    /// Do not add files as Assets.
+    #[clap(long)]
+    no_assets: bool,
 
-    #[clap(short, long, parse(from_os_str))]
-    parent: Option<PathBuf>,
+    /// Do not recurse.
+    #[clap(long)]
+    no_recurse: bool,
 }
 
 #[derive(Debug, Args)]
-pub struct AddAssetArgs {
-    #[clap(parse(from_os_str))]
+pub struct NewArgs {
     path: PathBuf,
-
-    #[clap(short, long, parse(from_os_str))]
-    parent: Option<PathBuf>,
 }
 
 #[derive(Debug, Args)]
-pub struct AddScriptArgs {
-    #[clap(parse(from_os_str))]
+pub struct AssociateScriptArgs {
     path: PathBuf,
 
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long)]
     container: Option<PathBuf>,
 
     #[clap(short, long)]
@@ -87,8 +60,8 @@ pub struct AddScriptArgs {
     // force register parameters
     #[clap(long)]
     register: bool,
-    
-    // @todo: Only valid if register is true
+
+    // TODO Only valid if register is true
     #[clap(long, value_enum)]
     path_type: Option<ResourcePathType>,
 }
diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs
index aa71af5d..1716895a 100644
--- a/cli/src/commands/mod.rs
+++ b/cli/src/commands/mod.rs
@@ -1,7 +1,6 @@
-pub mod run;
-
+pub mod check;
 pub mod config;
 pub mod container;
 pub mod project;
-pub mod remote;
+pub mod run;
 pub mod user;
diff --git a/cli/src/commands/project/commands.rs b/cli/src/commands/project/commands.rs
index 21cc7607..1d5eb5ea 100644
--- a/cli/src/commands/project/commands.rs
+++ b/cli/src/commands/project/commands.rs
@@ -1,17 +1,29 @@
 use super::AddScriptArgs;
-use crate::result::Result;
+use crate::Result;
+use std::env;
+use thot_core::error::{Error as CoreError, ResourceError};
 use thot_local::project::script;
 
 pub fn add_script(args: AddScriptArgs, verbose: bool) -> Result {
     // format project
-    let project = match &args.project {
-        None => None,
-        Some(p) => Some(p.as_path()),
+    let project = match args.project.as_ref() {
+        None => env::current_dir().unwrap(),
+        Some(p) => p.clone(),
     };
 
-    script::init(&args.path, project)?;
+    let project = match thot_local::project::project::project_id(&project)? {
+        Some(project) => project,
+        None => {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "path is not a project",
+            ))
+            .into())
+        }
+    };
+
+    script::init(project, args.path.clone())?;
     if verbose {
-        match &args.project {
+        match args.project.as_ref() {
             None => println!("Added script at {:?} to the current project.", &args.path),
             Some(p) => println!(
                 "Added script at {:?} to the project at project {:?}.",
diff --git a/cli/src/commands/project/init.rs b/cli/src/commands/project/init.rs
index 8fad73c1..6de9c2e6 100644
--- a/cli/src/commands/project/init.rs
+++ b/cli/src/commands/project/init.rs
@@ -1,32 +1,58 @@
-use crate::result::Result;
+use crate::Result;
 use clap::Args;
 use std::env;
 use std::path::PathBuf;
-use thot_local::project::project;
+use thot_local::project;
 
 #[derive(Debug, Args)]
 pub struct InitArgs {
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long)]
     root: Option<PathBuf>,
+
+    /// Relative path to the data root.
+    #[clap(long, default_value = "data")]
+    data_root: PathBuf,
+
+    /// Relative path to the analysis root.
+    #[clap(long, default_value = "analysis")]
+    analysis_root: PathBuf,
 }
 
 /// Initializes a new Thot project.
+/// Initilizes and registers the project.
+/// Initializes any existing folders as the `Container` graph moving them into the data root folder.
+/// If analysis root exists, registers all valid files as scripts.
+///
+/// Searches for `data` folder to be used as the `Project`'s data root,
+/// and `analysis` folder for the analysis root, creating them if they don't exist.
+/// If the data root folder does not exist, move the contents of the folder into it.
+/// e.g.
+/// **Original**
+/// my_project/
+///     |- root_data.csv
+///     |- group_1/
+///     |   |- group_1_data.csv
+///
+/// **Initialized**
+/// my_project/
+///     |- analysis/
+///     |- data/
+///     |   |- root_data.csv
+///     |   |- group_1
+///     |   |   |- group_1_data.csv
+///
 pub fn main(args: InitArgs, verbose: bool) -> Result {
-    // get root passed in or default to current folder
     let root = match args.root {
-        Some(root) => root,
+        Some(root) => root.clone(),
         None => match env::current_dir() {
             Ok(dir) => dir,
             Err(err) => return Err(err.into()),
         },
     };
 
+    project::init(&root, &args.data_root, &args.analysis_root)?;
     if verbose {
-        println!("Initializing Thot project in {}", root.display());
-    }
-
-    if let Err(err) = project::init(root.as_path()) {
-        return Err(err.into());
+        println!("Initialized {root:?} as a Thot project.");
     }
 
     Ok(())
diff --git a/cli/src/commands/project/mod.rs b/cli/src/commands/project/mod.rs
index edcdf8a4..7a3cfa43 100644
--- a/cli/src/commands/project/mod.rs
+++ b/cli/src/commands/project/mod.rs
@@ -1,5 +1,4 @@
-use crate::result::Result;
-use crate::types::ResourcePathType;
+use crate::Result;
 use clap::{Args, Subcommand};
 use std::path::PathBuf;
 mod commands;
@@ -34,13 +33,11 @@ enum Command {
 
 #[derive(Debug, Args)]
 pub struct AddScriptArgs {
-    #[clap(parse(from_os_str))]
     path: PathBuf,
 
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long)]
     project: Option<PathBuf>,
-
-    // @todo: Allow path type to be specified
+    // TODO Allow path type to be specified
     // #[clap(long, value_enum)]
     // path_type: Option<ResourcePathType>,
 }
diff --git a/cli/src/commands/project/move.rs b/cli/src/commands/project/move.rs
index 8a824a6a..de78ac2a 100644
--- a/cli/src/commands/project/move.rs
+++ b/cli/src/commands/project/move.rs
@@ -1,18 +1,16 @@
-use crate::result::Result;
+use crate::Result;
 use clap::Args;
-use std::env;
 use std::path::PathBuf;
-use thot_core::result::{Error as CoreError, ProjectError as CoreProjectError};
-use thot_local::common::canonicalize_path;
+use std::{env, fs};
+use thot_core::error::{Error as CoreError, ProjectError as CoreProjectError};
 use thot_local::project::project;
 use thot_local::system::projects;
 
 #[derive(Debug, Args)]
 pub struct MoveArgs {
-    #[clap(parse(from_os_str))]
     to: PathBuf,
 
-    #[clap(long, parse(from_os_str))]
+    #[clap(long)]
     from: Option<PathBuf>,
 }
 
@@ -20,10 +18,7 @@ pub struct MoveArgs {
 pub fn main(args: MoveArgs, verbose: bool) -> Result {
     // parse to and from args
     let from = match args.from {
-        Some(path) => match canonicalize_path(path) {
-            Ok(path) => path,
-            Err(err) => return Err(err.into()),
-        },
+        Some(path) => fs::canonicalize(path)?,
         None => match env::current_dir() {
             Ok(dir) => match project::project_root_path(dir.as_path()) {
                 Ok(path) => path,
@@ -33,30 +28,19 @@ pub fn main(args: MoveArgs, verbose: bool) -> Result {
         },
     };
 
-    let prj = projects::project_by_path(from.as_path())?;
-    let rid = match prj {
+    let pid = match projects::get_id(&from)? {
+        Some(pid) => pid,
         None => {
             return Err(
                 CoreError::ProjectError(CoreProjectError::NotRegistered(None, Some(from))).into(),
             )
         }
-        Some(p) => p.rid,
     };
 
-    let to = args.to;
-
+    project::mv(&pid, args.to.as_path())?;
     if verbose {
-        println!("Moving project located at {:?} to {:?}", from, to);
-    }
-
-    // move project
-    if let Err(err) = project::mv(&rid, to.as_path()) {
-        return Err(err.into());
+        println!("Project moved from `{from:?}` to `{:?}`", args.to);
     }
 
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./move_test.rs"]
-mod move_test;
diff --git a/cli/src/commands/project/new.rs b/cli/src/commands/project/new.rs
index b2d55ebf..acc7bf47 100644
--- a/cli/src/commands/project/new.rs
+++ b/cli/src/commands/project/new.rs
@@ -1,4 +1,4 @@
-use crate::result::Result;
+use crate::Result;
 use clap::Args;
 use std::env;
 use std::path::{Path, PathBuf};
@@ -8,7 +8,7 @@ use thot_local::project::project;
 pub struct NewArgs {
     name: String,
 
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long)]
     root: Option<PathBuf>,
 }
 
@@ -36,7 +36,3 @@ pub fn main(args: NewArgs, verbose: bool) -> Result {
 
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./new_test.rs"]
-mod new_test;
diff --git a/cli/src/commands/project/new_test.rs b/cli/src/commands/project/new_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/cli/src/commands/remote/mod.rs b/cli/src/commands/remote/mod.rs
deleted file mode 100644
index a273c8cd..00000000
--- a/cli/src/commands/remote/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use crate::result::Result;
-use clap::Args;
-
-pub fn main(args: RemoteArgs, verbose: bool) -> Result<()> {
-    todo!();
-    Ok(())
-}
-
-#[derive(Debug, Args)]
-pub struct RemoteArgs {}
diff --git a/cli/src/commands/run.rs b/cli/src/commands/run.rs
index 1ee1f03d..f00509bf 100644
--- a/cli/src/commands/run.rs
+++ b/cli/src/commands/run.rs
@@ -1,4 +1,4 @@
-use crate::result::Result;
+use crate::Result;
 use clap::Args;
 
 #[derive(Debug, Args)]
diff --git a/cli/src/commands/user/commands.rs b/cli/src/commands/user/commands.rs
index 8978e805..899abe57 100644
--- a/cli/src/commands/user/commands.rs
+++ b/cli/src/commands/user/commands.rs
@@ -1,7 +1,6 @@
 use super::{AddArgs, EditUserFields};
-use crate::result::Result;
-use thot_core::result::{Error as CoreError, ResourceError};
-use settings_manager::{ListSetting, SystemSettings};
+use crate::Result;
+use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::system::User;
 use thot_core::types::UserId;
 use thot_local::system::collections::Users;
@@ -12,7 +11,7 @@ use thot_local::system::users;
 /// If verbose, output is of the form `name <email> (id)` with each user on a new line.
 /// If not verbose, output is of the form `name <email>` with each user on a new line.
 pub fn list(verbose: bool) -> Result {
-    let mut users = match Users::load() {
+    let users = match Users::load() {
         Ok(sets) => sets,
         Err(err) => panic!("Something went wrong: {:?}", err),
     };
@@ -28,21 +27,13 @@ pub fn list(verbose: bool) -> Result {
         },
     };
 
-    let users: Vec<String> = users.items().iter().map(user_str).collect();
-
-    let mut out = String::new();
+    let users = users.values().map(user_str).collect::<Vec<_>>();
     if users.len() == 0 {
-        out.push_str("No users");
-    } else {
-        for user in users {
-            out.push_str(user.as_str());
-            out.push('\n');
-        }
-
-        out.pop(); // remove last new line
+        println!("No users");
+        return Ok(());
     }
 
-    println!("{}", out);
+    println!("{}", users.join("\n"));
     Ok(())
 }
 
@@ -79,14 +70,23 @@ pub fn delete(id: UserId) -> Result {
 pub fn edit(id: UserId, edits: EditUserFields) -> Result {
     let mut user: User = match id {
         UserId::Id(uid) => match users::user_by_id(&uid) {
-            Ok(u) => u,
+            Ok(Some(user)) => user,
+            Ok(None) => {
+                return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                    "user does not exist",
+                ))
+                .into());
+            }
             Err(err) => return Err(err.into()),
         },
         UserId::Email(email) => match users::user_by_email(&email) {
-            Ok(u) => match u {
-                None => return Err(CoreError::ResourceError(ResourceError::DoesNotExist("user with email `{email}` is not registered".to_string())).into()),
-                Some(u) => u,
-            },
+            Ok(Some(user)) => user,
+            Ok(None) => {
+                return Err(CoreError::ResourceError(ResourceError::DoesNotExist(
+                    "user with email `{email}` is not registered".to_string(),
+                ))
+                .into());
+            }
             Err(err) => return Err(err.into()),
         },
     };
diff --git a/cli/src/commands/user/mod.rs b/cli/src/commands/user/mod.rs
index 812878f9..c4631199 100644
--- a/cli/src/commands/user/mod.rs
+++ b/cli/src/commands/user/mod.rs
@@ -1,4 +1,4 @@
-use crate::result::Result;
+use crate::Result;
 use clap::{ArgGroup, Args, Subcommand};
 use thot_core::types::UserId;
 mod commands;
diff --git a/cli/src/common.rs b/cli/src/common.rs
index 7a932468..475b1fe8 100644
--- a/cli/src/common.rs
+++ b/cli/src/common.rs
@@ -1,16 +1,14 @@
-use crate::result::Result;
-use std::env;
+use crate::Result;
 use std::path::PathBuf;
-use thot_local::common::canonicalize_path;
+use std::{env, fs};
 
 /// Returns the absolute version of the path, relative to the current directory, if path is relative.
-pub fn abs_path(path: PathBuf) -> Result<PathBuf> {
-    let mut path = path;
+pub fn abs_path(mut path: PathBuf) -> Result<PathBuf> {
     if path.is_relative() {
         let cwd = env::current_dir()?;
         path = cwd.join(path);
     };
 
-    path = canonicalize_path(path)?;
+    path = fs::canonicalize(path)?;
     Ok(path)
 }
diff --git a/cli/src/common_test.rs b/cli/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/cli/src/error.rs b/cli/src/error.rs
new file mode 100644
index 00000000..25e93704
--- /dev/null
+++ b/cli/src/error.rs
@@ -0,0 +1,43 @@
+use clap::error::Error as ClapError;
+use std::io;
+use std::result::Result as StdResult;
+use thot_core::Error as CoreError;
+use thot_local::Error as LocalError;
+
+// *************
+// *** Error ***
+// *************
+
+#[derive(Debug)]
+pub enum Error {
+    Clap(ClapError),
+    Core(CoreError),
+    Io(io::Error),
+    Local(LocalError),
+}
+
+impl From<ClapError> for Error {
+    fn from(err: ClapError) -> Self {
+        Error::Clap(err)
+    }
+}
+
+impl From<CoreError> for Error {
+    fn from(err: CoreError) -> Self {
+        Error::Core(err)
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(err: io::Error) -> Self {
+        Error::Io(err)
+    }
+}
+
+impl From<LocalError> for Error {
+    fn from(err: LocalError) -> Self {
+        Error::Local(err)
+    }
+}
+
+pub type Result<T = ()> = StdResult<T, Error>;
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index f7755be4..4a0cbf18 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -1,4 +1,8 @@
+#![feature(io_error_more)]
+
 pub mod commands;
 pub mod common;
-pub mod result;
+pub mod error;
 pub mod types;
+
+pub use error::Result;
diff --git a/cli/src/main.rs b/cli/src/main.rs
index a6ff7a6e..dacf9704 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -1,5 +1,5 @@
 use clap::{Parser, Subcommand};
-use thot_cli::commands::{config, container, project, remote, run, user};
+use thot_cli::commands::{check, config, container, project, run, user};
 
 fn main() {
     let cli = Cli::parse();
@@ -10,12 +10,12 @@ fn main() {
         Command::Init(args) => project::init::main(args, cli.verbose),
         Command::Move(args) => project::r#move::main(args, cli.verbose),
         Command::Run(args) => run::main(args, cli.verbose),
+        Command::Check(args) => check::main(args, cli.verbose),
 
         // subcommands
         Command::Config(args) => config::main(args, cli.verbose),
         Command::User(args) => user::main(args, cli.verbose),
         Command::Container(args) => container::main(args, cli.verbose),
-        Command::Remote(args) => remote::main(args, cli.verbose),
         Command::Project(args) => project::main(args, cli.verbose),
     };
 
@@ -27,8 +27,7 @@ fn main() {
 
 #[derive(Debug, Parser)]
 #[clap(name = "Thot CLI")]
-#[clap(version)]
-#[clap(about, long_about = None)]
+#[clap(version, about, long_about = None)]
 struct Cli {
     #[clap(subcommand)]
     command: Command,
@@ -44,11 +43,11 @@ enum Command {
     Init(project::init::InitArgs),
     Run(run::RunArgs),
     Move(project::r#move::MoveArgs),
+    Check(check::CheckArgs),
 
     // subcommands
     Config(config::ConfigArgs),
     User(user::UserArgs),
-    Remote(remote::RemoteArgs),
     Container(container::ContainerArgs),
     Project(project::ProjectArgs),
 }
diff --git a/cli/src/result.rs b/cli/src/result.rs
deleted file mode 100644
index 7478fa6f..00000000
--- a/cli/src/result.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use clap::error::Error as ClapError;
-use settings_manager::result::Error as SettingsError;
-use std::io;
-use std::result::Result as StdResult;
-use thot_core::result::Error as CoreError;
-use thot_local::result::Error as LocalError;
-
-// *************
-// *** Error ***
-// *************
-
-#[derive(Debug)]
-pub enum Error {
-    ClapError(ClapError),
-    CoreError(CoreError),
-    IoError(io::Error),
-    LocalError(LocalError),
-    SettingsError(SettingsError),
-}
-
-impl From<ClapError> for Error {
-    fn from(err: ClapError) -> Self {
-        Error::ClapError(err)
-    }
-}
-
-impl From<CoreError> for Error {
-    fn from(err: CoreError) -> Self {
-        Error::CoreError(err)
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Self {
-        Error::IoError(err)
-    }
-}
-
-impl From<LocalError> for Error {
-    fn from(err: LocalError) -> Self {
-        Error::LocalError(err)
-    }
-}
-
-impl From<SettingsError> for Error {
-    fn from(err: SettingsError) -> Self {
-        Error::SettingsError(err)
-    }
-}
-
-pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./result_test.rs"]
-mod result_test;
diff --git a/cli/src/result_test.rs b/cli/src/result_test.rs
deleted file mode 100644
index c5b1ea0a..00000000
--- a/cli/src/result_test.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use super::*;
-use std::io;
-use settings_manager::result::Error as SettingsError;
-use thot_core::result::Error as ThotError;
-use clap::Command;
-use clap::error::ErrorKind as ClapErrorKind;
-
-#[test]
-fn error_from_clap_error_should_work() {
-    let cmd = Command::new("test");
-    let o_err = cmd.error(ClapErrorKind::InvalidValue, "test");
-    
-    let c_err: Error = o_err.into();
-    assert!(matches!(c_err, Error::ClapError(_)));
-}
-
-#[test]
-fn error_from_io_error_should_work() {
-    let o_err = io::Error::new(
-        io::ErrorKind::Other,
-        "test"
-    );
-
-    let c_err: Error = o_err.into();
-    assert!(matches!(c_err, Error::IoError(_)));
-}
-
-#[test]
-fn error_from_settings_manager_error_should_work() {
-    let io_err = io::Error::new(
-        io::ErrorKind::Other,
-        "test"
-    );
-
-    let o_err = SettingsError::IoError(io_err);
-    let c_err: Error = o_err.into();
-    assert!(matches!(c_err, Error::SettingsError(_)));
-}
-
-#[test]
-fn error_from_thot_core_error_should_work() {
-    let io_err = io::Error::new(
-        io::ErrorKind::Other,
-        "test"
-    );
-
-    let o_err = ThotError::IoError(io_err);
-    let c_err: Error = o_err.into();
-    assert!(matches!(c_err, Error::ThotError(_)));
-}
diff --git a/core/Cargo.toml b/core/Cargo.toml
index d5334cc9..a0176a4c 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-core"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -15,32 +15,29 @@ categories = [ "science", "data-structures" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aquamarine = "0.1"
+aquamarine = { workspace = true }
 chrono = { version = "0.4", features = ["serde"] }
-clap = { version = "3.1", optional = true }
-cluFlock = "1.2"
+clap = { workspace = true, optional = true }
 derivative = "2.2"
-directories = "4.0"
-extendr-api = { version = "*", optional = true }
-indexmap = { version = "1.9.2", features = ["serde"] }
-pyo3 = { version = "0.17", features = ["extension-module", "macros", "serde"], optional = true }
-pythonize = { version = "0.17", optional = true}
+directories = "5.0"
+indexmap = { workspace = true, features = ["serde"] }
 regex = "1"
-serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0" }
-uuid = { version = "1.2", features = ["serde", "v4"] }
-validator = "0.14"
-yew = { version = "0.20", optional = true }
+serde = { workspace = true, features = ["derive"], optional = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+uuid = { workspace = true, features = ["serde", "v4"] }
+validator = "0.16"
+yew = { workspace = true, optional = true }
 
 has_id = { path = "../has_id", features = ["derive"] }
-tracing = "0.1.37"
 
 [dev-dependencies]
 rand = "0.8"
 fake = "2.4"
 mockall = { version = "0.11", features = ["nightly"] }
 mockall_double = "0.3"
-ntest = "0.7"
+ntest = "0.9"
 dev_utils = { path = "../dev_utils" }
 lazy_static = "1.4"
 
@@ -53,7 +50,5 @@ system = []
 
 serde = ["dep:serde", "serde/rc", "has_id/serde"]
 clap = ["dep:clap"]
-extendr = ["dep:extendr-api"]
 js = ["uuid/js"]
-pyo3 = ["dep:pyo3", "dep:pythonize"]
 yew = ["dep:yew", "chrono/wasmbind", "chrono/clock"]
diff --git a/core/src/api/database.rs b/core/src/api/database.rs
deleted file mode 100644
index adaf646f..00000000
--- a/core/src/api/database.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! API interface functionality.
-use crate::db::StandardSearchFilter as StdFilter;
-use crate::project::{Asset, Container};
-use crate::Result;
-use std::path::PathBuf;
-
-pub trait Database {
-    /// Returns the root of the database.
-    fn root(&self) -> PathBuf;
-
-    /// Finds a single Container matching the search fitler.
-    fn find_container(&self, search: StdFilter) -> Option<Container>;
-
-    /// Finds all Containers matching the search filter.
-    fn find_containers(&self, search: StdFilter) -> Vec<Container>;
-
-    /// Finds a single Asset matching the search filter.
-    fn find_asset(&self, search: StdFilter) -> Option<Asset>;
-
-    /// Finds all Assets matching the search filter.
-    fn find_assets(&self, search: StdFilter) -> Vec<Asset>;
-
-    /// Adds an Asset to the database.
-    fn add_asset(&mut self, asset: Asset) -> Result;
-}
-
-#[cfg(test)]
-#[path = "./database_test.rs"]
-mod database_test;
diff --git a/core/src/api/database_test.rs b/core/src/api/database_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/api/mod.rs b/core/src/api/mod.rs
deleted file mode 100644
index 179e0fd3..00000000
--- a/core/src/api/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! API definitions.
-pub mod database;
-
-// Re-exports
-pub use database::Database;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/api/mod_test.rs b/core/src/api/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/db/dev_utils.rs b/core/src/db/dev_utils.rs
index ddca1c22..3aaeb99b 100644
--- a/core/src/db/dev_utils.rs
+++ b/core/src/db/dev_utils.rs
@@ -1,26 +1,57 @@
 //! Dev utils for database.
-use crate::db::{Resource, StandardResource};
-use crate::project::StandardProperties;
-use crate::types::ResourceId;
+use crate::project::{Asset, Container};
+use crate::types::ResourcePath;
+use fake::faker::filesystem::raw::FilePath;
 use fake::faker::lorem::raw::{Word, Words};
 use fake::locales::EN;
 use fake::Fake;
-use has_id::HasId;
 use serde_json::Value;
 use std::collections::HashMap;
-use std::hash::{Hash, Hasher};
+use std::path::PathBuf;
 
-#[cfg(feature = "serde")]
-use serde::Deserialize;
+/// Create a fake [`ContainerProperties`].
+///
+/// # Arguments
+/// + `kind`: `None` if `kind` is allowed to be `None` or `Some`, chosen randomly.
+///     `Some(false)` to force `kind` to be `None` or `Some(true)` to force `kind` to have a value.
+pub fn mock_container(kind_none: Option<bool>) -> Container {
+    // tags
+    let tag_words: Vec<String> = Words(EN, 1..20).fake();
 
-/// Create a fake StandardProperties.
+    // metadata
+    let mut md = HashMap::new();
+    md.insert(
+        String::from("str_val"),
+        Value::String(Word(EN).fake::<String>()),
+    );
+
+    md.insert(
+        String::from("int_val"),
+        Value::Number(rand::random::<i32>().into()),
+    );
+
+    md.insert(
+        String::from("bool_val"),
+        Value::Bool(rand::random::<bool>()),
+    );
+
+    // props
+    let mut container = Container::new(Word(EN).fake::<String>());
+    container.properties.kind = fake_opt_str(kind_none);
+    container.properties.tags = tag_words;
+    container.properties.metadata = md;
+
+    container
+}
+
+/// Create a fake [`AssetProperties`].
 ///
 /// # Arguments
 /// + `name_none`: `None` if `name` is allowed to be `None` or `Some`, chosen randomly.
 ///     `Some(false)` to force `name` to be `None` or `Some(true)` to force `name` to have a value.
 /// + `kind`: `None` if `kind` is allowed to be `None` or `Some`, chosen randomly.
 ///     `Some(false)` to force `kind` to be `None` or `Some(true)` to force `kind` to have a value.
-pub fn mock_props(name_none: Option<bool>, kind_none: Option<bool>) -> StandardProperties {
+pub fn mock_asset(name_none: Option<bool>, kind_none: Option<bool>) -> Asset {
     // tags
     let tag_words: Vec<String> = Words(EN, 1..20).fake();
 
@@ -41,16 +72,24 @@ pub fn mock_props(name_none: Option<bool>, kind_none: Option<bool>) -> StandardP
         Value::Bool(rand::random::<bool>()),
     );
 
+    let mut path = PathBuf::from(FilePath(EN).fake::<String>());
+    path.set_extension("py");
+    let path = ResourcePath::new(path).expect("creating ResourcePath should work");
+
     // props
-    let mut props = StandardProperties::default();
-    props.name = fake_opt_str(name_none);
-    props.kind = fake_opt_str(kind_none);
-    props.tags = tag_words;
-    props.metadata = md;
+    let mut asset = Asset::new(path);
+    asset.properties.name = fake_opt_str(name_none);
+    asset.properties.kind = fake_opt_str(kind_none);
+    asset.properties.tags = tag_words;
+    asset.properties.metadata = md;
 
-    props
+    asset
 }
 
+// ***************
+// *** helpers ***
+// ***************
+
 /// Create a fake StandardProperties.
 ///
 /// # Arguments
@@ -68,48 +107,3 @@ fn fake_opt_str(none: Option<bool>) -> Option<String> {
         false => None,
     }
 }
-
-// -----------------------
-// --- Standard Object ---
-// -----------------------
-
-#[cfg_attr(feature = "serde", derive(Deserialize))]
-#[derive(HasId, Clone, Debug, PartialEq, Eq)]
-pub struct StdObj {
-    #[id]
-    pub rid: ResourceId,
-    pub props: StandardProperties,
-}
-
-impl StdObj {
-    /// Create a new StdObj.
-    ///
-    /// # Arguments
-    /// + `name_none`: `None` if `name` is allowed to be `None` or `Some`, chosen randomly.
-    ///     `Some(false)` to force `name` to be `None` or `Some(true)` to force `name` to have a value.
-    /// + `kind`: `None` if `kind` is allowed to be `None` or `Some`, chosen randomly.
-    ///     `Some(false)` to force `kind` to be `None` or `Some(true)` to force `kind` to have a value.
-    pub fn new(name_none: Option<bool>, kind_none: Option<bool>) -> StdObj {
-        Self {
-            rid: ResourceId::new(),
-            props: mock_props(name_none, kind_none),
-        }
-    }
-}
-
-impl Hash for StdObj {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.rid.hash(state);
-    }
-}
-
-impl Resource for StdObj {}
-impl StandardResource for StdObj {
-    fn properties(&self) -> &StandardProperties {
-        &self.props
-    }
-
-    fn properties_mut(&mut self) -> &mut StandardProperties {
-        &mut self.props
-    }
-}
diff --git a/core/src/db/mod.rs b/core/src/db/mod.rs
index 3895b424..923c5c62 100644
--- a/core/src/db/mod.rs
+++ b/core/src/db/mod.rs
@@ -3,12 +3,8 @@ pub mod resource;
 pub mod search_filter;
 
 // Re-exports
-pub use resource::{Resource, StandardResource};
+pub use resource::Resource;
 pub use search_filter::{SearchFilter, StandardSearchFilter};
 
 #[cfg(test)]
 mod dev_utils;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/db/mod_test.rs b/core/src/db/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/db/resource.rs b/core/src/db/resource.rs
index 87e55624..4356f959 100644
--- a/core/src/db/resource.rs
+++ b/core/src/db/resource.rs
@@ -1,21 +1,7 @@
 //! Database object functionality.
-use crate::project::standard_properties::StandardProperties;
 use crate::types::ResourceId;
 use has_id::HasId;
 use std::hash::Hash;
 
 /// Functionality for database objects.
 pub trait Resource: HasId<Id = ResourceId> + Hash + Clone + PartialEq + Eq {}
-
-/// Functionality for standard objects.
-pub trait StandardResource: Resource {
-    /// Retrieve a reference to the [`StandardProperties`] of the object.
-    fn properties(&self) -> &StandardProperties;
-
-    /// Retrieve a mutable reference to the [`StandardProperties`] of the object.
-    fn properties_mut(&mut self) -> &mut StandardProperties;
-}
-
-#[cfg(test)]
-#[path = "./resource_test.rs"]
-mod resource_test;
diff --git a/core/src/db/resource_test.rs b/core/src/db/resource_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/db/search_filter.rs b/core/src/db/search_filter.rs
index d3935390..b73fcd17 100644
--- a/core/src/db/search_filter.rs
+++ b/core/src/db/search_filter.rs
@@ -1,11 +1,10 @@
 //! Search filter functionality.
-use super::StandardResource;
-use crate::project::Metadata;
+use crate::project::{Asset, Container, Metadata};
 use crate::types::ResourceId;
 use std::collections::HashSet;
 
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 
 // *************
 // *** Trait ***
@@ -21,32 +20,116 @@ pub trait SearchFilter<T> {
 // *** Standard Filter ***
 // ***********************
 
+#[cfg(feature = "serde")]
+fn deserialize_possible_empty_string<'de, D>(
+    deserializer: D,
+) -> Result<Option<Option<String>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    match Option::<String>::deserialize(deserializer)? {
+        None => Ok(None),
+        Some(val) if val.is_empty() => Ok(Some(None)),
+        Some(val) => Ok(Some(Some(val))),
+    }
+}
+
 /// Search filter for all properties.
 #[cfg_attr(feature = "pyo3", pyo3::pyclass)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Default, Debug, Clone)]
 pub struct StandardSearchFilter {
     pub rid: Option<ResourceId>,
+
+    #[cfg_attr(
+        feature = "serde",
+        serde(default, deserialize_with = "deserialize_possible_empty_string")
+    )]
     pub name: Option<Option<String>>,
+
+    #[cfg_attr(
+        feature = "serde",
+        serde(default, deserialize_with = "deserialize_possible_empty_string")
+    )]
     pub kind: Option<Option<String>>,
     pub tags: Option<HashSet<String>>,
     pub metadata: Option<Metadata>,
 }
 
-impl<T> SearchFilter<T> for StandardSearchFilter
-where
-    T: StandardResource,
-{
-    // @todo: Should just pass `StandardProperties`.
-    // Then can remove `StandardResource` trait.
-    fn matches(&self, resource: &T) -> bool {
+// ************************
+// *** Container Filter ***
+// ************************
+
+impl SearchFilter<Container> for StandardSearchFilter {
+    fn matches(&self, container: &Container) -> bool {
+        if let Some(s_rid) = self.rid.as_ref() {
+            if s_rid != &container.rid {
+                return false;
+            }
+        }
+
+        let props = &container.properties;
+        if let Some(s_name) = self.name.as_ref() {
+            if let Some(s_name) = s_name.as_ref() {
+                if s_name != &props.name {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+        if let Some(s_kind) = self.kind.as_ref() {
+            if s_kind != &props.kind {
+                return false;
+            }
+        }
+
+        if let Some(s_tags) = self.tags.as_ref() {
+            for s_tag in s_tags {
+                if !props.tags.contains(s_tag) {
+                    return false;
+                }
+            }
+        }
+
+        if let Some(s_md) = self.metadata.as_ref() {
+            for (s_key, s_val) in s_md {
+                let Some(f_val) = props.metadata.get(s_key) else {
+                    return false;
+                };
+
+                // only compare number values, not types
+                if f_val.is_number() && s_val.is_number() {
+                    if f_val.as_f64() != s_val.as_f64() {
+                        return false;
+                    }
+                } else {
+                    if f_val != s_val {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        // all search criteria matched
+        true
+    }
+}
+
+// ********************
+// *** Asset Filter ***
+// ********************
+
+impl SearchFilter<Asset> for StandardSearchFilter {
+    fn matches(&self, asset: &Asset) -> bool {
         if let Some(s_rid) = self.rid.as_ref() {
-            if s_rid != resource.id() {
+            if s_rid != &asset.rid {
                 return false;
             }
         }
 
-        let props = resource.properties();
+        let props = &asset.properties;
         if let Some(s_name) = self.name.as_ref() {
             if s_name != &props.name {
                 return false;
diff --git a/core/src/db/search_filter_test.rs b/core/src/db/search_filter_test.rs
index c910ac91..f64e20e9 100644
--- a/core/src/db/search_filter_test.rs
+++ b/core/src/db/search_filter_test.rs
@@ -1,4 +1,4 @@
-use super::super::dev_utils::StdObj;
+use super::super::dev_utils;
 use super::*;
 use rand::Rng;
 use std::collections::HashMap;
@@ -14,29 +14,142 @@ fn standard_search_filter_new_should_work() {
     assert_eq!(f.metadata, None, "metadata should be None");
 }
 
-// @todo: Known errors in test caused by randomized values can cause failure.
+// TODO Known errors in test caused by randomized values can cause failure.
 #[test]
-fn standard_search_filter_matches_should_work() {
+fn standard_search_filter_container_matches_should_work() {
     // setup
-    // props
-    let obj0 = StdObj::new(None, None);
+    // properties
+
+    let obj0 = dev_utils::mock_container(None);
+
+    let p1_kind = match &obj0.properties.kind {
+        None => Some(true),
+        Some(_) => None,
+    };
+
+    let mut obj1 = dev_utils::mock_container(p1_kind);
+
+    // prepend to tags to prevent clash
+    obj1.properties.tags = obj1
+        .properties
+        .tags
+        .into_iter()
+        .map(|t| format!("pre_{t}"))
+        .collect();
+
+    // filters
+    let mut rid_filter = StandardSearchFilter::default();
+    rid_filter.rid = Some(obj0.rid.clone());
+
+    let mut name_filter = StandardSearchFilter::default();
+    name_filter.name = Some(Some(obj0.properties.name.clone()));
+
+    let mut kind_filter = StandardSearchFilter::default();
+    kind_filter.kind = Some(obj0.properties.kind.clone());
+
+    let mut tags_filter = StandardSearchFilter::default();
+    let mut tf = HashSet::new();
+    for t in &obj0.properties.tags {
+        if rand::random() {
+            tf.insert(t.clone());
+        }
+    }
+    tags_filter.tags = Some(tf);
+
+    let mut md_filter = StandardSearchFilter::default();
+    let mut md = HashMap::new();
+
+    // create random metadata filter from data
+    // ensure at least one value is included
+    let f_len = obj0.properties.metadata.len();
+    let mut include: Vec<bool> = Vec::with_capacity(f_len);
+    for _ in 0..f_len {
+        include.push(rand::random());
+    }
+    if include.iter().all(|&x| !x) {
+        // no true values for include
+        // force one to be true
+        let mut rng = rand::thread_rng();
+        include[rng.gen_range(0..f_len)] = true;
+    }
+
+    let mut i = 0;
+    for (k, v) in &obj0.properties.metadata {
+        if include[i] {
+            md.insert(k.clone(), v.clone());
+        }
+        i += 1;
+    }
+    if md.len() == 1 {
+        for (k, v) in &md {
+            if let serde_json::Value::Bool(_) = v {
+                // ensure if matching on boolean value only
+                // obj1 has opposite value of obj0
+                let p0_val = obj0
+                    .properties
+                    .metadata
+                    .get(k)
+                    .expect("metadata should exist");
+                let p0_val = p0_val.as_bool().expect("metadata value should be a bool");
+                obj1.properties
+                    .metadata
+                    .insert(k.clone(), serde_json::Value::Bool(!p0_val));
+            }
+        }
+    }
+    md_filter.metadata = Some(md);
+
+    // test
+    // rid
+    assert!(rid_filter.matches(&obj0), "rid filter should match");
+    assert!(!rid_filter.matches(&obj1), "rid filter should not match");
+
+    // name
+    assert!(name_filter.matches(&obj0), "name filter should match");
+    assert!(!name_filter.matches(&obj1), "name filter should not match");
+
+    // kind
+    assert!(kind_filter.matches(&obj0), "kind filter should match");
+    assert!(!kind_filter.matches(&obj1), "kind filter should not match");
+
+    // tags
+    assert!(tags_filter.matches(&obj0), "tags filter should match");
+    assert!(!tags_filter.matches(&obj1), "tags filter should not match");
+
+    // metadata
+    assert!(md_filter.matches(&obj0), "metadata filter should match");
+    assert!(
+        !md_filter.matches(&obj1),
+        "metadata filter should not match"
+    );
+
+    // TODO Check empty filters. Specifically for `tags` and `metadata`.
+}
+
+// TODO Known errors in test caused by randomized values can cause failure.
+#[test]
+fn standard_search_filter_asset_matches_should_work() {
+    // setup
+    // properties
+
+    let obj0 = dev_utils::mock_asset(None, None);
 
     // force p1 to have different name and kind if either is None
-    let p1_name = match &obj0.props.name {
+    let p1_name = match &obj0.properties.name {
         None => Some(true),
         Some(_) => None,
     };
 
-    let p1_kind = match &obj0.props.kind {
+    let p1_kind = match &obj0.properties.kind {
         None => Some(true),
         Some(_) => None,
     };
 
-    let mut obj1 = StdObj::new(p1_name, p1_kind);
+    let mut obj1 = dev_utils::mock_asset(p1_name, p1_kind);
 
     // prepend to tags to prevent clash
-    obj1.props.tags = obj1
-        .props
+    obj1.properties.tags = obj1
+        .properties
         .tags
         .into_iter()
         .map(|t| format!("pre_{t}"))
@@ -47,14 +160,14 @@ fn standard_search_filter_matches_should_work() {
     rid_filter.rid = Some(obj0.rid.clone());
 
     let mut name_filter = StandardSearchFilter::default();
-    name_filter.name = Some(obj0.props.name.clone());
+    name_filter.name = Some(obj0.properties.name.clone());
 
     let mut kind_filter = StandardSearchFilter::default();
-    kind_filter.kind = Some(obj0.props.kind.clone());
+    kind_filter.kind = Some(obj0.properties.kind.clone());
 
     let mut tags_filter = StandardSearchFilter::default();
     let mut tf = HashSet::new();
-    for t in &obj0.props.tags {
+    for t in &obj0.properties.tags {
         if rand::random() {
             tf.insert(t.clone());
         }
@@ -66,7 +179,7 @@ fn standard_search_filter_matches_should_work() {
 
     // create random metadata filter from data
     // ensure at least one value is included
-    let f_len = obj0.props.metadata.len();
+    let f_len = obj0.properties.metadata.len();
     let mut include: Vec<bool> = Vec::with_capacity(f_len);
     for _ in 0..f_len {
         include.push(rand::random());
@@ -79,7 +192,7 @@ fn standard_search_filter_matches_should_work() {
     }
 
     let mut i = 0;
-    for (k, v) in &obj0.props.metadata {
+    for (k, v) in &obj0.properties.metadata {
         if include[i] {
             md.insert(k.clone(), v.clone());
         }
@@ -90,9 +203,13 @@ fn standard_search_filter_matches_should_work() {
             if let serde_json::Value::Bool(_) = v {
                 // ensure if matching on boolean value only
                 // obj1 has opposite value of obj0
-                let p0_val = obj0.props.metadata.get(k).expect("metadata should exist");
+                let p0_val = obj0
+                    .properties
+                    .metadata
+                    .get(k)
+                    .expect("metadata should exist");
                 let p0_val = p0_val.as_bool().expect("metadata value should be a bool");
-                obj1.props
+                obj1.properties
                     .metadata
                     .insert(k.clone(), serde_json::Value::Bool(!p0_val));
             }
@@ -124,5 +241,5 @@ fn standard_search_filter_matches_should_work() {
         "metadata filter should not match"
     );
 
-    // @todo: Check empty filters. Specifically for `tags` and `metadata`.
+    // TODO Check empty filters. Specifically for `tags` and `metadata`.
 }
diff --git a/core/src/error.rs b/core/src/error.rs
index 1523c589..0a453916 100644
--- a/core/src/error.rs
+++ b/core/src/error.rs
@@ -1,11 +1,10 @@
 //! Common error types.
-// use crate::db::error::Error as DbError;
 use crate::types::{ResourceId, ResourcePath};
 use std::convert::From;
-use std::ffi::OsString;
 use std::io;
 use std::path::PathBuf;
 use std::result::Result as StdResult;
+use thiserror::Error;
 
 #[cfg(feature = "serde")]
 use serde::{self, Deserialize, Serialize};
@@ -15,11 +14,26 @@ use serde::{self, Deserialize, Serialize};
 // **********************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum ResourceError {
-    DoesNotExist(&'static str),
+    #[error("resource `{0}` does not exist")]
+    DoesNotExist(String),
+
+    #[error("id `{0}` already exists")]
     DuplicateId(ResourceId),
-    AlreadyExists(&'static str),
+
+    #[error("resource `{0}` already exists")]
+    AlreadyExists(String),
+}
+
+impl ResourceError {
+    pub fn does_not_exist(msg: impl Into<String>) -> Self {
+        Self::DoesNotExist(msg.into())
+    }
+
+    pub fn already_exists(msg: impl Into<String>) -> Self {
+        Self::AlreadyExists(msg.into())
+    }
 }
 
 // **********************
@@ -27,10 +41,19 @@ pub enum ResourceError {
 // **********************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum ProjectError {
+    #[error("Project is not registered")]
     NotRegistered(Option<ResourceId>, Option<PathBuf>),
-    Misconfigured(&'static str),
+
+    #[error("Project is misconfigured: {0}")]
+    Misconfigured(String),
+}
+
+impl ProjectError {
+    pub fn misconfigured(msg: impl Into<String>) -> Self {
+        Self::Misconfigured(msg.into())
+    }
 }
 
 // ******************
@@ -38,19 +61,16 @@ pub enum ProjectError {
 // ******************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum GraphError {
-    InvalidGraph(&'static str),
+    #[error("invalid graph: {0}")]
+    InvalidGraph(String),
 }
 
-// ***********************
-// *** Container Error ***
-// ***********************
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
-pub enum ContainerError {
-    MissingChild(ResourceId),
+impl GraphError {
+    pub fn invalid_graph(msg: impl Into<String>) -> Self {
+        Self::InvalidGraph(msg.into())
+    }
 }
 
 // *******************
@@ -58,9 +78,12 @@ pub enum ContainerError {
 // *******************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum AssetError {
+    #[error("Asset not registered")]
     NotRegistered(Option<ResourceId>, Option<ResourcePath>),
+
+    #[error("Asset path is not set")]
     PathNotSet,
 }
 
@@ -68,10 +91,11 @@ pub enum AssetError {
 // *** Script Error ***
 // ********************
 
-// @todo: serde features.
-#[derive(Debug)]
+#[derive(Error, Debug)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ScriptError {
-    UnknownLanguage(Option<OsString>),
+    #[error("unknown language `{0:?}`")]
+    UnknownLanguage(Option<String>),
 }
 
 // ***************************
@@ -79,9 +103,16 @@ pub enum ScriptError {
 // ***************************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum ResourcePathError {
-    CouldNotParseMetalevel(&'static str),
+    #[error("{0}")]
+    CouldNotParseMetalevel(String),
+}
+
+impl ResourcePathError {
+    pub fn could_not_parse_meta_level(msg: impl Into<String>) -> Self {
+        Self::CouldNotParseMetalevel(msg.into())
+    }
 }
 
 // ********************
@@ -89,7 +120,7 @@ pub enum ResourcePathError {
 // ********************
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum RunnerError {
     /// An error occured when running the script
     /// on the specified `Container`.
@@ -98,30 +129,63 @@ pub enum RunnerError {
     /// 1. [`ResourceId`] of the `Script`.
     /// 2. [`ResourceId`] of the `Container`.
     /// 3. Error message from the script.
+    #[error("Script `{0}` running over Container `{1}` errored: {2}")]
     ScriptError(ResourceId, ResourceId, String),
+
+    #[error("Error running `{cmd}` from script `{script}` on container `{container}`")]
+    CommandError{
+        script: ResourceId,
+        container: ResourceId,
+        cmd: String,
+    }
 }
 
 // ******************
 // *** Thot Error ***
 // ******************
 
-// @todo[3]: Put behind correct features.
-#[derive(Debug)]
+// TODO Put behind correct features.
+#[derive(Error, Debug)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Error {
+    #[error("{0}")]
     AssetError(AssetError),
-    ContainerError(ContainerError),
-    // DbError(DbError),
+
+    #[error("{0}")]
+    #[cfg_attr(feature = "serde", serde(skip))]
     IoError(io::Error),
+
+    #[error("{0}")]
     ProjectError(ProjectError),
+
+    #[error("{0}")]
     ResourceError(ResourceError),
+
+    #[error("{0}")]
     GraphError(GraphError),
+
+    #[error("{0}")]
     ResourcePathError(ResourcePathError),
+
+    #[error("{0}")]
     RunnerError(RunnerError),
+
+    #[error("{0}")]
     ScriptError(ScriptError),
+
+    #[error("{0}")]
+    #[cfg_attr(feature = "serde", serde(skip))]
     SerdeError(serde_json::Error),
 
     /// Invalid value encountered.
-    ValueError(&'static str),
+    #[error("{0}")]
+    Value(String),
+}
+
+impl Error {
+    pub fn value(msg: impl Into<String>) -> Self {
+        Self::Value(msg.into())
+    }
 }
 
 impl From<io::Error> for Error {
@@ -154,15 +218,9 @@ impl From<GraphError> for Error {
     }
 }
 
-// @todo: Make better.
-#[cfg(feature = "serde")]
-impl Serialize for Error {
-    fn serialize<S>(&self, serializer: S) -> StdResult<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        let msg = format!("{:?}", self);
-        serializer.serialize_str(msg.as_ref())
+impl From<ScriptError> for Error {
+    fn from(err: ScriptError) -> Self {
+        Self::ScriptError(err)
     }
 }
 
diff --git a/core/src/graph/edge.rs b/core/src/graph/edge.rs
index fe5740c7..9a312f35 100644
--- a/core/src/graph/edge.rs
+++ b/core/src/graph/edge.rs
@@ -94,7 +94,3 @@ impl DirectedEdge {
         &self.to
     }
 }
-
-#[cfg(test)]
-#[path = "./edge_test.rs"]
-mod edge_test;
diff --git a/core/src/graph/edge_test.rs b/core/src/graph/edge_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/graph/mod.rs b/core/src/graph/mod.rs
index 413fb3c3..5319493c 100644
--- a/core/src/graph/mod.rs
+++ b/core/src/graph/mod.rs
@@ -7,7 +7,3 @@ pub mod tree;
 // pub use edge::{DirectedEdge, DirectedEdgeBuilder};
 pub use node::ResourceNode;
 pub use tree::ResourceTree;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/graph/mod_test.rs b/core/src/graph/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/graph/node.rs b/core/src/graph/node.rs
index 27be8a16..d3e99b03 100644
--- a/core/src/graph/node.rs
+++ b/core/src/graph/node.rs
@@ -1,12 +1,13 @@
 //! Graph node.
 use crate::types::ResourceId;
 use has_id::HasId;
+use std::fmt;
 use std::ops::{Deref, DerefMut};
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-// @todo[2]: Clean up serde.
+// TODO Clean up serde.
 /// A graph node for a resource.
 /// The id of the node matches the id of the resource.
 /// Contains data.
@@ -61,6 +62,11 @@ where
     }
 }
 
-#[cfg(test)]
-#[path = "./node_test.rs"]
-mod node_test;
+impl<D> fmt::Debug for ResourceNode<D>
+where
+    D: fmt::Debug + HasId<Id = ResourceId>,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self.data())
+    }
+}
diff --git a/core/src/graph/node_test.rs b/core/src/graph/node_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/graph/tree.rs b/core/src/graph/tree.rs
index 6ea7e42a..ed8ea91f 100644
--- a/core/src/graph/tree.rs
+++ b/core/src/graph/tree.rs
@@ -7,6 +7,7 @@ use has_id::HasId;
 use indexmap::IndexSet;
 use std::collections::hash_map::{Iter, IterMut};
 use std::collections::HashSet;
+use std::fmt;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -74,7 +75,7 @@ where
         // compute parents, find root.
         for (id, node) in nodes.iter() {
             let Some(children) = edges.get(&id) else {
-                return Err(GraphError::InvalidGraph("node does not have edge map").into());
+                return Err(GraphError::invalid_graph("node does not have edge map").into());
             };
 
             for child in children {
@@ -83,12 +84,16 @@ where
             }
         }
 
-        if root.len() != 1 {
-            return Err(GraphError::InvalidGraph("root `Node` not found").into());
-        }
+        let root = match root.len() {
+            0 => return Err(GraphError::invalid_graph("root `Node` not found").into()),
+            1 => {
+                let Some(root) = root.into_iter().next() else {
+                    return Err(GraphError::invalid_graph("could not get root").into());
+                };
 
-        let Some(root) = root.into_iter().next() else {
-            return Err(GraphError::InvalidGraph("could not get root").into());
+                root
+            }
+            _ => return Err(GraphError::invalid_graph("multiple root `Node`s found").into()),
         };
 
         parents.insert(root.clone(), None);
@@ -145,11 +150,11 @@ where
     pub fn insert(&mut self, parent: ResourceId, data: D) -> Result {
         // check parent exists
         if !self.nodes.contains_key(&parent) {
-            return Err(ResourceError::DoesNotExist("parent `Node` not found").into());
+            return Err(ResourceError::does_not_exist("parent `Node` not found").into());
         }
 
         let Some(children) = self.edges.get_mut(&parent) else {
-            return Err(ResourceError::DoesNotExist("parent `Node` not found").into());
+            return Err(ResourceError::does_not_exist("parent `Node` not found").into());
         };
 
         let node = ResourceNode::new(data);
@@ -164,27 +169,74 @@ where
     }
 
     /// Returns the children `Containers` of the parent, if found.
+    ///
+    /// # Returns
+    /// `None` if the parent `Node` is not found.
     pub fn children(&self, parent: &ResourceId) -> Option<&IndexSet<ResourceId>> {
-        self.edges.get(&parent).to_owned()
+        self.edges.get(parent)
     }
 
     /// Returns the parent of a `Node`.
     ///
+    /// # Returns
+    /// `None` if the `Node` is the graph root.
+    ///
     /// # Errors
     /// + If the child does not exist.
     pub fn parent(&self, child: &ResourceId) -> Result<Option<&ResourceId>> {
         let Some(parent) = self.parents.get(&child) else {
-            return Err(ResourceError::DoesNotExist("`Node` not found").into());
+            return Err(ResourceError::does_not_exist("`Node` not found").into());
         };
 
         Ok(parent.as_ref())
     }
 
+    /// Returns the siblings of a `Node`.
+    ///
+    /// # Returns
+    /// `None` if the `Node` is not found.
+    pub fn siblings(&self, node: &ResourceId) -> Option<Vec<ResourceId>> {
+        let Ok(parent) = self.parent(node) else {
+            // node not found
+            return None;
+        };
+
+        let Some(parent) = parent else {
+            // node is root
+            return Some(Vec::new());
+        };
+
+        Some(
+            self.children(parent)
+                .unwrap()
+                .iter()
+                .map(|rid| rid.clone())
+                .collect(),
+        )
+    }
+
+    /// Returns the path of ancesetors to the tree root.
+    /// Begins with self.
+    ///
+    /// # Returns
+    /// + Empty `Vec` if the `root` `Node` is not found.
+    /// + `Vec` of the ancestor path to the tree root, beginning with self.
+    pub fn ancestors(&self, root: &ResourceId) -> Vec<ResourceId> {
+        let mut ancestors = Vec::new();
+        let mut current = self.get(root).map(|node| node.id());
+        while let Some(id) = current {
+            ancestors.push(id.clone());
+            current = self.parent(id).expect("parent not found");
+        }
+
+        return ancestors;
+    }
+
     /// Returns all the descendants of the root.
     ///
     /// # Returns
     /// + `None` if the root `Node` does not exist.
-    /// + Descendant Ids, otherwise.
+    /// + Descendant ids, including `root`, otherwise.
     pub fn descendants(&self, root: &ResourceId) -> Option<HashSet<ResourceId>> {
         let mut descendants = HashSet::new();
         if !self.get(&root).is_some() {
@@ -212,7 +264,7 @@ where
     pub fn insert_tree(&mut self, parent: &ResourceId, tree: Self) -> Result {
         // insert root
         let Some(p_edges) = self.edges.get_mut(&parent) else {
-            return Err(ResourceError::DoesNotExist("parent edges not found").into());
+            return Err(ResourceError::does_not_exist("parent edges not found").into());
         };
 
         let root = tree.root().clone();
@@ -280,18 +332,18 @@ where
     pub fn mv(&mut self, root: &ResourceId, parent: &ResourceId) -> Result {
         // remove from original parent
         let Some(Some(o_parent)) = self.parents.get(&root) else {
-            return Err(ResourceError::DoesNotExist("parent `Node` does not exist").into());
+            return Err(ResourceError::does_not_exist("parent `Node` does not exist").into());
         };
 
         let Some(op_edges) = self.edges.get_mut(o_parent) else {
-            return Err(ResourceError::DoesNotExist("`Node` edges do not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` edges do not exist").into());
         };
 
         op_edges.remove(root);
 
         // add to new parent
         let Some(np_edges) = self.edges.get_mut(parent) else {
-            return Err(ResourceError::DoesNotExist("`Node` edges do not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` edges do not exist").into());
         };
 
         np_edges.insert(root.clone());
@@ -306,15 +358,15 @@ where
     /// + Follows the rules of [`indexset::IndexSet::move_index`].
     pub fn move_index(&mut self, node: &ResourceId, index: usize) -> Result {
         let Some(Some(parent)) = self.parents.get(&node) else {
-            return Err(ResourceError::DoesNotExist("`Node` parent does not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` parent does not exist").into());
         };
 
         let Some(edges) = self.edges.get_mut(parent) else {
-            return Err(ResourceError::DoesNotExist("`Node` edges do not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` edges do not exist").into());
         };
 
         let Some(curr_index) = edges.get_index_of(node) else {
-            return Err(ResourceError::DoesNotExist("`Node` edges do not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` edges do not exist").into());
         };
 
         edges.move_index(curr_index, index);
@@ -333,7 +385,7 @@ where
 
         // remove root node
         let Some(node) = self.nodes.remove(root) else {
-            return Err(ResourceError::DoesNotExist("`Node` does not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` does not exist").into());
         };
 
         self.parents.remove(node.id());
@@ -341,7 +393,7 @@ where
 
         // remove children
         let Some(children) = self.edges.remove(&root) else {
-            return Err(ResourceError::DoesNotExist("`Node` edges do not exist").into());
+            return Err(ResourceError::does_not_exist("`Node` edges do not exist").into());
         };
 
         for child in children.iter() {
@@ -369,7 +421,7 @@ where
     /// Clones a subtree.
     pub fn clone_tree(&self, root: &ResourceId) -> Result<Self> {
         let Some(root_node) = self.nodes.get(&root) else {
-            return Err(ResourceError::DoesNotExist("root `Node` not found").into());
+            return Err(ResourceError::does_not_exist("root `Node` not found").into());
         };
 
         let mut tree = Self::new(root_node.clone().into_data());
@@ -381,6 +433,15 @@ where
     }
 }
 
+impl<D> fmt::Debug for ResourceTree<D>
+where
+    D: fmt::Debug + HasId<Id = ResourceId>,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}\n{:?}", self.nodes(), self.edges())
+    }
+}
+
 #[cfg(test)]
 #[path = "./tree_test.rs"]
 mod tree_test;
diff --git a/core/src/graph/tree_test.rs b/core/src/graph/tree_test.rs
index 4d7422e1..cf1bf7ad 100644
--- a/core/src/graph/tree_test.rs
+++ b/core/src/graph/tree_test.rs
@@ -166,6 +166,57 @@ fn root_should_work() {
     assert_eq!(&data_0, f_root.inner(), "root data incorrect");
 }
 
+#[test]
+fn ancestors_should_work() {
+    // setup
+    let root = Data::new();
+    let mut tree = ResourceTree::new(root);
+
+    let c1 = Data::new();
+    let c2 = Data::new();
+    let c11 = Data::new();
+
+    let c1_id = c1.id().clone();
+    let c2_id = c2.id().clone();
+    let c11_id = c11.id().clone();
+
+    tree.insert(tree.root().clone(), c1)
+        .expect("could not insert root child `Node`");
+
+    tree.insert(tree.root().clone(), c2)
+        .expect("could not insert root child `Node`");
+
+    tree.insert(c1_id.clone(), c11)
+        .expect("could not insert `Node`");
+
+    // test
+    let blank_ans = tree.ancestors(&ResourceId::new());
+    assert_eq!(0, blank_ans.len(), "unfound node should have no ancestors");
+
+    let root_ans = tree.ancestors(tree.root());
+    assert_eq!(
+        vec![tree.root().clone()],
+        root_ans,
+        "root ancestors should only be self"
+    );
+
+    let c1_ans = tree.ancestors(&c1_id);
+    assert_eq!(2, c1_ans.len(), "incorrect ancestor path length");
+    assert_eq!(c1_id, c1_ans[0], "ancestors should start with self");
+    assert_eq!(tree.root(), &c1_ans[1], "ancestors should end with root");
+
+    let c2_ans = tree.ancestors(&c2_id);
+    assert_eq!(2, c2_ans.len(), "incorrect ancestor path length");
+    assert_eq!(c2_id, c2_ans[0], "ancestors should start with self");
+    assert_eq!(tree.root(), &c2_ans[1], "ancestors should end with root");
+
+    let c11_ans = tree.ancestors(&c11_id);
+    assert_eq!(3, c11_ans.len(), "incorrect ancestor path length");
+    assert_eq!(c11_id, c11_ans[0], "ancestors should start with self");
+    assert_eq!(c1_id, c11_ans[1], "ancestors should contain parent");
+    assert_eq!(tree.root(), &c11_ans[2], "ancestors should end with root");
+}
+
 #[test]
 fn descendants_should_work() {
     // setup
@@ -448,8 +499,6 @@ fn move_index_should_work() {
         .expect("could not get child `Node` by index")
         .clone();
 
-    drop(children);
-
     // test
     tree.move_index(&c1, 1)
         .expect("could not move child `Node` index");
diff --git a/core/src/identifier.rs b/core/src/identifier.rs
index 46ce28e4..732e9f9a 100644
--- a/core/src/identifier.rs
+++ b/core/src/identifier.rs
@@ -11,7 +11,7 @@ impl Identifier {
     }
 
     pub fn application() -> String {
-        String::from("core")
+        String::from("thot-core")
     }
 }
 
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 2dead386..42ea144f 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -6,7 +6,6 @@
 //! # Thot Core
 //!
 //! This package represents core functionality of the Thot software suite.
-// pub mod api; // REMOVE
 pub mod common;
 pub mod constants;
 pub mod error;
@@ -34,7 +33,3 @@ pub mod dev_utils;
 
 // Re-exports
 pub use error::{Error, Result};
-
-#[cfg(test)]
-#[path = "./lib_test.rs"]
-mod lib_test;
diff --git a/core/src/lib_impl/clap/mod.rs b/core/src/lib_impl/clap/mod.rs
index 3b328dfb..3c4224da 100644
--- a/core/src/lib_impl/clap/mod.rs
+++ b/core/src/lib_impl/clap/mod.rs
@@ -1,6 +1,2 @@
 //! Implementations for `clap`.
 pub mod user_id;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/clap/mod_test.rs b/core/src/lib_impl/clap/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/clap/user_id.rs b/core/src/lib_impl/clap/user_id.rs
index 964a6b22..3221455b 100644
--- a/core/src/lib_impl/clap/user_id.rs
+++ b/core/src/lib_impl/clap/user_id.rs
@@ -52,17 +52,15 @@ impl clap::FromArgMatches for UserId {
 
 // @todo [1]: Write tests and implement properly
 impl clap::Args for UserId {
-    fn augment_args(cmd: clap::Command<'_>) -> clap::Command<'_> {
+    fn augment_args(cmd: clap::Command) -> clap::Command {
         cmd.arg(clap::Arg::new("user"))
     }
 
-    fn augment_args_for_update(cmd: clap::Command<'_>) -> clap::Command<'_> {
+    fn augment_args_for_update(cmd: clap::Command) -> clap::Command {
         cmd.arg(clap::Arg::new("user"))
     }
 }
 
-// helper functions
-
 /// Extracts the `arg_name` arg from a clap::ArgMatches.
 fn arg_from_arg_matches(
     matches: &clap::ArgMatches,
@@ -70,8 +68,8 @@ fn arg_from_arg_matches(
     cmd: &mut clap::Command,
 ) -> Result<String, clap::error::Error> {
     let mut arg: Option<String> = None;
-    if matches.is_present(arg_name) {
-        match matches.value_of(arg_name) {
+    if matches.contains_id(arg_name) {
+        match matches.get_one::<String>(arg_name) {
             Some(id_res) => {
                 arg = Some(id_res.to_string());
             }
@@ -86,7 +84,7 @@ fn arg_from_arg_matches(
 
     if arg.is_none() {
         return Err(cmd.error(
-            clap::error::ErrorKind::ArgumentNotFound,
+            clap::error::ErrorKind::MissingRequiredArgument,
             "No valid user id found.",
         ));
     }
diff --git a/core/src/lib_impl/clap/user_id_test.rs b/core/src/lib_impl/clap/user_id_test.rs
index 82b8e6e4..fef13ab3 100644
--- a/core/src/lib_impl/clap/user_id_test.rs
+++ b/core/src/lib_impl/clap/user_id_test.rs
@@ -11,7 +11,7 @@ fn user_id_should_implement_clap_from_arg_matches_for_email() {
     let e_val: String = FreeEmail(EN).fake();
     let matches = clap::Command::new("test from_arg_matches")
         .arg(clap::Arg::new("prog"))
-        .arg(clap::Arg::new("user").long("user").default_value(&e_val))
+        .arg(clap::Arg::new("user").long("user"))
         .get_matches();
 
     let email = match UserId::from_arg_matches(&matches) {
@@ -25,7 +25,7 @@ fn user_id_should_implement_clap_from_arg_matches_for_email() {
 #[test]
 fn user_id_should_implement_clap_from_arg_matches_for_id() {
     let id_val = ResourceId::new();
-    let matches = create_user_id_arg_matches(&id_val.to_string());
+    let matches = create_user_id_arg_matches();
 
     let id = match UserId::from_arg_matches(&matches) {
         Ok(uid) => uid,
@@ -38,7 +38,7 @@ fn user_id_should_implement_clap_from_arg_matches_for_id() {
 
 #[test]
 fn user_id_clap_from_arg_matches_should_error_if_invalid_id() {
-    let matches = create_user_id_arg_matches("invalid id");
+    let matches = create_user_id_arg_matches();
 
     match UserId::from_arg_matches(&matches) {
         Err(err) if err.kind() == clap::error::ErrorKind::InvalidValue => {
@@ -59,7 +59,7 @@ fn user_id_clap_from_arg_matches_should_error_if_invalid_id() {
 #[test]
 fn user_id_should_implement_clap_update_from_arg_matches_email() {
     let ref_email: String = FreeEmail(EN).fake();
-    let matches = create_user_id_arg_matches(&ref_email);
+    let matches = create_user_id_arg_matches();
 
     // email
     let email: String = FreeEmail(EN).fake();
@@ -73,7 +73,7 @@ fn user_id_should_implement_clap_update_from_arg_matches_email() {
 #[test]
 fn user_id_should_implement_clap_update_from_arg_matches_id() {
     let ref_id = ResourceId::new();
-    let matches = create_user_id_arg_matches(&ref_id.to_string());
+    let matches = create_user_id_arg_matches();
 
     // id
     let id = ResourceId::new();
@@ -86,11 +86,10 @@ fn user_id_should_implement_clap_update_from_arg_matches_id() {
 
 #[test]
 fn user_id_clap_update_from_arg_matches_should_error_if_variant_changes() {
-    let ref_id = Uuid::new_v4();
     let ref_email: String = FreeEmail(EN).fake();
 
-    let id_matches = create_user_id_arg_matches(&ref_id.to_string());
-    let e_matches = create_user_id_arg_matches(&ref_email);
+    let id_matches = create_user_id_arg_matches();
+    let e_matches = create_user_id_arg_matches();
 
     // email -> id
     let mut eid = UserId::Email(ref_email.clone());
@@ -123,9 +122,9 @@ fn user_id_clap_update_from_arg_matches_should_error_if_variant_changes() {
 // ---------------
 
 /// Creates a clap::ArgMatches with the `user` arg set to `id`.
-fn create_user_id_arg_matches(id: &str) -> clap::ArgMatches {
+fn create_user_id_arg_matches() -> clap::ArgMatches {
     clap::Command::new("test UserId::FromArgMatches")
         .arg(clap::Arg::new("prog")) // required to absorb program positional argument
-        .arg(clap::Arg::new("user").default_value(id))
+        .arg(clap::Arg::new("user"))
         .get_matches()
 }
diff --git a/core/src/lib_impl/extendr/asset.rs b/core/src/lib_impl/extendr/asset.rs
deleted file mode 100644
index 7a7dbba7..00000000
--- a/core/src/lib_impl/extendr/asset.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-//! `rextendr` `impl` for [`Container`].
-use crate::project::{Asset, Metadata};
-use extendr_api::prelude::*;
-
-#[extendr]
-impl Asset {
-    pub fn name(&self) -> Option<&str> {
-        self.properties.name.as_ref().map(|name| name.as_str())
-    }
-
-    // TODO[h]: Change to `r#type`.
-    // See https://github.com/extendr/extendr/issues/528 for more info.
-    pub fn kind(&self) -> Option<&str> {
-        self.properties.kind.as_ref().map(|name| name.as_str())
-    }
-
-    pub fn tags(&self) -> &Vec<String> {
-        &self.properties.tags
-    }
-
-    // TODO[h]
-    // pub fn metadata(&self) -> &Metadata {
-    //     &self.properties.metadata
-    // }
-}
-
-extendr_module! {
-    mod asset;
-    impl Asset;
-}
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/core/src/lib_impl/extendr/asset_test.rs b/core/src/lib_impl/extendr/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/extendr/container.rs b/core/src/lib_impl/extendr/container.rs
deleted file mode 100644
index cb563e70..00000000
--- a/core/src/lib_impl/extendr/container.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-//! `rextendr` `impl` for [`Container`].
-use crate::project::{Container, Metadata};
-use extendr_api::prelude::*;
-
-#[extendr]
-impl Container {
-    pub fn name(&self) -> Option<&str> {
-        self.properties.name.as_ref().map(|name| name.as_str())
-    }
-
-    // TODO[h]: Change to `r#type`.
-    // See https://github.com/extendr/extendr/issues/528 for more info.
-    pub fn kind(&self) -> Option<&str> {
-        self.properties.kind.as_ref().map(|name| name.as_str())
-    }
-
-    pub fn tags(&self) -> &Vec<String> {
-        &self.properties.tags
-    }
-
-    // TODO[h]
-    // pub fn metadata(&self) -> &Metadata {
-    //     &self.properties.metadata
-    // }
-}
-
-extendr_module! {
-    mod container;
-    impl Container;
-}
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/core/src/lib_impl/extendr/container_test.rs b/core/src/lib_impl/extendr/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/extendr/functions.rs b/core/src/lib_impl/extendr/functions.rs
deleted file mode 100644
index de255702..00000000
--- a/core/src/lib_impl/extendr/functions.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-//! Common functions.
-use extendr_api::prelude::*;
-use serde_json::value::{Number as JsNumber, Value as JsValue};
-
-/// Convert an [`Robj`] to a [`Value`](JsValue).
-/// Returns `None` if the conversion fails.
-pub fn robj_to_value(obj: Robj) -> Option<JsValue> {
-    if let Some(val) = obj.as_bool() {
-        return Some(JsValue::Bool(val));
-    } else if let Some(val) = obj.as_integer() {
-        return Some(JsValue::Number(val.into()));
-    } else if let Some(val) = obj.as_integer_vector() {
-        let vals = val.into_iter().map(|n| JsValue::Number(n.into())).collect();
-        return Some(JsValue::Array(vals));
-    } else if let Some(val) = obj.as_real() {
-        let val = JsNumber::from_f64(val)
-            .expect("could not convert value to a serde_json::value::Number");
-
-        return Some(JsValue::Number(val));
-    } else if let Some(val) = obj.as_real_vector() {
-        let vals = val
-            .into_iter()
-            .map(|n| {
-                let n = JsNumber::from_f64(n)
-                    .expect("could not convert value to a serde_json::value::Number");
-
-                JsValue::Number(n)
-            })
-            .collect();
-
-        return Some(JsValue::Array(vals));
-    } else if let Some(val) = obj.as_str() {
-        return Some(JsValue::String(val.into()));
-    } else if let Some(val) = obj.as_string_vector() {
-        let val = val.into_iter().map(|s| JsValue::String(s.into())).collect();
-        return Some(JsValue::Array(val));
-    }
-
-    return None;
-}
-
-#[cfg(test)]
-#[path = "./functions_test.rs"]
-mod functions_test;
diff --git a/core/src/lib_impl/extendr/functions_test.rs b/core/src/lib_impl/extendr/functions_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/extendr/mod.rs b/core/src/lib_impl/extendr/mod.rs
deleted file mode 100644
index c939d280..00000000
--- a/core/src/lib_impl/extendr/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//! `extendr` `impl`s.
-pub mod container;
-pub mod functions;
-pub mod asset;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/extendr/mod_test.rs b/core/src/lib_impl/extendr/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/mod.rs b/core/src/lib_impl/mod.rs
index 22d127ad..6469f3be 100644
--- a/core/src/lib_impl/mod.rs
+++ b/core/src/lib_impl/mod.rs
@@ -2,15 +2,5 @@
 #[cfg(feature = "clap")]
 pub mod clap;
 
-#[cfg(feature = "extendr")]
-pub mod extendr;
-
-#[cfg(feature = "pyo3")]
-pub mod pyo3;
-
 #[cfg(feature = "yew")]
 pub mod yew;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/mod_test.rs b/core/src/lib_impl/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/pyo3/asset.rs b/core/src/lib_impl/pyo3/asset.rs
deleted file mode 100644
index c00f0e4b..00000000
--- a/core/src/lib_impl/pyo3/asset.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! PyO3 implementation for [`Asset`].
-use crate::project::{Asset, StandardProperties};
-use pyo3::exceptions::PyRuntimeError;
-use pyo3::prelude::*;
-use pythonize::pythonize;
-use std::collections::{HashMap, HashSet};
-use std::path::PathBuf;
-
-// @todo: Unify implementations of property getters with Container.
-#[pymethods]
-impl Asset {
-    // properties
-    #[getter(_id)]
-    fn py_id(&self) -> String {
-        self.rid.to_string()
-    }
-
-    #[getter(_properties)]
-    fn py_properties(&self) -> StandardProperties {
-        self.properties.clone()
-    }
-
-    #[getter(name)]
-    fn py_name(&self) -> Option<String> {
-        self.properties.name.clone()
-    }
-
-    #[getter(type)]
-    fn py_kind(&self) -> Option<String> {
-        self.properties.kind.clone()
-    }
-
-    #[getter(tags)]
-    fn py_tags(&self) -> HashSet<String> {
-        self.properties.tags.clone().into_iter().collect()
-    }
-
-    // @todo: Provide inherited and native metadata separated.
-    /// Returns all metadata.
-    #[getter(metadata)]
-    fn py_metadata(&self, py: Python<'_>) -> PyResult<HashMap<String, PyObject>> {
-        let mut md = HashMap::with_capacity(self.properties.metadata.len());
-        for (k, v) in self.properties.metadata.clone() {
-            let val = pythonize(py, &v);
-            if val.is_err() {
-                return Err(PyRuntimeError::new_err(format!(
-                    "Could not convert metadata of key `{}`: {:?}",
-                    k, val
-                )));
-            }
-
-            let val = val.unwrap();
-            md.insert(k, val);
-        }
-
-        Ok(md)
-    }
-
-    // others
-    /// Path of the `Asset`'s file.
-    #[getter(file)]
-    fn py_path(&self) -> PathBuf {
-        PathBuf::from(self.path.as_path())
-    }
-}
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/core/src/lib_impl/pyo3/asset_test.rs b/core/src/lib_impl/pyo3/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/pyo3/container.rs b/core/src/lib_impl/pyo3/container.rs
deleted file mode 100644
index 0183b86e..00000000
--- a/core/src/lib_impl/pyo3/container.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-//! [`PyO3`](pyo3) implementation for [`Container`].
-use crate::project::{Container, StandardProperties};
-use crate::types::ResourceId;
-use pyo3::exceptions::PyRuntimeError;
-use pyo3::prelude::*;
-use pythonize::pythonize;
-use std::collections::{HashMap, HashSet};
-
-// @todo: Unify implementations of property getters with Asset.
-#[pymethods]
-impl Container {
-    // properties
-    #[getter(_id)]
-    fn py_id(&self) -> String {
-        self.rid.to_string()
-    }
-
-    #[getter(_properties)]
-    fn py_properties(&self) -> StandardProperties {
-        self.properties.clone()
-    }
-
-    #[getter(name)]
-    fn py_name(&self) -> Option<String> {
-        self.properties.name.clone()
-    }
-
-    #[getter(type)]
-    fn py_kind(&self) -> Option<String> {
-        self.properties.kind.clone()
-    }
-
-    #[getter(tags)]
-    fn py_tags(&self) -> HashSet<String> {
-        self.properties.tags.clone().into_iter().collect()
-    }
-
-    // @todo: Provide inherited and native metadata separated.
-    /// Returns all metadata.
-    #[getter(metadata)]
-    fn py_metadata(&self, py: Python<'_>) -> PyResult<HashMap<String, PyObject>> {
-        let mut md = HashMap::with_capacity(self.properties.metadata.len());
-        for (k, v) in self.properties.metadata.clone() {
-            let val = pythonize(py, &v);
-            if val.is_err() {
-                return Err(PyRuntimeError::new_err(format!(
-                    "Could not convert metadata of key `{}`: {:?}",
-                    k, val
-                )));
-            }
-
-            let val = val.unwrap();
-            md.insert(k, val);
-        }
-
-        Ok(md)
-    }
-
-    // others
-    #[getter(assets)]
-    fn py_assets(&self) -> HashSet<ResourceId> {
-        self.assets.clone().into_keys().collect()
-    }
-}
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/core/src/lib_impl/pyo3/container_test.rs b/core/src/lib_impl/pyo3/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/pyo3/mod.rs b/core/src/lib_impl/pyo3/mod.rs
deleted file mode 100644
index a0f5e6d2..00000000
--- a/core/src/lib_impl/pyo3/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! [`PyO3`](pyo3) implementations.
-pub mod asset;
-pub mod container;
-pub mod standard_properties;
-pub mod types;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/pyo3/mod_test.rs b/core/src/lib_impl/pyo3/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/pyo3/standard_properties.rs b/core/src/lib_impl/pyo3/standard_properties.rs
deleted file mode 100644
index c973cea3..00000000
--- a/core/src/lib_impl/pyo3/standard_properties.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-//! [`PyO3`](pyo3) implementation for [`StandardProperties`].
-use crate::project::StandardProperties;
-use pyo3::conversion::ToPyObject;
-use pyo3::prelude::*;
-use serde_json::Value as SerdeValue;
-use std::collections::{HashMap, HashSet};
-
-#[pymethods]
-impl StandardProperties {
-    #[getter(name)]
-    fn py_name(&self) -> Option<String> {
-        self.name.clone()
-    }
-
-    #[getter(kind)]
-    fn py_kind(&self) -> Option<String> {
-        self.kind.clone()
-    }
-
-    #[getter(tags)]
-    fn py_tags(&self) -> HashSet<String> {
-        self.tags.clone().into_iter().collect()
-    }
-
-    #[getter(metadata)]
-    fn py_metadata(&self) -> HashMap<String, SerdePyValue> {
-        let mut md = HashMap::new();
-        for (k, v) in &self.metadata {
-            let val = SerdePyValue(v.clone());
-            md.insert(k.clone(), val);
-        }
-        md
-    }
-}
-
-/// Intermediate struct for converting between serde_json::Value's and pyo3::PyObject's.
-#[repr(transparent)]
-#[derive(Clone, Debug)]
-struct SerdePyValue(serde_json::Value);
-
-/// Convert from serde_json::Value to pyo3::PyObject.
-impl ToPyObject for SerdePyValue {
-    fn to_object(&self, py: Python<'_>) -> PyObject {
-        serde_value_to_py_object(&self.0, py)
-    }
-}
-
-impl IntoPy<PyObject> for SerdePyValue {
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        self.to_object(py)
-    }
-}
-
-// from https://stackoverflow.com/questions/70193869/exporting-hashmap-of-hashmap-to-python
-/// Convert a serde_json::Value to a [`pyo3::PyObject`].
-fn serde_value_to_py_object(val: &SerdeValue, py: Python<'_>) -> PyObject {
-    match val {
-        SerdeValue::Null => py.None(),
-        SerdeValue::Bool(b) => b.to_object(py),
-        SerdeValue::Number(n) => {
-            let oi64 = n.as_i64().map(|i| i.to_object(py));
-            let ou64 = n.as_u64().map(|i| i.to_object(py));
-            let of64 = n.as_f64().map(|i| i.to_object(py));
-            oi64.or(ou64).or(of64).expect("number too large")
-        }
-        SerdeValue::String(s) => s.to_object(py),
-        SerdeValue::Array(v) => {
-            let inner: Vec<_> = v.iter().map(|x| serde_value_to_py_object(x, py)).collect();
-            inner.to_object(py)
-        }
-        SerdeValue::Object(m) => {
-            let inner: HashMap<_, _> = m
-                .iter()
-                .map(|(k, v)| (k, serde_value_to_py_object(v, py)))
-                .collect();
-            inner.to_object(py)
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "./standard_properties_test.rs"]
-mod standard_properties_test;
diff --git a/core/src/lib_impl/pyo3/standard_properties_test.rs b/core/src/lib_impl/pyo3/standard_properties_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/pyo3/types.rs b/core/src/lib_impl/pyo3/types.rs
deleted file mode 100644
index a6432ffb..00000000
--- a/core/src/lib_impl/pyo3/types.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! [`PyO3`](pyo3) implementation for types:
-//! + [`ResourceId`]
-use crate::types::ResourceId;
-use pyo3::conversion::ToPyObject;
-use pyo3::prelude::*;
-use pyo3::types::PyString;
-
-impl ToPyObject for ResourceId {
-    fn to_object(&self, py: Python<'_>) -> PyObject {
-        let py_str = PyString::new(py, &self.to_string());
-        PyObject::from(py_str)
-    }
-}
-
-// impl IntoPy<PyObject> for ResourceId {
-//     fn into_py(self, py: Python<'_>) -> PyObject {
-//         self.to_object(py)
-//     }
-// }
-
-#[cfg(test)]
-#[path = "./types_test.rs"]
-mod types_test;
diff --git a/core/src/lib_impl/pyo3/types_test.rs b/core/src/lib_impl/pyo3/types_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/yew/mod.rs b/core/src/lib_impl/yew/mod.rs
index 58d5e4f7..260042f5 100644
--- a/core/src/lib_impl/yew/mod.rs
+++ b/core/src/lib_impl/yew/mod.rs
@@ -1,7 +1,3 @@
 //! ['yew'] implementations for 'thot_core' resources.
 pub mod project;
 pub mod types;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/yew/mod_test.rs b/core/src/lib_impl/yew/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/yew/project.rs b/core/src/lib_impl/yew/project.rs
index afd55d7c..6a05e973 100644
--- a/core/src/lib_impl/yew/project.rs
+++ b/core/src/lib_impl/yew/project.rs
@@ -13,7 +13,3 @@ impl Into<Key> for &Project {
         self.rid.clone().into()
     }
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/core/src/lib_impl/yew/project_test.rs b/core/src/lib_impl/yew/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/yew/types/mod.rs b/core/src/lib_impl/yew/types/mod.rs
index 7f90419c..2def8c07 100644
--- a/core/src/lib_impl/yew/types/mod.rs
+++ b/core/src/lib_impl/yew/types/mod.rs
@@ -1,6 +1,2 @@
 //! Yew implementations for [`types`](crate::types).
 pub mod resource_id;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/lib_impl/yew/types/mod_test.rs b/core/src/lib_impl/yew/types/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_impl/yew/types/resource_id.rs b/core/src/lib_impl/yew/types/resource_id.rs
index 53a84cb5..1728f2a3 100644
--- a/core/src/lib_impl/yew/types/resource_id.rs
+++ b/core/src/lib_impl/yew/types/resource_id.rs
@@ -20,7 +20,3 @@ impl IntoPropValue<Option<AttrValue>> for ResourceId {
         Some(self.to_string().into())
     }
 }
-
-#[cfg(test)]
-#[path = "./resource_id_test.rs"]
-mod resource_id_test;
diff --git a/core/src/lib_impl/yew/types/resource_id_test.rs b/core/src/lib_impl/yew/types/resource_id_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/lib_test.rs b/core/src/lib_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/asset.rs b/core/src/project/asset.rs
index 59b691c0..fc489177 100644
--- a/core/src/project/asset.rs
+++ b/core/src/project/asset.rs
@@ -1,6 +1,6 @@
 /// Asset.
-use super::{standard_properties::Builder as PropertiesBuilder, Metadata, StandardProperties};
-use crate::db::{Resource, StandardResource};
+use super::{asset_properties::Builder as PropertiesBuilder, AssetProperties, Metadata};
+use crate::db::Resource;
 use crate::types::{Creator, ResourceId, ResourcePath};
 use chrono::prelude::*;
 use has_id::HasId;
@@ -21,7 +21,7 @@ use has_id::HasIdSerde;
 pub struct Asset {
     #[id]
     pub rid: ResourceId,
-    pub properties: StandardProperties,
+    pub properties: AssetProperties,
 
     /// Path to the `Asset`'s resource file.
     pub path: ResourcePath,
@@ -31,7 +31,7 @@ impl Asset {
     pub fn new(path: ResourcePath) -> Asset {
         Asset {
             rid: ResourceId::new(),
-            properties: StandardProperties::new(),
+            properties: AssetProperties::new(),
             path,
         }
     }
@@ -62,16 +62,6 @@ impl Hash for Asset {
 
 impl Resource for Asset {}
 
-impl StandardResource for Asset {
-    fn properties(&self) -> &StandardProperties {
-        &self.properties
-    }
-
-    fn properties_mut(&mut self) -> &mut StandardProperties {
-        &mut self.properties
-    }
-}
-
 // ***************
 // *** Builder ***
 // ***************
diff --git a/core/src/project/standard_properties.rs b/core/src/project/asset_properties.rs
similarity index 83%
rename from core/src/project/standard_properties.rs
rename to core/src/project/asset_properties.rs
index fbfe2d7d..884b2892 100644
--- a/core/src/project/standard_properties.rs
+++ b/core/src/project/asset_properties.rs
@@ -8,26 +8,26 @@ use std::collections::HashMap;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-// ***************************
-// *** Standard Properties ***
-// ***************************
+// ************************
+// *** Asset Properties ***
+// ************************
 
 /// Standard resource properties.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "pyo3", pyo3::pyclass)]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct StandardProperties {
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+pub struct AssetProperties {
     created: DateTime<Utc>,
     pub creator: Creator,
 
     pub name: Option<String>,
     pub kind: Option<String>,
     pub description: Option<String>,
-    pub tags: Vec<String>, // @todo: Should be a `HashSet`.
+    pub tags: Vec<String>,
     pub metadata: Metadata,
 }
 
-impl StandardProperties {
+impl AssetProperties {
     pub fn new() -> Self {
         Self {
             created: Utc::now(),
@@ -46,21 +46,6 @@ impl StandardProperties {
     }
 }
 
-impl Default for StandardProperties {
-    fn default() -> Self {
-        StandardProperties {
-            created: Utc::now(),
-            creator: Creator::User(None),
-
-            name: None,
-            kind: None,
-            description: None,
-            tags: Vec::new(),
-            metadata: HashMap::new(),
-        }
-    }
-}
-
 // ***************
 // *** Builder ***
 // ***************
@@ -191,9 +176,9 @@ impl Default for Builder {
     }
 }
 
-impl Into<StandardProperties> for Builder {
-    fn into(self) -> StandardProperties {
-        StandardProperties {
+impl Into<AssetProperties> for Builder {
+    fn into(self) -> AssetProperties {
+        AssetProperties {
             created: self.created.unwrap_or_else(|| Utc::now()),
             creator: self.creator,
             name: self.name,
@@ -204,7 +189,3 @@ impl Into<StandardProperties> for Builder {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "standard_properties_test.rs"]
-mod standard_properties_test;
diff --git a/core/src/project/container.rs b/core/src/project/container.rs
index 64d67115..f8ae2078 100644
--- a/core/src/project/container.rs
+++ b/core/src/project/container.rs
@@ -1,9 +1,13 @@
 //! Container.
-use super::standard_properties::StandardProperties;
-use super::{Asset, RunParameters};
-use crate::db::{Resource, StandardResource};
+use super::container_properties::{Builder as PropertiesBuilder, ContainerProperties};
+use super::Metadata;
+use super::{Asset, RunParameters, ScriptAssociation};
+use crate::db::Resource;
+use crate::types::Creator;
 use crate::types::{ResourceId, ResourceMap};
+use chrono::prelude::*;
 use has_id::HasId;
+use serde_json::Value as JsValue;
 use std::hash::{Hash, Hasher};
 
 #[cfg(feature = "serde")]
@@ -26,27 +30,30 @@ pub type ScriptMap = ResourceMap<RunParameters>;
 pub struct Container {
     #[id]
     pub rid: ResourceId,
-    pub properties: StandardProperties,
+    pub properties: ContainerProperties,
     pub assets: AssetMap,
     pub scripts: ScriptMap,
 }
 
 impl Container {
-    /// Inserts an [`Asset`] into the [`Container`].
-    pub fn insert_asset(&mut self, asset: Asset) -> Option<Asset> {
-        self.assets.insert(asset.rid.clone(), asset)
-    }
-}
-
-impl Default for Container {
-    fn default() -> Container {
+    pub fn new(name: impl Into<String>) -> Container {
         Container {
             rid: ResourceId::new(),
-            properties: StandardProperties::default(),
+            properties: ContainerProperties::new(name),
             assets: AssetMap::default(),
             scripts: ScriptMap::default(),
         }
     }
+
+    /// Inserts an [`Asset`] into the [`Container`].
+    pub fn insert_asset(&mut self, asset: Asset) -> Option<Asset> {
+        self.assets.insert(asset.rid.clone(), asset)
+    }
+
+    /// Inserts an [`Asset`] into the [`Container`].
+    pub fn remove_asset(&mut self, rid: &ResourceId) -> Option<Asset> {
+        self.assets.remove(rid)
+    }
 }
 
 impl Hash for Container {
@@ -57,16 +64,130 @@ impl Hash for Container {
 
 impl Resource for Container {}
 
-impl StandardResource for Container {
-    fn properties(&self) -> &StandardProperties {
-        &self.properties
+// ***************
+// *** Builder ***
+// ***************
+
+#[derive(Default)]
+pub struct Builder {
+    properties: PropertiesBuilder,
+    assets: AssetMap,
+    scripts: ScriptMap,
+}
+
+impl Builder {
+    pub fn set_created(&mut self, value: DateTime<Utc>) -> &mut Self {
+        self.properties.set_created(value);
+        self
+    }
+
+    pub fn clear_created(&mut self) -> &mut Self {
+        self.properties.clear_created();
+        self
+    }
+
+    pub fn set_creator(&mut self, value: Creator) -> &mut Self {
+        self.properties.set_creator(value);
+        self
+    }
+
+    pub fn set_name(&mut self, value: String) -> &mut Self {
+        self.properties.set_name(value);
+        self
+    }
+
+    pub fn set_kind(&mut self, value: String) -> &mut Self {
+        self.properties.set_kind(value);
+        self
+    }
+
+    pub fn clear_kind(&mut self) -> &mut Self {
+        self.properties.clear_kind();
+        self
+    }
+
+    pub fn set_description(&mut self, value: String) -> &mut Self {
+        self.properties.set_description(value);
+        self
     }
 
-    fn properties_mut(&mut self) -> &mut StandardProperties {
-        &mut self.properties
+    pub fn clear_description(&mut self) -> &mut Self {
+        self.properties.clear_description();
+        self
+    }
+
+    pub fn set_tags(&mut self, value: Vec<String>) -> &mut Self {
+        self.properties.set_tags(value);
+        self
+    }
+
+    pub fn clear_tags(&mut self) -> &mut Self {
+        self.properties.clear_tags();
+        self
+    }
+
+    pub fn add_tag(&mut self, value: impl Into<String>) -> &mut Self {
+        self.properties.add_tag(value);
+        self
+    }
+
+    pub fn remove_tag(&mut self, value: impl Into<String>) -> &mut Self {
+        self.properties.remove_tag(value);
+        self
+    }
+
+    pub fn set_metadata(&mut self, value: Metadata) -> &mut Self {
+        self.properties.set_metadata(value);
+        self
+    }
+
+    pub fn clear_metadata(&mut self) -> &mut Self {
+        self.properties.clear_metadata();
+        self
+    }
+
+    pub fn set_metadatum(
+        &mut self,
+        key: impl Into<String>,
+        value: impl Into<JsValue>,
+    ) -> &mut Self {
+        self.properties.set_metadatum(key.into(), value.into());
+        self
+    }
+
+    pub fn remove_metadatum(&mut self, key: impl Into<String>) -> &mut Self {
+        self.properties.remove_metadatum(key);
+        self
+    }
+
+    pub fn add_asset(&mut self, asset: Asset) -> &mut Self {
+        self.assets.insert(asset.rid.clone(), asset);
+        self
+    }
+
+    pub fn remove_asset(&mut self, rid: &ResourceId) -> &mut Self {
+        self.assets.remove(rid);
+        self
+    }
+
+    pub fn add_script(&mut self, script: ScriptAssociation) -> &mut Self {
+        self.scripts.insert(script.script.clone(), script.into());
+        self
+    }
+
+    pub fn remove_script(&mut self, rid: &ResourceId) -> &mut Self {
+        self.scripts.remove(rid);
+        self
     }
 }
 
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
+impl Into<Container> for Builder {
+    fn into(self) -> Container {
+        Container {
+            rid: ResourceId::new(),
+            properties: self.properties.into(),
+            assets: self.assets,
+            scripts: self.scripts,
+        }
+    }
+}
diff --git a/core/src/project/container_properties.rs b/core/src/project/container_properties.rs
new file mode 100644
index 00000000..9b1d555c
--- /dev/null
+++ b/core/src/project/container_properties.rs
@@ -0,0 +1,176 @@
+//! Container properties.
+use super::Metadata;
+use crate::types::Creator;
+use chrono::prelude::*;
+use serde_json::Value as JsValue;
+use std::collections::HashMap;
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "pyo3", pyo3::pyclass)]
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ContainerProperties {
+    created: DateTime<Utc>,
+    pub creator: Creator,
+
+    pub name: String,
+    pub kind: Option<String>,
+    pub description: Option<String>,
+    pub tags: Vec<String>,
+    pub metadata: Metadata,
+}
+
+impl ContainerProperties {
+    pub fn new(name: impl Into<String>) -> Self {
+        Self {
+            created: Utc::now(),
+            creator: Creator::User(None),
+
+            name: name.into(),
+            kind: None,
+            description: None,
+            tags: Vec::new(),
+            metadata: HashMap::new(),
+        }
+    }
+
+    pub fn created(&self) -> &DateTime<Utc> {
+        &self.created
+    }
+}
+
+// ***************
+// *** Builder ***
+// ***************
+
+#[derive(Default)]
+pub struct Builder {
+    created: Option<DateTime<Utc>>,
+    creator: Creator,
+    name: String,
+    kind: Option<String>,
+    description: Option<String>,
+    tags: Vec<String>,
+    metadata: Metadata,
+}
+
+impl Builder {
+    pub fn set_created(&mut self, value: DateTime<Utc>) -> &mut Self {
+        self.created = Some(value);
+        self
+    }
+
+    pub fn clear_created(&mut self) -> &mut Self {
+        self.created = None;
+        self
+    }
+
+    pub fn set_creator(&mut self, value: Creator) -> &mut Self {
+        self.creator = value;
+        self
+    }
+
+    pub fn set_name(&mut self, value: String) -> &mut Self {
+        self.name = value;
+        self
+    }
+
+    pub fn set_kind(&mut self, value: String) -> &mut Self {
+        self.kind = Some(value);
+        self
+    }
+
+    pub fn clear_kind(&mut self) -> &mut Self {
+        self.kind = None;
+        self
+    }
+
+    pub fn set_description(&mut self, value: String) -> &mut Self {
+        self.description = Some(value);
+        self
+    }
+
+    pub fn clear_description(&mut self) -> &mut Self {
+        self.description = None;
+        self
+    }
+
+    pub fn set_tags(&mut self, value: Vec<String>) -> &mut Self {
+        self.tags = value;
+        self
+    }
+
+    pub fn clear_tags(&mut self) -> &mut Self {
+        self.tags.clear();
+        self
+    }
+
+    pub fn add_tag(&mut self, value: impl Into<String>) -> &mut Self {
+        let value = value.into();
+        if self.tags.iter().filter(|tag| tag == &&value).count() == 0 {
+            self.tags.push(value);
+        }
+
+        self
+    }
+
+    pub fn remove_tag(&mut self, value: impl Into<String>) -> &mut Self {
+        let value = value.into();
+        self.tags.retain(|tag| tag != &value);
+        self
+    }
+
+    pub fn set_metadata(&mut self, value: Metadata) -> &mut Self {
+        self.metadata = value;
+        self
+    }
+
+    pub fn clear_metadata(&mut self) -> &mut Self {
+        self.metadata.clear();
+        self
+    }
+
+    pub fn set_metadatum(
+        &mut self,
+        key: impl Into<String>,
+        value: impl Into<JsValue>,
+    ) -> &mut Self {
+        self.metadata.insert(key.into(), value.into());
+        self
+    }
+
+    pub fn remove_metadatum(&mut self, key: impl Into<String>) -> &mut Self {
+        self.metadata.remove(&key.into());
+        self
+    }
+}
+
+impl Builder {
+    pub fn new(name: impl Into<String>) -> Self {
+        Self {
+            created: None,
+            creator: Creator::default(),
+            name: name.into(),
+            kind: None,
+            description: None,
+            tags: Vec::default(),
+            metadata: Metadata::default(),
+        }
+    }
+}
+
+impl Into<ContainerProperties> for Builder {
+    fn into(self) -> ContainerProperties {
+        ContainerProperties {
+            created: self.created.unwrap_or_else(|| Utc::now()),
+            creator: self.creator,
+            name: self.name,
+            kind: self.kind,
+            description: self.description,
+            tags: self.tags,
+            metadata: self.metadata,
+        }
+    }
+}
diff --git a/core/src/project/container_test.rs b/core/src/project/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/metadata.rs b/core/src/project/metadata.rs
index 9413cff9..b9942a5f 100644
--- a/core/src/project/metadata.rs
+++ b/core/src/project/metadata.rs
@@ -13,7 +13,3 @@ pub trait InheritMetadata {
     /// Returns inherited [`Metadata`].
     fn metadata_inherited(&self) -> &Metadata;
 }
-
-#[cfg(test)]
-#[path = "./metadata_test.rs"]
-mod metadata_test;
diff --git a/core/src/project/metadata_test.rs b/core/src/project/metadata_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/mod.rs b/core/src/project/mod.rs
index 20cefb4b..563c3a2a 100644
--- a/core/src/project/mod.rs
+++ b/core/src/project/mod.rs
@@ -1,17 +1,21 @@
 /// Project resources.
 pub mod asset;
+pub mod asset_properties;
 pub mod container;
+pub mod container_properties;
 pub mod metadata;
 pub mod project;
+pub mod resources;
 pub mod script;
 pub mod script_association;
-pub mod standard_properties;
 
 // Reexports
 pub use asset::Asset;
+pub use asset_properties::AssetProperties;
 pub use container::Container;
+pub use container_properties::ContainerProperties;
 pub use metadata::Metadata;
 pub use project::Project;
+pub use resources::ResourceProperties;
 pub use script::{Script, ScriptEnv, ScriptLang, Scripts};
 pub use script_association::{RunParameters, ScriptAssociation};
-pub use standard_properties::StandardProperties;
diff --git a/core/src/project/mod_test.rs b/core/src/project/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/notes.rs b/core/src/project/notes.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/notes_test.rs b/core/src/project/notes_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/project/project.rs b/core/src/project/project.rs
index a0a66819..1dc30a64 100644
--- a/core/src/project/project.rs
+++ b/core/src/project/project.rs
@@ -28,26 +28,10 @@ pub struct Project {
 
 impl Project {
     /// Creates a new Project.
-    pub fn new(name: &str) -> Project {
+    pub fn new(name: impl Into<String>) -> Project {
         Project {
             rid: ResourceId::new(),
-            name: String::from(name),
-            creator: Creator::User(None),
-            created: Utc::now(),
-            description: None,
-            data_root: None,
-            universal_root: None,
-            analysis_root: None,
-            meta_level: 0,
-        }
-    }
-}
-
-impl Default for Project {
-    fn default() -> Project {
-        Project {
-            rid: ResourceId::new(),
-            name: String::from(""),
+            name: name.into(),
             creator: Creator::User(None),
             created: Utc::now(),
             description: None,
diff --git a/core/src/project/project_test.rs b/core/src/project/project_test.rs
index 8297f3a2..5178a17c 100644
--- a/core/src/project/project_test.rs
+++ b/core/src/project/project_test.rs
@@ -5,7 +5,7 @@ use super::*;
 // ***************
 
 #[test]
-fn project_new_w_defaults() {
+fn project_new_should_work() {
     let p_name = String::from("test");
     let prj = Project::new(p_name.as_str());
 
diff --git a/core/src/project/resources.rs b/core/src/project/resources.rs
index 40989f11..a6192951 100644
--- a/core/src/project/resources.rs
+++ b/core/src/project/resources.rs
@@ -1,23 +1,19 @@
-use super::RunParameters;
-use super::StandardResource;
-use crate::types::{ResourceMap, ResourceStore};
-use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
+use super::{AssetProperties, ContainerProperties};
 
-pub trait Asset: StandardResource {
-    fn path(&self) -> &Path;
-    fn set_path(&mut self, path: PathBuf);
+#[derive(PartialEq, Eq, Clone)]
+pub enum ResourceProperties {
+    Container(ContainerProperties),
+    Asset(AssetProperties),
 }
 
-pub trait Container: StandardResource {
-    type Asset: Asset;
-
-    fn children(&self) -> &ResourceStore<Arc<Mutex<Self>>>;
-    fn children_mut(&mut self) -> &mut ResourceStore<Arc<Mutex<Self>>>;
-
-    fn assets(&self) -> &ResourceMap<Self::Asset>;
-    fn assets_mut(&mut self) -> &mut ResourceMap<Self::Asset>;
+impl From<ContainerProperties> for ResourceProperties {
+    fn from(props: ContainerProperties) -> Self {
+        Self::Container(props)
+    }
+}
 
-    fn scripts(&self) -> &ResourceMap<RunParameters>;
-    fn scripts_mut(&mut self) -> &mut ResourceMap<RunParameters>;
+impl From<AssetProperties> for ResourceProperties {
+    fn from(props: AssetProperties) -> Self {
+        Self::Asset(props)
+    }
 }
diff --git a/core/src/project/script.rs b/core/src/project/script.rs
index 822ae198..6a5bf814 100644
--- a/core/src/project/script.rs
+++ b/core/src/project/script.rs
@@ -8,6 +8,7 @@ use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::ops::{Deref, DerefMut};
 use std::path::Path;
+use std::result::Result as StdResult;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -37,17 +38,12 @@ pub struct Script {
 }
 
 impl Script {
-    pub fn new(path: ResourcePath) -> Result<Script> {
-        // setup env
-        let file_name = path.as_path().file_name();
-        if file_name.is_none() {
-            return Err(Error::ScriptError(ScriptError::UnknownLanguage(None)));
-        }
-
-        let file_name = Path::new(file_name.unwrap());
-        let env = ScriptEnv::new(file_name)?;
+    pub fn new(path: ResourcePath) -> StdResult<Script, ScriptError> {
+        let Some(file_name) = path.as_path().file_name() else {
+            return Err(ScriptError::UnknownLanguage(None));
+        };
 
-        // create Script
+        let env = ScriptEnv::new(Path::new(file_name))?;
         Ok(Script {
             rid: ResourceId::new(),
             path,
@@ -75,12 +71,7 @@ impl Script {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, PartialEq, Debug, Default)]
 pub struct Scripts(#[cfg_attr(feature = "serde", serde(with = "values_only"))] ResourceMap<Script>);
-
 impl Scripts {
-    pub fn new() -> Scripts {
-        Scripts(ResourceMap::new())
-    }
-
     /// Returns whether a script with the given path is registered.
     pub fn contains_path(&self, path: &ResourcePath) -> bool {
         self.by_path(path).is_some()
@@ -141,19 +132,19 @@ pub struct ScriptEnv {
 
 impl ScriptEnv {
     /// Creates a new script environment for the given script.
-    pub fn new(script: &Path) -> Result<Self> {
+    pub fn new(script: &Path) -> StdResult<Self, ScriptError> {
         let path_ext = script.extension();
         if path_ext.is_none() {
-            return Err(Error::ScriptError(ScriptError::UnknownLanguage(None)));
+            return Err(ScriptError::UnknownLanguage(None));
         }
 
         // lang
         let path_ext = path_ext.unwrap();
         let language = ScriptLang::from_extension(path_ext);
         if language.is_none() {
-            return Err(Error::ScriptError(ScriptError::UnknownLanguage(Some(
-                path_ext.to_os_string(),
-            ))));
+            return Err(ScriptError::UnknownLanguage(Some(
+                path_ext.to_str().unwrap().to_string(),
+            )));
         }
         let language = language.unwrap();
 
@@ -161,8 +152,8 @@ impl ScriptEnv {
         let cmd = match &language {
             ScriptLang::Python => "python3",
             ScriptLang::R => "Rscript",
-        };
-        let cmd = cmd.to_string();
+        }
+        .to_string();
 
         // args
         let args = Vec::new();
@@ -198,7 +189,6 @@ impl ScriptLang {
     pub fn from_extension(ext: &OsStr) -> Option<Self> {
         let ext = ext.to_ascii_lowercase();
         let Some(ext) = ext.as_os_str().to_str() else {
-            tracing::debug!("0");
             return None;
         };
 
@@ -208,6 +198,11 @@ impl ScriptLang {
             _ => None,
         }
     }
+
+    /// Returns a list of supported extensions.
+    pub fn supported_extensions() -> Vec<&'static str> {
+        vec!["py", "r"]
+    }
 }
 
 // *************************
@@ -215,7 +210,3 @@ impl ScriptLang {
 // *************************
 
 pub type ScriptParameters = HashMap<String, JsValue>;
-
-#[cfg(test)]
-#[path = "./script_test.rs"]
-mod script_test;
diff --git a/core/src/project/script_association.rs b/core/src/project/script_association.rs
index 8076661a..2d4c9738 100644
--- a/core/src/project/script_association.rs
+++ b/core/src/project/script_association.rs
@@ -28,6 +28,14 @@ impl ScriptAssociation {
             priority: 0,
         }
     }
+
+    pub fn new_with_params(script: ResourceId, params: RunParameters) -> Self {
+        ScriptAssociation {
+            script,
+            autorun: params.autorun,
+            priority: params.priority,
+        }
+    }
 }
 
 impl Into<RunParameters> for ScriptAssociation {
diff --git a/core/src/project/script_test.rs b/core/src/project/script_test.rs
deleted file mode 100644
index f8be5c0c..00000000
--- a/core/src/project/script_test.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use super::*;
-use crate::types::ResourcePath;
-use fake::faker::filesystem::raw::FilePath;
-use fake::locales::EN;
-use fake::Fake;
-use rand::Rng;
-use std::path::PathBuf;
-
-// **************
-// *** Script ***
-// **************
-
-#[test]
-fn script_new_should_work() {
-    // py
-    let path = script_path(Some(String::from("py")));
-    let script = Script::new(path.clone()).expect("creating script should work");
-    assert_eq!(&path, &script.path, "script's path should be correct");
-
-    // r
-    let path = script_path(Some(String::from("R")));
-    let script = Script::new(path.clone()).expect("creating script should work");
-    assert_eq!(&path, &script.path, "script's path should be correct");
-}
-
-#[test]
-#[should_panic(expected = "UnknownLanguage")]
-fn script_new_with_unknown_file_type_should_error() {
-    let path = script_path(Some(String::from("unknown")));
-    Script::new(path).unwrap();
-}
-
-// ***************
-// *** Scripts ***
-// ***************
-
-#[test]
-fn scripts_new_should_work() {
-    let _script = Scripts::new();
-}
-
-#[test]
-fn scripts_contains_path_should_work() {
-    // setup
-    let scripts = create_scripts();
-    let c_rid = scripts
-        .keys()
-        .next()
-        .cloned()
-        .expect("no `Script`s available");
-
-    let script = scripts.get(&c_rid).expect("could not get `Script`");
-    let c_path = script.path.clone();
-
-    // test
-    // known
-    let found = scripts.contains_path(&c_path);
-    assert!(found, "script should be found");
-
-    // unknown
-    let unknown = scripts.contains_path(&script_path(None));
-    assert!(!unknown, "random script should not be found");
-}
-
-#[test]
-fn scripts_by_path_should_work() {
-    // setup
-    let scripts = create_scripts();
-    let c_rid = scripts
-        .keys()
-        .next()
-        .cloned()
-        .expect("no `Script`s available");
-
-    let script = scripts.get(&c_rid).expect("could not get `Script`");
-    let c_path = script.path.clone();
-
-    // test
-    // known
-    let Some(found) = scripts.by_path(&c_path) else {
-        panic!("script should be found");
-    };
-
-    assert_eq!(c_rid, found.rid, "correct script should be found");
-
-    // unknown
-    let unknown = scripts.by_path(&script_path(None));
-    assert!(unknown.is_none(), "random script should not be found");
-}
-
-// ******************
-// *** Script Env ***
-// ******************
-
-#[test]
-fn script_env_new_should_work() {
-    let script = script_path(Some("py".to_string()));
-    let path = match script {
-        ResourcePath::Absolute(path) => path,
-        ResourcePath::Relative(path) => path,
-        ResourcePath::Root(path, _) => path,
-    };
-
-    let _env = ScriptEnv::new(&path).expect("new should work");
-}
-
-#[test]
-#[should_panic(expected = "UnknownLanguage")]
-fn script_env_new_with_unknown_extension_should_error() {
-    let script = script_path(Some("unknown".to_string()));
-    let path = match script {
-        ResourcePath::Absolute(path) => path,
-        ResourcePath::Relative(path) => path,
-        ResourcePath::Root(path, _) => path,
-    };
-
-    ScriptEnv::new(&path).unwrap();
-}
-
-// *******************
-// *** Script Lang ***
-// *******************
-
-#[test]
-fn script_lang_from_extension_should_work() {
-    // py
-    let py_lang = ScriptLang::from_extension(&OsStr::new("py"));
-    assert_ne!(None, py_lang, "language should be found");
-    let py_lang = py_lang.unwrap();
-    assert_eq!(ScriptLang::Python, py_lang, "language should be correct");
-
-    // r
-    let r_lang = ScriptLang::from_extension(&OsStr::new("R"));
-    assert_ne!(None, r_lang, "language should be found");
-    let r_lang = r_lang.unwrap();
-    assert_eq!(ScriptLang::R, r_lang, "language should be correct");
-}
-
-// ************************
-// *** helper functions ***
-// ************************
-
-/// Selects a random path extension from a set of valid ones.
-fn random_path_ext() -> String {
-    let valid_ext = ["py", "R"];
-
-    let mut rng = rand::thread_rng();
-    let index = rng.gen_range(0..valid_ext.len());
-
-    let ext = valid_ext[index].to_string();
-    ext
-}
-
-/// Creates a random path.
-/// If `ext` is `None` uses a valid random extension.
-/// If `ext` is `Some`, uses the given value.
-fn script_path(ext: Option<String>) -> ResourcePath {
-    let mut path;
-    loop {
-        // enusre path is a valid path, not root
-        path = PathBuf::from(FilePath(EN).fake::<String>());
-        if path.parent().is_some() {
-            break;
-        }
-    }
-    match ext {
-        None => path.set_extension(random_path_ext()),
-        Some(ext) => path.set_extension(ext),
-    };
-
-    ResourcePath::new(path).expect("creating resource path should work")
-}
-
-/// Creates a [`Script`] with a random path.
-/// If `ext` is `None` uses a valid random extension.
-/// If `ext` is `Some`, uses the given value.
-fn create_script(ext: Option<String>) -> Result<Script> {
-    let path = script_path(ext);
-    Script::new(path)
-}
-
-/// Creates a [`Scripts`] with random script paths.
-fn create_scripts() -> Scripts {
-    let mut rng = rand::thread_rng();
-    let n_scripts = rng.gen_range(1..20);
-    let mut scripts = Scripts::new();
-    for _ in 0..n_scripts {
-        let script = create_script(None).expect("creating new script should work");
-        scripts.insert(script.rid.clone(), script);
-    }
-
-    scripts
-}
diff --git a/core/src/project/standard_properties_test.rs b/core/src/project/standard_properties_test.rs
deleted file mode 100644
index a2c308f6..00000000
--- a/core/src/project/standard_properties_test.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use super::*;
-
-#[test]
-fn new_should_work() {
-    let res = StandardProperties::new();
-
-    // name
-    assert_eq!(None, res.name, "name should be None");
-
-    // kind
-    assert_eq!(None, res.kind, "kind should be None");
-
-    // description
-    assert_eq!(None, res.description, "description should be None");
-
-    // tags
-    assert_eq!(0, res.tags.len(), "tags should be empty");
-
-    // metadata
-    assert_eq!(0, res.metadata.len(), "metadata should be empty");
-}
-
-#[test]
-fn default_should_work() {
-    let res = StandardProperties::default();
-
-    // name
-    assert_eq!(None, res.name, "name should be None");
-
-    // kind
-    assert_eq!(None, res.kind, "kind should be None");
-
-    // description
-    assert_eq!(None, res.description, "description should be None");
-
-    // tags
-    assert_eq!(0, res.tags.len(), "tags should be empty");
-
-    // metadata
-    assert_eq!(0, res.metadata.len(), "metadata should be empty");
-}
diff --git a/core/src/runner/common_test.rs b/core/src/runner/common_test.rs
index 44a0fed6..085a0f04 100644
--- a/core/src/runner/common_test.rs
+++ b/core/src/runner/common_test.rs
@@ -1,5 +1,5 @@
 use super::*;
-use crate::runner::env::ThotEnv;
+use crate::runner::env::CONTAINER_ID_KEY;
 use std::env;
 
 #[test]
@@ -8,6 +8,6 @@ fn dev_mode_should_work() {
     assert_eq!(true, dev_mode(), "dev mode should be true");
 
     // set container id
-    env::set_var(ThotEnv::container_id_key(), "TEST CONTAINER");
+    env::set_var(CONTAINER_ID_KEY, "TEST CONTAINER");
     assert_eq!(false, dev_mode(), "dev mode should be false");
 }
diff --git a/core/src/runner/env.rs b/core/src/runner/env.rs
index 448a1ac3..463af873 100644
--- a/core/src/runner/env.rs
+++ b/core/src/runner/env.rs
@@ -1,6 +1,2 @@
 //! Environment variables for runner.
 pub static CONTAINER_ID_KEY: &str = "THOT_CONTAINER_ID";
-
-#[cfg(test)]
-#[path = "./env_test.rs"]
-mod env_test;
diff --git a/core/src/runner/env_test.rs b/core/src/runner/env_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/runner/mod_test.rs b/core/src/runner/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/runner/resources/mod.rs b/core/src/runner/resources/mod.rs
index 085db269..26a7e99a 100644
--- a/core/src/runner/resources/mod.rs
+++ b/core/src/runner/resources/mod.rs
@@ -1,6 +1,2 @@
 //! Runner resources.
 pub mod script_groups;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/runner/resources/mod_test.rs b/core/src/runner/resources/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/runner/resources/script_groups_test.rs b/core/src/runner/resources/script_groups_test.rs
index 4750107c..4979ce7e 100644
--- a/core/src/runner/resources/script_groups_test.rs
+++ b/core/src/runner/resources/script_groups_test.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::project::ScriptAssociation;
-use crate::types::{ResourceId, ResourcePath};
+use crate::types::ResourceId;
 use dev_utils::fs::TempDir;
 use rand::Rng;
 use std::collections::HashSet;
@@ -9,7 +9,7 @@ use std::collections::HashSet;
 fn from_hashset_should_work() {
     // setup
     let mut _dir = TempDir::new().expect("setup shoudl work");
-    let assocs = create_script_associations(&mut _dir);
+    let assocs = create_script_associations();
     let groups = ScriptGroups::from(assocs);
 
     // test
@@ -27,7 +27,7 @@ fn from_hashset_should_work() {
 fn into_vec_should_work() {
     // setup
     let mut _dir = TempDir::new().expect("setup shoudl work");
-    let assocs = create_script_associations(&mut _dir);
+    let assocs = create_script_associations();
     let groups = ScriptGroups::from(assocs);
 
     // test
@@ -63,7 +63,7 @@ fn iter_should_work() {
 // *** helper functions ***
 // ************************
 
-fn create_script_associations(dir: &mut TempDir) -> HashSet<ScriptAssociation> {
+fn create_script_associations() -> HashSet<ScriptAssociation> {
     let mut rng = rand::thread_rng();
     let n_assocs = 20;
     let p_rng = (-n_assocs / 2)..(n_assocs / 2);
@@ -71,13 +71,6 @@ fn create_script_associations(dir: &mut TempDir) -> HashSet<ScriptAssociation> {
     let n_assocs = rng.gen_range(1..n_assocs);
     let mut assocs = HashSet::new();
     for _ in 0..n_assocs {
-        let path = dir
-            .mkfile_with_extension(".py")
-            .expect("mkfile should work");
-
-        let path = ResourcePath::new(path).expect("path to resource path should work");
-
-        // let script = Script::new(path).expect("new script should work");
         let script = ResourceId::new();
         let priority = rng.gen_range(p_rng.clone());
         let autorun = rng.gen();
diff --git a/core/src/runner/runner.rs b/core/src/runner/runner.rs
index c548bdf6..d1bc9392 100644
--- a/core/src/runner/runner.rs
+++ b/core/src/runner/runner.rs
@@ -107,6 +107,7 @@ impl RunnerHooks {
 
 type ContainerTree = ResourceTree<Container>;
 
+// TODO Make builder.
 #[cfg_attr(doc, aquamarine::aquamarine)]
 /// ```mermaid
 ///
@@ -167,6 +168,7 @@ impl Runner {
     /// 1. Container tree to evaluate.
     /// 2. Root of subtree.
     /// 3. Maximum number of analysis tasks to run at once.
+    #[tracing::instrument(skip(self, tree))]
     fn evaluate_tree(
         &self,
         tree: &mut ContainerTree,
@@ -175,7 +177,7 @@ impl Runner {
     ) -> Result {
         // recurse on children
         let Some(children) = tree.children(root).cloned() else {
-            return Err(ResourceError::DoesNotExist("`Node` children not found").into());
+            return Err(ResourceError::does_not_exist("`Node` children not found").into());
         };
 
         for child in children {
@@ -194,6 +196,7 @@ impl Runner {
     ///     Otherwise a [`HashSet`] of the scripts to run.
     /// + `ignore_errors`: Whether to continue running on a script error.
     /// + `verbose`: Output state.
+    #[tracing::instrument(skip(self, tree))]
     fn evaluate_container(
         &self,
         tree: &mut ContainerTree,
@@ -203,7 +206,7 @@ impl Runner {
         verbose: bool,
     ) -> Result {
         let Some(container) = tree.get(container) else {
-            return Err(ResourceError::DoesNotExist("`Node` not found").into());
+            return Err(ResourceError::does_not_exist("`Node` not found").into());
         };
 
         let mut scripts = container.scripts.clone();
@@ -254,6 +257,7 @@ impl Runner {
     ///    ignore_errors -- "true" --> post_script
     ///    ignore_errors -- "false" ---> break("return Err(_)")
     /// ```
+    #[tracing::instrument(skip(self))]
     fn run_scripts(
         &self,
         scripts: Vec<Script>,
@@ -314,6 +318,7 @@ impl Runner {
     ///
     /// # Errors
     /// + [`RunnerError`]: The script returned a `status` other than `0`.
+    #[tracing::instrument(skip(self))]
     fn run_script(&self, script: Script, container: &Container) -> Result<process::Output> {
         #[cfg(target_os = "windows")]
         let mut out = process::Command::new("cmd");
@@ -324,13 +329,22 @@ impl Runner {
         #[cfg(not(target_os = "windows"))]
         let mut out = process::Command::new(&script.env.cmd);
 
-        let out = out
+        let out = match out
             .arg(script.path.as_path())
             .args(&script.env.args)
             .env(CONTAINER_ID_KEY, container.rid.clone().to_string())
             .envs(&script.env.env)
-            .output()
-            .expect("failed to execute command");
+            .output() {
+                Ok(out) => out,
+                Err(err) => {
+                    tracing::debug!(?err);
+                    return Err(RunnerError::CommandError{
+                        script: script.rid.clone(),
+                        container: container.rid.clone(),
+                        cmd: format!("{out:?}")
+                    }.into())
+                }
+            };
 
         if !out.status.success() {
             let stderr = str::from_utf8(out.stderr.as_slice())
diff --git a/core/src/runner/runner_test.rs b/core/src/runner/runner_test.rs
index 8ed87b1e..8c61b5ba 100644
--- a/core/src/runner/runner_test.rs
+++ b/core/src/runner/runner_test.rs
@@ -1,7 +1,7 @@
 use super::*;
 use crate::error::{Error, ProjectError, RunnerError};
+use crate::project::Container;
 use crate::project::Script;
-use crate::project::{Container, ScriptAssociation};
 use crate::types::{ResourceId, ResourcePath};
 use dev_utils::fs::temp_file;
 use dev_utils::{create_lock, lock::get_lock};
@@ -9,7 +9,6 @@ use fake::faker::lorem::raw::Word;
 use fake::locales::EN;
 use fake::Fake;
 use mockall::*;
-use rand::Rng;
 use std::collections::HashSet;
 use std::result::Result as StdResult;
 use std::{fs, str};
@@ -50,7 +49,7 @@ fn runner_run_script_should_work() {
     let key: String = Word(EN).fake();
     fs::write(&script.path, format!("print('{}')", key)).expect("could not write to file");
     let runner = Runner::new(create_default_runner_hooks());
-    let container = Container::default();
+    let container = Container::new(Word(EN).fake::<String>());
 
     // test
     let out = runner
@@ -73,7 +72,7 @@ fn runner_run_script_if_script_errors_should_err() {
     fs::write(&script.path, prg).expect("could not write to file");
 
     let runner = Runner::new(create_default_runner_hooks());
-    let container = Container::default();
+    let container = Container::new(Word(EN).fake::<String>());
 
     let sid = script.rid.clone();
     let cid = container.rid.clone();
@@ -82,7 +81,7 @@ fn runner_run_script_if_script_errors_should_err() {
     let res = runner.run_script(script, &container);
 
     assert!(res.is_err(), "runner did not error");
-    let Err(Error::RunnerError(RunnerError::ScriptError(e_sid, e_cid, msg))) = res else {
+    let Err(Error::RunnerError(RunnerError::ScriptError(e_sid, e_cid, _msg))) = res else {
         panic!("incorrect error type");
     };
 
@@ -104,10 +103,7 @@ fn runner_run_scripts_should_work() {
     let prg = format!("print('{}')", key);
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -145,10 +141,7 @@ fn runner_run_scripts_with_unhandled_error_should_halt() {
     let prg = format!("raise RuntimeError()");
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -181,10 +174,7 @@ fn runner_run_scripts_with_handled_error_that_returns_ok_should_work() {
     let prg = format!("raise RuntimeError()");
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -226,10 +216,7 @@ fn runner_run_scripts_with_handled_error_that_returns_err_should_halt() {
     let prg = format!("raise RuntimeError()");
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -269,10 +256,7 @@ fn runner_run_scripts_with_unhandled_error_ignored_should_work() {
     let prg = format!("raise RuntimeError()");
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -292,7 +276,7 @@ fn runner_run_scripts_with_unhandled_error_ignored_should_work() {
     assets_added_ctx.expect().times(num_scripts);
     post_script_ctx.expect().times(num_scripts);
 
-    let res = runner
+    let _res = runner
         .run_scripts(scripts, &container, true, false)
         .expect("`run_scripts` should work");
 }
@@ -306,10 +290,7 @@ fn runner_run_scripts_with_handled_error_that_returns_err_ignored_should_work()
     let prg = format!("raise RuntimeError()");
     fs::write(&script.path, prg).expect("could not write program to file");
 
-    let container = Container::default();
-    let sid = script.rid.clone();
-    let cid = container.rid.clone();
-
+    let container = Container::new(Word(EN).fake::<String>());
     let scripts = vec![script];
     let num_scripts = scripts.len();
 
@@ -356,25 +337,6 @@ fn create_default_runner_hooks() -> RunnerHooks {
     RunnerHooks::new(get_script)
 }
 
-/// Creates a random number of [`ScriptAssociation`]s with random properties.
-fn create_script_associations() -> HashSet<ScriptAssociation> {
-    let mut rng = rand::thread_rng();
-    let n_assocs = 20;
-    let p_rng = (-n_assocs / 2)..(n_assocs / 2);
-
-    let n_assocs = rng.gen_range(1..n_assocs);
-    let mut assocs = HashSet::new();
-    for _ in 0..n_assocs {
-        let mut assoc = ScriptAssociation::new(ResourceId::new());
-        assoc.priority = rng.gen_range(p_rng.clone());
-        assoc.autorun = rng.gen();
-
-        assocs.insert(assoc);
-    }
-
-    assocs
-}
-
 /// Create a script to run.
 fn create_script(ext: &str) -> Script {
     let path = temp_file::mkfile_with_extension(ext).expect("could not create script file");
diff --git a/core/src/system/mod_test.rs b/core/src/system/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/system/template/mod.rs b/core/src/system/template/mod.rs
index f587d39c..0e4cf875 100644
--- a/core/src/system/template/mod.rs
+++ b/core/src/system/template/mod.rs
@@ -5,7 +5,3 @@ pub mod tree;
 // Re-exports
 pub use project::Project;
 pub use tree::ResourceTree;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/system/template/mod_test.rs b/core/src/system/template/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/system/template/project.rs b/core/src/system/template/project.rs
index 75d39875..852fe791 100644
--- a/core/src/system/template/project.rs
+++ b/core/src/system/template/project.rs
@@ -93,7 +93,3 @@ impl Project {
         })
     }
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/core/src/system/template/project_test.rs b/core/src/system/template/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/system/template/tree.rs b/core/src/system/template/tree.rs
index 922c7e23..a0061433 100644
--- a/core/src/system/template/tree.rs
+++ b/core/src/system/template/tree.rs
@@ -24,7 +24,3 @@ impl ResourceTree {
         serde_json::from_value(template)
     }
 }
-
-#[cfg(test)]
-#[path = "./tree_test.rs"]
-mod tree_test;
diff --git a/core/src/system/template/tree_test.rs b/core/src/system/template/tree_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/types/creator.rs b/core/src/types/creator.rs
index 3c52a5a3..615604b1 100644
--- a/core/src/types/creator.rs
+++ b/core/src/types/creator.rs
@@ -28,7 +28,3 @@ impl PartialEq for Creator {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./creator_test.rs"]
-mod creator_test;
diff --git a/core/src/types/creator_test.rs b/core/src/types/creator_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/types/local_id.rs b/core/src/types/local_id.rs
index 23893ff4..74c3f26d 100644
--- a/core/src/types/local_id.rs
+++ b/core/src/types/local_id.rs
@@ -8,7 +8,3 @@ pub enum LocalId {
     Path(PathBuf),
     ResourcePath(ResourcePath),
 }
-
-#[cfg(test)]
-#[path = "./local_id_test.rs"]
-mod local_id_test;
diff --git a/core/src/types/local_id_test.rs b/core/src/types/local_id_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/types/mod.rs b/core/src/types/mod.rs
index 1967fd47..9e784ead 100644
--- a/core/src/types/mod.rs
+++ b/core/src/types/mod.rs
@@ -15,7 +15,3 @@ pub use resource_map::ResourceMap;
 pub use resource_path::ResourcePath;
 pub use user_id::UserId;
 pub use user_permissions::UserPermissions;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/core/src/types/mod_test.rs b/core/src/types/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/src/types/resource_id.rs b/core/src/types/resource_id.rs
index 78ba54ab..7c7a360d 100644
--- a/core/src/types/resource_id.rs
+++ b/core/src/types/resource_id.rs
@@ -1,5 +1,4 @@
 //! Resource ids.
-use std::ffi::OsStr;
 use std::fmt::{self, Display};
 use std::ops::Deref;
 use std::result::Result as StdResult;
@@ -16,7 +15,6 @@ use serde::{Deserialize, Serialize};
 pub struct ResourceId(Uuid);
 
 impl ResourceId {
-    // @todo: Change to default.
     pub fn new() -> ResourceId {
         ResourceId(Uuid::new_v4())
     }
diff --git a/core/src/types/resource_path.rs b/core/src/types/resource_path.rs
index 1ae780cc..41ea2140 100644
--- a/core/src/types/resource_path.rs
+++ b/core/src/types/resource_path.rs
@@ -42,58 +42,15 @@ impl ResourcePath {
     /// ## Root paths
     /// Only the relative path from the root is stored for root paths.
     pub fn new(path: PathBuf) -> Result<Self> {
-        if Self::is_root(&path) {
-            // parse metalevel
-            let path_str = path.to_str();
-            if path_str.is_none() {
-                return Err(Error::ResourcePathError(
-                    ResourcePathError::CouldNotParseMetalevel("could not convert path to string"),
-                ));
-            }
-
-            let rd_pattern = Self::root_drive_regex();
-            let caps = rd_pattern.captures(path_str.unwrap());
-            if caps.is_none() {
-                return Err(Error::ResourcePathError(
-                    ResourcePathError::CouldNotParseMetalevel("path did not match root pattern"),
-                ));
-            }
-
-            let caps = caps.unwrap();
-            let metalevel = match caps.get(1) {
-                None => 0, // metalevel not set, default ot 0
-                Some(m) => match m.as_str().parse::<usize>() {
-                    Err(_) => {
-                        return Err(Error::ResourcePathError(
-                            ResourcePathError::CouldNotParseMetalevel(
-                                "invalid metalevel, could not parse as integer",
-                            ),
-                        ))
-                    }
-                    Ok(ml) => ml,
-                },
-            };
-
-            // extract relative path
-            let prefix = caps.get(0).unwrap().as_str();
-            let rel_path = path.strip_prefix(prefix);
-            if rel_path.is_err() {
-                return Err(Error::ResourcePathError(
-                    ResourcePathError::CouldNotParseMetalevel(
-                        "could not remove root drive from path",
-                    ),
-                ));
-            }
-
-            let rel_path = rel_path.unwrap().to_path_buf();
+        if let Some((metalevel, rel_path)) = Self::parse_root_path(&path)? {
             return Ok(Self::Root(rel_path, metalevel));
-        }
-
-        if Self::is_relative(&path) {
+        } else if Self::is_relative(&path) {
             return Ok(Self::Relative(path));
-        } else {
+        } else if Self::is_absolute(&path) {
             return Ok(Self::Absolute(path));
         }
+
+        unreachable!("could not parse path as a resource path");
     }
 
     /// Coerces to a [`Path`] slice.
@@ -101,32 +58,57 @@ impl ResourcePath {
         self.as_ref()
     }
 
-    /// Returns whether a path is a root path.
+    /// Attempts to parse a path as a Root path.
     ///
-    /// # See also
-    /// + [`Self.is_realtive_path`]
-    /// + [`Self.is_absolute_path`]
-    pub fn is_root(path: &Path) -> bool {
+    /// # Returns
+    /// `Some((meta level, relative path))` if successfully parsed, otherwise `None`.
+    pub fn parse_root_path(path: &Path) -> Result<Option<(usize, PathBuf)>> {
         let path_str = path.to_str().unwrap();
-        path_str.starts_with(ROOT_DRIVE_ID)
+        let rd_pattern = Self::root_drive_regex();
+        let Some(caps) = rd_pattern.captures(path_str) else {
+            return Ok(None);
+        };
+
+        let metalevel = match caps.get(1) {
+            None => 0, // metalevel not set, default ot 0
+            Some(m) => match m.as_str().parse::<usize>() {
+                Err(_) => {
+                    return Err(Error::ResourcePathError(
+                        ResourcePathError::could_not_parse_meta_level(
+                            "invalid metalevel, could not parse as integer",
+                        ),
+                    ));
+                }
+                Ok(ml) => ml,
+            },
+        };
+
+        // extract relative path
+        let prefix = caps.get(0).unwrap().as_str();
+        let Ok(rel_path) = path.strip_prefix(prefix) else {
+            return Err(Error::ResourcePathError(
+                ResourcePathError::could_not_parse_meta_level(
+                    "could not remove root drive from path",
+                ),
+            ));
+        };
+
+        Ok(Some((metalevel, rel_path.to_path_buf())))
+    }
+
+    /// Returns whether a path is a root path.
+    pub fn is_root(path: &Path) -> bool {
+        Self::parse_root_path(path).unwrap().is_some()
     }
 
     /// Returns whether a path is a relative path.
-    ///
-    /// # See also
-    /// + [`Self.is_root_path`]
-    /// + [`Self.is_absolute_path`]
     pub fn is_relative(path: &Path) -> bool {
         !Self::is_root(path) && path.is_relative()
     }
 
     /// Returns whether a path is an absolute path.
-    ///
-    /// # See also
-    /// + [`Self.is_root_path`]
-    /// + [`Self.is_relative_path`]
     pub fn is_absolute(path: &Path) -> bool {
-        !(Self::is_root(path) || path.is_relative())
+        !Self::is_root(path) && path.is_absolute()
     }
 
     /// Returns a regex for matching a root path.
diff --git a/core/tests/integration_tests.rs b/core/tests/integration_tests.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/BUILD.md b/desktop/BUILD.md
index 695a9dab..89f93e45 100644
--- a/desktop/BUILD.md
+++ b/desktop/BUILD.md
@@ -14,7 +14,7 @@ For this you need the following two files:
 - `Developer ID Application: Brian Carlsen (63BA6GV3UX)`
 - `Developer ID Certification Authority`
 
-Simply drag and drop these files to the `Keychain Access` app in the login tab.
+Simply drag and drop these files to the `Keychain Access` app in the `login` tab.
 
 ### XCode
 
@@ -28,7 +28,8 @@ Make sure XCode is installed, with it comes `altool`, you need to have this in y
 
 - `./build.sh`
 
-> When building from m1 to intel: `./build_from_m1_to_intel.sh`
+> If building from m1 to intel: `./build_x86_64.sh`
+> If building from intel to m1: `./build_aarch64.sh`
 
 ### On Windows
 
@@ -38,7 +39,7 @@ Make sure XCode is installed, with it comes `altool`, you need to have this in y
 
 If you haven't already, go back to the root path `cd ../../`.
 
-### On Bash / Zsh
+### In bash / zsh
 
 - `set -o allexport && source .github/act/secrets && set +o allexport`
 
@@ -47,10 +48,17 @@ If you haven't already, go back to the root path `cd ../../`.
 - `cd desktop`
 - `cargo tauri build`
 
-> When building from m1 to intel: `cargo tauri build --target x86_64-apple-darwin --debug`
+> If building from m1 to intel: `cargo tauri build --target x86_64-apple-darwin`
+> If building from intel to m1: `cargo tauri build --target aarch64-apple-darwin`
 
-## Build errors
+## FAQ
+
+### General errors
 
 `Error:error running bundle_dmg.sh`
+> Make sure no `Thot` process is running and that Thot is not mounted as a volume.
+
+### Apple
 
-Make sure no `Thot` process is running and that Thot is not mounted as a volume.
+`Error failed to bundle project: failed to upload app to Apple's notarization servers.`
+> Check in the apple developer account that no terms of service are pending for approval.
diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml
index d10aa033..13ae7400 100644
--- a/desktop/Cargo.toml
+++ b/desktop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-desktop"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -13,24 +13,25 @@ categories = [ "gui", "science" ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-aquamarine = "0.1" # TODO: Only needed for documentation.
+aquamarine = { workspace = true } # TODO: Only needed for documentation.
 futures = "0.3"
-gloo-storage = "0.2"
-gloo-timers = "0.2.6"
-indexmap = "1.9"
-js-sys = "0.3"
-serde = { version = "1.0", features = ["derive"] }
-serde-wasm-bindgen = "0.4"
-tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = ["dialog", "event", "path"] }
+gloo-storage = "0.3"
+gloo-timers = "0.3"
+indexmap = { workspace = true }
+js-sys = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true } # TODO: Only required for https://github.com/tauri-apps/tauri/issues/6078.
+serde-wasm-bindgen = { workspace = true }
+tauri-sys = { workspace = true, features = ["dialog", "event", "path"] }
 time = { version = "0.3", features = ["wasm-bindgen"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3.16", features = ["time"] }
 tracing-web = "0.1.2"
-uuid = { version = "1.2", features = ["serde", "v4"] }
-wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
-wasm-bindgen-futures = "0.4"
-yew = { version = "0.20", features = ["csr"] }
-yew-router = "0.17"
+uuid = { workspace = true, features = ["js", "serde", "v4"] }
+wasm-bindgen = { workspace = true, features = ["serde-serialize"] }
+wasm-bindgen-futures = { workspace = true }
+yew = { workspace = true, features = ["csr"] }
+yew-router = { workspace = true }
 
 thot-core = { path = "../core", features = ["yew", "serde"] }
 thot-local = { path = "../local", default-features = false }
@@ -38,10 +39,8 @@ thot-ui = { path = "../ui" }
 thot-desktop-lib = { path = "src-lib" }
 thot-local-database = { path = "../local/database" }
 
-serde_json = "1.0" # TODO: Only required for https://github.com/tauri-apps/tauri/issues/6078.
-
 [dependencies.web-sys]
-version = "0.3"
+workspace = true
 features = [
     "DomStringMap",
     "DragEvent",
@@ -50,6 +49,9 @@ features = [
     "HtmlElement",
     "HtmlInputElement",
     "InputEvent",
+    "ScrollBehavior",
+    "ScrollIntoViewOptions",
+    "ScrollLogicalPosition",
     "SubmitEvent",
     "SvgCircleElement",
     "SvggElement",
@@ -60,8 +62,13 @@ features = [
 ]
 
 [dependencies.yew_icons]
-version = "0.7"
+workspace = true
 features = [
+    "BootstrapExclamationTriangle",
+    "BootstrapFiles",
     "FontAwesomeRegularEye",
     "FontAwesomeRegularEyeSlash",
+    "FontAwesomeRegularFolder",
+    "FontAwesomeSolidCaretDown",
+    "FontAwesomeSolidCaretRight",
 ]
diff --git a/desktop/src-lib/Cargo.toml b/desktop/src-lib/Cargo.toml
index 36294b0c..1b0b1e92 100644
--- a/desktop/src-lib/Cargo.toml
+++ b/desktop/src-lib/Cargo.toml
@@ -14,8 +14,8 @@ rust-version = "1.57"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-indexmap = { version = "1.9", features = ["serde"] }
-serde = { version = "1.0", features = ["derive"] }
+indexmap = { workspace = true, features = ["serde"] }
+serde = { workspace = true, features = ["derive"] }
 
 thot-core = { path = "../../core", features = ["serde"] }
 thot-local = { path = "../../local", default-features = false }
diff --git a/desktop/src-lib/src/error.rs b/desktop/src-lib/src/error.rs
index 9ba92a74..1ef4a4ec 100644
--- a/desktop/src-lib/src/error.rs
+++ b/desktop/src-lib/src/error.rs
@@ -28,7 +28,3 @@ impl From<DesktopSettings> for Error {
 }
 
 pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/desktop/src-lib/src/error_test.rs b/desktop/src-lib/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/lib.rs b/desktop/src-lib/src/lib.rs
index 60d08a51..00b0411a 100644
--- a/desktop/src-lib/src/lib.rs
+++ b/desktop/src-lib/src/lib.rs
@@ -3,6 +3,7 @@
 //! of the Thot Desktop app.
 pub mod error;
 pub mod settings;
+pub mod types;
 
 // Re-exports
 pub use error::Error;
diff --git a/desktop/src-lib/src/settings/general.rs b/desktop/src-lib/src/settings/general.rs
index cb6216ce..a22e779f 100644
--- a/desktop/src-lib/src/settings/general.rs
+++ b/desktop/src-lib/src/settings/general.rs
@@ -6,8 +6,15 @@ use thot_local::types::AssetFileAction;
 #[derive(Serialize, Deserialize, PartialEq, Clone, Default, Debug)]
 pub struct GeneralSettings {
     pub default_project_directory: Option<PathBuf>,
-    pub open_previous_project_on_start: bool,
+
+    #[serde(default)]
     pub ondrop_asset_action: AssetFileAction,
+
+    #[serde(default)]
+    pub open_previous_project_on_start: bool,
+
+    #[serde(default)]
+    pub rename_container_folder: bool,
 }
 
 impl GeneralSettings {
@@ -16,10 +23,7 @@ impl GeneralSettings {
             default_project_directory: None,
             open_previous_project_on_start: true,
             ondrop_asset_action: AssetFileAction::Copy,
+            rename_container_folder: true,
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./general_test.rs"]
-mod general_test;
diff --git a/desktop/src-lib/src/settings/general_test.rs b/desktop/src-lib/src/settings/general_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/settings/has_user.rs b/desktop/src-lib/src/settings/has_user.rs
index 329b85e3..d21f6353 100644
--- a/desktop/src-lib/src/settings/has_user.rs
+++ b/desktop/src-lib/src/settings/has_user.rs
@@ -5,7 +5,3 @@ pub trait HasUser {
     fn new(user: ResourceId) -> Self;
     fn user(&self) -> &ResourceId;
 }
-
-#[cfg(test)]
-#[path = "./has_user_test.rs"]
-mod has_user_test;
diff --git a/desktop/src-lib/src/settings/has_user_test.rs b/desktop/src-lib/src/settings/has_user_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/settings/mod.rs b/desktop/src-lib/src/settings/mod.rs
index e1be1bc8..24a07d75 100644
--- a/desktop/src-lib/src/settings/mod.rs
+++ b/desktop/src-lib/src/settings/mod.rs
@@ -11,7 +11,3 @@ pub use has_user::HasUser;
 pub use user_app_state::UserAppState;
 pub use user_settings::UserSettings;
 pub use user_settings_file::UserSettingsFile;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-lib/src/settings/mod_test.rs b/desktop/src-lib/src/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/settings/user_app_state.rs b/desktop/src-lib/src/settings/user_app_state.rs
index fbda6bf4..f2015631 100644
--- a/desktop/src-lib/src/settings/user_app_state.rs
+++ b/desktop/src-lib/src/settings/user_app_state.rs
@@ -29,7 +29,3 @@ impl HasUser for UserAppState {
         &self.user
     }
 }
-
-#[cfg(test)]
-#[path = "./user_app_state_test.rs"]
-mod user_app_state_test;
diff --git a/desktop/src-lib/src/settings/user_app_state_test.rs b/desktop/src-lib/src/settings/user_app_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/settings/user_settings.rs b/desktop/src-lib/src/settings/user_settings.rs
index 42539712..526d9320 100644
--- a/desktop/src-lib/src/settings/user_settings.rs
+++ b/desktop/src-lib/src/settings/user_settings.rs
@@ -22,7 +22,3 @@ impl HasUser for UserSettings {
         &self.user
     }
 }
-
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/desktop/src-lib/src/settings/user_settings_file.rs b/desktop/src-lib/src/settings/user_settings_file.rs
index 93bac199..eed45b50 100644
--- a/desktop/src-lib/src/settings/user_settings_file.rs
+++ b/desktop/src-lib/src/settings/user_settings_file.rs
@@ -5,7 +5,3 @@ pub trait UserSettingsFile {
     /// The file should reside at <config_dir>/<users_dir>/<settings_file>.
     fn settings_file() -> PathBuf;
 }
-
-#[cfg(test)]
-#[path = "./user_settings_file_test.rs"]
-mod user_settings_file_test;
diff --git a/desktop/src-lib/src/settings/user_settings_file_test.rs b/desktop/src-lib/src/settings/user_settings_file_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/settings/user_settings_test.rs b/desktop/src-lib/src/settings/user_settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-lib/src/types.rs b/desktop/src-lib/src/types.rs
new file mode 100644
index 00000000..8ab54feb
--- /dev/null
+++ b/desktop/src-lib/src/types.rs
@@ -0,0 +1,17 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use thot_local::types::AssetFileAction;
+
+// TODO Merge with `thot_local::types::AssetFileAction`.
+/// Info for adding an [`Asset`](thot_core::project::Asset).
+#[derive(Serialize, Deserialize, Debug)]
+pub struct AddAssetInfo {
+    /// Path of the file to make an [`Asset`](thot_core::project::Asset).
+    pub path: PathBuf,
+
+    /// How to handle the file on disk.
+    pub action: AssetFileAction,
+
+    /// The bucket to place the [`Asset`](thot_core::project::Asset)'s file in.
+    pub bucket: Option<PathBuf>,
+}
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 5629f202..ebd48211 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-desktop-tauri"
-version = "0.10.0"
+version = "0.10.1"
 description = "Thot desktop application."
 authors = ["Brian Carlsen <carlsen.bri@gmail.com>"]
 
@@ -17,19 +17,19 @@ rust-version = "1.57"
 tauri-build = { version = "1.1", features = [] }
 
 [dependencies]
-cluFlock = "1.2"
-directories = "4.0"
-open = "3.2"
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tracing = "0.1.37"
+directories = { workspace = true }
+open = "5.0"
+serde_json = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+tauri = { version = "1.5", features = ["dialog-open", "process-command-api", "shell-sidecar", "system-tray", "updater"] }
+thiserror = { workspace = true }
+tracing = {  workspace = true}
 tracing-appender = "0.2.2"
-tracing-subscriber = { version = "0.3.16", features = ["time", "json"] }
-uuid = { version = "1.2", features = ["serde", "v4"] }
-tauri = { version = "1.3", features = ["dialog-open", "process-command-api", "shell-sidecar", "system-tray", "updater"] }
-zmq = "0.10.0"
+tracing-subscriber = { version = "0.3", features = ["time", "json"] }
+trash = "3.1.2"
+uuid = { workspace = true , features = ["serde", "v4"] }
+zmq = { workspace = true }
 
-settings_manager = { path = "../../settings_manager" }
 thot-core = { path = "../../core", features = ["serde"] }
 thot-desktop-lib = { path = "../src-lib" }
 thot-local = { path = "../../local" }
diff --git a/desktop/src-tauri/src/commands/asset.rs b/desktop/src-tauri/src/commands/asset.rs
index 6d6daecf..c86f5f47 100644
--- a/desktop/src-tauri/src/commands/asset.rs
+++ b/desktop/src-tauri/src/commands/asset.rs
@@ -1,18 +1,15 @@
-//! [`Asset`](CoreAsset) functionality.
+//! `Asset` functionality.
 use crate::error::Result;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use tauri::State;
-use thot_core::project::StandardProperties;
+use thot_core::project::{Asset, AssetProperties};
 use thot_core::types::ResourceId;
 use thot_local_database::client::Client as DbClient;
+use thot_local_database::command::asset::{AssetPropertiesUpdate, BulkUpdateAssetPropertiesArgs};
 use thot_local_database::command::AssetCommand;
 
-/// Gets [`Asset`](CoreAsset)s.
-///
-/// # Returns
-/// `Vec<[Asset](CoreAsset)>` where [`Asset`](CoreAsset)s that
-/// are not found are ignored.
+/// Gets `Asset`s.
 #[tauri::command]
 pub fn get_assets(
     db: State<DbClient>,
@@ -25,24 +22,44 @@ pub fn get_assets(
     serde_json::from_value(assets).expect("could not convert result of `GetAssets` to `Vec<Asset>`")
 }
 
-/// Update an [`Asset`](CoreAsset).
+/// Update an `Asset`'s properties.
 #[tauri::command]
-pub fn update_asset_properties(
-    db: State<DbClient>,
-    rid: ResourceId,
-    properties: StandardProperties,
-) -> Result {
-    db.send(AssetCommand::UpdateProperties(rid, properties).into());
+pub fn update_asset_properties(db: State<DbClient>, rid: ResourceId, properties: String) -> Result {
+    let properties: AssetProperties = serde_json::from_str(&properties).unwrap();
+    db.send(
+        AssetCommand::UpdateProperties {
+            asset: rid,
+            properties,
+        }
+        .into(),
+    )?;
     Ok(())
 }
 
-/// Remove an [`Asset`](CoreAsset).
+/// Remove an `Asset`.
 #[tauri::command]
 pub fn remove_asset(db: State<DbClient>, rid: ResourceId) -> Result {
-    db.send(AssetCommand::Remove(rid).into());
+    let path = db.send(AssetCommand::Path(rid).into())?;
+    let Some(path) = serde_json::from_value::<Option<PathBuf>>(path).unwrap() else {
+        panic!("asset not found");
+    };
+
+    trash::delete(path).unwrap();
     Ok(())
 }
 
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
+/// Bulk update the porperties of `Asset`s.
+#[tauri::command]
+pub fn bulk_update_asset_properties(
+    db: State<DbClient>,
+    rids: Vec<ResourceId>,
+    update: AssetPropertiesUpdate,
+) -> Result {
+    let res = db.send(
+        AssetCommand::BulkUpdateProperties(BulkUpdateAssetPropertiesArgs { rids, update }).into(),
+    );
+
+    // TODO Handle errors.
+    res.expect("could not update `Asset`s");
+    Ok(())
+}
diff --git a/desktop/src-tauri/src/commands/asset_test.rs b/desktop/src-tauri/src/commands/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/authenticate.rs b/desktop/src-tauri/src/commands/authenticate.rs
index 7addb08a..10e6eda9 100644
--- a/desktop/src-tauri/src/commands/authenticate.rs
+++ b/desktop/src-tauri/src/commands/authenticate.rs
@@ -18,7 +18,3 @@ pub fn create_user(email: String, name: Option<String>) -> Result<User> {
 
     Ok(user)
 }
-
-#[cfg(test)]
-#[path = "./authenticate_test.rs"]
-mod authenticate_test;
diff --git a/desktop/src-tauri/src/commands/authenticate_test.rs b/desktop/src-tauri/src/commands/authenticate_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/common.rs b/desktop/src-tauri/src/commands/common.rs
index fb791a73..4eb5c3b8 100644
--- a/desktop/src-tauri/src/commands/common.rs
+++ b/desktop/src-tauri/src/commands/common.rs
@@ -52,12 +52,9 @@ pub fn get_directory(title: Option<String>, dir: Option<PathBuf>) -> Option<Path
 }
 
 #[tauri::command]
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 pub fn open_file(path: PathBuf) -> Result {
+    let path = thot_local::common::normalize_path_separators(path);
     let path = path.canonicalize()?;
     open::that(path).map_err(|err| err.into())
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/desktop/src-tauri/src/commands/common_test.rs b/desktop/src-tauri/src/commands/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/container.rs b/desktop/src-tauri/src/commands/container.rs
index e2153d5b..ca67fa9f 100644
--- a/desktop/src-tauri/src/commands/container.rs
+++ b/desktop/src-tauri/src/commands/container.rs
@@ -4,14 +4,19 @@ use std::fs;
 use std::path::PathBuf;
 use tauri::State;
 use thot_core::project::container::ScriptMap;
-use thot_core::project::{Container, StandardProperties};
+use thot_core::project::{Container, ContainerProperties};
 use thot_core::types::ResourceId;
 use thot_desktop_lib::error::{Error as LibError, Result as LibResult};
+use thot_desktop_lib::types::AddAssetInfo;
 use thot_local::common::unique_file_name;
 use thot_local::types::AssetFileAction;
 use thot_local_database::client::Client as DbClient;
 use thot_local_database::command::container::{
-    AddAssetInfo, AddAssetsArgs, UpdatePropertiesArgs, UpdateScriptAssociationsArgs,
+    BulkUpdateContainerPropertiesArgs, ContainerPropertiesUpdate,
+};
+use thot_local_database::command::container::{
+    BulkUpdateScriptAssociationsArgs, ScriptAssociationBulkUpdate, UpdatePropertiesArgs,
+    UpdateScriptAssociationsArgs,
 };
 use thot_local_database::command::ContainerCommand;
 use thot_local_database::Result as DbResult;
@@ -32,12 +37,12 @@ pub fn get_container(db: State<DbClient>, rid: ResourceId) -> Option<Container>
 pub fn update_container_properties(
     db: State<DbClient>,
     rid: ResourceId,
-    properties: String, // @todo: Issue with deserializing `HashMap` of `metadata`. perform manually.
+    properties: String, // TODO Issue with deserializing `HashMap` of `metadata`. perform manually.
                         // See: https://github.com/tauri-apps/tauri/issues/6078
-                        // properties: StandardProperties,
+                        // properties: ContainerProperties,
 ) -> LibResult {
-    let properties: StandardProperties =
-        serde_json::from_str(&properties).expect("could not deserialize into `StandardProperties`");
+    let properties: ContainerProperties = serde_json::from_str(&properties)
+        .expect("could not deserialize into `ContainerProperties`");
 
     let res = db
         .send(ContainerCommand::UpdateProperties(UpdatePropertiesArgs { rid, properties }).into())
@@ -54,11 +59,11 @@ pub fn update_container_properties(
 pub fn update_container_script_associations(
     db: State<DbClient>,
     rid: ResourceId,
-    associations: String, // @todo: Issue with deserializing `HashMap`. perform manually.
+    associations: String, // TODO Issue with deserializing `HashMap`. perform manually.
                           // See: https://github.com/tauri-apps/tauri/issues/6078
                           // associations: ScriptMap,
 ) -> Result {
-    // @todo: Issue with deserializing `HashMap`. perform manually.
+    // TODO Issue with deserializing `HashMap`. perform manually.
     // See: https://github.com/tauri-apps/tauri/issues/6078
     let associations: ScriptMap =
         serde_json::from_str(&associations).expect("could not deserialize into `ScriptMap`");
@@ -83,7 +88,7 @@ pub fn update_container_script_associations(
 #[tauri::command]
 pub fn get_container_path(db: State<DbClient>, rid: ResourceId) -> Option<PathBuf> {
     let path = db
-        .send(ContainerCommand::GetPath(rid).into())
+        .send(ContainerCommand::Path(rid).into())
         .expect("could not get `Container` path");
 
     let path: Option<PathBuf> = serde_json::from_value(path)
@@ -94,19 +99,37 @@ pub fn get_container_path(db: State<DbClient>, rid: ResourceId) -> Option<PathBu
 
 /// Adds [`Asset`](thot_::project::Asset)s to a [`Container`](thot_::project::Container).
 #[tauri::command]
-pub fn add_assets(
-    db: State<DbClient>,
-    container: ResourceId,
-    assets: Vec<AddAssetInfo>,
-) -> Result<Vec<ResourceId>> {
-    let asset_rids = db
-        .send(ContainerCommand::AddAssets(AddAssetsArgs { container, assets }).into())
-        .expect("could not add `Asset`s to `Container`");
-
-    let asset_rids: DbResult<Vec<ResourceId>> = serde_json::from_value(asset_rids)
-        .expect("could not convert `AddAssets` result to `Vec<ResourceId>`");
-
-    Ok(asset_rids?)
+pub fn add_assets(db: State<DbClient>, container: ResourceId, assets: Vec<AddAssetInfo>) -> Result {
+    let container_path = db.send(ContainerCommand::Path(container).into()).unwrap();
+    let Some(container_path) = serde_json::from_value::<Option<PathBuf>>(container_path).unwrap()
+    else {
+        panic!("could not get container path");
+    };
+
+    for AddAssetInfo {
+        path,
+        action,
+        bucket,
+    } in assets
+    {
+        let mut asset_path = container_path.clone();
+        if let Some(bucket) = bucket {
+            todo!();
+            asset_path.push(bucket);
+            fs::create_dir_all(asset_path)?; // will trigger folder to be created as container by database.
+        }
+        asset_path.push(path.file_name().unwrap());
+
+        match action {
+            AssetFileAction::Copy => {
+                fs::copy(path, asset_path)?;
+            }
+            AssetFileAction::Move => todo!(),
+            AssetFileAction::Reference => todo!(),
+        }
+    }
+
+    Ok(())
 }
 
 #[tauri::command]
@@ -115,37 +138,52 @@ pub fn add_asset_windows(
     container: ResourceId,
     name: String,
     contents: Vec<u8>,
-) -> Result<Vec<ResourceId>> {
+) -> Result {
     // create file
     let path = db
-        .send(ContainerCommand::GetPath(container.clone()).into())
+        .send(ContainerCommand::Path(container.clone()).into())
         .expect("could not get `Container` path");
 
     let path: Option<PathBuf> =
         serde_json::from_value(path).expect("could not convert result of `GetPath` to `PathBuf`");
+
     let mut path = path.expect("could not get `Container` path");
     path.push(name);
     let path = unique_file_name(path).expect("could not create a unique file name");
-
     fs::write(&path, contents).expect("could not write to file");
+    Ok(())
+}
 
-    // add asset
-    let assets = vec![AddAssetInfo {
-        path,
-        action: AssetFileAction::Move,
-        bucket: None,
-    }];
-
-    let asset_rids = db
-        .send(ContainerCommand::AddAssets(AddAssetsArgs { container, assets }).into())
-        .expect("could not add `Asset`s");
-
-    let asset_rids: DbResult<Vec<ResourceId>> = serde_json::from_value(asset_rids)
-        .expect("could not convert `AddAssets` result to `Vec<ResourceId>`");
+#[tauri::command]
+pub fn bulk_update_container_properties(
+    db: State<DbClient>,
+    rids: Vec<ResourceId>,
+    update: ContainerPropertiesUpdate,
+) -> Result {
+    let res = db.send(
+        ContainerCommand::BulkUpdateProperties(BulkUpdateContainerPropertiesArgs { rids, update })
+            .into(),
+    );
 
-    Ok(asset_rids?)
+    // TODO Handle errors.
+    res.expect("could not update Containers");
+    Ok(())
 }
 
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
+#[tauri::command]
+pub fn bulk_update_container_script_associations(
+    db: State<DbClient>,
+    containers: Vec<ResourceId>,
+    update: ScriptAssociationBulkUpdate,
+) -> Result {
+    // TODO Handle errors.
+    db.send(
+        ContainerCommand::BulkUpdateScriptAssociations(BulkUpdateScriptAssociationsArgs {
+            containers,
+            update,
+        })
+        .into(),
+    )
+    .unwrap();
+    Ok(())
+}
diff --git a/desktop/src-tauri/src/commands/container_test.rs b/desktop/src-tauri/src/commands/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/graph.rs b/desktop/src-tauri/src/commands/graph.rs
index ce6b5575..57750389 100644
--- a/desktop/src-tauri/src/commands/graph.rs
+++ b/desktop/src-tauri/src/commands/graph.rs
@@ -6,17 +6,16 @@ use std::path::PathBuf;
 use tauri::State;
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::graph::ResourceTree;
-use thot_core::project::{Container, Project};
+use thot_core::project::{Container as CoreContainer, Project};
 use thot_core::types::{Creator, ResourceId, UserId};
 use thot_desktop_lib::error::{Error as LibError, Result as LibResult};
-use thot_local::project::container;
+use thot_local::error::{ContainerError, Error as LocalError};
+use thot_local::project::resources::Container as LocalContainer;
 use thot_local_database::client::Client as DbClient;
-use thot_local_database::command::container::UpdatePropertiesArgs;
-use thot_local_database::command::graph::NewChildArgs;
 use thot_local_database::command::{ContainerCommand, GraphCommand, ProjectCommand};
 use thot_local_database::Result as DbResult;
 
-type ContainerTree = ResourceTree<Container>;
+type ContainerTree = ResourceTree<CoreContainer>;
 
 /// Initializes a directory as a [`Container`](LocalContainer).
 ///
@@ -47,13 +46,11 @@ pub fn init_project_graph(
         return Err(DesktopSettingsError::NoUser.into());
     };
 
+    // create data folder
     let user = UserId::Id(user.rid.clone());
-    let mut container = Container::default();
+    let mut container = LocalContainer::new(path.clone());
     container.properties.creator = Creator::User(Some(user));
-
-    // create data folder
-    fs::create_dir(&path).expect("could not create data root directory");
-    let _rid = container::init_from(&path, container)?;
+    container.save()?;
 
     // set project data root
     let project = db
@@ -64,7 +61,10 @@ pub fn init_project_graph(
         serde_json::from_value(project).expect("could not convert `Get` result to `Project`");
 
     let Some(mut project) = project else {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` not loaded")).into());
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+            "`Project` not loaded",
+        ))
+        .into());
     };
 
     project.data_root = Some(path.clone());
@@ -116,15 +116,19 @@ pub fn load_project_graph(db: State<DbClient>, rid: ResourceId) -> LibResult<Con
 /// 2. `parent`: [`ResourceId`] of the parent [`Container`](LocalContainer).
 #[tracing::instrument(level = "debug", skip(db))]
 #[tauri::command]
-pub fn new_child(db: State<DbClient>, name: String, parent: ResourceId) -> Result<Container> {
-    let child = db
-        .send(GraphCommand::NewChild(NewChildArgs { name, parent }).into())
-        .expect("could not create child `Container`");
+pub fn new_child(db: State<DbClient>, name: String, parent: ResourceId) -> Result {
+    let path = db.send(ContainerCommand::Path(parent).into()).unwrap();
+    let Some(mut path) = serde_json::from_value::<Option<PathBuf>>(path).unwrap() else {
+        panic!("could not get container path");
+    };
 
-    let child: DbResult<Container> = serde_json::from_value(child)
-        .expect("could not convert `NewChild` result to a `Container`");
+    path.push(name);
+    if path.exists() {
+        return Err(LocalError::ContainerError(ContainerError::InvalidChildPath(path)).into());
+    }
 
-    Ok(child?)
+    fs::create_dir(path).unwrap();
+    Ok(())
 }
 
 /// Duplicates a [`Container`](LocalContainer) tree.
@@ -141,38 +145,7 @@ pub fn duplicate_container_tree(db: State<DbClient>, rid: ResourceId) -> LibResu
     let dup: DbResult<ContainerTree> = serde_json::from_value(dup)
         .expect("could not convert result of `Dupilcate` to `Container` tree");
 
-    // Update name
-    let mut dup = dup.map_err(|err| LibError::Database(format!("{err:?}")))?;
-    let root_id = dup.root().clone();
-    let root = dup
-        .get_mut(&root_id)
-        .expect("duplicated tree root not found");
-
-    let name = match root.properties.name.clone() {
-        None => "Copy".to_string(),
-        Some(mut name) => {
-            // TODO[m]: Add index to copy, instead of new "(Copy)" every time.
-            name.push_str(" (Copy)");
-            name
-        }
-    };
-
-    root.properties.name = Some(name);
-
-    let res = db
-        .send(
-            ContainerCommand::UpdateProperties(UpdatePropertiesArgs {
-                rid: root_id,
-                properties: root.properties.clone(),
-            })
-            .into(),
-        )
-        .expect("could not update root `Container`");
-
-    let res: DbResult = serde_json::from_value(res)
-        .expect("could not convert result of `UpdateContainerProperties` from JsValue");
-
-    res.map_err(|err| LibError::Database(format!("{err:?}")))?;
+    let dup = dup.map_err(|err| LibError::Database(format!("{err:?}")))?;
     Ok(dup)
 }
 
@@ -182,14 +155,11 @@ pub fn duplicate_container_tree(db: State<DbClient>, rid: ResourceId) -> LibResu
 /// 1. Id of the root of the `Container` tree to remove.
 #[tauri::command]
 pub fn remove_container_tree(db: State<DbClient>, rid: ResourceId) -> Result {
-    let res = db
-        .send(GraphCommand::Remove(rid).into())
-        .expect("could not remove `Container` tree");
-    let res: DbResult = serde_json::from_value(res)
-        .expect("could not convert result of `Remove` to `Container` tree");
-    res.map_err(|err| err.into())
-}
+    let path = db.send(ContainerCommand::Path(rid).into()).unwrap();
+    let Some(path) = serde_json::from_value::<Option<PathBuf>>(path).unwrap() else {
+        panic!("could not get container path");
+    };
 
-#[cfg(test)]
-#[path = "./graph_test.rs"]
-mod graph_test;
+    trash::delete(path).unwrap();
+    Ok(())
+}
diff --git a/desktop/src-tauri/src/commands/graph_test.rs b/desktop/src-tauri/src/commands/graph_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/mod.rs b/desktop/src-tauri/src/commands/mod.rs
index a6b83ae5..51380064 100644
--- a/desktop/src-tauri/src/commands/mod.rs
+++ b/desktop/src-tauri/src/commands/mod.rs
@@ -19,7 +19,3 @@ pub use project::*;
 pub use script::*;
 pub use settings::*;
 pub use user::*;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/commands/mod_test.rs b/desktop/src-tauri/src/commands/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/project.rs b/desktop/src-tauri/src/commands/project.rs
index 3f0e404b..a30bb2c2 100644
--- a/desktop/src-tauri/src/commands/project.rs
+++ b/desktop/src-tauri/src/commands/project.rs
@@ -12,9 +12,9 @@ use thot_desktop_lib::error::{
     DesktopSettings as DesktopSettingsError, Error as LibError, Result as LibResult,
 };
 use thot_local::project::project;
-use thot_local::project::resources::project::{Loader as ProjectLoader, Project as LocalProject};
-use thot_local::project::types::ProjectSettings;
+use thot_local::project::resources::Project as LocalProject;
 use thot_local::system::projects as sys_projects;
+use thot_local::types::ProjectSettings;
 use thot_local_database::client::Client as DbClient;
 use thot_local_database::command::{GraphCommand, ProjectCommand};
 use thot_local_database::Result as DbResult;
@@ -61,7 +61,7 @@ pub fn load_project(db: State<DbClient>, path: PathBuf) -> Result<(Project, Proj
 // *** add project ***
 // *******************
 
-/// Adds a [`Project`].
+/// Adds an existing [`Project`] to the users vault.
 #[tauri::command]
 pub fn add_project(
     app_state: State<AppState>,
@@ -80,6 +80,7 @@ pub fn add_project(
     let project = db
         .send(ProjectCommand::Add(path, user.rid.clone()).into())
         .expect("could not add `Project`");
+
     let project: DbResult<(Project, ProjectSettings)> =
         serde_json::from_value(project).expect("could not convert `Add` result to `Project`");
 
@@ -89,6 +90,7 @@ pub fn add_project(
 // *******************
 // *** get project ***
 // *******************
+
 /// Gets a [`Project`].
 #[tauri::command]
 pub fn get_project(db: State<DbClient>, rid: ResourceId) -> Result<Option<Project>> {
@@ -124,30 +126,6 @@ pub fn set_active_project(app_state: State<AppState>, rid: Option<ResourceId>) -
     Ok(())
 }
 
-// *******************
-// *** new project ***
-// *******************
-
-// @todo: Can possibly remove.
-//
-// /// Creates a new project.
-// #[tauri::command]
-// pub fn new_project(app_state: State<AppState>, name: &str) -> Result<Project> {
-//     // create new project
-//     let project = LocalProject::new(name)?;
-//     let prj_props = (*project).clone();
-
-//     // store project
-//     let mut project_store = app_state
-//         .projects
-//         .lock()
-//         .expect("could not lock `AppState.projects`");
-
-//     project_store.insert(prj.properties.rid.clone(), prj);
-
-//     Ok(prj_props)
-// }
-
 // ********************
 // *** init project ***
 // ********************
@@ -157,32 +135,34 @@ pub fn set_active_project(app_state: State<AppState>, rid: Option<ResourceId>) -
 pub fn init_project(path: &Path) -> Result<ResourceId> {
     let rid = project::init(path)?;
 
-    // @todo: Move to frontend.
     // create analysis folder
     let analysis_root = "analysis";
     let mut analysis = path.to_path_buf();
     analysis.push(analysis_root);
     fs::create_dir(&analysis).expect("could not create analysis directory");
 
-    let mut project: LocalProject = ProjectLoader::load_or_create(path)
-        .expect("Could not load `Project`")
-        .into();
-
+    let mut project = LocalProject::load_from(path)?;
     project.analysis_root = Some(PathBuf::from(analysis_root));
     project.save()?;
 
     Ok(rid)
 }
 
+// remember to call `.manage(MyState::default())`
+#[tauri::command]
+pub fn init_project_from(path: &Path) -> Result<ResourceId> {
+    Ok(thot_local::project::init(path, "data", "analysis")?)
+}
+
 // ************************
 // *** get project path ***
 // ************************
 
 #[tauri::command]
-pub fn get_project_path(id: ResourceId) -> Result<PathBuf> {
-    let Some(path) = sys_projects::get_path(&id)? else {
+pub fn get_project_path(rid: ResourceId) -> Result<PathBuf> {
+    let Some(path) = sys_projects::get_path(&rid)? else {
         return Err(CoreError::ProjectError(ProjectError::NotRegistered(
-            Some(ResourceId::from(id.clone())),
+            Some(ResourceId::from(rid.clone())),
             None,
         ))
         .into());
@@ -215,20 +195,21 @@ pub fn update_project(db: State<DbClient>, project: Project) -> Result {
 #[tauri::command]
 pub fn analyze(db: State<DbClient>, root: ResourceId, max_tasks: Option<usize>) -> LibResult {
     let graph = db
-        .send(GraphCommand::Get(root).into())
+        .send(GraphCommand::Get(root.clone()).into())
         .expect("could not get graph");
 
     let graph: Option<ResourceTree<Container>> =
         serde_json::from_value(graph).expect("could not convert from `Get` to `Container` tree");
 
     let Some(mut graph) = graph else {
-        let error = CoreError::ResourceError(ResourceError::DoesNotExist("root `Container` not loaded"));
+        let error =
+            CoreError::ResourceError(ResourceError::does_not_exist("root `Container` not loaded"));
         return Err(LibError::Database(format!("{error:?}")));
     };
 
     let runner = Runner::new();
     let res = match max_tasks {
-        None => runner.run(&mut graph),
+        None => runner.run_from(&mut graph, &root),
         Some(max_tasks) => runner.run_with_tasks(&mut graph, max_tasks),
     };
 
@@ -238,7 +219,3 @@ pub fn analyze(db: State<DbClient>, root: ResourceId, max_tasks: Option<usize>)
 
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/desktop/src-tauri/src/commands/project_test.rs b/desktop/src-tauri/src/commands/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/script.rs b/desktop/src-tauri/src/commands/script.rs
index 70a76bd8..c9beedda 100644
--- a/desktop/src-tauri/src/commands/script.rs
+++ b/desktop/src-tauri/src/commands/script.rs
@@ -42,7 +42,10 @@ pub fn add_script(db: State<DbClient>, project: ResourceId, path: PathBuf) -> Re
         serde_json::from_value(project).expect("could not convert `Get` result to `Project`");
 
     let Some(project) = project else {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` not loaded")).into());
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+            "`Project` not loaded",
+        ))
+        .into());
     };
 
     let project_path = db
@@ -52,11 +55,17 @@ pub fn add_script(db: State<DbClient>, project: ResourceId, path: PathBuf) -> Re
         serde_json::from_value(project_path).expect("could not convert `GetPath` to `PathBuf`");
 
     let Some(project_path) = project_path else {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` not loaded")).into());
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+            "`Project` not loaded",
+        ))
+        .into());
     };
 
     let Some(analysis_root) = project.analysis_root.clone() else {
-        return Err(CoreError::ProjectError(ProjectError::Misconfigured("`Project` does not have an analysis root set")).into());
+        return Err(CoreError::ProjectError(ProjectError::misconfigured(
+            "`Project` does not have an analysis root set",
+        ))
+        .into());
     };
 
     let script_name = path.file_name().expect("invalid `Script` file");
@@ -96,7 +105,3 @@ pub fn remove_script(db: State<DbClient>, project: ResourceId, script: ResourceI
     res.expect("error removing `Script`");
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./script_test.rs"]
-mod script_test;
diff --git a/desktop/src-tauri/src/commands/script_test.rs b/desktop/src-tauri/src/commands/script_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/settings/mod.rs b/desktop/src-tauri/src/commands/settings/mod.rs
index 727b850c..0681e5c5 100644
--- a/desktop/src-tauri/src/commands/settings/mod.rs
+++ b/desktop/src-tauri/src/commands/settings/mod.rs
@@ -5,7 +5,3 @@ pub mod user_settings;
 // Re-exports
 pub use user_app_state::*;
 pub use user_settings::*;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/commands/settings/mod_test.rs b/desktop/src-tauri/src/commands/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/settings/user_app_state.rs b/desktop/src-tauri/src/commands/settings/user_app_state.rs
index ffc518dc..0e558407 100644
--- a/desktop/src-tauri/src/commands/settings/user_app_state.rs
+++ b/desktop/src-tauri/src/commands/settings/user_app_state.rs
@@ -1,8 +1,7 @@
 //! Functionality to interact with [`UserAppState`] settings.
 use crate::error::{DesktopSettingsError, Result};
-use crate::settings::{loader::Loader, UserAppState};
+use crate::settings::UserAppState;
 use crate::state::AppState;
-use settings_manager::Settings;
 use tauri::State;
 use thot_core::types::ResourceId;
 use thot_desktop_lib::settings::{HasUser, UserAppState as DesktopUserAppState};
@@ -23,15 +22,14 @@ pub fn load_user_app_state(
         // user state loaded
         if state.user() == &rid {
             // user state for user already loaded
-            return Ok((*state).clone());
+            return Ok((*state).clone().into());
         }
     }
 
-    let user_state: UserAppState = Loader::load_or_create_with::<UserAppState>(&rid)?.into();
-    let desktop_state = user_state.clone().into();
-    *state = Some(user_state);
+    let user_app_state = UserAppState::load_or_new(&rid)?;
+    *state = Some(user_app_state.clone());
 
-    Ok(desktop_state)
+    Ok(user_app_state.into())
 }
 
 /// Gets the current [`UserAppState`].
@@ -42,7 +40,7 @@ pub fn get_user_app_state(app_state: State<AppState>) -> Option<DesktopUserAppSt
         .lock()
         .expect("could not lock `UserAppState`");
 
-    state.as_ref().map(|settings| (*settings).clone())
+    state.as_ref().map(|state| (*state).clone().into())
 }
 
 /// Updates a user's [`UserAppState`](DesktopUserAppState) settings.
@@ -67,7 +65,3 @@ pub fn update_user_app_state(app_state: State<AppState>, state: DesktopUserAppSt
     user_app_state.save()?;
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./user_app_state_test.rs"]
-mod user_app_state_test;
diff --git a/desktop/src-tauri/src/commands/settings/user_app_state_test.rs b/desktop/src-tauri/src/commands/settings/user_app_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/settings/user_settings.rs b/desktop/src-tauri/src/commands/settings/user_settings.rs
index e82355b8..c29e4ffe 100644
--- a/desktop/src-tauri/src/commands/settings/user_settings.rs
+++ b/desktop/src-tauri/src/commands/settings/user_settings.rs
@@ -1,8 +1,7 @@
 //! Commands to interact with [`UserSettings`].
 use crate::error::{DesktopSettingsError, Result};
-use crate::settings::{loader::Loader, UserSettings as AppUserSettings};
+use crate::settings::UserSettings as AppUserSettings;
 use crate::state::AppState;
-use settings_manager::Settings;
 use tauri::State;
 use thot_core::types::ResourceId;
 use thot_desktop_lib::settings::{HasUser, UserSettings as DesktopUserSettings};
@@ -28,8 +27,7 @@ pub fn load_user_settings(
         }
     }
 
-    let user_settings: AppUserSettings =
-        Loader::load_or_create_with::<AppUserSettings>(&rid)?.into();
+    let user_settings = AppUserSettings::load_or_new(&rid)?;
     let desktop_settings: DesktopUserSettings = user_settings.clone().into();
     *settings = Some(user_settings);
 
@@ -63,7 +61,3 @@ pub fn update_user_settings(app_state: State<AppState>, settings: DesktopUserSet
     user_settings.save()?;
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/desktop/src-tauri/src/commands/settings/user_settings_test.rs b/desktop/src-tauri/src/commands/settings/user_settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/commands/user.rs b/desktop/src-tauri/src/commands/user.rs
index 64d62849..76665b65 100644
--- a/desktop/src-tauri/src/commands/user.rs
+++ b/desktop/src-tauri/src/commands/user.rs
@@ -1,6 +1,5 @@
 //! Commands related to users.
 use crate::error::Result;
-use crate::settings::loader::Loader;
 use crate::settings::{UserAppState, UserSettings};
 use crate::state::AppState;
 use tauri::State;
@@ -34,13 +33,13 @@ pub fn set_active_user(app_state: State<AppState>, rid: ResourceId) -> Result {
         .expect("could not lock `AppState.user`") = user;
 
     // settings
-    let user_app_state: UserAppState = Loader::load_or_create_with::<UserAppState>(&rid)?.into();
+    let user_app_state = UserAppState::load_or_new(&rid)?;
     *app_state
         .user_app_state
         .lock()
         .expect("could not lock `AppState.user_app_state`") = Some(user_app_state);
 
-    let user_settings: UserSettings = Loader::load_or_create_with::<UserSettings>(&rid)?.into();
+    let user_settings = UserSettings::load_or_new(&rid)?.into();
     *app_state
         .user_settings
         .lock()
@@ -73,7 +72,3 @@ pub fn unset_active_user(app_state: State<AppState>) -> Result {
 
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./user_test.rs"]
-mod user_test;
diff --git a/desktop/src-tauri/src/commands/user_test.rs b/desktop/src-tauri/src/commands/user_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/common.rs b/desktop/src-tauri/src/common.rs
index c619ce22..8f17148f 100644
--- a/desktop/src-tauri/src/common.rs
+++ b/desktop/src-tauri/src/common.rs
@@ -1,17 +1,15 @@
 //! Common functionality.
-use settings_manager::Result;
-use std::path::PathBuf;
-use thot_core::types::ResourceId;
-use thot_local::system::common;
-
 use crate::identifier::Identifier;
 use directories::ProjectDirs;
-use settings_manager::{Error as SettingsError, Result as SettingsResult};
 use std::io;
+use std::path::PathBuf;
 use thot_core::identifier::Identifier as CoreIdentifier;
+use thot_core::types::ResourceId;
+use thot_core::Result;
+use thot_local::system::common;
 
 /// Returns directories for the user's Thot.
-pub fn system_dirs() -> SettingsResult<ProjectDirs> {
+pub fn system_dirs() -> Result<ProjectDirs> {
     let dirs_opt = ProjectDirs::from(
         &CoreIdentifier::qualifier(),
         &CoreIdentifier::organization(),
@@ -20,15 +18,16 @@ pub fn system_dirs() -> SettingsResult<ProjectDirs> {
 
     match dirs_opt {
         Some(dirs) => Ok(dirs),
-        None => Err(SettingsError::IoError(io::Error::new(
+        None => Err(io::Error::new(
             io::ErrorKind::NotFound,
             "system settings directory not found",
-        ))),
+        )
+        .into()),
     }
 }
 
 /// Returns the path to the user's config directory for Thot.
-pub fn config_dir_path() -> SettingsResult<PathBuf> {
+pub fn config_dir_path() -> Result<PathBuf> {
     let dirs = system_dirs()?;
     let path = dirs.config_dir();
     Ok(path.to_path_buf())
@@ -47,7 +46,3 @@ pub fn user_config_dir(user: &ResourceId) -> Result<PathBuf> {
     path.push(user.to_string());
     Ok(path)
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/desktop/src-tauri/src/common_test.rs b/desktop/src-tauri/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/db/functions.rs b/desktop/src-tauri/src/db/functions.rs
index e6d22db5..a832c1e1 100644
--- a/desktop/src-tauri/src/db/functions.rs
+++ b/desktop/src-tauri/src/db/functions.rs
@@ -23,7 +23,3 @@ fn init_database() -> (Receiver<CommandEvent>, CommandChild) {
         .spawn()
         .expect("failed to spawn sidecar")
 }
-
-#[cfg(test)]
-#[path = "./functions_test.rs"]
-mod functions_test;
diff --git a/desktop/src-tauri/src/db/functions_test.rs b/desktop/src-tauri/src/db/functions_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/db/mod.rs b/desktop/src-tauri/src/db/mod.rs
index 7e168fbd..837e1b04 100644
--- a/desktop/src-tauri/src/db/mod.rs
+++ b/desktop/src-tauri/src/db/mod.rs
@@ -1,6 +1,5 @@
 //! Interaction with a [`Database`](thot_local::db::Database).
 pub mod functions;
+pub mod update_actor;
 
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub use update_actor::UpdateActor;
diff --git a/desktop/src-tauri/src/db/mod_test.rs b/desktop/src-tauri/src/db/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/db/update_actor.rs b/desktop/src-tauri/src/db/update_actor.rs
new file mode 100644
index 00000000..ff2ae484
--- /dev/null
+++ b/desktop/src-tauri/src/db/update_actor.rs
@@ -0,0 +1,64 @@
+//! Actor for listening to database updates.
+use thot_local_database::event::Update;
+
+pub struct UpdateActor {
+    window: tauri::Window,
+    zmq_socket: zmq::Socket,
+}
+
+impl UpdateActor {
+    /// Create a new actor that listens to database updates.
+    /// The actor immediately begins listening.
+    pub fn new(window: tauri::Window) -> Self {
+        let zmq_context = zmq::Context::new();
+        let zmq_socket = zmq_context.socket(zmq::SUB).unwrap();
+        zmq_socket
+            .set_subscribe(thot_local_database::constants::PUB_SUB_TOPIC.as_bytes())
+            .unwrap();
+
+        zmq_socket
+            .connect(&thot_local_database::common::zmq_url(zmq::SUB).unwrap())
+            .unwrap();
+
+        Self { window, zmq_socket }
+    }
+
+    /// Instruct the actor to respond to events.
+    pub fn run(&self) {
+        self.listen_for_events();
+    }
+
+    /// Listen for database updates and send them to main window.
+    #[tracing::instrument(skip(self))]
+    fn listen_for_events(&self) {
+        loop {
+            let messages = match self.zmq_socket.recv_multipart(0) {
+                Ok(msg) => msg,
+                Err(err) => {
+                    tracing::debug!(?err);
+                    continue;
+                }
+            };
+
+            let messages = messages
+                .into_iter()
+                .map(|msg| zmq::Message::try_from(msg).unwrap())
+                .collect::<Vec<_>>();
+
+            let topic = messages
+                .get(0)
+                .unwrap()
+                .as_str()
+                .unwrap()
+                .replace("local-database", "database/update");
+
+            let mut message = String::new();
+            for msg in messages.iter().skip(1) {
+                message.push_str(msg.as_str().unwrap());
+            }
+
+            let event: Update = serde_json::from_str(&message).unwrap();
+            self.window.emit(&topic, event).unwrap();
+        }
+    }
+}
diff --git a/desktop/src-tauri/src/error.rs b/desktop/src-tauri/src/error.rs
index d4249f58..ce16eaae 100644
--- a/desktop/src-tauri/src/error.rs
+++ b/desktop/src-tauri/src/error.rs
@@ -1,10 +1,9 @@
 //! `Error`s and `Result`s
 use serde::{Deserialize, Serialize};
-use settings_manager::Error as SettingsError;
-use std::error::Error as StdErrorTrait;
+use std::io;
 use std::result::Result as StdResult;
-use std::{fmt, io};
 use tauri::Error as TauriError;
+use thiserror::Error;
 use thot_core::Error as CoreError;
 use thot_local::Error as LocalError;
 use thot_local_database::error::Error as DbError;
@@ -13,12 +12,14 @@ use thot_local_database::error::Error as DbError;
 // *** Desktop Settings Error ***
 // ******************************
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum DesktopSettingsError {
     /// The desired update can not be performed.
+    #[error("{0}")]
     InvalidUpdate(String),
 
     /// An active user is not set.
+    #[error("no user activated")]
     NoUser,
 }
 
@@ -26,14 +27,27 @@ pub enum DesktopSettingsError {
 // *** Error ***
 // *************
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum Error {
+    #[error("{0}")]
     CoreError(CoreError),
+
+    #[error("{0}")]
     DesktopSettingsError(DesktopSettingsError),
+
+    #[error("{0}")]
+    SerdeError(serde_json::Error),
+
+    #[error("{0}")]
     IoError(io::Error),
+
+    #[error("{0}")]
     LocalError(LocalError),
-    SettingsError(SettingsError),
+
+    #[error("{0}")]
     TauriError(TauriError),
+
+    #[error("{0}")]
     LocalDatabaseError(DbError),
 }
 
@@ -49,6 +63,12 @@ impl From<io::Error> for Error {
     }
 }
 
+impl From<serde_json::Error> for Error {
+    fn from(err: serde_json::Error) -> Self {
+        Self::SerdeError(err)
+    }
+}
+
 impl From<CoreError> for Error {
     fn from(err: CoreError) -> Self {
         Self::CoreError(err)
@@ -67,26 +87,12 @@ impl From<DbError> for Error {
     }
 }
 
-impl From<SettingsError> for Error {
-    fn from(err: SettingsError) -> Self {
-        Self::SettingsError(err)
-    }
-}
-
 impl From<TauriError> for Error {
     fn from(err: TauriError) -> Self {
         Self::TauriError(err)
     }
 }
 
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> StdResult<(), fmt::Error> {
-        write!(f, "{:?}", self)
-    }
-}
-
-impl StdErrorTrait for Error {}
-
 impl serde::Serialize for Error {
     fn serialize<S>(&self, serializer: S) -> StdResult<S::Ok, S::Error>
     where
@@ -101,7 +107,3 @@ impl serde::Serialize for Error {
 // **************
 
 pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/desktop/src-tauri/src/error_test.rs b/desktop/src-tauri/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/identifier.rs b/desktop/src-tauri/src/identifier.rs
index c648bbcb..9b2a6a39 100644
--- a/desktop/src-tauri/src/identifier.rs
+++ b/desktop/src-tauri/src/identifier.rs
@@ -3,6 +3,6 @@ pub struct Identifier;
 
 impl Identifier {
     pub fn application() -> String {
-        String::from("desktop")
+        String::from("thot-desktop")
     }
 }
diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
index 8fdf44a5..fb539882 100644
--- a/desktop/src-tauri/src/main.rs
+++ b/desktop/src-tauri/src/main.rs
@@ -15,12 +15,12 @@ mod ui;
 
 use commands::*;
 use std::io;
-use tauri::RunEvent;
+// use tauri::RunEvent;
 use thot_local_database::client::Client as DbClient;
 use tracing_subscriber::filter::LevelFilter;
 use tracing_subscriber::fmt;
 use tracing_subscriber::fmt::time::UtcTime;
-use tracing_subscriber::fmt::Subscriber;
+// use tracing_subscriber::fmt::Subscriber;
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::{Layer, Registry};
 
@@ -57,7 +57,7 @@ fn main() {
     db::functions::verify_database();
 
     // create app
-    let app = tauri::Builder::default()
+    let _app = tauri::Builder::default()
         .system_tray(system_tray())
         .on_system_tray_event(|app, event| handle_system_tray_event(app, event))
         .menu(main_menu())
@@ -86,11 +86,11 @@ fn main() {
             add_project,
             get_project_path,
             init_project,
+            init_project_from,
             set_active_project,
             load_project,
             load_user_projects,
             get_project,
-            // new_project, @todo: Possibly remove.
             update_project,
             analyze,
             // graph
@@ -99,6 +99,8 @@ fn main() {
             // container
             add_assets,
             add_asset_windows,
+            bulk_update_container_properties,
+            bulk_update_container_script_associations,
             get_container,
             get_container_path,
             new_child,
@@ -107,6 +109,7 @@ fn main() {
             duplicate_container_tree,
             remove_container_tree,
             // asset
+            bulk_update_asset_properties,
             get_assets,
             update_asset_properties,
             remove_asset,
@@ -116,19 +119,21 @@ fn main() {
             remove_script,
         ])
         .setup(setup::setup)
-        .build(tauri::generate_context!())
+        // .build(tauri::generate_context!()) // TODO Handle events
+        .run(tauri::generate_context!())
         .expect("could not build app");
 
-    app.run(move |_app, event| match event {
-        RunEvent::ExitRequested { api, .. } => {
-            // @todo: Appears that `database` process is killed automatically
-            // when parent is killed. May have to manually kill if detached.
-            // if let Some((_rx_database, proc_database)) = db_handler {
-            //     proc_database
-            //         .kill()
-            //         .expect("could not kill `database` process");
-            // }
-        }
-        _ => {}
-    });
+    // TODO Handle events
+    // app.run(move |_app, event| match event {
+    //     RunEvent::ExitRequested { api, .. } => {
+    // TODO Appears that `database` process is killed automatically
+    // when parent is killed. May have to manually kill if detached.
+    // if let Some((_rx_database, proc_database)) = db_handler {
+    //     proc_database
+    //         .kill()
+    //         .expect("could not kill `database` process");
+    // }
+    // }
+    // _ => {}
+    // });
 }
diff --git a/desktop/src-tauri/src/settings/loader.rs b/desktop/src-tauri/src/settings/loader.rs
index 380c1795..adad1b85 100644
--- a/desktop/src-tauri/src/settings/loader.rs
+++ b/desktop/src-tauri/src/settings/loader.rs
@@ -1,6 +1,6 @@
 //! User settings loader.
 use serde::{de::DeserializeOwned, Serialize};
-use settings_manager::user_settings::{Loader as UserLoader, UserSettings};
+use settings_manager::locked::user_settings::{Loader as UserLoader, UserSettings};
 use settings_manager::Result;
 use std::marker::PhantomData;
 use std::path::PathBuf;
@@ -26,7 +26,3 @@ where
         Ok(loader)
     }
 }
-
-#[cfg(test)]
-#[path = "./loader_test.rs"]
-mod loader_test;
diff --git a/desktop/src-tauri/src/settings/loader_test.rs b/desktop/src-tauri/src/settings/loader_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/settings/mod.rs b/desktop/src-tauri/src/settings/mod.rs
index 6ee227f6..dca24d8e 100644
--- a/desktop/src-tauri/src/settings/mod.rs
+++ b/desktop/src-tauri/src/settings/mod.rs
@@ -1,12 +1,8 @@
 //! Settings for Thot desktop app.
+// pub mod loader;
 pub mod user_app_state;
 pub mod user_settings;
-pub mod loader;
 
 // Re-exports
 pub use user_app_state::UserAppState;
 pub use user_settings::UserSettings;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/settings/mod_test.rs b/desktop/src-tauri/src/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/settings/user_app_state.rs b/desktop/src-tauri/src/settings/user_app_state.rs
index 78ac1810..1ef83b13 100644
--- a/desktop/src-tauri/src/settings/user_app_state.rs
+++ b/desktop/src-tauri/src/settings/user_app_state.rs
@@ -1,29 +1,67 @@
 //! Application state for startup.
 use crate::common;
 use crate::error::{DesktopSettingsError, Result};
-use cluFlock::FlockLock;
-use settings_manager::user_settings::{
-    Components, Loader as UserLoader, UserSettings as UserSettingsInterface,
-};
-use settings_manager::Settings;
-use std::fs::File;
+use std::fs;
+use std::io::{self, BufReader};
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
+use thot_core::types::ResourceId;
 use thot_desktop_lib::settings::UserSettingsFile;
 use thot_desktop_lib::settings::{HasUser, UserAppState as DesktopUserAppState};
+use thot_local::file_resource::UserResource;
 
-#[derive(Settings)]
+#[derive(Clone, Debug)]
 pub struct UserAppState {
-    #[settings(file_lock = "DesktopUserAppState")]
-    file_lock: FlockLock<File>,
-
     rel_path: PathBuf,
-
-    #[settings(priority = "User")]
     app_state: DesktopUserAppState,
 }
 
 impl UserAppState {
+    pub fn load(user: &ResourceId) -> Result<Self> {
+        let rel_path = PathBuf::from(user.to_string());
+        let rel_path = rel_path.join(Self::settings_file());
+
+        let path = Self::base_path().join(&rel_path);
+        let file = fs::File::open(path)?;
+        let reader = BufReader::new(file);
+        let app_state = serde_json::from_reader(reader)?;
+
+        Ok(Self {
+            rel_path: rel_path.into(),
+            app_state,
+        })
+    }
+
+    pub fn load_or_new(user: &ResourceId) -> Result<Self> {
+        let rel_path = PathBuf::from(user.to_string());
+        let rel_path = rel_path.join(Self::settings_file());
+
+        let path = Self::base_path().join(&rel_path);
+        match fs::File::open(path) {
+            Ok(file) => {
+                let reader = BufReader::new(file);
+                let app_state = serde_json::from_reader(reader)?;
+
+                Ok(Self {
+                    rel_path: rel_path.into(),
+                    app_state,
+                })
+            }
+
+            Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(Self {
+                rel_path: rel_path.into(),
+                app_state: DesktopUserAppState::new(user.clone()),
+            }),
+
+            Err(err) => Err(err.into()),
+        }
+    }
+
+    pub fn save(&self) -> Result {
+        fs::write(self.path(), serde_json::to_string_pretty(&self.app_state)?)?;
+        Ok(())
+    }
+
     /// Updates the app state.
     pub fn update(&mut self, app_state: DesktopUserAppState) -> Result {
         // verify correct user
@@ -52,7 +90,7 @@ impl Into<DesktopUserAppState> for UserAppState {
     }
 }
 
-impl UserSettingsInterface<DesktopUserAppState> for UserAppState {
+impl UserResource<DesktopUserAppState> for UserAppState {
     fn base_path() -> PathBuf {
         common::users_config_dir().expect("could not get config path")
     }
@@ -67,18 +105,3 @@ impl UserSettingsFile for UserAppState {
         PathBuf::from("desktop_app_state.json")
     }
 }
-
-impl From<UserLoader<DesktopUserAppState>> for UserAppState {
-    fn from(loader: UserLoader<DesktopUserAppState>) -> Self {
-        let loader: Components<DesktopUserAppState> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            rel_path: loader.rel_path,
-            app_state: loader.data,
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "./user_app_state_test.rs"]
-mod user_app_state_test;
diff --git a/desktop/src-tauri/src/settings/user_app_state_test.rs b/desktop/src-tauri/src/settings/user_app_state_test.rs
deleted file mode 100644
index 50afa8de..00000000
--- a/desktop/src-tauri/src/settings/user_app_state_test.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use super::*;
-use std::path::PathBuf;
-use thot_core::types::ResourceId;
-
-#[test]
-fn user_path_should_be_correct() {
-    let uid = ResourceId::new();
-
-    let mut expected = PathBuf::from(uid.to_string());
-    expected.set_extension("json");
-
-    assert_eq!(
-        expected,
-        UserAppState::user_path(uid),
-        "incorrect user path"
-    );
-}
diff --git a/desktop/src-tauri/src/settings/user_settings.rs b/desktop/src-tauri/src/settings/user_settings.rs
index 19ffc1e8..13215475 100644
--- a/desktop/src-tauri/src/settings/user_settings.rs
+++ b/desktop/src-tauri/src/settings/user_settings.rs
@@ -1,29 +1,67 @@
 //! All settings.
 use crate::common;
 use crate::error::{DesktopSettingsError, Result};
-use cluFlock::FlockLock;
-use settings_manager::user_settings::{
-    Components, Loader as UserLoader, UserSettings as UserSettingsInterface,
-};
-use settings_manager::Settings;
-use std::fs::File;
+use std::fs;
+use std::io::{self, BufReader};
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
+use thot_core::types::ResourceId;
 use thot_desktop_lib::settings::UserSettingsFile;
 use thot_desktop_lib::settings::{HasUser, UserSettings as DesktopUserSettings};
+use thot_local::file_resource::UserResource;
 
-#[derive(Settings)]
 pub struct UserSettings {
-    #[settings(file_lock = "DesktopUserSettings")]
-    file_lock: FlockLock<File>,
-
     rel_path: PathBuf,
-
-    #[settings(priority = "User")]
     settings: DesktopUserSettings,
 }
 
 impl UserSettings {
+    /// Loads the settings for the given user.
+    pub fn load(user: &ResourceId) -> Result<Self> {
+        let rel_path = PathBuf::from(user.to_string());
+        let rel_path = rel_path.join(Self::settings_file());
+
+        let path = Self::base_path().join(&rel_path);
+        let file = fs::File::open(path)?;
+        let reader = BufReader::new(file);
+        let settings = serde_json::from_reader(reader)?;
+
+        Ok(Self {
+            rel_path: rel_path.into(),
+            settings,
+        })
+    }
+
+    pub fn load_or_new(user: &ResourceId) -> Result<Self> {
+        let rel_path = PathBuf::from(user.to_string());
+        let rel_path = rel_path.join(Self::settings_file());
+
+        let path = Self::base_path().join(&rel_path);
+        match fs::File::open(path) {
+            Ok(file) => {
+                let reader = BufReader::new(file);
+                let settings = serde_json::from_reader(reader)?;
+
+                Ok(Self {
+                    rel_path: rel_path.into(),
+                    settings,
+                })
+            }
+
+            Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(Self {
+                rel_path: rel_path.into(),
+                settings: DesktopUserSettings::new(user.clone()),
+            }),
+
+            Err(err) => Err(err.into()),
+        }
+    }
+
+    pub fn save(&self) -> Result {
+        fs::write(self.path(), serde_json::to_string_pretty(&self.settings)?)?;
+        Ok(())
+    }
+
     /// Updates the app state.
     pub fn update(&mut self, settings: DesktopUserSettings) -> Result {
         // verify correct user
@@ -58,7 +96,7 @@ impl Into<DesktopUserSettings> for UserSettings {
     }
 }
 
-impl UserSettingsInterface<DesktopUserSettings> for UserSettings {
+impl UserResource<DesktopUserSettings> for UserSettings {
     fn base_path() -> PathBuf {
         common::users_config_dir().expect("could not get config path")
     }
@@ -73,18 +111,3 @@ impl UserSettingsFile for UserSettings {
         PathBuf::from("desktop_settings.json")
     }
 }
-
-impl From<UserLoader<DesktopUserSettings>> for UserSettings {
-    fn from(loader: UserLoader<DesktopUserSettings>) -> Self {
-        let loader: Components<DesktopUserSettings> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            rel_path: loader.rel_path,
-            settings: loader.data,
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/desktop/src-tauri/src/settings/user_settings_test.rs b/desktop/src-tauri/src/settings/user_settings_test.rs
deleted file mode 100644
index 81e81f6f..00000000
--- a/desktop/src-tauri/src/settings/user_settings_test.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use super::*;
-use std::path::PathBuf;
-use thot_core::types::ResourceId;
-
-#[test]
-fn user_path_should_be_correct() {
-    let uid = ResourceId::new();
-
-    let mut expected = PathBuf::from(uid.to_string());
-    expected.set_extension("json");
-
-    assert_eq!(
-        expected,
-        UserSettings::user_path(uid),
-        "incorrect relative path"
-    );
-}
diff --git a/desktop/src-tauri/src/setup.rs b/desktop/src-tauri/src/setup.rs
index f72da8a1..4b94b6b8 100644
--- a/desktop/src-tauri/src/setup.rs
+++ b/desktop/src-tauri/src/setup.rs
@@ -1,7 +1,21 @@
 //! Startup functionality.
+use crate::db::UpdateActor;
+use std::thread;
 use tauri::{App, Manager};
 
 pub fn setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
+    // database updates
+    let update_actor = UpdateActor::new(app.get_window("main").unwrap());
+    thread::Builder::new()
+        .name("update-actor".into())
+        .spawn(move || update_actor.run())
+        .unwrap();
+
+    Ok(())
+}
+
+/// Launches the splashscreen.
+fn splashscreen(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
     // get windows
     let w_splashscreen = app
         .get_window("splashscreen")
@@ -11,10 +25,9 @@ pub fn setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
 
     // run init in new task
     tauri::async_runtime::spawn(async move {
-        // Important! If sleep time is less than 150ms SIGBUS error occurs.
+        // NOTE If sleep time is less than 150ms SIGBUS error occurs.
         std::thread::sleep(std::time::Duration::from_millis(250));
         // TODO: Load user settings.
-        // TODO: Load user projects.
         w_splashscreen
             .close()
             .expect("could not close splashscreen");
@@ -24,7 +37,3 @@ pub fn setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
-
-#[cfg(test)]
-#[path = "./setup_test.rs"]
-mod setup_test;
diff --git a/desktop/src-tauri/src/setup_test.rs b/desktop/src-tauri/src/setup_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/state/app.rs b/desktop/src-tauri/src/state/app.rs
index 626d48f9..e75008b5 100644
--- a/desktop/src-tauri/src/state/app.rs
+++ b/desktop/src-tauri/src/state/app.rs
@@ -29,7 +29,3 @@ impl AppState {
         Self::default()
     }
 }
-
-#[cfg(test)]
-#[path = "./app_test.rs"]
-mod app_test;
diff --git a/desktop/src-tauri/src/state/app_test.rs b/desktop/src-tauri/src/state/app_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/state/mod.rs b/desktop/src-tauri/src/state/mod.rs
index 1f68d91a..019eb34b 100644
--- a/desktop/src-tauri/src/state/mod.rs
+++ b/desktop/src-tauri/src/state/mod.rs
@@ -3,7 +3,3 @@ pub mod app;
 
 // Re-exports
 pub use app::AppState;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/state/mod_test.rs b/desktop/src-tauri/src/state/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/main_menu/events.rs b/desktop/src-tauri/src/ui/main_menu/events.rs
index db13244b..c07159d6 100644
--- a/desktop/src-tauri/src/ui/main_menu/events.rs
+++ b/desktop/src-tauri/src/ui/main_menu/events.rs
@@ -1,8 +1,9 @@
 //! Handle main menu events.
 use crate::error::Result;
-use settings_manager::system_settings::Loader;
+use std::path::Path;
 use tauri::{Window, WindowMenuEvent};
-use thot_local::system::{common::config_dir_path, settings::RunnerSettings};
+use thot_local::file_resource::SystemResource;
+use thot_local::system::settings::RunnerSettings;
 
 /// Direct menu events to the correct function.
 pub fn handle_menu_event(event: WindowMenuEvent) {
@@ -17,20 +18,12 @@ pub fn handle_menu_event(event: WindowMenuEvent) {
 }
 
 /// Emit an `open_settings` event.
-pub fn open_developer_settings(window: &Window) -> Result {
-    Loader::load_or_create::<RunnerSettings>()?;
-    match config_dir_path() {
-        Ok(path) => {
-            open::that(path)?;
-        }
-        Err(_) => {
-            //TODO[l]: Display error message
-        }
-    };
-    window.emit("thot://open-settings", ())?;
-    Ok(())
-}
+pub fn open_developer_settings(_window: &Window) -> Result {
+    let path = RunnerSettings::path();
+    if !Path::exists(&path) {
+        let settings = RunnerSettings::default();
+        settings.save()?;
+    }
 
-#[cfg(test)]
-#[path = "./events_test.rs"]
-mod events_test;
+    Ok(open::that(path)?)
+}
diff --git a/desktop/src-tauri/src/ui/main_menu/events_test.rs b/desktop/src-tauri/src/ui/main_menu/events_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/main_menu/menu.rs b/desktop/src-tauri/src/ui/main_menu/menu.rs
index f8eb2560..30d50867 100644
--- a/desktop/src-tauri/src/ui/main_menu/menu.rs
+++ b/desktop/src-tauri/src/ui/main_menu/menu.rs
@@ -4,7 +4,7 @@ use tauri::{CustomMenuItem, Menu, MenuItem, Submenu};
 /// Build the main menu.
 pub fn main_menu() -> Menu {
     // thot submenu
-    let dev_settings = CustomMenuItem::new("developer_settings".to_string(), "Developer Settings");
+    let dev_settings = CustomMenuItem::new("developer_settings".to_string(), "Developer settings");
     let sm_thot = Submenu::new("Thot", Menu::new().add_item(dev_settings));
 
     // projects submenu
@@ -29,7 +29,3 @@ pub fn main_menu() -> Menu {
         .add_submenu(sm_project)
         .add_submenu(edit_menu)
 }
-
-#[cfg(test)]
-#[path = "./menu_test.rs"]
-mod menu_test;
diff --git a/desktop/src-tauri/src/ui/main_menu/menu_test.rs b/desktop/src-tauri/src/ui/main_menu/menu_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/main_menu/mod.rs b/desktop/src-tauri/src/ui/main_menu/mod.rs
index 426b6cae..322096e1 100644
--- a/desktop/src-tauri/src/ui/main_menu/mod.rs
+++ b/desktop/src-tauri/src/ui/main_menu/mod.rs
@@ -5,7 +5,3 @@ pub mod menu;
 // Re-exports
 pub use events::handle_menu_event;
 pub use menu::main_menu;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/ui/main_menu/mod_test.rs b/desktop/src-tauri/src/ui/main_menu/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/mod.rs b/desktop/src-tauri/src/ui/mod.rs
index 8e28831d..f807a670 100644
--- a/desktop/src-tauri/src/ui/mod.rs
+++ b/desktop/src-tauri/src/ui/mod.rs
@@ -5,7 +5,3 @@ pub mod system_tray;
 // Re-exports
 pub use main_menu::{handle_menu_event, main_menu};
 pub use system_tray::{handle_system_tray_event, system_tray};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/ui/mod_test.rs b/desktop/src-tauri/src/ui/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/system_tray/events.rs b/desktop/src-tauri/src/ui/system_tray/events.rs
index 0b2cb89b..59d26f4a 100644
--- a/desktop/src-tauri/src/ui/system_tray/events.rs
+++ b/desktop/src-tauri/src/ui/system_tray/events.rs
@@ -41,7 +41,3 @@ pub fn handle_system_tray_event(_app: &AppHandle, event: SystemTrayEvent) {
         _ => {}
     }
 }
-
-#[cfg(test)]
-#[path = "./events_test.rs"]
-mod events_test;
diff --git a/desktop/src-tauri/src/ui/system_tray/events_test.rs b/desktop/src-tauri/src/ui/system_tray/events_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/system_tray/menu.rs b/desktop/src-tauri/src/ui/system_tray/menu.rs
index 07ec517d..9e8fa4bc 100644
--- a/desktop/src-tauri/src/ui/system_tray/menu.rs
+++ b/desktop/src-tauri/src/ui/system_tray/menu.rs
@@ -50,7 +50,3 @@ pub fn system_tray() -> SystemTray {
     // init tray
     SystemTray::new().with_menu(tray_menu)
 }
-
-#[cfg(test)]
-#[path = "./menu_test.rs"]
-mod menu_test;
diff --git a/desktop/src-tauri/src/ui/system_tray/menu_test.rs b/desktop/src-tauri/src/ui/system_tray/menu_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/src/ui/system_tray/mod.rs b/desktop/src-tauri/src/ui/system_tray/mod.rs
index a7fcbabb..d24d83a6 100644
--- a/desktop/src-tauri/src/ui/system_tray/mod.rs
+++ b/desktop/src-tauri/src/ui/system_tray/mod.rs
@@ -5,7 +5,3 @@ pub mod menu;
 // Re-exports
 pub use events::handle_system_tray_event;
 pub use menu::system_tray;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src-tauri/src/ui/system_tray/mod_test.rs b/desktop/src-tauri/src/ui/system_tray/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index 7359b6e1..cfc99b86 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Thot",
-    "version": "0.10.0"
+    "version": "0.10.1"
   },
   "tauri": {
     "allowlist": {
@@ -82,15 +82,8 @@
         "minHeight": 640,
         "resizable": true,
         "title": "Thot",
-        "visible": false,
+        "visible": true,
         "fileDropEnabled": true
-      },
-      {
-          "width": 400,
-          "height": 200,
-          "decorations": false,
-          "url": "public/splashscreen.html",
-          "label": "splashscreen"
       }
     ],
     "systemTray": {
diff --git a/desktop/src-tauri/tauri.windows.conf.json b/desktop/src-tauri/tauri.windows.conf.json
index 2f181048..92749c2e 100644
--- a/desktop/src-tauri/tauri.windows.conf.json
+++ b/desktop/src-tauri/tauri.windows.conf.json
@@ -7,15 +7,8 @@
           "resizable": true,
           "title": "Thot",
           "width": 800,
-          "visible": false,
+          "visible": true,
           "fileDropEnabled": false
-        },
-        {
-            "width": 400,
-            "height": 200,
-            "decorations": false,
-            "url": "public/splashscreen.html",
-            "label": "splashscreen"
         }
       ]
     }
diff --git a/desktop/src/app/app.rs b/desktop/src/app/app.rs
index 2dd420b9..fe737e59 100644
--- a/desktop/src/app/app.rs
+++ b/desktop/src/app/app.rs
@@ -8,8 +8,9 @@ use crate::common::invoke;
 use crate::components::messages::Messages;
 use crate::routes::{routes::switch, Route};
 use crate::widgets::GlobalWidgets;
+use futures::stream::StreamExt;
 use thot_core::project::Project;
-use thot_local::project::types::ProjectSettings;
+use thot_local::types::ProjectSettings;
 use thot_ui::types::Message;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
@@ -32,7 +33,6 @@ use yew_router::prelude::*;
 ///      sign_in -- New user --> create_account(Create account)
 ///      create_account --> set_state
 /// ```
-#[tracing::instrument]
 #[function_component(App)]
 pub fn app() -> Html {
     let auth_state = use_reducer(|| AuthState::default());
@@ -45,33 +45,46 @@ pub fn app() -> Html {
         let app_state = app_state.clone();
         let projects_state = projects_state.clone();
 
-        use_effect_with_deps(
-            move |auth_state| {
-                let Some(user) = auth_state.user.as_ref() else {
-                    return;
-                };
+        use_effect_with(auth_state, move |auth_state| {
+            let Some(user) = auth_state.user.as_ref() else {
+                return;
+            };
 
-                let user_id = user.rid.clone();
-                let projects_state = projects_state.clone();
+            let user_id = user.rid.clone();
+            let projects_state = projects_state.clone();
 
-                spawn_local(async move {
-                    let Ok(projects) = invoke::<Vec<(Project, ProjectSettings)>>(
-                        "load_user_projects",
-                        LoadUserProjectsArgs { user: user_id }
-                    )
-                    .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not load user projects")));
-                            return;
-                    };
+            spawn_local(async move {
+                let Ok(projects) = invoke::<Vec<(Project, ProjectSettings)>>(
+                    "load_user_projects",
+                    LoadUserProjectsArgs { user: user_id },
+                )
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not load user projects",
+                    )));
+                    return;
+                };
 
-                    projects_state.dispatch(ProjectsStateAction::InsertProjects(projects));
-                });
-            },
-            auth_state,
-        )
+                projects_state.dispatch(ProjectsStateAction::InsertProjects(projects));
+            });
+        })
     }
 
-    // @todo: Respond to `open_settings` event.
+    // TODO Respond to `open_settings` event.
+    // use_effect_with((), move |_| {
+    //     spawn_local(async move {
+    //         let mut events =
+    //             tauri_sys::event::listen::<thot_local_database::Update>("thot://settings")
+    //                 .await
+    //                 .expect("could not create `thot://settings` listener");
+
+    //         while let Some(event) = events.next().await {
+    //             tracing::debug!(?event);
+    //             handle_event(event.payload).unwrap();
+    //         }
+    //     });
+    // });
 
     html! {
         <BrowserRouter>
@@ -98,7 +111,3 @@ pub fn app() -> Html {
         </BrowserRouter>
     }
 }
-
-#[cfg(test)]
-#[path = "./app_test.rs"]
-mod app_test;
diff --git a/desktop/src/app/app_state.rs b/desktop/src/app/app_state.rs
index 8633f84f..a76d3413 100644
--- a/desktop/src/app/app_state.rs
+++ b/desktop/src/app/app_state.rs
@@ -12,6 +12,9 @@ pub enum AppWidget {
     /// Create a new project.
     CreateProject,
 
+    /// Intiailize an existing folder as a project.
+    InitializeProject,
+
     /// Import a project.
     ImportProject,
 
@@ -21,17 +24,17 @@ pub enum AppWidget {
 
 /// Actions available to modify the [`AppState`].
 #[derive(Debug)]
-pub enum AppStateAction<'a> {
+pub enum AppStateAction {
     /// Sets the active widget.
     SetActiveWidget(Option<AppWidget>),
 
     /// Add a message to display.
-    AddMessage(Message<'a>),
+    AddMessage(Message),
 
-    // @todo: Remove requirement to pass `AppStateReducer`.
+    // TODO Remove requirement to pass `AppStateReducer`.
     /// Adda a message to display,
     /// disappering after some time.
-    AddMessageWithTimeout(Message<'a>, u32, AppStateReducer<'static>),
+    AddMessageWithTimeout(Message, u32, AppStateReducer<'static>),
 
     /// Removes a message.
     RemoveMessage(Uuid),
@@ -51,13 +54,13 @@ pub enum AppStateAction<'a> {
 
 /// Application state.
 #[derive(Default, Debug, Clone, PartialEq)]
-pub struct AppState<'a> {
+pub struct AppState {
     /// Active widget
     pub app_widget: Option<AppWidget>,
 
     /// Messages for the user.
     /// `([Message], timeout).
-    pub messages: Vec<Rc<Message<'a>>>,
+    pub messages: Vec<Rc<Message>>,
 
     /// User's application state.
     pub user_app_state: Option<UserAppState>,
@@ -66,10 +69,10 @@ pub struct AppState<'a> {
     pub user_settings: Option<UserSettings>,
 }
 
-impl Reducible for AppState<'static> {
-    type Action = AppStateAction<'static>;
+impl Reducible for AppState {
+    type Action = AppStateAction;
 
-    #[tracing::instrument(level = "debug", skip(self))]
+    #[tracing::instrument(skip(self))]
     fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
         let mut current = (*self).clone();
         match action {
@@ -114,13 +117,8 @@ impl Reducible for AppState<'static> {
             }
         };
 
-        tracing::debug!(app_state = ?current);
         current.into()
     }
 }
 
-pub type AppStateReducer<'a> = UseReducerHandle<AppState<'a>>;
-
-#[cfg(test)]
-#[path = "./app_state_test.rs"]
-mod app_state_test;
+pub type AppStateReducer<'a> = UseReducerHandle<AppState>;
diff --git a/desktop/src/app/app_state_test.rs b/desktop/src/app/app_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/app/app_test.rs b/desktop/src/app/app_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/app/auth_state.rs b/desktop/src/app/auth_state.rs
index 4fc8c547..156b6913 100644
--- a/desktop/src/app/auth_state.rs
+++ b/desktop/src/app/auth_state.rs
@@ -48,7 +48,7 @@ impl Reducible for AuthState {
                 //      See also `AppStateAction::UnsetUser`.
                 let store_res = LocalStorage::set("user", user_email);
                 if let Err(err) = store_res {
-                    // @todo: Alert user could not store log in.
+                    // TODO Alert user could not store log in.
                     web_sys::console::debug_1(&format!("Could not store user: {:#?}", err).into());
                 }
 
@@ -60,13 +60,8 @@ impl Reducible for AuthState {
             }
         };
 
-        tracing::debug!(auth_state = ?current);
         current.into()
     }
 }
 
 pub type AuthStateReducer = UseReducerHandle<AuthState>;
-
-#[cfg(test)]
-#[path = "./auth_state_test.rs"]
-mod auth_state_test;
diff --git a/desktop/src/app/auth_state_test.rs b/desktop/src/app/auth_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/app/mod.rs b/desktop/src/app/mod.rs
index 9cc3b874..8fb0666c 100644
--- a/desktop/src/app/mod.rs
+++ b/desktop/src/app/mod.rs
@@ -11,7 +11,3 @@ pub use app_state::{AppStateAction, AppStateReducer, AppWidget};
 pub use auth_state::{AuthStateAction, AuthStateReducer};
 pub use projects_state::{ProjectsStateAction, ProjectsStateReducer};
 pub use shadow_box::ShadowBox;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/app/mod_test.rs b/desktop/src/app/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/app/projects_state.rs b/desktop/src/app/projects_state.rs
index 98477f3f..415938b0 100644
--- a/desktop/src/app/projects_state.rs
+++ b/desktop/src/app/projects_state.rs
@@ -2,9 +2,9 @@
 // use crate::commands::settings::UserAppStateArgs;
 use indexmap::IndexSet;
 use std::rc::Rc;
-use thot_core::project::{Project, Scripts};
-use thot_core::types::{ResourceId, ResourceMap};
-use thot_local::project::types::ProjectSettings;
+use thot_core::project::{Project, Script, Scripts};
+use thot_core::types::{ResourceId, ResourceMap, ResourcePath};
+use thot_local::types::ProjectSettings;
 use yew::prelude::*;
 
 pub type ProjectMap = ResourceMap<Project>;
@@ -38,12 +38,24 @@ pub enum ProjectsStateAction {
     /// Update the [`Project`].
     UpdateProject(Project),
 
-    /// Insert a `Script`.
+    InsertProjectScript {
+        project: ResourceId,
+        script: Script,
+    },
+
+    /// Inserts `Script`s into a `Project`.
     ///
     /// # Fields
     /// 1. `Project`'s id.
     /// 2. `Project`'s `Script`s.
     InsertProjectScripts(ResourceId, Scripts),
+
+    RemoveProjectScript(ResourceId),
+
+    MoveProjectScript {
+        script: ResourceId,
+        path: ResourcePath,
+    },
 }
 
 #[derive(Debug, Default, PartialEq, Clone)]
@@ -101,22 +113,40 @@ impl Reducible for ProjectsState {
                 current.active_project = Some(rid);
             }
 
+            ProjectsStateAction::InsertProjectScript { project, script } => {
+                let scripts = current.project_scripts.get_mut(&project).unwrap();
+                scripts.insert(script.rid.clone(), script);
+            }
+
             ProjectsStateAction::InsertProjectScripts(project, scripts) => {
                 current.project_scripts.insert(project, scripts);
             }
 
+            ProjectsStateAction::RemoveProjectScript(script) => {
+                for (_project, scripts) in current.project_scripts.iter_mut() {
+                    if scripts.contains_key(&script) {
+                        scripts.remove(&script);
+                        break;
+                    }
+                }
+            }
+
+            ProjectsStateAction::MoveProjectScript { script, path } => {
+                for (_project, scripts) in current.project_scripts.iter_mut() {
+                    if let Some(script) = scripts.get_mut(&script) {
+                        script.path = path;
+                        break;
+                    }
+                }
+            }
+
             ProjectsStateAction::UpdateProject(project) => {
                 current.projects.insert(project.rid.clone(), project);
             }
         }
 
-        tracing::debug!(projects_state = ?current);
         current.into()
     }
 }
 
 pub type ProjectsStateReducer = UseReducerHandle<ProjectsState>;
-
-#[cfg(test)]
-#[path = "./projects_state_test.rs"]
-mod projects_state_test;
diff --git a/desktop/src/app/projects_state_test.rs b/desktop/src/app/projects_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/app/shadow_box.rs b/desktop/src/app/shadow_box.rs
index 3bccfc4f..42470a66 100644
--- a/desktop/src/app/shadow_box.rs
+++ b/desktop/src/app/shadow_box.rs
@@ -27,7 +27,3 @@ pub fn shadow_box(props: &ShadowBoxProps) -> Html {
             onclose={&props.onclose} />
     }
 }
-
-#[cfg(test)]
-#[path = "./shadow_box_test.rs"]
-mod shadow_box_test;
diff --git a/desktop/src/app/shadow_box_test.rs b/desktop/src/app/shadow_box_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/asset.rs b/desktop/src/commands/asset.rs
index 650faeaf..24c5bac2 100644
--- a/desktop/src/commands/asset.rs
+++ b/desktop/src/commands/asset.rs
@@ -1,12 +1,61 @@
 //! Resources for [`Asset`](CoreAsset) functionality.
+use super::types::{MetadataAction, ResourcePropertiesUpdate, TagsAction};
 use serde::Serialize;
-use thot_core::project::Asset as CoreAsset;
+use thot_core::project::{Asset, AssetProperties};
+use thot_core::types::ResourceId;
 
 #[derive(Serialize)]
 pub struct AssetArgs {
-    pub asset: CoreAsset,
+    pub asset: Asset,
 }
 
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
+/// Arguments to update a resorce's [`StandardProperties`].
+#[derive(Clone, Serialize)]
+pub struct UpdatePropertiesArgs {
+    /// [`ResourceId`] of the resource to update.
+    pub rid: ResourceId,
+
+    /// Updated values.
+    pub properties: AssetProperties, // TODO: Issue with serializing `HashMap` of `metadata`. perform manually.
+                                     // See: https://github.com/tauri-apps/tauri/issues/6078
+}
+
+/// Arguments to update a resorce's [`StandardProperties`].
+#[derive(Clone, Serialize)]
+pub struct UpdatePropertiesStringArgs {
+    /// [`ResourceId`] of the resource to update.
+    pub rid: ResourceId,
+
+    /// Updated values.
+    pub properties: String, // TODO: Issue with serializing `HashMap` of `metadata`. perform manually.
+                            // Unify with `UpdatePropertiesArgs` once resolved.
+                            // See: https://github.com/tauri-apps/tauri/issues/6078
+}
+
+/// Bulk update resources.
+#[derive(Clone, Serialize)]
+pub struct BulkUpdatePropertiesArgs {
+    pub rids: Vec<ResourceId>,
+    pub update: AssetPropertiesUpdate,
+}
+
+#[derive(Serialize, Clone, Default, Debug)]
+pub struct AssetPropertiesUpdate {
+    pub name: Option<Option<String>>,
+    pub kind: Option<Option<String>>,
+    pub description: Option<Option<String>>,
+    pub tags: TagsAction,
+    pub metadata: MetadataAction,
+}
+
+impl From<ResourcePropertiesUpdate> for AssetPropertiesUpdate {
+    fn from(update: ResourcePropertiesUpdate) -> Self {
+        Self {
+            name: update.name.map(|name| Some(name)),
+            kind: update.kind,
+            description: update.description,
+            tags: update.tags,
+            metadata: update.metadata,
+        }
+    }
+}
diff --git a/desktop/src/commands/asset_test.rs b/desktop/src/commands/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/authenticate.rs b/desktop/src/commands/authenticate.rs
index deb46e09..bf361ab6 100644
--- a/desktop/src/commands/authenticate.rs
+++ b/desktop/src/commands/authenticate.rs
@@ -13,7 +13,3 @@ pub struct CreateUserArgs {
     pub name: Option<String>,
     pub email: String,
 }
-
-#[cfg(test)]
-#[path = "./authenticate_test.rs"]
-mod authenticate_test;
diff --git a/desktop/src/commands/authenticate_test.rs b/desktop/src/commands/authenticate_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/common.rs b/desktop/src/commands/common.rs
index b8d3b3d8..fe470a3f 100644
--- a/desktop/src/commands/common.rs
+++ b/desktop/src/commands/common.rs
@@ -1,7 +1,7 @@
 //! Resources for common commands.
+use super::types::ResourcePropertiesUpdate;
 use serde::Serialize;
 use std::path::PathBuf;
-use thot_core::project::StandardProperties;
 use thot_core::types::ResourceId;
 
 /// Used for functions that do not accept arguments.
@@ -21,29 +21,9 @@ pub struct PathBufArgs {
     pub path: PathBuf,
 }
 
-/// Arguments to update a resorce's [`StandardProperties`].
+/// Bulk update resources.
 #[derive(Clone, Serialize)]
-pub struct UpdatePropertiesArgs {
-    /// [`ResourceId`] of the resource to update.
-    pub rid: ResourceId,
-
-    /// Updated values.
-    pub properties: StandardProperties, // @todo: Issue with serializing `HashMap` of `metadata`. perform manually.
-                                        // See: https://github.com/tauri-apps/tauri/issues/6078
-}
-
-/// Arguments to update a resorce's [`StandardProperties`].
-#[derive(Clone, Serialize)]
-pub struct UpdatePropertiesStringArgs {
-    /// [`ResourceId`] of the resource to update.
-    pub rid: ResourceId,
-
-    /// Updated values.
-    pub properties: String, // @todo: Issue with serializing `HashMap` of `metadata`. perform manually.
-                            // Unify with `UpdatePropertiesArgs` once resolved.
-                            // See: https://github.com/tauri-apps/tauri/issues/6078
+pub struct BulkUpdateResourcePropertiesArgs {
+    pub rids: Vec<ResourceId>,
+    pub update: ResourcePropertiesUpdate,
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/desktop/src/commands/common_test.rs b/desktop/src/commands/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/container.rs b/desktop/src/commands/container.rs
index f7d66d24..ea1f7403 100644
--- a/desktop/src/commands/container.rs
+++ b/desktop/src/commands/container.rs
@@ -1,10 +1,11 @@
 //! Resources for [`container commands`](thot_desktop_tauri::commands::container).
+use super::types::{MetadataAction, ResourcePropertiesUpdate, TagsAction};
 use serde::Serialize;
 use std::path::PathBuf;
 use thot_core::project::container::ScriptMap;
-use thot_core::project::Container as CoreContainer;
+use thot_core::project::{Container, ContainerProperties, ScriptAssociation};
 use thot_core::types::ResourceId;
-use thot_local_database::command::container::AddAssetInfo;
+use thot_desktop_lib::types::AddAssetInfo;
 
 /// Arguments for
 /// [`load_container_tree`](thot_desktop_tauri::commands::container::load_container_tree).
@@ -14,11 +15,34 @@ pub struct LoadContainerTreeArgs {
     pub root: PathBuf,
 }
 
-/// Arguments for commands requiring a [`Container`](CoreContainer) named `container` only.
+/// Arguments for commands requiring a [`Container`](Container) named `container` only.
 #[derive(Serialize)]
 pub struct ContainerArgs {
-    /// [`Container`](CoreContainer) to update.
-    pub container: CoreContainer,
+    /// [`Container`](Container) to update.
+    pub container: Container,
+}
+
+/// Arguments to update a resorce's [`StandardProperties`].
+#[derive(Clone, Serialize)]
+pub struct UpdatePropertiesArgs {
+    /// [`ResourceId`] of the resource to update.
+    pub rid: ResourceId,
+
+    /// Updated values.
+    pub properties: ContainerProperties, // TODO: Issue with serializing `HashMap` of `metadata`. perform manually.
+                                         // See: https://github.com/tauri-apps/tauri/issues/6078
+}
+
+/// Arguments to update a resorce's [`StandardProperties`].
+#[derive(Clone, Serialize)]
+pub struct UpdatePropertiesStringArgs {
+    /// [`ResourceId`] of the resource to update.
+    pub rid: ResourceId,
+
+    /// Updated values.
+    pub properties: String, // TODO: Issue with serializing `HashMap` of `metadata`. perform manually.
+                            // Unify with `UpdatePropertiesArgs` once resolved.
+                            // See: https://github.com/tauri-apps/tauri/issues/6078
 }
 
 /// Arguments for [`new_child`](thot_desktop_tauri::commands::container::new_child).
@@ -63,17 +87,17 @@ pub struct UpdateScriptAssociationsStringArgs {
 /// Arguments for [`add_assets`](thot_desktop_tauri::commands::container::add_assets).
 #[derive(Serialize, Debug)]
 pub struct AddAssetsArgs {
-    /// [`ResourceId`] of the [`Container`](CoreContainer).
+    /// [`ResourceId`] of the [`Container`](Container).
     pub container: ResourceId,
 
     /// [`Asset`](thot_core::project::Asset)s to add.
     pub assets: Vec<AddAssetInfo>,
 }
 
-/// Arguments for [`add_asset_windows`](thot_desktop_tauri::commands::container::add_asset_windows). 
+/// Arguments for [`add_asset_windows`](thot_desktop_tauri::commands::container::add_asset_windows).
 #[derive(Serialize)]
 pub struct AddAssetWindowsArgs {
-    /// [`ResourceId`] of the [`Container`](CoreContainer).
+    /// [`ResourceId`] of the [`Container`](Container).
     pub container: ResourceId,
 
     /// Name of the file.
@@ -83,6 +107,67 @@ pub struct AddAssetWindowsArgs {
     pub contents: Vec<u8>,
 }
 
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
+/// Bulk update resources.
+#[derive(Clone, Serialize)]
+pub struct BulkUpdatePropertiesArgs {
+    pub rids: Vec<ResourceId>,
+    pub update: ContainerPropertiesUpdate,
+}
+
+#[derive(Serialize, Clone, Default, Debug)]
+pub struct ContainerPropertiesUpdate {
+    pub name: Option<String>,
+    pub kind: Option<Option<String>>,
+    pub description: Option<Option<String>>,
+    pub tags: TagsAction,
+    pub metadata: MetadataAction,
+}
+
+impl From<ResourcePropertiesUpdate> for ContainerPropertiesUpdate {
+    fn from(update: ResourcePropertiesUpdate) -> Self {
+        Self {
+            name: update.name,
+            kind: update.kind,
+            description: update.description,
+            tags: update.tags,
+            metadata: update.metadata,
+        }
+    }
+}
+
+/// Arguments for [`bulk_update_container_script_association`](thot_desktop_tauri::commands::container::bulk_update_container_script_association).
+#[derive(Serialize, Clone)]
+pub struct BulkUpdateScriptAssociationArgs {
+    pub containers: Vec<ResourceId>,
+    pub update: ScriptAssociationsBulkUpdate,
+}
+
+/// Update action used for [`BulkUpdateScriptAssociationArgs`].
+#[derive(Serialize, Default, Clone)]
+pub struct ScriptAssociationsBulkUpdate {
+    /// Associations to insert.
+    pub add: Vec<ScriptAssociation>,
+
+    /// Scripts to remove.
+    pub remove: Vec<ResourceId>,
+
+    /// Associations to update.
+    pub update: Vec<RunParametersUpdate>,
+}
+
+#[derive(Serialize, Clone)]
+pub struct RunParametersUpdate {
+    pub script: ResourceId,
+    pub autorun: Option<bool>,
+    pub priority: Option<i32>,
+}
+
+impl RunParametersUpdate {
+    pub fn new(script: ResourceId) -> Self {
+        Self {
+            script,
+            autorun: None,
+            priority: None,
+        }
+    }
+}
diff --git a/desktop/src/commands/container_test.rs b/desktop/src/commands/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/graph.rs b/desktop/src/commands/graph.rs
index 4d04d180..2a22124b 100644
--- a/desktop/src/commands/graph.rs
+++ b/desktop/src/commands/graph.rs
@@ -12,7 +12,3 @@ pub struct InitProjectGraphArgs {
     /// Project id.
     pub project: ResourceId,
 }
-
-#[cfg(test)]
-#[path = "./graph_test.rs"]
-mod graph_test;
diff --git a/desktop/src/commands/graph_test.rs b/desktop/src/commands/graph_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/mod.rs b/desktop/src/commands/mod.rs
index 0ef2d285..473b10e6 100644
--- a/desktop/src/commands/mod.rs
+++ b/desktop/src/commands/mod.rs
@@ -7,8 +7,4 @@ pub mod graph;
 pub mod project;
 pub mod script;
 pub mod settings;
-pub mod user;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub mod types;
diff --git a/desktop/src/commands/mod_test.rs b/desktop/src/commands/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/project.rs b/desktop/src/commands/project.rs
index ef15b8eb..d7a0d2a0 100644
--- a/desktop/src/commands/project.rs
+++ b/desktop/src/commands/project.rs
@@ -10,13 +10,6 @@ pub struct LoadUserProjectsArgs {
     pub user: ResourceId,
 }
 
-/// Arguments for [`get_project_path`](thot_desktop_tauri::commands::project::get_project_path).
-#[derive(Serialize)]
-pub struct GetProjectPathArgs {
-    /// Id of the [`Project`](thot_core::project::Project).
-    pub id: ResourceId,
-}
-
 /// Arguments for creating a [`new_project`](thot_desktop_tauri::commands::project::new_project).
 #[derive(Serialize)]
 pub struct NewProjectArgs<'a> {
@@ -40,7 +33,3 @@ pub struct AnalyzeArgs {
     /// Maximum number of allowed tasks.
     pub max_tasks: Option<usize>,
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/desktop/src/commands/project_test.rs b/desktop/src/commands/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/script.rs b/desktop/src/commands/script.rs
index 67dc8ca0..9554df84 100644
--- a/desktop/src/commands/script.rs
+++ b/desktop/src/commands/script.rs
@@ -14,7 +14,3 @@ pub struct RemoveScriptArgs {
     pub project: ResourceId,
     pub script: ResourceId,
 }
-
-#[cfg(test)]
-#[path = "./script_test.rs"]
-mod script_test;
diff --git a/desktop/src/commands/script_test.rs b/desktop/src/commands/script_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/settings.rs b/desktop/src/commands/settings.rs
index a497bf05..eb0a049c 100644
--- a/desktop/src/commands/settings.rs
+++ b/desktop/src/commands/settings.rs
@@ -13,7 +13,3 @@ pub struct UserAppStateArgs {
 pub struct UserSettingsArgs {
     pub settings: UserSettings,
 }
-
-#[cfg(test)]
-#[path = "./settings_test.rs"]
-mod settings_test;
diff --git a/desktop/src/commands/settings_test.rs b/desktop/src/commands/settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/commands/types.rs b/desktop/src/commands/types.rs
new file mode 100644
index 00000000..57bda8d0
--- /dev/null
+++ b/desktop/src/commands/types.rs
@@ -0,0 +1,28 @@
+//! Common types for `Command`s.
+pub use serde::Serialize;
+pub use thot_core::project::Metadata;
+
+// ************
+// *** Bulk ***
+// ************
+
+#[derive(Serialize, Clone, Default, Debug)]
+pub struct TagsAction {
+    pub insert: Vec<String>,
+    pub remove: Vec<String>,
+}
+
+#[derive(Serialize, Clone, Default, Debug)]
+pub struct MetadataAction {
+    pub insert: Metadata,
+    pub remove: Vec<String>,
+}
+
+#[derive(Serialize, Clone, Default, Debug)]
+pub struct ResourcePropertiesUpdate {
+    pub name: Option<String>,
+    pub kind: Option<Option<String>>,
+    pub description: Option<Option<String>>,
+    pub tags: TagsAction,
+    pub metadata: MetadataAction,
+}
diff --git a/desktop/src/commands/user.rs b/desktop/src/commands/user.rs
deleted file mode 100644
index 0b7a335c..00000000
--- a/desktop/src/commands/user.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Resources for [`user commands`](thot_desktop_tauri::commands::user).
-// use serde::Serialize;
-// use thot_core::types::ResourceId;
-
-#[cfg(test)]
-#[path = "./user_test.rs"]
-mod user_test;
diff --git a/desktop/src/commands/user_test.rs b/desktop/src/commands/user_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/common.rs b/desktop/src/common.rs
index 2d879078..6cfb6195 100644
--- a/desktop/src/common.rs
+++ b/desktop/src/common.rs
@@ -32,7 +32,3 @@ mod inner {
         pub async fn invoke(cmd: &str, args: JsValue) -> Result<JsValue, JsValue>;
     }
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/desktop/src/common_test.rs b/desktop/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/asset/create_assets.rs b/desktop/src/components/canvas/asset/create_assets.rs
index 08d10153..a55ec493 100644
--- a/desktop/src/components/canvas/asset/create_assets.rs
+++ b/desktop/src/components/canvas/asset/create_assets.rs
@@ -1,5 +1,6 @@
 //! Create an [`Asset`](thot_core::project::Asset).
 use crate::commands::common::ResourceIdArgs;
+use crate::commands::container::AddAssetsArgs;
 use crate::common::invoke;
 use crate::components::canvas::{GraphStateAction, GraphStateReducer};
 use crate::hooks::use_container_path;
@@ -7,8 +8,8 @@ use std::path::PathBuf;
 use tauri_sys::dialog::FileDialogBuilder;
 use thot_core::project::Container;
 use thot_core::types::ResourceId;
+use thot_desktop_lib::types::AddAssetInfo;
 use thot_local::types::AssetFileAction;
-use thot_local_database::command::container::{AddAssetInfo, AddAssetsArgs};
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 
@@ -185,6 +186,3 @@ pub fn create_assets(props: &CreateAssetsProps) -> HtmlResult {
         </div>
     })
 }
-
-#[path = "./create_assets_test.rs"]
-mod create_assets_test;
diff --git a/desktop/src/components/canvas/asset/create_assets_test.rs b/desktop/src/components/canvas/asset/create_assets_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/asset/mod.rs b/desktop/src/components/canvas/asset/mod.rs
index 9af36d2b..316a1ba1 100644
--- a/desktop/src/components/canvas/asset/mod.rs
+++ b/desktop/src/components/canvas/asset/mod.rs
@@ -3,7 +3,3 @@ pub mod create_assets;
 
 // Re-export
 pub use create_assets::CreateAssets;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/asset/mod_test.rs b/desktop/src/components/canvas/asset/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/canvas.rs b/desktop/src/components/canvas/canvas.rs
index 8e73bc0b..3ddc4f84 100644
--- a/desktop/src/components/canvas/canvas.rs
+++ b/desktop/src/components/canvas/canvas.rs
@@ -1,16 +1,28 @@
 //! Project canvas.
+use super::canvas_state::ResourceType;
 use super::details_bar::DetailsBar;
+use super::layers_bar::LayersBar;
 use super::project::Project as ProjectUi;
 use super::{
-    canvas_state::CanvasState, graph_state::GraphState, CanvasStateReducer, GraphStateReducer,
+    canvas_state::CanvasState, graph_state::GraphState, CanvasStateAction, CanvasStateReducer,
+    GraphStateAction, GraphStateReducer,
 };
-use crate::app::{AppStateAction, AppStateReducer, ProjectsStateReducer};
+use crate::app::{AppStateAction, AppStateReducer, ProjectsStateAction, ProjectsStateReducer};
+use crate::commands::container::UpdatePropertiesArgs as UpdateContainerPropertiesArgs;
+use crate::constants::MESSAGE_TIMEOUT;
 use crate::hooks::{use_load_project_scripts, use_project_graph};
 use crate::routes::Route;
+use futures::stream::StreamExt;
 use thot_core::types::ResourceId;
-use thot_ui::components::{Drawer, DrawerPosition};
+use thot_local_database::event::{
+    Analysis as AnalysisUpdate, Asset as AssetUpdate, Container as ContainerUpdate,
+    Graph as GraphUpdate, Project as ProjectUpdate, Script as ScriptUpdate, Update,
+};
+use thot_ui::components::{drawer, Drawer, DrawerPosition};
 use thot_ui::types::Message;
+use thot_ui::widgets::common::asset as asset_ui;
 use thot_ui::widgets::suspense::Loading;
+use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 use yew_router::prelude::*;
 
@@ -22,7 +34,7 @@ pub struct ProjectCanvasProps {
     pub class: Option<Classes>,
 }
 
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 #[function_component(ProjectCanvas)]
 pub fn project_canvas(props: &ProjectCanvasProps) -> HtmlResult {
     let show_side_bars = use_state(|| true);
@@ -37,7 +49,9 @@ pub fn project_canvas(props: &ProjectCanvasProps) -> HtmlResult {
 
     let project = projects_state.projects.get(&props.project);
     let Some(project) = project else {
-        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not load project")));
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Could not load project",
+        )));
         navigator.push(&Route::Dashboard);
         return Ok(html! {{ "Could not load project" }});
     };
@@ -46,17 +60,233 @@ pub fn project_canvas(props: &ProjectCanvasProps) -> HtmlResult {
     let graph = use_project_graph(&project.rid)?;
     let graph_state = use_reducer(|| GraphState::new(graph));
 
+    let drawers_visible_state = use_state(|| None);
+
+    {
+        let canvas_state = canvas_state.clone();
+        let projects_state = projects_state.clone();
+        let graph_state = graph_state.clone();
+        let pid = project.rid.clone();
+
+        use_effect_with((), move |_| {
+            let canvas_state = canvas_state.clone();
+            let projects_state = projects_state.clone();
+            let graph_state = graph_state.clone();
+            let pid = pid.clone();
+
+            spawn_local(async move {
+                let mut events = tauri_sys::event::listen::<thot_local_database::Update>(&format!(
+                    "thot://database/update/project/{pid}"
+                ))
+                .await
+                .expect(&format!(
+                    "could not create `thot://database/update/project/{pid}` listener"
+                ));
+
+                while let Some(event) = events.next().await {
+                    tracing::debug!(?event.payload);
+                    let Update::Project { project, update } = event.payload;
+                    assert!(project == pid);
+
+                    match update {
+                        ProjectUpdate::Container(update) => match update {
+                            ContainerUpdate::Properties {
+                                container,
+                                properties,
+                            } => graph_state.dispatch(GraphStateAction::UpdateContainerProperties(
+                                UpdateContainerPropertiesArgs {
+                                    rid: container,
+                                    properties,
+                                },
+                            )),
+                        },
+
+                        ProjectUpdate::Graph(update) => match update {
+                            GraphUpdate::Created { parent, graph } => {
+                                graph_state
+                                    .dispatch(GraphStateAction::InsertSubtree { parent, graph });
+                            }
+
+                            GraphUpdate::Removed(graph) => {
+                                let mut rids = Vec::with_capacity(graph.nodes().len());
+                                for (cid, container) in graph.nodes() {
+                                    rids.push(cid.clone());
+                                    for aid in container.assets.keys() {
+                                        rids.push(aid.clone());
+                                    }
+                                }
+
+                                canvas_state.dispatch(CanvasStateAction::RemoveMany(rids));
+                                graph_state.dispatch(GraphStateAction::RemoveSubtree(
+                                    graph.root().clone(),
+                                ));
+                            }
+
+                            GraphUpdate::Moved { parent, root, name } => {
+                                graph_state.dispatch(GraphStateAction::MoveSubtree {
+                                    parent,
+                                    root,
+                                    name,
+                                });
+                            }
+                        },
+
+                        ProjectUpdate::Asset(update) => match update {
+                            AssetUpdate::Created { container, asset } => {
+                                graph_state.dispatch(GraphStateAction::InsertContainerAssets(
+                                    container.clone(),
+                                    vec![asset],
+                                ));
+                            }
+
+                            AssetUpdate::Moved {
+                                asset,
+                                container,
+                                path,
+                            } => {
+                                graph_state.dispatch(GraphStateAction::MoveAsset {
+                                    asset,
+                                    container,
+                                    path,
+                                });
+                            }
+
+                            AssetUpdate::Removed(asset) => {
+                                canvas_state.dispatch(CanvasStateAction::Remove(asset.clone()));
+                                graph_state.dispatch(GraphStateAction::RemoveAsset(asset));
+                            }
+
+                            AssetUpdate::PathChanged { asset, path } => {
+                                graph_state
+                                    .dispatch(GraphStateAction::UpdateAssetPath { asset, path });
+                            }
+                        },
+
+                        ProjectUpdate::Script(update) => match update {
+                            ScriptUpdate::Created(script) => {
+                                projects_state.dispatch(ProjectsStateAction::InsertProjectScript {
+                                    project: pid.clone(),
+                                    script,
+                                });
+                            }
+
+                            ScriptUpdate::Removed(script) => {
+                                projects_state.dispatch(ProjectsStateAction::RemoveProjectScript(
+                                    script.clone(),
+                                ));
+
+                                graph_state.dispatch(
+                                    GraphStateAction::RemoveContainerScriptAssociations(script),
+                                );
+                            }
+
+                            ScriptUpdate::Moved { script, path } => {
+                                projects_state.dispatch(ProjectsStateAction::MoveProjectScript {
+                                    script: script.clone(),
+                                    path,
+                                });
+                            }
+                        },
+
+                        ProjectUpdate::Analysis(update) => match update {
+                            AnalysisUpdate::Flag { resource, message } => {
+                                let name = if let Some(container) = graph_state.graph.get(&resource)
+                                {
+                                    container.properties.name.clone()
+                                } else if let Some(container) = graph_state.asset_map.get(&resource)
+                                {
+                                    let container = graph_state.graph.get(&container).unwrap();
+                                    let asset = container.assets.get(&resource).unwrap();
+                                    asset_ui::asset_display_name(asset)
+                                } else {
+                                    tracing::debug!("could not find resource `{resource:?}`");
+                                    let mut msg = Message::error("Could not find resource");
+                                    msg.set_details("Could not find `{resource:?}` when flagging");
+                                    app_state.dispatch(AppStateAction::AddMessage(msg));
+                                    return;
+                                };
+
+                                canvas_state.dispatch(CanvasStateAction::AddFlag {
+                                    resource,
+                                    message: message.clone(),
+                                });
+
+                                let mut msg =
+                                    Message::warning(format!("Resource `{name}` was flagged"));
+                                msg.set_details(message);
+                                app_state.dispatch(AppStateAction::AddMessage(msg));
+                            }
+                        },
+                    }
+                }
+            });
+        });
+    }
+
+    {
+        let canvas_state = canvas_state.clone();
+        let graph_state = graph_state.clone();
+        use_effect_with(graph_state, move |graph_state| {
+            let mut resources = Vec::new();
+            for (cid, container) in graph_state.graph.iter_nodes() {
+                resources.push(cid);
+
+                for asset in container.assets.keys() {
+                    resources.push(asset);
+                }
+            }
+
+            let unselect = canvas_state
+                .selected
+                .iter()
+                .filter_map(|rid| match resources.contains(&rid) {
+                    true => None,
+                    false => Some(rid.clone()),
+                })
+                .collect::<Vec<_>>();
+
+            canvas_state.dispatch(CanvasStateAction::UnselectMany(unselect));
+        });
+    }
+
+    let onkeydown = {
+        let drawers_visible_state = drawers_visible_state.clone();
+        Callback::from(move |e: KeyboardEvent| {
+            if !e.ctrl_key() {
+                return;
+            }
+
+            if e.key() == "\\" {
+                drawers_visible_state.set(if drawers_visible_state.is_some() {
+                    None
+                } else {
+                    Some("hidden")
+                });
+            }
+        })
+    };
+
     let fallback = html! { <Loading text={"Loading project"} /> };
     Ok(html! {
         <ContextProvider<CanvasStateReducer> context={canvas_state.clone()}>
         <ContextProvider<GraphStateReducer> context={graph_state}>
-        <div class={classes!("project-canvas", props.class.clone())}>
+        <div class={classes!("project-canvas", props.class.clone())}
+            tabIndex={"-1"}
+            onkeydown={onkeydown}
+            data-rid={props.project.clone()}>
+
+            <Drawer class={classes!("layers-bar-drawer", *drawers_visible_state)}
+                position={DrawerPosition::Left}
+                open={show_side_bars.clone()}>
+
+                <LayersBar />
+            </Drawer>
             <div class={classes!("project-canvas-content")} >
                 <Suspense {fallback}>
                     <ProjectUi rid={props.project.clone()} />
                 </Suspense>
             </div>
-            <Drawer class={classes!("details-bar-drawer")}
+            <Drawer class={classes!("details-bar-drawer", *drawers_visible_state)}
                 position={DrawerPosition::Right}
                 open={show_side_bars}>
 
@@ -67,7 +297,3 @@ pub fn project_canvas(props: &ProjectCanvasProps) -> HtmlResult {
         </ContextProvider<CanvasStateReducer>>
     })
 }
-
-#[cfg(test)]
-#[path = "./canvas_test.rs"]
-mod canvas_test;
diff --git a/desktop/src/components/canvas/canvas_state.rs b/desktop/src/components/canvas/canvas_state.rs
index a76a5407..d0aa5be9 100644
--- a/desktop/src/components/canvas/canvas_state.rs
+++ b/desktop/src/components/canvas/canvas_state.rs
@@ -6,8 +6,8 @@ use thot_core::types::{ResourceId, ResourceMap};
 use thot_ui::types::ContainerPreview;
 use yew::prelude::*;
 
-#[derive(PartialEq, Clone)]
-enum ResourceType {
+#[derive(PartialEq, Clone, Debug)]
+pub enum ResourceType {
     Container,
     Asset,
 }
@@ -28,6 +28,9 @@ pub enum CanvasStateAction {
     /// Mark an `Asset` as selected.
     SelectAsset(ResourceId),
 
+    /// Set `Asset` as only selected.
+    SelectAssetOnly(ResourceId),
+
     /// Mark a resource as unselected.
     /// Updates the details bar as needed.
     Unselect(ResourceId),
@@ -41,6 +44,30 @@ pub enum CanvasStateAction {
 
     /// Set the visibility state of a `Container`.
     SetVisibility(ResourceId, bool),
+
+    /// Removes a resource's mappings.
+    Remove(ResourceId),
+
+    /// Removes resource mappings.
+    RemoveMany(Vec<ResourceId>),
+
+    /// Toggle canvas drawers visibility.
+    ToggleDrawers,
+
+    /// Adds a flag to a resource.
+    AddFlag {
+        resource: ResourceId,
+        message: String,
+    },
+
+    /// Removes the flag at the given index for the resource.
+    RemoveFlag { resource: ResourceId, index: usize },
+
+    /// Clears all the flags for the given resource.
+    ClearResourceFlags(ResourceId),
+
+    /// Clears all flags.
+    ClearFlags,
 }
 
 #[derive(Clone, PartialEq)]
@@ -57,6 +84,12 @@ pub struct CanvasState {
     /// Current preview view.
     pub preview: ContainerPreview,
 
+    /// If canvas drawers are visible.
+    pub drawers_visible: bool,
+
+    /// Flag messages for each resource.
+    pub flags: ResourceMap<Vec<String>>,
+
     /// `Container` tree visibility state.
     /// Key indicates the root of the hidden tree.
     visible: ResourceMap<bool>,
@@ -73,7 +106,9 @@ impl CanvasState {
             project,
             details_bar_widget: None,
             selected: HashSet::default(),
+            drawers_visible: true,
             visible: ResourceMap::default(),
+            flags: ResourceMap::default(),
             resource_types: ResourceMap::default(),
             show_side_bars,
         }
@@ -84,17 +119,27 @@ impl CanvasState {
         self.visible.get(&rid).unwrap_or(&true).to_owned()
     }
 
+    /// Returns the ResourceType of a given ResourceId
+    pub fn resource_type(&self, rid: &ResourceId) -> Option<ResourceType> {
+        self.resource_types.get(rid).cloned()
+    }
+
+    /// Remove a resource from mappings.
+    pub fn remove(&mut self, rid: &ResourceId) {
+        self.selected.remove(rid);
+        self.visible.remove(rid);
+        self.resource_types.remove(rid);
+    }
+
+    #[tracing::instrument(skip(self))]
     fn details_bar_widget_from_selected(&self) -> Option<DetailsBarWidget> {
         match self.selected.len() {
             0 => None,
             1 => {
-                let Some(rid) = self.selected.iter().next() else {
-                    return None;
-                };
-
+                let rid = self.selected.iter().next().expect("resource not available");
                 let kind = self
                     .resource_types
-                    .get(&rid)
+                    .get(rid)
                     .expect("could not find resource type");
 
                 match kind {
@@ -103,8 +148,20 @@ impl CanvasState {
                 }
             }
             _ => {
-                // @todo: Bulk editing.
-                None
+                let mut kinds = self.selected.iter().map(|rid| {
+                    self.resource_types
+                        .get(rid)
+                        .expect("could not find resource type")
+                });
+
+                // must clone iterator, iterators can only be used once
+                if kinds.clone().all(|k| k == &ResourceType::Container) {
+                    Some(DetailsBarWidget::ContainerBulkEditor(self.selected.clone()))
+                } else if kinds.all(|k| k == &ResourceType::Asset) {
+                    Some(DetailsBarWidget::AssetBulkEditor(self.selected.clone()))
+                } else {
+                    Some(DetailsBarWidget::MixedBulkEditor(self.selected.clone()))
+                }
             }
         }
     }
@@ -141,6 +198,13 @@ impl Reducible for CanvasState {
                 current.details_bar_widget = current.details_bar_widget_from_selected();
             }
 
+            CanvasStateAction::SelectAssetOnly(rid) => {
+                current.selected.clear();
+                current.selected.insert(rid.clone());
+                current.resource_types.insert(rid, ResourceType::Asset);
+                current.details_bar_widget = current.details_bar_widget_from_selected();
+            }
+
             CanvasStateAction::Unselect(rid) => {
                 current.selected.remove(&rid);
                 current.details_bar_widget = current.details_bar_widget_from_selected();
@@ -150,7 +214,6 @@ impl Reducible for CanvasState {
                 for rid in rids {
                     current.selected.remove(&rid);
                 }
-
                 current.details_bar_widget = current.details_bar_widget_from_selected();
             }
 
@@ -162,6 +225,41 @@ impl Reducible for CanvasState {
             CanvasStateAction::SetVisibility(rid, visible) => {
                 current.visible.insert(rid, visible);
             }
+
+            CanvasStateAction::Remove(rid) => {
+                current.remove(&rid);
+                current.details_bar_widget = current.details_bar_widget_from_selected();
+            }
+
+            CanvasStateAction::RemoveMany(rids) => {
+                for rid in rids {
+                    current.remove(&rid);
+                }
+                current.details_bar_widget = current.details_bar_widget_from_selected();
+            }
+
+            CanvasStateAction::ToggleDrawers => {
+                current.drawers_visible = !current.drawers_visible;
+            }
+
+            CanvasStateAction::AddFlag { resource, message } => {
+                let resource_flags = current.flags.entry(resource).or_insert(Vec::new());
+                resource_flags.push(message);
+            }
+
+            CanvasStateAction::RemoveFlag { resource, index } => {
+                if let Some(resource_flags) = current.flags.get_mut(&resource) {
+                    resource_flags.remove(index);
+                }
+            }
+
+            CanvasStateAction::ClearResourceFlags(resource) => {
+                current.flags.remove(&resource);
+            }
+
+            CanvasStateAction::ClearFlags => {
+                current.flags.clear();
+            }
         }
 
         current.into()
@@ -169,7 +267,3 @@ impl Reducible for CanvasState {
 }
 
 pub type CanvasStateReducer = UseReducerHandle<CanvasState>;
-
-#[cfg(test)]
-#[path = "./canvas_state_test.rs"]
-mod canvas_state_test;
diff --git a/desktop/src/components/canvas/canvas_state_test.rs b/desktop/src/components/canvas/canvas_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/canvas_test.rs b/desktop/src/components/canvas/canvas_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/container.rs b/desktop/src/components/canvas/container/container.rs
index d8749e08..d4afaec5 100644
--- a/desktop/src/components/canvas/container/container.rs
+++ b/desktop/src/components/canvas/container/container.rs
@@ -69,7 +69,3 @@ pub fn container(props: &ContainerProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/desktop/src/components/canvas/container/container_test.rs b/desktop/src/components/canvas/container/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/container_tree/container.rs b/desktop/src/components/canvas/container/container_tree/container.rs
index ad5082fd..0fdb4759 100644
--- a/desktop/src/components/canvas/container/container_tree/container.rs
+++ b/desktop/src/components/canvas/container/container_tree/container.rs
@@ -1,11 +1,12 @@
 //! UI for a `Container` preview within a [`Graph`](super::Graph).
 //! Acts as a wrapper around a [`thot_ui::widgets::container::container_tree::Container`].
-use super::super::super::asset::CreateAssets;
 use crate::app::ShadowBox;
 use crate::app::{AppStateAction, AppStateReducer, ProjectsStateReducer};
 use crate::commands::common::{PathBufArgs, ResourceIdArgs};
 use crate::commands::container::AddAssetWindowsArgs;
 use crate::common::invoke;
+use crate::components::canvas::asset::CreateAssets;
+use crate::components::canvas::selection_action::{selection_action, SelectionAction};
 use crate::components::canvas::{
     CanvasStateAction, CanvasStateReducer, GraphStateAction, GraphStateReducer,
 };
@@ -42,7 +43,7 @@ pub struct ContainerProps {
     pub onadd_child: Option<Callback<ResourceId>>,
 }
 
-#[tracing::instrument(level = "debug", skip(props), fields(?props.rid))]
+#[tracing::instrument(skip(props), fields(?props.rid))]
 #[function_component(Container)]
 pub fn container(props: &ContainerProps) -> HtmlResult {
     // -------------
@@ -64,7 +65,9 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
     let multiple_selected = canvas_state.selected.len() > 1;
 
     let Some(project_scripts) = projects_state.project_scripts.get(&canvas_state.project) else {
-        app_state.dispatch(AppStateAction::AddMessage(Message::error("Project scripts not loaded")));
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Project scripts not loaded",
+        )));
         navigator.push(&Route::Dashboard);
         return Ok(html! {{ "Project scripts not loaded. Redirecting to home." }});
     };
@@ -93,6 +96,10 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
     // --- interaction ---
     // -------------------
 
+    let onmousedown = Callback::from(move |e: MouseEvent| {
+        e.prevent_default();
+    });
+
     let onclick = {
         let rid = props.rid.clone();
         let canvas_state = canvas_state.clone();
@@ -101,6 +108,7 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
 
         Callback::from(move |e: MouseEvent| {
             e.stop_propagation();
+            e.prevent_default();
 
             let rid = rid.clone();
             match selection_action(selected, multiple_selected, e) {
@@ -126,7 +134,6 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
 
     let on_menu_event = {
         let app_state = app_state.clone();
-        let canvas_state = canvas_state.clone();
         let graph_state = graph_state.clone();
         let rid = props.rid.clone();
         let show_create_assets = show_create_assets.clone();
@@ -201,41 +208,10 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
                 }
 
                 ContainerMenuEvent::Remove => {
-                    let app_state = app_state.clone();
-                    let canvas_state = canvas_state.clone();
-                    let graph_state = graph_state.clone();
-
                     spawn_local(async move {
                         invoke::<()>("remove_container_tree", ResourceIdArgs { rid: rid.clone() })
                             .await
                             .expect("could not invoke `remove_container_tree`");
-
-                        let mut graph = graph_state.graph.clone();
-
-                        match graph.remove(&rid) {
-                            Ok(removed) => {
-                                // unselect removed elements
-                                let mut rids = Vec::with_capacity(removed.nodes().len());
-                                for (cid, container) in removed.nodes() {
-                                    rids.push(cid.clone());
-                                    let mut aids = container
-                                        .assets
-                                        .keys()
-                                        .map(|rid| rid.clone())
-                                        .collect::<Vec<ResourceId>>();
-
-                                    rids.append(&mut aids);
-                                }
-
-                                canvas_state.dispatch(CanvasStateAction::UnselectMany(rids));
-                                graph_state.dispatch(GraphStateAction::SetGraph(graph));
-                            }
-                            Err(_) => {
-                                app_state.dispatch(AppStateAction::AddMessage(Message::error(
-                                    "Could not remove tree",
-                                )));
-                            }
-                        }
                     });
                 }
             }
@@ -262,7 +238,11 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
 
         Callback::from(move |(asset, e): (ResourceId, MouseEvent)| {
             let Some(asset) = get_asset(&asset, graph_state.clone()) else {
-                app_state.dispatch(AppStateAction::AddMessageWithTimeout(Message::error("Could not load asset"), MESSAGE_TIMEOUT, app_state.clone()));
+                app_state.dispatch(AppStateAction::AddMessageWithTimeout(
+                    Message::error("Could not load asset"),
+                    MESSAGE_TIMEOUT,
+                    app_state.clone(),
+                ));
                 return;
             };
 
@@ -270,8 +250,7 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
             let selected = canvas_state.selected.contains(&rid);
             match selection_action(selected, multiple_selected, e) {
                 SelectionAction::SelectOnly => {
-                    canvas_state.dispatch(CanvasStateAction::ClearSelected);
-                    canvas_state.dispatch(CanvasStateAction::SelectAsset(rid));
+                    canvas_state.dispatch(CanvasStateAction::SelectAssetOnly(rid));
                 }
 
                 SelectionAction::Select => {
@@ -291,65 +270,51 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
         let rid = props.rid.clone();
 
         Callback::from(move |(asset, e): (ResourceId, MouseEvent)| {
+            e.stop_propagation();
             let rid = rid.clone();
             let Some(asset) = get_asset(&asset, graph_state.clone()) else {
-                app_state.dispatch(AppStateAction::AddMessageWithTimeout(Message::error("Could not load asset"), MESSAGE_TIMEOUT, app_state.clone()));
+                app_state.dispatch(AppStateAction::AddMessageWithTimeout(
+                    Message::error("Could not load asset"),
+                    MESSAGE_TIMEOUT,
+                    app_state.clone(),
+                ));
                 return;
             };
 
             let app_state = app_state.clone();
             spawn_local(async move {
-                let Ok(mut path) = invoke::<PathBuf>("get_container_path", ResourceIdArgs { rid })
-                    .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get container path")));
-                        return;
-                    };
+                let Ok(mut path) =
+                    invoke::<PathBuf>("get_container_path", ResourceIdArgs { rid }).await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not get container path",
+                    )));
+                    return;
+                };
 
                 path.push(asset.path.clone());
-                let Ok(_) = invoke::<()>("open_file", PathBufArgs { path })
-                    .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not open file")));
-                        return;
-                    };
+                let Ok(_) = invoke::<()>("open_file", PathBufArgs { path }).await else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not open file",
+                    )));
+                    return;
+                };
             });
         })
     };
 
     let onclick_asset_remove = {
         let app_state = app_state.clone();
-        let graph_state = graph_state.clone();
-        let canvas_state = canvas_state.clone();
-        let container_id = props.rid.clone();
-
         Callback::from(move |rid: ResourceId| {
             let app_state = app_state.clone();
-            let graph_state = graph_state.clone();
-            let canvas_state = canvas_state.clone();
-            let container_id = container_id.clone();
-
             spawn_local(async move {
-                let Ok(_) = invoke::<()>("remove_asset", ResourceIdArgs { rid: rid.clone() })
-                    .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not remove asset")));
-                        return;
-                    };
-
-                let Some(container) = graph_state
-                    .graph
-                    .get(&container_id)
-                    .cloned() else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not update container")));
-                        return;
-                    };
-
-                let mut assets = container.assets.clone();
-                assets.retain(|asset, _| asset != &rid);
-                graph_state.dispatch(GraphStateAction::UpdateContainerAssets(
-                    container_id.clone(),
-                    assets,
-                ));
-
-                canvas_state.dispatch(CanvasStateAction::Unselect(rid.clone()));
+                let Ok(_) = invoke::<()>("remove_asset", ResourceIdArgs { rid: rid.clone() }).await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not remove asset",
+                    )));
+                    return;
+                };
             });
         })
     };
@@ -370,7 +335,7 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
     // --- on drop events ---
     // ----------------------
 
-    // @note: Used for Windows machines.
+    // NOTE Used for Windows machines.
     //      For *nix and macOS machine, look in the `ContainerTreeController` component.
 
     let ondragenter = {
@@ -391,7 +356,6 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
     };
 
     let ondrop = {
-        let app_state = app_state.clone();
         let graph_state = graph_state.clone();
         let container_id = props.rid.clone();
 
@@ -408,8 +372,6 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
                 let file_reader = web_sys::FileReader::new().unwrap();
                 file_reader.read_as_array_buffer(&file).unwrap();
 
-                let app_state = app_state.clone();
-                let graph_state = graph_state.clone();
                 let container_id = container_id.clone();
                 let onload = Closure::<dyn FnMut(Event)>::new(move |e: Event| {
                     let file_reader: FileReader = e.target().unwrap().dyn_into().unwrap();
@@ -419,14 +381,12 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
                     let mut contents = vec![0; file.length() as usize];
                     file.copy_to(&mut contents);
 
-                    let app_state = app_state.clone();
-                    let graph_state = graph_state.clone();
                     let name = name.clone();
                     let container_id = container_id.clone();
                     spawn_local(async move {
                         // create assets
-                        // @todo: Handle buckets.
-                        let asset: Vec<ResourceId> = invoke(
+                        // TODO Handle buckets.
+                        invoke::<()>(
                             "add_asset_windows",
                             AddAssetWindowsArgs {
                                 container: container_id.clone(),
@@ -436,34 +396,6 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
                         )
                         .await
                         .expect("could not invoke `add_asset_windows`");
-
-                        // update container
-                        let container: CoreContainer = invoke(
-                            "get_container",
-                            ResourceIdArgs {
-                                rid: container_id.clone(),
-                            },
-                        )
-                        .await
-                        .expect("could not invoke `get_container`");
-
-                        // update container
-                        let asset = container
-                            .assets
-                            .get(&asset[0])
-                            .expect("could not find `Asset`")
-                            .clone();
-                        graph_state.dispatch(GraphStateAction::InsertContainerAssets(
-                            container_id.clone(),
-                            vec![asset],
-                        ));
-
-                        // notify user
-                        app_state.dispatch(AppStateAction::AddMessageWithTimeout(
-                            Message::success("Added asset"),
-                            MESSAGE_TIMEOUT,
-                            app_state.clone(),
-                        ));
                     });
                 });
 
@@ -501,6 +433,7 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
                 scripts: container.scripts.clone(),
                 script_names,
                 preview: canvas_state.preview.clone(),
+                onmousedown,
                 onclick,
                 onclick_asset,
                 ondblclick_asset,
@@ -513,10 +446,7 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
             }
     };
 
-    let container_name = match container.properties.name.clone() {
-        None => "(no name)".to_string(),
-        Some(name) => name,
-    };
+    let container_name = &container.properties.name;
 
     Ok(html! {
         <>
@@ -539,49 +469,15 @@ pub fn container(props: &ContainerProps) -> HtmlResult {
 // *** helpers ***
 // ***************
 
-enum SelectionAction {
-    SelectOnly,
-    Select,
-    Unselect,
-}
-
-/// Determines the selection action from the current action and state.
-///
-/// # Arguments
-/// 1. If the clicked resource is currently selected.
-/// 2. If at least one other resource is currently selected.
-/// 3. The [`MouseEvent`].
-fn selection_action(selected: bool, multiple: bool, e: MouseEvent) -> SelectionAction {
-    if e.ctrl_key() {
-        if selected {
-            return SelectionAction::Unselect;
-        } else {
-            return SelectionAction::Select;
-        }
-    }
-
-    if selected {
-        if multiple {
-            return SelectionAction::SelectOnly;
-        }
-
-        return SelectionAction::Unselect;
-    }
-
-    SelectionAction::SelectOnly
-}
-
 /// Gets an `Asset`.
 ///
 /// # Arguments
 /// 1. `Asset`'s `ResourceId`.
 /// 2. Tree state.
 fn get_asset(rid: &ResourceId, graph_state: GraphStateReducer) -> Option<CoreAsset> {
-    let Some(container) = graph_state
-                .asset_map
-                .get(&rid) else {
-                    return None;
-                };
+    let Some(container) = graph_state.asset_map.get(&rid) else {
+        return None;
+    };
 
     let container = graph_state
         .graph
@@ -590,7 +486,3 @@ fn get_asset(rid: &ResourceId, graph_state: GraphStateReducer) -> Option<CoreAss
 
     container.assets.get(&rid).cloned()
 }
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/desktop/src/components/canvas/container/container_tree/container_test.rs b/desktop/src/components/canvas/container/container_tree/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/container_tree/container_tree.rs b/desktop/src/components/canvas/container/container_tree/container_tree.rs
index e0475938..1b1d34f2 100644
--- a/desktop/src/components/canvas/container/container_tree/container_tree.rs
+++ b/desktop/src/components/canvas/container/container_tree/container_tree.rs
@@ -1,8 +1,7 @@
 //! Container tree UI.
 use super::Container as ContainerUi;
 use crate::app::{AppStateAction, AppStateReducer, AuthStateReducer, ShadowBox};
-use crate::commands::common::UpdatePropertiesArgs;
-use crate::commands::container::NewChildArgs;
+use crate::commands::container::{NewChildArgs, UpdatePropertiesArgs};
 use crate::common::invoke;
 use crate::components::canvas::{
     CanvasStateAction, CanvasStateReducer, GraphStateAction, GraphStateReducer,
@@ -79,10 +78,10 @@ fn new_child_name(props: &NewChildNameProps) -> Html {
 // *** Container Tree ***
 // **********************
 
-static CONNECTOR_CLASS: &str = "container-tree-node-connector";
-static VISIBILITY_CONTROL_CLASS: &str = "container-tree-visibility-control";
-static VISIBILITY_CONTROL_SIZE: u8 = 20;
-static EYE_ICON_SIZE: u8 = 16;
+const CONNECTOR_CLASS: &str = "container-tree-node-connector";
+const VISIBILITY_CONTROL_CLASS: &str = "container-tree-visibility-control";
+const VISIBILITY_CONTROL_SIZE: u8 = 20;
+const EYE_ICON_SIZE: u8 = 16;
 
 /// Properties for a [`ContainerTree`].
 #[derive(Properties, PartialEq, Debug)]
@@ -92,12 +91,9 @@ pub struct ContainerTreeProps {
 }
 
 /// Container tree component.
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 #[function_component(ContainerTree)]
 pub fn container_tree(props: &ContainerTreeProps) -> HtmlResult {
-    let auth_state =
-        use_context::<AuthStateReducer>().expect("`AuthStateReducer` context not found");
-
     let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
     let canvas_state =
         use_context::<CanvasStateReducer>().expect("`CanvasStateReducer` context not found");
@@ -134,21 +130,10 @@ pub fn container_tree(props: &ContainerTreeProps) -> HtmlResult {
 
     let add_child = {
         let app_state = app_state.clone();
-        let graph_state = graph_state.clone();
         let new_child_parent = new_child_parent.clone();
         let show_add_child_form = show_add_child_form.clone();
-        let uid = auth_state
-            .user
-            .as_ref()
-            .expect("`AuthState.user` should be set")
-            .rid
-            .clone();
-
         Callback::from(move |name: String| {
             let app_state = app_state.clone();
-            let graph_state = graph_state.clone();
-            let uid = uid.clone();
-
             show_add_child_form.set(false);
             let parent = (*new_child_parent)
                 .clone()
@@ -156,32 +141,20 @@ pub fn container_tree(props: &ContainerTreeProps) -> HtmlResult {
 
             spawn_local(async move {
                 // create child
-                let Ok(mut child) = invoke::<Container>(
+                let Ok(_) = invoke::<()>(
                     "new_child",
                     NewChildArgs {
                         name,
                         parent: parent.clone(),
                     },
                 )
-                .await else {
-                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not create child")));
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not create child",
+                    )));
                     return;
                 };
-
-                graph_state.dispatch(GraphStateAction::InsertChildContainer(
-                    parent,
-                    child.clone(),
-                ));
-
-                // set creator
-                child.properties.creator = Creator::User(Some(UserId::Id(uid)));
-
-                graph_state.dispatch(GraphStateAction::UpdateContainerProperties(
-                    UpdatePropertiesArgs {
-                        rid: child.rid,
-                        properties: child.properties,
-                    },
-                ));
             });
         })
     };
@@ -212,29 +185,26 @@ pub fn container_tree(props: &ContainerTreeProps) -> HtmlResult {
         let children_ref = children_ref.clone();
         let connectors_ref = connectors_ref.clone();
 
-        use_effect_with_deps(
-            move |_| {
-                let window = web_sys::window().expect("could not get window");
-                let create_connectors_cb = Closure::<dyn Fn()>::new(move || {
-                    create_connectors(
-                        root_ref.clone(),
-                        children_ref.clone(),
-                        connectors_ref.clone(),
-                        canvas_state.clone(),
-                    )
-                });
-
-                window
-                    .add_event_listener_with_callback(
-                        "resize",
-                        create_connectors_cb.as_ref().unchecked_ref(),
-                    )
-                    .expect("could not add `resize` listener to `window`");
-
-                create_connectors_cb.forget();
-            },
-            (),
-        );
+        use_effect_with((), move |_| {
+            let window = web_sys::window().expect("could not get window");
+            let create_connectors_cb = Closure::<dyn Fn()>::new(move || {
+                create_connectors(
+                    root_ref.clone(),
+                    children_ref.clone(),
+                    connectors_ref.clone(),
+                    canvas_state.clone(),
+                )
+            });
+
+            window
+                .add_event_listener_with_callback(
+                    "resize",
+                    create_connectors_cb.as_ref().unchecked_ref(),
+                )
+                .expect("could not add `resize` listener to `window`");
+
+            create_connectors_cb.forget();
+        });
     }
 
     let container_fallback = html! { <Loading text={"Loading container"} /> };
@@ -276,14 +246,10 @@ pub fn container_tree(props: &ContainerTreeProps) -> HtmlResult {
                                 <div class={classes!("child-node-marker")}
                                     data-rid={rid.clone()}>
 
-                                    { match graph_state.graph.get(&rid)
+                                    { &graph_state.graph.get(&rid)
                                         .expect("child `Container` not found")
                                         .properties
                                         .name
-                                        .clone() {
-                                            Some(name) => name,
-                                            None => "(no name)".to_string()
-                                        }
                                     }
                                 </div>
                             }
@@ -593,7 +559,3 @@ fn create_visibility_control_element(
 
     visibility.to_owned()
 }
-
-#[cfg(test)]
-#[path = "./container_tree_test.rs"]
-mod container_tree_test;
diff --git a/desktop/src/components/canvas/container/container_tree/container_tree_controller.rs b/desktop/src/components/canvas/container/container_tree/container_tree_controller.rs
index 172b7314..495361db 100644
--- a/desktop/src/components/canvas/container/container_tree/container_tree_controller.rs
+++ b/desktop/src/components/canvas/container/container_tree/container_tree_controller.rs
@@ -2,8 +2,10 @@
 use super::ContainerTree;
 use crate::app::{AppStateAction, AppStateReducer};
 use crate::commands::common::ResourceIdArgs;
+use crate::commands::container::AddAssetsArgs;
 use crate::commands::project::AnalyzeArgs;
 use crate::common::invoke;
+use crate::components::canvas::canvas_state::{self, ResourceType};
 use crate::components::canvas::{CanvasStateAction, CanvasStateReducer};
 use crate::components::canvas::{GraphStateAction, GraphStateReducer};
 use crate::constants::MESSAGE_TIMEOUT;
@@ -11,10 +13,10 @@ use futures::stream::StreamExt;
 use std::path::PathBuf;
 use std::str::FromStr;
 use thot_core::graph::ResourceTree;
-use thot_core::project::{Asset, Container};
+use thot_core::project::Container;
 use thot_core::types::ResourceId;
+use thot_desktop_lib::types::AddAssetInfo;
 use thot_local::types::AssetFileAction;
-use thot_local_database::command::container::{AddAssetInfo, AddAssetsArgs};
 use thot_ui::types::ContainerPreview;
 use thot_ui::types::Message;
 use thot_ui::widgets::container::container_tree::ContainerPreviewSelect;
@@ -22,6 +24,7 @@ use thot_ui::widgets::suspense::Loading;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
+use yew_icons::{Icon, IconId};
 
 #[derive(PartialEq)]
 enum AnalysisState {
@@ -37,7 +40,7 @@ enum AnalysisState {
 // *****************
 
 /// Container tree with controls.
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 #[function_component(ContainerTreeController)]
 pub fn container_tree_controller() -> Html {
     let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
@@ -51,131 +54,112 @@ pub fn container_tree_controller() -> Html {
     let node_ref = use_node_ref(); // @todo: Remove in favor of `graph_state.dragover_container`
                                    // See https://github.com/yewstack/yew/issues/3125.
 
+    let show_analyze_options = use_state(|| false);
+
     // listen for file drop events
     {
         let app_state = app_state.clone();
         let graph_state = graph_state.clone();
         let node_ref = node_ref.clone();
 
-        use_effect_with_deps(
-            move |_| {
-                spawn_local(async move {
-                    // TODO Listen to window events.
-                    // NOTE Used for *nix and macOS machines.
-                    //      For Windows machine, look in the `Container` component.
-                    let mut events = tauri_sys::event::listen::<Vec<PathBuf>>("tauri://file-drop")
-                        .await
-                        .expect("could not create `tauri://file-drop` listener");
-
-                    while let Some(event) = events.next().await {
-                        // get active container id
-                        let node = node_ref
-                            .cast::<web_sys::HtmlElement>()
-                            .expect("could not cast node to element");
-
-                        let active_nodes = node
-                            .query_selector_all(".dragover-active")
-                            .expect("could not query node");
-
-                        if active_nodes.length() > 1 {
-                            web_sys::console::error_1(
-                                &"more than one node is dragover active".into(),
-                            );
-                            graph_state.dispatch(GraphStateAction::ClearDragOverContainer);
-                            app_state.dispatch(AppStateAction::AddMessage(Message::error(
-                                "Could not add files",
-                            )));
-                            return;
-                        }
-
-                        let Some(active_node) = active_nodes.get(0) else {
-                            continue;
-                        };
-
-                        let active_node = active_node
-                            .dyn_ref::<web_sys::HtmlElement>()
-                            .expect("could not cast node to element");
-
-                        let container_id = active_node
-                            .dataset()
-                            .get("rid")
-                            .expect("could not get `ResourceId` from element");
-
-                        let container_id = ResourceId::from_str(&container_id)
-                            .expect("could not convest string to `ResourceId`");
-
-                        // create assets
-                        let action = match &app_state.user_settings {
-                            None => AssetFileAction::Copy,
-                            Some(user_settings) => {
-                                user_settings.general.ondrop_asset_action.clone()
-                            }
-                        };
-
-                        // @todo: Handle buckets.
-                        let assets = event
-                            .payload
-                            .into_iter()
-                            .map(|path| AddAssetInfo {
-                                path,
-                                action: action.clone(),
-                                bucket: None,
-                            })
-                            .collect::<Vec<AddAssetInfo>>();
-
-                        let assets: Vec<ResourceId> = invoke(
-                            "add_assets",
-                            AddAssetsArgs {
-                                container: container_id.clone(),
-                                assets,
-                            },
-                        )
-                        .await
-                        .expect("could not invoke `add_assets`");
-
-                        // update container
-                        let container: Container = invoke(
-                            "get_container",
-                            ResourceIdArgs {
-                                rid: container_id.clone(),
-                            },
-                        )
-                        .await
-                        .expect("could not invoke `get_container`");
-
-                        let assets = container
-                            .assets
-                            .into_values()
-                            .filter(|asset| assets.contains(&asset.rid))
-                            .collect::<Vec<Asset>>();
-
-                        // update container
-                        let num_assets = assets.len();
-                        graph_state.dispatch(GraphStateAction::InsertContainerAssets(
-                            container_id.clone(),
-                            assets,
-                        ));
-
-                        // notify user
-                        let num_assets_msg = if num_assets == 0 {
-                            "No assets added"
-                        } else if num_assets == 1 {
-                            "1 asset added"
-                        } else {
-                            // todo[3]: Display number of assets added.
-                            "Assets added"
-                        };
-
-                        app_state.dispatch(AppStateAction::AddMessageWithTimeout(
-                            Message::success(num_assets_msg),
-                            MESSAGE_TIMEOUT,
-                            app_state.clone(),
-                        ));
+        use_effect_with((), move |_| {
+            spawn_local(async move {
+                // TODO Listen to window events.
+                // NOTE Used for *nix and macOS machines.
+                //      For Windows machine, look in the `Container` component.
+                let mut events = tauri_sys::event::listen::<Vec<PathBuf>>("tauri://file-drop")
+                    .await
+                    .expect("could not create `tauri://file-drop` listener");
+
+                while let Some(event) = events.next().await {
+                    // get active container id
+                    let node = node_ref
+                        .cast::<web_sys::HtmlElement>()
+                        .expect("could not cast node to element");
+
+                    let active_nodes = node
+                        .query_selector_all(".dragover-active")
+                        .expect("could not query node");
+
+                    if active_nodes.length() > 1 {
+                        tracing::error!("more than one node is dragover active");
+                        graph_state.dispatch(GraphStateAction::ClearDragOverContainer);
+                        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                            "Could not add files",
+                        )));
+                        return;
                     }
-                });
-            },
-            (),
-        );
+
+                    let Some(active_node) = active_nodes.get(0) else {
+                        continue;
+                    };
+
+                    let active_node = active_node
+                        .dyn_ref::<web_sys::HtmlElement>()
+                        .expect("could not cast node to element");
+
+                    let container_id = active_node
+                        .dataset()
+                        .get("rid")
+                        .expect("could not get `ResourceId` from element");
+
+                    let container_id = ResourceId::from_str(&container_id)
+                        .expect("could not convest string to `ResourceId`");
+
+                    // create assets
+                    let action = match &app_state.user_settings {
+                        None => AssetFileAction::Copy,
+                        Some(user_settings) => user_settings.general.ondrop_asset_action.clone(),
+                    };
+
+                    // TODO Handle buckets.
+                    let assets = event
+                        .payload
+                        .into_iter()
+                        .map(|path| AddAssetInfo {
+                            path,
+                            action: action.clone(),
+                            bucket: None,
+                        })
+                        .collect::<Vec<AddAssetInfo>>();
+
+                    invoke::<()>(
+                        "add_assets",
+                        AddAssetsArgs {
+                            container: container_id.clone(),
+                            assets,
+                        },
+                    )
+                    .await
+                    .expect("could not invoke `add_assets`");
+                }
+            });
+        });
+    }
+
+    {
+        let canvas_state = canvas_state.clone();
+        let show_analyze_options = show_analyze_options.clone();
+        use_effect_with(canvas_state, move |canvas_state| {
+            if canvas_state.selected.len() != 1 {
+                show_analyze_options.set(false);
+                return;
+            }
+            let item = canvas_state
+                .selected
+                .iter()
+                .next()
+                .clone()
+                .expect("selected has 1 item");
+            let item_type = canvas_state
+                .resource_type(item)
+                .expect("item should have type");
+            if item_type != ResourceType::Container {
+                show_analyze_options.set(false);
+                return;
+            }
+            show_analyze_options.set(true);
+        })
     }
 
     let set_preview = {
@@ -188,8 +172,10 @@ pub fn container_tree_controller() -> Html {
 
     let analyze = {
         let app_state = app_state.clone();
+        let canvas_state = canvas_state.clone();
         let graph_state = graph_state.clone();
         let analysis_state = analysis_state.clone();
+        let canvas_state = canvas_state.clone();
 
         Callback::from(move |_: MouseEvent| {
             let app_state = app_state.clone();
@@ -197,9 +183,11 @@ pub fn container_tree_controller() -> Html {
             let analysis_state = analysis_state.clone();
             let project_id = canvas_state.project.clone();
 
+            canvas_state.dispatch(CanvasStateAction::ClearFlags);
+
             spawn_local(async move {
-                // analyze
                 let root = graph_state.graph.root();
+
                 let max_tasks = None;
                 analysis_state.set(AnalysisState::Analyzing);
                 app_state.dispatch(AppStateAction::AddMessageWithTimeout(
@@ -208,25 +196,95 @@ pub fn container_tree_controller() -> Html {
                     app_state.clone(),
                 ));
 
-                // @todo: Handle analysis error.
-                match invoke(
+                let res = invoke(
                     "analyze",
                     &AnalyzeArgs {
                         root: root.clone(),
                         max_tasks,
                     },
                 )
-                .await
-                {
+                .await;
+
+                // update tree
+                let update: ResourceTree<Container> =
+                    invoke("load_project_graph", &ResourceIdArgs { rid: project_id })
+                        .await
+                        .expect("could not `load_project_graph");
+
+                graph_state.dispatch(GraphStateAction::SetGraph(update));
+                analysis_state.set(AnalysisState::Complete);
+
+                match res {
                     Err(err) => {
                         web_sys::console::error_1(&format!("{err:?}").into());
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error(
-                            "Error while analyzing",
-                        )))
+
+                        let mut msg = Message::error("Error while analyzing");
+                        msg.set_details(format!("{err:?}"));
+                        app_state.dispatch(AppStateAction::AddMessage(msg));
+                    }
+
+                    Ok(()) => {
+                        app_state.dispatch(AppStateAction::AddMessage(Message::success(
+                            "Analysis complete",
+                        )));
+                    }
+                }
+            })
+        })
+    };
+
+    let analyze_container = {
+        let app_state = app_state.clone();
+        let canvas_state = canvas_state.clone();
+        let graph_state = graph_state.clone();
+        let analysis_state = analysis_state.clone();
+        let canvas_state = canvas_state.clone();
+
+        Callback::from(move |_: MouseEvent| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let analysis_state = analysis_state.clone();
+            let project_id = canvas_state.project.clone();
+
+            let selected = canvas_state.selected.clone();
+            let selected_rid = selected
+                .iter()
+                .next()
+                .expect("a container should be selected")
+                .clone();
+
+            if let Some(descendants) = graph_state.graph.descendants(&selected_rid) {
+                for descendant in descendants {
+                    let descendant = graph_state.graph.get(&descendant).unwrap();
+                    for asset in descendant.assets.keys() {
+                        canvas_state.dispatch(CanvasStateAction::ClearResourceFlags(asset.clone()));
                     }
 
-                    Ok(()) => {}
+                    canvas_state.dispatch(CanvasStateAction::ClearResourceFlags(
+                        descendant.rid.clone(),
+                    ));
                 }
+            }
+
+            spawn_local(async move {
+                let root = selected_rid;
+
+                let max_tasks = None;
+                analysis_state.set(AnalysisState::Analyzing);
+                app_state.dispatch(AppStateAction::AddMessageWithTimeout(
+                    Message::info("Running analysis"),
+                    MESSAGE_TIMEOUT,
+                    app_state.clone(),
+                ));
+
+                let res = invoke(
+                    "analyze",
+                    &AnalyzeArgs {
+                        root: root.clone(),
+                        max_tasks,
+                    },
+                )
+                .await;
 
                 // update tree
                 let update: ResourceTree<Container> =
@@ -236,14 +294,31 @@ pub fn container_tree_controller() -> Html {
 
                 graph_state.dispatch(GraphStateAction::SetGraph(update));
                 analysis_state.set(AnalysisState::Complete);
-                app_state.dispatch(AppStateAction::AddMessage(Message::success(
-                    "Analysis complete",
-                )));
+
+                match res {
+                    Err(err) => {
+                        web_sys::console::error_1(&format!("{err:?}").into());
+
+                        let mut msg = Message::error("Error while analyzing");
+                        msg.set_details(format!("{err:?}"));
+                        app_state.dispatch(AppStateAction::AddMessage(msg));
+                    }
+
+                    Ok(()) => {
+                        app_state.dispatch(AppStateAction::AddMessage(Message::success(
+                            "Analysis complete",
+                        )));
+                    }
+                }
             })
         })
     };
 
     let container_tree_fallback = html! { <Loading text={"Loading container tree"} /> };
+    let mut primary_analyze_btn_classes = classes!("btn-primary", "primary-analyze-btn");
+    if *show_analyze_options {
+        primary_analyze_btn_classes.push("with_options");
+    }
 
     html! {
         <div ref={node_ref}
@@ -251,13 +326,34 @@ pub fn container_tree_controller() -> Html {
 
             <div class={classes!("container-tree-controls")}>
                 <ContainerPreviewSelect onchange={set_preview} />
-                <button
-                    class={classes!("btn-primary")}
-                    onclick={analyze}
-                    disabled={*analysis_state == AnalysisState::Analyzing}>
-
-                    { "Analyze" }
-                </button>
+                <div class={classes!("analyze-commands-group")}>
+                    <button
+                        class={primary_analyze_btn_classes}
+                        onclick={analyze.clone()}
+                        disabled={*analysis_state == AnalysisState::Analyzing}>
+
+                        { "Analyze" }
+                    </button>
+                    if *show_analyze_options {
+                        <div class={classes!("dropdown")}>
+                            <button class={classes!("btn-primary", "dropdown-btn")}>
+                                <Icon
+                                    icon_id={IconId::FontAwesomeSolidAngleDown}
+                                    height={"12px"} />
+                            </button>
+                            <ul class={classes!("dropdown-content")}>
+                                <li class={classes!("clickable")}
+                                    onclick={analyze.clone()}>
+                                    { "Project" }
+                                </li>
+                                <li class={classes!("clickable")}
+                                    onclick={analyze_container}>
+                                    { "Container" }
+                                </li>
+                            </ul>
+                        </div>
+                    }
+                </div>
             </div>
 
             <div class={classes!("container-tree")}>
@@ -268,7 +364,3 @@ pub fn container_tree_controller() -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./container_tree_controller_test.rs"]
-mod container_tree_controller_test;
diff --git a/desktop/src/components/canvas/container/container_tree/container_tree_controller_test.rs b/desktop/src/components/canvas/container/container_tree/container_tree_controller_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/container_tree/container_tree_test.rs b/desktop/src/components/canvas/container/container_tree/container_tree_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/container_tree/mod.rs b/desktop/src/components/canvas/container/container_tree/mod.rs
index 17fffa71..251999e4 100644
--- a/desktop/src/components/canvas/container/container_tree/mod.rs
+++ b/desktop/src/components/canvas/container/container_tree/mod.rs
@@ -7,7 +7,3 @@ pub mod container_tree_controller;
 pub use container::Container;
 pub use container_tree::ContainerTree;
 pub use container_tree_controller::ContainerTreeController;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/container/container_tree/mod_test.rs b/desktop/src/components/canvas/container/container_tree/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/container/mod.rs b/desktop/src/components/canvas/container/mod.rs
index f077651f..8de8b8a6 100644
--- a/desktop/src/components/canvas/container/mod.rs
+++ b/desktop/src/components/canvas/container/mod.rs
@@ -3,7 +3,3 @@ pub mod container_tree;
 
 // Re-exports
 pub use container_tree::ContainerTreeController;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/container/mod_test.rs b/desktop/src/components/canvas/container/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/asset_bulk_editor.rs b/desktop/src/components/canvas/details_bar/asset_bulk_editor.rs
new file mode 100644
index 00000000..7aa3aab7
--- /dev/null
+++ b/desktop/src/components/canvas/details_bar/asset_bulk_editor.rs
@@ -0,0 +1,311 @@
+//! Bulk editor for `Asset`s.
+use super::super::{GraphStateAction, GraphStateReducer};
+use crate::app::{AppStateAction, AppStateReducer};
+use crate::commands::asset::{AssetPropertiesUpdate, BulkUpdatePropertiesArgs};
+use crate::commands::types::{MetadataAction, TagsAction};
+use crate::common::invoke;
+use std::collections::HashSet;
+use thot_core::types::ResourceId;
+use thot_ui::types::Message;
+use thot_ui::widgets::bulk_editor::AssetPropertiesBulkEditor;
+use wasm_bindgen_futures::spawn_local;
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct AssetBulkEditorProps {
+    pub assets: HashSet<ResourceId>,
+}
+
+#[function_component(AssetBulkEditor)]
+pub fn container_bulk_editor(props: &AssetBulkEditorProps) -> Html {
+    let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
+
+    let graph_state =
+        use_context::<GraphStateReducer>().expect("`GraphStateReducer` context not found");
+
+    let assets = props
+        .assets
+        .iter()
+        .map(|rid| {
+            let container = graph_state
+                .asset_map
+                .get(rid)
+                .expect("`Asset`'s `Container` not found");
+
+            let container = graph_state
+                .graph
+                .get(container)
+                .expect("`Container` not found");
+
+            container.assets.get(rid).expect("`Asset` not found")
+        })
+        .collect::<Vec<_>>();
+
+    let rids = assets.iter().map(|c| c.rid.clone()).collect::<Vec<_>>();
+    let properties = assets
+        .iter()
+        .map(|a| a.properties.clone())
+        .collect::<Vec<_>>();
+
+    // **********************
+    // *** event handlers ***
+    // **********************
+
+    let onchange_name = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |name| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            update.name = Some(name);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onchange_kind = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |kind| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            update.kind = Some(kind);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onchange_description = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |description| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            update.description = Some(description);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onadd_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tags| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.insert = tags;
+            update.tags = tags_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onremove_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tag| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.remove.push(tag);
+            update.tags = tags_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onadd_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onremove_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |key| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.remove.push(key);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    let onchange_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = AssetPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_asset_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateAssetProperties(update));
+            });
+        })
+    };
+
+    html! {
+        <div class={classes!("thot-ui-editor")}>
+            <h4 class={classes!("align-center", "m-0")}>{ "Bulk editor" }</h4>
+            <AssetPropertiesBulkEditor
+                {properties}
+                {onchange_name}
+                {onchange_kind}
+                {onchange_description}
+                {onadd_tag}
+                {onremove_tag}
+                {onadd_metadata}
+                {onremove_metadata}
+                {onchange_metadata} />
+        </div>
+    }
+}
diff --git a/desktop/src/components/canvas/details_bar/asset_editor.rs b/desktop/src/components/canvas/details_bar/asset_editor.rs
index bbe35f9d..e1c5c22b 100644
--- a/desktop/src/components/canvas/details_bar/asset_editor.rs
+++ b/desktop/src/components/canvas/details_bar/asset_editor.rs
@@ -1,10 +1,10 @@
 //! Asset editor.
 use crate::app::{AppStateAction, AppStateReducer};
-use crate::commands::common::UpdatePropertiesArgs;
+use crate::commands::asset::UpdatePropertiesStringArgs;
 use crate::common::invoke;
 use crate::components::canvas::{GraphStateAction, GraphStateReducer};
 use crate::hooks::use_asset;
-use thot_core::project::StandardProperties;
+use thot_core::project::AssetProperties;
 use thot_core::types::ResourceId;
 use thot_ui::types::Message;
 use thot_ui::widgets::asset::AssetEditor as AssetEditorUi;
@@ -29,25 +29,26 @@ pub fn asset_editor(props: &AssetEditorProps) -> Html {
         let app_state = app_state.clone();
         let graph_state = graph_state.clone();
 
-        Callback::from(move |properties: StandardProperties| {
+        Callback::from(move |properties: AssetProperties| {
             let asset = asset.clone();
             let app_state = app_state.clone();
             let graph_state = graph_state.clone();
             spawn_local(async move {
                 let Ok(_) = invoke::<()>(
-                            "update_asset_properties",
-                            &UpdatePropertiesArgs {
-                                rid: asset.rid.clone(),
-                                properties: properties.clone(),
-                            },
-                        )
-                        .await else {
-                            app_state.dispatch(AppStateAction::AddMessage(Message::success(
-                                "Could not save resource",
-                            )));
-
-                            return;
-                        };
+                    "update_asset_properties",
+                    &UpdatePropertiesStringArgs {
+                        rid: asset.rid.clone(),
+                        properties: serde_json::to_string(&properties).unwrap(),
+                    },
+                )
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::success(
+                        "Could not save resource",
+                    )));
+
+                    return;
+                };
 
                 let mut asset = (*asset).clone();
                 asset.properties = properties;
@@ -60,7 +61,3 @@ pub fn asset_editor(props: &AssetEditorProps) -> Html {
         <AssetEditorUi asset={(*asset).clone()} {onchange_properties} />
     }
 }
-
-#[cfg(test)]
-#[path = "./asset_editor_test.rs"]
-mod asset_editor_test;
diff --git a/desktop/src/components/canvas/details_bar/asset_editor_test.rs b/desktop/src/components/canvas/details_bar/asset_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/container_bulk_editor.rs b/desktop/src/components/canvas/details_bar/container_bulk_editor.rs
new file mode 100644
index 00000000..66446e44
--- /dev/null
+++ b/desktop/src/components/canvas/details_bar/container_bulk_editor.rs
@@ -0,0 +1,546 @@
+//! Bulk editor for `Container`s.
+use super::super::{CanvasStateReducer, GraphStateAction, GraphStateReducer};
+use crate::app::{AppStateAction, AppStateReducer, ProjectsStateReducer};
+use crate::commands::container::{
+    BulkUpdatePropertiesArgs, BulkUpdateScriptAssociationArgs, ContainerPropertiesUpdate,
+    RunParametersUpdate, ScriptAssociationsBulkUpdate,
+};
+use crate::commands::types::{MetadataAction, TagsAction};
+use crate::common::invoke;
+use std::collections::HashSet;
+use thot_core::project::ScriptAssociation;
+use thot_core::types::{ResourceId, ResourceMap};
+use thot_ui::types::Message;
+use thot_ui::widgets::bulk_editor::{
+    ContainerPropertiesBulkEditor, RunParametersUpdate as RunParametersUiUpdate,
+    ScriptAssociationsBulkEditor, ScriptBulkMap,
+};
+use thot_ui::widgets::container::script_associations::{AddScriptAssociation, NameMap};
+use wasm_bindgen_futures::spawn_local;
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct ContainerBulkEditorProps {
+    pub containers: HashSet<ResourceId>,
+}
+
+#[function_component(ContainerBulkEditor)]
+pub fn container_bulk_editor(props: &ContainerBulkEditorProps) -> Html {
+    let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
+
+    let canvas_state =
+        use_context::<CanvasStateReducer>().expect("`CanvasStateReducer` context not found");
+
+    let project_state =
+        use_context::<ProjectsStateReducer>().expect("`ProjectStateReducer` context not found");
+
+    let graph_state =
+        use_context::<GraphStateReducer>().expect("`GraphStateReducer` context not found");
+
+    let containers = props
+        .containers
+        .iter()
+        .map(|rid| graph_state.graph.get(rid).expect("`Container` not found"))
+        .collect::<Vec<_>>();
+
+    let rids = containers.iter().map(|c| c.rid.clone()).collect::<Vec<_>>();
+    let properties = containers
+        .iter()
+        .map(|c| c.properties.clone())
+        .collect::<Vec<_>>();
+
+    let mut associations = ScriptBulkMap::new();
+    for container in containers.iter() {
+        for (script, params) in container.scripts.iter() {
+            if let Some(param_vec) = associations.get_mut(script) {
+                param_vec.push(params.clone());
+            } else {
+                associations.insert(script.clone(), Vec::from([params.clone()]));
+            }
+        }
+    }
+
+    let project_scripts = project_state
+        .project_scripts
+        .get(&canvas_state.project)
+        .expect("`Project`'s `Script`s not loaded");
+
+    let name_map = associations
+        .clone()
+        .into_keys()
+        .map(|assoc| {
+            let script = project_scripts.get(&assoc).expect("`Script` not found");
+            let name = match script.name.clone() {
+                Some(name) => name,
+                None => {
+                    let name = script
+                        .path
+                        .as_path()
+                        .file_name()
+                        .expect("could not get path's file name");
+
+                    name.to_str()
+                        .expect("could not convert file name to string")
+                        .to_string()
+                }
+            };
+
+            (assoc, name)
+        })
+        .collect::<NameMap>();
+
+    let remaining_scripts = {
+        let num_containers = containers.len();
+        project_scripts
+            .iter()
+            .filter_map(|(sid, script)| {
+                let Some(script_containers) = associations.get(&sid) else {
+                    return Some(script.clone());
+                };
+
+                if script_containers.len() == num_containers {
+                    return None;
+                }
+
+                Some(script.clone())
+            })
+            .collect::<Vec<_>>()
+    };
+
+    // **********************
+    // *** event handlers ***
+    // **********************
+
+    let onchange_name = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |name| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            update.name = Some(name);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onchange_kind = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |kind| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            update.kind = Some(kind);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onchange_description = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |description| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            update.description = Some(description);
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onadd_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tags| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.insert = tags;
+            update.tags = tags_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onremove_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tag| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.remove.push(tag);
+            update.tags = tags_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onadd_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onremove_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |key| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.remove.push(key);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onchange_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ContainerPropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+            let update = BulkUpdatePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", update.clone()).await;
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerProperties(update));
+            });
+        })
+    };
+
+    let onadd_association = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_scripts = containers
+            .iter()
+            .map(|c| {
+                (
+                    c.rid.clone(),
+                    c.scripts.keys().cloned().collect::<Vec<ResourceId>>(),
+                )
+            })
+            .collect::<ResourceMap<_>>();
+
+        Callback::from(move |script: ResourceId| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+
+            let update_containers = container_scripts
+                .iter()
+                .filter_map(|(c, scripts)| {
+                    if scripts.contains(&&script) {
+                        None
+                    } else {
+                        Some(c.clone())
+                    }
+                })
+                .collect();
+
+            let mut update = ScriptAssociationsBulkUpdate::default();
+            update.add.push(ScriptAssociation::new(script.clone()));
+            let update = BulkUpdateScriptAssociationArgs {
+                containers: update_containers,
+                update,
+            };
+
+            spawn_local(async move {
+                let res =
+                    invoke::<()>("bulk_update_container_script_associations", update.clone()).await;
+
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Container Script Assocations",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerScriptAssociations(
+                    update,
+                ));
+            });
+        })
+    };
+
+    let onremove_association = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_scripts = containers
+            .iter()
+            .map(|c| {
+                (
+                    c.rid.clone(),
+                    c.scripts.keys().cloned().collect::<Vec<ResourceId>>(),
+                )
+            })
+            .collect::<ResourceMap<_>>();
+
+        Callback::from(move |script: ResourceId| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+
+            let update_containers = container_scripts
+                .iter()
+                .filter_map(|(c, scripts)| {
+                    if scripts.contains(&&script) {
+                        Some(c.clone())
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            let mut update = ScriptAssociationsBulkUpdate::default();
+            update.remove.push(script.clone());
+            let update = BulkUpdateScriptAssociationArgs {
+                containers: update_containers,
+                update,
+            };
+
+            spawn_local(async move {
+                let res =
+                    invoke::<()>("bulk_update_container_script_associations", update.clone()).await;
+
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Container Script Assocations",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerScriptAssociations(
+                    update,
+                ));
+            });
+        })
+    };
+
+    let onchange_association = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_scripts = containers
+            .iter()
+            .map(|c| {
+                (
+                    c.rid.clone(),
+                    c.scripts.keys().cloned().collect::<Vec<ResourceId>>(),
+                )
+            })
+            .collect::<ResourceMap<_>>();
+
+        Callback::from(move |update: RunParametersUiUpdate| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+
+            let update_containers = container_scripts
+                .iter()
+                .filter_map(|(c, scripts)| {
+                    if scripts.contains(&update.script) {
+                        Some(c.clone())
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            let mut assoc_update = ScriptAssociationsBulkUpdate::default();
+            let assoc = RunParametersUpdate {
+                script: update.script,
+                autorun: update.autorun,
+                priority: update.priority,
+            };
+
+            assoc_update.update.push(assoc);
+            let update = BulkUpdateScriptAssociationArgs {
+                containers: update_containers,
+                update: assoc_update,
+            };
+
+            spawn_local(async move {
+                let res =
+                    invoke::<()>("bulk_update_container_script_associations", update.clone()).await;
+
+                if let Err(_err) = res {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Container Script Assocations",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateContainerScriptAssociations(
+                    update,
+                ));
+            });
+        })
+    };
+
+    html! {
+        <div class={classes!("thot-ui-editor")}>
+            <h4 class={classes!("align-center", "m-0")}>{ "Bulk editor" }</h4>
+            <ContainerPropertiesBulkEditor
+                {properties}
+                {onchange_name}
+                {onchange_kind}
+                {onchange_description}
+                {onadd_tag}
+                {onremove_tag}
+                {onadd_metadata}
+                {onremove_metadata}
+                {onchange_metadata} />
+
+            <AddScriptAssociation
+                scripts={remaining_scripts}
+                onadd={onadd_association} />
+
+            <ScriptAssociationsBulkEditor
+                {associations}
+                {name_map}
+                onremove={onremove_association}
+                onchange={onchange_association} />
+        </div>
+    }
+}
diff --git a/desktop/src/components/canvas/details_bar/container_editor.rs b/desktop/src/components/canvas/details_bar/container_editor.rs
index bb57496c..47cb6bfd 100644
--- a/desktop/src/components/canvas/details_bar/container_editor.rs
+++ b/desktop/src/components/canvas/details_bar/container_editor.rs
@@ -1,13 +1,13 @@
 //! Container editor widget.
 use super::script_associations_editor::ScriptAssociationsEditor;
 use crate::app::{AppStateAction, AppStateReducer};
-use crate::commands::common::{UpdatePropertiesArgs, UpdatePropertiesStringArgs};
+use crate::commands::container::{UpdatePropertiesArgs, UpdatePropertiesStringArgs};
 use crate::common::invoke;
 use crate::components::canvas::{GraphStateAction, GraphStateReducer};
-use thot_core::project::StandardProperties;
+use thot_core::project::ContainerProperties;
 use thot_core::types::ResourceId;
 use thot_ui::types::Message;
-use thot_ui::widgets::StandardPropertiesEditor;
+use thot_ui::widgets::container::ContainerPropertiesEditor;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 
@@ -19,7 +19,7 @@ pub struct ContainerEditorProps {
     pub onsave: Callback<()>,
 }
 
-#[tracing::instrument(level = "debug", skip(props), fields(?props.rid))]
+#[tracing::instrument(skip(props), fields(?props.rid))]
 #[function_component(ContainerEditor)]
 pub fn container_editor(props: &ContainerEditorProps) -> Html {
     let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
@@ -38,13 +38,10 @@ pub fn container_editor(props: &ContainerEditorProps) -> Html {
         let dirty_state = dirty_state.clone();
         let properties = properties.clone();
 
-        use_effect_with_deps(
-            move |container| {
-                properties.set(container.properties.clone());
-                dirty_state.set(false);
-            },
-            container.clone(),
-        );
+        use_effect_with(container.clone(), move |container| {
+            properties.set(container.properties.clone());
+            dirty_state.set(false);
+        });
     }
 
     {
@@ -55,50 +52,48 @@ pub fn container_editor(props: &ContainerEditorProps) -> Html {
         let dirty_state = dirty_state.clone();
         let properties = properties.clone();
 
-        use_effect_with_deps(
-            move |properties| {
-                if !*dirty_state {
-                    return;
-                }
-
-                let properties = properties.clone();
-                spawn_local(async move {
-                    // TODO Issue with serializing `HashMap` of `metadata`. perform manually.
-                    // See https://github.com/tauri-apps/tauri/issues/6078
-                    let properties_str = serde_json::to_string(&*properties)
-                        .expect("could not serialize `StandardProperties`");
-
-                    let update_str = UpdatePropertiesStringArgs {
-                        rid: rid.clone(),
-                        properties: properties_str,
-                    };
-
-                    let update = UpdatePropertiesArgs {
-                        rid,
-                        properties: (*properties).clone(),
-                    };
-                    match invoke::<()>("update_container_properties", update_str).await {
-                        Err(err) => {
-                            tracing::debug!(?err);
-                            app_state.dispatch(AppStateAction::AddMessage(Message::error(
-                                "Could not save resource",
-                            )));
-                        }
-                        Ok(_) => {
-                            graph_state
-                                .dispatch(GraphStateAction::UpdateContainerProperties(update));
-                        }
+        use_effect_with(properties, move |properties| {
+            if !*dirty_state {
+                return;
+            }
+
+            let properties = properties.clone();
+            spawn_local(async move {
+                // TODO Issue with serializing `HashMap` of `metadata`. perform manually.
+                // See https://github.com/tauri-apps/tauri/issues/6078
+                let properties_str = serde_json::to_string(&*properties)
+                    .expect("could not serialize `ContainerProperties`");
+
+                let update_str = UpdatePropertiesStringArgs {
+                    rid: rid.clone(),
+                    properties: properties_str,
+                };
+
+                let update = UpdatePropertiesArgs {
+                    rid,
+                    properties: (*properties).clone(),
+                };
+
+                match invoke::<()>("update_container_properties", update_str).await {
+                    Err(err) => {
+                        tracing::debug!(?err);
+                        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                            "Could not save resource",
+                        )));
+                    }
+                    Ok(_) => {
+                        graph_state.dispatch(GraphStateAction::UpdateContainerProperties(update));
                     }
-                });
-            },
-            properties,
-        );
+                }
+            });
+        });
     }
 
     let onchange = {
         let properties = properties.clone();
 
-        Callback::from(move |update: StandardProperties| {
+        Callback::from(move |update: ContainerProperties| {
+            tracing::debug!("properties changed");
             properties.set(update);
             dirty_state.set(true);
         })
@@ -106,16 +101,12 @@ pub fn container_editor(props: &ContainerEditorProps) -> Html {
 
     html! {
         <div class={classes!("thot-ui-editor")}>
-            <StandardPropertiesEditor
+            <ContainerPropertiesEditor
                 properties={(*properties).clone()}
                 onchange={onchange} />
 
             <ScriptAssociationsEditor container={props.rid.clone()} />
-            // TODO <AssetDropZone />
+            // TODO Allow Assets to be dropped here.
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./container_editor_test.rs"]
-mod container_editor_test;
diff --git a/desktop/src/components/canvas/details_bar/container_editor_test.rs b/desktop/src/components/canvas/details_bar/container_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/details_bar.rs b/desktop/src/components/canvas/details_bar/details_bar.rs
index a1eea3f8..2e189ed2 100644
--- a/desktop/src/components/canvas/details_bar/details_bar.rs
+++ b/desktop/src/components/canvas/details_bar/details_bar.rs
@@ -1,18 +1,31 @@
 //! Project workspace details bar.
+use super::asset_bulk_editor::AssetBulkEditor;
 use super::asset_editor::AssetEditor;
+use super::container_bulk_editor::ContainerBulkEditor;
 use super::container_editor::ContainerEditor;
+use super::mixed_bulk_editor::MixedBulkEditor;
 use super::project_actions::ProjectActions;
 use crate::components::canvas::CanvasStateReducer;
+use std::collections::HashSet;
 use thot_core::types::ResourceId;
 use yew::prelude::*;
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Debug)]
 pub enum DetailsBarWidget {
-    /// Asset editor.
+    /// `Asset` editor.
     AssetEditor(ResourceId),
 
-    /// Container editor.
+    /// `Container` editor.
     ContainerEditor(ResourceId),
+
+    /// `Container` bulk editor.
+    ContainerBulkEditor(HashSet<ResourceId>),
+
+    /// `Asset` bulk editor.
+    AssetBulkEditor(HashSet<ResourceId>),
+
+    /// Mixed bulk editor.
+    MixedBulkEditor(HashSet<ResourceId>),
 }
 
 #[function_component(DetailsBar)]
@@ -30,7 +43,19 @@ pub fn details_bar() -> Html {
 
                     DetailsBarWidget::ContainerEditor(rid) => html! {
                         <ContainerEditor {rid} />
-                    }
+                    },
+
+                    DetailsBarWidget::ContainerBulkEditor(containers) => html! {
+                        <ContainerBulkEditor {containers} />
+                    },
+
+                    DetailsBarWidget::AssetBulkEditor(assets) => html! {
+                        <AssetBulkEditor {assets} />
+                    },
+
+                    DetailsBarWidget::MixedBulkEditor(resources) => html! {
+                        <MixedBulkEditor {resources} />
+                    },
                 }}
             } else {{
                 // default
@@ -41,7 +66,3 @@ pub fn details_bar() -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./details_bar_test.rs"]
-mod details_bar_test;
diff --git a/desktop/src/components/canvas/details_bar/details_bar_test.rs b/desktop/src/components/canvas/details_bar/details_bar_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/mixed_bulk_editor.rs b/desktop/src/components/canvas/details_bar/mixed_bulk_editor.rs
new file mode 100644
index 00000000..47dcf8d1
--- /dev/null
+++ b/desktop/src/components/canvas/details_bar/mixed_bulk_editor.rs
@@ -0,0 +1,510 @@
+//! Bulk editor for `Asset`s.
+use super::super::{GraphStateAction, GraphStateReducer};
+use crate::app::{AppStateAction, AppStateReducer};
+use crate::commands::common::BulkUpdateResourcePropertiesArgs;
+use crate::commands::types::{MetadataAction, ResourcePropertiesUpdate, TagsAction};
+use crate::common::invoke;
+use std::collections::HashSet;
+use thot_core::project::ResourceProperties;
+use thot_core::types::ResourceId;
+use thot_ui::types::Message;
+use thot_ui::widgets::bulk_editor::ResourcePropertiesBulkEditor;
+use wasm_bindgen_futures::spawn_local;
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct MixedBulkEditorProps {
+    pub resources: HashSet<ResourceId>,
+}
+
+#[function_component(MixedBulkEditor)]
+pub fn mixed_bulk_editor(props: &MixedBulkEditorProps) -> Html {
+    let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
+    let graph_state =
+        use_context::<GraphStateReducer>().expect("`GraphStateReducer` context not found");
+
+    let mut containers = Vec::new();
+    let mut container_rids = Vec::new();
+    let mut assets = Vec::new();
+    let mut asset_rids = Vec::new();
+    for rid in props.resources.iter() {
+        if let Some(container) = graph_state.asset_map.get(rid) {
+            let container = graph_state
+                .graph
+                .get(container)
+                .expect("could not retrieve `Container`");
+
+            assets.push(container.assets.get(rid).expect("could not find `Asset`"));
+            asset_rids.push(rid.clone());
+        } else {
+            containers.push(
+                graph_state
+                    .graph
+                    .get(rid)
+                    .expect("could not find `Container`"),
+            );
+
+            container_rids.push(rid.clone());
+        }
+    }
+
+    let mut rids = container_rids.clone();
+    rids.extend(asset_rids.clone());
+
+    let mut properties = containers
+        .iter()
+        .map(|c| c.properties.clone().into())
+        .collect::<Vec<ResourceProperties>>();
+
+    properties.extend(assets.iter().map(|a| a.properties.clone().into()));
+
+    // **********************
+    // *** event handlers ***
+    // **********************
+
+    let onchange_name = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let rids = rids.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+
+        Callback::from(move |name| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            update.name = Some(name);
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onchange_kind = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |kind| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            update.kind = Some(kind);
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onchange_description = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |description| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            update.description = Some(description);
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onadd_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tags| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let container_rids = container_rids.clone();
+            let asset_rids = asset_rids.clone();
+            let rids = rids.clone();
+
+            let mut update = ResourcePropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.insert = tags;
+            update.tags = tags_update;
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onremove_tag = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |tag| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            let mut tags_update = TagsAction::default();
+            tags_update.remove.push(tag);
+            update.tags = tags_update;
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onadd_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onremove_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |key| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.remove.push(key);
+            update.metadata = metadata_update;
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    let onchange_metadata = {
+        let app_state = app_state.clone();
+        let graph_state = graph_state.clone();
+        let container_rids = container_rids.clone();
+        let asset_rids = asset_rids.clone();
+        let rids = rids.clone();
+
+        Callback::from(move |(key, value)| {
+            let app_state = app_state.clone();
+            let graph_state = graph_state.clone();
+            let mut update = ResourcePropertiesUpdate::default();
+            let mut metadata_update = MetadataAction::default();
+            metadata_update.insert.insert(key, value);
+            update.metadata = metadata_update;
+
+            let container_update = BulkUpdateResourcePropertiesArgs {
+                rids: container_rids.clone(),
+                update: update.clone(),
+            };
+
+            let asset_update = BulkUpdateResourcePropertiesArgs {
+                rids: asset_rids.clone(),
+                update: update.clone(),
+            };
+
+            let update = BulkUpdateResourcePropertiesArgs {
+                rids: rids.clone(),
+                update,
+            };
+
+            spawn_local(async move {
+                let res = invoke::<()>("bulk_update_container_properties", container_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Containers",
+                    )));
+                    return;
+                }
+
+                let res = invoke::<()>("bulk_update_asset_properties", asset_update).await;
+                if let Err(err) = res {
+                    tracing::debug!(?err);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update Assets",
+                    )));
+                    return;
+                }
+
+                graph_state.dispatch(GraphStateAction::BulkUpdateResourceProperties(update));
+            });
+        })
+    };
+
+    html! {
+        <div class={classes!("thot-ui-editor")}>
+            <h4 class={classes!("align-center", "m-0")}>{ "Bulk editor" }</h4>
+            <ResourcePropertiesBulkEditor
+                {properties}
+                {onchange_name}
+                {onchange_kind}
+                {onchange_description}
+                {onadd_tag}
+                {onremove_tag}
+                {onadd_metadata}
+                {onremove_metadata}
+                {onchange_metadata} />
+        </div>
+    }
+}
diff --git a/desktop/src/components/canvas/details_bar/mod.rs b/desktop/src/components/canvas/details_bar/mod.rs
index bd8db637..001f4fad 100644
--- a/desktop/src/components/canvas/details_bar/mod.rs
+++ b/desktop/src/components/canvas/details_bar/mod.rs
@@ -1,15 +1,13 @@
 //! Details bar for the canvas.
+pub mod asset_bulk_editor;
+pub mod asset_editor;
+pub mod container_bulk_editor;
 pub mod container_editor;
 pub mod details_bar;
+pub mod mixed_bulk_editor;
 pub mod project_actions;
 pub mod project_scripts;
 pub mod script_associations_editor;
-pub mod script_editor;
-pub mod asset_editor;
 
 // Re-exports
 pub use details_bar::{DetailsBar, DetailsBarWidget};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/details_bar/mod_test.rs b/desktop/src/components/canvas/details_bar/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/project_actions.rs b/desktop/src/components/canvas/details_bar/project_actions.rs
index c2b0b72c..fe4d02c6 100644
--- a/desktop/src/components/canvas/details_bar/project_actions.rs
+++ b/desktop/src/components/canvas/details_bar/project_actions.rs
@@ -36,7 +36,8 @@ pub fn project_actions() -> HtmlResult {
         Callback::from(move |paths: HashSet<PathBuf>| {
             let project = project.clone();
             let projects_state = projects_state.clone();
-            let Some(mut project_scripts) = projects_state.project_scripts.get(&project).cloned() else {
+            let Some(mut project_scripts) = projects_state.project_scripts.get(&project).cloned()
+            else {
                 panic!("`Project`'s `Scripts` not loaded");
             };
 
@@ -77,7 +78,9 @@ pub fn project_actions() -> HtmlResult {
             let project = project.clone();
 
             let Some(mut scripts) = projects_state.project_scripts.get(&project).cloned() else {
-                app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not remove script")));
+                app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                    "Could not remove script",
+                )));
                 return;
             };
 
@@ -90,12 +93,15 @@ pub fn project_actions() -> HtmlResult {
                         script: rid.clone(),
                     },
                 )
-                .await else {
-                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not remove script")));
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not remove script",
+                    )));
                     return;
                 };
 
-                // @note: Program order does not follow logical order, should first remove from
+                // NOTE Program order does not follow logical order, should first remove from
                 // containers and then projects, else containers might contain stale scripts.
                 // however doing the right order makes the program crash due to `Script` not
                 // found error.
@@ -119,7 +125,3 @@ pub fn project_actions() -> HtmlResult {
         </div>
     })
 }
-
-#[cfg(test)]
-#[path = "./project_actions_test.rs"]
-mod project_actions_test;
diff --git a/desktop/src/components/canvas/details_bar/project_actions_test.rs b/desktop/src/components/canvas/details_bar/project_actions_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/project_scripts.rs b/desktop/src/components/canvas/details_bar/project_scripts.rs
index 60b85bde..fc27ae92 100644
--- a/desktop/src/components/canvas/details_bar/project_scripts.rs
+++ b/desktop/src/components/canvas/details_bar/project_scripts.rs
@@ -1,10 +1,14 @@
 //! Project scripts editor.
-use crate::app::ProjectsStateReducer;
+use crate::app::{AppStateAction, AppStateReducer, ProjectsStateReducer};
+use crate::commands::common::{PathBufArgs, ResourceIdArgs};
+use crate::common::invoke;
 use crate::hooks::use_canvas_project;
 use std::collections::HashSet;
 use std::path::PathBuf;
 use thot_core::types::ResourceId;
+use thot_ui::types::Message;
 use thot_ui::widgets::script::CreateScript;
+use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 use yew_icons::{Icon, IconId};
 
@@ -21,6 +25,7 @@ pub struct ProjectScriptsProps {
 
 #[function_component(ProjectScripts)]
 pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
+    let app_state = use_context::<AppStateReducer>().unwrap();
     let projects_state =
         use_context::<ProjectsStateReducer>().expect("`ProjectsStateReducer` context not found");
 
@@ -29,6 +34,56 @@ pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
         panic!("`Project`'s `Scripts` not loaded");
     };
 
+    let ondblclick_script = {
+        let app_state = app_state.clone();
+        let projects_state = projects_state.clone();
+        let project = project.clone();
+
+        move |script: ResourceId| {
+            let app_state = app_state.clone();
+            let project = projects_state.projects.get(&*project).unwrap();
+            let pid = project.rid.clone();
+            let analysis_root = project.analysis_root.clone().unwrap();
+            let script_path = projects_state
+                .project_scripts
+                .get(&project.rid)
+                .unwrap()
+                .get(&script)
+                .unwrap()
+                .path
+                .clone();
+
+            Callback::from(move |e: MouseEvent| {
+                e.stop_propagation();
+                let app_state = app_state.clone();
+                let pid = pid.clone();
+                let analysis_root = analysis_root.clone();
+                let script_path = script_path.clone();
+
+                spawn_local(async move {
+                    let Ok(mut path) =
+                        invoke::<PathBuf>("get_project_path", ResourceIdArgs { rid: pid }).await
+                    else {
+                        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                            "Could not get project path",
+                        )));
+                        return;
+                    };
+
+                    path.push(analysis_root);
+                    path.push(script_path.as_path());
+
+                    let Ok(_) = invoke::<()>("open_file", PathBufArgs { path }).await else {
+                        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                            "Could not open file",
+                        )));
+                        return;
+                    };
+                });
+            })
+        }
+    };
+
     let onclick_remove = {
         let onremove = props.onremove.clone();
         move |rid: ResourceId| {
@@ -44,7 +99,7 @@ pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
     };
 
     Ok(html! {
-        <div class={classes!("project-scripts-widget")}>
+        <div class={"project-scripts-widget"}>
             if let Some(onadd) = props.onadd.as_ref() {
                 <CreateScript oncreate={onadd.clone()} />
             }
@@ -54,7 +109,7 @@ pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
                     let name = match script.name.as_ref() {
                         Some(name) => name.clone(),
                         None => {
-                            let path = script.path.as_path().clone();
+                            let path = script.path.as_path();
                             let file_name = path.file_name().expect("could not get file name");
                             let name = file_name.to_string_lossy().to_string();
 
@@ -64,12 +119,18 @@ pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
 
                     html! {
                         <li key={script.rid.clone()}>
-                            <span>
+                            <span class={"name clickable"}
+                                title={name.clone()}
+                                ondblclick={ondblclick_script(script.rid.clone())}>
                                 { name }
                             </span>
+
                             if props.onremove.is_some() {
-                                <button classes={ "btn-icon" } type="button" onclick={onclick_remove(script.rid.clone())}>
-                                    <Icon class={ classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidMinus }/>
+                                <button class={"btn-icon"} type={"button"}
+                                    onclick={onclick_remove(script.rid.clone())}>
+
+                                    <Icon class={"thot-ui-add-remove-icon"}
+                                        icon_id={IconId::HeroiconsSolidMinus}/>
                                 </button>
                             }
                         </li>
@@ -79,7 +140,3 @@ pub fn project_scripts(props: &ProjectScriptsProps) -> HtmlResult {
         </div>
     })
 }
-
-#[cfg(test)]
-#[path = "./project_scripts_test.rs"]
-mod project_scripts_test;
diff --git a/desktop/src/components/canvas/details_bar/project_scripts_test.rs b/desktop/src/components/canvas/details_bar/project_scripts_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/script_associations_editor.rs b/desktop/src/components/canvas/details_bar/script_associations_editor.rs
index 2c4fa948..01e899f4 100644
--- a/desktop/src/components/canvas/details_bar/script_associations_editor.rs
+++ b/desktop/src/components/canvas/details_bar/script_associations_editor.rs
@@ -8,14 +8,13 @@ use crate::components::canvas::{CanvasStateReducer, GraphStateAction, GraphState
 use thot_core::project::container::ScriptMap;
 use thot_core::project::{RunParameters, Script as CoreScript};
 use thot_core::types::ResourceId;
-use thot_ui::widgets::container::script_associations::script_associations_editor::NameMap;
 use thot_ui::widgets::container::script_associations::{
-    AddScriptAssociation, ScriptAssociationsEditor as ContainerScriptsEditor,
+    AddScriptAssociation, NameMap, ScriptAssociationsEditor as ContainerScriptsEditor,
 };
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 
-#[derive(Properties, PartialEq)]
+#[derive(Properties, PartialEq, Debug)]
 pub struct ScriptAssociationsEditorProps {
     pub container: ResourceId,
 
@@ -24,6 +23,7 @@ pub struct ScriptAssociationsEditorProps {
     pub onsave: Option<Callback<()>>,
 }
 
+#[tracing::instrument]
 #[function_component(ScriptAssociationsEditor)]
 pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> HtmlResult {
     let projects_state =
@@ -43,9 +43,13 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
     let dirty_state = use_state(|| false); // track if changes come from user or are internal
     let associations = use_state(|| container.scripts.clone());
 
-    let Some(project_scripts) = projects_state.project_scripts.get(&canvas_state.project) else {
-        panic!("`Project`'s `Scripts` not loaded");
-    };
+    let project_scripts = use_state(|| {
+        projects_state
+            .project_scripts
+            .get(&canvas_state.project)
+            .expect("`Project`'s `Scripts` not loaded")
+            .clone()
+    });
 
     let remaining_scripts = use_state(|| {
         project_scripts
@@ -61,29 +65,28 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
     });
 
     {
-        // Update associations based on container
-        let container = container.clone();
-        let dirty_state = dirty_state.clone();
-        let associations = associations.clone();
+        let projects_state = projects_state.clone();
+        let project_scripts = project_scripts.clone();
 
-        use_effect_with_deps(
-            move |container| {
-                associations.set(container.scripts.clone());
-                dirty_state.set(false);
-            },
-            container,
-        );
+        use_effect_with(projects_state, move |projects_state| {
+            project_scripts.set(
+                projects_state
+                    .project_scripts
+                    .get(&canvas_state.project)
+                    .expect("`Project`'s `Scripts` not loaded")
+                    .clone(),
+            );
+        });
     }
 
     {
-        // Update remaining scripts based on associations
         let project_scripts = project_scripts.clone();
-        let associations = associations.clone();
         let remaining_scripts = remaining_scripts.clone();
+        let associations = associations.clone();
 
-        use_effect_with_deps(
-            move |associations| {
-                let scripts = project_scripts
+        use_effect_with(project_scripts, move |project_scripts| {
+            remaining_scripts.set(
+                project_scripts
                     .values()
                     .filter_map(|script| {
                         if associations.contains_key(&script.rid) {
@@ -92,12 +95,43 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
                             Some(script.clone())
                         }
                     })
-                    .collect::<Vec<CoreScript>>();
+                    .collect::<Vec<CoreScript>>(),
+            );
+        });
+    }
+
+    {
+        // Update associations based on container
+        let container = container.clone();
+        let dirty_state = dirty_state.clone();
+        let associations = associations.clone();
+
+        use_effect_with(container, move |container| {
+            associations.set(container.scripts.clone());
+            dirty_state.set(false);
+        });
+    }
+
+    {
+        // Update remaining scripts based on associations
+        let project_scripts = project_scripts.clone();
+        let associations = associations.clone();
+        let remaining_scripts = remaining_scripts.clone();
 
-                remaining_scripts.set(scripts);
-            },
-            associations,
-        );
+        use_effect_with(associations, move |associations| {
+            let scripts = project_scripts
+                .values()
+                .filter_map(|script| {
+                    if associations.contains_key(&script.rid) {
+                        None
+                    } else {
+                        Some(script.clone())
+                    }
+                })
+                .collect::<Vec<CoreScript>>();
+
+            remaining_scripts.set(scripts);
+        });
     }
 
     {
@@ -107,42 +141,38 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
         let dirty_state = dirty_state.clone();
         let associations = associations.clone();
 
-        use_effect_with_deps(
-            move |associations| {
-                if !*dirty_state {
-                    return;
-                }
-
-                let container = container.clone();
-                let graph_state = graph_state.clone();
-                let associations = associations.clone();
-
-                spawn_local(async move {
-                    // TODO Issue with deserializing `HashMap` in Tauri, send as string.
-                    // See https://github.com/tauri-apps/tauri/issues/6078
-                    let associations_str = serde_json::to_string(&*associations)
-                        .expect("could not serialize `ScriptMap`");
-
-                    let update = UpdateScriptAssociationsStringArgs {
-                        rid: container.clone(),
-                        associations: associations_str,
-                    };
-
-                    let _res = invoke::<()>("update_container_script_associations", update)
-                        .await
-                        .expect("could not invoke `update_container_script_associations`");
-
-                    let update = UpdateScriptAssociationsArgs {
-                        rid: container,
-                        associations: (*associations).clone(),
-                    };
-
-                    graph_state
-                        .dispatch(GraphStateAction::UpdateContainerScriptAssociations(update));
-                });
-            },
-            associations,
-        );
+        use_effect_with(associations, move |associations| {
+            if !*dirty_state {
+                return;
+            }
+
+            let container = container.clone();
+            let graph_state = graph_state.clone();
+            let associations = associations.clone();
+
+            spawn_local(async move {
+                // TODO Issue with deserializing `HashMap` in Tauri, send as string.
+                // See https://github.com/tauri-apps/tauri/issues/6078
+                let associations_str =
+                    serde_json::to_string(&*associations).expect("could not serialize `ScriptMap`");
+
+                let update = UpdateScriptAssociationsStringArgs {
+                    rid: container.clone(),
+                    associations: associations_str,
+                };
+
+                let _res = invoke::<()>("update_container_script_associations", update)
+                    .await
+                    .expect("could not invoke `update_container_script_associations`");
+
+                let update = UpdateScriptAssociationsArgs {
+                    rid: container,
+                    associations: (*associations).clone(),
+                };
+
+                graph_state.dispatch(GraphStateAction::UpdateContainerScriptAssociations(update));
+            });
+        });
     }
 
     let name_map = (*associations)
@@ -204,7 +234,3 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
         </div>
     })
 }
-
-#[cfg(test)]
-#[path = "./script_associations_editor_test.rs"]
-mod script_associations_editor_test;
diff --git a/desktop/src/components/canvas/details_bar/script_associations_editor_test.rs b/desktop/src/components/canvas/details_bar/script_associations_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/details_bar/script_editor.rs b/desktop/src/components/canvas/details_bar/script_editor.rs
deleted file mode 100644
index 1ff3fe38..00000000
--- a/desktop/src/components/canvas/details_bar/script_editor.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#[cfg(test)]
-#[path = "./script_editor_test.rs"]
-mod script_editor_test;
diff --git a/desktop/src/components/canvas/details_bar/script_editor_test.rs b/desktop/src/components/canvas/details_bar/script_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/graph_state.rs b/desktop/src/components/canvas/graph_state.rs
index 06ae6f0f..dcb9fa25 100644
--- a/desktop/src/components/canvas/graph_state.rs
+++ b/desktop/src/components/canvas/graph_state.rs
@@ -1,49 +1,103 @@
 //! State Redcucer for the [`ContainerTree`](super::ContainerTree).
-use crate::commands::common::UpdatePropertiesArgs;
-use crate::commands::container::UpdateScriptAssociationsArgs;
+use crate::commands::asset::{
+    AssetPropertiesUpdate, BulkUpdatePropertiesArgs as BulkUpdateAssetPropertiesArgs,
+};
+use crate::commands::common::BulkUpdateResourcePropertiesArgs;
+use crate::commands::container::{
+    BulkUpdatePropertiesArgs as BulkUpdateContainerPropertiesArgs, BulkUpdateScriptAssociationArgs,
+    ContainerPropertiesUpdate, ScriptAssociationsBulkUpdate,
+    UpdatePropertiesArgs as UpdateContainerPropertiesArgs, UpdateScriptAssociationsArgs,
+};
 use std::collections::HashMap;
 use std::rc::Rc;
 use thot_core::graph::ResourceTree;
-use thot_core::project::{container::AssetMap, Asset, Container};
-use thot_core::types::ResourceId;
+use thot_core::project::{container::AssetMap, Asset, Container, RunParameters};
+use thot_core::types::{ResourceId, ResourcePath};
 use yew::prelude::*;
 
 type ContainerTree = ResourceTree<Container>;
-
 pub type AssetContainerMap = HashMap<ResourceId, ResourceId>;
 
 pub enum GraphStateAction {
     ///  Sets the [`ContainerTree`].
     SetGraph(ContainerTree),
 
-    /// Update a [`Container`](Container)'s [`StandardProperties`](thot_::project::StandardProperties).
-    UpdateContainerProperties(UpdatePropertiesArgs),
+    /// Removes a `Container` subtree from the graph.
+    RemoveSubtree(ResourceId),
 
-    /// Add a [`Container`](Container) as a child.
+    /// Move a subtree.
+    ///
+    /// # Fields
+    /// `parent`: New parent.
+    /// `root`: Root of the subtree to move.
+    /// `name`: Name of the root `Container`.
+    MoveSubtree {
+        parent: ResourceId,
+        root: ResourceId,
+        name: String,
+    },
+
+    /// Update a [`Container`]'s [`StandardProperties`](thot_::project::StandardProperties).
+    UpdateContainerProperties(UpdateContainerPropertiesArgs),
+
+    /// Add a [`Container`] as a child.
     ///
     /// # Fields
     /// #. `parent`: `ResourceId` of the parent.
     /// #. `child`: Child `Container`.
     InsertChildContainer(ResourceId, Container),
 
-    /// Update [`Asset`](CoreAsset)s of a [`Container`](CoreContainer).
-    UpdateContainerAssets(ResourceId, AssetMap),
+    /// Insert the graph as a child of `parent.`
+    InsertSubtree {
+        parent: ResourceId,
+        graph: ContainerTree,
+    },
 
-    /// Insert [`Asset`](Asset)s into a [`Container`](Container).
+    /// Set a [`Container`]'s [`Asset`]s.
+    SetContainerAssets(ResourceId, AssetMap),
+
+    /// Insert [`Asset`]s into a [`Container`].
     InsertContainerAssets(ResourceId, Vec<Asset>),
 
-    /// Update a [`Container`](Container)'s
-    /// [`ScriptAssociation`](thot_::project::ScriptAssociation)s.
+    /// Update a [`Container`]'s
+    /// [`ScriptAssociation`](thot_core::project::ScriptAssociation)s.
     UpdateContainerScriptAssociations(UpdateScriptAssociationsArgs),
 
-    /// Remove all associations with `Script` from [`Container`](CoreContainer)'s
+    /// Remove all associations with `Script` from [`Container`]'s.
     RemoveContainerScriptAssociations(ResourceId),
 
-    /// Update an [`Asset`](Asset).
+    // Remove an [`Asset`].
+    RemoveAsset(ResourceId),
+
+    /// Update an [`Asset`].
     UpdateAsset(Asset),
 
+    UpdateAssetPath {
+        asset: ResourceId,
+        path: ResourcePath,
+    },
+
+    /// Move an `Asset` to another `Container`.  
+    MoveAsset {
+        asset: ResourceId,
+        container: ResourceId,
+        path: ResourcePath,
+    },
+
     SetDragOverContainer(ResourceId),
     ClearDragOverContainer,
+
+    /// Bulk update `Container`s.
+    BulkUpdateContainerProperties(BulkUpdateContainerPropertiesArgs),
+
+    /// Bulk update `Asset`s.
+    BulkUpdateAssetProperties(BulkUpdateAssetPropertiesArgs),
+
+    /// Bulk update resource properties.
+    BulkUpdateResourceProperties(BulkUpdateResourcePropertiesArgs),
+
+    /// Bulk update `Container` `ScriptAssociation`s.
+    BulkUpdateContainerScriptAssociations(BulkUpdateScriptAssociationArgs),
 }
 
 #[derive(PartialEq, Clone)]
@@ -73,6 +127,153 @@ impl GraphState {
             dragover_container: None,
         }
     }
+
+    /// Update a `Container`'s properties.
+    #[tracing::instrument(skip(self))]
+    fn update_container_properties_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &ContainerPropertiesUpdate,
+    ) {
+        let container = self
+            .graph
+            .get_mut(&rid)
+            .expect("could not find `Container`");
+
+        // basic properties
+        if let Some(name) = update.name.as_ref() {
+            container.properties.name = name.clone();
+        }
+
+        if let Some(kind) = update.kind.as_ref() {
+            container.properties.kind = kind.clone();
+        }
+
+        if let Some(description) = update.description.as_ref() {
+            container.properties.description = description.clone();
+        }
+
+        // tags
+        container
+            .properties
+            .tags
+            .append(&mut update.tags.insert.clone());
+
+        container.properties.tags.sort();
+        container.properties.tags.dedup();
+        container
+            .properties
+            .tags
+            .retain(|tag| !update.tags.remove.contains(tag));
+
+        // metadata
+        container
+            .properties
+            .metadata
+            .extend(update.metadata.insert.clone());
+
+        for key in update.metadata.remove.iter() {
+            container.properties.metadata.remove(key);
+        }
+    }
+
+    /// Update an `Assets`'s properties.
+    #[tracing::instrument(skip(self))]
+    fn update_asset_properties_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &AssetPropertiesUpdate,
+    ) {
+        let container = self.asset_map.get(rid).expect("`Asset` map not found");
+        let container = self
+            .graph
+            .get_mut(container)
+            .expect("could not find `Container`");
+
+        let asset = container.assets.get_mut(rid).expect("`Asset` not found");
+
+        // basic properties
+        if let Some(name) = update.name.as_ref() {
+            asset.properties.name = name.clone();
+        }
+
+        if let Some(kind) = update.kind.as_ref() {
+            asset.properties.kind = kind.clone();
+        }
+
+        if let Some(description) = update.description.as_ref() {
+            asset.properties.description = description.clone();
+        }
+
+        // tags
+        asset
+            .properties
+            .tags
+            .append(&mut update.tags.insert.clone());
+
+        asset.properties.tags.sort();
+        asset.properties.tags.dedup();
+        asset
+            .properties
+            .tags
+            .retain(|tag| !update.tags.remove.contains(tag));
+
+        // metadata
+        asset
+            .properties
+            .metadata
+            .extend(update.metadata.insert.clone());
+
+        for key in update.metadata.remove.iter() {
+            asset.properties.metadata.remove(key);
+        }
+    }
+
+    /// Update a `Container`'s `ScriptAssociations`.
+    ///
+    /// # Note
+    /// Updates are processed in the following order:
+    /// 1. New associations are added.
+    /// 2. Present associations are updated.
+    /// 3. Associations are removed.
+    pub fn update_container_script_associations_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &ScriptAssociationsBulkUpdate,
+    ) {
+        let container = self
+            .graph
+            .get_mut(&rid)
+            .expect("could not find `Container`");
+
+        for assoc in update.add.iter() {
+            container.scripts.insert(
+                assoc.script.clone(),
+                RunParameters {
+                    priority: assoc.priority.clone(),
+                    autorun: assoc.autorun.clone(),
+                },
+            );
+        }
+
+        for u in update.update.iter() {
+            let Some(script) = container.scripts.get_mut(&u.script) else {
+                continue;
+            };
+
+            if let Some(priority) = u.priority.as_ref() {
+                script.priority = priority.clone();
+            }
+
+            if let Some(autorun) = u.autorun.as_ref() {
+                script.autorun = autorun.clone();
+            }
+        }
+
+        for script in update.remove.iter() {
+            container.scripts.remove(script);
+        }
+    }
 }
 
 impl Reducible for GraphState {
@@ -87,15 +288,29 @@ impl Reducible for GraphState {
 
         match action {
             GraphStateAction::SetGraph(graph) => {
-                let mut asset_map = AssetContainerMap::new();
+                current.asset_map.clear();
                 for container in graph.nodes().values() {
                     for aid in container.assets.keys() {
-                        asset_map.insert(aid.clone(), container.rid.clone());
+                        current.asset_map.insert(aid.clone(), container.rid.clone());
                     }
                 }
 
                 current.graph = graph;
-                current.asset_map = asset_map;
+            }
+
+            GraphStateAction::RemoveSubtree(root) => {
+                let graph = current.graph.remove(&root).unwrap();
+                for container in graph.nodes().values() {
+                    for asset in container.assets.keys() {
+                        current.asset_map.remove(asset);
+                    }
+                }
+            }
+
+            GraphStateAction::MoveSubtree { parent, root, name } => {
+                current.graph.mv(&root, &parent).unwrap();
+                let root = current.graph.get_mut(&root).unwrap();
+                root.properties.name = name;
             }
 
             GraphStateAction::UpdateContainerProperties(update) => {
@@ -139,6 +354,30 @@ impl Reducible for GraphState {
                     .expect("could not insert child node");
             }
 
+            GraphStateAction::InsertSubtree { parent, graph } => {
+                for container in graph.nodes().values() {
+                    for aid in container.assets.keys() {
+                        current.asset_map.insert(aid.clone(), container.rid.clone());
+                    }
+                }
+
+                current.graph.insert_tree(&parent, graph).unwrap();
+            }
+
+            GraphStateAction::SetContainerAssets(container_rid, assets) => {
+                let Some(container) = current.graph.get_mut(&container_rid) else {
+                    panic!("`Container` not found")
+                };
+
+                container.assets = assets;
+                current.asset_map.clear();
+                for asset in container.assets.keys() {
+                    current
+                        .asset_map
+                        .insert(asset.clone(), container.rid.clone());
+                }
+            }
+
             GraphStateAction::InsertContainerAssets(container, assets) => {
                 let container = current
                     .graph
@@ -154,15 +393,15 @@ impl Reducible for GraphState {
                 }
             }
 
-            GraphStateAction::UpdateContainerAssets(container_rid, assets) => {
-                let Some(container) = current
+            GraphStateAction::RemoveAsset(asset) => {
+                let container = current.asset_map.get(&asset).unwrap();
+                let container = current
                     .graph
-                    .get_mut(&container_rid)
-                     else {
-                        panic!("`Container` not found")
-                    };
+                    .get_mut(container)
+                    .expect("`Container` not found");
 
-                container.assets = assets;
+                container.assets.remove(&asset);
+                current.asset_map.remove(&asset);
             }
 
             GraphStateAction::UpdateAsset(asset) => {
@@ -176,10 +415,34 @@ impl Reducible for GraphState {
                     .get_mut(&container)
                     .expect("`Container` not found");
 
-                // @todo: Ensure `Asset` exists in `Container` before update.
+                // TODO Ensure `Asset` exists in `Container` before update.
                 container.assets.insert(asset.rid.clone(), asset.clone());
             }
 
+            GraphStateAction::UpdateAssetPath { asset, path } => {
+                let container = current.asset_map.get(&asset).unwrap();
+                let container = current.graph.get_mut(container).unwrap();
+                let asset = container.assets.get_mut(&asset).unwrap();
+                asset.path = path;
+            }
+
+            GraphStateAction::MoveAsset {
+                asset,
+                container,
+                path,
+            } => {
+                let container_old = current.asset_map.get(&asset).unwrap();
+                let container_old = current.graph.get_mut(container_old).unwrap();
+                let mut asset = container_old.assets.remove(&asset).unwrap();
+                asset.path = path;
+                current.asset_map.remove(&asset.rid);
+
+                let container = current.graph.get_mut(&container).unwrap();
+                let aid = asset.rid.clone();
+                container.insert_asset(asset);
+                current.asset_map.insert(aid, container.rid.clone());
+            }
+
             GraphStateAction::SetDragOverContainer(rid) => {
                 current.dragover_container = Some(rid);
             }
@@ -187,6 +450,45 @@ impl Reducible for GraphState {
             GraphStateAction::ClearDragOverContainer => {
                 current.dragover_container = None;
             }
+
+            GraphStateAction::BulkUpdateContainerProperties(
+                BulkUpdateContainerPropertiesArgs { rids, update },
+            ) => {
+                for rid in rids {
+                    current.update_container_properties_from_update(&rid, &update);
+                }
+            }
+
+            GraphStateAction::BulkUpdateAssetProperties(BulkUpdateAssetPropertiesArgs {
+                rids,
+                update,
+            }) => {
+                for rid in rids {
+                    current.update_asset_properties_from_update(&rid, &update);
+                }
+            }
+
+            GraphStateAction::BulkUpdateResourceProperties(BulkUpdateResourcePropertiesArgs {
+                rids,
+                update,
+            }) => {
+                for rid in rids {
+                    if self.asset_map.contains_key(&rid) {
+                        current.update_asset_properties_from_update(&rid, &update.clone().into());
+                    } else {
+                        current
+                            .update_container_properties_from_update(&rid, &update.clone().into());
+                    }
+                }
+            }
+
+            GraphStateAction::BulkUpdateContainerScriptAssociations(
+                BulkUpdateScriptAssociationArgs { containers, update },
+            ) => {
+                for container in containers {
+                    current.update_container_script_associations_from_update(&container, &update);
+                }
+            }
         };
 
         current.into()
@@ -194,7 +496,3 @@ impl Reducible for GraphState {
 }
 
 pub type GraphStateReducer = UseReducerHandle<GraphState>;
-
-#[cfg(test)]
-#[path = "./graph_state_test.rs"]
-mod graph_state_test;
diff --git a/desktop/src/components/canvas/graph_state_test.rs b/desktop/src/components/canvas/graph_state_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/layers_bar.rs b/desktop/src/components/canvas/layers_bar.rs
new file mode 100644
index 00000000..f1465b45
--- /dev/null
+++ b/desktop/src/components/canvas/layers_bar.rs
@@ -0,0 +1,323 @@
+//! Layers.
+use crate::components::canvas::selection_action::{selection_action, SelectionAction};
+use crate::components::canvas::{CanvasStateAction, CanvasStateReducer, GraphStateReducer};
+use thot_core::project::Asset as CoreAsset;
+use thot_core::types::ResourceId;
+use thot_ui::widgets::common::asset as asset_ui;
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+const ICON_SIZE: u8 = 16;
+
+/// Properties for [`Assets`].
+#[derive(Properties, PartialEq)]
+struct AssetProps {
+    pub asset: CoreAsset,
+}
+
+#[function_component(Asset)]
+fn asset(props: &AssetProps) -> Html {
+    let canvas_state = use_context::<CanvasStateReducer>().unwrap();
+
+    let selected = canvas_state.selected.contains(&props.asset.rid);
+    let multiple_selected = canvas_state.selected.len() > 1;
+    let onclick = {
+        let canvas_state = canvas_state.clone();
+        let asset = props.asset.rid.clone();
+        let selected = selected.clone();
+        Callback::from(move |e: MouseEvent| {
+            e.prevent_default();
+            e.stop_propagation();
+            let asset = asset.clone();
+
+            match selection_action(selected, multiple_selected, e) {
+                SelectionAction::SelectOnly => {
+                    canvas_state.dispatch(CanvasStateAction::SelectAssetOnly(asset));
+                }
+
+                SelectionAction::Select => {
+                    canvas_state.dispatch(CanvasStateAction::SelectAsset(asset));
+                }
+
+                SelectionAction::Unselect => {
+                    canvas_state.dispatch(CanvasStateAction::Unselect(asset));
+                }
+            }
+        })
+    };
+
+    let name = asset_ui::asset_display_name(&props.asset);
+    let mut class = classes!("layer-asset");
+    if selected {
+        class.push("selected");
+    }
+
+    html! {
+        <div {class} {onclick}>
+            <div class={"info-group"}>
+                <span class={"resource-icon"} style={asset_ui::asset_icon_color(&props.asset)}>
+                    <Icon icon_id={asset_ui::asset_icon_id(&props.asset)}
+                        width={ICON_SIZE.to_string()}
+                        height={ICON_SIZE.to_string()} />
+                </span>
+
+                <span class={"name"} title={name.clone()}>
+                    { name }
+                </span>
+            </div>
+            <div class={"controls-group"}>
+                if let Some(flags) = canvas_state.flags.get(&props.asset.rid) {
+                    <span class={"alert-icon"}
+                        title={flags.iter().map(|msg| format!("\u{2022} {msg}")).collect::<Vec<_>>().join("\n")}>
+
+                        <Icon icon_id={IconId::BootstrapExclamationTriangle}
+                            width={ICON_SIZE.to_string()}
+                            height={ICON_SIZE.to_string()} />
+                    </span>
+                }
+            </div>
+        </div>
+    }
+}
+
+/// Properties for [`Assets`].
+#[derive(Properties, PartialEq)]
+struct AssetsProps {
+    pub assets: Vec<CoreAsset>,
+
+    /// Initial expansion state.
+    #[prop_or(false)]
+    pub expanded: bool,
+}
+
+#[function_component(Assets)]
+fn assets(props: &AssetsProps) -> Html {
+    let expanded_state = use_state(|| props.expanded);
+
+    let toggle_expanded_state = {
+        let expanded_state = expanded_state.clone();
+        Callback::from(move |e: MouseEvent| {
+            e.stop_propagation();
+            expanded_state.set(!*expanded_state);
+        })
+    };
+
+    let mut class = classes!("layer", "assets");
+    if *expanded_state {
+        class.push("expanded")
+    }
+
+    html! {
+        <div {class}>
+            <div class={"layer-title"}>
+                <span class={"layer-expand"}
+                    onclick={toggle_expanded_state}>
+                    if *expanded_state {
+                        <Icon icon_id={IconId::FontAwesomeSolidCaretDown}
+                            width={ICON_SIZE.to_string()}
+                            height={ICON_SIZE.to_string()} />
+                    } else {
+                        <Icon icon_id={IconId::FontAwesomeSolidCaretRight}
+                            width={ICON_SIZE.to_string()}
+                            height={ICON_SIZE.to_string()} />
+                    }
+                </span>
+
+                <span class={"resource-icon"}>
+                    <Icon icon_id={IconId::BootstrapFiles}
+                        width={ICON_SIZE.to_string()}
+                        height={ICON_SIZE.to_string()} />
+                </span>
+
+                <span class={"name"}>{ "Assets" }</span>
+            </div>
+
+            <div class={"layer-assets"}>
+                { props.assets.iter().map(|asset| html! {
+                    <Asset asset={asset.clone()} />
+                }).collect::<Html>()}
+            </div>
+        </div>
+    }
+}
+
+/// Properties for a [`Layer`].
+#[derive(Properties, PartialEq)]
+struct LayerProps {
+    pub root: ResourceId,
+
+    /// Initial expansion state.
+    #[prop_or(false)]
+    pub expanded: bool,
+}
+
+#[function_component(Layer)]
+fn layer(props: &LayerProps) -> Html {
+    let canvas_state = use_context::<CanvasStateReducer>().unwrap();
+    let graph_state = use_context::<GraphStateReducer>().unwrap();
+    let expanded_state = use_state(|| props.expanded);
+
+    let root = graph_state.graph.get(&props.root).unwrap();
+    let children = graph_state.graph.children(&props.root).unwrap();
+    let selected = canvas_state.selected.contains(&props.root);
+    let multiple_selected = canvas_state.selected.len() > 1;
+
+    let toggle_expanded_state = {
+        let expanded_state = expanded_state.clone();
+        Callback::from(move |e: MouseEvent| {
+            e.stop_propagation();
+            expanded_state.set(!*expanded_state);
+        })
+    };
+
+    let onclick = {
+        let canvas_state = canvas_state.clone();
+        let root = props.root.clone();
+        Callback::from(move |e: MouseEvent| {
+            e.prevent_default();
+            e.stop_propagation();
+            let root = root.clone();
+
+            match selection_action(selected, multiple_selected, e) {
+                SelectionAction::SelectOnly => {
+                    canvas_state.dispatch(CanvasStateAction::ClearSelected);
+                    canvas_state.dispatch(CanvasStateAction::SelectContainer(root));
+                }
+
+                SelectionAction::Select => {
+                    canvas_state.dispatch(CanvasStateAction::SelectContainer(root));
+                }
+
+                SelectionAction::Unselect => {
+                    canvas_state.dispatch(CanvasStateAction::Unselect(root));
+                }
+            }
+        })
+    };
+
+    let ondblclick = {
+        let root = props.root.clone();
+        let project = canvas_state.project.clone();
+        Callback::from(move |e: MouseEvent| {
+            e.stop_propagation();
+
+            let window = web_sys::window().unwrap();
+            let document = window.document().unwrap();
+            let container = document
+                .query_selector(&format!(
+                    ".project-canvas[data-rid=\"{project}\"] .container-node[data-rid=\"{root}\"]"
+                ))
+                .unwrap()
+                .unwrap();
+
+            let mut scroll_opts = web_sys::ScrollIntoViewOptions::new();
+            scroll_opts.behavior(web_sys::ScrollBehavior::Smooth);
+            scroll_opts.block(web_sys::ScrollLogicalPosition::Center);
+            scroll_opts.inline(web_sys::ScrollLogicalPosition::Center);
+            container.scroll_into_view_with_scroll_into_view_options(&scroll_opts);
+        })
+    };
+
+    let onclick_toggle_visibility = {
+        let root = root.rid.clone();
+        use_callback(canvas_state.clone(), move |e: MouseEvent, canvas_state| {
+            e.stop_propagation();
+
+            canvas_state.dispatch(CanvasStateAction::SetVisibility(
+                root.clone(),
+                !canvas_state.is_visible(&root),
+            ))
+        })
+    };
+
+    let mut class = classes!("layer");
+    if *expanded_state {
+        class.push("expanded")
+    }
+    if selected {
+        class.push("selected");
+    }
+
+    html! {
+        <div {class}>
+            <div class={"layer-title"}
+                {onclick}
+                {ondblclick} >
+
+                <div class={"info-group"}>
+                    if children.len() > 0 || root.assets.len() > 0 {
+                        <span class={"layer-expand"}
+                            onclick={toggle_expanded_state}>
+                            if *expanded_state {
+                                <Icon icon_id={IconId::FontAwesomeSolidCaretDown}
+                                    width={ICON_SIZE.to_string()}
+                                    height={ICON_SIZE.to_string()} />
+                            } else {
+                                <Icon icon_id={IconId::FontAwesomeSolidCaretRight}
+                                    width={ICON_SIZE.to_string()}
+                                    height={ICON_SIZE.to_string()} />
+                            }
+                        </span>
+                    }
+                    <span class={"resource-icon"}>
+                        <Icon icon_id={IconId::FontAwesomeRegularFolder}
+                            width={ICON_SIZE.to_string()}
+                            height={ICON_SIZE.to_string()} />
+                    </span>
+                    <span class={"name"}
+                        title={root.properties.name.clone()}>
+                        { &root.properties.name }
+                    </span>
+                </div>
+                <div class={"controls-group"}>
+                    if let Some(flags) = canvas_state.flags.get(&props.root) {
+                        <span class={"alert-icon"}
+                            title={flags.iter().map(|msg| format!("\u{2022} {msg}")).collect::<Vec<_>>().join("\n")}>
+
+                            <Icon icon_id={IconId::BootstrapExclamationTriangle}
+                                width={ICON_SIZE.to_string()}
+                                height={ICON_SIZE.to_string()} />
+                        </span>
+                    }
+                    <span class={"visibility-toggle"}
+                        onclick={onclick_toggle_visibility}>
+                        if canvas_state.is_visible(&root.rid) {
+                            <Icon icon_id={IconId::FontAwesomeRegularEye}
+                                width={ICON_SIZE.to_string()}
+                                height={ICON_SIZE.to_string()} />
+                        } else {
+                            <Icon icon_id={IconId::FontAwesomeRegularEyeSlash}
+                                width={ICON_SIZE.to_string()}
+                                height={ICON_SIZE.to_string()} />
+                        }
+                    </span>
+                </div>
+            </div>
+            <div class={"resources"}>
+                if root.assets.len() > 0 {
+                    <Assets assets={root.assets.values().map(|asset| asset.clone()).collect::<Vec<_>>()} />
+                }
+
+                if children.len() > 0 {
+                    <div class={"children"}>
+                        { children.iter().map(|child| html!{
+                            <Layer key={format!("layer-{child}")}
+                                root={child.clone()} />
+                        }).collect::<Html>() }
+                    </div>
+                }
+            </div>
+        </div>
+    }
+}
+
+#[function_component(LayersBar)]
+pub fn layers_bar() -> Html {
+    let graph_state = use_context::<GraphStateReducer>().unwrap();
+    let root = graph_state.graph.root();
+    html! {
+        <div class={"layers-bar"}>
+            <Layer root={root.clone()} expanded={true} />
+        </div>
+    }
+}
diff --git a/desktop/src/components/canvas/mod.rs b/desktop/src/components/canvas/mod.rs
index 7227e0e0..3ee89126 100644
--- a/desktop/src/components/canvas/mod.rs
+++ b/desktop/src/components/canvas/mod.rs
@@ -5,13 +5,11 @@ pub mod canvas_state;
 pub mod container;
 pub mod details_bar;
 pub mod graph_state;
+pub mod layers_bar;
 pub mod project;
+pub mod selection_action;
 
 // Re-exports
 pub use canvas::ProjectCanvas;
 pub use canvas_state::{CanvasStateAction, CanvasStateReducer};
 pub use graph_state::{GraphStateAction, GraphStateReducer};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/mod_test.rs b/desktop/src/components/canvas/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/navbar.rs b/desktop/src/components/canvas/navbar.rs
index 9ca813fc..5327c2d4 100644
--- a/desktop/src/components/canvas/navbar.rs
+++ b/desktop/src/components/canvas/navbar.rs
@@ -68,7 +68,3 @@ pub fn navbar() -> Html {
         <ContainerTreeView root={project.root} />
     }
 }
-
-#[cfg(test)]
-#[path = "./navbar_test.rs"]
-mod navbar_test;
diff --git a/desktop/src/components/canvas/navbar_test.rs b/desktop/src/components/canvas/navbar_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/project/mod.rs b/desktop/src/components/canvas/project/mod.rs
index 58c33768..2f578660 100644
--- a/desktop/src/components/canvas/project/mod.rs
+++ b/desktop/src/components/canvas/project/mod.rs
@@ -5,7 +5,3 @@ pub mod set_data_root;
 // Re-exports
 pub use project::Project;
 pub use set_data_root::SetDataRoot;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/canvas/project/mod_test.rs b/desktop/src/components/canvas/project/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/project/project.rs b/desktop/src/components/canvas/project/project.rs
index c467847b..093c4099 100644
--- a/desktop/src/components/canvas/project/project.rs
+++ b/desktop/src/components/canvas/project/project.rs
@@ -48,7 +48,3 @@ pub fn project(props: &ProjectProps) -> HtmlResult {
 
     })
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/desktop/src/components/canvas/project/project_test.rs b/desktop/src/components/canvas/project/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/project/set_data_root.rs b/desktop/src/components/canvas/project/set_data_root.rs
index e8fc3043..28194a4d 100644
--- a/desktop/src/components/canvas/project/set_data_root.rs
+++ b/desktop/src/components/canvas/project/set_data_root.rs
@@ -1,7 +1,8 @@
 //! Set the data root of a project.
 use crate::app::{ProjectsStateAction, ProjectsStateReducer};
+use crate::commands::common::ResourceIdArgs;
 use crate::commands::graph::InitProjectGraphArgs;
-use crate::commands::project::{GetProjectPathArgs, UpdateProjectArgs};
+use crate::commands::project::UpdateProjectArgs;
 use crate::common::invoke;
 use crate::hooks::use_project;
 use std::path::PathBuf;
@@ -46,19 +47,15 @@ pub fn set_data_root(props: &SetDataRootProps) -> Html {
         let project_path = project_path.clone();
         let pid = props.project.clone();
 
-        use_effect_with_deps(
-            move |_| {
-                spawn_local(async move {
-                    let path =
-                        invoke::<PathBuf>("get_project_path", GetProjectPathArgs { id: pid })
-                            .await
-                            .expect("could not invoke `get_project_path`");
-
-                    project_path.set(Some(path));
-                })
-            },
-            (),
-        )
+        use_effect_with((), move |_| {
+            spawn_local(async move {
+                let path = invoke::<PathBuf>("get_project_path", ResourceIdArgs { rid: pid })
+                    .await
+                    .expect("could not invoke `get_project_path`");
+
+                project_path.set(Some(path));
+            })
+        })
     }
 
     let onsuccess = {
@@ -76,7 +73,7 @@ pub fn set_data_root(props: &SetDataRootProps) -> Html {
                 let project = project.rid.clone();
                 let path = path.clone();
                 spawn_local(async move {
-                    let rid = invoke::<ContainerTree>(
+                    let _rid = invoke::<ContainerTree>(
                         "init_project_graph",
                         InitProjectGraphArgs { path, project },
                     )
@@ -93,7 +90,7 @@ pub fn set_data_root(props: &SetDataRootProps) -> Html {
                 let projects_state = projects_state.clone();
 
                 spawn_local(async move {
-                    let res = invoke::<()>(
+                    let _res = invoke::<()>(
                         "update_project",
                         UpdateProjectArgs {
                             project: project.clone(),
@@ -128,7 +125,3 @@ pub fn set_data_root(props: &SetDataRootProps) -> Html {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./set_data_root_test.rs"]
-mod set_data_root_test;
diff --git a/desktop/src/components/canvas/project/set_data_root_test.rs b/desktop/src/components/canvas/project/set_data_root_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/canvas/selection_action.rs b/desktop/src/components/canvas/selection_action.rs
new file mode 100644
index 00000000..e357ce79
--- /dev/null
+++ b/desktop/src/components/canvas/selection_action.rs
@@ -0,0 +1,34 @@
+//! Selection action based on click event.
+use yew::prelude::MouseEvent;
+
+pub enum SelectionAction {
+    SelectOnly,
+    Select,
+    Unselect,
+}
+
+/// Determines the selection action from the current action and state.
+///
+/// # Arguments
+/// 1. If the clicked resource is currently selected.
+/// 2. If at least one other resource is currently selected.
+/// 3. The [`MouseEvent`].
+pub fn selection_action(selected: bool, multiple: bool, e: MouseEvent) -> SelectionAction {
+    if e.shift_key() {
+        if selected {
+            return SelectionAction::Unselect;
+        } else {
+            return SelectionAction::Select;
+        }
+    }
+
+    if selected {
+        if multiple {
+            return SelectionAction::SelectOnly;
+        }
+
+        return SelectionAction::Unselect;
+    }
+
+    SelectionAction::SelectOnly
+}
diff --git a/desktop/src/components/dashboard/mod.rs b/desktop/src/components/dashboard/mod.rs
index 31c10ce7..39cd4f1f 100644
--- a/desktop/src/components/dashboard/mod.rs
+++ b/desktop/src/components/dashboard/mod.rs
@@ -3,7 +3,3 @@ pub mod sidebar;
 
 // Re-exports
 pub use sidebar::Sidebar;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/dashboard/mod_test.rs b/desktop/src/components/dashboard/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/project/create_project.rs b/desktop/src/components/dashboard/project/create_project.rs
index a5853221..a5ff74d5 100644
--- a/desktop/src/components/dashboard/project/create_project.rs
+++ b/desktop/src/components/dashboard/project/create_project.rs
@@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
 use thot_core::graph::ResourceTree;
 use thot_core::project::{Container, Project};
 use thot_core::types::{Creator, ResourceId, UserId};
-use thot_local::project::types::ProjectSettings;
+use thot_local::types::ProjectSettings;
 use thot_ui::components::{file_selector::FileSelectorProps, FileSelector, FileSelectorAction};
 use thot_ui::types::Message;
 use wasm_bindgen_futures::spawn_local;
@@ -41,7 +41,9 @@ pub fn create_project() -> Html {
     let user = use_user();
     let Some(user) = user.as_ref() else {
         navigator.push(&Route::SignIn);
-        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user.")));
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Could not get user.",
+        )));
         return html! {};
     };
 
@@ -63,23 +65,31 @@ pub fn create_project() -> Html {
             spawn_local(async move {
                 // TODO[m]: Validate path is not already a project.
                 // init project
-                let Ok(_rid) = invoke::<ResourceId>("init_project", PathBufArgs { path: path.clone() })
-                    .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not create project")));
-                        return;
-                    };
-
-                let Ok((mut project, settings)) =
-                    invoke::<(Project, ProjectSettings)>("load_project", PathBufArgs { path: path.clone() })
-                        .await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not load project")));
-                        return;
-                    };
+                let Ok(_rid) =
+                    invoke::<ResourceId>("init_project", PathBufArgs { path: path.clone() }).await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not create project",
+                    )));
+                    return;
+                };
+
+                let Ok((mut project, settings)) = invoke::<(Project, ProjectSettings)>(
+                    "load_project",
+                    PathBufArgs { path: path.clone() },
+                )
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not load project",
+                    )));
+                    return;
+                };
 
                 // initialize data root as container
                 let mut data_root_abs = path.clone();
                 let data_root_rel = Path::new("data");
-                data_root_abs.push(data_root_rel.clone());
+                data_root_abs.push(data_root_rel);
 
                 // TODO[l]: Could load graph here.
                 let Ok(_graph) = invoke::<ContainerTree>(
@@ -88,23 +98,29 @@ pub fn create_project() -> Html {
                         path: data_root_abs.clone(),
                         project: project.rid.clone(),
                     },
-                ).await else {
-                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not create project graph.")));
+                )
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not create project graph.",
+                    )));
                     return;
                 };
 
                 // save project
                 project.data_root = Some(data_root_rel.to_path_buf());
                 project.creator = Creator::User(Some(UserId::Id(user)));
-                tracing::debug!(?project);
                 let Ok(_) = invoke::<()>(
                     "update_project",
                     UpdateProjectArgs {
                         project: project.clone(),
                     },
                 )
-                .await else {
-                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not update project")));
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not update project",
+                    )));
                     return;
                 };
 
@@ -141,7 +157,3 @@ pub fn create_project() -> Html {
         <FileSelector ..props />
     }
 }
-
-#[cfg(test)]
-#[path = "./create_project_test.rs"]
-mod create_project_test;
diff --git a/desktop/src/components/dashboard/project/create_project_test.rs b/desktop/src/components/dashboard/project/create_project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/project/import_project.rs b/desktop/src/components/dashboard/project/import_project.rs
index a2390267..1970524c 100644
--- a/desktop/src/components/dashboard/project/import_project.rs
+++ b/desktop/src/components/dashboard/project/import_project.rs
@@ -4,9 +4,8 @@ use crate::commands::common::PathBufArgs;
 use crate::common::invoke;
 use crate::routes::Route;
 use std::path::PathBuf;
-use thot_core::graph::ResourceTree;
-use thot_core::project::{Container, Project};
-use thot_local::project::types::ProjectSettings;
+use thot_core::project::Project;
+use thot_local::types::ProjectSettings;
 use thot_ui::components::{file_selector::FileSelectorProps, FileSelector, FileSelectorAction};
 use thot_ui::types::Message;
 use wasm_bindgen_futures::spawn_local;
@@ -18,8 +17,6 @@ use yew_router::prelude::*;
 // *** Import Project Component ***
 // ********************************
 
-type ContainerTree = ResourceTree<Container>;
-
 /// Import project component.
 #[function_component(ImportProject)]
 pub fn import_project() -> Html {
@@ -42,12 +39,18 @@ pub fn import_project() -> Html {
 
             // import and go to project
             spawn_local(async move {
-                let Ok(project) = invoke::<(Project, ProjectSettings)>("add_project", PathBufArgs { path: path.clone() })
-                    .await else {
-                        web_sys::console::error_1(&"could not add project".into());
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not import project")));
-                        return;
-                    };
+                let Ok(project) = invoke::<(Project, ProjectSettings)>(
+                    "add_project",
+                    PathBufArgs { path: path.clone() },
+                )
+                .await
+                else {
+                    web_sys::console::error_1(&"could not add project".into());
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not import project",
+                    )));
+                    return;
+                };
 
                 // update ui
                 let rid = project.0.rid.clone();
@@ -82,7 +85,3 @@ pub fn import_project() -> Html {
         <FileSelector ..props />
     }
 }
-
-#[cfg(test)]
-#[path = "./import_project_test.rs"]
-mod import_project_test;
diff --git a/desktop/src/components/dashboard/project/import_project_test.rs b/desktop/src/components/dashboard/project/import_project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/project/initialize_project.rs b/desktop/src/components/dashboard/project/initialize_project.rs
new file mode 100644
index 00000000..88d95ecd
--- /dev/null
+++ b/desktop/src/components/dashboard/project/initialize_project.rs
@@ -0,0 +1,101 @@
+use crate::app::{AppStateAction, AppStateReducer, ProjectsStateAction, ProjectsStateReducer};
+use crate::commands::common::PathBufArgs;
+use crate::common::invoke;
+use crate::hooks::use_user;
+use crate::routes::Route;
+use std::path::PathBuf;
+use thot_core::project::Project;
+use thot_core::types::ResourceId;
+use thot_local::types::ProjectSettings;
+use thot_ui::components::{file_selector::FileSelectorProps, FileSelector, FileSelectorAction};
+use thot_ui::types::Message;
+use wasm_bindgen_futures::spawn_local;
+use yew::prelude::*;
+use yew::props;
+use yew_router::prelude::*;
+
+#[function_component(InitializeProject)]
+pub fn initialize_project() -> Html {
+    let navigator = use_navigator().expect("navigator not found");
+    let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
+    let projects_state =
+        use_context::<ProjectsStateReducer>().expect("`ProjectsStateReducer` context not found");
+
+    let user = use_user();
+    let Some(user) = user.as_ref() else {
+        navigator.push(&Route::SignIn);
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Could not get user.",
+        )));
+        return html! {};
+    };
+
+    let onsuccess = {
+        let app_state = app_state.clone();
+        let projects_state = projects_state.clone();
+        let navigator = navigator.clone();
+        let user = user.rid.clone();
+
+        Callback::from(move |path: PathBuf| {
+            let app_state = app_state.clone();
+            let projects_state = projects_state.clone();
+            let navigator = navigator.clone();
+            let user = user.clone();
+
+            app_state.dispatch(AppStateAction::SetActiveWidget(None)); // close self
+            spawn_local(async move {
+                let Ok(_rid) =
+                    invoke::<ResourceId>("init_project_from", PathBufArgs { path: path.clone() })
+                        .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not create project",
+                    )));
+                    return;
+                };
+
+                let Ok((mut project, settings)) = invoke::<(Project, ProjectSettings)>(
+                    "load_project",
+                    PathBufArgs { path: path.clone() },
+                )
+                .await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not load project",
+                    )));
+                    return;
+                };
+
+                // update ui
+                let rid = project.rid.clone();
+                projects_state.dispatch(ProjectsStateAction::InsertProject((project, settings)));
+                projects_state.dispatch(ProjectsStateAction::AddOpenProject(rid.clone()));
+                projects_state.dispatch(ProjectsStateAction::SetActiveProject(rid));
+
+                navigator.push(&Route::Workspace);
+            });
+        })
+    };
+
+    let oncancel = {
+        let app_state = app_state.clone();
+
+        Callback::from(move |_| {
+            app_state.dispatch(AppStateAction::SetActiveWidget(None));
+        })
+    };
+
+    let props = props! {
+        FileSelectorProps {
+            title: "Select project directory",
+            action: FileSelectorAction::PickFolder,
+            show_cancel: false,
+            onsuccess,
+            oncancel,
+        }
+    };
+
+    html! {
+        <FileSelector ..props />
+    }
+}
diff --git a/desktop/src/components/dashboard/project/mod.rs b/desktop/src/components/dashboard/project/mod.rs
index 607ac6ca..54df656d 100644
--- a/desktop/src/components/dashboard/project/mod.rs
+++ b/desktop/src/components/dashboard/project/mod.rs
@@ -1,11 +1,9 @@
 //! Project related components.
 pub mod create_project;
 pub mod import_project;
+pub mod initialize_project;
 
 // Re-exports
 pub use create_project::CreateProject;
 pub use import_project::ImportProject;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub use initialize_project::InitializeProject;
diff --git a/desktop/src/components/dashboard/project/mod_test.rs b/desktop/src/components/dashboard/project/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/sidebar/commands.rs b/desktop/src/components/dashboard/sidebar/commands.rs
index 32b11c87..c1586f35 100644
--- a/desktop/src/components/dashboard/sidebar/commands.rs
+++ b/desktop/src/components/dashboard/sidebar/commands.rs
@@ -66,7 +66,3 @@ pub fn commands() -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./commands_test.rs"]
-mod commands_test;
diff --git a/desktop/src/components/dashboard/sidebar/commands_test.rs b/desktop/src/components/dashboard/sidebar/commands_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/sidebar/mod.rs b/desktop/src/components/dashboard/sidebar/mod.rs
index 4ed9ade5..6c983c8d 100644
--- a/desktop/src/components/dashboard/sidebar/mod.rs
+++ b/desktop/src/components/dashboard/sidebar/mod.rs
@@ -6,7 +6,3 @@ pub mod sidebar;
 
 // Re-exports
 pub use sidebar::Sidebar;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/dashboard/sidebar/mod_test.rs b/desktop/src/components/dashboard/sidebar/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/sidebar/project_list.rs b/desktop/src/components/dashboard/sidebar/project_list.rs
index 9e7378d3..bddddf56 100644
--- a/desktop/src/components/dashboard/sidebar/project_list.rs
+++ b/desktop/src/components/dashboard/sidebar/project_list.rs
@@ -58,7 +58,3 @@ pub fn project_list(props: &ProjectListProps) -> HtmlResult {
         </ol>
     })
 }
-
-#[cfg(test)]
-#[path = "./project_list_test.rs"]
-mod project_list_test;
diff --git a/desktop/src/components/dashboard/sidebar/project_list_test.rs b/desktop/src/components/dashboard/sidebar/project_list_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/sidebar/script_list.rs b/desktop/src/components/dashboard/sidebar/script_list.rs
index b55ed189..65136e45 100644
--- a/desktop/src/components/dashboard/sidebar/script_list.rs
+++ b/desktop/src/components/dashboard/sidebar/script_list.rs
@@ -7,7 +7,3 @@ pub fn script_list() -> Html {
         { "Scripts" }
     }
 }
-
-#[cfg(test)]
-#[path = "./script_list_test.rs"]
-mod script_list_test;
diff --git a/desktop/src/components/dashboard/sidebar/script_list_test.rs b/desktop/src/components/dashboard/sidebar/script_list_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/dashboard/sidebar/sidebar.rs b/desktop/src/components/dashboard/sidebar/sidebar.rs
index b4abcfc0..9df43392 100644
--- a/desktop/src/components/dashboard/sidebar/sidebar.rs
+++ b/desktop/src/components/dashboard/sidebar/sidebar.rs
@@ -62,7 +62,3 @@ pub fn sidebar() -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./sidebar_test.rs"]
-mod sidebar_test;
diff --git a/desktop/src/components/dashboard/sidebar/sidebar_test.rs b/desktop/src/components/dashboard/sidebar/sidebar_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/excel_template/excel_template.rs b/desktop/src/components/excel_template/excel_template.rs
new file mode 100644
index 00000000..57c8ddcd
--- /dev/null
+++ b/desktop/src/components/excel_template/excel_template.rs
@@ -0,0 +1,12 @@
+//! Excel template builder.
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct ExcelTemplateProps {}
+
+#[function_component(ExcelTemplate)]
+pub fn excel_template(props: &ExcelTemplateProps) -> Html {
+    html! {
+        { "Excel Template Builder"}
+    }
+}
diff --git a/desktop/src/components/excel_template/mod.rs b/desktop/src/components/excel_template/mod.rs
new file mode 100644
index 00000000..a4dd493a
--- /dev/null
+++ b/desktop/src/components/excel_template/mod.rs
@@ -0,0 +1,4 @@
+//! Interface to build Excel analysis template.
+pub mod excel_template;
+
+pub use excel_template::ExcelTemplate;
diff --git a/desktop/src/components/messages.rs b/desktop/src/components/messages.rs
index 07376ebd..dd402ea1 100644
--- a/desktop/src/components/messages.rs
+++ b/desktop/src/components/messages.rs
@@ -30,12 +30,9 @@ pub fn messages() -> Html {
                     class={classes!("clickable")}
                     kind={m.kind.clone()}
                     message={m.message.clone()}
+                    details={m.details.clone()}
                     onclick={onclick(m.id())} />
             }).collect::<Html>() }
         </MessagesUi>
     }
 }
-
-#[cfg(test)]
-#[path = "./messages_test.rs"]
-mod messages_test;
diff --git a/desktop/src/components/messages_test.rs b/desktop/src/components/messages_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/mod.rs b/desktop/src/components/mod.rs
index f22ad71e..d03fd30c 100644
--- a/desktop/src/components/mod.rs
+++ b/desktop/src/components/mod.rs
@@ -1,9 +1,6 @@
 //! App components.
 pub mod canvas;
 pub mod dashboard;
+pub mod excel_template;
 pub mod messages;
 pub mod settings;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/mod_test.rs b/desktop/src/components/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/settings/general/mod.rs b/desktop/src/components/settings/general/mod.rs
index 42d07006..d724f07f 100644
--- a/desktop/src/components/settings/general/mod.rs
+++ b/desktop/src/components/settings/general/mod.rs
@@ -7,7 +7,3 @@ pub fn general_settings() -> Html {
         <h2>{ "General" }</h2>
     }
 }
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/settings/general/mod_test.rs b/desktop/src/components/settings/general/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/settings/mod.rs b/desktop/src/components/settings/mod.rs
index 6bd33036..471a09fe 100644
--- a/desktop/src/components/settings/mod.rs
+++ b/desktop/src/components/settings/mod.rs
@@ -4,7 +4,3 @@ pub mod settings;
 
 // Re-exports
 pub use settings::Settings;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/components/settings/mod_test.rs b/desktop/src/components/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/components/settings/settings.rs b/desktop/src/components/settings/settings.rs
index 2e38aa9b..bfcbe759 100644
--- a/desktop/src/components/settings/settings.rs
+++ b/desktop/src/components/settings/settings.rs
@@ -11,7 +11,3 @@ pub fn settings() -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./settings_test.rs"]
-mod settings_test;
diff --git a/desktop/src/components/settings/settings_test.rs b/desktop/src/components/settings/settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/constants.rs b/desktop/src/constants.rs
index c6917ad5..71d4d0ea 100644
--- a/desktop/src/constants.rs
+++ b/desktop/src/constants.rs
@@ -1,7 +1,3 @@
 //! Constat values.
 pub static MESSAGE_TIMEOUT: u32 = 5_000;
 pub static SCRIPT_DISPLAY_NAME_MAX_LENGTH: usize = 30;
-
-#[cfg(test)]
-#[path = "./constants_test.rs"]
-mod constants_test;
diff --git a/desktop/src/constants_test.rs b/desktop/src/constants_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/error.rs b/desktop/src/error.rs
index f8b8bd85..c57aa574 100644
--- a/desktop/src/error.rs
+++ b/desktop/src/error.rs
@@ -88,7 +88,3 @@ impl From<JsValue> for Error {
 
 /// Crate result.
 pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/desktop/src/error_test.rs b/desktop/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/asset.rs b/desktop/src/hooks/asset.rs
index 33beb451..014209b5 100644
--- a/desktop/src/hooks/asset.rs
+++ b/desktop/src/hooks/asset.rs
@@ -26,40 +26,30 @@ pub fn use_asset(rid: &ResourceId) -> UseStateHandle<Asset> {
             .expect("`Asset` not found")
             .clone()
     });
-    tracing::debug!(?asset);
 
     {
         let rid = rid.clone();
         let asset = asset.clone();
         let graph_state = graph_state.clone();
-        use_effect_with_deps(
-            move |(rid, graph_state)| {
-                let container = graph_state
-                    .asset_map
+        use_effect_with((rid, graph_state), move |(rid, graph_state)| {
+            let container = graph_state
+                .asset_map
+                .get(rid)
+                .expect("`Asset`'s `Container` not found");
+
+            let container = graph_state
+                .graph
+                .get(container)
+                .expect("`Container` not found");
+
+            asset.set(
+                container
+                    .assets
                     .get(rid)
-                    .expect("`Asset`'s `Container` not found");
-
-                let container = graph_state
-                    .graph
-                    .get(container)
-                    .expect("`Container` not found");
-
-                asset.set(
-                    container
-                        .assets
-                        .get(rid)
-                        .expect("`Asset` not found")
-                        .clone(),
-                );
-
-                tracing::debug!("Asset updated via use effect {:?}", asset);
-            },
-            (rid, graph_state),
-        )
+                    .expect("`Asset` not found")
+                    .clone(),
+            );
+        })
     }
     asset
 }
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/desktop/src/hooks/asset_test.rs b/desktop/src/hooks/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/canvas_state/details_bar_widget.rs b/desktop/src/hooks/canvas_state/details_bar_widget.rs
index 889aff14..9b450e45 100644
--- a/desktop/src/hooks/canvas_state/details_bar_widget.rs
+++ b/desktop/src/hooks/canvas_state/details_bar_widget.rs
@@ -14,17 +14,10 @@ pub fn use_details_bar_widget() -> UseStateHandle<Option<DetailsBarWidget>> {
         let canvas_state = canvas_state.clone();
         let details_bar_widget = details_bar_widget.clone();
 
-        use_effect_with_deps(
-            move |canvas_state| {
-                details_bar_widget.set(canvas_state.details_bar_widget.clone());
-            },
-            canvas_state,
-        );
+        use_effect_with(canvas_state, move |canvas_state| {
+            details_bar_widget.set(canvas_state.details_bar_widget.clone());
+        });
     };
 
     details_bar_widget
 }
-
-#[cfg(test)]
-#[path = "./details_bar_widget_test.rs"]
-mod details_bar_widget_test;
diff --git a/desktop/src/hooks/canvas_state/details_bar_widget_test.rs b/desktop/src/hooks/canvas_state/details_bar_widget_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/canvas_state/graph.rs b/desktop/src/hooks/canvas_state/graph.rs
index 5eb7020c..b23d0b06 100644
--- a/desktop/src/hooks/canvas_state/graph.rs
+++ b/desktop/src/hooks/canvas_state/graph.rs
@@ -44,7 +44,3 @@ pub fn use_project_graph(project: &ResourceId) -> SuspensionResult<ContainerTree
 
     Err(s)
 }
-
-#[cfg(test)]
-#[path = "./graph_test.rs"]
-mod graph_test;
diff --git a/desktop/src/hooks/canvas_state/graph_test.rs b/desktop/src/hooks/canvas_state/graph_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/canvas_state/mod.rs b/desktop/src/hooks/canvas_state/mod.rs
index d2885e90..df6afeb0 100644
--- a/desktop/src/hooks/canvas_state/mod.rs
+++ b/desktop/src/hooks/canvas_state/mod.rs
@@ -7,7 +7,3 @@ pub mod project;
 pub use details_bar_widget::use_details_bar_widget;
 pub use graph::use_project_graph;
 pub use project::use_canvas_project;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/hooks/canvas_state/mod_test.rs b/desktop/src/hooks/canvas_state/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/canvas_state/project.rs b/desktop/src/hooks/canvas_state/project.rs
index 40d648a8..3ce6a26b 100644
--- a/desktop/src/hooks/canvas_state/project.rs
+++ b/desktop/src/hooks/canvas_state/project.rs
@@ -15,17 +15,10 @@ pub fn use_canvas_project() -> UseStateHandle<ResourceId> {
         let canvas_state = canvas_state.clone();
         let project = project.clone();
 
-        use_effect_with_deps(
-            move |canvas_state| {
-                project.set(canvas_state.project.clone());
-            },
-            canvas_state,
-        );
+        use_effect_with(canvas_state, move |canvas_state| {
+            project.set(canvas_state.project.clone());
+        });
     };
 
     project
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/desktop/src/hooks/canvas_state/project_test.rs b/desktop/src/hooks/canvas_state/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/container_path.rs b/desktop/src/hooks/container_path.rs
index 6150949c..f5b5ce07 100644
--- a/desktop/src/hooks/container_path.rs
+++ b/desktop/src/hooks/container_path.rs
@@ -31,7 +31,3 @@ pub fn use_container_path(rid: ResourceId) -> SuspensionResult<PathBuf> {
 
     Err(s)
 }
-
-#[cfg(test)]
-#[path = "./container_path_test.rs"]
-mod container_path_test;
diff --git a/desktop/src/hooks/container_path_test.rs b/desktop/src/hooks/container_path_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/container_tree_state/container.rs b/desktop/src/hooks/container_tree_state/container.rs
index 606df281..790f25ba 100644
--- a/desktop/src/hooks/container_tree_state/container.rs
+++ b/desktop/src/hooks/container_tree_state/container.rs
@@ -23,23 +23,16 @@ pub fn use_container(rid: ResourceId) -> UseStateHandle<CoreContainer> {
         let tree_state = tree_state.clone();
         let container = container.clone();
 
-        use_effect_with_deps(
-            move |(rid, tree_state)| {
-                container.set(
-                    tree_state
-                        .tree
-                        .get(&rid)
-                        .cloned()
-                        .expect("`Container` not found"),
-                )
-            },
-            (rid, tree_state),
-        )
+        use_effect_with((rid, tree_state), move |(rid, tree_state)| {
+            container.set(
+                tree_state
+                    .tree
+                    .get(&rid)
+                    .cloned()
+                    .expect("`Container` not found"),
+            )
+        })
     }
 
     container
 }
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/desktop/src/hooks/container_tree_state/container_test.rs b/desktop/src/hooks/container_tree_state/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/container_tree_state/mod.rs b/desktop/src/hooks/container_tree_state/mod.rs
index 30eda044..1b38ff32 100644
--- a/desktop/src/hooks/container_tree_state/mod.rs
+++ b/desktop/src/hooks/container_tree_state/mod.rs
@@ -1,10 +1 @@
 //! `ContainerTreeState` hooks.
-// @remove
-// pub mod container;
-
-// Re-exports
-// pub use container::use_container;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/hooks/container_tree_state/mod_test.rs b/desktop/src/hooks/container_tree_state/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/mod.rs b/desktop/src/hooks/mod.rs
index 4deb29db..2e60ec46 100644
--- a/desktop/src/hooks/mod.rs
+++ b/desktop/src/hooks/mod.rs
@@ -11,11 +11,5 @@ pub mod user;
 pub use asset::use_asset;
 pub use canvas_state::*;
 pub use container_path::use_container_path;
-pub use container_tree_state::*;
 pub use projects_state::*;
-pub use settings::*;
 pub use user::use_user;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/hooks/mod_test.rs b/desktop/src/hooks/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/active_project.rs b/desktop/src/hooks/projects_state/active_project.rs
index 73eac3b8..920b9215 100644
--- a/desktop/src/hooks/projects_state/active_project.rs
+++ b/desktop/src/hooks/projects_state/active_project.rs
@@ -14,17 +14,10 @@ pub fn use_active_project() -> UseStateHandle<Option<ResourceId>> {
         let projects_state = projects_state.clone();
         let active_project = active_project.clone();
 
-        use_effect_with_deps(
-            move |projects_state| {
-                active_project.set(projects_state.active_project.clone());
-            },
-            projects_state,
-        );
+        use_effect_with(projects_state, move |projects_state| {
+            active_project.set(projects_state.active_project.clone());
+        });
     };
 
     active_project
 }
-
-#[cfg(test)]
-#[path = "./active_project_test.rs"]
-mod active_project_test;
diff --git a/desktop/src/hooks/projects_state/active_project_test.rs b/desktop/src/hooks/projects_state/active_project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/load_project_scripts.rs b/desktop/src/hooks/projects_state/load_project_scripts.rs
index b5293602..ab048034 100644
--- a/desktop/src/hooks/projects_state/load_project_scripts.rs
+++ b/desktop/src/hooks/projects_state/load_project_scripts.rs
@@ -46,7 +46,3 @@ pub fn use_load_project_scripts(project: &ResourceId) -> SuspensionResult<()> {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./load_project_scripts_test.rs"]
-mod load_project_scripts_test;
diff --git a/desktop/src/hooks/projects_state/load_project_scripts_test.rs b/desktop/src/hooks/projects_state/load_project_scripts_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/mod.rs b/desktop/src/hooks/projects_state/mod.rs
index ab8c969c..269f1b37 100644
--- a/desktop/src/hooks/projects_state/mod.rs
+++ b/desktop/src/hooks/projects_state/mod.rs
@@ -11,7 +11,3 @@ pub use load_project_scripts::use_load_project_scripts;
 pub use open_projects::use_open_projects;
 pub use project::use_project;
 pub use user_projects::use_user_projects;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/hooks/projects_state/mod_test.rs b/desktop/src/hooks/projects_state/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/open_projects.rs b/desktop/src/hooks/projects_state/open_projects.rs
index 04bc7984..58f3f586 100644
--- a/desktop/src/hooks/projects_state/open_projects.rs
+++ b/desktop/src/hooks/projects_state/open_projects.rs
@@ -15,17 +15,10 @@ pub fn use_open_projects() -> UseStateHandle<IndexSet<ResourceId>> {
         let projects_state = projects_state.clone();
         let open_projects = open_projects.clone();
 
-        use_effect_with_deps(
-            move |projects_state| {
-                open_projects.set(projects_state.open_projects.clone());
-            },
-            projects_state,
-        );
+        use_effect_with(projects_state, move |projects_state| {
+            open_projects.set(projects_state.open_projects.clone());
+        });
     };
 
     open_projects
 }
-
-#[cfg(test)]
-#[path = "./open_projects_test.rs"]
-mod open_projects_test;
diff --git a/desktop/src/hooks/projects_state/open_projects_test.rs b/desktop/src/hooks/projects_state/open_projects_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/project.rs b/desktop/src/hooks/projects_state/project.rs
index f5e01b8f..e33f88bd 100644
--- a/desktop/src/hooks/projects_state/project.rs
+++ b/desktop/src/hooks/projects_state/project.rs
@@ -18,17 +18,10 @@ pub fn use_project(rid: &ResourceId) -> UseStateHandle<Option<Project>> {
         let projects_state = projects_state.clone();
         let project = project.clone();
 
-        use_effect_with_deps(
-            move |projects_state| {
-                project.set(projects_state.projects.get(&rid).cloned());
-            },
-            projects_state,
-        );
+        use_effect_with(projects_state, move |projects_state| {
+            project.set(projects_state.projects.get(&rid).cloned());
+        });
     }
 
     project
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/desktop/src/hooks/projects_state/project_test.rs b/desktop/src/hooks/projects_state/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/projects_state/user_projects.rs b/desktop/src/hooks/projects_state/user_projects.rs
index 6671a210..abe363e8 100644
--- a/desktop/src/hooks/projects_state/user_projects.rs
+++ b/desktop/src/hooks/projects_state/user_projects.rs
@@ -23,19 +23,16 @@ pub fn use_user_projects(user: &ResourceId) -> UseStateHandle<Vec<Project>> {
         let user = user.clone();
         let user_projects = user_projects.clone();
 
-        use_effect_with_deps(
-            move |projects_state| {
-                let projects =
-                    filter_user_projects(&user, &projects_state.projects, &projects_state.settings)
-                        .clone()
-                        .into_iter()
-                        .map(|project| project.clone())
-                        .collect();
-
-                user_projects.set(projects);
-            },
-            projects_state,
-        );
+        use_effect_with(projects_state, move |projects_state| {
+            let projects =
+                filter_user_projects(&user, &projects_state.projects, &projects_state.settings)
+                    .clone()
+                    .into_iter()
+                    .map(|project| project.clone())
+                    .collect();
+        
+            user_projects.set(projects);
+        });
     }
 
     user_projects
@@ -63,7 +60,3 @@ fn filter_user_projects<'a>(
         })
         .collect::<Vec<&Project>>()
 }
-
-#[cfg(test)]
-#[path = "./user_projects_test.rs"]
-mod user_projects_test;
diff --git a/desktop/src/hooks/projects_state/user_projects_test.rs b/desktop/src/hooks/projects_state/user_projects_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/settings/mod.rs b/desktop/src/hooks/settings/mod.rs
index b9523901..4490fe39 100644
--- a/desktop/src/hooks/settings/mod.rs
+++ b/desktop/src/hooks/settings/mod.rs
@@ -1,5 +1 @@
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
 pub mod user_settings;
diff --git a/desktop/src/hooks/settings/mod_test.rs b/desktop/src/hooks/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/settings/user_settings.rs b/desktop/src/hooks/settings/user_settings.rs
index 86e544de..8b137891 100644
--- a/desktop/src/hooks/settings/user_settings.rs
+++ b/desktop/src/hooks/settings/user_settings.rs
@@ -1,4 +1 @@
 
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/desktop/src/hooks/settings/user_settings_test.rs b/desktop/src/hooks/settings/user_settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/hooks/user.rs b/desktop/src/hooks/user.rs
index 3a71ab68..14f02586 100644
--- a/desktop/src/hooks/user.rs
+++ b/desktop/src/hooks/user.rs
@@ -14,17 +14,10 @@ pub fn use_user() -> UseStateHandle<Option<User>> {
         let auth_state = auth_state.clone();
         let user = user.clone();
 
-        use_effect_with_deps(
-            move |auth_state| {
-                user.set(auth_state.user.clone());
-            },
-            auth_state,
-        );
+        use_effect_with(auth_state, move |auth_state| {
+            user.set(auth_state.user.clone());
+        });
     }
 
     user
 }
-
-#[cfg(test)]
-#[path = "./user_test.rs"]
-mod user_test;
diff --git a/desktop/src/hooks/user_test.rs b/desktop/src/hooks/user_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/main.rs b/desktop/src/main.rs
index b5da3510..e568c1f7 100644
--- a/desktop/src/main.rs
+++ b/desktop/src/main.rs
@@ -12,7 +12,6 @@ mod pages;
 mod routes;
 mod widgets;
 
-use app::App;
 pub use error::Result;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::fmt::format::Pretty;
@@ -39,5 +38,5 @@ fn main() {
         .with(perf_layer)
         .init();
 
-    yew::Renderer::<App>::new().render();
+    yew::Renderer::<app::App>::new().render();
 }
diff --git a/desktop/src/navigation/main.rs b/desktop/src/navigation/main.rs
index fdf84655..7369f4a1 100644
--- a/desktop/src/navigation/main.rs
+++ b/desktop/src/navigation/main.rs
@@ -37,17 +37,14 @@ pub fn main_navigation() -> Html {
         let open_projects = open_projects.clone();
         let user_projects = user_projects.clone();
 
-        use_effect_with_deps(
-            move |open_projects| {
-                let projects = user_projects
-                    .iter()
-                    .filter(|prj| open_projects.contains(&prj.rid))
-                    .collect::<Vec<&Project>>();
-
-                tabs.set(projects_to_tabs(projects));
-            },
-            open_projects,
-        );
+        use_effect_with(open_projects, move |open_projects| {
+            let projects = user_projects
+                .iter()
+                .filter(|prj| open_projects.contains(&prj.rid))
+                .collect::<Vec<&Project>>();
+        
+            tabs.set(projects_to_tabs(projects));
+        });
     }
 
     // -----------------
@@ -112,7 +109,3 @@ fn projects_to_tabs(projects: Vec<&Project>) -> IndexMap<ResourceId, String> {
         .map(|p| (p.rid.clone(), p.name.clone()))
         .collect::<IndexMap<ResourceId, String>>()
 }
-
-#[cfg(test)]
-#[path = "./main_test.rs"]
-mod main_test;
diff --git a/desktop/src/navigation/main_test.rs b/desktop/src/navigation/main_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/navigation/mod.rs b/desktop/src/navigation/mod.rs
index 57393b39..6a6fb256 100644
--- a/desktop/src/navigation/mod.rs
+++ b/desktop/src/navigation/mod.rs
@@ -3,7 +3,3 @@ pub mod main;
 
 // Re-exports
 pub use main::MainNavigation;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/navigation/mod_test.rs b/desktop/src/navigation/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/authenticate/mod.rs b/desktop/src/pages/authenticate/mod.rs
index 1d4bf9e4..001a811d 100644
--- a/desktop/src/pages/authenticate/mod.rs
+++ b/desktop/src/pages/authenticate/mod.rs
@@ -4,7 +4,3 @@ pub mod sign_up;
 // Re-exports
 pub use sign_in::SignIn;
 pub use sign_up::SignUp;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/pages/authenticate/mod_test.rs b/desktop/src/pages/authenticate/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/authenticate/sign_in.rs b/desktop/src/pages/authenticate/sign_in.rs
index 32a90710..3385027f 100644
--- a/desktop/src/pages/authenticate/sign_in.rs
+++ b/desktop/src/pages/authenticate/sign_in.rs
@@ -43,17 +43,17 @@ pub fn sign_in() -> Html {
 
             spawn_local(async move {
                 debug!(email);
-                let Ok(user) = invoke::<Option<User>>(
-                    "authenticate_user",
-                    UserCredentials { email }
-                )
-                .await else {
-                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not authenticate user.")));
+                let Ok(user) =
+                    invoke::<Option<User>>("authenticate_user", UserCredentials { email }).await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not authenticate user.",
+                    )));
                     return;
                 };
 
                 if user.is_none() {
-                    // @todo[0]: Alert user.
+                    // TODO Alert user.
                     // user not found, alert user
                     invalid_credentials.set(true);
                 } else {
@@ -110,7 +110,3 @@ pub fn sign_in() -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./sign_in_test.rs"]
-mod sign_in_test;
diff --git a/desktop/src/pages/authenticate/sign_in_test.rs b/desktop/src/pages/authenticate/sign_in_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/authenticate/sign_up.rs b/desktop/src/pages/authenticate/sign_up.rs
index 5db7b44d..e88df62b 100644
--- a/desktop/src/pages/authenticate/sign_up.rs
+++ b/desktop/src/pages/authenticate/sign_up.rs
@@ -79,7 +79,7 @@ pub fn sign_up() -> Html {
                     // set user as active
                     navigator.push(&Route::Home);
 
-                    // @todo[1]: Handle error from set_active_user.
+                    // TODO Handle error from set_active_user.
                     let _active_res =
                         invoke::<()>("set_active_user", ResourceIdArgs { rid: user.rid }).await;
                 }
@@ -107,7 +107,3 @@ pub fn sign_up() -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./sign_up_test.rs"]
-mod sign_up_test;
diff --git a/desktop/src/pages/authenticate/sign_up_test.rs b/desktop/src/pages/authenticate/sign_up_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/dashboard/dashboard.rs b/desktop/src/pages/dashboard/dashboard.rs
index 2c1b7472..22d9b015 100644
--- a/desktop/src/pages/dashboard/dashboard.rs
+++ b/desktop/src/pages/dashboard/dashboard.rs
@@ -29,10 +29,8 @@ pub fn dashboard() -> HtmlResult {
 
     let projects = use_user_projects(&user.rid);
 
-    // create project
     let create_project = {
         let app_state = app_state.clone();
-
         Callback::from(move |_: MouseEvent| {
             app_state.dispatch(AppStateAction::SetActiveWidget(Some(
                 AppWidget::CreateProject,
@@ -40,10 +38,8 @@ pub fn dashboard() -> HtmlResult {
         })
     };
 
-    // import project
     let import_project = {
         let app_state = app_state.clone();
-
         Callback::from(move |_: MouseEvent| {
             app_state.dispatch(AppStateAction::SetActiveWidget(Some(
                 AppWidget::ImportProject,
@@ -51,6 +47,15 @@ pub fn dashboard() -> HtmlResult {
         })
     };
 
+    let init_project = {
+        let app_state = app_state.clone();
+        Callback::from(move |_: MouseEvent| {
+            app_state.dispatch(AppStateAction::SetActiveWidget(Some(
+                AppWidget::InitializeProject,
+            )));
+        })
+    };
+
     let navigator = use_navigator().expect("navigator not found");
     let onclick_card = {
         let navigator = navigator.clone();
@@ -69,33 +74,33 @@ pub fn dashboard() -> HtmlResult {
         <>
             <MainNavigation />
             <div id={"dashboard"}>
-                if projects.len() == 0 {
-                    <div class={classes!("align-center")}>
-                        <h2>{ "Get started" }</h2>
-                        <div>
-                            <button onclick={create_project.clone()}>{ "Create your first project" }</button>
-                        </div>
-                        <div>
-                            <button class={classes!("btn-secondary")} onclick={import_project.clone()}>{ "Import project" }</button>
-                        </div>
-                    </div>
-                } else {
                     <div id={"dashboard-container"}>
                         <div id={"dashboard-header"}>
                             <h1 class={classes!("title")}>
                                 { "Dashboard" }
                             </h1>
-                            <div class={classes!("new-project")}>
+                            <div>
                                 <button
                                     class={classes!("btn-primary")}
+                                    title={"Create a new project."}
                                     onclick={create_project}>
 
                                     { "New" }
                                 </button>
                             </div>
-                            <div class={classes!("import-project")}>
+                            <div>
                                 <button
                                     class={classes!("btn-secondary")}
+                                    title={"Initialize an existing folder as a project."}
+                                    onclick={init_project}>
+
+                                    { "Initialize" }
+                                </button>
+                            </div>
+                            <div>
+                                <button
+                                    class={classes!("btn-secondary")}
+                                    title={"Import an existing project."}
                                     onclick={import_project}>
 
                                     { "Import" }
@@ -104,12 +109,7 @@ pub fn dashboard() -> HtmlResult {
                         </div>
                         <ProjectDeck items={(*projects).clone()} {onclick_card} />
                     </div>
-                }
             </div>
         </>
     })
 }
-
-#[cfg(test)]
-#[path = "./dashboard_test.rs"]
-mod dashboard_test;
diff --git a/desktop/src/pages/dashboard/dashboard_test.rs b/desktop/src/pages/dashboard/dashboard_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/dashboard/mod.rs b/desktop/src/pages/dashboard/mod.rs
index ce9e9971..e9902767 100644
--- a/desktop/src/pages/dashboard/mod.rs
+++ b/desktop/src/pages/dashboard/mod.rs
@@ -4,7 +4,3 @@ pub mod page;
 
 // Re-exports
 pub use page::Dashboard;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/pages/dashboard/mod_test.rs b/desktop/src/pages/dashboard/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/dashboard/page.rs b/desktop/src/pages/dashboard/page.rs
index acdcf96e..90e596e4 100644
--- a/desktop/src/pages/dashboard/page.rs
+++ b/desktop/src/pages/dashboard/page.rs
@@ -13,7 +13,3 @@ pub fn dashboard() -> Html {
         </Suspense>
     }
 }
-
-#[cfg(test)]
-#[path = "./page_test.rs"]
-mod page_test;
diff --git a/desktop/src/pages/dashboard/page_test.rs b/desktop/src/pages/dashboard/page_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/home.rs b/desktop/src/pages/home.rs
index 62eb8b45..64b4e8d5 100644
--- a/desktop/src/pages/home.rs
+++ b/desktop/src/pages/home.rs
@@ -20,23 +20,21 @@ use yew_router::prelude::*;
 #[tracing::instrument]
 #[function_component(HomeComponent)]
 pub fn home_component() -> HtmlResult {
-    tracing::debug!("home");
     let app_state = use_context::<AppStateReducer>().expect("`AppStateReducer` context not found");
     let navigator = use_navigator().expect("navigator not found");
     let user = use_user();
 
     let Some(user) = user.as_ref() else {
         navigator.push(&Route::SignIn);
-        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user.")));
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Could not get user.",
+        )));
         return Ok(html! {});
     };
 
     let projects = use_user_projects(&user.rid);
-
-    // create project
     let create_project = {
         let app_state = app_state.clone();
-
         Callback::from(move |_: MouseEvent| {
             app_state.dispatch(AppStateAction::SetActiveWidget(Some(
                 AppWidget::CreateProject,
@@ -44,10 +42,17 @@ pub fn home_component() -> HtmlResult {
         })
     };
 
-    // import project
-    let import_project = {
+    let initialize_project = {
         let app_state = app_state.clone();
+        Callback::from(move |_: MouseEvent| {
+            app_state.dispatch(AppStateAction::SetActiveWidget(Some(
+                AppWidget::InitializeProject,
+            )));
+        })
+    };
 
+    let import_project = {
+        let app_state = app_state.clone();
         Callback::from(move |_: MouseEvent| {
             app_state.dispatch(AppStateAction::SetActiveWidget(Some(
                 AppWidget::ImportProject,
@@ -60,12 +65,15 @@ pub fn home_component() -> HtmlResult {
             if projects.len() == 0 {
                 <div class={classes!("align-center")}>
                     <h2>{ "Get started" }</h2>
-                    <div>
+                    <div class={classes!("mb-4")}>
                         <button class={classes!("btn-primary")} onclick={create_project}>{ "Create your first project" }</button>
                     </div>
-                    <div>
-                        <button class={classes!("btn-secondary")} onclick={import_project}>{ "Import project" }</button>
+                    <div class={classes!("mb-4")}>
+                        <button class={classes!("btn-secondary")} onclick={initialize_project}>{ "Initialize an existing folder" }</button>
                     </div>
+                    <div>
+                    <button class={classes!("btn-secondary")} onclick={import_project}>{ "Import a project" }</button>
+                </div>
 
                 </div>
             } else {
@@ -87,43 +95,48 @@ pub fn home() -> Html {
     let user = use_user();
     let Some(user) = user.as_ref() else {
         navigator.push(&Route::SignIn);
-        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user.")));
+        app_state.dispatch(AppStateAction::AddMessage(Message::error(
+            "Could not get user.",
+        )));
         return html! {};
     };
 
     {
-        // user settings
-        let app_state = app_state.clone();
-        let rid = user.rid.clone();
-
-        spawn_local(async move {
-            let Ok(user_settings) = invoke::<UserSettings>("load_user_settings", ResourceIdArgs { rid }).await else {
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user settings.")));
-                        return;
-            };
-
-            app_state.dispatch(AppStateAction::SetUserSettings(Some(user_settings)));
-        });
-    }
-
-    {
-        // user app state
         let app_state = app_state.clone();
         let navigator = navigator.clone();
         let rid = user.rid.clone();
 
-        spawn_local(async move {
-            let Ok(user_app_state) = invoke::<UserAppState>(
-                "load_user_app_state",
-                ResourceIdArgs { rid }
-            )
-            .await else {
-                navigator.push(&Route::SignIn);
-                app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user app state.")));
-                return;
-            };
-
-            app_state.dispatch(AppStateAction::SetUserAppState(Some(user_app_state)));
+        use_effect_with((), move |_| {
+            let navigator = navigator.clone();
+            let app_state = app_state.clone();
+            let rid = rid.clone();
+
+            spawn_local(async move {
+                let Ok(user_app_state) = invoke::<UserAppState>(
+                    "load_user_app_state",
+                    ResourceIdArgs { rid: rid.clone() },
+                )
+                .await
+                else {
+                    navigator.push(&Route::SignIn);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not get user app state.",
+                    )));
+                    return;
+                };
+
+                let Ok(user_settings) =
+                    invoke::<UserSettings>("load_user_settings", ResourceIdArgs { rid }).await
+                else {
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error(
+                        "Could not get user settings.",
+                    )));
+                    return;
+                };
+
+                app_state.dispatch(AppStateAction::SetUserAppState(Some(user_app_state)));
+                app_state.dispatch(AppStateAction::SetUserSettings(Some(user_settings)));
+            });
         });
     }
 
@@ -138,7 +151,3 @@ pub fn home() -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./home_test.rs"]
-mod home_test;
diff --git a/desktop/src/pages/home_test.rs b/desktop/src/pages/home_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/index.rs b/desktop/src/pages/index.rs
index d8b1d8da..b7a9a087 100644
--- a/desktop/src/pages/index.rs
+++ b/desktop/src/pages/index.rs
@@ -24,39 +24,36 @@ pub fn index() -> Html {
         let app_state = app_state.clone();
         let navigator = navigator.clone();
 
-        // @todo: Check if any users exist. If not redirect to sign up page
+        // TODO Check if any users exist. If not redirect to sign up page
         //  instead of sign in page.
-        use_effect_with_deps(
-            |auth_state| {
-                let auth_state = auth_state.clone();
-                spawn_local(async move {
-                    let Ok(active_user) = invoke::<Option<User>>("get_active_user", EmptyArgs {}).await else {
-                        navigator.push(&Route::SignIn);
-                        app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user.")));
-                        return;
-                    };
-
-                    match active_user {
-                        None => navigator.push(&Route::SignIn),
-                        Some(user) => {
-                            // set acitve user on backend
-                            let _active_res = invoke::<()>(
-                                "set_active_user",
-                                ResourceIdArgs {
-                                    rid: user.rid.clone(),
-                                },
-                            )
-                            .await;
-
-                            // set active user on front end
-                            auth_state.dispatch(AuthStateAction::SetUser(Some(user)));
-                            navigator.push(&Route::Home);
-                        }
+        use_effect_with(auth_state, |auth_state| {
+            let auth_state = auth_state.clone();
+            spawn_local(async move {
+                let Ok(active_user) = invoke::<Option<User>>("get_active_user", EmptyArgs {}).await else {
+                    navigator.push(&Route::SignIn);
+                    app_state.dispatch(AppStateAction::AddMessage(Message::error("Could not get user.")));
+                    return;
+                };
+        
+                match active_user {
+                    None => navigator.push(&Route::SignIn),
+                    Some(user) => {
+                        // set active user on backend
+                        let _active_res = invoke::<()>(
+                            "set_active_user",
+                            ResourceIdArgs {
+                                rid: user.rid.clone(),
+                            },
+                        )
+                        .await;
+        
+                        // set active user on front end
+                        auth_state.dispatch(AuthStateAction::SetUser(Some(user)));
+                        navigator.push(&Route::Home);
                     }
-                });
-            },
-            auth_state,
-        );
+                }
+            });
+        });
     }
 
     // default to sign in page
@@ -64,7 +61,3 @@ pub fn index() -> Html {
        <Redirect<Route> to={Route::SignIn} />
     }
 }
-
-#[cfg(test)]
-#[path = "./index_test.rs"]
-mod index_test;
diff --git a/desktop/src/pages/index_test.rs b/desktop/src/pages/index_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/mod.rs b/desktop/src/pages/mod.rs
index 240de323..7fc9f703 100644
--- a/desktop/src/pages/mod.rs
+++ b/desktop/src/pages/mod.rs
@@ -5,9 +5,4 @@ pub mod home;
 pub mod index;
 pub mod not_found;
 pub mod settings;
-pub mod tutorials;
 pub mod workspace;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/pages/mod_test.rs b/desktop/src/pages/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/not_found.rs b/desktop/src/pages/not_found.rs
index 93597a59..4bea8a2b 100644
--- a/desktop/src/pages/not_found.rs
+++ b/desktop/src/pages/not_found.rs
@@ -15,7 +15,3 @@ pub fn not_found() -> Html {
     </>
     }
 }
-
-#[cfg(test)]
-#[path = "./not_found_test.rs"]
-mod not_found_test;
diff --git a/desktop/src/pages/not_found_test.rs b/desktop/src/pages/not_found_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/settings.rs b/desktop/src/pages/settings.rs
index ab063c4a..5bfb3928 100644
--- a/desktop/src/pages/settings.rs
+++ b/desktop/src/pages/settings.rs
@@ -10,7 +10,3 @@ pub fn settings() -> Html {
         <SettingsUI />
     }
 }
-
-#[cfg(test)]
-#[path = "./settings_test.rs"]
-mod settings_test;
diff --git a/desktop/src/pages/settings_test.rs b/desktop/src/pages/settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/tutorials/first_project.rs b/desktop/src/pages/tutorials/first_project.rs
deleted file mode 100644
index 41d98f0b..00000000
--- a/desktop/src/pages/tutorials/first_project.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// @todo: Turorial
-
-#[cfg(test)]
-#[path = "./first_project_test.rs"]
-mod first_project_test;
diff --git a/desktop/src/pages/tutorials/first_project_test.rs b/desktop/src/pages/tutorials/first_project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/tutorials/mod.rs b/desktop/src/pages/tutorials/mod.rs
deleted file mode 100644
index 106c7996..00000000
--- a/desktop/src/pages/tutorials/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//! Tutorial pages for first time users.
-pub mod first_project;
-
-// Re-exports
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/pages/tutorials/mod_test.rs b/desktop/src/pages/tutorials/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/workspace/mod.rs b/desktop/src/pages/workspace/mod.rs
index a156a6fe..f46d2125 100644
--- a/desktop/src/pages/workspace/mod.rs
+++ b/desktop/src/pages/workspace/mod.rs
@@ -4,7 +4,3 @@ pub mod workspace;
 
 // Re-exports
 pub use page::Workspace;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/pages/workspace/mod_test.rs b/desktop/src/pages/workspace/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/workspace/page.rs b/desktop/src/pages/workspace/page.rs
index a7315c11..ae677ad1 100644
--- a/desktop/src/pages/workspace/page.rs
+++ b/desktop/src/pages/workspace/page.rs
@@ -12,7 +12,3 @@ pub fn workspace() -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./page_test.rs"]
-mod page_test;
diff --git a/desktop/src/pages/workspace/page_test.rs b/desktop/src/pages/workspace/page_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/pages/workspace/workspace.rs b/desktop/src/pages/workspace/workspace.rs
index b2bf2659..3aa38923 100644
--- a/desktop/src/pages/workspace/workspace.rs
+++ b/desktop/src/pages/workspace/workspace.rs
@@ -40,7 +40,3 @@ pub fn workspace() -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./workspace_test.rs"]
-mod workspace_test;
diff --git a/desktop/src/pages/workspace/workspace_test.rs b/desktop/src/pages/workspace/workspace_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/routes/auth_guard.rs b/desktop/src/routes/auth_guard.rs
index 2e06e5f9..b85d44c7 100644
--- a/desktop/src/routes/auth_guard.rs
+++ b/desktop/src/routes/auth_guard.rs
@@ -31,7 +31,3 @@ pub fn auth_guard(props: &AuthGuardProps) -> Html {
         </RouteGuard<Route>>
     }
 }
-
-#[cfg(test)]
-#[path = "./auth_guard_test.rs"]
-mod auth_guard_test;
diff --git a/desktop/src/routes/auth_guard_test.rs b/desktop/src/routes/auth_guard_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/routes/mod.rs b/desktop/src/routes/mod.rs
index af048bb2..35309540 100644
--- a/desktop/src/routes/mod.rs
+++ b/desktop/src/routes/mod.rs
@@ -4,7 +4,3 @@ pub mod routes;
 
 // Re-exports
 pub use routes::Route;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/routes/mod_test.rs b/desktop/src/routes/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/routes/routes.rs b/desktop/src/routes/routes.rs
index b89e97ce..f3c63e74 100644
--- a/desktop/src/routes/routes.rs
+++ b/desktop/src/routes/routes.rs
@@ -52,12 +52,8 @@ pub fn switch(routes: Route) -> Html {
         Route::Home => html! { <AuthGuard><Home /></AuthGuard> },
         Route::Settings => html! { <AuthGuard><Settings /></AuthGuard> },
         Route::Dashboard => html! { <AuthGuard><Dashboard /></AuthGuard> },
-        Route::Projects => html! { <AuthGuard><Dashboard /></AuthGuard> }, // @todo: Create dedicated page.
+        Route::Projects => html! { <AuthGuard><Dashboard /></AuthGuard> }, // TODO Create dedicated page.
         Route::Workspace => html! { <AuthGuard><Workspace /></AuthGuard> },
         Route::NotFound => html! { <NotFound /> },
     }
 }
-
-#[cfg(test)]
-#[path = "./routes_test.rs"]
-mod routes_test;
diff --git a/desktop/src/routes/routes_test.rs b/desktop/src/routes/routes_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/widgets/global.rs b/desktop/src/widgets/global.rs
index 70ea67cb..2bf1e687 100644
--- a/desktop/src/widgets/global.rs
+++ b/desktop/src/widgets/global.rs
@@ -1,7 +1,7 @@
 //! Collection of widgetst available from anywhere in the app.
 //! Activation of the widgets is determined by the [`AppState`].
 use crate::app::{AppStateAction, AppStateReducer, AppWidget, ShadowBox};
-use crate::components::dashboard::project::{CreateProject, ImportProject};
+use crate::components::dashboard::project::{CreateProject, ImportProject, InitializeProject};
 use crate::components::settings::Settings;
 use yew::prelude::*;
 
@@ -20,7 +20,10 @@ pub fn global_widgets() -> Html {
     let (title, widget) = if let Some(wgt) = &app_state.app_widget {
         match wgt {
             AppWidget::CreateProject => ("Create a project", html! { <CreateProject /> }),
-            AppWidget::ImportProject => ("Import project", html! { <ImportProject /> }),
+            AppWidget::InitializeProject => {
+                ("Initialize a project", html! { <InitializeProject /> })
+            }
+            AppWidget::ImportProject => ("Import a project", html! { <ImportProject /> }),
             AppWidget::UserSettings => ("Settings", html! { <Settings /> }),
         }
     } else {
@@ -35,7 +38,3 @@ pub fn global_widgets() -> Html {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./global_test.rs"]
-mod global_test;
diff --git a/desktop/src/widgets/global_test.rs b/desktop/src/widgets/global_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/src/widgets/mod.rs b/desktop/src/widgets/mod.rs
index 30c1ce47..8d6f634c 100644
--- a/desktop/src/widgets/mod.rs
+++ b/desktop/src/widgets/mod.rs
@@ -3,7 +3,3 @@ pub mod global;
 
 // Re-exports
 pub use global::GlobalWidgets;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/desktop/src/widgets/mod_test.rs b/desktop/src/widgets/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/desktop/styles/container_tree.scss b/desktop/styles/container_tree.scss
index 1bd171ca..c5b374ad 100644
--- a/desktop/styles/container_tree.scss
+++ b/desktop/styles/container_tree.scss
@@ -1,4 +1,5 @@
 @use 'themes' as t;
+@use 'mixins';
 
 $control-button-size: 25px;
 
@@ -7,6 +8,8 @@ $control-button-size: 25px;
   text-align: center;
   
   .container-node {
+    user-select: none;
+    -webkit-user-select: none;
     position: relative; // positioning for add child button
     display: inline-block;
 
@@ -50,33 +53,6 @@ $control-button-size: 25px;
         border: none;
         box-shadow: none;
       }
-
-      .container-menu {
-        position: absolute;
-        z-index: 100;
-
-        background-color: t.$background-accent-color;
-        padding: 5px;
-        border: t.$border-width-s t.$shadow-medium solid;
-        border-radius: t.$border-radius-m;
-
-        ul {
-          list-style: none;
-          margin: 0;
-          padding: 5px;
-
-          li {
-            text-align: left;
-            white-space: nowrap;
-            border-bottom: t.$border-width-s t.$background-color solid;
-
-            &:hover {
-              // @todo: Darken background.
-              filter: brightness(t.$darker); 
-            }
-          }
-        }
-      }
     }     
 
     .container-name {
@@ -147,9 +123,6 @@ $control-button-size: 25px;
           content: ":";
         }
       }
-
-      // .metadatum-value {
-      // }
     }
 
     .assets-preview {
@@ -162,6 +135,10 @@ $control-button-size: 25px;
           &.active {
             background-color: t.$primary-color;
           }
+
+          .thot-ui-asset-name {
+            @include mixins.hide-text-overflow;
+          }
         }
       }
 
@@ -216,9 +193,6 @@ $control-button-size: 25px;
             margin-left: t.$margin-m;
           }
 
-          // .script-name {
-          // }
-
           .script-priority {
             display: inline-block;
             margin-left: t.$margin-l;
@@ -273,3 +247,64 @@ $control-button-size: 25px;
     }
   }
 }
+
+.container-tree-controls {
+  .analyze-commands-group {
+    display: inline-block;
+    margin-left: t.$margin-l;
+
+    .primary-analyze-btn {
+      &.with_options {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+    }
+
+    .dropdown {
+      position: relative;
+      display: inline-block;
+      
+      .dropdown-btn {
+        padding-left: t.$padding-s;
+        padding-right: t.$padding-s;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-left: t.$border-width-s black solid;
+      }
+
+      .dropdown-content {
+        display: none;
+        position: absolute;
+        z-index: 1;
+
+        background-color: t.$background-accent-color;
+        border-radius: t.$border-radius-s;
+
+        list-style: none;
+        margin: 0;
+        padding-left: 0;
+
+        li {
+          display: block;
+          color: t.$body-text-color;
+          text-decoration: none;
+
+          padding: t.$padding-s t.$padding-xxl;
+
+          &:not(:last-child) {
+            border-bottom: t.$border-width-s t.$frame-border-color solid;
+          }
+
+          &:hover {
+            color: t.$primary-button-hover-color;
+            background-color: t.$primary-button-hover-background-color;
+          }
+        }
+      }
+
+      &:hover .dropdown-content {
+        display: block;
+      }
+    }
+  }
+}
diff --git a/desktop/styles/dashboard.scss b/desktop/styles/dashboard.scss
index 80a6e50e..49dba145 100644
--- a/desktop/styles/dashboard.scss
+++ b/desktop/styles/dashboard.scss
@@ -1,7 +1,6 @@
 @use 'themes' as t;
 
 #dashboard {
-
   #dashboard-container {
     display: flex;
     flex-direction: column;
@@ -40,8 +39,6 @@
     height: 7rem;
     background-color: t.$card-background-color;
     border-radius: t.$border-radius-l;
-    //@todo[3]: Should we remove margin from
-    // the .card in the main.scss?
     margin: 0px;
     padding: 1.3rem;
 
diff --git a/desktop/styles/main.scss b/desktop/styles/main.scss
index 255c0b18..ade71e44 100644
--- a/desktop/styles/main.scss
+++ b/desktop/styles/main.scss
@@ -24,8 +24,8 @@ html {
 body {
   min-width: 100%;
   margin: 0;
-  overflow: hidden;
-
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 #content {
diff --git a/desktop/styles/mixins.scss b/desktop/styles/mixins.scss
new file mode 100644
index 00000000..651e6720
--- /dev/null
+++ b/desktop/styles/mixins.scss
@@ -0,0 +1,6 @@
+@mixin hide-text-overflow {
+    overflow: hidden;
+    text-wrap: nowrap;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/desktop/styles/navigation.scss b/desktop/styles/navigation.scss
index 5ba0deb0..b7fd4559 100644
--- a/desktop/styles/navigation.scss
+++ b/desktop/styles/navigation.scss
@@ -14,6 +14,52 @@
   }
 }
 
+.dropdown-group {
+  position: relative;
+
+  .dropdown-menu {
+    position: absolute;
+    display: none;
+    z-index: 100;
+    top: t.$margin-xl;
+    left: - t.$margin-xl;
+  }
+
+  &:hover .dropdown-menu {
+    display: block;
+  }
+
+  .dropdown-menu:hover {
+    display: block;
+  }
+
+  ul.dropdown-menu,
+  ol.dropdown-menu {
+    margin: 0;
+    border: t.$border-width-s t.$shadow-medium solid;
+    border-radius: t.$border-radius-s;
+    padding-left: 0;
+
+    list-style: none;
+    background-color: t.$background-accent-color;
+
+    li {
+      cursor: pointer;
+      white-space: nowrap;
+      padding: t.$padding-s t.$padding-m;
+
+      &:not(:last-child) {
+        border-bottom: t.$border-width-s t.$background-color solid;
+      }
+
+      &:hover {
+        // TODO Darken background.
+        filter: brightness(t.$darker); 
+      }
+    }
+  }
+}
+
 #main-navigation-tabs {
   background-color: t.$frame-background-color;
   border-bottom: solid t.$border-width-s t.$frame-border-color;
diff --git a/desktop/styles/project_canvas.scss b/desktop/styles/project_canvas.scss
index 5addc19a..8f069698 100644
--- a/desktop/styles/project_canvas.scss
+++ b/desktop/styles/project_canvas.scss
@@ -1,8 +1,8 @@
 @use 'themes' as t;
+@use 'mixins';
 
 .project-canvas {
   height: 100%;
-  margin-left: t.$margin-3xl;
   display: flex;
   justify-content: space-between;
 
@@ -16,13 +16,26 @@
     border-right: solid t.$border-width-s t.$frame-border-color;
   }
 
-  .details-bar-drawer {
+  .thot-ui-drawer {
     display: flex;
-    justify-content: center;
-    padding-top: t.$padding-l;
     width: t.$drawer-width;
     height: 100%;
+    max-height: 100vh;
+    overflow-y: scroll;
     background-color: t.$frame-background-color;
+    box-sizing: border-box;
+
+    &.hidden {
+      display: none;
+    }
+
+    .drawer-contents {
+      overflow: auto;
+    }
+  }
+
+  .details-bar-drawer {
+    justify-content: center;
 
     .drawer-toggle {
       height: 100%;
@@ -30,19 +43,101 @@
       vertical-align: middle;
       cursor: pointer;
 
-      padding: 0 t.$padding-s;
       border-right: solid t.$border-width-s t.$frame-border-color;
     }
 
+
+    .project-canvas-details-bar {
+      margin: 0 t.$margin-l;
+    }
+  }
+
+  .layers-bar-drawer {
+    justify-content: left;
+    padding: t.$padding-s;
+
     .drawer-contents {
-      overflow: auto;
+      width: 100%;
+    }
+
+    .layers-bar {
+      user-select: none;
+      -webkit-user-select: none;
+
+      .layer:not(.expanded) .children,
+      .layer:not(.expanded) .layer.assets,
+      .layer.assets:not(.expanded) .layer-assets {
+        display: none;
+      }
+
+      .layer {
+        cursor: pointer;
+        padding: t.$padding-s 0;
+
+        &.selected > .layer-title {
+          background-color: t.$background-accent-color;
+        }
+        
+        .info-group {
+            @include mixins.hide-text-overflow;
+            flex-grow: 1;
+        }
+
+        .controls-group {
+          span:not(:last-child) {
+            padding-right: t.$padding-m;
+          }
+        }
+
+        span {
+          line-height: 100%;
+          vertical-align: middle;
+        }
+
+        .alert-icon {
+          color: t.$warning-color;
+        }
 
-      .project-canvas-details-bar {
-        margin: 0 t.$margin-l;
-        height: 100%;
+        .layer-title {
+          display: flex;
+          padding: 0 t.$padding-m;
+          border: solid t.$border-width-s transparent;
+
+          &:hover {
+            border-color: t.$primary-color
+          }
+
+          .resource-icon {
+            padding-left: t.$padding-s;
+          }
+
+          .name {
+            padding-left: t.$padding-s;
+          }
+        }
+      }
+      
+      .children,
+      .layer.assets,
+      .layer-asset {
+        // TODO Use text-indent
+        padding-left: t.$padding-xxl;
+      }
+
+      .layer-asset {
+        display: flex;
+        border: solid t.$border-width-s transparent;
+        
+        &:hover {
+          border-color: t.$primary-color
+        }
+
+        &.selected {
+          background-color: t.$background-accent-color;
+        }
 
-        &.hidden {
-          display: none;
+        .name {
+            padding-left: t.$padding-s;
         }
       }
     }
diff --git a/desktop/styles/style.scss b/desktop/styles/style.scss
index 1f4cb37c..8d63f46e 100644
--- a/desktop/styles/style.scss
+++ b/desktop/styles/style.scss
@@ -1,3 +1,4 @@
+@use 'utilities';
 @use 'main';
 @use 'sidebar';
 @use 'thot_ui';
diff --git a/desktop/styles/themes.scss b/desktop/styles/themes.scss
index 3d3a9435..8228b0c2 100644
--- a/desktop/styles/themes.scss
+++ b/desktop/styles/themes.scss
@@ -61,6 +61,7 @@ $message-font-color: vars.$secondary-color-900;
 $info-color: vars.$primary-color-300;
 $success-color: vars.$utility-green-300;
 $error-color: vars.$utility-red-300;
+$warning-color: vars.$utility-yellow-300;
 
 $shadow-light: rgba(0, 0, 0, 0.2);
 $shadow-medium: rgba(0, 0, 0, 0.4);
diff --git a/desktop/styles/thot_ui.scss b/desktop/styles/thot_ui.scss
index fde36f8b..40589230 100644
--- a/desktop/styles/thot_ui.scss
+++ b/desktop/styles/thot_ui.scss
@@ -1,4 +1,5 @@
 @use 'themes' as t;
+@use 'mixins';
 
 .thot-ui-shadow-box {
   z-index: 100;
@@ -11,8 +12,11 @@
   position: absolute;
   bottom:0;
   right: t.$margin-l;
+  text-align: right;
+  max-width: 50%;
 
   .thot-ui-message {
+    text-align: left;
     color: t.$message-font-color;
     padding: t.$padding-m;
     border-radius: t.$border-radius-m;
@@ -29,6 +33,16 @@
     &.message-error {
       background-color: t.$error-color;
     }
+
+    &.message-warning {
+      background-color: t.$warning-color;
+    }
+
+
+    .details-body {
+      max-height: 25vh;
+      overflow: auto;
+    }
   }
 }
 
@@ -94,13 +108,16 @@
   }
 }
 
-.thot-ui-standard-properties-editor {
-
+.thot-ui-container-properties-editor,
+.thot-ui-asset-properties-editor,
+.thot-ui-bulk-container-properties-editor,
+.thot-ui-bulk-asset-properties-editor,
+.thot-ui-bulk-resource-properties-editor {
   .thot-ui-metadata-editor {
-
     margin-top: t.$margin-l;
+
     input {
-      all:unset;
+      all: unset;
       appearance: auto;
       width: t.$drawer-content-width-1-4;
       border: solid t.$border-width-s transparent;
@@ -109,12 +126,14 @@
         outline: none;
         border: solid t.$border-width-s t.$hover-border-color;
       }
+
       &:hover {
         border: solid t.$border-width-s t.$hover-border-color;
       }
     }
     .metadatum-key {
       width: t.$drawer-content-width-1-4;
+      @include mixins.hide-text-overflow;
     }
 
     .metadata-editor {
@@ -127,13 +146,21 @@
         justify-content: space-between; 
       }
 
-      .metadatum, .thot-ui-metadatum-value-editor {
+      .thot-ui-metadatum .metadatum-fields, 
+      .thot-ui-metadatum-value-editor {
         display: flex;
         align-items: center;
         gap: t.$gap-s;
+
       }
     }
 
+    .thot-ui-metadatum-builder .error,
+    .thot-ui-metadatum .error {
+      display: block;
+      color: t.$error-color;
+    }
+
     .form-fields, .form-controls, .metadatum-value {
       display: flex;
       gap: t.$gap-s;
@@ -141,6 +168,29 @@
   }
 }
 
+.thot-ui-bulk-container-properties-editor,
+.thot-ui-bulk-asset-properties-editor,
+.thot-ui-bulk-resource-properties-editor {
+  .thot-ui-bulk-tag-editor {
+    list-style: none;
+    padding: 0;
+
+    ul {
+      padding: 0;
+    }
+
+    li {
+      display: flex;
+      align-items: center;
+      justify-content: space-between; 
+    }
+
+    .add-tags {
+      display: flex;
+    }
+  }
+}
+
 .thot-ui-file-selector {
   text-align: center;
 
diff --git a/desktop/styles/utilities.scss b/desktop/styles/utilities.scss
new file mode 100644
index 00000000..b5d60ece
--- /dev/null
+++ b/desktop/styles/utilities.scss
@@ -0,0 +1,11 @@
+.m-0 {
+    margin: 0;
+}
+
+.mb-4 {
+    margin-bottom: 1rem;
+}
+
+.align-center {
+    text-align: center; 
+}
\ No newline at end of file
diff --git a/desktop/styles/widgets.scss b/desktop/styles/widgets.scss
index 1d9dfa0d..446cc665 100644
--- a/desktop/styles/widgets.scss
+++ b/desktop/styles/widgets.scss
@@ -1,7 +1,7 @@
 @use 'themes' as t;
+@use 'mixins';
 
 .project-scripts-widget {
-
   button {
     width: t.$drawer-content-width; 
     background-color: t.$project-script-button-background-color;
@@ -11,38 +11,37 @@
       }
   }
 
-  span {
-    width: 80%;
-    overflow: auto;
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
   ul {
     list-style: none;
     padding: 0 0 t.$padding-m 0;
 
-    button {
-      all: unset;
+    li {
       display: flex;
       align-items: center;
-      padding: t.$padding-s;
-      box-sizing: border-box;
-
-      .thot-ui-add-remove-icon {
-        width: t.$add-remove-icon-size;
-        height: t.$add-remove-icon-size;
-      }
-
+      justify-content: space-between;
+    
       &:hover {
         cursor: pointer;
         background-color: t.$secondary-button-hover-background-color;
       }
 
+      .name {
+        @include mixins.hide-text-overflow;
+        flex-grow: 1;
+      }
+
+      button {
+        all: unset;
+        display: flex;
+        align-items: center;
+        padding: t.$padding-s;
+        box-sizing: border-box;
+
+        .thot-ui-add-remove-icon {
+          width: t.$add-remove-icon-size;
+          height: t.$add-remove-icon-size;
+        }
+      }
     }
 
   }
diff --git a/dev_utils/Cargo.toml b/dev_utils/Cargo.toml
index bef4ee49..af76695d 100644
--- a/dev_utils/Cargo.toml
+++ b/dev_utils/Cargo.toml
@@ -13,4 +13,7 @@ license = 'GPL-3.0'
 fake = "2.5.0"
 lazy_static = "1.4.0"
 tempfile = "3.3"
-thot-core = { path = "../core" }
+thot-core = { path = "../core" , optional = true}
+
+[features]
+thot_core = ["dep:thot-core"]
diff --git a/dev_utils/src/fs/mod.rs b/dev_utils/src/fs/mod.rs
index b44deabc..63b17576 100644
--- a/dev_utils/src/fs/mod.rs
+++ b/dev_utils/src/fs/mod.rs
@@ -8,7 +8,3 @@ pub mod temp_file;
 
 // Re-exports
 pub use temp_dir::TempDir;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/dev_utils/src/fs/mod_test.rs b/dev_utils/src/fs/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/dev_utils/src/fs/temp_dir.rs b/dev_utils/src/fs/temp_dir.rs
index 48444f12..d0866cde 100644
--- a/dev_utils/src/fs/temp_dir.rs
+++ b/dev_utils/src/fs/temp_dir.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 /// Information about the temporary folder.
 #[derive(Debug)]
 pub struct TempDir {
-    _dir: tempfile::TempDir,
+    dir: tempfile::TempDir,
     pub children: HashMap<PathBuf, Self>,
     pub files: HashMap<PathBuf, tempfile::NamedTempFile>,
 }
@@ -17,21 +17,21 @@ impl TempDir {
     pub fn new() -> Result<Self> {
         let td = tempfile::tempdir()?;
         Ok(TempDir {
-            _dir: td,
+            dir: td,
             children: HashMap::new(),
             files: HashMap::new(),
         })
     }
 
     pub fn path(&self) -> &Path {
-        self._dir.path()
+        self.dir.path()
     }
 
     /// Create a subdirectory.
     pub fn mkdir(&mut self) -> Result<PathBuf> {
-        let td = tempfile::tempdir_in(self._dir.path())?;
+        let td = tempfile::tempdir_in(self.dir.path())?;
         let tdir = TempDir {
-            _dir: td,
+            dir: td,
             children: HashMap::new(),
             files: HashMap::new(),
         };
@@ -42,23 +42,29 @@ impl TempDir {
     }
 
     /// Add a file to the directory.
-    ///
-    /// # See also
-    /// + `mkfile_with_extension`
     pub fn mkfile(&mut self) -> Result<PathBuf> {
-        let f = tempfile::NamedTempFile::new_in(self._dir.path())?;
+        let f = tempfile::NamedTempFile::new_in(self.dir.path())?;
         let path = f.path().to_path_buf();
         self.files.insert(path.clone(), f);
 
         Ok(path)
     }
 
+    /// Add a file to the directory with a given name.
+    pub fn mkfile_with_name<S: AsRef<OsStr>>(&mut self, file_name: S) -> Result<PathBuf> {
+        let f = tempfile::NamedTempFile::new_in(self.dir.path())?;
+        let mut dst = f.path().to_path_buf();
+        dst.set_file_name(file_name);
+
+        fs::rename(f.path(), &dst)?;
+        self.files.insert(dst.clone(), f);
+
+        Ok(dst)
+    }
+
     /// Add a file to the directory with a given extension.
-    ///
-    /// # See also
-    /// + `mkfile`
     pub fn mkfile_with_extension<S: AsRef<OsStr>>(&mut self, ext: S) -> Result<PathBuf> {
-        let f = tempfile::NamedTempFile::new_in(self._dir.path())?;
+        let f = tempfile::NamedTempFile::new_in(self.dir.path())?;
         let mut dst = f.path().to_path_buf();
         dst.set_extension(ext);
 
diff --git a/dev_utils/src/fs/temp_file.rs b/dev_utils/src/fs/temp_file.rs
index 432af6ba..7477e3c2 100644
--- a/dev_utils/src/fs/temp_file.rs
+++ b/dev_utils/src/fs/temp_file.rs
@@ -27,7 +27,3 @@ pub fn mkfile_with_extension<S: AsRef<OsStr>>(ext: S) -> Result<PathBuf> {
     fs::rename(f.path(), &dst)?;
     Ok(dst)
 }
-
-#[cfg(test)]
-#[path = "./temp_file_test.rs"]
-mod temp_file_test;
diff --git a/dev_utils/src/fs/temp_file_test.rs b/dev_utils/src/fs/temp_file_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/dev_utils/src/lib.rs b/dev_utils/src/lib.rs
index dacdf133..cb92f15b 100644
--- a/dev_utils/src/lib.rs
+++ b/dev_utils/src/lib.rs
@@ -6,6 +6,3 @@ pub mod path;
 
 // Re-exports
 pub use error::{Error, Result};
-
-#[cfg(test)]
-mod tests {}
diff --git a/dev_utils/src/lock.rs b/dev_utils/src/lock.rs
index 2126dcb5..e3ce3bc7 100644
--- a/dev_utils/src/lock.rs
+++ b/dev_utils/src/lock.rs
@@ -16,7 +16,3 @@ pub fn get_lock(m: &'static Mutex<()>) -> MutexGuard<'static, ()> {
         Err(poisoned) => poisoned.into_inner(),
     }
 }
-
-#[cfg(test)]
-#[path = "./lock_test.rs"]
-mod lock_test;
diff --git a/dev_utils/src/lock_test.rs b/dev_utils/src/lock_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/dev_utils/src/path/mod.rs b/dev_utils/src/path/mod.rs
index 7cd38ad4..9e9986fb 100644
--- a/dev_utils/src/path/mod.rs
+++ b/dev_utils/src/path/mod.rs
@@ -2,10 +2,5 @@
 //!
 //! # See also
 //! + For utilities that have side effects in the file system, see the [`fs`](crate::fs) module.
+#[cfg(feature = "thot_core")]
 pub mod resource_path;
-
-// Re-exports
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/dev_utils/src/path/mod_test.rs b/dev_utils/src/path/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/dev_utils/src/path/resource_path.rs b/dev_utils/src/path/resource_path.rs
index 304c9ab0..428befe3 100644
--- a/dev_utils/src/path/resource_path.rs
+++ b/dev_utils/src/path/resource_path.rs
@@ -18,7 +18,3 @@ pub fn resource_path<S: AsRef<OsStr>>(ext: Option<S>) -> ResourcePath {
 
     ResourcePath::new(path).expect("creating resource path should work")
 }
-
-#[cfg(test)]
-#[path = "./resource_path_test.rs"]
-mod resource_path_test;
diff --git a/dev_utils/src/path/resource_path_test.rs b/dev_utils/src/path/resource_path_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/has_id_derive/src/common.rs b/has_id/has_id_derive/src/common.rs
index ee12a816..352e3b0f 100644
--- a/has_id/has_id_derive/src/common.rs
+++ b/has_id/has_id_derive/src/common.rs
@@ -14,7 +14,3 @@ pub fn attrs_with_ident<'a>(attrs: &'a Vec<Attribute>, ident: &str) -> Vec<&'a A
         })
         .collect::<Vec<&Attribute>>()
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/has_id/has_id_derive/src/common_test.rs b/has_id/has_id_derive/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/has_id_derive/src/derive.rs b/has_id/has_id_derive/src/derive.rs
index edd83934..cf363480 100644
--- a/has_id/has_id_derive/src/derive.rs
+++ b/has_id/has_id_derive/src/derive.rs
@@ -58,7 +58,3 @@ pub(crate) fn impl_has_id(ast: &syn::DeriveInput) -> TokenStream {
 
     gen.into()
 }
-
-#[cfg(test)]
-#[path = "./derive_test.rs"]
-mod derive_test;
diff --git a/has_id/has_id_derive/src/derive_serde.rs b/has_id/has_id_derive/src/derive_serde.rs
index b4396599..d6381fda 100644
--- a/has_id/has_id_derive/src/derive_serde.rs
+++ b/has_id/has_id_derive/src/derive_serde.rs
@@ -57,7 +57,3 @@ pub(crate) fn impl_has_id(ast: &syn::DeriveInput) -> TokenStream {
 
     gen.into()
 }
-
-#[cfg(test)]
-#[path = "./derive_serde_test.rs"]
-mod derive_serde_test;
diff --git a/has_id/has_id_derive/src/derive_serde_test.rs b/has_id/has_id_derive/src/derive_serde_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/has_id_derive/src/derive_test.rs b/has_id/has_id_derive/src/derive_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/has_id_derive/src/lib.rs b/has_id/has_id_derive/src/lib.rs
index 490a864d..aabbe8df 100644
--- a/has_id/has_id_derive/src/lib.rs
+++ b/has_id/has_id_derive/src/lib.rs
@@ -27,7 +27,3 @@ pub fn has_id_serde_derive(input: TokenStream) -> TokenStream {
 
     derive_serde::impl_has_id(&ast)
 }
-
-#[cfg(test)]
-#[path = "lib_test.rs"]
-mod lib_test;
diff --git a/has_id/has_id_derive/src/lib_test.rs b/has_id/has_id_derive/src/lib_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/src/has_id.rs b/has_id/src/has_id.rs
index d7327047..8e989543 100644
--- a/has_id/src/has_id.rs
+++ b/has_id/src/has_id.rs
@@ -7,7 +7,3 @@ pub trait HasId {
 
     fn id(&self) -> &Self::Id;
 }
-
-#[cfg(test)]
-#[path = "./has_id_test.rs"]
-mod has_id_test;
diff --git a/has_id/src/has_id_mut.rs b/has_id/src/has_id_mut.rs
index 8e21fd2a..3b635e32 100644
--- a/has_id/src/has_id_mut.rs
+++ b/has_id/src/has_id_mut.rs
@@ -6,7 +6,3 @@ use crate::HasId;
 pub trait HasIdMut: HasId {
     fn id_mut(&mut self) -> &mut Self::Id;
 }
-
-#[cfg(test)]
-#[path = "./has_id_mut_test.rs"]
-mod has_id_mut_test;
diff --git a/has_id/src/has_id_mut_test.rs b/has_id/src/has_id_mut_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/src/has_id_serde.rs b/has_id/src/has_id_serde.rs
index 52e75a50..5d884841 100644
--- a/has_id/src/has_id_serde.rs
+++ b/has_id/src/has_id_serde.rs
@@ -11,7 +11,3 @@ pub trait HasIdSerde<'de> {
 
     fn id(&self) -> &Self::Id;
 }
-
-#[cfg(test)]
-#[path = "./has_id_serde_test.rs"]
-mod has_id_serde_test;
diff --git a/has_id/src/has_id_serde_test.rs b/has_id/src/has_id_serde_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/has_id/src/has_id_test.rs b/has_id/src/has_id_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
deleted file mode 100644
index 4efcf489..00000000
--- a/lang/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "thot-lang"
-version = "0.10.0"
-edition = "2021"
-
-authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
-description = "Base language bindings for Thot."
-license = "MIT OR Apache-2.0"
-
-homepage = "https://thot.so"
-repository = "https://github.com/thot-data/thot"
-keywords = [ "thot", "thot-data", "language-bindings", "data-analysis", "data-management" ]
-categories = [ "science" ]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde = "1.0"
-serde_json = "1.0"
-
-thot-core = { path = "../core" }
-thot-local = { path = "../local" }
-thot-local-database = { path = "../local/database", features = ["client"] }
diff --git a/lang/python/src/thot/__init__.py b/lang/python/src/thot/__init__.py
index 0f312bc3..e0066926 100644
--- a/lang/python/src/thot/__init__.py
+++ b/lang/python/src/thot/__init__.py
@@ -1,4 +1,13 @@
 # SPDX-FileCopyrightText: 2023-present Brian Carlsen <carlsen.bri@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-from .database import Database
\ No newline at end of file
+import sys
+
+if sys.version_info < (3, 9):
+    _LEGACY_ = True
+else:
+    _LEGACY_ = False
+
+from .common import dev_mode
+from .database import Database, Asset, Container
+from .filter import filter
\ No newline at end of file
diff --git a/lang/python/src/thot/asset.py b/lang/python/src/thot/asset.py
deleted file mode 100644
index eefe044d..00000000
--- a/lang/python/src/thot/asset.py
+++ /dev/null
@@ -1,64 +0,0 @@
-from .types import OptStr, Tags, Metadata
-
-class Asset:
-    """
-    An Asset.
-    """
-    def __init__(
-        self,
-        rid: str,
-        file: str,
-        name: OptStr = None,
-        type: OptStr = None,
-        tags: Tags = [],
-        metadata: Metadata = {},
-    ):
-        """
-        Create a new Asset.
-        """
-        self._rid: str = rid
-        self._file: str = file
-        self._name: OptStr = name
-        self._type: OptStr = type
-        self._tags: Tags = tags
-        self._metadata: Metadata = metadata
-    
-    @property
-    def name(self) -> OptStr:
-        """
-        Returns:
-            OptStr: Asset's name.
-        """
-        return self._name
-    
-    @property
-    def type(self) -> OptStr:
-        """
-        Returns:
-            OptStr: Asset's type.
-        """
-        return self._type
-    
-    @property
-    def tags(self) -> Tags:
-        """
-        Returns:
-            Tags: Asset's tags.
-        """
-        return self._tags
-    
-    @property
-    def metadata(self) -> Metadata:
-        """
-        Returns:
-            Metadata: Asset's metadata.
-        """
-        return self._metadata
-        
-    @property
-    def file(self) -> str:
-        """
-        Returns:
-            str: Asset's file path.
-        """
-        return self._file
\ No newline at end of file
diff --git a/lang/python/src/thot/bin/thot-local-database-aarch64-apple-darwin b/lang/python/src/thot/bin/thot-local-database-aarch64-apple-darwin
index 9ba0b361..2ab55d0f 100755
Binary files a/lang/python/src/thot/bin/thot-local-database-aarch64-apple-darwin and b/lang/python/src/thot/bin/thot-local-database-aarch64-apple-darwin differ
diff --git a/lang/python/src/thot/bin/thot-local-database-x86_64-apple-darwin b/lang/python/src/thot/bin/thot-local-database-x86_64-apple-darwin
index 74a6d706..006404da 100755
Binary files a/lang/python/src/thot/bin/thot-local-database-x86_64-apple-darwin and b/lang/python/src/thot/bin/thot-local-database-x86_64-apple-darwin differ
diff --git a/lang/python/src/thot/bin/thot-local-database-x86_64-pc-windows-msvc.exe b/lang/python/src/thot/bin/thot-local-database-x86_64-pc-windows-msvc.exe
index b3a93fe8..52517b7c 100644
Binary files a/lang/python/src/thot/bin/thot-local-database-x86_64-pc-windows-msvc.exe and b/lang/python/src/thot/bin/thot-local-database-x86_64-pc-windows-msvc.exe differ
diff --git a/lang/python/src/thot/bin/thot-local-database-x86_64-unknown-linux-gnu b/lang/python/src/thot/bin/thot-local-database-x86_64-unknown-linux-gnu
index ae35ee3f..cc764f7c 100755
Binary files a/lang/python/src/thot/bin/thot-local-database-x86_64-unknown-linux-gnu and b/lang/python/src/thot/bin/thot-local-database-x86_64-unknown-linux-gnu differ
diff --git a/lang/python/src/thot/common.py b/lang/python/src/thot/common.py
index 87fdf040..88cdfe49 100644
--- a/lang/python/src/thot/common.py
+++ b/lang/python/src/thot/common.py
@@ -1,46 +1,10 @@
-from typing import Any
+import os
 
-from .container import Container
-from .asset import Asset
-
-def dict_to_container(d: dict[str, Any]) -> Container:
-    """
-    Converts a dictionary to a Container.
-
-    Args:
-        d (dict[str, Any]): Dictionary to convert.
-
-    Returns:
-        Container: Container that the JSON represented.
+def dev_mode() -> bool:
     """
-    return Container(
-        d["rid"],
-        name = d["properties"]["name"],
-        type = d["properties"]["kind"],
-        tags = d["properties"]["tags"],
-        metadata = d["properties"]["metadata"],
-        assets = d["assets"]
-    )
+    Returns if the script is running in dev mode.
     
-def dict_to_asset(d: dict[str, Any]) -> Asset:
-    """
-    Converts a dictionary to an Asset.
-
-    Args:
-        d (dict[str, Any]): Dictionary to convert.
-
     Returns:
-        Asset: Asset that the JSON represented.
+        bool: If the database is running in dev mode.
     """
-    file = d["path"]
-    if "Absolute" not in file:
-        raise ValueError("Asset path must be absolute")
-    
-    return Asset(
-        d["rid"],
-        file["Absolute"],
-        name = d["properties"]["name"],
-        type = d["properties"]["kind"],
-        tags = d["properties"]["tags"],
-        metadata = d["properties"]["metadata"]
-    )
\ No newline at end of file
+    return os.getenv("THOT_CONTAINER_ID") is None
\ No newline at end of file
diff --git a/lang/python/src/thot/container.py b/lang/python/src/thot/container.py
deleted file mode 100644
index a196fe02..00000000
--- a/lang/python/src/thot/container.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from typing import List
-
-from .types import OptStr, Tags, Metadata
-from .asset import Asset
-
-class Container:
-    """
-    A Container.
-    """
-    def __init__(
-        self,
-        rid: str,
-        name: OptStr = None,
-        type: OptStr = None,
-        tags: Tags = [],
-        metadata: Metadata = {},
-        assets: List[str] = []
-    ):
-        """
-        Create a new Container.
-        """
-        self._rid: str = rid
-        self._name: OptStr = name
-        self._type: OptStr = type
-        self._tags: Tags = tags
-        self._metadata: Metadata = metadata
-        self._assets: List[str] = assets
-    
-    @property
-    def name(self) -> OptStr:
-        """
-        Returns:
-            OptStr: Container's name.
-        """
-        return self._name
-    
-    @property
-    def type(self) -> OptStr:
-        """
-        Returns:
-            OptStr: Container's type.
-        """
-        return self._type
-    
-    @property
-    def tags(self) -> Tags:
-        """
-        Returns:
-            Tags: Container's tags.
-        """
-        return self._tags
-    
-    @property
-    def metadata(self) -> Metadata:
-        """
-        Returns:
-            Metadata: Container's metadata.
-        """
-        return self._metadata
-        
-    @property
-    def assets(self) -> List[Asset]:
-        """
-        Returns:
-            List[Asset]: Container's Assets.
-        """
-        return self._assets
\ No newline at end of file
diff --git a/lang/python/src/thot/database.py b/lang/python/src/thot/database.py
index 49ec0231..1b27b484 100644
--- a/lang/python/src/thot/database.py
+++ b/lang/python/src/thot/database.py
@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import Union
 import subprocess
 import importlib.resources as pkg_resources
 import socket
@@ -9,47 +9,67 @@
 
 import zmq
 
+from thot import _LEGACY_
 from .types import OptStr, Tags, Metadata
-from .common import dict_to_container, dict_to_asset
-from .asset import Asset
-from .container import Container
+from .resources import Container, Asset, dict_to_container, dict_to_asset
 
 OptTags = Union[Tags, None]
 OptMetadata = Union[Metadata, None]
+if _LEGACY_:
+    from typing import List
+    Containers = List[Container]
+    Assets = List[Asset]
+else:
+    Containers = list[Container]
+    Assets = list[Asset]
 
 LOCALHOST = "127.0.0.1"
 THOT_PORT = 7047
+SOCKET_TIMEOUT = 10_000
 
 class Database:
     """
     A Thot Database.
     """
-    def __init__(self, dev_root: OptStr = None):
+    def __init__(self, dev_root: OptStr = None, chdir: bool = True):
         """
         Create a new Thot Database.
+        
+        Args:
+            dev_root (OptStr, optional): Interactive graph root.
+                Used to set the development root when using a script interactively.
+                The script will set its graph root to the `Container` at the given path.
+                This is ignored if the script is being run by a runner.
+                
+            chdir (bool, optional): Whether to change the directory to the script's. Defaults to `True`.
         """
         self._ctx: zmq.Context = zmq.Context()
         self._socket: zmq.Socket = self._ctx.socket(zmq.REQ)
-        self._socket.setsockopt(zmq.SNDTIMEO, 10_000)
-        self._socket.setsockopt(zmq.RCVTIMEO, 10_000)
+        self._socket.setsockopt(zmq.SNDTIMEO, SOCKET_TIMEOUT)
+        self._socket.setsockopt(zmq.RCVTIMEO, SOCKET_TIMEOUT)
         self._socket.connect(f'tcp://{LOCALHOST}:{THOT_PORT}')
         if not self._is_database_available():
             exe_base_name = "thot-local-database"
-            bin_path = pkg_resources.files("thot").joinpath("bin")
             os_name = platform.system()
             if os_name == "Linux":
-                exe_path = bin_path.joinpath(f"{exe_base_name}-x86_64-unknown-linux-gnu")
+                exe_name = f"{exe_base_name}-x86_64-unknown-linux-gnu"
             elif os_name == "Darwin":
                 mac_system = platform.processor()
                 if mac_system == 'arm':
-                    exe_path = bin_path.joinpath(f"{exe_base_name}-aarch64-apple-darwin")
+                    exe_name = f"{exe_base_name}-aarch64-apple-darwin"
                 else:
-                    exe_path = bin_path.joinpath(f"{exe_base_name}-x86_64-apple-darwin")
+                    exe_name = f"{exe_base_name}-x86_64-apple-darwin"
             elif os_name == "Windows":
-                exe_path = bin_path.joinpath(f"{exe_base_name}-x86_64-pc-windows-msvc.exe")
+                exe_name = f"{exe_base_name}-x86_64-pc-windows-msvc.exe"
             else:
                 raise OSError()
             
+            if _LEGACY_:
+                with pkg_resources.path("thot", "bin") as path:
+                    exe_path = str(path.joinpath(exe_name))
+            else:
+                exe_path = pkg_resources.files("thot").joinpath("bin").joinpath(exe_name)
+                
             subprocess.Popen(exe_path, start_new_session=True)
         
         root_id: OptStr = os.getenv("THOT_CONTAINER_ID")
@@ -59,7 +79,7 @@ def __init__(self, dev_root: OptStr = None):
             
             self._root_path: str = dev_root
         else:
-            self._socket.send_json({"ContainerCommand": {"GetPath": root_id}})
+            self._socket.send_json({"ContainerCommand": {"Path": root_id}})
             root_path = self._socket.recv_json()
             self._root_path: str = root_path
             
@@ -87,6 +107,14 @@ def __init__(self, dev_root: OptStr = None):
         
         self._root: str = root["rid"]
         
+        if chdir:
+            analysis_root = project["analysis_root"]
+            if analysis_root is None:
+                raise RuntimeError("analysis root is not set, can not change directory")
+            
+            analysis_path = os.path.join(project_path, analysis_root)
+            os.chdir(analysis_path)
+        
     def _is_database_available(self) -> bool:
         """
         Check if a database is already running.
@@ -128,12 +156,16 @@ def root(self) -> Container:
         Returns:
             Container: Root Container.
         """
-        self._socket.send_json({"ContainerCommand": {"Get": self._root}})
+        self._socket.send_json({"ContainerCommand": {"GetWithMetadata": self._root}})
         root = self._socket.recv_json()
         if root is None:
-            raise RuntimeError("could not get rot Container")
+            raise RuntimeError("Could not get root Container")
+
+        if 'Err' in root:
+            raise RuntimeError(f"Error getting root: {root['Err']}")
         
         root = dict_to_container(root)
+        root._db = self
         return root
                 
     def find_containers(
@@ -142,18 +174,18 @@ def find_containers(
         type: OptStr = None,
         tags: OptTags = None,
         metadata: OptMetadata = None
-    ) -> List[Container]:
+    ) -> Containers:
         """
         Find Containers matching the filter.
 
         Args:
-            name (OptStr, optional): Name filter. Defaults to None.
-            type (OptStr, optional): Type filter. Defaults to None.
-            tags (OptTags, optional): Tags filter. Defaults to None.
-            metadata (OptMetadata, optional): Metadata filter. Defaults to None.
+            name (OptStr, optional): Name filter. Defaults to `None`.
+            type (OptStr, optional): Type filter. Defaults to `None`.
+            tags (OptTags, optional): Tags filter. Defaults to `None`.
+            metadata (OptMetadata, optional): Metadata filter. Defaults to `None`.
 
         Returns:
-            List[Container]: Containers matching the filter.
+            list[Container]: Containers matching the filter.
         """
         f = {}
         if name is not None:
@@ -167,9 +199,14 @@ def find_containers(
         
         self._socket.send_json({"ContainerCommand": {"FindWithMetadata": (self._root, f)}})
         containers = self._socket.recv_json()
-        containers = map(dict_to_container, containers)
-        return list(containers)
-    
+        if 'Err' in containers:
+            raise RuntimeError(f"Error getting containers: {containers['Err']}")
+
+        return list(map(
+            lambda container: dict_to_container(container, db = self),
+            containers
+        ))
+                
     def find_container(
         self,
         name: OptStr = None,
@@ -181,10 +218,10 @@ def find_container(
         Find a single Container matching the filter.
         
         Args:
-            name (OptStr, optional): Name filter. Defaults to None.
-            type (OptStr, optional): Type filter. Defaults to None.
-            tags (OptTags, optional): Tags filter. Defaults to None.
-            metadata (OptMetadata, optional): Metadata filter. Defaults to None.
+            name (OptStr, optional): Name filter. Defaults to `None`.
+            type (OptStr, optional): Type filter. Defaults to `None`.
+            tags (OptTags, optional): Tags filter. Defaults to `None`.
+            metadata (OptMetadata, optional): Metadata filter. Defaults to `None`.
         
         Returns:
             Union[Container, None]: A Contianer, or `None`.
@@ -201,18 +238,18 @@ def find_assets(
         type: OptStr = None,
         tags: OptTags = None,
         metadata: OptMetadata = None
-    ) -> List[Asset]:
+    ) -> Assets:
         """
         Find Assets matching the filter.
         
         Args:
-            name (OptStr, optional): Name filter. Defaults to None.
-            type (OptStr, optional): Type filter. Defaults to None.
-            tags (OptTags, optional): Tags filter. Defaults to None.
-            metadata (OptMetadata, optional): Metadata filter. Defaults to None.
+            name (OptStr, optional): Name filter. Defaults to `None`.
+            type (OptStr, optional): Type filter. Defaults to `None`.
+            tags (OptTags, optional): Tags filter. Defaults to `None`.
+            metadata (OptMetadata, optional): Metadata filter. Defaults to `None`.
 
         Returns:
-            List[Asset]: Assets matching the filter.
+            list[Asset]: Assets matching the filter.
         """
         f = {}
         if name is not None:
@@ -226,8 +263,13 @@ def find_assets(
         
         self._socket.send_json({"AssetCommand": {"FindWithMetadata": (self._root, f)}})
         assets = self._socket.recv_json()
-        assets = map(dict_to_asset, assets)
-        return list(assets)
+        if 'Err' in assets:
+            raise RuntimeError(f"Error getting assets: {assets['Err']}")
+
+        return list(map(
+            lambda asset: dict_to_asset(asset, db = self),
+            assets
+        ))
             
     def find_asset(
         self,
@@ -240,10 +282,10 @@ def find_asset(
         Find a single Asset matching the filter.
         
         Args:
-            name (OptStr, optional): Name filter. Defaults to None.
-            type (OptStr, optional): Type filter. Defaults to None.
-            tags (OptTags, optional): Tags filter. Defaults to None.
-            metadata (OptMetadata, optional): Metadata filter. Defaults to None.
+            name (OptStr, optional): Name filter. Defaults to `None`.
+            type (OptStr, optional): Type filter. Defaults to `None`.
+            tags (OptTags, optional): Tags filter. Defaults to `None`.
+            metadata (OptMetadata, optional): Metadata filter. Defaults to `None`.
         
         Returns: 
             Union[Asset, None]: An Asset or `None`.
@@ -268,16 +310,16 @@ def add_asset(
         
         Args:
             file (str): File name of the associated data. Use relative paths to place the Asset in a bucket.
-            name (OptStr, optional): Name filter. Defaults to None.
-            type (OptStr, optional): Type filter. Defaults to None.
-            tags (OptTags, optional): Tags filter. Defaults to None.
-            metadata (OptMetadata, optional): Metadata filter. Defaults to None.
+            name (OptStr, optional): Name filter. Defaults to `None`.
+            type (OptStr, optional): Type filter. Defaults to `None`.
+            tags (OptTags, optional): Tags filter. Defaults to `None`.
+            metadata (OptMetadata, optional): Metadata filter. Defaults to `None`.
 
         Returns:
             str: Path to save the Asset's file to.
         """
         if os.path.isabs(file):
-            raise ValueError("Asset file must be relative")
+            raise ValueError("file must be relative")
         
         path = {"Relative": file}
         user = self._active_user()
@@ -306,10 +348,38 @@ def add_asset(
         if "Ok" not in res:
             raise RuntimeError(f"could not create Asset: {res['Err']}")
         
-        path = os.path.join(self._root_path, file)
+        path = os.path.join(self._root_path, os.path.normpath(file))
         os.makedirs(os.path.dirname(path), exist_ok=True) # ensure bucket directory exists
         return path
     
+    def flag(self, resource: Union[Container, Asset], message: str):
+        """Add a flag to the resource.
+
+        Args:
+            resource (Union[Container, Asset]): Resource to flag.
+            message (str): Message to display.
+        """
+        self._socket.send_json({"AnalysisCommand": {"Flag": {"resource": resource._rid, "message": message}}})
+        res = self._socket.recv_json()
+    
+    def clone(self) -> 'Database':
+        """Clones the Database.
+        For use in multithreaded applications.
+
+        Returns:
+            Database: Clone of the Database.
+        """
+        clone = Database.__new__(Database)
+        clone._ctx = self._ctx
+        clone._socket: zmq.Socket = self._ctx.socket(zmq.REQ)
+        clone._root_path = self._root_path
+        clone._root = self._root
+        
+        clone._socket.setsockopt(zmq.SNDTIMEO, SOCKET_TIMEOUT)
+        clone._socket.setsockopt(zmq.RCVTIMEO, SOCKET_TIMEOUT)
+        clone._socket.connect(f'tcp://{LOCALHOST}:{THOT_PORT}')
+        return clone
+    
     def _active_user(self) -> OptStr:
         """
         Get the active user.
diff --git a/lang/python/src/thot/filter.py b/lang/python/src/thot/filter.py
new file mode 100644
index 00000000..038294f5
--- /dev/null
+++ b/lang/python/src/thot/filter.py
@@ -0,0 +1,138 @@
+import builtins
+import typing
+from typing import Any, Iterable, Union
+from functools import partial
+
+from .resources import Container, Asset
+
+Resource = Union[Asset, Container]
+
+def property_filter(prop: str, value: Any, obj: Resource):
+    """
+    Check if object matched property filter.
+
+    Args:
+        prop (str): Name of the property to check.
+            Properties are drilled down using dot notation.
+            
+        value (Any): Value to match.
+            Value can be a
+            + List: Object should be a list.
+                Returns True if all values in object are included in value.
+            + Dictionary: Uses operators to match.
+                Operators are
+                + $in: Tests for inclusion.
+                    + If object to check is not a list,
+                        checks if the object is in the list. 
+                    + If object to check is a list,
+                        checks if all elements are in the value list.
+            + Callable: Value is passed the object,
+                and should return a boolean indicating if the object matches.
+            + RegEx: RegEx#search is used to match object.
+            + String: Tests if value and object are equal. 
+            
+        obj (Resource): Object to check.
+        
+    Returns:
+        True if matches, False otherwise.
+    """
+    # parse prop
+    prop_path = prop.split('.')
+    for part in prop_path:
+        if isinstance(obj, dict):
+            try:
+                obj = obj[part]
+                
+            except KeyError as err:
+                # property not contained in object
+                return False
+        
+        else:
+            try:
+                obj = getattr(obj, part)
+
+            except AttributeError as err:
+                return False
+
+    if isinstance(value, list):
+        # value is list, check for inclusion
+        if isinstance(obj, list):
+            # object is list, verfiy all values are in object
+            for item in value:
+                if isinstance(item, typing.Pattern):
+                    # value is regex
+                    match = item.search(value)
+                    return (match is None)
+
+                if item not in obj:
+                    # search item not obj
+                    return False
+
+            # all items present
+            return True
+
+
+        else:
+            # object is not list, can not match
+            return False
+
+    elif isinstance(value, dict):
+        # value is dictionary, search for operators
+        for op, val in value.items():
+            if op == '$in':
+                # inclusion operator
+                if not isinstance(val, list):
+                    raise TypeError(f'Invalid search criteria {op}: {val}. Value must be list.')
+
+                if isinstance(obj, list):
+                    # test all values are included in object
+                    return all([(v in obj) for v in val])
+
+                else:
+                    # basic object
+                    return (obj in val)
+
+            elif op == '$eq':
+                # equals operator
+                return (obj == val)
+
+            else:
+                # not an operator
+                raise TypeError(f'Invalid search operator {op}')
+
+        # passed all operator checks
+        return True
+
+    elif callable(value):
+        # value is a function
+        return value(obj)
+
+    else:
+        # value is not list, check for direct match
+        if isinstance(value, typing.Pattern):
+            # value is regex
+            match = value.search(obj)
+            return (match is not None)
+
+        # simple value
+        return (obj == value)
+
+
+def filter(filter: Any, resources: Iterable[Resource]):
+    """
+    Filters an iterable of Assets and/or Containers.
+
+    Args:
+        filter: Search criteria.
+            [See #property_filter > `value` for more info]
+        Resources (Iterable[Resource]): Iterable of resources to filter.
+    
+    Returns:
+        List of filtered resources.
+    """
+    matching = resources.copy()
+    for prop, value in filter.items():
+        obj_fltr = partial( property_filter, prop, value )
+        matching = builtins.filter( obj_fltr, matching )  # builtins required because filter overwritten by parameter.
+
+    return list( matching )
diff --git a/lang/python/src/thot/resources.py b/lang/python/src/thot/resources.py
new file mode 100644
index 00000000..4be6b5e0
--- /dev/null
+++ b/lang/python/src/thot/resources.py
@@ -0,0 +1,323 @@
+from typing import Union
+
+from thot import _LEGACY_
+from .types import OptStr, Tags, Metadata, Properties
+from .common import dev_mode
+
+OptDatabase = Union['Database', None]
+OptContainer = Union['Container', None]
+if _LEGACY_:
+    from typing import List
+    Assets = List['Asset']
+    ContainerList = List['Container']
+else:
+    Assets = list['Asset']
+    ContainerList = list['Container']
+    
+class Container:
+    """
+    A Container.
+    """
+    def __init__(
+        self,
+        rid: str,
+        name: OptStr = None,
+        type: OptStr = None,
+        description: OptStr = None,
+        tags: Tags = [],
+        metadata: Metadata = {},
+        assets: Assets = [],
+        db: OptDatabase = None
+    ):
+        """
+        Create a new Container.
+        """
+        self._rid: str = rid
+        self._name: OptStr = name
+        self._type: OptStr = type
+        self._description: OptStr = description
+        self._tags: Tags = tags
+        self._metadata: Metadata = metadata
+        self._assets: Assets = assets
+        
+        self._db: OptDatabase = db
+        self._parent: OptContainer = None
+        self._parent_set: bool = False
+    
+    @property
+    def name(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Container's name.
+        """
+        return self._name
+    
+    @property
+    def type(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Container's type.
+        """
+        return self._type
+    
+    @property
+    def description(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Container's description.
+        """
+        return self._description
+    
+    @property
+    def tags(self) -> Tags:
+        """
+        Returns:
+            Tags: Container's tags.
+        """
+        return self._tags
+    
+    @property
+    def metadata(self) -> Metadata:
+        """
+        Returns:
+            Metadata: Container's metadata.
+        """
+        return self._metadata
+        
+    @property
+    def assets(self) -> Assets:
+        """
+        Returns:
+            list[Asset]: Container's Assets.
+        """
+        if self._db is None or not dev_mode():
+            return self._assets
+        
+        self._db._socket.send_json({"ContainerCommand": {"GetWithMetadata": self._rid}})
+        container = self._db._socket.recv_json()
+        if container is None:
+            raise RuntimeError("Could not retrieve Container")
+        
+        container = dict_to_container(container, db = self._db)
+        self._assets = container._assets
+        return self._assets
+    
+    def children(self) -> ContainerList:
+        """
+        Returns:
+            ContainerList: Container's children.
+        """
+        self._db._socket.send_json({"GraphCommand": {"Children": self._rid}})
+        child_ids = self._db._socket.recv_json()
+        children = []
+        for cid in child_ids:
+            self._db._socket.send_json({"ContainerCommand": {"GetWithMetadata": cid}})
+            child = self._db._socket.recv_json()
+            if child is None:
+                raise RuntimeError("Could not get child Container")
+            
+            children.append(child)
+            
+        children = list(map(
+            lambda child: dict_to_container(child, db = self._db),
+            children
+        ))
+        
+        for child in children:
+            child._set_parent(self)
+        
+        return children
+    
+    def parent(self) -> OptContainer:
+        """
+        Returns:
+            OptContainer: Container's parent or `None` if the
+            Container is the root of the current graph.
+        """
+        if self._db is None:
+            raise RuntimeError('No database connector')
+        
+        if self._parent_set and not dev_mode():
+            return self._parent
+        
+        if self._rid == self._db._root:
+            self._set_parent(None)
+            return None
+            
+        self._db._socket.send_json({"GraphCommand": {"Parent": self._rid}})
+        parent = self._db._socket.recv_json()
+        if parent is None:
+            self._set_parent(None)
+            return None
+        
+        self._db._socket.send_json({"ContainerCommand": {"GetWithMetadata": parent}})
+        parent = self._db._socket.recv_json()
+        if parent is None:
+            raise RuntimeError("Could not get container parent")
+        
+        parent = dict_to_container(parent, db = self._db)
+        self._set_parent(parent)
+        return parent
+    
+    def _set_parent(self, parent: OptContainer):
+        """Set the Container's parent
+
+        Args:
+            parent (OptContainer): The Container's parent.
+            `None` represents the root of the current tree.
+        """
+        self._parent = parent
+        self._parent_set = True
+
+class Asset:
+    """
+    An Asset.
+    """
+    def __init__(
+        self,
+        rid: str,
+        file: str,
+        name: OptStr = None,
+        description: OptStr = None,
+        type: OptStr = None,
+        tags: Tags = [],
+        metadata: Metadata = {},
+        db: OptDatabase = None,
+        parent: OptContainer = None,
+    ):
+        """
+        Create a new Asset.
+        """
+        self._rid: str = rid
+        self._file: str = file
+        self._name: OptStr = name
+        self._type: OptStr = type
+        self._description: OptStr = description
+        self._tags: Tags = tags
+        self._metadata: Metadata = metadata
+        self._db = db
+        self._parent = parent
+    
+    @property
+    def name(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Asset's name.
+        """
+        return self._name
+            
+    @property
+    def type(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Asset's type.
+        """
+        return self._type
+    
+    @property
+    def description(self) -> OptStr:
+        """
+        Returns:
+            OptStr: Asset's description.
+        """
+        return self._description
+    
+    @property
+    def tags(self) -> Tags:
+        """
+        Returns:
+            Tags: Asset's tags.
+        """
+        return self._tags
+    
+    @property
+    def metadata(self) -> Metadata:
+        """
+        Returns:
+            Metadata: Asset's metadata.
+        """
+        return self._metadata
+        
+    @property
+    def file(self) -> str:
+        """
+        Returns:
+            str: Asset's file path.
+        """
+        return self._file
+    
+    def parent(self) -> 'Container':
+        """
+        Returns:
+            Asset's Container.
+        """
+        if self._parent is not None:
+            return self._parent
+            
+        if self._db is None:
+            raise RuntimeError("No database connector")
+        
+        self._db._socket.send_json({"AssetCommand": {"Parent": self._rid}})
+        parent = self._db._socket.recv_json()
+        if parent is None:
+            return None
+        
+        self._db._socket.send_json({"ContainerCommand": {"GetWithMetadata": parent["rid"]}})
+        parent = self._db._socket.recv_json()
+        if parent is None:
+            raise RuntimeError("Parent Container could not be retrieved")
+        
+        return dict_to_container(parent, db = self._db)            
+
+def dict_to_container(d: Properties, db: OptDatabase = None) -> Container:
+    """
+    Converts a dictionary to a Container.
+
+    Args:
+        d (dict[str, Any]): Dictionary to convert.
+
+    Returns:
+        Container: Container that the JSON represented.
+    """
+    container =  Container(
+        d["rid"],
+        name = d["properties"]["name"],
+        type = d["properties"]["kind"],
+        description = d["properties"]["description"],
+        tags = d["properties"]["tags"],
+        metadata = d["properties"]["metadata"],
+        db = db
+    )
+    
+    container._assets = list(map(
+        lambda asset: dict_to_asset(asset, db = db, parent = container),
+        d["assets"].values()
+    ))
+    
+    return container
+
+def dict_to_asset(d: Properties, db: OptDatabase = None, parent: OptContainer = None) -> Asset:
+    """
+    Converts a dictionary to an Asset.
+
+    Args:
+        d (dict[str, Any]): Dictionary to convert.
+
+    Returns:
+        Asset: Asset that the JSON represented.
+    """
+    file = d["path"]
+    if "Absolute" not in file:
+        raise ValueError("Asset path must be absolute")
+    
+    return Asset(
+        d["rid"],
+        file["Absolute"],
+        name = d["properties"]["name"],
+        type = d["properties"]["kind"],
+        description = d["properties"]["description"],
+        tags = d["properties"]["tags"],
+        metadata = d["properties"]["metadata"],
+        db = db,
+        parent = parent
+    )
\ No newline at end of file
diff --git a/lang/python/src/thot/types.py b/lang/python/src/thot/types.py
index 60b96161..d75df91f 100644
--- a/lang/python/src/thot/types.py
+++ b/lang/python/src/thot/types.py
@@ -1,5 +1,14 @@
-from typing import Union, List, Any
-
+from typing import Union, Any
+from thot import _LEGACY_
+    
 OptStr = Union[str, None]
-Tags = List[str]
-Metadata = dict[str, Any]
\ No newline at end of file
+
+if _LEGACY_:
+    from typing import List, Dict
+    Tags = List[str]
+    Metadata = Dict[str, Any]
+    Properties = Dict[str, Any]
+else:
+    Tags = list[str]
+    Metadata = dict[str, Any]
+    Properties = dict[str, Any]
\ No newline at end of file
diff --git a/lang/r/NAMESPACE b/lang/r/NAMESPACE
index 0e0774ac..5a06c93e 100644
--- a/lang/r/NAMESPACE
+++ b/lang/r/NAMESPACE
@@ -1,12 +1,16 @@
 # Generated by roxygen2: do not edit by hand
 
 export(add_asset)
+export(children)
 export(database)
 export(find_asset)
 export(find_assets)
 export(find_container)
 export(find_containers)
+export(flag)
+export(parent)
 export(root)
+exportMethods(parent)
 importFrom(R.utils,isAbsolutePath)
 importFrom(jsonlite,fromJSON)
 importFrom(jsonlite,toJSON)
diff --git a/lang/r/R/api.R b/lang/r/R/api.R
index c0a6d534..78d904e3 100644
--- a/lang/r/R/api.R
+++ b/lang/r/R/api.R
@@ -34,7 +34,13 @@ database <- function(dev_root = NULL) {
   root <- container_by_path(socket, escape_str(root_path))
 
   stopifnot(!is.null(root))
-  db <- new("Database", root = root$rid, root_path = root_path, socket = socket)
+  db <-
+    new(
+      "Database",
+      root = root$rid,
+      root_path = root_path,
+      socket = socket
+    )
 }
 
 #' Gets the root Container of the database.
@@ -67,16 +73,27 @@ root <- function(db) {
 #' @examples
 #' db <- database()
 #' containers <- find_containers(db, type = "my_container")
-find_containers <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NULL) {
-  args <- to_json(list(
-    db@root,
-    list(name = name, kind = type, tags = tags, metadata = metadata)
-  ))
+find_containers <-
+  function(db,
+           name = NULL,
+           type = NULL,
+           tags = NULL,
+           metadata = NULL) {
+    args <- to_json(list(
+      db@root,
+      list(
+        name = name,
+        kind = type,
+        tags = tags,
+        metadata = metadata
+      )
+    ))
 
-  cmd <- sprintf('{"ContainerCommand": {"FindWithMetadata": %s}}', args)
-  containers <- send_cmd(db@socket, cmd, result = FALSE)
-  containers |> map(container_from_json)
-}
+    cmd <-
+      sprintf('{"ContainerCommand": {"FindWithMetadata": %s}}', args)
+    containers <- send_cmd(db@socket, cmd, result = FALSE)
+    containers |> map(container_from_json)
+  }
 
 #' Finds a single Container matching the given filter criteria.
 #' If multiple matching Containers are found, a random one is returned.
@@ -93,14 +110,26 @@ find_containers <- function(db, name = NULL, type = NULL, tags = NULL, metadata
 #' @examples
 #' db <- database()
 #' container <- find_container(db, name = "My Container")
-find_container <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NULL) {
-  containers <- find_containers(db, name = name, type = type, tags = tags, metadata = metadata)
-  if (length(containers) > 0) {
-    return(containers[[1]])
-  }
+find_container <-
+  function(db,
+           name = NULL,
+           type = NULL,
+           tags = NULL,
+           metadata = NULL) {
+    containers <-
+      find_containers(
+        db,
+        name = name,
+        type = type,
+        tags = tags,
+        metadata = metadata
+      )
+    if (length(containers) > 0) {
+      return(containers[[1]])
+    }
 
-  NULL
-}
+    NULL
+  }
 
 #' Find Assets matching the given filter criteria.
 #'
@@ -116,16 +145,26 @@ find_container <- function(db, name = NULL, type = NULL, tags = NULL, metadata =
 #' @examples
 #' db <- database()
 #' assets <- find_assets(db, type = "my_asset")
-find_assets <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NULL) {
-  args <- to_json(list(
-    db@root,
-    list(name = name, kind = type, tags = tags, metadata = metadata)
-  ))
+find_assets <-
+  function(db,
+           name = NULL,
+           type = NULL,
+           tags = NULL,
+           metadata = NULL) {
+    args <- to_json(list(
+      db@root,
+      list(
+        name = name,
+        kind = type,
+        tags = tags,
+        metadata = metadata
+      )
+    ))
 
-  cmd <- sprintf('{"AssetCommand": {"FindWithMetadata": %s}}', args)
-  assets <- send_cmd(db@socket, cmd, result = FALSE)
-  assets |> map(asset_from_json)
-}
+    cmd <- sprintf('{"AssetCommand": {"FindWithMetadata": %s}}', args)
+    assets <- send_cmd(db@socket, cmd, result = FALSE)
+    assets |> map(asset_from_json)
+  }
 
 #' Finds a single Asset matching the given filter criteria.
 #' If multiple matching Assets are found, a random one is returned.
@@ -142,14 +181,26 @@ find_assets <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NU
 #' @examples
 #' db <- database()
 #' asset <- find_asset(db, name = "My Asset")
-find_asset <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NULL) {
-  assets <- find_assets(db, name = name, type = type, tags = tags, metadata = metadata)
-  if (length(assets) > 0) {
-    return(assets[[1]])
-  }
+find_asset <-
+  function(db,
+           name = NULL,
+           type = NULL,
+           tags = NULL,
+           metadata = NULL) {
+    assets <-
+      find_assets(
+        db,
+        name = name,
+        type = type,
+        tags = tags,
+        metadata = metadata
+      )
+    if (length(assets) > 0) {
+      return(assets[[1]])
+    }
 
-  NULL
-}
+    NULL
+  }
 
 #' Adds an Asset to the Thot project.
 #' The associated data should be saved at the return path.
@@ -159,7 +210,7 @@ find_asset <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NUL
 #' Use relative paths to place the Asset in a bucket.
 #' @param name Name of the Asset.
 #' @param type Type of the Asset.
-#' @param description Description of the Asset. 
+#' @param description Description of the Asset.
 #' @param tags List of tags for the Asset.
 #' @param metadata Named list of metadata for the Asset.
 #'
@@ -170,15 +221,13 @@ find_asset <- function(db, name = NULL, type = NULL, tags = NULL, metadata = NUL
 #' db <- database()
 #' path <- add_asset(db, "my_file.txt", name = "My Text File")
 #' cat("Hello!", path)
-add_asset <- function(
-  db,
-  file,
-  name = NULL,
-  type = NULL,
-  description = NULL,
-  tags = list(),
-  metadata = list()
-) {
+add_asset <- function(db,
+                      file,
+                      name = NULL,
+                      type = NULL,
+                      description = NULL,
+                      tags = list(),
+                      metadata = list()) {
   asset <- new_asset(
     file,
     name = name,
@@ -198,6 +247,29 @@ add_asset <- function(
   }
 
   # ensure bucket is created
-  dir.create(dirname(path), recursive = TRUE, showWarnings = FALSE)
+  dir.create(dirname(path),
+             recursive = TRUE,
+             showWarnings = FALSE)
   path
 }
+
+#' Flags a resource (Container or Asset).
+#'
+#' @param db Thot database connection.
+#' @param resource Resource to flag.
+#' @param message Flag message.
+#'
+#' @export
+#'
+#' @examples
+#' db <- database()
+#' asset <- db |> find_asset()
+#' db |> flag(asset, "Check me!")
+flag <- function(db, resource, message) {
+  args <- to_json(list(
+    resource = resource@.rid,
+    message = message
+  ))
+  cmd <- sprintf('{"AnalysisCommand": {"Flag": %s}}', args)
+  send_cmd(db@socket, cmd)
+}
diff --git a/lang/r/R/commands.R b/lang/r/R/commands.R
index 5bae6db4..25fd85ab 100644
--- a/lang/r/R/commands.R
+++ b/lang/r/R/commands.R
@@ -30,17 +30,16 @@ send_cmd <- function(socket, cmd, result = TRUE) {
 #' @returns Whether a Thot database is available.
 database_available <- function() {
   server_up <- tryCatch({
-      socketConnection(port = THOT_PORT)
-      TRUE
-    },
-    error = function(cond) {
-      # port not open, no chance for server
-      FALSE
-    },
-    warning = function(cond) {
-      FALSE
-    }
-  )
+    socketConnection(port = THOT_PORT)
+    TRUE
+  },
+  error = function(cond) {
+    # port not open, no chance for server
+    FALSE
+  },
+  warning = function(cond) {
+    FALSE
+  })
 
   if (!server_up) {
     return(FALSE)
@@ -92,7 +91,7 @@ get_container <- function(socket, id) {
 #'
 #' @returns Container's path.
 container_path <- function(socket, id) {
-  cmd <- sprintf('{"ContainerCommand": {"GetPath": "%s"}}', id)
+  cmd <- sprintf('{"ContainerCommand": {"Path": "%s"}}', id)
   send_cmd(socket, cmd, result = FALSE)
 }
 
diff --git a/lang/r/R/common.R b/lang/r/R/common.R
index 1417f6b3..29587e7b 100644
--- a/lang/r/R/common.R
+++ b/lang/r/R/common.R
@@ -28,7 +28,8 @@ to_json <- function(obj) {
 #'
 #' @returns Path to the local database executable for the current system.
 database_server_path <- function() {
-  exe <- switch(Sys.info()["sysname"],
+  exe <- switch(
+    Sys.info()["sysname"],
     "Linux" = "x86_64-unknown-linux-gnu",
     "Darwin" = "aarch64-apple-darwin",
     "Windows" = "x86_64-pc-windows-msvc.exe"
diff --git a/lang/r/R/functions.R b/lang/r/R/functions.R
index bc43763a..8f193483 100644
--- a/lang/r/R/functions.R
+++ b/lang/r/R/functions.R
@@ -23,7 +23,9 @@ thot_container_id <- function() {
 #'
 #' @returns Project path of the resource, or `NULL`.
 project_resource_root_path <- function(path) {
-  cmd <- sprintf('{"ProjectCommand": {"ResourceRootPath": "%s"}}', escape_str(path))
+  cmd <-
+    sprintf('{"ProjectCommand": {"ResourceRootPath": "%s"}}',
+            escape_str(path))
   path <- send_cmd(zmq_socket(), cmd)
   path
 }
@@ -35,48 +37,60 @@ project_resource_root_path <- function(path) {
 #' @param tags List of tags the Asset has to match.
 #' @param metadata Named list of metadata the Asset has to match.
 #'
-#' @returns New core Asset as a list.
-new_asset <- function(file, name = NULL, type = NULL, tags = list(), metadata = list()) {
-  path_type <- if(isAbsolutePath(file)) "Absolute" else "Relative"
-  path_val <- list()
-  path_val[[path_type]] <- file
+#' @returns NewAsset as a list.
+new_asset <-
+  function(file,
+           name = NULL,
+           type = NULL,
+           tags = list(),
+           metadata = list()) {
+    path_type <- if (isAbsolutePath(file))
+      "Absolute"
+    else
+      "Relative"
+    path_val <- list()
+    path_val[[path_type]] <- file
 
-  asset <- list(
-    rid = uuid::UUIDgenerate(),
-    properties = StandardProperties(
-      name = name,
-      type = type,
-      tags = tags,
-      metadata = metadata
-    ),
-    path = path_val
-  )
+    asset <- list(
+      rid = uuid::UUIDgenerate(),
+      properties = StandardProperties(
+        name = name,
+        type = type,
+        tags = tags,
+        metadata = metadata
+      ),
+      path = path_val
+    )
 
-  asset
-}
+    asset
+  }
 
 
 #' Create a new `StandardProperties` list.
-#' 
+#'
 #' @param name Name of the Asset to match.
 #' @param type Type of the Asset to match.
 #' @param tags List of tags the Asset has to match.
 #' @param metadata Named list of metadata the Asset has to match.
 #'
 #' @returns Standard properties as a named list.
-StandardProperties <- function(name = NULL, type = NULL, tags = list(), metadata = list()) {
-  user <- active_user()
-  if (!is.null(user)) {
-    user <- list(Id = user$rid)
-  }
+StandardProperties <-
+  function(name = NULL,
+           type = NULL,
+           tags = list(),
+           metadata = list()) {
+    user <- active_user()
+    if (!is.null(user)) {
+      user <- list(Id = user$rid)
+    }
 
-  list(
-    created = utc_now(),
-    creator = list(User = user),
-    name = name,
-    kind = type,
-    description = NULL,
-    tags = tags,
-    metadata = metadata
-  )
-}
+    list(
+      created = utc_now(),
+      creator = list(User = user),
+      name = name,
+      kind = type,
+      description = NULL,
+      tags = tags,
+      metadata = metadata
+    )
+  }
diff --git a/lang/r/R/resources.R b/lang/r/R/resources.R
index 2c371f8c..fdc7b0df 100644
--- a/lang/r/R/resources.R
+++ b/lang/r/R/resources.R
@@ -1,19 +1,19 @@
-setClassUnion("OptionChar", c("character", "NULL"))
+setClassUnion("OptChar", c("character", "NULL"))
 
-setClass(
-  'Database',
-  slots = list(
-    root = "character",
-    root_path = "character",
-    socket = "externalptr"
-  )
-)
+setClass("Database",
+         slots = list(
+           root = "character",
+           root_path = "character",
+           socket = "externalptr"
+         ))
 
 setClass(
-  'Container',
+  "Container",
   slots = list(
-    name = "OptionChar",
-    type = "OptionChar",
+    .rid = "character",
+    name = "OptChar",
+    type = "OptChar",
+    description = "OptChar",
     tags = "list",
     metadata = "list",
     assets = "list"
@@ -21,36 +21,91 @@ setClass(
 )
 
 setClass(
-  'Asset',
+  "Asset",
   slots = list(
-    name = "OptionChar",
-    type = "OptionChar",
+    .rid = "character",
+    name = "OptChar",
+    type = "OptChar",
+    description = "OptChar",
     tags = "list",
     metadata = "list",
-    file = "OptionChar"
+    file = "OptChar"
   )
 )
 
 #' Create a new Asset.
 #'
+#' @param rid Resource id.
 #' @param file File path.
 #' @param name Name.
 #' @param type Type.
+#' @param description Description.
 #' @param tags List of tags.
 #' @param metadata List of metadata.
-Asset <- function(file, name = NULL, type = NULL, tags = list(), metadata = list()) {
-  new("Asset", file = file, name = name, type = type, tags = tags, metadata = metadata)
+Asset <- function(rid,
+                  file,
+                  name = NULL,
+                  type = NULL,
+                  description = NULL,
+                  tags = list(),
+                  metadata = list()) {
+  new(
+    "Asset",
+    .rid = rid,
+    file = file,
+    name = name,
+    type = type,
+    description = description,
+    tags = tags,
+    metadata = metadata
+  )
 }
 
-#' Create a new Asset.
+#' Create a new Container.
 #'
+#' @param rid Resource id.
 #' @param name Name.
 #' @param type Type.
+#' @param description Description.
 #' @param tags List of tags.
 #' @param metadata List of metadata.
 #' @param assets List of Assets.
-Container <- function(name = NULL, type = NULL, tags = list(), metadata = list(), assets=list()) {
-  new("Container", name = name, type = type, tags = tags, metadata = metadata, assets = assets)
+Container <- function(rid,
+                      name = NULL,
+                      type = NULL,
+                      description = NULL,
+                      tags = list(),
+                      metadata = list(),
+                      assets = list()) {
+  new(
+    "Container",
+    .rid = rid,
+    name = name,
+    type = type,
+    description = description,
+    tags = tags,
+    metadata = metadata,
+    assets = assets
+  )
+}
+
+#' Converts a list of properties to an Asset.
+#' The list should mirror the structure of the JSON representation of an Asset.
+#'
+#' @param asset List of properties.
+#'
+#' @returns Asset.
+asset_from_json <- function(asset) {
+  properties <- asset$properties
+  Asset(
+    rid = asset$rid,
+    file = asset$path[[1]],
+    name = properties$name,
+    type = properties$kind,
+    description = properties$description,
+    tags = properties$tags,
+    metadata = properties$metadata
+  )
 }
 
 #' Converts a list of properties to a Container.
@@ -66,27 +121,109 @@ container_from_json <- function(container) {
   # convert container
   properties <- container$properties
   Container(
+    rid = container$rid,
     name = properties$name,
-    type = properties$type,
+    type = properties$kind,
+    description = properties$description,
     tags = properties$tag,
     metadata = properties$metadata,
     assets = assets
   )
 }
 
-#' Converts a list of properties to an Asset.
-#' The list should mirror the structure of the JSON representation of an Asset.
+#' Gets the children of the Container.
 #'
-#' @param asset List of properties.
+#' @param db Thot database connection.
+#' @param container Thot Container.
 #'
-#' @returns Asset.
-asset_from_json <- function(asset) {
-  properties <- asset$properties
-  Asset(
-    file = asset$path[[1]],
-    name = properties$name,
-    type = properties$kind,
-    tags = properties$tags,
-    metadata = properties$metadata
-  )
+#' @returns List of the Container's children.
+#' @export
+#'
+#' @examples
+#' db <- database()
+#' container <- db |> find_container(type = "child")
+#' childs <- db |> children(container)
+children <- function(db, container) {
+  cmd <-
+    sprintf('{"GraphCommand": {"Children": %s}}',
+            to_json(container@.rid))
+
+  children_ids <- send_cmd(db@socket, cmd, result = FALSE)
+  childs <- vector("list", length(children_ids))
+  for (i in seq_along(children_ids)) {
+    cmd <-
+      sprintf('{"ContainerCommand": {"GetWithMetadata": %s}}',
+              to_json(children_ids[[i]]))
+
+    container <- send_cmd(db@socket, cmd, result = FALSE)
+    childs[[i]] <- container_from_json(container)
+  }
+
+  childs
 }
+
+#' Get the parent of a resource.
+#'
+#' @param db Thot database connection.
+#' @param resource Thot resource.
+#'
+#' @returns Parent of the resource, or `NULL` if it does not exist in the current context.
+#' @export
+setGeneric("parent", function(db, resource)
+  standardGeneric("parent"))
+
+#' Gets the parent of the Container within the database context.
+#'
+#' @param db Thot database connection.
+#' @param resource Thot Container.
+#'
+#' @returns Container's parent or `NULL` if the root of the database.
+#' @export
+#'
+#' @examples
+#' db <- database()
+#' container <- db |> find_container(type = "child")
+#' parent <- db |> parent(container)
+setMethod("parent", signature(db = "Database", resource = "Container"), function(db, resource) {
+  if (resource@.rid == db@root) {
+    return(NULL)
+  }
+
+  cmd <-
+    sprintf('{"GraphCommand": {"Parent": %s}}', to_json(resource@.rid))
+
+  container <- send_cmd(db@socket, cmd, result = FALSE)
+
+  cmd <-
+    sprintf('{"ContainerCommand": {"GetWithMetadata": %s}}',
+            to_json(container))
+
+  container <- send_cmd(db@socket, cmd, result = FALSE)
+  container_from_json(container)
+})
+
+#' Gets the parent of the Asset.
+#'
+#' @param db Thot database connection.
+#' @param resource Thot Asset.
+#'
+#' @returns Asset's parent Container.
+#' @export
+#'
+#' @examples
+#' db <- database()
+#' asset <- db |> find_asset(type = "data")
+#' container <- db |> parent(asset)
+setMethod("parent", signature(db = "Database", resource = "Asset"), function(db, resource) {
+  cmd <-
+    sprintf('{"AssetCommand": {"Parent": %s}}', to_json(resource@.rid))
+
+  container <- send_cmd(db@socket, cmd, result = FALSE)
+
+  cmd <-
+    sprintf('{"ContainerCommand": {"GetWithMetadata": %s}}',
+            to_json(container$rid))
+
+  container <- send_cmd(db@socket, cmd, result = FALSE)
+  container_from_json(container)
+})
diff --git a/lang/r/inst/thot-local-database-aarch64-apple-darwin b/lang/r/inst/thot-local-database-aarch64-apple-darwin
index 9ba0b361..2ab55d0f 100755
Binary files a/lang/r/inst/thot-local-database-aarch64-apple-darwin and b/lang/r/inst/thot-local-database-aarch64-apple-darwin differ
diff --git a/lang/r/inst/thot-local-database-x86_64-apple-darwin b/lang/r/inst/thot-local-database-x86_64-apple-darwin
index 74a6d706..006404da 100755
Binary files a/lang/r/inst/thot-local-database-x86_64-apple-darwin and b/lang/r/inst/thot-local-database-x86_64-apple-darwin differ
diff --git a/lang/r/inst/thot-local-database-x86_64-pc-windows-msvc.exe b/lang/r/inst/thot-local-database-x86_64-pc-windows-msvc.exe
index b3a93fe8..52517b7c 100644
Binary files a/lang/r/inst/thot-local-database-x86_64-pc-windows-msvc.exe and b/lang/r/inst/thot-local-database-x86_64-pc-windows-msvc.exe differ
diff --git a/lang/r/inst/thot-local-database-x86_64-unknown-linux-gnu b/lang/r/inst/thot-local-database-x86_64-unknown-linux-gnu
index ae35ee3f..cc764f7c 100755
Binary files a/lang/r/inst/thot-local-database-x86_64-unknown-linux-gnu and b/lang/r/inst/thot-local-database-x86_64-unknown-linux-gnu differ
diff --git a/lang/r/man/Asset.Rd b/lang/r/man/Asset.Rd
index 0a95ce6d..38f125f9 100644
--- a/lang/r/man/Asset.Rd
+++ b/lang/r/man/Asset.Rd
@@ -4,15 +4,27 @@
 \alias{Asset}
 \title{Create a new Asset.}
 \usage{
-Asset(file, name = NULL, type = NULL, tags = list(), metadata = list())
+Asset(
+  rid,
+  file,
+  name = NULL,
+  type = NULL,
+  description = NULL,
+  tags = list(),
+  metadata = list()
+)
 }
 \arguments{
+\item{rid}{Resource id.}
+
 \item{file}{File path.}
 
 \item{name}{Name.}
 
 \item{type}{Type.}
 
+\item{description}{Description.}
+
 \item{tags}{List of tags.}
 
 \item{metadata}{List of metadata.}
diff --git a/lang/r/man/Container.Rd b/lang/r/man/Container.Rd
index d000be1a..4bbd7caf 100644
--- a/lang/r/man/Container.Rd
+++ b/lang/r/man/Container.Rd
@@ -2,21 +2,27 @@
 % Please edit documentation in R/resources.R
 \name{Container}
 \alias{Container}
-\title{Create a new Asset.}
+\title{Create a new Container.}
 \usage{
 Container(
+  rid,
   name = NULL,
   type = NULL,
+  description = NULL,
   tags = list(),
   metadata = list(),
   assets = list()
 )
 }
 \arguments{
+\item{rid}{Resource id.}
+
 \item{name}{Name.}
 
 \item{type}{Type.}
 
+\item{description}{Description.}
+
 \item{tags}{List of tags.}
 
 \item{metadata}{List of metadata.}
@@ -24,5 +30,5 @@ Container(
 \item{assets}{List of Assets.}
 }
 \description{
-Create a new Asset.
+Create a new Container.
 }
diff --git a/lang/r/man/StandardProperties.Rd b/lang/r/man/StandardProperties.Rd
index ae993e81..95592a79 100644
--- a/lang/r/man/StandardProperties.Rd
+++ b/lang/r/man/StandardProperties.Rd
@@ -4,10 +4,19 @@
 \alias{StandardProperties}
 \title{Create a new \code{StandardProperties} list.}
 \usage{
-StandardProperties()
+StandardProperties(name = NULL, type = NULL, tags = list(), metadata = list())
+}
+\arguments{
+\item{name}{Name of the Asset to match.}
+
+\item{type}{Type of the Asset to match.}
+
+\item{tags}{List of tags the Asset has to match.}
+
+\item{metadata}{Named list of metadata the Asset has to match.}
 }
 \value{
-Default standard properties as a named list.
+Standard properties as a named list.
 }
 \description{
 Create a new \code{StandardProperties} list.
diff --git a/lang/r/man/add_asset.Rd b/lang/r/man/add_asset.Rd
index 7f4db97e..19252749 100644
--- a/lang/r/man/add_asset.Rd
+++ b/lang/r/man/add_asset.Rd
@@ -5,20 +5,31 @@
 \title{Adds an Asset to the Thot project.
 The associated data should be saved at the return path.}
 \usage{
-add_asset(db, file, name = NULL, type = NULL, tags = list(), metadata = list())
+add_asset(
+  db,
+  file,
+  name = NULL,
+  type = NULL,
+  description = NULL,
+  tags = list(),
+  metadata = list()
+)
 }
 \arguments{
 \item{db}{Thot database connection.}
 
-\item{file}{File name of the associated data. Use relative paths to place the Asset in a bucket.}
+\item{file}{File name of the associated data.
+Use relative paths to place the Asset in a bucket.}
 
-\item{name}{Name of the Asset to match.}
+\item{name}{Name of the Asset.}
 
-\item{type}{Type of the Asset to match.}
+\item{type}{Type of the Asset.}
 
-\item{tags}{List of tags the Asset has to match.}
+\item{description}{Description of the Asset.}
 
-\item{metadata}{Named list of metadata the Asset has to match.}
+\item{tags}{List of tags for the Asset.}
+
+\item{metadata}{Named list of metadata for the Asset.}
 }
 \value{
 Path to save the Asset's related data to.
diff --git a/lang/r/man/children.Rd b/lang/r/man/children.Rd
new file mode 100644
index 00000000..fc4d739c
--- /dev/null
+++ b/lang/r/man/children.Rd
@@ -0,0 +1,24 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/resources.R
+\name{children}
+\alias{children}
+\title{Gets the children of the Container.}
+\usage{
+children(db, container)
+}
+\arguments{
+\item{db}{Thot database connection.}
+
+\item{container}{Thot Container.}
+}
+\value{
+List of the Container's children.
+}
+\description{
+Gets the children of the Container.
+}
+\examples{
+db <- database()
+container <- db |> find_container(type = "child")
+childs <- db |> children(container)
+}
diff --git a/lang/r/man/flag.Rd b/lang/r/man/flag.Rd
new file mode 100644
index 00000000..6e8c9c79
--- /dev/null
+++ b/lang/r/man/flag.Rd
@@ -0,0 +1,23 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/api.R
+\name{flag}
+\alias{flag}
+\title{Flags a resource (Container or Asset).}
+\usage{
+flag(db, resource, message)
+}
+\arguments{
+\item{db}{Thot database connection.}
+
+\item{resource}{Resource to flag.}
+
+\item{message}{Flag message.}
+}
+\description{
+Flags a resource (Container or Asset).
+}
+\examples{
+db <- database()
+asset <- db |> find_asset()
+db |> flag(asset, "Check me!")
+}
diff --git a/lang/r/man/new_asset.Rd b/lang/r/man/new_asset.Rd
index df06dffb..20a4759c 100644
--- a/lang/r/man/new_asset.Rd
+++ b/lang/r/man/new_asset.Rd
@@ -18,7 +18,7 @@ new_asset(file, name = NULL, type = NULL, tags = list(), metadata = list())
 \item{metadata}{Named list of metadata the Asset has to match.}
 }
 \value{
-New core Asset as a list.
+NewAsset as a list.
 }
 \description{
 Creates a new core Asset.
diff --git a/lang/r/man/parent-Database-Asset-method.Rd b/lang/r/man/parent-Database-Asset-method.Rd
new file mode 100644
index 00000000..2afb41fa
--- /dev/null
+++ b/lang/r/man/parent-Database-Asset-method.Rd
@@ -0,0 +1,24 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/resources.R
+\name{parent,Database,Asset-method}
+\alias{parent,Database,Asset-method}
+\title{Gets the parent of the Asset.}
+\usage{
+\S4method{parent}{Database,Asset}(db, resource)
+}
+\arguments{
+\item{db}{Thot database connection.}
+
+\item{resource}{Thot Asset.}
+}
+\value{
+Asset's parent Container.
+}
+\description{
+Gets the parent of the Asset.
+}
+\examples{
+db <- database()
+asset <- db |> find_asset(type = "data")
+container <- db |> parent(asset)
+}
diff --git a/lang/r/man/parent-Database-Container-method.Rd b/lang/r/man/parent-Database-Container-method.Rd
new file mode 100644
index 00000000..eea63002
--- /dev/null
+++ b/lang/r/man/parent-Database-Container-method.Rd
@@ -0,0 +1,24 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/resources.R
+\name{parent,Database,Container-method}
+\alias{parent,Database,Container-method}
+\title{Gets the parent of the Container within the database context.}
+\usage{
+\S4method{parent}{Database,Container}(db, resource)
+}
+\arguments{
+\item{db}{Thot database connection.}
+
+\item{resource}{Thot Container.}
+}
+\value{
+Container's parent or \code{NULL} if the root of the database.
+}
+\description{
+Gets the parent of the Container within the database context.
+}
+\examples{
+db <- database()
+container <- db |> find_container(type = "child")
+parent <- db |> parent(container)
+}
diff --git a/lang/r/man/parent.Rd b/lang/r/man/parent.Rd
new file mode 100644
index 00000000..ca5d0c14
--- /dev/null
+++ b/lang/r/man/parent.Rd
@@ -0,0 +1,19 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/resources.R
+\name{parent}
+\alias{parent}
+\title{Get the parent of a resource.}
+\usage{
+parent(db, resource)
+}
+\arguments{
+\item{db}{Thot database connection.}
+
+\item{resource}{Thot resource.}
+}
+\value{
+Parent of the resource, or \code{NULL} if it does not exist in the current context.
+}
+\description{
+Get the parent of a resource.
+}
diff --git a/lang/rust/Cargo.toml b/lang/rust/Cargo.toml
index 0fe26a4d..644aa5bd 100644
--- a/lang/rust/Cargo.toml
+++ b/lang/rust/Cargo.toml
@@ -15,3 +15,9 @@ categories = [ "science" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+serde = "1.0"
+serde_json = "1.0"
+
+thot-core = { path = "../../core" }
+thot-local = { path = "../../local" }
+thot-local-database = { path = "../../local/database", features = ["client"] }
diff --git a/lang/src/database.rs b/lang/rust/src/database.rs
similarity index 88%
rename from lang/src/database.rs
rename to lang/rust/src/database.rs
index 3ef7c1f4..709fc0ec 100644
--- a/lang/src/database.rs
+++ b/lang/rust/src/database.rs
@@ -44,24 +44,22 @@ impl Database {
         // resolve root
         let root_path = if thot_runner::dev_mode() {
             let Some(dev_root) = dev_root else {
-                return Err(Error::Value(
-                    "`dev_root` must be specified".into(),
-                ));
+                return Err(Error::Value("`dev_root` must be specified".into()));
             };
 
             dev_root
         } else {
             // TODO: Pass Container path instead of id?
             let Ok(root_id) = env::var(CONTAINER_ID_KEY) else {
-                return Err(Error::Runtime(
-                    format!("could not get `{:}`", CONTAINER_ID_KEY)
-                ));
+                return Err(Error::Runtime(format!(
+                    "could not get `{CONTAINER_ID_KEY}`"
+                )));
             };
 
             let root_id = ResourceId::from_str(&root_id)
                 .expect("could not convert `THOT_CONTAINER_ID` to `ResourceId`");
 
-            let root_path = db.send(ContainerCommand::GetPath(root_id).into());
+            let root_path = db.send(ContainerCommand::Path(root_id).into())?;
             let root_path: Option<PathBuf> = serde_json::from_value(root_path)
                 .expect("could not convert result of `GetPath` to `PathBuf`");
 
@@ -74,10 +72,12 @@ impl Database {
 
         // get project id
         let Ok(project_path) = project_resource_root_path(&root_path) else {
-                return Err(Error::Runtime("Root path is not a resource in a Thot project".into()));
+            return Err(Error::Runtime(
+                "Root path is not a resource in a Thot project".into(),
+            ));
         };
 
-        let project = db.send(ProjectCommand::Load(project_path).into());
+        let project = db.send(ProjectCommand::Load(project_path).into())?;
         let project: DbResult<Project> = serde_json::from_value(project)
             .expect("could not convert result of `Load` to `Project`");
 
@@ -86,7 +86,7 @@ impl Database {
         };
 
         // load tree
-        let graph = db.send(GraphCommand::Load(project.rid.clone()).into());
+        let graph = db.send(GraphCommand::Load(project.rid.clone()).into())?;
         let graph: DbResult<ContainerTree> =
             serde_json::from_value(graph).expect("could not convert result of `Load` to graph");
 
@@ -95,7 +95,7 @@ impl Database {
         };
 
         // get root container
-        let root = db.send(ContainerCommand::ByPath(root_path.clone()).into());
+        let root = db.send(ContainerCommand::ByPath(root_path.clone()).into())?;
         let root: Option<Container> = serde_json::from_value(root)
             .expect("could not convert result of `ByPath` to `Container`");
 
@@ -114,7 +114,7 @@ impl Database {
     pub fn root(&self) -> Result<Container> {
         let root = self
             .db
-            .send(ContainerCommand::Get(self.root.clone()).into());
+            .send(ContainerCommand::Get(self.root.clone()).into())?;
 
         let root: Option<Container> = serde_json::from_value(root)
             .expect("could not convert result of `GetContainer` to `Container`");
@@ -136,7 +136,7 @@ impl Database {
     pub fn find_containers(&self, filter: StdFilter) -> Result<HashSet<Container>> {
         let containers = self
             .db
-            .send(ContainerCommand::FindWithMetadata(self.root.clone(), filter).into());
+            .send(ContainerCommand::FindWithMetadata(self.root.clone(), filter).into())?;
 
         let containers: HashSet<Container> = serde_json::from_value(containers)
             .expect("could not convert result of `Find` to `HashSet<Container>`");
@@ -152,9 +152,13 @@ impl Database {
 
     /// Finds all Assets matching the search filter.
     pub fn find_assets(&self, filter: StdFilter) -> Result<HashSet<Asset>> {
-        let assets = self
-            .db
-            .send(AssetCommand::FindWithMetadata(self.root.clone(), filter).into());
+        let assets = self.db.send(
+            AssetCommand::FindWithMetadata {
+                root: self.root.clone(),
+                filter,
+            }
+            .into(),
+        )?;
 
         let assets: HashSet<Asset> = serde_json::from_value(assets)
             .expect("could not convert result of `Find` to `HashSet<Asset>`");
@@ -174,16 +178,20 @@ impl Database {
     pub fn add_asset(&self, asset: Asset) -> Result<PathBuf> {
         let root = self
             .db
-            .send(ContainerCommand::Get(self.root.clone()).into());
+            .send(ContainerCommand::Get(self.root.clone()).into())?;
 
         let root: Container =
             serde_json::from_value(root).expect("could not convert result of `Get` to `Container`");
 
         let asset_path = asset.path.clone();
         let bucket = asset.bucket();
-        let res = self
-            .db
-            .send(AssetCommand::Add(asset, root.rid.clone()).into());
+        let res = self.db.send(
+            AssetCommand::Add {
+                asset,
+                container: root.rid.clone(),
+            }
+            .into(),
+        )?;
 
         let res: DbResult<Option<Asset>> = serde_json::from_value(res)
             .expect("could not convert result of `Add` to `Option<Asset>`");
@@ -208,7 +216,3 @@ impl Database {
         Ok(path.into())
     }
 }
-
-#[cfg(test)]
-#[path = "./database_test.rs"]
-mod database_test;
diff --git a/lang/src/error.rs b/lang/rust/src/error.rs
similarity index 54%
rename from lang/src/error.rs
rename to lang/rust/src/error.rs
index a9eb051c..236eaf81 100644
--- a/lang/src/error.rs
+++ b/lang/rust/src/error.rs
@@ -1,5 +1,6 @@
 //! Crate errors.
 use std::result::Result as StdResult;
+use thot_local_database::Error as DbError;
 
 #[derive(Debug)]
 pub enum Error {
@@ -10,10 +11,15 @@ pub enum Error {
 
     /// A value error.
     Value(String),
+
+    /// `thot_local_database` error.
+    Database(DbError),
 }
 
-pub type Result<T = ()> = StdResult<T, Error>;
+impl From<DbError> for Error {
+    fn from(err: DbError) -> Self {
+        Self::Database(err)
+    }
+}
 
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
+pub type Result<T = ()> = StdResult<T, Error>;
diff --git a/lang/rust/src/lib.rs b/lang/rust/src/lib.rs
index dd6037d9..70de1420 100644
--- a/lang/rust/src/lib.rs
+++ b/lang/rust/src/lib.rs
@@ -1,4 +1,7 @@
-#[cfg(test)]
-mod tests {
+//! Base language binding functionality for Thot.
+pub mod database;
+pub mod error;
 
-}
+// Re-exports
+pub use database::Database;
+pub use error::{Error, Result};
diff --git a/lang/src/database_test.rs b/lang/src/database_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/lang/src/error_test.rs b/lang/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/lang/src/lib.rs b/lang/src/lib.rs
deleted file mode 100644
index 70de1420..00000000
--- a/lang/src/lib.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Base language binding functionality for Thot.
-pub mod database;
-pub mod error;
-
-// Re-exports
-pub use database::Database;
-pub use error::{Error, Result};
diff --git a/local/Cargo.toml b/local/Cargo.toml
index 79df5b35..328e02ae 100644
--- a/local/Cargo.toml
+++ b/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-local"
-version = "0.10.0-intermediate"
+version = "0.10.1"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -15,28 +15,28 @@ categories = [ "science", "data-structures" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aquamarine = "0.1"  # @todo: Only needed for documentation.
-cluFlock = { version = "1.2.7", optional = true }
+aquamarine = { wrokspace = true }  # TODO Only needed for documentation.
 derivative = "2.2"
-directories = { version = "4.0", optional = true }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0" }
-uuid = { version = "1.2.1", features = ["serde", "v4"] }
-validator = "0.14"
+directories = { workspace = true, optional = true }
+glob = { version = "0.3.1", optional = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+regex = "1.9.5"
+thiserror = { workspace = true }
+tracing = {workspace = true }
+uuid = { workspace = true, features = ["serde", "v4"] }
+validator = "0.16"
 
 has_id = { path  = "../has_id", features = ["derive", "serde"] }
-settings_manager = { path = "../settings_manager", optional = true }
 thot-core = { path = "../core", features = ["serde"] }
-tracing = "0.1.37"
 
 [dev-dependencies]
 rand = "0.8"
 fake = "2.4"
 lazy_static = "1.4.0"
 
-settings_manager_change_path = { path = "../settings_manager/settings_manager_change_path" }
-dev_utils = { path = "../dev_utils" }
+dev_utils = { path = "../dev_utils", features = ["thot_core"] }
 
 [features]
 default = ["fs"]
-fs = ["dep:cluFlock", "dep:directories", "dep:settings_manager"]
+fs = ["dep:directories", "dep:glob"]
diff --git a/local/database/Cargo.toml b/local/database/Cargo.toml
index 8728b869..7ee25a6e 100644
--- a/local/database/Cargo.toml
+++ b/local/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-local-database"
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -15,27 +15,30 @@ categories = [ "science", "data-structures" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+futures = "0.3.28"
+notify = { version = "6.1", default-features = false, features = ["macos_kqueue"], optional = true}
+notify-debouncer-full = { version = "0.3", default-features = false, optional = true}
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+thiserror = "1.0.44"
 tracing = "0.1.37"
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.16", features = ["time", "json"] }
-trash = { version = "3.0.2", optional = true }
+trash = { version = "3.0", optional = true }
 zmq = { version = "0.10", optional = true }
 
 has_id = { path = "../../has_id", optional = true }
-settings_manager = { path = "../../settings_manager", optional = true }
 thot-core = { path = "../../core" }
 thot-local = { path = "..", default-features = false }
-
+indexmap = { version = "2.1.0", features = ["serde"] }
 
 [dev-dependencies]
 rand = "0.8"
 fake = "2.4"
 lazy_static = "1.4"
 
-dev_utils = { path = "../../dev_utils" }
+dev_utils = { path = "../../dev_utils", features = ["thot_core"] }
 
 [features]
-server = ["dep:zmq", "dep:settings_manager", "thot-local/fs", "dep:has_id", "dep:trash"]
+server = ["dep:zmq", "thot-local/fs", "dep:has_id", "dep:trash", "dep:notify", "dep:notify-debouncer-full"]
 client = ["dep:zmq"]
diff --git a/local/database/build.bat b/local/database/build.bat
old mode 100644
new mode 100755
diff --git a/local/database/build_aarch64.sh b/local/database/build_aarch64.sh
new file mode 100755
index 00000000..16b6cd3e
--- /dev/null
+++ b/local/database/build_aarch64.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+root=../..
+releases=${root}/target/release
+target=aarch64-apple-darwin
+target_file=thot-local-database-${target}
+target_out=${releases}/${target_file}
+
+mkdir -p ${dir}
+cargo build --release -F server --target ${target}
+build_path=${root}/target/${target}/release/thot-local-database
+mv ${build_path} ${target_out}
+
+# copy to other packages
+lang=${root}/lang
+python_path=${lang}/python/src/thot/bin
+r_path=${lang}/r/inst
+
+cp ${target_out} ${python_path}
+cp ${target_out} ${r_path}
+
+chmod a+x ${python_path}/${target_file} ${r_path}/${target_file}
diff --git a/local/database/build_from_m1_to_intel.sh b/local/database/build_x86_64.sh
old mode 100644
new mode 100755
similarity index 83%
rename from local/database/build_from_m1_to_intel.sh
rename to local/database/build_x86_64.sh
index 2005f5fd..8099fc6a
--- a/local/database/build_from_m1_to_intel.sh
+++ b/local/database/build_x86_64.sh
@@ -10,11 +10,10 @@ mkdir -p ${dir}
 cargo build --release -F server --target ${target}
 build_path=${root}/target/${target}/release/thot-local-database
 mv ${build_path} ${target_out}
-# mv ${releases}/thot-local-database ${target_out}
 
 # copy to other packages
 lang=${root}/lang
-python_path=${lang}/python/python/thot/package_data
+python_path=${lang}/python/src/thot/bin
 r_path=${lang}/r/inst
 
 cp ${target_out} ${python_path}
diff --git a/local/database/cli/Cargo.toml b/local/database/cli/Cargo.toml
new file mode 100644
index 00000000..63d7a8b9
--- /dev/null
+++ b/local/database/cli/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "thot-local-database-cli"
+version = "0.0.1"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+clap = { version = "4.4.6", features = ["derive"] }
+serde = "1.0.190"
+serde_json = "1.0.107"
+tracing = "0.1.37"
+tracing-appender = "0.2.2"
+tracing-subscriber = { version = "0.3.16", features = ["time", "json"] }
+zmq = "0.10.0"
+
+thot-core = { path = "../../../core", features=["clap"] }
+thot-local = { path = "../../../local" }
+thot-local-database = { path = "..", features = ["client"] }
+notify-debouncer-full = "0.3.1"
+notify = "6.1.1"
diff --git a/cli/src/commands/project/move_test.rs b/local/database/cli/src/lib.rs
similarity index 100%
rename from cli/src/commands/project/move_test.rs
rename to local/database/cli/src/lib.rs
diff --git a/local/database/cli/src/main.rs b/local/database/cli/src/main.rs
new file mode 100644
index 00000000..968753ae
--- /dev/null
+++ b/local/database/cli/src/main.rs
@@ -0,0 +1,206 @@
+use clap::{Parser, Subcommand};
+use notify::Watcher;
+use std::io;
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+use thot_local_database::constants;
+
+const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
+
+#[derive(Parser, Debug)]
+#[clap(name = "Thot Local Database CLI", author, version, about, long_about = None)]
+struct Cli {
+    #[clap(subcommand)]
+    command: Command,
+}
+
+fn main() {
+    let cli = Cli::parse();
+    match cli.command {
+        Command::Pub => publ().unwrap(),
+        Command::Sub => sub().unwrap(),
+        Command::Req => req().unwrap(),
+        Command::Rep => rep().unwrap(),
+        Command::WatchFs { path, no_debounce } => {
+            if no_debounce {
+                watch_file_system(&path);
+            } else {
+                watch_file_system_debounce(&path);
+            }
+        }
+    }
+}
+
+fn publ() -> zmq::Result<()> {
+    let zmq_context = zmq::Context::new();
+    let zmq_socket = zmq_context.socket(zmq::PUB).unwrap();
+    zmq_socket
+        .bind(&thot_local_database::common::zmq_url(zmq::PUB).unwrap())
+        .unwrap();
+
+    let stdin = io::stdin();
+    let mut message = String::new();
+    loop {
+        stdin.read_line(&mut message).unwrap();
+        zmq_socket.send(&constants::PUB_SUB_TOPIC, zmq::SNDMORE)?;
+        zmq_socket.send(&message, 0)?;
+        message.clear();
+    }
+}
+
+fn sub() -> zmq::Result<()> {
+    let zmq_context = zmq::Context::new();
+    let zmq_socket = zmq_context.socket(zmq::SUB).unwrap();
+    zmq_socket.connect(&thot_local_database::common::zmq_url(zmq::SUB).unwrap())?;
+    zmq_socket
+        .set_subscribe(constants::PUB_SUB_TOPIC.as_bytes())
+        .unwrap();
+
+    loop {
+        let messages = match zmq_socket.recv_multipart(0) {
+            Ok(msg) => msg,
+            Err(err) => {
+                tracing::debug!(?err);
+                continue;
+            }
+        };
+
+        let messages = messages
+            .into_iter()
+            .map(|msg| zmq::Message::try_from(msg).unwrap())
+            .collect::<Vec<_>>();
+
+        let topic = messages.get(0).unwrap().as_str().unwrap();
+        let mut message = String::new();
+        for msg in messages.iter().skip(1) {
+            message.push_str(msg.as_str().unwrap());
+        }
+
+        match serde_json::from_str::<thot_local_database::event::Update>(&message) {
+            Ok(message) => println!(
+                "{topic}\n{}\n",
+                serde_json::to_string_pretty(&message).unwrap()
+            ),
+            Err(err) => println!("[could not decode: {err:?}]\n{topic}\n{message:?}\n"),
+        }
+    }
+}
+
+fn req() -> zmq::Result<()> {
+    let zmq_context = zmq::Context::new();
+    let zmq_socket = zmq_context.socket(zmq::REQ)?;
+    zmq_socket.connect(&thot_local_database::common::zmq_url(zmq::REQ).unwrap())?;
+
+    let stdin = io::stdin();
+    let mut message = String::new();
+    loop {
+        stdin.read_line(&mut message).unwrap();
+        zmq_socket.send(&message, 0)?;
+        message.clear();
+    }
+}
+
+fn rep() -> zmq::Result<()> {
+    let zmq_context = zmq::Context::new();
+    let zmq_socket = zmq_context.socket(zmq::REP).unwrap();
+    zmq_socket.bind(&thot_local_database::common::zmq_url(zmq::REP).unwrap())?;
+
+    loop {
+        let msg = zmq_socket.recv_msg(0)?;
+        println!("{:?}", msg.as_str().unwrap());
+    }
+}
+
+fn watch_file_system(path: impl AsRef<Path>) {
+    let mut watcher = notify::recommended_watcher(|res| match res {
+        Ok(event) => println!("{event:?}"),
+        Err(err) => println!("ERROR {err:?}"),
+    })
+    .unwrap();
+
+    watcher
+        .watch(path.as_ref(), notify::RecursiveMode::Recursive)
+        .unwrap();
+
+    loop {}
+}
+
+#[cfg(target_os = "macos")]
+fn watch_file_system_debounce(path: impl AsRef<Path>) {
+    let path = path.as_ref();
+    let mut watcher: notify_debouncer_full::Debouncer<notify::PollWatcher, _> = {
+        let config = notify::Config::default()
+            .with_poll_interval(DEBOUNCE_TIMEOUT)
+            .with_compare_contents(true);
+
+        notify_debouncer_full::new_debouncer_opt(
+            DEBOUNCE_TIMEOUT,
+            None,
+            move |events: notify_debouncer_full::DebounceEventResult| {
+                println!("{events:?}");
+            },
+            notify_debouncer_full::FileIdMap::new(),
+            config,
+        )
+        .unwrap()
+    };
+
+    watcher
+        .watcher()
+        .watch(path, notify::RecursiveMode::Recursive)
+        .unwrap();
+
+    watcher
+        .cache()
+        .add_root(path, notify::RecursiveMode::Recursive);
+
+    loop {}
+}
+
+#[cfg(not(target_os = "macos"))]
+fn watch_file_system_debounce(path: impl AsRef<Path>) {
+    let path = path.as_ref();
+
+    let mut watcher = notify_debouncer_full::new_debouncer(
+        DEBOUNCE_TIMEOUT,
+        None,
+        move |events: notify_debouncer_full::DebounceEventResult| {
+            println!("{events:?}");
+        },
+    )
+    .unwrap();
+
+    watcher
+        .watcher()
+        .watch(path, notify::RecursiveMode::Recursive)
+        .unwrap();
+
+    watcher
+        .cache()
+        .add_root(path, notify::RecursiveMode::Recursive);
+
+    loop {}
+}
+
+#[derive(Debug, Subcommand)]
+enum Command {
+    /// Publish an event to the database channel.
+    Pub,
+
+    /// Listen to published events from the database.
+    Sub,
+
+    /// Send a request to the database.
+    Req,
+
+    /// Listen for requests to the database.
+    Rep,
+
+    /// Listen to file system events.
+    WatchFs {
+        path: PathBuf,
+
+        #[clap(long)]
+        no_debounce: bool,
+    },
+}
diff --git a/local/database/src/client/client.rs b/local/database/src/client/client.rs
index 1a9ec1d0..35303335 100644
--- a/local/database/src/client/client.rs
+++ b/local/database/src/client/client.rs
@@ -1,6 +1,6 @@
 //! Client to interact with a [`Database`].
-use crate::command::Command;
-use crate::command::{Command as DbCommand, DatabaseCommand};
+use crate::command::{Command, DatabaseCommand};
+use crate::common;
 use crate::constants::{DATABASE_ID, REQ_REP_PORT};
 use crate::types::PortNumber;
 use crate::Result;
@@ -25,7 +25,7 @@ impl Client {
         // TODO: May be able to move creation of `req_socket` to `#new`, but may run into `Sync` issues.
         let req_socket = self
             .zmq_context
-            .socket(zmq::SocketType::REQ)
+            .socket(zmq::REQ)
             .expect("could not create `REQ` socket");
 
         req_socket
@@ -37,7 +37,7 @@ impl Client {
             .expect("could not set socket timeout");
 
         req_socket
-            .connect(&format!("tcp://{LOCALHOST}:{REQ_REP_PORT}"))
+            .connect(&common::zmq_url(zmq::REQ).unwrap())
             .expect("socket could not connect");
 
         req_socket
@@ -78,12 +78,12 @@ impl Client {
             .expect("could not set socket timeout");
 
         req_socket
-            .connect(&format!("tcp://{LOCALHOST}:{REQ_REP_PORT}"))
+            .connect(&common::zmq_url(zmq::REQ).unwrap())
             .expect("socket could not connect");
 
         req_socket
             .send(
-                &serde_json::to_string(&DbCommand::DatabaseCommand(DatabaseCommand::Id))
+                &serde_json::to_string(&Command::DatabaseCommand(DatabaseCommand::Id))
                     .expect("could not serialize `Command`"),
                 0,
             )
@@ -92,7 +92,7 @@ impl Client {
         let mut msg = zmq::Message::new();
         let res = req_socket.recv(&mut msg, 0);
         if res.is_err() {
-            // @todo: Check error type for timeout.
+            // TODO Check error type for timeout.
             return false;
         }
 
@@ -119,7 +119,3 @@ impl Default for Client {
 fn port_is_free(port: PortNumber) -> bool {
     TcpListener::bind(format!("{LOCALHOST}:{port}")).is_ok()
 }
-
-#[cfg(test)]
-#[path = "./client_test.rs"]
-mod client_test;
diff --git a/local/database/src/client/client_test.rs b/local/database/src/client/client_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/client/mod.rs b/local/database/src/client/mod.rs
index d7e56eef..8e961e5f 100644
--- a/local/database/src/client/mod.rs
+++ b/local/database/src/client/mod.rs
@@ -3,7 +3,3 @@ pub mod client;
 
 // Re-exports
 pub use client::Client;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/database/src/client/mod_test.rs b/local/database/src/client/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/analysis.rs b/local/database/src/command/analysis.rs
new file mode 100644
index 00000000..0562a8c4
--- /dev/null
+++ b/local/database/src/command/analysis.rs
@@ -0,0 +1,11 @@
+//! Analysis commands.
+use serde::{Deserialize, Serialize};
+use thot_core::types::ResourceId;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum AnalysisCommand {
+    Flag {
+        resource: ResourceId,
+        message: String,
+    },
+}
diff --git a/local/database/src/command/asset.rs b/local/database/src/command/asset.rs
index e0d1120d..b785ad55 100644
--- a/local/database/src/command/asset.rs
+++ b/local/database/src/command/asset.rs
@@ -1,58 +1,77 @@
 //! Asset realated commands.
+use super::types::{MetadataAction, TagsAction};
 use serde::{Deserialize, Serialize};
 use thot_core::db::StandardSearchFilter;
-use thot_core::project::{Asset as CoreAsset, StandardProperties};
+use thot_core::project::{Asset, AssetProperties};
 use thot_core::types::ResourceId;
 
 /// Asset realated commands.
 #[derive(Serialize, Deserialize, Debug)]
 pub enum AssetCommand {
-    /// Retrieves an [`Asset`](CoreAsset) by [`ResourceId`].
+    /// Retrieves an [`Asset`] by [`ResourceId`].
     Get(ResourceId),
 
-    /// Retrieves [`Asset`](CoreAsset)s by [`ResourceId`].
+    /// Retrieves [`Asset`]s by [`ResourceId`].
     ///
     /// # Returns
-    /// `Vec<[Asset](CoreAsset)>` where [`Asset`](thot_core::project::Asset)s that were not found
+    /// `Vec<Asset>` where [`Asset`]s that were not found
     /// are not included.
     GetMany(Vec<ResourceId>),
 
+    /// Return the absolute path to the `Asset`'s file.
+    Path(ResourceId),
+
     /// Gets an `Asset`'s `Container`.
     ///
     /// # Fields
     /// 1. `Asset`'s `ResourceId`.
     Parent(ResourceId),
 
-    /// Insert's an [`Asset`](CoreAsset) into a
-    /// [`Container`](thot_core::project::Container).
-    ///  
-    /// # Fields
-    /// 1. [`Asset`](CoreAsset).
-    /// 2. `Container`.
-    Add(CoreAsset, ResourceId),
-
-    /// Removes an [`Asset`](CoreAsset).
-    Remove(ResourceId),
+    /// Insert's an [`Asset`] into a [`Container`](thot_core::project::Container).
+    Add { asset: Asset, container: ResourceId },
 
-    /// Updates an [`Asset`](CoreAsset).
-    UpdateProperties(ResourceId, StandardProperties),
+    /// Updates an [`Asset`].
+    UpdateProperties {
+        asset: ResourceId,
+        properties: AssetProperties,
+    },
 
-    /// Retrieves [`Asset`](CoreAsset)s based on a filter.
+    /// Retrieves [`Asset`]s based on a filter.
     ///
     /// # Fields
     /// 1. Root `Container`.
     /// 2. Search filter.
-    Find(ResourceId, StandardSearchFilter),
+    Find {
+        root: ResourceId,
+        filter: StandardSearchFilter,
+    },
 
-    /// Retrieves [`Asset`](CoreAsset)s based on a filter.
+    /// Retrieves [`Asset`]s based on a filter.
     /// Lineage is compiled.
     ///
     /// # Fields
     /// 1. Root `Container`.
     /// 2. Search filter.
-    FindWithMetadata(ResourceId, StandardSearchFilter),
+    FindWithMetadata {
+        root: ResourceId,
+        filter: StandardSearchFilter,
+    },
+
+    /// Update multiple [`Asset`]s' properties.
+    BulkUpdateProperties(BulkUpdateAssetPropertiesArgs),
 }
 
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct AssetPropertiesUpdate {
+    pub name: Option<Option<String>>,
+    pub kind: Option<Option<String>>,
+    pub description: Option<Option<String>>,
+    pub tags: TagsAction,
+    pub metadata: MetadataAction,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BulkUpdateAssetPropertiesArgs {
+    pub rids: Vec<ResourceId>,
+    pub update: AssetPropertiesUpdate,
+}
diff --git a/local/database/src/command/asset_test.rs b/local/database/src/command/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/command.rs b/local/database/src/command/command.rs
index e5d2b6ea..01744fcc 100644
--- a/local/database/src/command/command.rs
+++ b/local/database/src/command/command.rs
@@ -1,7 +1,8 @@
 //! Commands.
 use super::{
-    asset::AssetCommand, container::ContainerCommand, database::DatabaseCommand,
-    graph::GraphCommand, project::ProjectCommand, script::ScriptCommand, user::UserCommand,
+    analysis::AnalysisCommand, asset::AssetCommand, container::ContainerCommand,
+    database::DatabaseCommand, graph::GraphCommand, project::ProjectCommand, script::ScriptCommand,
+    user::UserCommand,
 };
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +16,7 @@ pub enum Command {
     DatabaseCommand(DatabaseCommand),
     ScriptCommand(ScriptCommand),
     UserCommand(UserCommand),
+    AnalysisCommand(AnalysisCommand),
 }
 
 impl From<AssetCommand> for Command {
@@ -59,6 +61,8 @@ impl From<UserCommand> for Command {
     }
 }
 
-#[cfg(test)]
-#[path = "./command_test.rs"]
-mod command_test;
+impl From<AnalysisCommand> for Command {
+    fn from(cmd: AnalysisCommand) -> Self {
+        Self::AnalysisCommand(cmd)
+    }
+}
diff --git a/local/database/src/command/command_test.rs b/local/database/src/command/command_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/container.rs b/local/database/src/command/container.rs
index 6aa4eb93..f8746655 100644
--- a/local/database/src/command/container.rs
+++ b/local/database/src/command/container.rs
@@ -1,29 +1,32 @@
 //! Container related commands.
+use super::types::{MetadataAction, TagsAction};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use thot_core::db::StandardSearchFilter;
 use thot_core::project::container::ScriptMap;
-use thot_core::project::StandardProperties;
+use thot_core::project::{ContainerProperties, ScriptAssociation};
 use thot_core::types::ResourceId;
-use thot_local::types::AssetFileAction;
 
 /// Container related commands.
 #[derive(Serialize, Deserialize, Debug)]
 pub enum ContainerCommand {
-    /// Retrieves a [`Container`](CoreContainer) by [`ResourceId`].
+    /// Retrieves a [`Container`](thot_core::project::Container) by [`ResourceId`].
     Get(ResourceId),
 
-    /// Retrieves a [`Container`](CoreContainer) by its path.
+    /// Retrievea a [`Container`](thot_core::project::Container) with inherited metadata by [`ResourceId`].
+    GetWithMetadata(ResourceId),
+
+    /// Retrieves a [`Container`](thot_core::project::Container) by its path.
     ByPath(PathBuf),
 
-    /// Retrieves [`Container`](CoreContainer)s based on a filter.
+    /// Retrieves [`Container`](thot_core::project::Container)s based on a filter.
     ///
     /// # Fields
     /// 1. Root `Container`.
     /// 2. Search filter.
     Find(ResourceId, StandardSearchFilter),
 
-    /// Retrieves [`Container`](CoreContainer)s based on a filter.
+    /// Retrieves [`Container`](thot_core::project::Container)s based on a filter.
     /// Lineage is compiled.
     ///
     /// # Fields
@@ -31,25 +34,24 @@ pub enum ContainerCommand {
     /// 2. Search filter.
     FindWithMetadata(ResourceId, StandardSearchFilter),
 
-    /// Updates a [`Container`](CoreContainer)'s properties.
+    /// Updates a [`Container`](thot_core::project::Container)'s properties.
     UpdateProperties(UpdatePropertiesArgs),
 
-    /// Updates a [`Container`](CoreContainer)'s
+    /// Updates a [`Container`](thot_core::project::Container)'s
     /// [`ScriptAssociation`](thot_core::project::ScriptAssociation)s.
     UpdateScriptAssociations(UpdateScriptAssociationsArgs),
 
-    /// Add [`Asset`](CoreAsset)s to a [`Container`](CoreContainer).
-    ///
-    /// # Notes
-    /// + If an [`Asset`] with a given path already exists, the file name is
-    /// changed to be unique.
-    AddAssets(AddAssetsArgs),
-
     /// Gets the path of a [`Container`](thot_local::project::resources::Container).
-    GetPath(ResourceId),
+    Path(ResourceId),
 
     /// Gets the parent of a [`Container`](thot_core::project::Container).
     Parent(ResourceId),
+
+    /// Update multiple [`Container`](thot_core::project::Container)s' properties.
+    BulkUpdateProperties(BulkUpdateContainerPropertiesArgs),
+
+    /// Update multiple `Container`s `ScriptAssociations`.
+    BulkUpdateScriptAssociations(BulkUpdateScriptAssociationsArgs),
 }
 
 // *****************
@@ -60,10 +62,25 @@ pub enum ContainerCommand {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct UpdatePropertiesArgs {
     pub rid: ResourceId,
-    pub properties: StandardProperties,
+    pub properties: ContainerProperties,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct ContainerPropertiesUpdate {
+    pub name: Option<String>,
+    pub kind: Option<Option<String>>,
+    pub description: Option<Option<String>>,
+    pub tags: TagsAction,
+    pub metadata: MetadataAction,
 }
 
-/// Arguments for updating a [`Container`](CoreContainer)'s
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BulkUpdateContainerPropertiesArgs {
+    pub rids: Vec<ResourceId>,
+    pub update: ContainerPropertiesUpdate,
+}
+
+/// Arguments for updating a [`Container`](thot_core::project::Container)'s
 /// [`ScriptAssociation`](thot_core::project::ScriptAssociation)s.
 #[derive(Serialize, Deserialize, Debug)]
 pub struct UpdateScriptAssociationsArgs {
@@ -71,31 +88,22 @@ pub struct UpdateScriptAssociationsArgs {
     pub associations: ScriptMap,
 }
 
-/// Arguments for adding [`Asset`](CoreAsset)s to a [`Container`](CoreContainer).
 #[derive(Serialize, Deserialize, Debug)]
-pub struct AddAssetsArgs {
-    pub container: ResourceId,
-    pub assets: Vec<AddAssetInfo>,
+pub struct BulkUpdateScriptAssociationsArgs {
+    pub containers: Vec<ResourceId>,
+    pub update: ScriptAssociationBulkUpdate,
 }
 
-// **********************
-// *** Add Asset Info ***
-// **********************
-
-// @todo: Merge with `thot_local::types::AssetFileAction`.
-/// Info for adding an [`Asset`](thot_core::project::Asset).
 #[derive(Serialize, Deserialize, Debug)]
-pub struct AddAssetInfo {
-    /// Path of the file to make an [`Asset`](thot_core::project::Asset).
-    pub path: PathBuf,
-
-    /// How to handle the file on disk.
-    pub action: AssetFileAction,
-
-    /// The bucket to place the [`Asset`](thot_core::project::Asset)'s file in.
-    pub bucket: Option<PathBuf>,
+pub struct ScriptAssociationBulkUpdate {
+    pub add: Vec<ScriptAssociation>,
+    pub remove: Vec<ResourceId>,
+    pub update: Vec<RunParametersUpdate>,
 }
 
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
+#[derive(Serialize, Deserialize, Debug)]
+pub struct RunParametersUpdate {
+    pub script: ResourceId,
+    pub autorun: Option<bool>,
+    pub priority: Option<i32>,
+}
diff --git a/local/database/src/command/container_test.rs b/local/database/src/command/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/database.rs b/local/database/src/command/database.rs
index 04d16108..e2769134 100644
--- a/local/database/src/command/database.rs
+++ b/local/database/src/command/database.rs
@@ -10,7 +10,3 @@ pub enum DatabaseCommand {
     /// Used to identify the running `Database`.
     Id,
 }
-
-#[cfg(test)]
-#[path = "./database_test.rs"]
-mod database_test;
diff --git a/local/database/src/command/database_test.rs b/local/database/src/command/database_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/graph.rs b/local/database/src/command/graph.rs
index 0890d335..d5bec977 100644
--- a/local/database/src/command/graph.rs
+++ b/local/database/src/command/graph.rs
@@ -11,14 +11,14 @@ pub enum GraphCommand {
     /// Gets a subtree.
     Get(ResourceId),
 
-    /// Remove a graph from its root.
-    Remove(ResourceId),
-
-    /// Insert a child into the graph.
-    NewChild(NewChildArgs),
-
     /// Duplicate a graph from its root.
     Duplicate(ResourceId),
+
+    /// Get the children of the Container.
+    Children(ResourceId),
+
+    /// Get the parent of the Container.
+    Parent(ResourceId),
 }
 
 /// Arguments for [`Command::NewChild`].
@@ -27,7 +27,3 @@ pub struct NewChildArgs {
     pub name: String,
     pub parent: ResourceId,
 }
-
-#[cfg(test)]
-#[path = "./graph_test.rs"]
-mod graph_test;
diff --git a/local/database/src/command/graph_test.rs b/local/database/src/command/graph_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/mod.rs b/local/database/src/command/mod.rs
index 70cae9f7..ae8550da 100644
--- a/local/database/src/command/mod.rs
+++ b/local/database/src/command/mod.rs
@@ -1,4 +1,5 @@
 //! Commands and their related arguments and responses.
+pub mod analysis;
 pub mod asset;
 pub mod command;
 pub mod container;
@@ -6,9 +7,11 @@ pub mod database;
 pub mod graph;
 pub mod project;
 pub mod script;
+pub mod types;
 pub mod user;
 
 // Re-exports
+pub use analysis::AnalysisCommand;
 pub use asset::AssetCommand;
 pub use command::Command;
 pub use container::ContainerCommand;
@@ -17,7 +20,3 @@ pub use graph::GraphCommand;
 pub use project::ProjectCommand;
 pub use script::ScriptCommand;
 pub use user::UserCommand;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/database/src/command/mod_test.rs b/local/database/src/command/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/project.rs b/local/database/src/command/project.rs
index 7fdb7e67..b49065eb 100644
--- a/local/database/src/command/project.rs
+++ b/local/database/src/command/project.rs
@@ -47,7 +47,3 @@ pub enum ProjectCommand {
     /// Get's the project root path of a resource given its path.
     ResourceRootPath(PathBuf),
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/local/database/src/command/project_test.rs b/local/database/src/command/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/script.rs b/local/database/src/command/script.rs
index b9b4cc56..04d1068a 100644
--- a/local/database/src/command/script.rs
+++ b/local/database/src/command/script.rs
@@ -39,7 +39,3 @@ pub enum ScriptCommand {
     /// Gets the `Project` of a `Script`.
     GetProject(ResourceId),
 }
-
-#[cfg(test)]
-#[path = "./script_test.rs"]
-mod script_test;
diff --git a/local/database/src/command/script_test.rs b/local/database/src/command/script_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/command/types.rs b/local/database/src/command/types.rs
new file mode 100644
index 00000000..7d1adeea
--- /dev/null
+++ b/local/database/src/command/types.rs
@@ -0,0 +1,23 @@
+//! Types used for `Command`s.
+use serde::{Deserialize, Serialize};
+use thot_core::project::Metadata;
+
+/// Actions to be taken on tags.
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct TagsAction {
+    /// Values to insert.
+    pub insert: Vec<String>,
+
+    /// Values to remove.
+    pub remove: Vec<String>,
+}
+
+/// Actions to be taken on metadata.
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct MetadataAction {
+    /// Values to insert, either adding new, or updating.
+    pub insert: Metadata,
+
+    /// Values to remove.
+    pub remove: Vec<String>,
+}
diff --git a/local/database/src/common.rs b/local/database/src/common.rs
new file mode 100644
index 00000000..f6651d50
--- /dev/null
+++ b/local/database/src/common.rs
@@ -0,0 +1,21 @@
+//! Common functions.
+use crate::constants::{PUB_SUB_PORT, REQ_REP_PORT};
+use std::net::Ipv4Addr;
+
+static LOCALHOST: Ipv4Addr = Ipv4Addr::LOCALHOST;
+
+/// Returns the URL of the ZMQ socket of the given type.
+///
+/// # Returns
+/// `None` if the given socket type is not supported.
+pub fn zmq_url(kind: zmq::SocketType) -> Option<String> {
+    let port = match kind {
+        zmq::SocketType::REP => REQ_REP_PORT,
+        zmq::SocketType::REQ => REQ_REP_PORT,
+        zmq::SocketType::PUB => PUB_SUB_PORT,
+        zmq::SocketType::SUB => PUB_SUB_PORT,
+        _ => return None,
+    };
+
+    Some(format!("tcp://{LOCALHOST}:{port}"))
+}
diff --git a/local/database/src/constants.rs b/local/database/src/constants.rs
index 07bcd7a2..210599c4 100644
--- a/local/database/src/constants.rs
+++ b/local/database/src/constants.rs
@@ -4,5 +4,11 @@ pub use crate::types::PortNumber;
 /// Local port for REP-REQ communication.
 pub const REQ_REP_PORT: PortNumber = 7047;
 
+/// Local port for PUB-SUB communication.
+pub const PUB_SUB_PORT: PortNumber = 7048;
+
+/// PUB-SUB topic
+pub const PUB_SUB_TOPIC: &str = "thot://local-database";
+
 /// Identifier string for the database
 pub const DATABASE_ID: &str = "thot local database";
diff --git a/local/database/src/error.rs b/local/database/src/error.rs
index 35dcec4d..a79800f9 100644
--- a/local/database/src/error.rs
+++ b/local/database/src/error.rs
@@ -1,53 +1,50 @@
 //! Errors
 use serde::{Deserialize, Serialize};
 use std::result::Result as StdResult;
+use thiserror::Error;
 use thot_core::Error as CoreError;
 use thot_local::Error as LocalError;
 
 #[cfg(feature = "server")]
 use crate::types::SocketType;
 
-#[cfg(feature = "server")]
-use settings_manager::Error as SettingsError;
-
 // **************
 // ***  Error ***
 // **************
 
 /// [`Database`](crate::db) related errors.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum Error {
     /// A ZMQ [`Context`](zmq::Context) does not exist where expected.
+    #[error("ZMQ context does not exist")]
     ContextDoesNotExist,
 
-    // @todo: Serialize using `message`.
     /// A ZMQ error.
+    #[error("{0}")]
     ZMQ(String),
 
     /// A type of socket is required, but has not yet been created.
     #[cfg(feature = "server")]
+    #[error("{0:?}")]
     SocketDoesNotExist(SocketType),
 
-    // @todo: Serialize correctly.
     #[cfg(feature = "server")]
+    #[error("{0}")]
     SettingsError(String),
 
-    // @todo: Serialize correctly.
-    CoreError(String),
+    #[error("core error")]
+    CoreError(CoreError),
 
-    // @todo: Serialize correctly.
+    #[error("{0}")]
     LocalError(String),
 
     /// Issue with the database.
+    #[error("{0}")]
     DatabaseError(String),
-}
 
-#[cfg(feature = "server")]
-impl From<SettingsError> for Error {
-    fn from(err: SettingsError) -> Self {
-        // @todo: Serialize correctly.
-        Error::SettingsError(format!("{err:?}"))
-    }
+    /// The database has become out of sync.
+    #[error("out of sync")]
+    OutOfSync,
 }
 
 impl From<zmq::Error> for Error {
@@ -58,7 +55,7 @@ impl From<zmq::Error> for Error {
 
 impl From<CoreError> for Error {
     fn from(err: CoreError) -> Self {
-        Error::CoreError(format!("{err:?}"))
+        Error::CoreError(err)
     }
 }
 
@@ -76,7 +73,3 @@ impl From<trash::Error> for Error {
 }
 
 pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/local/database/src/error_test.rs b/local/database/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/event.rs b/local/database/src/event.rs
new file mode 100644
index 00000000..594e551c
--- /dev/null
+++ b/local/database/src/event.rs
@@ -0,0 +1,167 @@
+//! Database update messages.
+//!
+//! Topic should be `project:` followed by the resource id of the affected project.
+//! e.g. `project:123-4567-890
+use serde::{Deserialize, Serialize};
+use thot_core::graph::ResourceTree;
+use thot_core::project::{Container as CoreContainer, ContainerProperties, Script as CoreScript};
+use thot_core::types::{ResourceId, ResourcePath};
+
+// **************
+// *** Update ***
+// **************
+
+/// Update types.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Update {
+    Project {
+        project: ResourceId,
+        update: Project,
+    },
+}
+
+// ***************
+// *** Project ***
+// ***************
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Project {
+    Graph(Graph),
+    Container(Container),
+    Asset(Asset),
+    Script(Script),
+    Analysis(Analysis),
+}
+
+impl From<Graph> for Project {
+    fn from(update: Graph) -> Self {
+        Self::Graph(update)
+    }
+}
+
+impl From<Container> for Project {
+    fn from(update: Container) -> Self {
+        Self::Container(update)
+    }
+}
+
+impl From<Asset> for Project {
+    fn from(update: Asset) -> Self {
+        Self::Asset(update)
+    }
+}
+
+impl From<Script> for Project {
+    fn from(update: Script) -> Self {
+        Self::Script(update)
+    }
+}
+
+impl From<Analysis> for Project {
+    fn from(update: Analysis) -> Self {
+        Self::Analysis(update)
+    }
+}
+
+// *************
+// *** Graph ***
+// *************
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Graph {
+    /// A subgraph was created.
+    Created {
+        parent: ResourceId,
+        graph: ResourceTree<CoreContainer>,
+    },
+
+    /// A subgraph was moved within the `Project`.
+    ///
+    /// # Fields
+    /// `parent`: New parent of the subgraph.
+    /// `root`: Root of the subgraph.
+    /// `name`: Name of the root `Container`.
+    Moved {
+        root: ResourceId,
+        parent: ResourceId,
+        name: String,
+    },
+
+    /// Subgraph was removed.
+    Removed(ResourceTree<CoreContainer>),
+}
+
+// *****************
+// *** Container ***
+// *****************
+
+/// Container updates.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Container {
+    /// `Container`'s properties were modified.
+    Properties {
+        container: ResourceId,
+        properties: ContainerProperties,
+    },
+}
+
+// *************
+// *** Asset ***
+// *************
+
+/// Asset updates.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Asset {
+    Created {
+        container: ResourceId,
+        asset: thot_core::project::Asset,
+    },
+
+    /// The `Asset`'s path property changed.
+    PathChanged {
+        asset: ResourceId,
+        path: ResourcePath,
+    },
+
+    /// An Asset moved `Container`s.
+    Moved {
+        asset: ResourceId,
+        container: ResourceId,
+        path: ResourcePath,
+    },
+
+    Removed(ResourceId),
+}
+
+// **************
+// *** Script ***
+// **************
+
+/// Script updates.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Script {
+    Created(CoreScript),
+    Removed(ResourceId),
+
+    /// A `Script`'s relative path changed.
+    ///
+    /// # Notes
+    /// + The `Script` remains in the same project.
+    Moved {
+        script: ResourceId,
+        path: ResourcePath,
+    },
+}
+
+// ****************
+// *** Analysis ***
+// ****************
+
+/// Analysis updates.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Analysis {
+    Flag {
+        resource: ResourceId,
+        message: String,
+    },
+}
diff --git a/local/database/src/lib.rs b/local/database/src/lib.rs
index 2430f779..599ae4cb 100644
--- a/local/database/src/lib.rs
+++ b/local/database/src/lib.rs
@@ -2,10 +2,14 @@
 //! # Thot Local Database
 //! Implements a local database for Thot.
 pub mod command;
+pub mod event;
 
 #[cfg(any(feature = "client", feature = "server"))]
 pub mod constants;
 
+#[cfg(any(feature = "client", feature = "server"))]
+pub mod common;
+
 #[cfg(any(feature = "client", feature = "server"))]
 pub mod error;
 
@@ -24,6 +28,8 @@ pub use command::{
     ScriptCommand,
 };
 
+pub use event::Update;
+
 #[cfg(any(feature = "client", feature = "server"))]
 pub use error::{Error, Result};
 
diff --git a/local/database/src/main.rs b/local/database/src/main.rs
index 87a0812d..818ab4cd 100644
--- a/local/database/src/main.rs
+++ b/local/database/src/main.rs
@@ -1,12 +1,12 @@
 //! Runs a local [`Database`].
 use std::io;
-use tracing_subscriber::filter::LevelFilter;
-use tracing_subscriber::prelude::*;
-use tracing_subscriber::{Registry, Layer};
+use thot_local::system::common;
 use thot_local_database::server::Database;
-use tracing_subscriber::fmt::time::UtcTime;
+use tracing_subscriber::filter::LevelFilter;
 use tracing_subscriber::fmt;
-use thot_local::system::common;
+use tracing_subscriber::fmt::time::UtcTime;
+use tracing_subscriber::prelude::*;
+use tracing_subscriber::{Layer, Registry};
 
 const LOG_PREFIX: &str = "database.local.log";
 const MAX_LOG_LEVEL: LevelFilter = LevelFilter::DEBUG;
@@ -20,7 +20,6 @@ fn main() {
         .with_writer(file_logger)
         .with_timer(UtcTime::rfc_3339())
         .json()
-        // .pretty()
         .with_filter(MAX_LOG_LEVEL);
 
     let console_logger = fmt::layer()
@@ -29,13 +28,10 @@ fn main() {
         .pretty()
         .with_filter(MAX_LOG_LEVEL);
 
-    let subscriber = Registry::default()
-        .with(console_logger)
-        .with(file_logger);
-
+    let subscriber = Registry::default().with(console_logger).with(file_logger);
     tracing::subscriber::set_global_default(subscriber).expect("could not create logger");
 
     // run database
     let mut db = Database::new();
-    db.listen_for_commands();
+    db.start();
 }
diff --git a/local/database/src/server/command/actor.rs b/local/database/src/server/command/actor.rs
new file mode 100644
index 00000000..e20a6612
--- /dev/null
+++ b/local/database/src/server/command/actor.rs
@@ -0,0 +1,67 @@
+use crate::common;
+use crate::server::Event;
+use crate::{Command, Error, Result};
+use std::sync::mpsc;
+
+/// Actor to handle command events.
+pub struct CommandActor {
+    event_tx: mpsc::Sender<Event>,
+
+    /// Reply socket for command requests.
+    zmq_socket: zmq::Socket,
+}
+
+impl CommandActor {
+    pub fn new(event_tx: mpsc::Sender<Event>) -> Self {
+        let zmq_context = zmq::Context::new();
+        let zmq_socket = zmq_context.socket(zmq::REP).unwrap();
+        zmq_socket
+            .bind(&common::zmq_url(zmq::REP).unwrap())
+            .unwrap();
+
+        Self {
+            event_tx,
+            zmq_socket,
+        }
+    }
+
+    pub fn run(&self) -> Result {
+        self.listen_for_commands()?;
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn listen_for_commands(&self) -> Result {
+        loop {
+            let cmd = self.receive_command()?;
+            let (value_tx, value_rx) = mpsc::channel();
+            self.event_tx
+                .send(Event::Command { cmd, tx: value_tx })
+                .unwrap();
+
+            let res = value_rx.recv().unwrap();
+            self.zmq_socket.send(&res.to_string(), 0)?;
+        }
+    }
+
+    fn receive_command(&self) -> Result<Command> {
+        let mut msg = zmq::Message::new();
+        self.zmq_socket
+            .recv(&mut msg, 0)
+            .expect("could not recieve request");
+
+        let Some(msg_str) = msg.as_str() else {
+            let err_msg = "invalid message: could not convert to string";
+            tracing::debug!(?err_msg);
+            return Err(Error::ZMQ(err_msg.into()));
+        };
+
+        let Ok(cmd) = serde_json::from_str(msg_str) else {
+            let err_msg = "invalid message: could not convert `Message` to `Command";
+            tracing::debug!(err = err_msg, msg = msg_str);
+            return Err(Error::ZMQ(err_msg.into()));
+        };
+
+        Ok(cmd)
+    }
+}
diff --git a/local/database/src/server/command/analysis.rs b/local/database/src/server/command/analysis.rs
new file mode 100644
index 00000000..f0e35446
--- /dev/null
+++ b/local/database/src/server/command/analysis.rs
@@ -0,0 +1,31 @@
+//! Handle analysis commands.
+use super::super::Database;
+use crate::command::AnalysisCommand;
+use crate::event::{Analysis as AnalysisUpdate, Update};
+use serde_json::Value as JsValue;
+
+impl Database {
+    #[tracing::instrument(skip(self))]
+    pub fn handle_command_analysis(&mut self, cmd: AnalysisCommand) -> JsValue {
+        match cmd {
+            AnalysisCommand::Flag { resource, message } => {
+                let project = if let Some(project) = self.store.get_container_project(&resource) {
+                    project.clone()
+                } else if let Some(container) = self.store.get_asset_container_id(&resource) {
+                    self.store.get_container_project(container).unwrap().clone()
+                } else {
+                    tracing::debug!("resource `{resource:?}` not found");
+                    panic!("resource not found");
+                };
+
+                self.publish_update(&Update::Project {
+                    project,
+                    update: AnalysisUpdate::Flag { resource, message }.into(),
+                })
+                .unwrap();
+
+                serde_json::to_value(JsValue::Null).unwrap()
+            }
+        }
+    }
+}
diff --git a/local/database/src/server/command/asset.rs b/local/database/src/server/command/asset.rs
new file mode 100644
index 00000000..aed742c0
--- /dev/null
+++ b/local/database/src/server/command/asset.rs
@@ -0,0 +1,213 @@
+//! Handle `Asset` related functionality.
+use super::super::Database;
+use crate::command::asset::{AssetPropertiesUpdate, BulkUpdateAssetPropertiesArgs};
+use crate::command::AssetCommand;
+use crate::error::Result;
+use serde_json::Value as JsValue;
+use std::path::PathBuf;
+use thot_core::error::{Error as CoreError, ResourceError};
+use thot_core::project::{Asset, AssetProperties, Container as CoreContainer};
+use thot_core::types::ResourceId;
+
+impl Database {
+    #[tracing::instrument(skip(self))]
+    pub fn handle_command_asset(&mut self, cmd: AssetCommand) -> JsValue {
+        match cmd {
+            AssetCommand::Get(rid) => {
+                let asset: Option<Asset> = {
+                    if let Some(container) = self.store.get_asset_container(&rid) {
+                        container.assets.get(&rid).cloned().into()
+                    } else {
+                        None
+                    }
+                };
+
+                serde_json::to_value(asset).expect("could not convert `Asset` to JSON")
+            }
+
+            AssetCommand::GetMany(rids) => {
+                let assets = rids
+                    .iter()
+                    .filter_map(|rid| {
+                        let Some(container) = self.store.get_asset_container(&rid) else {
+                            return None;
+                        };
+
+                        let Some(asset) = container.assets.get(&rid) else {
+                            return None;
+                        };
+
+                        Some(asset.clone())
+                    })
+                    .collect::<Vec<Asset>>();
+
+                serde_json::to_value(assets).expect("could not convert `Vec<Asset>` to JSON")
+            }
+
+            AssetCommand::Path(asset) => {
+                let Some(container) = self.store.get_asset_container(&asset) else {
+                    let res: Option<PathBuf> = None;
+                    return serde_json::to_value(res).unwrap();
+                };
+
+                let asset = container.assets.get(&asset).unwrap();
+                let path = container.base_path().join(asset.path.as_path());
+                serde_json::to_value(Some(path)).unwrap()
+            }
+
+            AssetCommand::Parent(asset) => {
+                // TODO Convert to result for homogeneity with `ContainerCommand::Parent`.
+                let container: Option<CoreContainer> = self
+                    .store
+                    .get_asset_container(&asset)
+                    .map(|container| (*container).clone().into());
+
+                serde_json::to_value(container).expect("could not convert `Container` to JSON")
+            }
+
+            AssetCommand::Add { asset, container } => {
+                let res = self.store.add_asset(asset, container);
+                serde_json::to_value(res).expect("could not convert result to JSON")
+            }
+
+            AssetCommand::UpdateProperties { asset, properties } => {
+                let res = self.update_asset_properties(&asset, properties);
+                serde_json::to_value(res).expect("could not convert result to JSON")
+            }
+
+            AssetCommand::Find { root, filter } => {
+                let assets = self.store.find_assets(&root, filter);
+                serde_json::to_value(assets).expect("could not convert result to JSON")
+            }
+
+            AssetCommand::FindWithMetadata { root, filter } => {
+                let assets = self.store.find_assets_with_metadata(&root, filter);
+                serde_json::to_value(assets).expect("could not convert result to JSON")
+            }
+
+            AssetCommand::BulkUpdateProperties(BulkUpdateAssetPropertiesArgs { rids, update }) => {
+                let res = self.bulk_update_asset_properties(&rids, &update);
+                serde_json::to_value(res).unwrap()
+            }
+        }
+    }
+
+    fn update_asset_properties(&mut self, rid: &ResourceId, properties: AssetProperties) -> Result {
+        let Some(container) = self.store.get_asset_container_id(&rid).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Asset` does not exist",
+            ))
+            .into());
+        };
+
+        let Some(container) = self.store.get_container_mut(&container) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        let Some(asset) = container.assets.get_mut(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Asset` does not exist",
+            ))
+            .into());
+        };
+
+        asset.properties = properties;
+        container.save()?;
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn remove_asset(&mut self, rid: &ResourceId) -> Result {
+        let Some((_asset, path)) = self.store.remove_asset(rid)? else {
+            return Ok(());
+        };
+
+        trash::delete(&path)?;
+        Ok(())
+    }
+
+    /// Bulk update `Asset` properties.
+    #[tracing::instrument(skip(self))]
+    fn bulk_update_asset_properties(
+        &mut self,
+        assets: &Vec<ResourceId>,
+        update: &AssetPropertiesUpdate,
+    ) -> Result {
+        for asset in assets {
+            self.update_asset_properties_from_update(asset, update)?;
+        }
+
+        Ok(())
+    }
+
+    /// Update a `Asset`'s properties.
+    #[tracing::instrument(skip(self))]
+    fn update_asset_properties_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &AssetPropertiesUpdate,
+    ) -> Result {
+        let Some(container) = self.store.get_asset_container_id(&rid).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Asset` does not exist",
+            ))
+            .into());
+        };
+
+        let Some(container) = self.store.get_container_mut(&container) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        let Some(asset) = container.assets.get_mut(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Asset` does not exist",
+            ))
+            .into());
+        };
+
+        // basic properties
+        if let Some(name) = update.name.as_ref() {
+            asset.properties.name = name.clone();
+        }
+
+        if let Some(kind) = update.kind.as_ref() {
+            asset.properties.kind = kind.clone();
+        }
+
+        if let Some(description) = update.description.as_ref() {
+            asset.properties.description = description.clone();
+        }
+
+        // tags
+        asset
+            .properties
+            .tags
+            .append(&mut update.tags.insert.clone());
+
+        asset.properties.tags.sort();
+        asset.properties.tags.dedup();
+        asset
+            .properties
+            .tags
+            .retain(|tag| !update.tags.remove.contains(tag));
+
+        // metadata
+        asset
+            .properties
+            .metadata
+            .extend(update.metadata.insert.clone());
+
+        for key in update.metadata.remove.iter() {
+            asset.properties.metadata.remove(key);
+        }
+
+        container.save()?;
+        Ok(())
+    }
+}
diff --git a/local/database/src/server/command/container.rs b/local/database/src/server/command/container.rs
new file mode 100644
index 00000000..0050c473
--- /dev/null
+++ b/local/database/src/server/command/container.rs
@@ -0,0 +1,416 @@
+//! Implementation of `Container` related functionality.
+use super::super::Database;
+use crate::command::container::{
+    BulkUpdateContainerPropertiesArgs, BulkUpdateScriptAssociationsArgs, ContainerPropertiesUpdate,
+    ScriptAssociationBulkUpdate, UpdatePropertiesArgs, UpdateScriptAssociationsArgs,
+};
+use crate::command::ContainerCommand;
+use crate::Result;
+use serde_json::Value as JsValue;
+use std::collections::HashSet;
+use std::fs;
+use std::path::PathBuf;
+use thot_core::db::StandardSearchFilter;
+use thot_core::error::{Error as CoreError, ResourceError};
+use thot_core::project::container::ScriptMap;
+use thot_core::project::{Container as CoreContainer, ContainerProperties, RunParameters};
+use thot_core::types::ResourceId;
+use thot_local::common;
+use thot_local::error::ContainerError;
+use thot_local::error::Error as LocalError;
+use thot_local::project::resources::Container;
+
+impl Database {
+    #[tracing::instrument(skip(self))]
+    pub fn handle_command_container(&mut self, cmd: ContainerCommand) -> JsValue {
+        match cmd {
+            ContainerCommand::Get(rid) => {
+                let container: Option<CoreContainer> = {
+                    if let Some(container) = self.store.get_container(&rid) {
+                        Some((*container).clone().into())
+                    } else {
+                        None
+                    }
+                };
+
+                serde_json::to_value(container).expect("could not convert `Container` to JSON")
+            }
+
+            ContainerCommand::GetWithMetadata(rid) => {
+                let container = self.store.get_container_with_metadata(&rid);
+                serde_json::to_value(container).expect("could not convert `Container` to JSON")
+            }
+
+            ContainerCommand::ByPath(path) => {
+                let Some(rid) = self.store.get_path_container_canonical(&path).unwrap() else {
+                    let value: Option<CoreContainer> = None;
+                    return serde_json::to_value(value).expect("could not convert `None` to JSON");
+                };
+
+                let container: Option<CoreContainer> = {
+                    if let Some(container) = self.store.get_container(&rid) {
+                        Some((*container).clone().into())
+                    } else {
+                        None
+                    }
+                };
+
+                serde_json::to_value(container).expect("could not convert `Container` to JSON")
+            }
+
+            ContainerCommand::Find(root, filter) => {
+                let containers = self.find_containers(&root, filter);
+                serde_json::to_value(containers).expect("could not convert `Container`s to JSON")
+            }
+
+            ContainerCommand::FindWithMetadata(root, filter) => {
+                let containers = self.find_containers_with_metadata(&root, filter);
+                serde_json::to_value(containers).expect("could not convert `Container`s to JSON")
+            }
+
+            ContainerCommand::UpdateProperties(UpdatePropertiesArgs { rid, properties }) => {
+                let res = self.update_container_properties(rid, properties);
+                serde_json::to_value(res).expect("could not convert result to JSON")
+            }
+
+            ContainerCommand::UpdateScriptAssociations(UpdateScriptAssociationsArgs {
+                rid,
+                associations,
+            }) => {
+                let res = self.update_container_script_associations(rid, associations);
+                serde_json::to_value(res).expect("could not convert result to JSON")
+            }
+
+            // TODO Handle errors.
+            ContainerCommand::Path(rid) => {
+                let path = self.get_container_path(&rid);
+                serde_json::to_value(path).expect("could not convert path to JsValue")
+            }
+
+            ContainerCommand::Parent(rid) => {
+                let parent: Result<Option<CoreContainer>> =
+                    self.get_container_parent(&rid).map(|opt| match opt {
+                        Some(container) => Some((*container).clone()),
+                        None => None,
+                    });
+
+                serde_json::to_value(parent).expect("could not convert `Container` to JsValue")
+            }
+
+            ContainerCommand::BulkUpdateProperties(BulkUpdateContainerPropertiesArgs {
+                rids,
+                update,
+            }) => {
+                let res = self.bulk_update_container_properties(&rids, &update);
+                serde_json::to_value(res).unwrap()
+            }
+
+            ContainerCommand::BulkUpdateScriptAssociations(BulkUpdateScriptAssociationsArgs {
+                containers,
+                update,
+            }) => {
+                let res = self.bulk_update_container_script_associations(&containers, &update);
+                serde_json::to_value(res).unwrap()
+            }
+        }
+    }
+
+    /// # Arguments
+    /// 1. Root `Container`.
+    /// 2. Search filter.
+    fn find_containers(
+        &self,
+        root: &ResourceId,
+        filter: StandardSearchFilter,
+    ) -> HashSet<CoreContainer> {
+        self.store
+            .find_containers(&root, filter)
+            .into_iter()
+            .map(|container| (*container).clone())
+            .collect()
+    }
+
+    /// # Arguments
+    /// 1. Root `Container`.
+    /// 2. Search filter.
+    fn find_containers_with_metadata(
+        &self,
+        root: &ResourceId,
+        filter: StandardSearchFilter,
+    ) -> HashSet<CoreContainer> {
+        self.store.find_containers_with_metadata(&root, filter)
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn update_container_properties(
+        &mut self,
+        rid: ResourceId,
+        properties: ContainerProperties,
+    ) -> Result {
+        let Some(container) = self.store.get_container(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        let graph = self.store.get_container_graph(&rid).unwrap();
+        if properties.name != container.properties.name && &container.rid != graph.root() {
+            self.rename_container_folder(&rid, &properties.name)?;
+        }
+
+        let container = self
+            .store
+            .get_container_mut(&rid)
+            .expect("Container no longer exists");
+
+        container.properties = properties;
+        container.save()?;
+        Ok(())
+    }
+
+    /// Renames a Container's folder.
+    ///
+    /// # Side effects
+    /// + Updates the Container's graph.
+    /// + Updates the store's mappings.
+    ///
+    /// # Errors
+    /// + If the new name results in a name clash between sibling Containers.
+    #[tracing::instrument(skip(self, name))]
+    fn rename_container_folder(
+        &mut self,
+        container: &ResourceId,
+        name: impl Into<String>,
+    ) -> Result {
+        let container_path = {
+            let name: String = name.into();
+            let Some(container) = self.store.get_container(container) else {
+                return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                    "`Container` does not exist",
+                ))
+                .into());
+            };
+            let graph = self.store.get_container_graph(&container.rid).unwrap();
+
+            // get siblings to check for name clash
+            let siblings = graph.siblings(&container.rid).unwrap();
+            let sibling_names: Vec<String> = siblings
+                .iter()
+                .map(|sid| {
+                    let sibling = graph.get(sid).unwrap();
+                    sibling.properties.name.clone()
+                })
+                .collect();
+
+            if sibling_names.contains(&name) {
+                return Err(
+                    LocalError::ContainerError(ContainerError::ContainerNameConflict).into(),
+                );
+            }
+
+            // create unique sanitized path
+            let mut container_path = container
+                .base_path()
+                .parent()
+                .expect("invalid path")
+                .to_path_buf();
+
+            container_path.push(common::sanitize_file_path(name));
+            let container_path = common::unique_file_name(PathBuf::from(container_path)).unwrap();
+
+            // rename folder
+            match fs::rename(container.base_path(), &container_path) {
+                Ok(_) => {}
+                Err(err) => {
+                    let from = container.base_path();
+                    tracing::debug!(?err, ?from, ?container_path);
+                    return Err(LocalError::from(err).into());
+                }
+            };
+
+            container_path
+        };
+
+        // update descendant's path
+        self.store.update_subgraph_path(container, container_path)?;
+        Ok(())
+    }
+
+    fn update_container_script_associations(
+        &mut self,
+        rid: ResourceId,
+        associations: ScriptMap,
+    ) -> Result {
+        let Some(container) = self.store.get_container_mut(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Script` does not exist",
+            ))
+            .into());
+        };
+
+        container.scripts = associations;
+        container.save()?;
+        Ok(())
+    }
+
+    fn get_container_path(&self, container: &ResourceId) -> Option<PathBuf> {
+        let Some(container) = self.store.get_container(&container) else {
+            return None;
+        };
+
+        Some(container.base_path().into())
+    }
+
+    fn get_container_parent(&self, rid: &ResourceId) -> Result<Option<&Container>> {
+        let Some(graph) = self.store.get_container_graph(rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        let parent = graph.parent(rid)?;
+        let Some(parent) = parent else {
+            return Ok(None);
+        };
+
+        let parent = graph.get(parent).expect("could not get parent `Container`");
+        Ok(Some(parent))
+    }
+
+    /// Bulk update `Container` properties.
+    #[tracing::instrument(skip(self))]
+    fn bulk_update_container_properties(
+        &mut self,
+        containers: &Vec<ResourceId>,
+        update: &ContainerPropertiesUpdate,
+    ) -> Result {
+        for container in containers {
+            self.update_container_properties_from_update(container, update)?;
+        }
+
+        Ok(())
+    }
+
+    /// Update a `Container`'s properties.
+    #[tracing::instrument(skip(self))]
+    fn update_container_properties_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &ContainerPropertiesUpdate,
+    ) -> Result {
+        let Some(container) = self.store.get_container_mut(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        // basic properties
+        if let Some(name) = update.name.as_ref() {
+            container.properties.name = name.clone();
+        }
+
+        if let Some(kind) = update.kind.as_ref() {
+            container.properties.kind = kind.clone();
+        }
+
+        if let Some(description) = update.description.as_ref() {
+            container.properties.description = description.clone();
+        }
+
+        // tags
+        container
+            .properties
+            .tags
+            .append(&mut update.tags.insert.clone());
+
+        container.properties.tags.sort();
+        container.properties.tags.dedup();
+        container
+            .properties
+            .tags
+            .retain(|tag| !update.tags.remove.contains(tag));
+
+        // metadata
+        container
+            .properties
+            .metadata
+            .extend(update.metadata.insert.clone());
+
+        for key in update.metadata.remove.iter() {
+            container.properties.metadata.remove(key);
+        }
+
+        container.save()?;
+        Ok(())
+    }
+
+    fn bulk_update_container_script_associations(
+        &mut self,
+        containers: &Vec<ResourceId>,
+        update: &ScriptAssociationBulkUpdate,
+    ) -> Result {
+        for rid in containers {
+            self.update_container_script_associations_from_update(rid, update)?;
+        }
+
+        Ok(())
+    }
+
+    /// Update a `Container`'s `ScriptAssociations`.
+    ///
+    /// # Note
+    /// Updates are processed in the following order:
+    /// 1. New associations are added.
+    /// 2. Present associations are updated.
+    /// 3. Associations are removed.
+    fn update_container_script_associations_from_update(
+        &mut self,
+        rid: &ResourceId,
+        update: &ScriptAssociationBulkUpdate,
+    ) -> Result {
+        let Some(container) = self.store.get_container_mut(&rid) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
+        };
+
+        for assoc in update.add.iter() {
+            container.scripts.insert(
+                assoc.script.clone(),
+                RunParameters {
+                    priority: assoc.priority.clone(),
+                    autorun: assoc.autorun.clone(),
+                },
+            );
+        }
+
+        for u in update.update.iter() {
+            let Some(script) = container.scripts.get_mut(&u.script) else {
+                continue;
+            };
+
+            if let Some(priority) = u.priority.as_ref() {
+                script.priority = priority.clone();
+            }
+
+            if let Some(autorun) = u.autorun.as_ref() {
+                script.autorun = autorun.clone();
+            }
+        }
+
+        for script in update.remove.iter() {
+            container.scripts.remove(script);
+        }
+
+        container.save()?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+#[path = "./container_test.rs"]
+mod container_test;
diff --git a/local/database/src/server/command/container_test.rs b/local/database/src/server/command/container_test.rs
new file mode 100644
index 00000000..318905f0
--- /dev/null
+++ b/local/database/src/server/command/container_test.rs
@@ -0,0 +1,151 @@
+use super::*;
+use crate::command::{ContainerCommand, GraphCommand, ProjectCommand};
+use crate::error::Result;
+use dev_utils::fs::TempDir;
+use fake::faker::lorem::raw::Word;
+use fake::locales::EN;
+use fake::Fake;
+use std::path::Path;
+use thot_core::project::{Container as CoreContainer, ContainerProperties};
+use thot_local::project::resources::{Container as LocalContainer, Project as LocalProject};
+use thot_local::project::{container, project};
+
+#[test]
+fn database_command_update_container_properties_without_name_should_work() {
+    // setup
+    let mut dir = TempDir::new().expect("could not create new temp dir");
+    let data_dir = dir.mkdir().unwrap();
+    let pid = project::init(dir.path()).unwrap();
+    let builder = container::InitOptions::new();
+    let _rid = builder
+        .build(&data_dir)
+        .expect("could not init `Container`");
+
+    let mut db = Database::new();
+    let _project = db.handle_command_project(ProjectCommand::Load(dir.path().into()));
+    let container = db.handle_command_graph(GraphCommand::Load(pid));
+
+    let container: Result<CoreContainer> =
+        serde_json::from_value(container).expect("could not contvert JsValue to `Container`");
+
+    let container = container.expect("`LoadContainer` should work");
+    let mut properties = container.properties.clone();
+    let kind = Word(EN).fake();
+    properties.kind = kind;
+
+    // test
+    db.handle_command_container(ContainerCommand::UpdateProperties(UpdatePropertiesArgs {
+        rid: container.rid.clone(),
+        properties: properties.clone(),
+    }));
+
+    {
+        // ensure stored container updated
+        let stored = db
+            .store
+            .get_container(&container.rid)
+            .expect("`Container` not stored");
+
+        assert_eq!(
+            properties.name, stored.properties.name,
+            "incorrect name stored"
+        );
+    }
+
+    let saved = LocalContainer::load_from(dir.path()).expect("could not load `Container`");
+    assert_eq!(
+        properties.name, saved.properties.name,
+        "incorrect name persisted"
+    );
+}
+
+#[test]
+fn database_command_update_container_name_should_work() {
+    // setup
+    let mut dir = TempDir::new().expect("could not create new temp dir");
+    let data_dir = dir.mkdir().unwrap();
+    let child_dir = dir.children.get_mut(&data_dir).unwrap().mkdir().unwrap();
+    let sibling_dir = dir.children.get_mut(&data_dir).unwrap().mkdir().unwrap();
+
+    let mut project = LocalProject::new(dir.path().to_path_buf()).unwrap();
+    project.data_root = Some(data_dir.clone());
+    project.save().unwrap();
+
+    let pid = project.rid.clone();
+    let builder = container::InitOptions::new();
+    let rid = builder
+        .build(&data_dir)
+        .expect("could not init `Container`");
+    let cid = builder
+        .build(&child_dir)
+        .expect("could not init `Container`");
+    let _sid = builder
+        .build(&sibling_dir)
+        .expect("could not init `Container`");
+
+    let mut db = Database::new();
+    let _project = db.handle_command_project(ProjectCommand::Load(dir.path().into()));
+    let _graph = db.handle_command_graph(GraphCommand::Load(pid));
+
+    let properties = ContainerProperties::new(Word(EN).fake::<String>());
+
+    // test
+    // root
+    db.handle_command_container(ContainerCommand::UpdateProperties(UpdatePropertiesArgs {
+        rid: rid.clone(),
+        properties: properties.clone(),
+    }));
+
+    let stored = db
+        .store
+        .get_container(&rid)
+        .expect("`Container` not stored");
+
+    assert_eq!(
+        properties.name, stored.properties.name,
+        "incorrect name stored"
+    );
+
+    assert_eq!(&data_dir, stored.base_path(), "root path should not change");
+
+    let saved = LocalContainer::load_from(&data_dir).expect("could not load `Container`");
+    assert_eq!(
+        properties.name, saved.properties.name,
+        "incorrect name persisted"
+    );
+
+    // child
+    db.handle_command_container(ContainerCommand::UpdateProperties(UpdatePropertiesArgs {
+        rid: cid.clone(),
+        properties: properties.clone(),
+    }));
+
+    let stored = db
+        .store
+        .get_container(&cid)
+        .expect("`Container` not stored");
+
+    assert_eq!(
+        properties.name, stored.properties.name,
+        "incorrect name stored"
+    );
+
+    assert_ne!(
+        child_dir,
+        stored.base_path(),
+        "container path should change"
+    );
+
+    if properties.name.is_ascii() {
+        assert_eq!(
+            &properties.name,
+            stored.base_path().file_name().unwrap().to_str().unwrap(),
+            "folder name and name should agree"
+        );
+    }
+
+    assert!(
+        Path::exists(stored.base_path()),
+        "child folder should be renamed"
+    );
+}
diff --git a/local/database/src/server/handler/database.rs b/local/database/src/server/command/database.rs
similarity index 61%
rename from local/database/src/server/handler/database.rs
rename to local/database/src/server/command/database.rs
index 9fc4860a..c5b5e5c2 100644
--- a/local/database/src/server/handler/database.rs
+++ b/local/database/src/server/command/database.rs
@@ -1,21 +1,14 @@
 //! Handle [`DatabaseCommand`]s.
 use super::super::Database;
-use super::super::DATABASE_ID;
 use crate::command::DatabaseCommand;
+use crate::constants::DATABASE_ID;
 use serde_json::Value as JsValue;
 
 impl Database {
     pub fn handle_command_database(&mut self, cmd: DatabaseCommand) -> JsValue {
         match cmd {
-            DatabaseCommand::Kill => {
-                self.kill = true;
-                JsValue::Null
-            }
+            DatabaseCommand::Kill => JsValue::Null,
             DatabaseCommand::Id => JsValue::String(DATABASE_ID.to_string()),
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./database_test.rs"]
-mod database_test;
diff --git a/local/database/src/server/handler/graph.rs b/local/database/src/server/command/graph.rs
similarity index 57%
rename from local/database/src/server/handler/graph.rs
rename to local/database/src/server/command/graph.rs
index 0affaf46..c78fe009 100644
--- a/local/database/src/server/handler/graph.rs
+++ b/local/database/src/server/command/graph.rs
@@ -5,7 +5,6 @@ use crate::command::GraphCommand;
 use crate::server::store::ContainerTree;
 use crate::{Error, Result};
 use serde_json::Value as JsValue;
-use std::fs;
 use std::path::Path;
 use std::result::Result as StdResult;
 use thot_core::error::{Error as CoreError, ProjectError, ResourceError};
@@ -15,7 +14,7 @@ use thot_core::types::ResourceId;
 use thot_local::common::unique_file_name;
 use thot_local::graph::{ContainerTreeDuplicator, ContainerTreeLoader, ContainerTreeTransformer};
 use thot_local::project::container;
-use thot_local::project::resources::container::{Container, Loader as ContainerLoader};
+use thot_local::project::resources::container::Container;
 
 impl Database {
     #[tracing::instrument(skip(self))]
@@ -39,67 +38,27 @@ impl Database {
             GraphCommand::Get(root) => {
                 let Some(graph) = self.store.get_container_graph(&root) else {
                     let res: Result<Option<ResourceTree<CoreContainer>>> = Ok(None);
-                    return serde_json::to_value(res)
-                        .expect("could not convert to JsValue");
+                    return serde_json::to_value(res).expect("could not convert to JsValue");
                 };
 
                 let graph = ContainerTreeTransformer::local_to_core(graph);
                 serde_json::to_value(graph).expect("could not convert `Result` to JsValue")
             }
 
-            GraphCommand::Remove(root) => {
-                let sub_graph = match self.store.remove_subgraph(&root) {
-                    Ok(path) => path,
-                    Err(err) => {
-                        let err: Result = Err(err);
-                        return serde_json::to_value(err)
-                            .expect("could not convert `Result` to JsValue");
-                    }
-                };
-
-                let root_path = sub_graph
-                    .get(sub_graph.root())
-                    .expect("`Graph` root not found")
-                    .base_path()
-                    .canonicalize()
-                    .expect("could not canonicalize path");
-
-                if let Err(err) = delete_folder(&root_path) {
-                    let err: Error = err.into();
-                    return serde_json::to_value(err)
-                        .expect("could not convert `Result` to JsValue");
-                }
-
-                let res: Result = Ok(());
-                serde_json::to_value(res).expect("could not convert `Result` to JsValue")
-            }
-
-            GraphCommand::NewChild(NewChildArgs { name, parent }) => {
-                let res = self.new_child(&parent, name);
-                let Ok(cid) = res else {
-                    return serde_json::to_value(res).expect("could not convert error to JsValue");
-                };
-
-                let Some(child) = self.store.get_container(&cid) else {
-                    let err: Error =  CoreError::ResourceError(ResourceError::DoesNotExist("child `Container` not inserted into graph")).into();
-                    return serde_json::to_value(err).expect("could not convert error to JsValue");
-
-                };
-
-                let child: Result<CoreContainer> = Ok((*child).clone());
-                serde_json::to_value(child).expect("could not convert child `Container` to JsValue")
-            }
-
             GraphCommand::Duplicate(root) => {
                 // duplicate tree
                 let res = self.duplicate_container_tree(&root);
                 let Ok(rid) = res else {
-                    return serde_json::to_value(res).expect("could not convert `Result` to JsValue");
+                    return serde_json::to_value(res)
+                        .expect("could not convert `Result` to JsValue");
                 };
 
                 // get duplicated tree
                 let Some(graph) = self.store.get_container_graph(&rid) else {
-                    let err: Result<ResourceTree<CoreContainer>> = Err(CoreError::ResourceError(ResourceError::DoesNotExist("graph not found")).into());
+                    let err: Result<ResourceTree<CoreContainer>> = Err(CoreError::ResourceError(
+                        ResourceError::does_not_exist("graph not found"),
+                    )
+                    .into());
                     return serde_json::to_value(err).expect("could not convert error to JsValue");
                 };
 
@@ -109,17 +68,52 @@ impl Database {
                 let graph: Result<ResourceTree<CoreContainer>> = Ok(graph);
                 serde_json::to_value(graph).expect("could not convert `Result` to JsValue")
             }
+
+            GraphCommand::Parent(rid) => {
+                let Some(graph) = self.store.get_container_graph(&rid) else {
+                    let err: Result<Option<ResourceId>> =
+                        Err(Error::CoreError(CoreError::ResourceError(
+                            ResourceError::does_not_exist("`Container` does not exist"),
+                        )));
+
+                    return serde_json::to_value(err).expect("could not convert error to JsValue");
+                };
+
+                let parent = graph.parent(&rid).unwrap();
+                let Some(parent) = parent else {
+                    let res: Result<Option<ResourceId>> = Ok(None);
+                    return serde_json::to_value(res).expect("could not convert error to JsValue");
+                };
+
+                serde_json::to_value(parent).expect("could not convert `Container` to JsValue")
+            }
+
+            GraphCommand::Children(rid) => {
+                let Some(graph) = self.store.get_container_graph(&rid) else {
+                    let res: Option<indexmap::IndexSet<ResourceId>> = None;
+                    return serde_json::to_value(res)
+                        .expect("could not convert `Container` to JsValue");
+                };
+
+                let children = graph.children(&rid).unwrap();
+                serde_json::to_value(children).expect("could not convert `Container` to JsValue")
+            }
         }
     }
 
-    /// Loads a `Projcet`'s [`Container`](LocalContainer) tree from settings.
+    /// Loads a `Project`'s [`Container`](LocalContainer) tree from settings.
     fn load_project_graph(&mut self, pid: &ResourceId) -> Result<&ContainerTree> {
         let Some(project) = self.store.get_project(pid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project` not loaded",
+            ))
+            .into());
         };
 
         let Some(data_root) = project.data_root.as_ref() else {
-            return Err(CoreError::ProjectError(ProjectError::Misconfigured("data root not set")).into());
+            return Err(
+                CoreError::ProjectError(ProjectError::misconfigured("data root not set")).into(),
+            );
         };
 
         if self.store.get_project_graph(pid).is_none() {
@@ -129,7 +123,9 @@ impl Database {
         }
 
         let Some(graph) = self.store.get_project_graph(pid) else {
-            return Err(Error::LocalError("could not load `Project` graph".to_string()));
+            return Err(Error::LocalError(
+                "could not load `Project` graph".to_string(),
+            ));
         };
 
         Ok(graph)
@@ -140,26 +136,49 @@ impl Database {
     #[tracing::instrument(skip(self))]
     fn duplicate_container_tree(&mut self, rid: &ResourceId) -> Result<ResourceId> {
         let Some(project) = self.store.get_container_project(rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` `Project` not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` `Project` not loaded",
+            ))
+            .into());
         };
 
         let Some(graph) = self.store.get_project_graph(&project) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` graph not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project` graph not loaded",
+            ))
+            .into());
         };
 
         let Some(root) = graph.get(rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist in graph")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist in graph",
+            ))
+            .into());
         };
 
         let Some(parent) = graph.parent(rid)?.cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not have parent")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not have parent",
+            ))
+            .into());
         };
 
         // duplicate tree
         let dup_path = unique_file_name(root.base_path().into())?;
-        let dup = ContainerTreeDuplicator::duplicate_to(&dup_path, graph, rid)?;
+        let mut dup = ContainerTreeDuplicator::duplicate_without_assets_to(&dup_path, graph, rid)?;
         let dup_root = dup.root().clone();
 
+        // update root name
+        let root = dup.get_mut(&dup_root).unwrap();
+        root.properties.name = root
+            .base_path()
+            .file_name()
+            .unwrap()
+            .to_string_lossy()
+            .to_string();
+
+        root.save()?;
+
         // insert duplicate
         let res = self.store.insert_subgraph(&parent, dup);
         match res {
@@ -170,15 +189,18 @@ impl Database {
 
     fn new_child(&mut self, parent: &ResourceId, name: String) -> Result<ResourceId> {
         let Some(parent) = self.store.get_container(&parent) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
         };
 
         // create child
-        // @todo: Ensure unique and valid path.
+        // TODO Ensure unique and valid path.
         let child_path = unique_file_name(parent.base_path().join(&name))?;
         let cid = container::new(&child_path)?;
-        let mut child: Container = ContainerLoader::load_or_create(child_path.into())?.into();
-        child.properties.name = Some(name);
+        let mut child = Container::load_from(child_path)?;
+        child.properties.name = name;
         child.save()?;
 
         // insert into graph
@@ -187,32 +209,3 @@ impl Database {
         Ok(cid)
     }
 }
-
-#[cfg(not(target_os = "windows"))]
-fn delete_folder(root_path: &Path) -> StdResult<(), trash::Error> {
-    trash::delete(root_path)
-}
-
-#[cfg(target_os = "windows")]
-#[tracing::instrument]
-fn delete_folder(root_path: &Path) -> StdResult<(), trash::Error> {
-    for entry in fs::read_dir(root_path).expect("could not read dir") {
-        let entry = entry.expect("could not get dir entry");
-        let path = root_path.join(entry.file_name());
-        if entry
-            .file_type()
-            .expect("could not read file type")
-            .is_dir()
-        {
-            delete_folder(&path)?;
-        } else {
-            trash::delete(path)?;
-        }
-    }
-
-    trash::delete(root_path)
-}
-
-#[cfg(test)]
-#[path = "./graph_test.rs"]
-mod graph_test;
diff --git a/local/database/src/server/handler/mod.rs b/local/database/src/server/command/mod.rs
similarity index 52%
rename from local/database/src/server/handler/mod.rs
rename to local/database/src/server/command/mod.rs
index 6f836b78..6586ec50 100644
--- a/local/database/src/server/handler/mod.rs
+++ b/local/database/src/server/command/mod.rs
@@ -1,4 +1,6 @@
-//! Handlers for each `Database` `Command` type.
+//! Database `Command` handlers.
+pub mod actor;
+pub mod analysis;
 pub mod asset;
 pub mod container;
 pub mod database;
@@ -7,6 +9,4 @@ pub mod project;
 pub mod script;
 pub mod user;
 
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub(super) use actor::CommandActor;
diff --git a/local/database/src/server/handler/project.rs b/local/database/src/server/command/project.rs
similarity index 85%
rename from local/database/src/server/handler/project.rs
rename to local/database/src/server/command/project.rs
index c5aab0a8..27d27c66 100644
--- a/local/database/src/server/handler/project.rs
+++ b/local/database/src/server/command/project.rs
@@ -3,15 +3,14 @@ use super::super::Database;
 use crate::command::ProjectCommand;
 use crate::error::{Error, Result};
 use serde_json::Value as JsValue;
-use settings_manager::{system_settings::Loader as SystemLoader, Settings};
 use std::path::Path;
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::project::Project as CoreProject;
 use thot_core::types::{Creator, ResourceId, UserPermissions};
 use thot_local::project::project::project_resource_root_path;
-use thot_local::project::resources::project::{Loader as ProjectLoader, Project as LocalProject};
-use thot_local::project::types::{project_settings, ProjectSettings};
+use thot_local::project::resources::project::Project as LocalProject;
 use thot_local::system::collections::projects::Projects;
+use thot_local::types::ProjectSettings;
 
 impl Database {
     /// Directs the command to the correct handler.
@@ -65,7 +64,8 @@ impl Database {
 
             ProjectCommand::Add(path, user) => {
                 let Ok(local_project) = self.load_project(&path) else {
-                    let err: Result<CoreProject> = Err(Error::SettingsError("could not load project".to_string()));
+                    let err: Result<CoreProject> =
+                        Err(Error::SettingsError("could not load project".to_string()));
                     return serde_json::to_value(err).expect("could not convert error to JsValue");
                 };
 
@@ -88,15 +88,14 @@ impl Database {
                 }
 
                 // add project to collection
-                let mut projects: Projects = match SystemLoader::load_or_create::<Projects>() {
+                let mut projects = match Projects::load() {
                     Ok(projects) => projects,
                     Err(err) => {
                         let err = Error::SettingsError(format!("{err:?}"));
                         return serde_json::to_value(err)
                             .expect("could not convert error to JsValue");
                     }
-                }
-                .into();
+                };
 
                 projects.insert(project.rid.clone(), path.to_path_buf());
 
@@ -108,7 +107,6 @@ impl Database {
                 };
 
                 let project: Result<(CoreProject, ProjectSettings)> = Ok((project, settings));
-
                 serde_json::to_value(project).expect("could not convert `Project` to JsValue")
             }
 
@@ -120,7 +118,8 @@ impl Database {
             ProjectCommand::Get(rid) => {
                 let Some(project) = self.store.get_project(&rid) else {
                     let value: Option<CoreProject> = None;
-                    return serde_json::to_value(value).expect("could not convert `None` to JsValue")
+                    return serde_json::to_value(value)
+                        .expect("could not convert `None` to JsValue");
                 };
 
                 let project = Some((**project).clone());
@@ -153,21 +152,19 @@ impl Database {
     ///
     /// # Returns
     /// Reference to the loaded [`Project`](LocalProject).
+    ///
+    /// # Side effects
+    /// + Watches the project folder.
     pub fn load_project(&mut self, path: &Path) -> Result<&LocalProject> {
-        // load project
-        let project: LocalProject = ProjectLoader::load_or_create(path)?.into();
-        let _o_project = self.store.insert_project(project)?;
-        if let Some(project) = self.get_path_project(&path) {
-            return Ok(project);
-        }
-
-        Err(Error::DatabaseError(
-            "could not store `Project`".to_string(),
-        ))
+        let project = LocalProject::load_from(path)?;
+        self.store.insert_project(project)?;
+        self.watch_path(path);
+        let project = self.get_path_project(&path).unwrap();
+        return Ok(project);
     }
 
     fn get_path_project(&self, path: &Path) -> Option<&LocalProject> {
-        if let Some(pid) = self.store.get_path_project(&path) {
+        if let Some(pid) = self.store.get_path_project_canonical(&path).unwrap() {
             if let Some(project) = self.store.get_project(pid) {
                 // already loaded
                 return Some(project);
@@ -189,7 +186,7 @@ impl Database {
         &mut self,
         user: &ResourceId,
     ) -> Result<Vec<(CoreProject, ProjectSettings)>> {
-        let projects_info: Projects = SystemLoader::load_or_create::<Projects>()?.into();
+        let projects_info = Projects::load_or_default()?;
 
         // load projects
         let mut projects = Vec::new();
@@ -204,13 +201,16 @@ impl Database {
             }
         }
 
-        // @todo: Unload unused projects.
+        // TODO Unload unused projects.
         Ok(projects)
     }
 
     fn update_project(&mut self, update: CoreProject) -> Result {
         let Some(project) = self.store.get_project_mut(&update.rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Script` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Script` does not exist",
+            ))
+            .into());
         };
 
         **project = update;
@@ -220,7 +220,10 @@ impl Database {
 
     fn update_project_settings(&mut self, rid: &ResourceId, settings: ProjectSettings) -> Result {
         let Some(project) = self.store.get_project_mut(rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Script` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Script` does not exist",
+            ))
+            .into());
         };
 
         *project.settings_mut() = settings;
diff --git a/local/database/src/server/handler/project_test.rs b/local/database/src/server/command/project_test.rs
similarity index 91%
rename from local/database/src/server/handler/project_test.rs
rename to local/database/src/server/command/project_test.rs
index 57bb2601..226d2c00 100644
--- a/local/database/src/server/handler/project_test.rs
+++ b/local/database/src/server/command/project_test.rs
@@ -3,7 +3,6 @@ use dev_utils::fs::TempDir;
 use fake::faker::lorem::raw::Word;
 use fake::locales::EN;
 use fake::Fake;
-use settings_manager::LocalSettings;
 use thot_core::project::Project as CoreProject;
 use thot_local::project::project;
 use thot_local::project::resources::Project as LocalProject;
@@ -18,7 +17,7 @@ fn update_project_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not create new `TempDir`");
     project::init(_dir.path()).expect("could not init `Project`");
-    let project = LocalProject::load(_dir.path()).expect("could not load `Project`");
+    let project = LocalProject::load_from(_dir.path()).expect("could not load `Project`");
     let pid = project.rid.clone();
 
     let name = Word(EN).fake::<String>();
diff --git a/local/database/src/server/handler/script.rs b/local/database/src/server/command/script.rs
similarity index 79%
rename from local/database/src/server/handler/script.rs
rename to local/database/src/server/command/script.rs
index 801d997a..efd6d1d8 100644
--- a/local/database/src/server/handler/script.rs
+++ b/local/database/src/server/command/script.rs
@@ -3,8 +3,6 @@ use super::super::Database;
 use crate::command::ScriptCommand;
 use crate::{Error, Result};
 use serde_json::Value as JsValue;
-use settings_manager::local_settings::Loader as LocalLoader;
-use settings_manager::system_settings::Loader as SystemLoader;
 use std::path::PathBuf;
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::project::{Project as CoreProject, Script as CoreScript};
@@ -46,7 +44,8 @@ impl Database {
                 let project = self.get_script_project(&script);
                 let Some(project) = project else {
                     let val: Option<CoreProject> = None;
-                    return serde_json::to_value(val).expect("could not convert `CoreProject` to JsValue")
+                    return serde_json::to_value(val)
+                        .expect("could not convert `CoreProject` to JsValue");
                 };
 
                 let project: Option<CoreProject> = Some((**project).clone());
@@ -62,21 +61,20 @@ impl Database {
     fn load_project_scripts(&mut self, rid: ResourceId) -> Result<Vec<CoreScript>> {
         if let Some(scripts) = self.store.get_project_scripts(&rid) {
             // project scripts already loaded
-            let scripts = (*scripts).clone().into_values().collect();
-            return Ok(scripts);
+            return Ok(scripts.values().map(|script| script.clone()).collect());
         }
 
-        let projects: Projects = SystemLoader::load_or_create::<Projects>()?.into();
+        let projects = Projects::load_or_default()?;
         let Some(project) = projects.get(&rid).clone() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project` does not exist",
+            ))
+            .into());
         };
 
-        let scripts: ProjectScripts =
-            LocalLoader::load_or_create::<ProjectScripts>(project.clone())?.into();
-
-        let script_vals = (*scripts).clone().into_values().collect();
+        let scripts = ProjectScripts::load_from(project)?;
+        let script_vals = (**scripts).clone().into_values().collect();
         self.store.insert_project_scripts(rid, scripts);
-
         Ok(script_vals)
     }
 
@@ -91,20 +89,27 @@ impl Database {
     /// Remove `Script` from `Project`.
     fn remove_script(&mut self, pid: &ResourceId, script: &ResourceId) -> Result {
         let script = self.store.remove_project_script(pid, script)?;
-        
+
         if let Some(script) = script {
             let path = match script.path {
                 ResourcePath::Absolute(path) => path.clone(),
                 ResourcePath::Relative(script_path) => {
                     let Some(project) = self.store.get_project(&pid) else {
-                        return Err(Error::DatabaseError(String::from("could not get `Project` path")));
+                        return Err(Error::DatabaseError(String::from(
+                            "could not get `Project` path",
+                        )));
                     };
 
                     let path = project.base_path();
-                    path
-                        .join(project.analysis_root.as_ref().expect("`Project`'s analysis root not set").clone())
-                        .join(script_path)
-                },
+                    path.join(
+                        project
+                            .analysis_root
+                            .as_ref()
+                            .expect("`Project`'s analysis root not set")
+                            .clone(),
+                    )
+                    .join(script_path)
+                }
                 ResourcePath::Root(_path, _level) => {
                     todo!("root paths not handled");
                 }
@@ -119,7 +124,10 @@ impl Database {
     /// Update a `Script`.
     fn update_script(&mut self, script: CoreScript) -> Result {
         let Some(project) = self.store.get_script_project(&script.rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Script` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Script` does not exist",
+            ))
+            .into());
         };
 
         self.store.insert_script(project.clone(), script)?;
diff --git a/local/database/src/server/handler/script_test.rs b/local/database/src/server/command/script_test.rs
similarity index 64%
rename from local/database/src/server/handler/script_test.rs
rename to local/database/src/server/command/script_test.rs
index a52da28a..b4e9d5e2 100644
--- a/local/database/src/server/handler/script_test.rs
+++ b/local/database/src/server/command/script_test.rs
@@ -1,37 +1,30 @@
 use super::*;
 use dev_utils::fs::TempDir;
 use dev_utils::path::resource_path;
+use thot_core::graph::ResourceTree;
 use thot_core::project::{Script, ScriptAssociation};
-use thot_local::project::resources::{Project as LocalProject, Scripts as LocalScripts};
-use thot_local::project::{container, project};
+use thot_local::project::resources::{
+    Container as LocalContainer, Project as LocalProject, Scripts as LocalScripts,
+};
 
 #[test]
 fn remove_script_should_work() {
     // setup
-
-    let mut _dir = TempDir::new().expect("could not create new `TempDir`");
-    let child_dir = _dir.mkdir().expect("could not create new child directory");
+    let mut dir = TempDir::new().expect("could not create new `TempDir`");
+    let data_dir = dir.mkdir().expect("could not create new child directory");
+    let child_dir = dir.children.get_mut(&data_dir).unwrap().mkdir().unwrap();
 
     // initialize project
-    project::init(_dir.path()).expect("could not init `Project`");
-    let mut project = LocalProject::load(_dir.path()).expect("could not load `Project`");
-
-    let cid = container::init(_dir.path()).expect("could not init `Container`");
-
-    let child_cid = container::init(&child_dir).expect("could not init child `Container`");
-
-    let mut container = LocalContainer::load(_dir.path()).expect("could not load `Container`");
+    let mut project = LocalProject::new(dir.path().into()).unwrap();
+    let mut container = LocalContainer::new(data_dir.clone());
+    let mut child_container = LocalContainer::new(child_dir.clone());
 
-    let mut child_container =
-        LocalContainer::load(&child_dir).expect("could not load child `Container`");
-
-    container.register_child(child_cid.clone());
-
-    project.data_root = Some(_dir.path().to_path_buf());
+    project.data_root = Some(data_dir.clone());
+    let cid = container.rid.clone();
+    let child_cid = child_container.rid.clone();
     let pid = project.rid.clone();
 
     // initialize scripts
-
     let script_0 =
         Script::new(resource_path::resource_path(Some("py"))).expect("could not create `script`");
 
@@ -41,7 +34,7 @@ fn remove_script_should_work() {
     let sid_0 = script_0.rid.clone();
     let sid_1 = script_1.rid.clone();
 
-    let mut scripts = LocalScripts::load(_dir.path()).expect("could not load `Scripts`");
+    let mut scripts = LocalScripts::load_from(dir.path()).expect("could not load `Scripts`");
 
     scripts
         .insert_script(script_0)
@@ -52,7 +45,6 @@ fn remove_script_should_work() {
         .expect("could not insert `Script` 1");
 
     // add script association
-
     let assoc_root_0 = ScriptAssociation::new(sid_0.clone());
     let assoc_root_1 = ScriptAssociation::new(sid_1.clone());
     let assoc_child_0 = ScriptAssociation::new(sid_0.clone());
@@ -74,26 +66,17 @@ fn remove_script_should_work() {
         .add_script_association(assoc_child_1.clone())
         .expect("could not add `ScriptAssociation`");
 
-    project.save().expect("could not save `Project`");
-    scripts.save().expect("could not save `Scripts`");
-
-    container.save().expect("could not save root `Container`");
-    child_container
-        .save()
-        .expect("could not save child `Container`");
+    let mut graph = ResourceTree::new(container);
+    graph.insert(cid.clone(), child_container).unwrap();
 
     // database setup
-
-    drop(child_container);
-    container.load_children(true).expect("could not load child");
-
     let mut db = Database::new();
     db.store
         .insert_project(project)
         .expect("could not insert `Project`");
 
     db.store
-        .insert_container_tree(Arc::new(Mutex::new(container)))
+        .insert_project_graph(pid.clone(), graph)
         .expect("could not insert `Container`");
 
     db.store.insert_project_scripts(pid.clone(), scripts);
@@ -110,7 +93,6 @@ fn remove_script_should_work() {
 
     // scripts are properly removed from project
     assert!(!scripts.contains_key(&sid_0));
-
     assert!(scripts.contains_key(&sid_1));
 
     let container = db
@@ -123,9 +105,6 @@ fn remove_script_should_work() {
         .get_container(&child_cid)
         .expect("could not get `Container`");
 
-    let container = container.lock().expect("could not lock `Container`");
-    let child_container = child_container.lock().expect("could not lock `Container`");
-
     // scripts are properly removed from container
     assert!(
         !container.scripts.contains_key(&sid_0),
@@ -143,5 +122,5 @@ fn remove_script_should_work() {
         child_container.scripts.contains_key(&sid_1),
         "child container should contain unremoved script"
     );
-    // @todo[3]: ensure changes save to disk
+    // TODO ensure changes save to disk
 }
diff --git a/local/database/src/server/handler/user.rs b/local/database/src/server/command/user.rs
similarity index 100%
rename from local/database/src/server/handler/user.rs
rename to local/database/src/server/command/user.rs
diff --git a/local/database/src/server/database.rs b/local/database/src/server/database.rs
index 3cc47770..7f77929c 100644
--- a/local/database/src/server/database.rs
+++ b/local/database/src/server/database.rs
@@ -1,89 +1,109 @@
 //! Database for storing resources.
-#[path = "./handler/mod.rs"]
-mod handler;
+#[path = "./command/mod.rs"]
+mod command;
 
+#[path = "./file_system/mod.rs"]
+mod file_system;
+
+use self::command::CommandActor;
+use self::file_system::actor::{FileSystemActor, FileSystemActorCommand};
+use self::file_system::file_system_event_processor::FileSystemEventProcessor;
 use super::store::Datastore;
+use super::Event;
 use crate::command::Command;
-use crate::constants::{DATABASE_ID, REQ_REP_PORT};
-use crate::{Error, Result};
+use crate::event::Update;
+use crate::{common, constants, Result};
+use notify_debouncer_full::DebounceEventResult;
 use serde_json::Value as JsValue;
-use std::net::Ipv4Addr;
-
-static LOCALHOST: Ipv4Addr = Ipv4Addr::LOCALHOST;
+use std::path::PathBuf;
+use std::sync::mpsc;
+use std::thread;
 
 /// Database.
 pub struct Database {
     store: Datastore,
+    event_rx: mpsc::Receiver<Event>,
+    file_system_tx: mpsc::Sender<FileSystemActorCommand>,
 
-    /// Kill flag indicating the database should stop listening and return.
-    kill: bool,
-
-    /// ZMQ context.
-    zmq_context: zmq::Context,
+    /// Publication socket to broadcast updates.
+    update_tx: zmq::Socket,
 }
 
 impl Database {
+    /// Creates a new Database.
+    /// The database immediately begins listening for ZMQ and file system events.
     pub fn new() -> Self {
+        let zmq_context = zmq::Context::new();
+        let update_tx = zmq_context.socket(zmq::PUB).unwrap();
+        update_tx.bind(&common::zmq_url(zmq::PUB).unwrap()).unwrap();
+
+        let (event_tx, event_rx) = mpsc::channel();
+        let (file_system_tx, file_system_rx) = mpsc::channel();
+        let command_actor = CommandActor::new(event_tx.clone());
+        let mut file_system_actor = FileSystemActor::new(event_tx, file_system_rx);
+
+        thread::spawn(move || command_actor.run());
+        thread::spawn(move || file_system_actor.run());
+
         Database {
             store: Datastore::new(),
-            kill: false,
-            zmq_context: zmq::Context::new(),
+            event_rx,
+            file_system_tx,
+            update_tx,
         }
     }
 
-    #[tracing::instrument(skip(self))]
-    pub fn listen_for_commands(&mut self) -> Result {
-        let rep_socket = self.zmq_context.socket(zmq::SocketType::REP)?;
-        rep_socket.bind(&format!("tcp://{LOCALHOST}:{REQ_REP_PORT}"))?;
+    /// Begin responding to events.
+    pub fn start(&mut self) {
+        self.listen_for_events();
+    }
 
+    /// Listen for events coming from child actors.
+    fn listen_for_events(&mut self) {
         loop {
-            if self.kill {
-                break;
+            match self.event_rx.recv().unwrap() {
+                Event::Command { cmd, tx } => tx.send(self.handle_command(cmd)).unwrap(),
+                Event::FileSystem(events) => self.handle_file_system_events(events).unwrap(),
             }
-
-            let mut msg = zmq::Message::new();
-            rep_socket
-                .recv(&mut msg, 0)
-                .expect("could not recieve request");
-
-            let Some(msg_str) = msg.as_str() else {
-                let err_msg = "invalid message: could not convert to string".to_string();
-                tracing::debug!(err = err_msg.clone());
-                let res: Result<JsValue> = Err(Error::ZMQ(err_msg));
-                let res = serde_json::to_value(res).expect("could not convert error to JsValue");
-                rep_socket
-                    .send(&res.to_string(), 0)
-                    .expect("could not send response");
-
-                continue;
-            };
-
-            let Ok(cmd) = serde_json::from_str(msg_str) else {
-                let err_msg = "invalid message: could not convert `Message` to `Command".to_string();
-                tracing::debug!(err = err_msg, msg = msg_str);
-                let res: Result<JsValue> = Err(Error::ZMQ(err_msg));
-                let res = serde_json::to_value(res).expect("could not convert error to JsValue");
-                rep_socket
-                    .send(&res.to_string(), 0)
-                    .expect("could not send response");
-
-                continue;
-            };
-
-            tracing::debug!(?cmd);
-            let res = self.handle_command(cmd);
-
-            rep_socket
-                .send(&res.to_string(), 0)
-                .expect("could not send response");
         }
+    }
 
-        Ok(())
+    /// Add a path to watch for file system changes.
+    fn watch_path(&mut self, path: impl Into<PathBuf>) {
+        self.file_system_tx
+            .send(FileSystemActorCommand::Watch(path.into()))
+            .unwrap();
+    }
+
+    /// Remove a path from watching file system changes.
+    fn unwatch_path(&mut self, path: impl Into<PathBuf>) {
+        self.file_system_tx
+            .send(FileSystemActorCommand::Unwatch(path.into()))
+            .unwrap();
+    }
+
+    /// Publish an update to subscribers.
+    /// Triggered by file system events.
+    fn publish_update(&self, update: &Update) -> zmq::Result<()> {
+        let mut topic = constants::PUB_SUB_TOPIC.to_string();
+        match update {
+            Update::Project {
+                project,
+                update: _update,
+            } => {
+                topic.push_str(&format!("/project/{project}"));
+            }
+        };
+
+        self.update_tx.send(&topic, zmq::SNDMORE)?;
+        self.update_tx
+            .send(&serde_json::to_string(update).unwrap(), 0)
     }
 
-    // @todo: Handle errors.
+    // TODO Handle errors.
     /// Handles a given command, returning the correct data.
-    pub fn handle_command(&mut self, command: Command) -> JsValue {
+    fn handle_command(&mut self, command: Command) -> JsValue {
+        tracing::debug!(?command);
         match command {
             Command::AssetCommand(cmd) => self.handle_command_asset(cmd),
             Command::ContainerCommand(cmd) => self.handle_command_container(cmd),
@@ -92,10 +112,49 @@ impl Database {
             Command::GraphCommand(cmd) => self.handle_command_graph(cmd),
             Command::ScriptCommand(cmd) => self.handle_command_script(cmd),
             Command::UserCommand(cmd) => self.handle_command_user(cmd),
+            Command::AnalysisCommand(cmd) => self.handle_command_analysis(cmd),
         }
     }
-}
 
-#[cfg(test)]
-#[path = "./database_test.rs"]
-mod database_test;
+    /// Handle file system events.
+    /// To be used with [`notify::Watcher`]s.
+    #[tracing::instrument(skip(self))]
+    fn handle_file_system_events(&mut self, events: DebounceEventResult) -> Result {
+        let events = match events {
+            Ok(events) => events,
+            Err(errs) => {
+                #[cfg(target_os = "macos")]
+                {
+                    if errs.iter().any(|err| match &err.clone().kind {
+                        notify::ErrorKind::Io(err)
+                            if err.kind() == std::io::ErrorKind::NotFound =>
+                        {
+                            false
+                        }
+                        notify::ErrorKind::Generic(msg)
+                            if msg.contains("No such file or directory") =>
+                        {
+                            false
+                        }
+                        _ => true,
+                    }) {
+                        tracing::debug!("watch error: {errs:?}");
+                        return Err(crate::Error::DatabaseError(format!("{errs:?}")));
+                    }
+
+                    Vec::new()
+                }
+                #[cfg(not(target_os = "macos"))]
+                {
+                    tracing::debug!("watch error: {errs:?}");
+                    return Err(crate::Error::DatabaseError(format!("{errs:?}")));
+                }
+            }
+        };
+
+        let events = FileSystemEventProcessor::process(events);
+        let events = self.process_file_system_events_to_thot_events(&events);
+        self.handle_thot_events(events)?;
+        Ok(())
+    }
+}
diff --git a/local/database/src/server/database_test.rs b/local/database/src/server/database_test.rs
deleted file mode 100644
index 0d00e600..00000000
--- a/local/database/src/server/database_test.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use super::*;
-
-#[test]
-fn database_new_should_work() {
-    Database::new();
-}
diff --git a/local/database/src/server/event.rs b/local/database/src/server/event.rs
new file mode 100644
index 00000000..e2ce9e17
--- /dev/null
+++ b/local/database/src/server/event.rs
@@ -0,0 +1,8 @@
+pub enum Event {
+    Command {
+        cmd: crate::Command,
+        tx: std::sync::mpsc::Sender<serde_json::Value>,
+    },
+
+    FileSystem(notify_debouncer_full::DebounceEventResult),
+}
diff --git a/local/database/src/server/file_system/actor.rs b/local/database/src/server/file_system/actor.rs
new file mode 100644
index 00000000..dfa44522
--- /dev/null
+++ b/local/database/src/server/file_system/actor.rs
@@ -0,0 +1,107 @@
+use crate::server::Event;
+use notify::{self, RecursiveMode, Watcher};
+use notify_debouncer_full::{DebounceEventResult, Debouncer, FileIdMap};
+use std::path::{Path, PathBuf};
+use std::sync::mpsc;
+use std::time::Duration;
+
+const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
+
+#[cfg(target_os = "macos")]
+type FileSystemWatcher = notify::PollWatcher;
+#[cfg(not(target_os = "macos"))]
+type FileSystemWatcher = notify::RecommendedWatcher;
+
+pub enum FileSystemActorCommand {
+    Watch(PathBuf),
+    Unwatch(PathBuf),
+}
+
+pub struct FileSystemActor {
+    command_rx: mpsc::Receiver<FileSystemActorCommand>,
+    watcher: Debouncer<FileSystemWatcher, FileIdMap>,
+}
+
+impl FileSystemActor {
+    /// Create a new actor to watch the file system.
+    /// Begins watching upon creation.
+    #[cfg(target_os = "macos")]
+    pub fn new(
+        event_tx: mpsc::Sender<Event>,
+        command_rx: mpsc::Receiver<FileSystemActorCommand>,
+    ) -> Self {
+        let watcher: Debouncer<FileSystemWatcher, _> = {
+            let event_tx = event_tx.clone();
+            let config = notify::Config::default()
+                .with_poll_interval(DEBOUNCE_TIMEOUT)
+                .with_compare_contents(true);
+
+            notify_debouncer_full::new_debouncer_opt(
+                DEBOUNCE_TIMEOUT,
+                None,
+                move |event: DebounceEventResult| {
+                    event_tx.send(Event::FileSystem(event)).unwrap();
+                },
+                notify_debouncer_full::FileIdMap::new(),
+                config,
+            )
+            .unwrap()
+        };
+
+        Self {
+            command_rx,
+            watcher,
+        }
+    }
+
+    /// Create a new actor to watch the file system.
+    /// Begins watching upon creation.
+    #[cfg(not(target_os = "macos"))]
+    pub fn new(
+        event_tx: mpsc::Sender<Event>,
+        command_rx: mpsc::Receiver<FileSystemActorCommand>,
+    ) -> Self {
+        let watcher = {
+            notify_debouncer_full::new_debouncer(
+                DEBOUNCE_TIMEOUT,
+                None,
+                move |event: DebounceEventResult| {
+                    event_tx.send(Event::FileSystem(event)).unwrap();
+                },
+            )
+            .unwrap()
+        };
+
+        Self {
+            command_rx,
+            watcher,
+        }
+    }
+
+    pub fn run(&mut self) {
+        loop {
+            match self.command_rx.recv().unwrap() {
+                FileSystemActorCommand::Watch(path) => self.watch(path),
+                FileSystemActorCommand::Unwatch(path) => self.unwatch(path),
+            }
+        }
+    }
+
+    fn watch(&mut self, path: impl AsRef<Path>) {
+        let path = path.as_ref();
+        self.watcher
+            .watcher()
+            .watch(path, RecursiveMode::Recursive)
+            .unwrap();
+
+        self.watcher
+            .cache()
+            .add_root(path, RecursiveMode::Recursive);
+    }
+
+    fn unwatch(&mut self, path: impl AsRef<Path>) {
+        let path = path.as_ref();
+        self.watcher.watcher().unwatch(path).unwrap();
+        self.watcher.cache().remove_root(path);
+    }
+}
diff --git a/local/database/src/server/file_system/asset.rs b/local/database/src/server/file_system/asset.rs
new file mode 100644
index 00000000..fcef0942
--- /dev/null
+++ b/local/database/src/server/file_system/asset.rs
@@ -0,0 +1,165 @@
+//! Handle [`thot::Asset`](AssetEvent) events.
+use super::event::thot::Asset as AssetEvent;
+use crate::event::{Asset as AssetUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::fs;
+use thot_local::project::asset as local_asset;
+
+impl Database {
+    pub fn handle_thot_event_asset(&mut self, event: AssetEvent) -> Result {
+        match event {
+            AssetEvent::Moved { asset, path } => {
+                let asset_container = self.store.get_asset_container_id(&asset).unwrap().clone();
+                let asset_project = self
+                    .store
+                    .get_container_project(&asset_container)
+                    .unwrap()
+                    .clone();
+
+                let Ok(path_container) = local_asset::container_from_path_ancestor(&path) else {
+                    // asset file moved out of any container
+                    self.store.remove_asset(&asset)?;
+                    self.publish_update(&Update::Project {
+                        project: asset_project,
+                        update: AssetUpdate::Removed(asset.clone()).into(),
+                    })?;
+
+                    return Ok(());
+                };
+
+                let path_container = self
+                    .store
+                    .get_path_container(&path_container)
+                    .unwrap()
+                    .clone();
+
+                let path_project = self
+                    .store
+                    .get_container_project(&path_container)
+                    .unwrap()
+                    .clone();
+
+                let container = self.store.get_container(&path_container).unwrap();
+                let container_path = fs::canonicalize(container.base_path()).unwrap();
+                let asset_path = path.strip_prefix(container_path).unwrap();
+
+                if asset_container == path_container {
+                    // path updated
+                    self.store.update_asset_path(&asset, asset_path).unwrap();
+
+                    let container = self.store.get_asset_container(&asset).unwrap();
+                    let asset_path = container.assets.get(&asset).unwrap().path.clone();
+                    self.publish_update(&Update::Project {
+                        project: asset_project,
+                        update: AssetUpdate::PathChanged {
+                            asset: asset.clone(),
+                            path: asset_path,
+                        }
+                        .into(),
+                    })?;
+
+                    return Ok(());
+                }
+
+                // asset moved containers
+                self.store.move_asset(&asset, &path_container)?;
+                self.store.update_asset_path(&asset, asset_path)?;
+
+                if asset_project == path_project {
+                    let container = self.store.get_asset_container(&asset).unwrap();
+                    let asset_path = container.assets.get(&asset).unwrap().path.clone();
+                    self.publish_update(&Update::Project {
+                        project: asset_project,
+                        update: AssetUpdate::Moved {
+                            asset: asset.clone(),
+                            container: path_container.clone(),
+                            path: asset_path,
+                        }
+                        .into(),
+                    })?;
+                } else {
+                    self.publish_update(&Update::Project {
+                        project: asset_project,
+                        update: AssetUpdate::Removed(asset.clone()).into(),
+                    })?;
+
+                    let asset = self
+                        .store
+                        .get_container(&path_container)
+                        .unwrap()
+                        .assets
+                        .get(&asset)
+                        .unwrap()
+                        .clone();
+
+                    self.publish_update(&Update::Project {
+                        project: path_project,
+                        update: AssetUpdate::Created {
+                            container: path_container.clone(),
+                            asset,
+                        }
+                        .into(),
+                    })?;
+                }
+
+                Ok(())
+            }
+
+            AssetEvent::Removed(asset) => {
+                let container = self.store.get_asset_container_id(&asset).unwrap();
+                let project = self.store.get_container_project(container).unwrap().clone();
+                self.store.remove_asset(&asset)?;
+                self.publish_update(&Update::Project {
+                    project,
+                    update: AssetUpdate::Removed(asset.clone()).into(),
+                })?;
+
+                Ok(())
+            }
+
+            AssetEvent::Renamed { asset, name } => {
+                let container = self.store.get_asset_container(&asset).unwrap();
+                let cid = container.rid.clone();
+                let container_path = fs::canonicalize(container.base_path()).unwrap().clone();
+                let name = name.strip_prefix(container_path).unwrap();
+                self.store.update_asset_path(&asset, name)?;
+
+                let project = self.store.get_container_project(&cid).unwrap().clone();
+                let container = self.store.get_asset_container(&asset).unwrap();
+                let path = container.assets.get(&asset).unwrap().path.clone();
+                self.publish_update(&Update::Project {
+                    project,
+                    update: AssetUpdate::PathChanged {
+                        asset: asset.clone(),
+                        path,
+                    }
+                    .into(),
+                })?;
+
+                Ok(())
+            }
+
+            AssetEvent::FileCreated(asset) => {
+                let container = self.store.get_asset_container(&asset).unwrap();
+                let asset = container.assets.get(&asset).unwrap();
+                let project = self
+                    .store
+                    .get_container_project(&container.rid)
+                    .unwrap()
+                    .clone();
+
+                self.publish_update(&Update::Project {
+                    project,
+                    update: AssetUpdate::Created {
+                        container: container.rid.clone(),
+                        asset: asset.clone(),
+                    }
+                    .into(),
+                })?;
+
+                Ok(())
+            }
+        }
+    }
+}
diff --git a/local/database/src/server/file_system/container.rs b/local/database/src/server/file_system/container.rs
new file mode 100644
index 00000000..ed935dc0
--- /dev/null
+++ b/local/database/src/server/file_system/container.rs
@@ -0,0 +1,60 @@
+//! Handle [`thot::Container`](ContainerEvent) events.
+use super::event::thot::Container as ContainerEvent;
+use crate::event::{Container as ContainerUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::path::PathBuf;
+use thot_core::types::ResourceId;
+
+impl Database {
+    pub fn handle_thot_event_container(&mut self, event: ContainerEvent) -> Result {
+        match event {
+            ContainerEvent::Renamed { container, name } => {
+                self.update_container_name(&container, name.clone())?;
+                let project = self
+                    .store
+                    .get_container_project(&container)
+                    .unwrap()
+                    .clone();
+
+                let properties = self
+                    .store
+                    .get_container(&container)
+                    .unwrap()
+                    .properties
+                    .clone();
+
+                self.publish_update(&Update::Project {
+                    project,
+                    update: ContainerUpdate::Properties {
+                        container: container.clone(),
+                        properties,
+                    }
+                    .into(),
+                })?;
+
+                Ok(())
+            }
+        }
+    }
+
+    /// Updates a subgraph's path.
+    /// Syncs the root `Container`'s name with path.
+    ///
+    /// # Returns
+    /// `ResouceId` of the affected `Container`.
+    #[tracing::instrument(skip(self))]
+    fn update_container_name(&mut self, root: &ResourceId, name: PathBuf) -> Result {
+        let rid = root.clone();
+        let root = self.store.get_container_mut(&root).unwrap();
+        root.properties.name = name.to_str().unwrap().to_string();
+
+        let mut path = root.base_path().to_path_buf();
+        path.set_file_name(name);
+        self.store.update_subgraph_path(&rid, path)?; // must update graph paths before saving container
+
+        let root = self.store.get_container(&rid).unwrap();
+        root.save()?;
+        Ok(())
+    }
+}
diff --git a/local/database/src/server/file_system/event.rs b/local/database/src/server/file_system/event.rs
new file mode 100644
index 00000000..9ed894da
--- /dev/null
+++ b/local/database/src/server/file_system/event.rs
@@ -0,0 +1,203 @@
+//! File system events
+
+pub mod file_system {
+    use std::path::PathBuf;
+
+    #[derive(Debug)]
+    pub enum Event {
+        File(File),
+        Folder(Folder),
+
+        /// Could not determine if the event affect a file, folder, or other resource.
+        Any(Any),
+    }
+
+    impl From<File> for Event {
+        fn from(event: File) -> Self {
+            Self::File(event)
+        }
+    }
+
+    impl From<Folder> for Event {
+        fn from(event: Folder) -> Self {
+            Self::Folder(event)
+        }
+    }
+
+    impl From<Any> for Event {
+        fn from(event: Any) -> Self {
+            Self::Any(event)
+        }
+    }
+
+    #[derive(Debug)]
+    pub enum File {
+        Created(PathBuf),
+        Removed(PathBuf),
+
+        /// A file's name was changed.
+        /// Its base directory is unchanged.
+        Renamed {
+            from: PathBuf,
+            to: PathBuf,
+        },
+
+        /// A file was moved to a different folder.
+        /// Its file name is unchanged.
+        Moved {
+            from: PathBuf,
+            to: PathBuf,
+        },
+    }
+
+    #[derive(Debug)]
+    pub enum Folder {
+        /// A new folder was created.
+        /// This folder may already have contents in it, e.g. if it was pasted in from another location.
+        Created(PathBuf),
+
+        Removed(PathBuf),
+
+        /// A folder's name was changed.
+        Renamed {
+            from: PathBuf,
+            to: PathBuf,
+        },
+
+        /// A folder was moved to a different parent.
+        Moved {
+            from: PathBuf,
+            to: PathBuf,
+        },
+    }
+
+    #[derive(Debug)]
+    pub enum Any {
+        Created(PathBuf),
+        Removed(PathBuf),
+    }
+}
+
+pub mod thot {
+    use std::path::PathBuf;
+    use thot_core::graph::ResourceTree;
+    use thot_core::types::ResourceId;
+    use thot_local::project::resources::Container as LocalContainer;
+
+    #[derive(Debug)]
+    pub enum Event {
+        Graph(Graph),
+        Container(Container),
+        Asset(Asset),
+        Script(Script),
+        File(File),
+        Folder(Folder),
+    }
+
+    impl From<Graph> for Event {
+        fn from(event: Graph) -> Self {
+            Self::Graph(event)
+        }
+    }
+
+    impl From<Container> for Event {
+        fn from(event: Container) -> Self {
+            Self::Container(event)
+        }
+    }
+
+    impl From<Asset> for Event {
+        fn from(event: Asset) -> Self {
+            Self::Asset(event)
+        }
+    }
+
+    impl From<Script> for Event {
+        fn from(event: Script) -> Self {
+            Self::Script(event)
+        }
+    }
+
+    impl From<File> for Event {
+        fn from(event: File) -> Self {
+            Self::File(event)
+        }
+    }
+
+    impl From<Folder> for Event {
+        fn from(event: Folder) -> Self {
+            Self::Folder(event)
+        }
+    }
+
+    #[derive(Debug)]
+    pub enum Graph {
+        /// An existing graph was inserted.
+        /// The graph could not be loaded from the database.
+        Inserted(ResourceTree<LocalContainer>),
+
+        /// An existing graph was copied.
+        Copied(ResourceTree<LocalContainer>),
+
+        Removed(ResourceId),
+
+        /// A subgraph was moved.
+        Moved {
+            root: ResourceId,
+            path: PathBuf,
+        },
+    }
+
+    #[derive(Debug)]
+    pub enum Container {
+        /// The name of the `Container`'s folder was changed.
+        Renamed {
+            container: ResourceId,
+            name: PathBuf,
+        },
+    }
+
+    #[derive(Debug)]
+    pub enum Asset {
+        Removed(ResourceId),
+        Moved {
+            asset: ResourceId,
+            path: PathBuf,
+        },
+
+        /// The name of the `Asset`'s file was changed.
+        Renamed {
+            asset: ResourceId,
+            name: PathBuf,
+        },
+
+        /// A file corresponding to a registered `Asset` was created.
+        FileCreated(ResourceId),
+    }
+
+    #[derive(Debug)]
+    pub enum Script {
+        /// A `Script`` was created.
+        Created(PathBuf),
+        Removed(ResourceId),
+
+        /// A `Script`'s path changed.
+        ///
+        /// # Notes
+        /// + The `Script` may have been moved into a different `Project`.
+        Moved {
+            script: ResourceId,
+            path: PathBuf,
+        },
+    }
+
+    #[derive(Debug)]
+    pub enum Folder {
+        Created(PathBuf),
+    }
+
+    #[derive(Debug)]
+    pub enum File {
+        Created(PathBuf),
+    }
+}
diff --git a/local/database/src/server/file_system/file.rs b/local/database/src/server/file_system/file.rs
new file mode 100644
index 00000000..057bb12e
--- /dev/null
+++ b/local/database/src/server/file_system/file.rs
@@ -0,0 +1,126 @@
+//! Handle [`thot::File`](FileEvent) events.
+use super::event::thot::File as FileEvent;
+use crate::event::{Asset as AssetUpdate, Graph as GraphUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::path::PathBuf;
+use thot_core::types::{ResourceId, ResourcePath};
+use thot_local::graph::{ContainerTreeLoader, ContainerTreeTransformer};
+use thot_local::project::container;
+use thot_local::project::resources::Asset;
+
+impl Database {
+    pub fn handle_thot_event_file(&mut self, event: FileEvent) -> Result {
+        match event {
+            FileEvent::Created(path) => {
+                let container_path =
+                    thot_local::project::asset::container_from_path_ancestor(&path)?;
+
+                let path_container = self
+                    .store
+                    .get_path_container_canonical(&container_path)
+                    .unwrap()
+                    .cloned()
+                    .unwrap();
+
+                let path_container = self.store.get_container(&path_container).unwrap();
+                if self
+                    .store
+                    .get_path_asset_id_canonical(&path)
+                    .unwrap()
+                    .is_some()
+                {
+                    return Ok(());
+                }
+
+                // NOTE When transferring large amounts of data
+                // some folder creation events are missed by `notify`.
+                // We account for this here by checking if the file is placed in a bucket.
+                // If not then we ensure it is placed in a Container, otherwise we initialize the highest possible
+                // folder as a subgraph.
+                let asset_path = path
+                    .strip_prefix(path_container.base_path())
+                    .unwrap()
+                    .to_path_buf();
+
+                let mut as_asset = true;
+                if asset_path.components().count() > 1 {
+                    as_asset = path_container
+                        .buckets()
+                        .iter()
+                        .any(|bucket| asset_path.strip_prefix(bucket).is_ok())
+                }
+
+                if as_asset {
+                    self.handle_file_as_asset(asset_path, path_container.rid.clone())?;
+                } else {
+                    let root_path = path_container
+                        .base_path()
+                        .join(asset_path.components().next().unwrap());
+
+                    self.init_subgraph_file(root_path)?;
+                }
+
+                Ok(())
+            }
+        }
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn handle_file_as_asset(&mut self, asset_path: PathBuf, container: ResourceId) -> Result {
+        let asset = Asset::new(ResourcePath::new(asset_path)?)?;
+        let aid = asset.rid.clone();
+        self.store.add_asset(asset, container.clone())?;
+
+        let project = self
+            .store
+            .get_container_project(&container)
+            .unwrap()
+            .clone();
+
+        let container = self.store.get_container(&container).unwrap();
+        let asset = container.assets.get(&aid).unwrap().clone();
+
+        self.publish_update(&Update::Project {
+            project,
+            update: AssetUpdate::Created {
+                container: container.rid.clone(),
+                asset,
+            }
+            .into(),
+        })?;
+
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn init_subgraph_file(&mut self, path: PathBuf) -> Result {
+        let parent = self
+            .store
+            .get_path_container_canonical(path.parent().unwrap())
+            .unwrap()
+            .cloned()
+            .unwrap();
+
+        // init graph
+        let mut builder = container::InitOptions::init();
+        builder.recurse(true);
+        builder.with_assets();
+        builder.build(&path)?;
+
+        // insert into graph
+        let graph = ContainerTreeLoader::load(path)?;
+        let root = graph.root().clone();
+        self.store.insert_subgraph(&parent, graph)?;
+
+        let project = self.store.get_container_project(&root).unwrap().clone();
+        let graph = self.store.get_container_graph(&root).unwrap();
+        let graph = ContainerTreeTransformer::local_to_core(graph);
+        self.publish_update(&Update::Project {
+            project,
+            update: GraphUpdate::Created { parent, graph }.into(),
+        })?;
+
+        Ok(())
+    }
+}
diff --git a/local/database/src/server/file_system/file_system_event_processor.rs b/local/database/src/server/file_system/file_system_event_processor.rs
new file mode 100644
index 00000000..157e8893
--- /dev/null
+++ b/local/database/src/server/file_system/file_system_event_processor.rs
@@ -0,0 +1,521 @@
+//! Process [`notify_debouncer_full::DebouncedEvent`]s into [`file_system::Event`](FileSystemEvent)s.
+use super::event::file_system::{
+    Any as AnyEvent, Event as FileSystemEvent, File as FileEvent, Folder as FolderEvent,
+};
+use notify::event::{CreateKind, EventKind, ModifyKind, RemoveKind, RenameMode};
+use notify_debouncer_full::DebouncedEvent;
+use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
+use thot_local::common;
+
+pub struct FileSystemEventProcessor;
+impl FileSystemEventProcessor {
+    /// Process [`notify_debouncer_full::DebouncedEvent`]s into [`file_system::Event`](FileSystemEvent)s.
+    /// Paths are canonicalized.
+    ///
+    /// # Notes
+    /// + When canonicalizing paths:
+    /// Assume that relative segments are resolved in file paths.
+    /// On Windows, paths are canonicalized to UNC.
+    /// However, `fs::canonicalize` can not be used on `from` paths because file no longer exists,
+    /// so must canonicalize by hand.
+    pub fn process(events: Vec<DebouncedEvent>) -> Vec<FileSystemEvent> {
+        let events = Self::filter_events(events);
+        let events = Self::filter_hidden(events);
+        let events = Self::filter_subfolder_events(events);
+        let (mut converted, remaining) = Self::group_events(events);
+        converted.append(&mut Self::convert_ungrouped_events(remaining));
+        converted
+    }
+
+    fn filter_hidden(events: Vec<DebouncedEvent>) -> Vec<DebouncedEvent> {
+        events
+            .into_iter()
+            .filter(|event| match event.kind {
+                EventKind::Create(_) => {
+                    let Some(file_name) = event.paths[0].file_name() else {
+                        return true;
+                    };
+
+                    let file_name = file_name.to_str().unwrap();
+                    !file_name.starts_with(".")
+                }
+
+                _ => true,
+            })
+            .collect()
+    }
+
+    /// Filters out uninteresting events.
+    fn filter_events(events: Vec<DebouncedEvent>) -> Vec<DebouncedEvent> {
+        events
+            .into_iter()
+            .filter(|event| match event.kind {
+                EventKind::Create(_)
+                | EventKind::Remove(_)
+                | EventKind::Modify(ModifyKind::Name(_)) => true,
+
+                _ => false,
+            })
+            .collect()
+    }
+
+    /// Filters out subevents of a folder.
+    /// These include
+    /// + Created files and folders contained in another created folder.
+    /// + Removed files and folders contained within another removed folder.
+    fn filter_subfolder_events(events: Vec<DebouncedEvent>) -> Vec<DebouncedEvent> {
+        fn get_root_paths<'a>(paths: &'a Vec<(usize, &PathBuf)>) -> Vec<(usize, &'a PathBuf)> {
+            let mut root_paths = Vec::<(usize, &PathBuf)>::with_capacity(paths.len());
+            for (event_index, path) in paths.into_iter() {
+                let mut new_root = Some(root_paths.len());
+                for (root_index, (_, root_path)) in root_paths.iter().enumerate() {
+                    if path.starts_with(root_path) {
+                        new_root.take();
+                        break;
+                    }
+
+                    if root_path.starts_with(path) {
+                        let _ = new_root.insert(root_index);
+                        break;
+                    }
+                }
+
+                match new_root {
+                    Some(root_index) if root_index == root_paths.len() => {
+                        root_paths.push((event_index.clone(), path));
+                    }
+
+                    Some(index) => root_paths[index] = (event_index.clone(), path),
+
+                    None => {}
+                }
+            }
+
+            root_paths
+        }
+
+        let create_events = events
+            .iter()
+            .enumerate()
+            .filter_map(|(index, event)| match event.kind {
+                EventKind::Create(_) => Some((index, &event.paths[0])),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+
+        let remove_events = events
+            .iter()
+            .enumerate()
+            .filter_map(|(index, event)| match event.kind {
+                EventKind::Remove(_) => Some((index, &event.paths[0])),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+
+        let create_root_paths = get_root_paths(&create_events);
+        let remove_root_paths = get_root_paths(&remove_events);
+
+        let create_root_indices = create_root_paths
+            .into_iter()
+            .map(|(index, _)| index)
+            .collect::<Vec<_>>();
+
+        let create_indices = create_events
+            .into_iter()
+            .map(|(index, _)| index)
+            .collect::<Vec<_>>();
+
+        let remove_root_indices = remove_root_paths
+            .into_iter()
+            .map(|(index, _)| index)
+            .collect::<Vec<_>>();
+
+        let remove_indices = remove_events
+            .into_iter()
+            .map(|(index, _)| index)
+            .collect::<Vec<_>>();
+
+        events
+            .into_iter()
+            .enumerate()
+            .filter_map(|(index, event)| {
+                if (create_indices.contains(&index) && !create_root_indices.contains(&index))
+                    || (remove_indices.contains(&index) && !remove_root_indices.contains(&index))
+                {
+                    None
+                } else {
+                    Some(event)
+                }
+            })
+            .collect()
+    }
+
+    /// Tries to convert all events into a single one.
+    ///
+    /// # Returns
+    /// Tuple of (<converted events>, <unconverted events>).
+    fn group_events(events: Vec<DebouncedEvent>) -> (Vec<FileSystemEvent>, Vec<DebouncedEvent>) {
+        let (mut renamed, remaining) = Self::group_renamed(events);
+        let (mut moved, remaining) = Self::group_moved(remaining);
+
+        renamed.append(&mut moved);
+        (renamed, remaining)
+    }
+
+    /// Converts groups of events that represent a renaming.
+    ///
+    /// # Returns
+    /// Tuple of (<converted events>, <unconverted events>).
+    fn group_renamed(events: Vec<DebouncedEvent>) -> (Vec<FileSystemEvent>, Vec<DebouncedEvent>) {
+        let mut other_events = Vec::with_capacity(events.len());
+        let mut from_events = HashMap::with_capacity(events.len() / 2);
+        let mut to_events = HashMap::with_capacity(events.len() / 2);
+        let mut remove_events = HashMap::with_capacity(events.len() / 2);
+        let mut create_events = HashMap::with_capacity(events.len() / 2);
+        for event in events {
+            match event.kind {
+                EventKind::Modify(ModifyKind::Name(RenameMode::From)) => {
+                    let parent = event.paths[0].parent().unwrap();
+                    let event_map = from_events
+                        .entry(parent.to_path_buf())
+                        .or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+
+                EventKind::Modify(ModifyKind::Name(RenameMode::To)) => {
+                    let parent = event.paths[0].parent().unwrap();
+                    let event_map = to_events.entry(parent.to_path_buf()).or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+
+                EventKind::Remove(_) => {
+                    let parent = event.paths[0].parent().unwrap();
+                    let event_map = remove_events
+                        .entry(parent.to_path_buf())
+                        .or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+
+                EventKind::Create(_) => {
+                    let parent = event.paths[0].parent().unwrap();
+                    let event_map = create_events
+                        .entry(parent.to_path_buf())
+                        .or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+
+                _ => other_events.push(event),
+            }
+        }
+
+        // rename events
+        let mut grouped_events = Vec::with_capacity(from_events.len() + remove_events.len());
+        let mut grouped_rename_keys = Vec::with_capacity(from_events.len() + remove_events.len());
+        for (parent, from_name_events) in from_events.iter() {
+            let Some(to_name_events) = to_events.get(parent) else {
+                continue;
+            };
+
+            match (&from_name_events[..], &to_name_events[..]) {
+                ([from_name_event], [to_name_event]) => {
+                    if to_name_event.paths[0].is_file() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&from_name_event.paths[0])
+                        } else {
+                            from_name_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FileEvent::Renamed {
+                                from,
+                                to: fs::canonicalize(&to_name_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_rename_keys.push(parent.to_owned());
+                    } else if to_name_event.paths[0].is_dir() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&from_name_event.paths[0])
+                        } else {
+                            from_name_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FolderEvent::Moved {
+                                from,
+                                to: fs::canonicalize(&to_name_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_rename_keys.push(parent.to_owned());
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        // remove / create events
+        let mut grouped_remove_create_keys = Vec::with_capacity(remove_events.len());
+        for (parent, remove_parent_events) in remove_events.iter() {
+            let Some(create_parent_events) = create_events.get(parent) else {
+                continue;
+            };
+
+            match (&remove_parent_events[..], &create_parent_events[..]) {
+                ([remove_parent_event], [create_parent_event]) => {
+                    if create_parent_event.paths[0].is_file() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&remove_parent_event.paths[0])
+                        } else {
+                            remove_parent_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FileEvent::Renamed {
+                                from,
+                                to: fs::canonicalize(&create_parent_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_remove_create_keys.push(parent.to_owned());
+                    } else if create_parent_event.paths[0].is_dir() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&remove_parent_event.paths[0])
+                        } else {
+                            remove_parent_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FolderEvent::Moved {
+                                from,
+                                to: fs::canonicalize(&create_parent_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_remove_create_keys.push(parent.to_owned());
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        // sort remaining
+        for name in grouped_rename_keys {
+            from_events.remove(&name);
+            to_events.remove(&name);
+        }
+
+        for name in grouped_remove_create_keys {
+            remove_events.remove(&name);
+            create_events.remove(&name);
+        }
+
+        for mut from_parent_events in from_events.into_values() {
+            other_events.append(&mut from_parent_events);
+        }
+
+        for mut to_parent_events in to_events.into_values() {
+            other_events.append(&mut to_parent_events);
+        }
+
+        for mut remove_parent_events in remove_events.into_values() {
+            other_events.append(&mut remove_parent_events);
+        }
+
+        for mut create_parent_events in create_events.into_values() {
+            other_events.append(&mut create_parent_events);
+        }
+
+        (grouped_events, other_events)
+    }
+
+    /// Converts groups of events that represent a move.
+    ///
+    /// # Returns
+    /// Tuple of (<converted events>, <unconverted events>).
+    fn group_moved(events: Vec<DebouncedEvent>) -> (Vec<FileSystemEvent>, Vec<DebouncedEvent>) {
+        let mut other_events = Vec::with_capacity(events.len());
+        let mut remove_events = HashMap::with_capacity(events.len() / 2);
+        let mut create_events = HashMap::with_capacity(events.len() / 2);
+        for event in events {
+            match event.kind {
+                EventKind::Remove(_) => {
+                    let file_name = event.paths[0].file_name().unwrap();
+                    let event_map = remove_events
+                        .entry(file_name.to_owned())
+                        .or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+                EventKind::Create(_) => {
+                    let file_name = event.paths[0].file_name().unwrap();
+                    let event_map = create_events
+                        .entry(file_name.to_owned())
+                        .or_insert(Vec::new());
+
+                    event_map.push(event);
+                }
+                _ => other_events.push(event),
+            }
+        }
+
+        let mut grouped_events = Vec::with_capacity(remove_events.len());
+        let mut grouped_names = Vec::with_capacity(remove_events.len());
+        for (file_name, remove_parent_events) in remove_events.iter() {
+            let Some(create_parent_events) = create_events.get(file_name) else {
+                continue;
+            };
+
+            match (&remove_parent_events[..], &create_parent_events[..]) {
+                ([remove_parent_event], [create_parent_event]) => {
+                    if create_parent_event.paths[0].is_file() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&remove_parent_event.paths[0])
+                        } else {
+                            remove_parent_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FileEvent::Moved {
+                                from,
+                                to: fs::canonicalize(&create_parent_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_names.push(file_name.to_owned());
+                    } else if create_parent_event.paths[0].is_dir() {
+                        let from = if cfg!(target_os = "windows") {
+                            common::ensure_windows_unc(&remove_parent_event.paths[0])
+                        } else {
+                            remove_parent_event.paths[0].clone()
+                        };
+
+                        grouped_events.push(
+                            FolderEvent::Moved {
+                                from,
+                                to: fs::canonicalize(&create_parent_event.paths[0]).unwrap(),
+                            }
+                            .into(),
+                        );
+
+                        grouped_names.push(file_name.to_owned());
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        for name in grouped_names {
+            remove_events.remove(&name);
+            create_events.remove(&name);
+        }
+
+        for mut remove_name_events in remove_events.into_values() {
+            other_events.append(&mut remove_name_events);
+        }
+
+        for mut create_name_events in create_events.into_values() {
+            other_events.append(&mut create_name_events);
+        }
+
+        (grouped_events, other_events)
+    }
+
+    fn convert_ungrouped_events(events: Vec<DebouncedEvent>) -> Vec<FileSystemEvent> {
+        events
+            .iter()
+            .filter_map(|event| Self::convert_event(event))
+            .collect()
+    }
+
+    fn convert_event(event: &DebouncedEvent) -> Option<FileSystemEvent> {
+        match event.kind {
+            EventKind::Create(CreateKind::File) => {
+                let path = fs::canonicalize(&event.paths[0]).unwrap();
+                Some(FileEvent::Created(path).into())
+            }
+
+            EventKind::Create(CreateKind::Folder) => {
+                let path = fs::canonicalize(&event.paths[0]).unwrap();
+                Some(FolderEvent::Created(path).into())
+            }
+
+            EventKind::Create(CreateKind::Any) => {
+                let Ok(path) = fs::canonicalize(&event.paths[0]) else {
+                    return Some(AnyEvent::Created(event.paths[0].to_owned()).into());
+                };
+                if path.is_file() {
+                    Some(FileEvent::Created(path).into())
+                } else if path.is_dir() {
+                    Some(FolderEvent::Created(path).into())
+                } else {
+                    None
+                }
+            }
+
+            EventKind::Modify(ModifyKind::Name(RenameMode::Both)) => {
+                let [from, to] = &event.paths[..] else {
+                    panic!("invalid paths");
+                };
+
+                let to = fs::canonicalize(to).unwrap();
+                let from = if cfg!(target_os = "windows") {
+                    common::ensure_windows_unc(&from)
+                } else {
+                    from.clone()
+                };
+
+                if to.is_file() {
+                    Some(FileEvent::Renamed { from, to }.into())
+                } else if to.is_dir() {
+                    Some(FolderEvent::Renamed { from, to }.into())
+                } else {
+                    None
+                }
+            }
+
+            EventKind::Remove(RemoveKind::File) => {
+                let path = if cfg!(target_os = "windows") {
+                    common::ensure_windows_unc(&event.paths[0])
+                } else {
+                    event.paths[0].clone()
+                };
+
+                Some(FileEvent::Removed(path).into())
+            }
+
+            EventKind::Remove(RemoveKind::Folder) => {
+                let path = if cfg!(target_os = "windows") {
+                    common::ensure_windows_unc(&event.paths[0])
+                } else {
+                    event.paths[0].clone()
+                };
+
+                Some(FolderEvent::Removed(path).into())
+            }
+
+            EventKind::Remove(RemoveKind::Any) => {
+                let path = if cfg!(target_os = "windows") {
+                    common::ensure_windows_unc(&event.paths[0])
+                } else {
+                    event.paths[0].clone()
+                };
+
+                Some(AnyEvent::Removed(path).into())
+            }
+
+            _ => None,
+        }
+    }
+}
diff --git a/local/database/src/server/file_system/folder.rs b/local/database/src/server/file_system/folder.rs
new file mode 100644
index 00000000..2c68a3b8
--- /dev/null
+++ b/local/database/src/server/file_system/folder.rs
@@ -0,0 +1,114 @@
+//! Handle [`thot::Folder`](FolderEvent) events.
+use super::event::thot::Folder as FolderEvent;
+use super::ParentChild;
+use crate::event::{Graph as GraphUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::fs;
+use std::path::{Component, PathBuf};
+use thot_local::graph::{ContainerTreeLoader, ContainerTreeTransformer};
+use thot_local::project::{asset, container, project};
+
+impl Database {
+    pub fn handle_thot_event_folder(&mut self, event: FolderEvent) -> Result {
+        match event {
+            FolderEvent::Created(path) => {
+                // ignore analysis folder
+                let path_project = project::project_root_path(&path).unwrap();
+                let path_project = self
+                    .store
+                    .get_path_project_canonical(&path_project)
+                    .unwrap()
+                    .unwrap();
+
+                let path_project = self.store.get_project(path_project).unwrap();
+                let analysis_path = fs::canonicalize(
+                    path_project
+                        .base_path()
+                        .join(path_project.analysis_root.clone().unwrap()),
+                )
+                .unwrap();
+
+                if path.strip_prefix(analysis_path).is_ok() {
+                    return Ok(());
+                }
+
+                // ignore if bucket
+                let path_container = asset::container_from_path_ancestor(&path)?;
+                let path_container = self.store.get_path_container(&path_container).unwrap();
+                let path_container = self.store.get_container(path_container).unwrap();
+                let bucket_path = path
+                    .strip_prefix(path_container.base_path())
+                    .unwrap()
+                    .to_path_buf();
+
+                let Component::Normal(bucket_path_root) = bucket_path.components().next().unwrap()
+                else {
+                    panic!("invalid path type")
+                };
+
+                if path_container
+                    .buckets()
+                    .iter()
+                    .any(|bucket| bucket.starts_with(&bucket_path_root))
+                {
+                    return Ok(());
+                }
+
+                // init subgraph
+                // NOTE When transferring large amounts of data
+                // some folder creation events are missed by `notify`.
+                // We account for this here by taking the highest possible folder as the root
+                // of the subgraph to be initialized.
+                let mut root_path = path_container.base_path().to_path_buf();
+                root_path.push(bucket_path.components().next().unwrap());
+
+                let ParentChild {
+                    parent,
+                    child: container,
+                } = self.init_subgraph(root_path)?;
+
+                let project = self
+                    .store
+                    .get_container_project(&container)
+                    .unwrap()
+                    .clone();
+
+                let graph = self.store.get_container_graph(&container).unwrap();
+                let graph = ContainerTreeTransformer::local_to_core(graph);
+                self.publish_update(&Update::Project {
+                    project,
+                    update: GraphUpdate::Created { parent, graph }.into(),
+                })?;
+
+                Ok(())
+            }
+        }
+    }
+
+    /// Initialize a path as a  Container tree and insert it into the graph.
+    ///
+    /// # Returns
+    /// `ResourceId` of the graph's root `Container`.
+    #[tracing::instrument(skip(self))]
+    fn init_subgraph(&mut self, path: PathBuf) -> Result<ParentChild> {
+        let parent = self
+            .store
+            .get_path_container_canonical(path.parent().unwrap())
+            .unwrap()
+            .cloned()
+            .unwrap();
+
+        // init graph
+        let mut builder = container::InitOptions::init();
+        builder.recurse(true);
+        builder.with_assets();
+        let child = builder.build(&path)?;
+
+        // insert into graph
+        let graph = ContainerTreeLoader::load(path)?;
+        self.store.insert_subgraph(&parent, graph)?;
+
+        Ok(ParentChild { parent, child })
+    }
+}
diff --git a/local/database/src/server/file_system/graph.rs b/local/database/src/server/file_system/graph.rs
new file mode 100644
index 00000000..590dfa65
--- /dev/null
+++ b/local/database/src/server/file_system/graph.rs
@@ -0,0 +1,148 @@
+//! Handle [`thot::Graph`](GraphEvent) events.
+use super::event::thot::Graph as GraphEvent;
+use crate::event::{Graph as GraphUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::path::PathBuf;
+use thot_core::types::ResourceId;
+use thot_local::graph::{ContainerTreeDuplicator, ContainerTreeTransformer};
+
+impl Database {
+    pub fn handle_thot_event_graph(&mut self, event: GraphEvent) -> Result {
+        match event {
+            GraphEvent::Moved { root, path } => {
+                let project = self.store.get_container_project(&root).unwrap().clone();
+                let parent = self
+                    .store
+                    .get_path_container(&path.parent().unwrap())
+                    .unwrap()
+                    .clone();
+
+                self.update_subgraph_path(&root, path.clone())?;
+                self.store.move_subgraph(&root, &parent)?;
+
+                let name = self
+                    .store
+                    .get_container(&root)
+                    .unwrap()
+                    .properties
+                    .name
+                    .clone();
+
+                self.publish_update(&Update::Project {
+                    project,
+                    update: GraphUpdate::Moved { root, parent, name }.into(),
+                })?;
+
+                Ok(())
+            }
+
+            GraphEvent::Inserted(graph) => {
+                // reassign rids
+                let mut graph = ContainerTreeDuplicator::duplicate(&graph, graph.root())?;
+                let root = graph.root().clone();
+                let path = graph.get(&root).unwrap().base_path().to_owned();
+                let parent = self
+                    .store
+                    .get_path_container_canonical(path.parent().unwrap())
+                    .unwrap()
+                    .cloned()
+                    .unwrap();
+
+                // sync root container name
+                let container = graph.get_mut(&root).unwrap();
+                container.properties.name = path.file_name().unwrap().to_str().unwrap().to_string();
+                container.save()?;
+
+                // remove scripts if not in project
+                let project = self.store.get_container_project(&parent).unwrap().clone();
+                let scripts = self.store.get_project_scripts(&project).unwrap();
+                for (_, container) in graph.iter_nodes_mut() {
+                    container
+                        .scripts
+                        .retain(|script, _| scripts.contains_key(script));
+
+                    container.save()?;
+                }
+
+                // insert graph
+                self.store.insert_subgraph(&parent, graph)?;
+                let project = self.store.get_container_project(&root).unwrap().clone();
+                let graph = self.store.get_container_graph(&root).unwrap();
+                let graph = ContainerTreeTransformer::local_to_core(graph);
+                self.publish_update(&Update::Project {
+                    project,
+                    update: GraphUpdate::Created { parent, graph }.into(),
+                })?;
+
+                Ok(())
+            }
+
+            GraphEvent::Copied(graph) => {
+                let mut graph = ContainerTreeDuplicator::duplicate(&graph, graph.root())?;
+                let root = graph.root().clone();
+                let root_container = graph.get_mut(&root).unwrap();
+                root_container.properties.name = root_container
+                    .base_path()
+                    .file_name()
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .to_string();
+
+                for container in graph.nodes().values() {
+                    container.save()?;
+                }
+
+                let path = graph.get(&root).unwrap().base_path();
+                let parent = self
+                    .store
+                    .get_path_container_canonical(path.parent().unwrap())
+                    .unwrap()
+                    .cloned()
+                    .unwrap();
+
+                self.store.insert_subgraph(&parent, graph)?;
+
+                let project = self.store.get_container_project(&root).unwrap().clone();
+                let graph = self.store.get_container_graph(&root).unwrap();
+                let graph = ContainerTreeTransformer::local_to_core(graph);
+                self.publish_update(&Update::Project {
+                    project,
+                    update: GraphUpdate::Created { parent, graph }.into(),
+                })?;
+
+                Ok(())
+            }
+
+            GraphEvent::Removed(root) => {
+                let project = self.store.get_container_project(&root).unwrap().clone();
+                let graph = self.store.remove_subgraph(&root)?;
+                let graph = ContainerTreeTransformer::local_to_core(&graph);
+                self.publish_update(&Update::Project {
+                    project,
+                    update: GraphUpdate::Removed(graph).into(),
+                })?;
+
+                Ok(())
+            }
+        }
+    }
+
+    /// Updates a subgraph's path.
+    /// Syncs the root `Container`'s name with path.
+    ///
+    /// # Returns
+    /// `ResouceId` of the affected `Container`.
+    #[tracing::instrument(skip(self))]
+    fn update_subgraph_path(&mut self, root: &ResourceId, path: PathBuf) -> Result {
+        let rid = root.clone();
+        let root = self.store.get_container_mut(&root).unwrap();
+        root.properties.name = path.file_name().unwrap().to_str().unwrap().to_string();
+        self.store.update_subgraph_path(&rid, path)?; // must update graph paths before saving container
+
+        let root = self.store.get_container(&rid).unwrap();
+        root.save()?;
+        Ok(())
+    }
+}
diff --git a/local/database/src/server/file_system/mod.rs b/local/database/src/server/file_system/mod.rs
new file mode 100644
index 00000000..83522895
--- /dev/null
+++ b/local/database/src/server/file_system/mod.rs
@@ -0,0 +1,61 @@
+//! File system event handler.
+pub mod actor;
+pub mod asset;
+pub mod container;
+pub mod event;
+pub mod file;
+pub mod file_system_event_processor;
+pub mod folder;
+pub mod graph;
+pub mod script;
+pub mod thot_event_processor;
+
+use crate::server::Database;
+use crate::Result;
+use event::thot::Event;
+use thot_core::types::ResourceId;
+
+impl Database {
+    pub fn handle_thot_events(&mut self, events: Vec<Event>) -> Result {
+        let events = sort_events(events);
+
+        tracing::debug!(?events);
+        for event in events.into_iter() {
+            match event {
+                Event::Graph(event) => self.handle_thot_event_graph(event)?,
+                Event::Container(event) => self.handle_thot_event_container(event)?,
+                Event::Asset(event) => self.handle_thot_event_asset(event)?,
+                Event::Script(event) => self.handle_thot_event_script(event)?,
+                Event::Folder(event) => self.handle_thot_event_folder(event)?,
+                Event::File(event) => self.handle_thot_event_file(event)?,
+            }
+        }
+
+        Ok(())
+    }
+}
+
+struct ParentChild {
+    parent: ResourceId,
+    child: ResourceId,
+}
+
+fn sort_events(events: Vec<Event>) -> Vec<Event> {
+    let mut folder_events = Vec::with_capacity(events.len());
+    let mut file_events = Vec::with_capacity(events.len());
+    let mut other_events = Vec::with_capacity(events.len());
+    for event in events {
+        match event {
+            Event::Graph(_) => folder_events.push(event),
+            Event::Container(_) => folder_events.push(event),
+            Event::Asset(_) => file_events.push(event),
+            Event::Script(_) => other_events.push(event),
+            Event::Folder(_) => folder_events.push(event),
+            Event::File(_) => file_events.push(event),
+        }
+    }
+
+    folder_events.append(&mut file_events);
+    folder_events.append(&mut other_events);
+    folder_events
+}
diff --git a/local/database/src/server/file_system/script.rs b/local/database/src/server/file_system/script.rs
new file mode 100644
index 00000000..116767cd
--- /dev/null
+++ b/local/database/src/server/file_system/script.rs
@@ -0,0 +1,110 @@
+//! Handle [`thot::Script`](ScriptEvent) events.
+use super::event::thot::Script as ScriptEvent;
+use crate::event::{Script as ScriptUpdate, Update};
+use crate::server::Database;
+use crate::Result;
+use std::fs;
+use thot_core::types::ResourcePath;
+use thot_local::project::project;
+use thot_local::project::resources::Script as LocalScript;
+
+impl Database {
+    pub fn handle_thot_event_script(&mut self, event: ScriptEvent) -> Result {
+        match event {
+            ScriptEvent::Created(path) => {
+                let project_path = fs::canonicalize(project::project_root_path(&path)?).unwrap();
+                let project = self
+                    .store
+                    .get_path_project_canonical(&project_path)
+                    .unwrap()
+                    .unwrap()
+                    .clone();
+
+                let project = self.store.get_project(&project).unwrap();
+                let pid = project.rid.clone();
+                let script_path = path
+                    .strip_prefix(project.analysis_root_path().unwrap())
+                    .unwrap();
+
+                let path = ResourcePath::new(script_path.to_path_buf())?;
+                let script = LocalScript::new(path)?;
+                self.store.insert_script(pid.clone(), script.clone())?;
+
+                self.publish_update(&Update::Project {
+                    project: pid,
+                    update: ScriptUpdate::Created(script).into(),
+                })?;
+
+                Ok(())
+            }
+
+            ScriptEvent::Removed(script) => {
+                let project = self.store.get_script_project(&script).unwrap().clone();
+                self.store.remove_project_script(&project, &script)?;
+
+                self.publish_update(&Update::Project {
+                    project,
+                    update: ScriptUpdate::Removed(script).into(),
+                })?;
+
+                Ok(())
+            }
+
+            ScriptEvent::Moved { script, path } => {
+                let from_project = self.store.get_script_project(&script).unwrap().clone();
+                let to_project = project::project_root_path(&path).unwrap();
+                let to_project = self
+                    .store
+                    .get_path_project_canonical(&to_project)
+                    .unwrap()
+                    .unwrap()
+                    .clone();
+
+                if to_project == from_project {
+                    let project = self.store.get_project(&to_project).unwrap();
+                    let script_path = path
+                        .strip_prefix(project.analysis_root_path().unwrap())
+                        .unwrap()
+                        .to_owned();
+
+                    let scripts = self.store.get_project_scripts_mut(&from_project).unwrap();
+                    let script = scripts.get_mut(&script).unwrap();
+                    let sid = script.rid.clone();
+                    let script_path = ResourcePath::new(script_path.clone())?;
+                    script.path = script_path.clone();
+                    scripts.save()?;
+
+                    self.publish_update(&Update::Project {
+                        project: from_project,
+                        update: ScriptUpdate::Moved {
+                            script: sid,
+                            path: script_path,
+                        }
+                        .into(),
+                    })?;
+                } else {
+                    let script = self
+                        .store
+                        .remove_project_script(&from_project, &script)?
+                        .unwrap();
+
+                    self.publish_update(&Update::Project {
+                        project: from_project,
+                        update: ScriptUpdate::Removed(script.rid.clone()).into(),
+                    })?;
+
+                    self.store
+                        .insert_script(to_project.clone(), script.clone())
+                        .unwrap();
+
+                    self.publish_update(&Update::Project {
+                        project: to_project.clone(),
+                        update: ScriptUpdate::Created(script).into(),
+                    })?;
+                }
+
+                Ok(())
+            }
+        }
+    }
+}
diff --git a/local/database/src/server/file_system/thot_event_processor.rs b/local/database/src/server/file_system/thot_event_processor.rs
new file mode 100644
index 00000000..7c562dec
--- /dev/null
+++ b/local/database/src/server/file_system/thot_event_processor.rs
@@ -0,0 +1,505 @@
+//! Processes [`FileSystemEvent`]s into [`ThotEvent`]s.
+use super::event::{file_system, thot};
+use crate::error::{Error, Result};
+use crate::server::store::ContainerTree;
+use crate::server::Database;
+use std::path::{Path, PathBuf};
+use std::{fs, io};
+use thot_core::error::{Error as CoreError, ProjectError as CoreProjectError, ResourceError};
+use thot_core::project::ScriptLang;
+use thot_core::types::{ResourceId, ResourcePath};
+use thot_local::error::{Error as LocalError, ProjectError};
+use thot_local::graph::ContainerTreeLoader;
+use thot_local::project::project;
+use thot_local::project::project::project_root_path;
+use thot_local::project::resources::{Project as LocalProject, Scripts as ProjectScripts};
+
+impl Database {
+    pub fn process_file_system_events_to_thot_events(
+        &mut self,
+        events: &Vec<file_system::Event>,
+    ) -> Vec<thot::Event> {
+        let mut thot_events = Vec::with_capacity(events.len());
+        for event in events {
+            let thot_event = match event {
+                file_system::Event::File(file_system::File::Created(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_file_created(&path)
+                        .unwrap()
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::File(file_system::File::Removed(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_file_removed(&path).map(|event| event.into())
+                }
+
+                file_system::Event::File(file_system::File::Moved { from, to }) => {
+                    let from = normalize_path_root(from);
+                    self.ensure_project_resources_loaded(&from).unwrap();
+                    self.ensure_project_resources_loaded(&to).unwrap();
+                    self.handle_file_moved(&from, to).map(|event| event.into())
+                }
+
+                file_system::Event::File(file_system::File::Renamed { from, to }) => {
+                    let from = normalize_path_root(from);
+                    self.ensure_project_resources_loaded(&from).unwrap();
+                    self.ensure_project_resources_loaded(&to).unwrap();
+                    self.handle_file_renamed(&from, to)
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::Folder(file_system::Folder::Created(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_folder_created(&path)
+                        .unwrap()
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::Folder(file_system::Folder::Removed(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_folder_removed(&path).map(|event| event.into())
+                }
+
+                file_system::Event::Folder(file_system::Folder::Moved { from, to }) => {
+                    let from = normalize_path_root(from);
+                    self.ensure_project_resources_loaded(&from).unwrap();
+                    self.ensure_project_resources_loaded(&to).unwrap();
+                    self.handle_folder_moved(&from, to)
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::Folder(file_system::Folder::Renamed { from, to }) => {
+                    let from = normalize_path_root(from);
+                    self.ensure_project_resources_loaded(&from).unwrap();
+                    self.ensure_project_resources_loaded(&to).unwrap();
+                    self.handle_folder_renamed(&from, to)
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::Any(file_system::Any::Created(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_any_created(&path)
+                        .unwrap()
+                        .map(|event| event.into())
+                }
+
+                file_system::Event::Any(file_system::Any::Removed(path)) => {
+                    let path = normalize_path_root(path);
+                    self.ensure_project_resources_loaded(&path).unwrap();
+                    self.handle_any_removed(&path)
+                }
+            };
+
+            if let Some(thot_event) = thot_event {
+                thot_events.push(thot_event);
+            }
+        }
+
+        thot_events
+    }
+
+    fn handle_file_created(&self, path: &PathBuf) -> Result<Option<thot::Event>> {
+        // ignore thot folder
+        if path
+            .components()
+            .any(|seg| seg.as_os_str() == thot_local::common::thot_dir().as_os_str())
+        {
+            return Ok(None);
+        }
+
+        // analysis root
+        let project = self.project_by_resource_path(&path)?;
+        if let Some(analysis_root) = project.analysis_root_path().as_ref() {
+            if let Ok(script_path) = path.strip_prefix(analysis_root) {
+                let script_path = ResourcePath::new(script_path.to_path_buf()).unwrap();
+                let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+                if scripts.contains_path(&script_path) {
+                    return Ok(None);
+                }
+
+                let Some(ext) = path.extension() else {
+                    return Ok(None);
+                };
+
+                let ext = ext.to_ascii_lowercase();
+                let ext = ext.to_str().unwrap();
+                if ScriptLang::supported_extensions().contains(&ext) {
+                    return Ok(Some(thot::Script::Created(path.clone()).into()));
+                }
+
+                return Ok(None);
+            }
+        }
+
+        // ignore if asset
+        if let Some(asset) = self.store.get_path_asset_id_canonical(&path).unwrap() {
+            return Ok(Some(thot::Asset::FileCreated(asset.clone()).into()));
+        }
+
+        // handle new
+        return Ok(Some(thot::File::Created(path.into()).into()));
+    }
+
+    fn handle_file_removed(&self, path: &PathBuf) -> Option<thot::Event> {
+        let project = self.project_by_resource_path(path).unwrap();
+
+        // script
+        let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+        let script_path = path
+            .strip_prefix(project.analysis_root_path().unwrap())
+            .unwrap();
+
+        let script_path = ResourcePath::new(script_path.to_path_buf()).unwrap();
+        if let Some(script) = scripts.by_path(&script_path) {
+            return Some(thot::Script::Removed(script.rid.clone()).into());
+        }
+
+        // analysis
+        if let Some(asset) = self.store.get_path_asset_id(path).cloned() {
+            return Some(thot::Asset::Removed(asset).into());
+        };
+
+        None
+    }
+
+    /// Handles a moved file
+    /// A moved file has the same file name, but its base directory has changed.
+    fn handle_file_moved(&self, from: &PathBuf, to: &PathBuf) -> Option<thot::Event> {
+        enum Location {
+            Data,
+            Analysis,
+            None,
+        }
+
+        fn get_path_resource_type(project: &LocalProject, path: &PathBuf) -> Location {
+            if path.starts_with(project.data_root_path().unwrap()) {
+                return Location::Data;
+            } else if path.starts_with(project.analysis_root_path().unwrap()) {
+                return Location::Analysis;
+            }
+
+            Location::None
+        }
+
+        let project = self.project_by_resource_path(&from).unwrap();
+        let from_type = get_path_resource_type(project, from);
+        let to_type = get_path_resource_type(project, to);
+
+        match (from_type, to_type) {
+            (Location::Data, Location::Data) => {
+                if let Some(asset) = self.store.get_path_asset_id(&from).cloned() {
+                    return Some(
+                        thot::Asset::Moved {
+                            asset,
+                            path: to.clone(),
+                        }
+                        .into(),
+                    );
+                }
+
+                return Some(thot::File::Created(to.clone()).into());
+            }
+
+            (Location::Analysis, Location::Analysis) => {
+                let Some(ext) = to.extension() else {
+                    return None;
+                };
+
+                let ext = ext.to_ascii_lowercase();
+                let ext = ext.to_str().unwrap();
+                if !ScriptLang::supported_extensions().contains(&ext) {
+                    return None;
+                }
+
+                let from_script_path = from
+                    .strip_prefix(project.analysis_root_path().unwrap())
+                    .unwrap();
+
+                let from_script_path = ResourcePath::new(from_script_path.to_path_buf()).unwrap();
+                let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+                if let Some(script) = scripts.by_path(&from_script_path) {
+                    return Some(
+                        thot::Script::Moved {
+                            script: script.rid.clone(),
+                            path: to.clone(),
+                        }
+                        .into(),
+                    );
+                }
+
+                Some(thot::Script::Created(to.clone()).into())
+            }
+
+            _ => todo!(),
+        }
+    }
+
+    fn handle_file_renamed(&self, from: &PathBuf, to: &PathBuf) -> Option<thot::Event> {
+        if let Some(asset) = self.store.get_path_asset_id(&from).cloned() {
+            return Some(
+                thot::Asset::Moved {
+                    asset,
+                    path: to.clone(),
+                }
+                .into(),
+            );
+        };
+
+        let project = self.project_by_resource_path(&from).unwrap();
+        if let Some(analysis_root) = project.analysis_root_path().as_ref() {
+            let script_path = from.strip_prefix(analysis_root).unwrap();
+            let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+            for script in scripts.values() {
+                if script.path.as_path() == script_path {
+                    return Some(
+                        thot::Script::Moved {
+                            script: script.rid.clone(),
+                            path: to.clone(),
+                        }
+                        .into(),
+                    );
+                }
+            }
+
+            if let Ok(script_path) = to.strip_prefix(analysis_root) {
+                let script_path = ResourcePath::new(script_path.to_path_buf()).unwrap();
+                let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+                if scripts.contains_path(&script_path) {
+                    return None;
+                }
+
+                let Some(ext) = to.extension() else {
+                    return None;
+                };
+
+                let ext = ext.to_ascii_lowercase();
+                let ext = ext.to_str().unwrap();
+                if ScriptLang::supported_extensions().contains(&ext) {
+                    return Some(thot::Script::Created(to.clone()).into());
+                }
+
+                return None;
+            }
+        }
+
+        None
+    }
+
+    fn handle_folder_created(&self, path: &PathBuf) -> Result<Option<thot::Event>> {
+        // ignore thot folder
+        if path
+            .components()
+            .any(|seg| seg.as_os_str() == thot_local::common::thot_dir().as_os_str())
+        {
+            return Ok(None);
+        }
+
+        // ignore graph root
+        let project = self.project_by_resource_path(path)?;
+        if project.data_root.is_some() {
+            let path = fs::canonicalize(&path).unwrap();
+            if path == project.data_root_path().unwrap() {
+                return Ok(None);
+            }
+        };
+
+        // ignore if registered container
+        if self
+            .store
+            .get_path_container_canonical(&path)
+            .unwrap()
+            .is_some()
+        {
+            return Ok(None);
+        }
+
+        // handle if unregistered container
+        match ContainerTreeLoader::load(&path) {
+            Ok(graph) => {
+                let Some(loaded_container) = self.store.get_container(graph.root()) else {
+                    return Ok(Some(thot::Graph::Inserted(graph).into()));
+                };
+
+                if loaded_container.base_path().exists() {
+                    Ok(Some(thot::Graph::Copied(graph).into()))
+                } else {
+                    Ok(Some(
+                        thot::Graph::Moved {
+                            root: graph.root().clone(),
+                            path: path.clone(),
+                        }
+                        .into(),
+                    ))
+                }
+            }
+
+            Err(LocalError::CoreError(CoreError::IoError(err)))
+                if err.kind() == io::ErrorKind::NotFound =>
+            {
+                Ok(Some(thot::Folder::Created(path.clone()).into()))
+            }
+
+            Err(err) => return Err(err.into()),
+        }
+    }
+
+    fn handle_folder_removed(&self, path: &PathBuf) -> Option<thot::Event> {
+        let Some(container) = self.store.get_path_container(path).cloned() else {
+            return None;
+        };
+
+        Some(thot::Graph::Removed(container).into())
+    }
+
+    fn handle_folder_moved(&self, from: &PathBuf, to: &PathBuf) -> Option<thot::Graph> {
+        let Some(root) = self.store.get_path_container(from).cloned() else {
+            return None;
+        };
+
+        Some(thot::Graph::Moved {
+            root,
+            path: to.clone(),
+        })
+    }
+
+    fn handle_folder_renamed(&self, from: &PathBuf, to: &PathBuf) -> Option<thot::Graph> {
+        let Some(container) = self.store.get_path_container(from).cloned() else {
+            return None;
+        };
+
+        Some(thot::Graph::Moved {
+            root: container,
+            path: to.clone(),
+        })
+    }
+
+    fn handle_any_created(&self, path: &PathBuf) -> Result<Option<thot::Event>> {
+        if path.is_file() {
+            self.handle_file_created(path)
+        } else if path.is_dir() {
+            self.handle_folder_created(path)
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn handle_any_removed(&self, path: &PathBuf) -> Option<thot::Event> {
+        if let Some(container) = self.store.get_path_container(&path).cloned() {
+            return Some(thot::Graph::Removed(container).into());
+        }
+
+        if let Some(asset) = self.store.get_path_asset_id(&path).cloned() {
+            return Some(thot::Asset::Removed(asset).into());
+        }
+
+        let project = self.project_by_resource_path(&path).unwrap();
+        let scripts = self.store.get_project_scripts(&project.rid).unwrap();
+        if let Ok(script_path) = path.strip_prefix(project.analysis_root_path().unwrap()) {
+            let script_path = ResourcePath::new(script_path.to_path_buf()).unwrap();
+            if let Some(script) = scripts.by_path(&script_path) {
+                return Some(thot::Script::Removed(script.rid.clone()).into());
+            }
+        }
+
+        None
+    }
+
+    /// Get a `Project` by a path within it.
+    fn project_by_resource_path(&self, path: impl AsRef<Path>) -> Result<&LocalProject> {
+        let path = path.as_ref();
+        let project_path = project::project_root_path(path)?;
+        let Some(project) = self
+            .store
+            .get_path_project_canonical(&project_path)
+            .unwrap()
+        else {
+            return Err(LocalError::ProjectError(ProjectError::PathNotInProject(
+                path.to_path_buf(),
+            ))
+            .into());
+        };
+
+        let Some(project) = self.store.get_project(project) else {
+            return Err(Error::DatabaseError("Project not loaded".into()));
+        };
+
+        Ok(project)
+    }
+
+    /// Ensures all a `Project`'s resources are loaded.
+    ///
+    /// # Arguments
+    /// 1. `path`: Path to a resource within the project.
+    fn ensure_project_resources_loaded(&mut self, path: impl AsRef<Path>) -> Result {
+        let project = project_root_path(path.as_ref())?;
+        let Some(project) = self
+            .store
+            .get_path_project_canonical(project.as_ref())
+            .unwrap()
+            .cloned()
+        else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project` not loaded",
+            ))
+            .into());
+        };
+
+        self.ensure_project_graph_loaded(&project)?;
+        self.ensure_project_scripts_loaded(&project)?;
+        Ok(())
+    }
+
+    /// Ensures a `Project` resource's graph is loaded.
+    fn ensure_project_graph_loaded(&mut self, project: &ResourceId) -> Result {
+        let project = self.store.get_project(project).unwrap();
+        let Some(data_root) = project.data_root.as_ref() else {
+            return Err(CoreError::ProjectError(CoreProjectError::misconfigured(
+                "data root not set",
+            ))
+            .into());
+        };
+
+        if self.store.is_project_graph_loaded(&project.rid) {
+            return Ok(());
+        }
+
+        let path = project.base_path().join(data_root);
+        let graph: ContainerTree = ContainerTreeLoader::load(&path)?;
+        self.store.insert_project_graph(project.rid.clone(), graph);
+
+        Ok(())
+    }
+
+    /// Loads a `Project`'s `Scripts`.
+    ///
+    /// # Arguments
+    /// 1. `Project`'s id.
+    fn ensure_project_scripts_loaded(&mut self, project: &ResourceId) -> Result {
+        if self.store.are_project_scripts_loaded(project) {
+            return Ok(());
+        }
+
+        let project = self.store.get_project(project).unwrap();
+        let scripts = ProjectScripts::load_from(project.base_path())?;
+        self.store
+            .insert_project_scripts(project.rid.clone(), scripts);
+
+        Ok(())
+    }
+}
+
+/// If on Windows, convert to UNC if needed.
+/// Otherwise, returns the given path.
+fn normalize_path_root(path: impl Into<PathBuf>) -> PathBuf {
+    if cfg!(target_os = "windows") {
+        thot_local::common::ensure_windows_unc(path)
+    } else {
+        path.into()
+    }
+}
diff --git a/local/database/src/server/handler/asset.rs b/local/database/src/server/handler/asset.rs
deleted file mode 100644
index 25a7d742..00000000
--- a/local/database/src/server/handler/asset.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-//! Handle `Asset` related functionality.
-use super::super::Database;
-use crate::command::AssetCommand;
-use crate::Result;
-use serde_json::Value as JsValue;
-use thot_core::error::{Error as CoreError, ResourceError};
-use thot_core::project::{Asset as CoreAsset, Container as CoreContainer, StandardProperties};
-use thot_core::types::ResourceId;
-
-impl Database {
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub fn handle_command_asset(&mut self, cmd: AssetCommand) -> JsValue {
-        match cmd {
-            AssetCommand::Get(rid) => {
-                let asset: Option<CoreAsset> = {
-                    if let Some(container) = self.store.get_asset_container(&rid) {
-                        container.assets.get(&rid).cloned().into()
-                    } else {
-                        None
-                    }
-                };
-
-                serde_json::to_value(asset).expect("could not convert `Asset` to JSON")
-            }
-
-            AssetCommand::GetMany(rids) => {
-                let assets = rids
-                    .iter()
-                    .filter_map(|rid| {
-                        let Some(container) = self.store.get_asset_container(&rid) else {
-                            return None;
-                        };
-
-                        let Some(asset) = container.assets.get(&rid) else {
-                            return None;
-                        };
-
-                        Some(asset.clone())
-                    })
-                    .collect::<Vec<CoreAsset>>();
-
-                serde_json::to_value(assets).expect("could not convert `Vec<Asset>` to JSON")
-            }
-
-            AssetCommand::Parent(asset) => {
-                // @todo: Convert to result for homogeneity with `ContainerCommand::Parent`.
-                let container: Option<CoreContainer> = self
-                    .store
-                    .get_asset_container(&asset)
-                    .map(|container| (*container).clone().into());
-
-                serde_json::to_value(container).expect("could not convert `Container` to JSON")
-            }
-
-            AssetCommand::Add(asset, container) => {
-                let res = self.store.add_asset(asset, container);
-                serde_json::to_value(res).expect("could not convert result to JSON")
-            }
-
-            AssetCommand::Remove(rid) => {
-                let res = self.remove_asset(&rid);
-                serde_json::to_value(res).expect("could not convert result to JSON")
-            }
-
-            AssetCommand::UpdateProperties(rid, properties) => {
-                let res = self.update_asset_properties(&rid, properties);
-                serde_json::to_value(res).expect("could not convert result to JSON")
-            }
-
-            AssetCommand::Find(root, filter) => {
-                let assets = self.store.find_assets(&root, filter);
-                serde_json::to_value(assets).expect("could not convert result to JSON")
-            }
-
-            AssetCommand::FindWithMetadata(root, filter) => {
-                let assets = self.store.find_assets_with_metadata(&root, filter);
-                serde_json::to_value(assets).expect("could not convert result to JSON")
-            }
-        }
-    }
-
-    fn update_asset_properties(
-        &mut self,
-        rid: &ResourceId,
-        properties: StandardProperties,
-    ) -> Result {
-        let Some(container) = self.store.get_asset_container_id(&rid).cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Asset` does not exist")).into());
-        };
-
-        let Some(container) = self.store.get_container_mut(&container) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist")).into());
-        };
-
-        let Some(asset) = container.assets.get_mut(&rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Asset` does not exist")).into());
-        };
-
-        asset.properties = properties;
-        container.save()?;
-        Ok(())
-    }
-
-    #[tracing::instrument(level = "debug", skip(self))]
-    fn remove_asset(&mut self, rid: &ResourceId) -> Result {
-        self.store.remove_asset(rid)?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/local/database/src/server/handler/asset_test.rs b/local/database/src/server/handler/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/server/handler/container.rs b/local/database/src/server/handler/container.rs
deleted file mode 100644
index e9cdc795..00000000
--- a/local/database/src/server/handler/container.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-//! Implementation of `Container` related functionality.
-use super::super::Database;
-use crate::command::container::AddAssetInfo;
-use crate::command::container::{
-    AddAssetsArgs, UpdatePropertiesArgs, UpdateScriptAssociationsArgs,
-};
-use crate::command::ContainerCommand;
-use crate::Result;
-use serde_json::Value as JsValue;
-use std::collections::HashSet;
-use std::path::PathBuf;
-use thot_core::db::StandardSearchFilter;
-use thot_core::error::{Error as CoreError, ResourceError};
-use thot_core::project::container::ScriptMap;
-use thot_core::project::{Container as CoreContainer, StandardProperties};
-use thot_core::types::ResourceId;
-use thot_local::project::asset::AssetBuilder;
-use thot_local::project::resources::Container;
-
-impl Database {
-    pub fn handle_command_container(&mut self, cmd: ContainerCommand) -> JsValue {
-        match cmd {
-            ContainerCommand::Get(rid) => {
-                let container: Option<CoreContainer> = {
-                    if let Some(container) = self.store.get_container(&rid) {
-                        Some((*container).clone().into())
-                    } else {
-                        None
-                    }
-                };
-
-                serde_json::to_value(container).expect("could not convert `Container` to JSON")
-            }
-
-            ContainerCommand::ByPath(path) => {
-                let Some(rid) = self.store.get_path_container(&path) else {
-                    let value: Option<CoreContainer> = None;
-                    return serde_json::to_value(value).expect("could not convert `None` to JSON");
-                };
-
-                let container: Option<CoreContainer> = {
-                    if let Some(container) = self.store.get_container(&rid) {
-                        Some((*container).clone().into())
-                    } else {
-                        None
-                    }
-                };
-
-                serde_json::to_value(container).expect("could not convert `Container` to JSON")
-            }
-
-            ContainerCommand::Find(root, filter) => {
-                let containers = self.find_containers(&root, filter);
-                serde_json::to_value(containers).expect("could not convert `Container`s to JSON")
-            }
-
-            ContainerCommand::FindWithMetadata(root, filter) => {
-                let containers = self.find_containers_with_metadata(&root, filter);
-                serde_json::to_value(containers).expect("could not convert `Container`s to JSON")
-            }
-
-            ContainerCommand::UpdateProperties(UpdatePropertiesArgs { rid, properties }) => {
-                let res = self.update_container_properties(rid, properties);
-                serde_json::to_value(res).expect("could not convert result to JSON")
-            }
-
-            ContainerCommand::UpdateScriptAssociations(UpdateScriptAssociationsArgs {
-                rid,
-                associations,
-            }) => {
-                let res = self.update_container_script_associations(rid, associations);
-                serde_json::to_value(res).expect("could not convert result to JSON")
-            }
-
-            ContainerCommand::AddAssets(AddAssetsArgs { container, assets }) => {
-                let asset_rids = self.container_add_assets(&container, assets);
-                serde_json::to_value(asset_rids)
-                    .expect("could not convert `Asset` `ResourceId`s to JSON")
-            }
-
-            // @todo: Handle errors.
-            ContainerCommand::GetPath(rid) => {
-                let path = self.get_container_path(&rid);
-                serde_json::to_value(path).expect("could not convert path to JsValue")
-            }
-
-            ContainerCommand::Parent(rid) => {
-                let parent: Result<Option<CoreContainer>> =
-                    self.get_container_parent(&rid).map(|opt| match opt {
-                        Some(container) => Some((*container).clone()),
-                        None => None,
-                    });
-
-                serde_json::to_value(parent).expect("could not convert `Container` to JsValue")
-            }
-        }
-    }
-
-    /// # Arguments
-    /// 1. Root `Container`.
-    /// 2. Search filter.
-    fn find_containers(
-        &self,
-        root: &ResourceId,
-        filter: StandardSearchFilter,
-    ) -> HashSet<CoreContainer> {
-        self.store
-            .find_containers(&root, filter)
-            .into_iter()
-            .map(|container| (*container).clone())
-            .collect()
-    }
-
-    /// # Arguments
-    /// 1. Root `Container`.
-    /// 2. Search filter.
-    fn find_containers_with_metadata(
-        &self,
-        root: &ResourceId,
-        filter: StandardSearchFilter,
-    ) -> HashSet<CoreContainer> {
-        self.store
-            .find_containers_with_metadata(&root, filter)
-            .into_iter()
-            .map(|container| (*container).clone())
-            .collect()
-    }
-
-    fn update_container_properties(
-        &mut self,
-        rid: ResourceId,
-        properties: StandardProperties,
-    ) -> Result {
-        let Some(container) = self.store.get_container_mut(&rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist")).into());
-        };
-
-        container.properties = properties;
-        container.save()?;
-        Ok(())
-    }
-
-    fn update_container_script_associations(
-        &mut self,
-        rid: ResourceId,
-        associations: ScriptMap,
-    ) -> Result {
-        let Some(container) = self.store.get_container_mut(&rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Script` does not exist")).into());
-        };
-
-        container.scripts = associations;
-        container.save()?;
-        Ok(())
-    }
-
-    fn container_add_assets(
-        &mut self,
-        container: &ResourceId,
-        assets: Vec<AddAssetInfo>,
-    ) -> Result<HashSet<ResourceId>> {
-        let Some(container) = self.store.get_container_mut(&container) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Script` does not exist")).into());
-        };
-
-        // @todo: Ensure file is not an Asset with the Container already.
-        let mut asset_ids = HashSet::with_capacity(assets.len());
-        for AddAssetInfo {
-            path,
-            action,
-            bucket,
-        } in assets
-        {
-            // create asset
-            let mut asset = AssetBuilder::new(path);
-            asset.set_container(container.base_path().into());
-            if let Some(bucket) = bucket {
-                asset.set_bucket(bucket);
-            }
-
-            let asset = asset.create(action)?;
-            asset_ids.insert(asset.rid.clone());
-            container.insert_asset(asset);
-        }
-
-        container.save()?;
-        let cid = container.rid.clone();
-        drop(container); // free mutable borrow of store
-
-        for aid in asset_ids.iter() {
-            self.store.insert_asset(aid.clone(), cid.clone());
-        }
-
-        Ok(asset_ids)
-    }
-
-    fn get_container_path(&self, container: &ResourceId) -> Option<PathBuf> {
-        let Some(container) = self.store.get_container(&container) else {
-            return None;
-        };
-
-        Some(container.base_path().into())
-    }
-
-    fn get_container_parent(&self, rid: &ResourceId) -> Result<Option<&Container>> {
-        let Some(graph) = self.store.get_container_graph(rid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist")).into());
-        };
-
-        let parent = graph.parent(rid)?;
-        let Some(parent) = parent else {
-           return Ok(None);
-        };
-
-        let parent = graph.get(parent).expect("could not get parent `Container`");
-        Ok(Some(parent))
-    }
-}
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/local/database/src/server/handler/container_test.rs b/local/database/src/server/handler/container_test.rs
deleted file mode 100644
index d281027f..00000000
--- a/local/database/src/server/handler/container_test.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use super::*;
-use crate::command::ContainerCommand;
-use crate::error::Result;
-use dev_utils::fs::TempDir;
-use fake::faker::lorem::raw::Word;
-use fake::locales::EN;
-use fake::Fake;
-use thot_core::project::Container as CoreContainer;
-use thot_local::project::container;
-use thot_local::project::resources::Container as LocalContainer;
-
-#[test]
-fn load_container_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("new temp dir should work");
-    let c_path = _dir.path().to_path_buf();
-    let rid = container::init(_dir.path()).expect("could not init `Container`");
-    let mut db = Database::new();
-
-    // test
-    let container = db.handle_command_container(ContainerCommand::Load(c_path.clone()));
-
-    let container: Result<CoreContainer> =
-        serde_json::from_value(container).expect("could not convert JsValue to `Container`");
-
-    let container = container.expect("`LoadContainer` should work");
-    assert_eq!(
-        rid.clone(),
-        container.rid,
-        "incorrect `Container` retrieved"
-    );
-
-    // second retrieval
-    let container = db.handle_command_container(ContainerCommand::Load(c_path));
-
-    let container: Result<CoreContainer> =
-        serde_json::from_value(container).expect("could not convert JsValue to `Container`");
-
-    let container = container.expect("`LoadContainer` should work");
-    assert_eq!(
-        rid.clone(),
-        container.rid,
-        "could not retrieve `Container` again"
-    );
-}
-
-#[test]
-fn database_command_update_container_properties_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("could not create new temp dir");
-    let _rid = container::init(_dir.path()).expect("could not init `Container`");
-    let mut db = Database::new();
-    let container = db.handle_command_container(ContainerCommand::Load(_dir.path().to_path_buf()));
-
-    let container: Result<CoreContainer> =
-        serde_json::from_value(container).expect("could not contvert JsValue to `Container`");
-
-    let container = container.expect("`LoadContainer` should work");
-    let mut properties = container.properties.clone();
-    let name = Word(EN).fake();
-    properties.name = Some(name);
-
-    // test
-    db.handle_command_container(ContainerCommand::UpdateProperties(UpdatePropertiesArgs {
-        rid: container.rid.clone(),
-        properties: properties.clone(),
-    }));
-
-    {
-        // ensure stored container updated
-        let stored = db
-            .store
-            .get_container(&container.rid)
-            .expect("`Container` not stored");
-
-        let stored = stored.lock().expect("could not lock `Container`");
-        assert_eq!(
-            properties.name, stored.properties.name,
-            "incorrect name stored"
-        );
-
-        // ensure persisted container updated
-        db.store.remove_container(&container.rid);
-    }
-
-    let saved = LocalContainer::load(_dir.path()).expect("could not load `Container`");
-    assert_eq!(
-        properties.name, saved.properties.name,
-        "incorrect name persisted"
-    );
-}
-
-#[test]
-fn database_command_update_asset_should_work() {
-    todo!();
-}
-
-#[test]
-fn database_add_assets_should_work() {
-    todo!();
-}
-
-#[test]
-fn duplicate_tree_should_work() {
-    todo!();
-}
diff --git a/local/database/src/server/handler/database_test.rs b/local/database/src/server/handler/database_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/server/handler/graph_test.rs b/local/database/src/server/handler/graph_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/server/handler/mod_test.rs b/local/database/src/server/handler/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/server/mod.rs b/local/database/src/server/mod.rs
index 1ae4aeb4..8dbe1f8d 100644
--- a/local/database/src/server/mod.rs
+++ b/local/database/src/server/mod.rs
@@ -1,12 +1,10 @@
 //! Database for storing resources.
 //! Because multiple local executales may need access to the same resouce,
 //! the database acts as the single source of truth.
-pub mod database;
-pub mod store;
+pub(self) mod database;
+mod event;
+pub(self) mod store;
 
 // Re-exports
 pub use database::Database;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub(self) use event::Event;
diff --git a/local/database/src/server/mod_test.rs b/local/database/src/server/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/database/src/server/store.rs b/local/database/src/server/store.rs
index 52318629..e55f9e44 100644
--- a/local/database/src/server/store.rs
+++ b/local/database/src/server/store.rs
@@ -1,10 +1,11 @@
 //! Database for storing resources.
 use crate::error::Result;
 use has_id::HasId;
-use settings_manager::Settings;
 use std::collections::{HashMap, HashSet};
-use std::fs;
+use std::ops::Deref;
 use std::path::{Path, PathBuf};
+use std::result::Result as StdResult;
+use std::{fs, io};
 use thot_core::db::{SearchFilter, StandardSearchFilter as StdFilter};
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::graph::ResourceTree;
@@ -19,33 +20,76 @@ use thot_local::project::resources::{
 // *************
 
 // TODO[l]: Types don't need to be `pub`.
+#[derive(Debug)]
 pub struct PathMap<T>(HashMap<PathBuf, T>);
 impl<T> PathMap<T> {
     pub fn new() -> Self {
         Self(HashMap::new())
     }
 
-    pub fn get(&self, key: &Path) -> Option<&T> {
-        let key = fs::canonicalize(&key).unwrap();
-        self.0.get(&key)
+    /// Gets an item.
+    ///
+    /// # Notes
+    /// + Canonicalizes the `key` path.
+    pub fn get_canonical(&self, key: &Path) -> StdResult<Option<&T>, io::Error> {
+        let key = fs::canonicalize(&key)?;
+        Ok(self.0.get(&key))
     }
 
-    pub fn get_mut(&mut self, key: &Path) -> Option<&mut T> {
+    /// Gets an item.
+    ///
+    /// # Notes
+    /// + Canonicalizes the `key` path.
+    pub fn get_canonical_mut(&mut self, key: &Path) -> Option<&mut T> {
         let key = fs::canonicalize(key).unwrap();
         self.0.get_mut(&key)
     }
 
+    /// Inserts an item.
+    ///
+    /// # Notes
+    /// + Canonicalizes the `key` path.
     pub fn insert(&mut self, key: PathBuf, value: T) -> Option<T> {
-        let key = fs::canonicalize(key).unwrap();
+        self.0.insert(key, value)
+    }
+
+    /// Inserts an item.
+    ///
+    /// # Notes
+    /// + Canonicalizes the `key` path.
+    pub fn insert_canonical(&mut self, key: PathBuf, value: T) -> Option<T> {
+        let Ok(key) = fs::canonicalize(&key) else {
+            panic!("could not canonicalize path `{:?}`", key);
+        };
+
         self.0.insert(key, value)
     }
 
     pub fn remove(&mut self, key: &Path) -> Option<T> {
-        let key = fs::canonicalize(key).unwrap();
+        self.0.remove(key)
+    }
+
+    /// Removes an item.
+    ///
+    /// # Notes
+    /// + Canonicalizes the `key` path.
+    pub fn remove_canonical(&mut self, key: &Path) -> Option<T> {
+        let key = match fs::canonicalize(key) {
+            Ok(key) => key,
+            Err(_) => key.to_path_buf(),
+        };
+
         self.0.remove(&key)
     }
 }
 
+impl<T> Deref for PathMap<T> {
+    type Target = HashMap<PathBuf, T>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
 pub type ContainerTree = ResourceTree<LocalContainer>;
 
 pub type IdMap = HashMap<ResourceId, ResourceId>;
@@ -63,13 +107,11 @@ pub type ProjectGraphMap = HashMap<ResourceId, ContainerTree>;
 // *** Datastore ***
 // *****************
 
-// @todo: Paths should always be canonicalized.
+// TODO Paths should always be canonicalized.
 
 /// A store for [`Container`](LocalContainer)s.
 /// Assets can be referenced as well.
 ///
-///
-///
 /// # Notes
 /// + Because local Thot resources can only be controlled by a single process
 /// a `Datastore` operates as a single repository for all processes requiring access
@@ -91,8 +133,11 @@ pub struct Datastore {
     /// Map from a `Container`'s id to its `Project`'s.
     container_projects: IdMap,
 
-    /// Map from an [`Asset`]'s [`ResourceId`] to its [`Container`]'s.
-    assets: IdMap,
+    /// Map from an [`Asset`]'s [`ResourceId`] to its `Container`'s.
+    asset_containers: IdMap,
+
+    /// Map from an [`Asset`]'s path to its [`ResourceId`].
+    asset_paths: PathMap<ResourceId>,
 
     /// Map from a [`Script`](CoreScript)'s [`ResourceId`] to its `Project`.
     script_projects: IdMap,
@@ -109,7 +154,8 @@ impl Datastore {
             graphs: ProjectGraphMap::new(),
             container_paths: PathMap::new(),
             container_projects: IdMap::new(),
-            assets: IdMap::new(),
+            asset_containers: IdMap::new(),
+            asset_paths: PathMap::new(),
             script_projects: IdMap::new(),
             scripts: ProjectScriptsMap::new(),
         }
@@ -119,7 +165,6 @@ impl Datastore {
     // *** project ***
     // ***************
 
-    // @todo: Ensure the `Project` controls the settings file.
     /// Inserts a [`Project`](LocalProject) into the database.
     ///
     /// # Returns
@@ -132,7 +177,7 @@ impl Datastore {
         let project_path = project.base_path().to_path_buf();
 
         self.projects.insert(pid.clone(), project);
-        self.project_paths.insert(project_path, pid);
+        self.project_paths.insert_canonical(project_path, pid);
 
         Ok(())
     }
@@ -150,8 +195,14 @@ impl Datastore {
     }
 
     /// Gets the `Project` associated to the given path.
-    pub fn get_path_project(&self, path: &Path) -> Option<&ResourceId> {
-        self.project_paths.get(path)
+    ///
+    /// # Notes
+    /// + Canonicalizes the path.
+    pub fn get_path_project_canonical(
+        &self,
+        path: &Path,
+    ) -> StdResult<Option<&ResourceId>, io::Error> {
+        self.project_paths.get_canonical(path)
     }
 
     /// Gets the `Project` the `Container` belongs to.
@@ -163,14 +214,27 @@ impl Datastore {
     // *** graph ***
     // *************
 
-    /// Gets a [`Project`](LocalProjet)'s [`ContainerTree`].
+    /// Gets a [`Project`](LocalProject)'s [`ContainerTree`].
     ///
     /// # Arguments
-    /// 1. [`ResourceId`] of the [`Project`](LocalProjet).
+    /// 1. [`ResourceId`] of the [`Project`](LocalProject).
     pub fn get_project_graph(&self, rid: &ResourceId) -> Option<&ContainerTree> {
         self.graphs.get(&rid)
     }
 
+    /// Gets a `mut`able reference to a [`Project`](LocalProject)'s [`ContainerTree`].
+    ///
+    /// # Arguments
+    /// 1. [`ResourceId`] of the [`Project`](LocalProject).
+    pub fn get_project_graph_mut(&mut self, rid: &ResourceId) -> Option<&mut ContainerTree> {
+        self.graphs.get_mut(&rid)
+    }
+
+    /// Resturns whether the `Project`;s graph is loaded.
+    pub fn is_project_graph_loaded(&self, rid: &ResourceId) -> bool {
+        self.graphs.contains_key(rid)
+    }
+
     /// Gets the graph of a `Container`.
     ///
     /// # Arguments
@@ -188,7 +252,7 @@ impl Datastore {
         Some(graph)
     }
 
-    /// Gets the `mut`able graph of a `Container`.
+    /// Gets a `mut`able graph of a `Container`.
     ///
     /// # Arguments
     /// 1. [`ResourceId`] of the [`Container`](LocalContainer).
@@ -223,11 +287,12 @@ impl Datastore {
         for (cid, node) in graph.nodes().iter() {
             self.container_projects.insert(cid.clone(), rid.clone());
             self.container_paths
-                .insert(node.base_path().into(), cid.clone());
+                .insert_canonical(node.base_path().into(), cid.clone());
 
-            // map assets to containers
-            for aid in node.data().assets.keys() {
-                self.assets.insert(aid.clone(), cid.clone());
+            // map assets
+            for (aid, asset) in node.data().assets.iter() {
+                let asset_path = node.base_path().join(asset.path.as_path());
+                self.insert_asset_canonical(aid.clone(), asset_path, cid.clone())
             }
         }
 
@@ -241,13 +306,15 @@ impl Datastore {
         graph: ResourceTree<LocalContainer>,
     ) -> Result {
         let Some(project) = self.get_container_project(parent).cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` `Project` not found")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` `Project` not found",
+            ))
+            .into());
         };
 
-        let p_graph = self
-            .graphs
-            .get_mut(&project)
-            .expect("`Project` graph not found");
+        if !self.graphs.contains_key(&project) {
+            panic!("`Project` graph not found");
+        }
 
         for (cid, container) in graph.nodes() {
             // map container to project
@@ -255,50 +322,131 @@ impl Datastore {
 
             // map path to container
             self.container_paths
-                .insert(container.base_path().into(), cid.clone());
+                .insert_canonical(container.base_path().into(), cid.clone());
 
-            // map assets to containers
-            for aid in container.assets.keys() {
-                self.assets.insert(aid.clone(), cid.clone());
+            // map assets
+            for (aid, asset) in container.assets.iter() {
+                let asset_path = container.base_path().join(asset.path.as_path());
+                self.insert_asset_canonical(aid.clone(), asset_path, cid.clone());
             }
         }
 
-        p_graph.insert_tree(parent, graph)?;
+        self.graphs
+            .get_mut(&project)
+            .unwrap()
+            .insert_tree(parent, graph)?;
+
+        Ok(())
+    }
+
+    /// Move a subgraph.
+    ///
+    /// # Notes
+    /// + This does not affect node paths.
+    /// + This does not affect the file system.
+    pub fn move_subgraph(&mut self, root: &ResourceId, parent: &ResourceId) -> Result {
+        let Some(project) = self.get_container_project(root).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` `Project` not found",
+            ))
+            .into());
+        };
+
+        let graph = self
+            .graphs
+            .get_mut(&project)
+            .expect("`Project` graph not found");
+
+        graph.mv(root, parent)?;
         Ok(())
     }
 
     /// Remove the subgraph with the given root.
     ///
     /// # Returns
-    /// Removed subgraph root.
+    /// Removed subgraph.
     #[tracing::instrument(skip(self))]
     pub fn remove_subgraph(&mut self, root: &ResourceId) -> Result<ContainerTree> {
         let Some(project) = self.get_container_project(root).cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` `Project` not found")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` `Project` not found",
+            ))
+            .into());
         };
 
-        let p_graph = self
+        let graph = self
             .graphs
             .get_mut(&project)
             .expect("`Project` graph not found");
 
-        let sub_graph = p_graph.remove(root)?;
+        let sub_graph = graph.remove(root)?;
         for (cid, container) in sub_graph.nodes() {
-            // map container to project
+            // remove maps
             self.container_projects.remove(cid);
+            self.container_paths
+                .remove_canonical(&container.base_path());
 
-            // map path to container
-            self.container_paths.remove(&container.base_path());
+            for (aid, asset) in container.assets.iter() {
+                self.asset_containers.remove(aid);
 
-            // map assets to containers
-            for aid in container.assets.keys() {
-                self.assets.remove(aid);
+                let asset_path = container.base_path().join(asset.path.as_path());
+                self.asset_paths.remove_canonical(&asset_path);
             }
         }
 
         Ok(sub_graph)
     }
 
+    /// Updates the path to a subtree.
+    ///
+    /// # Notes
+    /// + This does not affect the graph in any way.
+    /// + This does not affect the file system.
+    pub fn update_subgraph_path(&mut self, root: &ResourceId, path: impl Into<PathBuf>) -> Result {
+        let path = path.into();
+        let Some(graph) = self.get_container_graph(root) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` graph not found",
+            ))
+            .into());
+        };
+
+        let descendants = graph.descendants(root).unwrap();
+        let container_path = graph.get(root).unwrap().base_path().to_path_buf();
+
+        for rid in descendants {
+            let descendant = self.get_container_mut(&rid).unwrap();
+            let descendant_id = descendant.rid.clone();
+            let old_path = descendant.base_path().to_path_buf();
+            let new_path = old_path.strip_prefix(&container_path).unwrap();
+            let new_path = path.join(new_path);
+            if new_path == old_path {
+                continue;
+            }
+
+            let assets = descendant
+                .assets
+                .values()
+                .map(|asset| (asset.rid.clone(), asset.path.as_path().to_owned()))
+                .collect::<Vec<_>>();
+
+            descendant.set_base_path(new_path.clone());
+            let descendant_path = descendant.base_path().to_owned();
+            self.container_paths.remove_canonical(&old_path).unwrap();
+            self.container_paths
+                .insert_canonical(new_path, descendant_id);
+
+            for (aid, asset_path) in assets {
+                self.asset_paths.remove(&old_path.join(&asset_path));
+
+                self.asset_paths
+                    .insert(descendant_path.join(asset_path), aid);
+            }
+        }
+
+        Ok(())
+    }
+
     // *****************
     // *** container ***
     // *****************
@@ -329,6 +477,45 @@ impl Datastore {
         Some(node)
     }
 
+    /// Get a Container with inherited metadata.
+    pub fn get_container_with_metadata(&self, container: &ResourceId) -> Option<CoreContainer> {
+        let Some(container) = self.get_container(container) else {
+            return None;
+        };
+
+        let graph = self
+            .get_container_graph(container.id())
+            .expect("could not find `Container`'s graph");
+
+        let metadata = graph.ancestors(container.id()).into_iter().rfold(
+            Metadata::new(),
+            |mut metadata, ancestor| {
+                let container = graph.get(&ancestor).expect("`Container` not found");
+                for (key, value) in container.properties.metadata.clone() {
+                    metadata.insert(key, value);
+                }
+
+                metadata
+            },
+        );
+
+        let container_path = container.base_path().to_owned();
+        let mut container = (*container).clone();
+        container.properties.metadata = metadata;
+        for asset in container.assets.values_mut() {
+            for (key, value) in container.properties.metadata.iter() {
+                if !asset.properties.metadata.contains_key(key) {
+                    asset.properties.metadata.insert(key.clone(), value.clone());
+                }
+            }
+
+            let path = fs::canonicalize(container_path.join(asset.path.as_path())).unwrap();
+            asset.path = ResourcePath::new(path).expect("could not set absolute path");
+        }
+
+        Some(container)
+    }
+
     /// Finds `Container`'s that match the filter.
     ///
     /// # Arguments
@@ -376,18 +563,20 @@ impl Datastore {
     ///
     /// # See also
     /// + [`find_containers`]
+    #[tracing::instrument(skip(self))]
     pub fn find_containers_with_metadata(
         &self,
         root: &ResourceId,
         filter: StdFilter,
-    ) -> HashSet<&LocalContainer> {
+    ) -> HashSet<CoreContainer> {
         /// Recursively finds mathcing `Containers`, inheriting metadata.
-        fn find_containers_with_metadata_recursive<'a>(
+        #[tracing::instrument(skip(graph))]
+        fn find_containers_with_metadata_recursive(
             root: &ResourceId,
-            graph: &'a ContainerTree,
+            graph: &ContainerTree,
             filter: StdFilter,
             mut metadata: Metadata,
-        ) -> HashSet<&'a LocalContainer> {
+        ) -> HashSet<CoreContainer> {
             let mut found = HashSet::new();
             let root = graph.get(root).expect("`Container` not in graph");
 
@@ -413,25 +602,63 @@ impl Datastore {
             let mut container: CoreContainer = (*root.data()).clone();
             container.properties.metadata = metadata;
             if filter.matches(&container) {
-                found.insert(root.data());
+                for asset in container.assets.values_mut() {
+                    for (key, value) in container.properties.metadata.iter() {
+                        if !asset.properties.metadata.contains_key(key) {
+                            asset.properties.metadata.insert(key.clone(), value.clone());
+                        }
+                    }
+
+                    let path = root.base_path().join(asset.path.as_path());
+                    asset.path = ResourcePath::new(path).expect("could not set absolute path");
+                }
+
+                found.insert(container);
             }
 
             found
         }
 
-        // find mathing containers
+        // run fn
         let Some(graph) = self.get_container_graph(root) else {
             return HashSet::new();
         };
 
-        find_containers_with_metadata_recursive(root, graph, filter, Metadata::new())
+        let metadata =
+            graph
+                .ancestors(root)
+                .into_iter()
+                .rfold(Metadata::new(), |mut metadata, ancestor| {
+                    let container = graph.get(&ancestor).expect("`Container` not found");
+                    for (key, value) in container.properties.metadata.clone() {
+                        metadata.insert(key, value);
+                    }
+
+                    metadata
+                });
+
+        find_containers_with_metadata_recursive(root, graph, filter, metadata)
     }
 
-    /// Gets a `Container`'s id by path.
+    /// Get a `Container`'s id by its path.
+    ///
+    /// # See also
+    /// + [`get_path_container_canonical`]
     pub fn get_path_container(&self, path: &Path) -> Option<&ResourceId> {
         self.container_paths.get(path)
     }
 
+    /// Gets a `Container`'s id by path.
+    ///
+    /// # Notes
+    /// + Path is canonicalized.
+    pub fn get_path_container_canonical(
+        &self,
+        path: &Path,
+    ) -> StdResult<Option<&ResourceId>, io::Error> {
+        self.container_paths.get_canonical(path)
+    }
+
     // *************
     // *** asset ***
     // *************
@@ -439,13 +666,13 @@ impl Datastore {
     /// Gets an [`Asset`](LocalAsset)'s [`Container`](LocalContainer) [`ResourceId`]
     /// from the database if it exists, otherwise `None`.
     pub fn get_asset_container_id(&self, rid: &ResourceId) -> Option<&ResourceId> {
-        self.assets.get(rid)
+        self.asset_containers.get(rid)
     }
 
     /// Gets an [`Asset`](LocalAsset)'s [`Container`](LocalContainer)
     /// from the database if it exists, otherwise `None`.
     pub fn get_asset_container(&self, rid: &ResourceId) -> Option<&LocalContainer> {
-        let Some(container) = self.assets.get(rid) else {
+        let Some(container) = self.asset_containers.get(rid) else {
             return None;
         };
 
@@ -456,15 +683,48 @@ impl Datastore {
         Some(container)
     }
 
-    /// Inserts a map from the `Asset` to its `Container`.
-    pub fn insert_asset(&mut self, asset: ResourceId, container: ResourceId) -> Option<ResourceId> {
-        self.assets.insert(asset, container)
+    /// Get the [`ResourceId`] of the `Asset` associated with the path.
+    ///
+    /// # See also
+    /// + `get_path_asset_id_canoncial`
+    pub fn get_path_asset_id(&self, path: impl AsRef<Path>) -> Option<&ResourceId> {
+        self.asset_paths.get(path.as_ref())
+    }
+
+    /// Get the [`ResourceId`] of the `Asset` associated with the path.
+    /// `path` is first canonicalized.
+    pub fn get_path_asset_id_canonical(
+        &self,
+        path: impl AsRef<Path>,
+    ) -> StdResult<Option<&ResourceId>, io::Error> {
+        self.asset_paths.get_canonical(path.as_ref())
+    }
+
+    /// Inserts maps for an [`Asset`].
+    pub fn insert_asset(&mut self, asset: ResourceId, path: PathBuf, container: ResourceId) {
+        self.asset_containers.insert(asset.clone(), container);
+        self.asset_paths.insert(path, asset);
+    }
+
+    /// Inserts maps for an [`Asset`].
+    /// Canonicalizes `asset_path`.
+    pub fn insert_asset_canonical(
+        &mut self,
+        asset: ResourceId,
+        path: PathBuf,
+        container: ResourceId,
+    ) {
+        self.asset_containers.insert(asset.clone(), container);
+        self.asset_paths.insert_canonical(path, asset);
     }
 
     /// Adds an [`Asset`](CoreAsset) to a `Container`.
     pub fn add_asset(&mut self, mut asset: Asset, container: ResourceId) -> Result<Option<Asset>> {
         let Some(project) = self.container_projects.get(&container) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` is not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` is not loaded",
+            ))
+            .into());
         };
 
         let graph = self
@@ -473,7 +733,10 @@ impl Datastore {
             .expect("`Project` present without graph");
 
         let Some(container) = graph.get_mut(&container) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` is not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` is not loaded",
+            ))
+            .into());
         };
 
         // check if asset with same path already extists
@@ -486,40 +749,142 @@ impl Datastore {
 
         let aid = asset.rid.clone();
         let cid = container.rid.clone();
-        let o_asset = container.assets.insert(aid.clone(), asset);
+        let asset_path = container.base_path().join(asset.path.as_path());
+        let o_asset = container.insert_asset(asset);
         container.save()?;
 
-        self.insert_asset(aid, cid);
+        let asset_path = match fs::canonicalize(&asset_path) {
+            Ok(path) => path,
+            Err(_) => {
+                if cfg!(target_os = "windows") {
+                    thot_local::common::ensure_windows_unc(asset_path)
+                } else {
+                    asset_path
+                }
+            }
+        };
+
+        self.insert_asset(aid, asset_path, cid);
         Ok(o_asset)
     }
 
     /// Removes an `Asset` from its `Container`.
-    /// Deletes the related file if it exists.
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub fn remove_asset(&mut self, rid: &ResourceId) -> Result<Option<Asset>> {
-        let Some(cid) = self.assets.get(rid).cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` is not loaded")).into());
+    ///
+    /// # Returns
+    /// Tuple of the `Asset` and the `Asset`'s canonicalized path.
+    #[tracing::instrument(skip(self))]
+    pub fn remove_asset(&mut self, rid: &ResourceId) -> Result<Option<(Asset, PathBuf)>> {
+        let Some(cid) = self.asset_containers.get(rid).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` is not loaded",
+            ))
+            .into());
         };
 
         let Some(graph) = self.get_container_graph_mut(&cid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container`'s graph is not loaded")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container`'s graph is not loaded",
+            ))
+            .into());
         };
 
         let Some(container) = graph.get_mut(&cid) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` not in graph")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` not in graph",
+            ))
+            .into());
         };
 
         let container_path = container.base_path().to_path_buf();
         let asset = container.assets.remove(rid);
         container.save()?;
+        self.asset_containers.remove(rid);
 
-        self.assets.remove(rid);
-        if let Some(asset) = asset.as_ref() {
+        if let Some(asset) = asset {
             let path = container_path.join(asset.path.as_path());
-            trash::delete(path)?;
+            let path = match fs::canonicalize(path.clone()) {
+                Ok(path) => path,
+
+                Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
+                    if cfg!(target_os = "windows") {
+                        thot_local::common::ensure_windows_unc(path)
+                    } else {
+                        path
+                    }
+                }
+
+                Err(err) => panic!("{err}"),
+            };
+            self.asset_paths.remove(&path);
+
+            Ok(Some((asset, path)))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Updates an [`Asset`]'s path.
+    /// Sets the `Asset`'s path relative to its `Container`.
+    ///
+    /// # Arguments
+    /// + `path` should be the path relative to its `Container`.
+    pub fn update_asset_path(&mut self, asset: &ResourceId, path: impl Into<PathBuf>) -> Result {
+        let path = path.into();
+        assert!(path.is_relative());
+
+        let container = self.get_asset_container_id(asset).unwrap().clone();
+        let container = self.get_container_mut(&container).unwrap();
+        let container_path = container.base_path().to_path_buf();
+        let asset = container.assets.get_mut(asset).unwrap();
+        let aid = asset.rid.clone();
+        let asset_path = asset.path.as_path().to_owned();
+
+        asset.path = ResourcePath::new(path.clone())?;
+        container.save()?;
+
+        let old_asset_path = container_path.join(&asset_path);
+        self.asset_paths.remove_canonical(&old_asset_path);
+
+        let path = container_path.join(path);
+        self.asset_paths.insert_canonical(path, aid);
+        Ok(())
+    }
+
+    /// Moves an [`Asset`] to another [`Container`](CoreContainer).
+    ///
+    /// # Notes
+    /// + Does not manipulate the `Asset`'s file.
+    pub fn move_asset(&mut self, asset: &ResourceId, container: &ResourceId) -> Result {
+        let Some(asset_container) = self.get_asset_container_id(asset).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Asset` does not exist",
+            ))
+            .into());
+        };
+
+        let asset_container = self.get_container_mut(&asset_container).unwrap();
+        let aid = asset.clone();
+        let asset = asset_container.remove_asset(asset).unwrap();
+        let asset_path_old = asset_container.base_path().join(asset.path.as_path());
+        asset_container.save()?;
+
+        let Some(container) = self.get_container_mut(container) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist",
+            ))
+            .into());
         };
 
-        Ok(asset)
+        let cid = container.rid.clone();
+        let asset_path = container.base_path().join(asset.path.as_path());
+        container.insert_asset(asset);
+        container.save()?;
+
+        self.asset_containers.insert(aid.clone(), cid);
+        self.asset_paths.remove(&asset_path_old);
+        self.asset_paths.insert(asset_path, aid);
+
+        Ok(())
     }
 
     /// Finds `Asset`'s that match the filter.
@@ -575,9 +940,9 @@ impl Datastore {
         filter: StdFilter,
     ) -> HashSet<Asset> {
         /// Recursively finds mathcing `Containers`, inheriting metadata.
-        fn find_assets_with_metadata_recursive<'a>(
+        fn find_assets_with_metadata_recursive(
             root: &ResourceId,
-            graph: &'a ContainerTree,
+            graph: &ContainerTree,
             filter: StdFilter,
             mut metadata: Metadata,
         ) -> HashSet<Asset> {
@@ -606,12 +971,12 @@ impl Datastore {
             for asset in root.data().assets.values() {
                 let mut asset = asset.clone();
                 for (key, value) in metadata.clone().into_iter() {
-                    asset.properties.metadata.insert(key, value);
+                    asset.properties.metadata.entry(key).or_insert(value);
                 }
 
                 if filter.matches(&asset) {
                     // set path to absolute
-                    let mut path = root.base_path().join(asset.path.as_path());
+                    let path = root.base_path().join(asset.path.as_path());
                     asset.path = ResourcePath::new(path).expect("could not set absolute path");
 
                     found.insert(asset);
@@ -626,7 +991,20 @@ impl Datastore {
             return HashSet::new();
         };
 
-        find_assets_with_metadata_recursive(root, graph, filter, Metadata::new())
+        let metadata =
+            graph
+                .ancestors(root)
+                .into_iter()
+                .rfold(Metadata::new(), |mut metadata, ancestor| {
+                    let container = graph.get(&ancestor).expect("`Container` not found");
+                    for (key, value) in container.properties.metadata.clone() {
+                        metadata.insert(key, value);
+                    }
+
+                    metadata
+                });
+
+        find_assets_with_metadata_recursive(root, graph, filter, metadata)
     }
 
     // **************
@@ -651,6 +1029,16 @@ impl Datastore {
         self.scripts.get(&project)
     }
 
+    /// Gets a `mut`able reference to a `Project`'s `Script`s.
+    pub fn get_project_scripts_mut(&mut self, project: &ResourceId) -> Option<&mut ProjectScripts> {
+        self.scripts.get_mut(&project)
+    }
+
+    /// Returns if the `Project`'s `Scripts` are loaded.
+    pub fn are_project_scripts_loaded(&self, project: &ResourceId) -> bool {
+        self.scripts.contains_key(project)
+    }
+
     /// Gets the `Project` of a `Script`.
     pub fn get_script_project(&self, script: &ResourceId) -> Option<&ResourceId> {
         self.script_projects.get(&script)
@@ -662,8 +1050,10 @@ impl Datastore {
         script: CoreScript,
     ) -> Result<Option<CoreScript>> {
         let Some(scripts) = self.scripts.get_mut(&project) else {
-            // project does not exist
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project` does not exist",
+            ))
+            .into());
         };
 
         let sid = script.rid.clone();
@@ -688,12 +1078,18 @@ impl Datastore {
     ) -> Result<Option<CoreScript>> {
         let Some(scripts) = self.scripts.get_mut(&project) else {
             // project does not exist
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project`'s `Scripts` does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project`'s `Scripts` does not exist",
+            ))
+            .into());
         };
 
         // remove association from contiainers
         let Some(graph) = self.graphs.get_mut(project) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project`'s graph does not exist")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Project`'s graph does not exist",
+            ))
+            .into());
         };
 
         for (_cid, container) in graph.iter_nodes_mut() {
diff --git a/local/database/src/server/store_test.rs b/local/database/src/server/store_test.rs
index 340c7d97..73670f18 100644
--- a/local/database/src/server/store_test.rs
+++ b/local/database/src/server/store_test.rs
@@ -1,27 +1,19 @@
 use super::*;
 use dev_utils::fs::TempDir;
 use dev_utils::path::resource_path::resource_path;
-use fake::faker::filesystem::raw::DirPath;
-use fake::locales::EN;
-use fake::Fake;
-use std::sync::{Arc, Mutex};
+use thot_core::db::StandardSearchFilter as StdFilter;
 use thot_core::types::ResourceId;
-use thot_core::{db::StandardSearchFilter as StdFilter, project::Scripts as CoreScripts};
+use thot_local::graph::ContainerTreeLoader;
 use thot_local::project::resources::{
     Asset as LocalAsset, Container as LocalContainer, Project as LocalProject,
-    Script as LocalScript, Scripts as LocalScripts,
+    Scripts as LocalScripts,
 };
 
-#[test]
-fn new_should_work() {
-    Datastore::new();
-}
-
 #[test]
 fn insert_project_should_work() {
     // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let project = LocalProject::load(_dir.path()).expect("load `Project` should work");
+    let dir = TempDir::new().expect("new `TempDir` should work");
+    let project = LocalProject::load_from(dir.path()).expect("load `Project` should work");
     let pid = project.rid.clone();
 
     let mut db = Datastore::new();
@@ -32,14 +24,14 @@ fn insert_project_should_work() {
 
     assert!(db.projects.contains_key(&pid), "`Project` not inserted");
     assert!(
-        db.project_paths.contains_key(_dir.path()),
+        db.project_paths.contains_key(dir.path()),
         "`Project` path not inserted",
     );
 
     let project = db.projects.get(&pid).expect("`Project` not loaded");
     let rid = db
         .project_paths
-        .get(_dir.path())
+        .get(dir.path())
         .expect("`Project` path not loaded");
 
     assert_eq!(&pid, &project.rid, "incorrect `Project` inserted");
@@ -47,14 +39,15 @@ fn insert_project_should_work() {
 }
 
 #[test]
-fn insert_container_tree_should_work() {
+fn insert_project_graph_should_work() {
     // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let child_dir = _dir.mkdir().expect("mkdir should work");
+    let pid = ResourceId::new();
+    let mut dir = TempDir::new().expect("new `TempDir` should work");
+    let child_dir = dir.mkdir().expect("mkdir should work");
 
-    let mut root = LocalContainer::load(_dir.path()).expect("load `Container` should work");
-    let mut child = LocalContainer::load(&child_dir).expect("load child `Container` should work");
-    root.register_child(child.rid.clone());
+    let mut root = LocalContainer::load_from(dir.path()).expect("load `Container` should work");
+    let mut child =
+        LocalContainer::load_from(&child_dir).expect("load child `Container` should work");
 
     let a0 = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
     let a1 = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
@@ -63,8 +56,7 @@ fn insert_container_tree_should_work() {
     let c_child_rid = child.rid.clone();
     let aids = vec![a0.rid.clone(), a1.rid.clone()];
 
-    root.assets
-        .insert_asset(a0)
+    root.insert_asset(a0)
         .expect("could not insert `Asset` into root `Container`");
 
     child
@@ -73,74 +65,52 @@ fn insert_container_tree_should_work() {
 
     root.save().expect("could not save root `Container`");
     child.save().expect("could not save child `Container`");
-    drop(child);
 
-    root.load_children(true)
-        .expect("could not load `Container` children");
+    drop(root);
+    drop(child);
 
-    let root = Arc::new(Mutex::new(root));
+    let graph = ContainerTreeLoader::load(dir.path()).unwrap();
     let mut db = Datastore::new();
 
     // test
-    db.insert_container_tree(root.clone())
+    db.insert_project_graph(pid.clone(), graph)
         .expect("load container tree should work");
 
     // containers
-    assert!(
-        db.containers.contains_key(&c_root_rid),
+    assert!(db.graphs.contains_key(&pid), "`Project` not inserted");
+
+    assert_eq!(
+        &pid,
+        db.container_projects
+            .get(&c_root_rid)
+            .expect("`Container` not registered with project"),
         "root `Container` not inserted"
     );
 
-    assert!(
-        db.containers.contains_key(&c_child_rid),
+    assert_eq!(
+        &pid,
+        db.container_projects
+            .get(&c_child_rid)
+            .expect("`Container` not registered with project"),
         "child `Container` not inserted"
     );
 
     // assets
     for rid in aids {
-        assert!(db.assets.contains_key(&rid), "asset not inserted");
+        assert!(db.asset_containers.contains_key(&rid), "asset not inserted");
     }
-
-    // second insert
-    db.insert_container_tree(root)
-        .expect("load container tree should work");
-}
-
-#[test]
-fn insert_container_should_work() {
-    // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let mut container = LocalContainer::load(_dir.path()).expect("load `Container` should work");
-    let asset = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
-
-    let cid = container.rid.clone();
-    let aid = asset.rid.clone();
-
-    container
-        .assets
-        .insert_asset(asset)
-        .expect("could not insert `Asset`s");
-
-    container.save().expect("save `Container` should work");
-    let mut db = Datastore::new();
-
-    // test
-    db.insert_container(container)
-        .expect("load container should work");
-
-    assert!(db.containers.contains_key(&cid), "container not inserted");
-    assert!(db.assets.contains_key(&aid), "asset not inserted");
 }
 
 #[test]
 fn get_container_should_work() {
     // setup
+    let dir = TempDir::new().unwrap();
     let mut db = Datastore::new();
-    let container = LocalContainer::new().expect("new `Container` should work");
+    let container = LocalContainer::new(dir.path());
     let rid = container.rid.clone();
+    let graph = ResourceTree::new(container);
 
-    db.containers
-        .insert(container.rid.clone(), Arc::new(Mutex::new(container)));
+    db.insert_project_graph(ResourceId::new(), graph);
 
     // test
     let found = db.get_container(&rid);
@@ -154,28 +124,24 @@ fn get_container_should_work() {
 #[test]
 fn get_asset_container_should_work() {
     // setup
+    let dir = TempDir::new().unwrap();
     let mut db = Datastore::new();
-    let mut container = LocalContainer::new().expect("new `Container` should work");
-
+    let mut container = LocalContainer::new(dir.path());
     let cid = container.rid.clone();
-    let c_path = PathBuf::from(DirPath(EN).fake::<String>());
-    container
-        .set_base_path(c_path)
-        .expect("could not set `Container` `base_path`");
 
     let asset = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
     let aid = asset.rid.clone();
 
-    container.assets.insert(asset.rid.clone(), asset);
-    db.insert_container(container)
-        .expect("could not insert `Container`");
+    container.insert_asset(asset);
+
+    let graph = ResourceTree::new(container);
+    db.insert_project_graph(ResourceId::new(), graph);
 
     // test
     let Some(found) = db.get_asset_container(&aid) else {
         panic!("container should have been found");
     };
 
-    let found = found.lock().expect("could not lock container");
     assert_eq!(cid, found.rid, "incorrect container found");
 
     // get non-existant
@@ -191,19 +157,13 @@ fn update_container_should_work() {
 #[test]
 fn find_containers_should_work() {
     // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let child_1_dir = _dir.mkdir().expect("mkdir should work");
-    let child_2_dir = _dir.mkdir().expect("mkdir should work");
+    let mut dir = TempDir::new().expect("new `TempDir` should work");
+    let child_1_dir = dir.mkdir().expect("mkdir should work");
+    let child_2_dir = dir.mkdir().expect("mkdir should work");
 
-    let mut root = LocalContainer::load(_dir.path()).expect("load `Container` should work");
-    let mut child_1 =
-        LocalContainer::load(&child_1_dir).expect("load child `Container` should work");
-
-    let mut child_2 =
-        LocalContainer::load(&child_2_dir).expect("load child `Container` should work");
-
-    root.register_child(child_1.rid.clone());
-    root.register_child(child_2.rid.clone());
+    let mut root = LocalContainer::new(dir.path());
+    let mut child_1 = LocalContainer::new(&child_1_dir);
+    let child_2 = LocalContainer::new(&child_2_dir);
 
     let root_rid = root.rid.clone();
     let child_1_rid = child_1.rid.clone();
@@ -213,20 +173,12 @@ fn find_containers_should_work() {
     root.properties.kind = find_kind.clone();
     child_1.properties.kind = find_kind.clone();
 
-    root.save().expect("could not save root `Container`");
-    child_1.save().expect("could not save child `Container`");
-    child_2.save().expect("could not save child `Container`");
-    drop(child_1);
-    drop(child_2);
-
-    root.load_children(true)
-        .expect("could not load `Container` children");
-
-    let root = Arc::new(Mutex::new(root));
     let mut db = Datastore::new();
 
-    db.insert_container_tree(root.clone())
-        .expect("load container tree should work");
+    let mut graph = ResourceTree::new(root);
+    graph.insert(root_rid.clone(), child_1).unwrap();
+    graph.insert(root_rid.clone(), child_2).unwrap();
+    db.insert_project_graph(ResourceId::new(), graph);
 
     let mut find_filter = StdFilter::default();
     find_filter.kind = Some(find_kind);
@@ -238,35 +190,45 @@ fn find_containers_should_work() {
 
     // find from root
     let found = db.find_containers(&root_rid, find_filter.clone());
+    let found_ids = found
+        .iter()
+        .map(|c| c.rid.clone())
+        .collect::<Vec<ResourceId>>();
+
     assert!(
-        found.contains_key(&root_rid),
+        found_ids.contains(&root_rid),
         "root `Container` should be found"
     );
 
     assert!(
-        found.contains_key(&child_1_rid),
+        found_ids.contains(&child_1_rid),
         "child `Container` should be found"
     );
 
     assert!(
-        !found.contains_key(&child_2_rid),
+        !found_ids.contains(&child_2_rid),
         "child `Container` should not be found"
     );
 
     // find from child
     let found = db.find_containers(&child_1_rid, find_filter.clone());
+    let found_ids = found
+        .iter()
+        .map(|c| c.rid.clone())
+        .collect::<Vec<ResourceId>>();
+
     assert!(
-        !found.contains_key(&root_rid),
+        !found_ids.contains(&root_rid),
         "root `Container` should not be found"
     );
 
     assert!(
-        found.contains_key(&child_1_rid),
+        found_ids.contains(&child_1_rid),
         "child `Container` should be found"
     );
 
     assert!(
-        !found.contains_key(&child_2_rid),
+        !found_ids.contains(&child_2_rid),
         "child `Container` should not be found"
     );
 }
@@ -277,9 +239,8 @@ fn find_assets_should_work() {
     let mut _dir = TempDir::new().expect("new `TempDir` should work");
     let child_dir = _dir.mkdir().expect("mkdir should work");
 
-    let mut root = LocalContainer::load(_dir.path()).expect("load `Container` should work");
-    let mut child = LocalContainer::load(&child_dir).expect("load child `Container` should work");
-    root.register_child(child.rid.clone());
+    let mut root = LocalContainer::new(_dir.path());
+    let mut child = LocalContainer::new(&child_dir);
 
     let mut a0 = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
     let mut a1 = LocalAsset::new(resource_path(Some("py"))).expect("new `Asset` should work");
@@ -304,15 +265,11 @@ fn find_assets_should_work() {
 
     root.save().expect("could not save root `Container`");
     child.save().expect("could not save child `Container`");
-    drop(child);
-
-    root.load_children(true)
-        .expect("could not load `Container` children");
 
-    let root = Arc::new(Mutex::new(root));
     let mut db = Datastore::new();
-
-    db.insert_container_tree(root.clone())
+    let mut graph = ResourceTree::new(root);
+    graph.insert(root_rid.clone(), child).unwrap();
+    db.insert_project_graph(ResourceId::new(), graph)
         .expect("load container tree should work");
 
     let mut kind_filter = StdFilter::default();
@@ -372,23 +329,23 @@ fn find_assets_should_work() {
 fn insert_project_scripts_should_work() {
     // setup
     let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let project = LocalProject::load(_dir.path()).expect("load `Project` should work");
+    let project = LocalProject::load_from(_dir.path()).expect("load `Project` should work");
     let pid = project.rid.clone();
 
-    let mut db = Datastore::new();
+    let db = Datastore::new();
 
     // test
     todo!();
 }
 
 #[test]
-fn remove_script_should_work() {
+fn remove_project_script_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not create temporary directory");
 
     let pid = ResourceId::new();
 
-    let mut scripts = LocalScripts::load(_dir.path()).expect("could not load `Scripts`");
+    let mut scripts = LocalScripts::load_from(_dir.path()).expect("could not load `Scripts`");
     let script = CoreScript::new(resource_path(Some("py"))).expect("could not create `Script`");
     let sid = script.rid.clone();
 
@@ -411,7 +368,7 @@ fn remove_script_should_work() {
 
     // test
     store
-        .remove_script(&pid, &sid)
+        .remove_project_script(&pid, &sid)
         .expect("could not remove `Script`");
 
     let scripts = store
diff --git a/local/database/src/types.rs b/local/database/src/types.rs
index baa4886c..bd02fecb 100644
--- a/local/database/src/types.rs
+++ b/local/database/src/types.rs
@@ -15,7 +15,3 @@ pub enum SocketType {
     /// [`zmq::SocketType::REP`]
     REP,
 }
-
-#[cfg(test)]
-#[path = "./types_test.rs"]
-mod types_test;
diff --git a/local/database/src/types_test.rs b/local/database/src/types_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/runner/Cargo.toml b/local/runner/Cargo.toml
index 9b7862e6..116a2361 100644
--- a/local/runner/Cargo.toml
+++ b/local/runner/Cargo.toml
@@ -16,9 +16,8 @@ categories = [ "science", "data-structures" ]
 
 [dependencies]
 serde_json = "1.0"
+tracing = "0.1.37"
 
 thot-core = { path = "../../core" }
 thot-local = { path = "../../local" }
 thot-local-database = { path = "../database", features = ["client"] }
-settings_manager = { path = "../../settings_manager" }
-tracing = "0.1.37"
diff --git a/local/runner/src/hooks.rs b/local/runner/src/hooks.rs
index cdf4349c..eb572c25 100644
--- a/local/runner/src/hooks.rs
+++ b/local/runner/src/hooks.rs
@@ -1,8 +1,7 @@
 //! Local runner hooks.
-use settings_manager::system_settings::Loader as SystemLoader;
 use std::path::PathBuf;
 use thot_core::error::{ResourceError, Result as CoreResult};
-use thot_core::project::{Project, Script as CoreScript};
+use thot_core::project::{Project, Script as CoreScript, ScriptLang};
 use thot_core::runner::RunnerHooks as CoreRunnerHooks;
 use thot_core::types::{ResourceId, ResourcePath};
 use thot_local::system::settings::RunnerSettings;
@@ -20,12 +19,15 @@ pub fn get_script(rid: &ResourceId) -> CoreResult<CoreScript> {
         serde_json::from_value(script).expect("could not convert result of `Get` to `Script`");
 
     let Some(mut script) = script else {
-        return Err(ResourceError::DoesNotExist("`Script` not loaded").into());
+        return Err(ResourceError::does_not_exist("`Script` not loaded").into());
     };
 
     // get absolute path to script
     match script.path {
-        ResourcePath::Absolute(_) => {}
+        ResourcePath::Absolute(_) => {
+            todo!();
+        }
+
         ResourcePath::Relative(path) => {
             let project = db
                 .send(ScriptCommand::GetProject(script.rid.clone()).into())
@@ -63,24 +65,21 @@ pub fn get_script(rid: &ResourceId) -> CoreResult<CoreScript> {
         }
     }
 
-    //TODO[h]: Settings should be passed in and not loaded here. This is a temporary fix.
+    // TODO[h]: Settings should be passed in and not loaded here. This is a temporary fix.
     // Get runner settings and override script's cmd if necessary
-    let runner_settings = SystemLoader::load_or_create::<RunnerSettings>();
-    if let Ok(runner_settings) = runner_settings {
-        let runner_settings: RunnerSettings = runner_settings.into();
-        let cmd_str = script.env.cmd.as_str().to_lowercase();
-        match cmd_str {
-            _ if cmd_str.contains("python") => {
+    if let Ok(runner_settings) = RunnerSettings::load() {
+        match script.env.language {
+            ScriptLang::Python => {
                 if let Some(python_path) = runner_settings.python_path.clone() {
                     script.env.cmd = python_path;
                 }
             }
-            _ if cmd_str.contains("rscript") => {
+
+            ScriptLang::R => {
                 if let Some(r_path) = runner_settings.r_path.clone() {
                     script.env.cmd = r_path;
                 }
             }
-            _ => {}
         }
     };
 
@@ -93,7 +92,3 @@ impl RunnerHooks {
         CoreRunnerHooks::new(get_script)
     }
 }
-
-#[cfg(test)]
-#[path = "./hooks_test.rs"]
-mod hooks_test;
diff --git a/local/runner/src/hooks_test.rs b/local/runner/src/hooks_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/runner/src/main.rs b/local/runner/src/main.rs
index 0b98f50a..2d10c7e9 100644
--- a/local/runner/src/main.rs
+++ b/local/runner/src/main.rs
@@ -11,6 +11,5 @@ fn main() {
     }
 
     let runner = Runner::new();
-    // @todo
-    // runner.run(root, max_tasks);
+    // TODO runner.run(root, max_tasks);
 }
diff --git a/local/runner/src/runner.rs b/local/runner/src/runner.rs
index c0455738..7ab52d80 100644
--- a/local/runner/src/runner.rs
+++ b/local/runner/src/runner.rs
@@ -9,7 +9,3 @@ impl Runner {
         CoreRunner::new(hooks)
     }
 }
-
-#[cfg(test)]
-#[path = "./runner_test.rs"]
-mod runner_test;
diff --git a/local/runner/src/runner_test.rs b/local/runner/src/runner_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/common.rs b/local/src/common.rs
index 813decfb..46333984 100644
--- a/local/src/common.rs
+++ b/local/src/common.rs
@@ -1,23 +1,16 @@
 //! Common use functions.
 use crate::constants::*;
 use crate::{Error, Result};
+use regex::Regex;
 use std::fs;
-use std::path::{Path, PathBuf};
-
-/// Canonicalizes a path.
-///
-/// # Notes
-/// Currently delegates to std::fs::canonicalize, but reserved for
-/// easy future changes.
-pub fn canonicalize_path<P: AsRef<Path>>(path: P) -> Result<PathBuf> {
-    match fs::canonicalize(path) {
-        Ok(path) => Ok(path),
-        Err(err) => Err(Error::from(err)),
-    }
-}
+use std::path::{Component, Path, PathBuf, MAIN_SEPARATOR};
 
 /// Creates a unique file name.
 pub fn unique_file_name(path: PathBuf) -> Result<PathBuf> {
+    if !path.exists() {
+        return Ok(path);
+    }
+
     // get file name
     let Some(file_prefix) = path.file_prefix() else {
         return Err(Error::InvalidPath(path.to_path_buf()));
@@ -38,18 +31,104 @@ pub fn unique_file_name(path: PathBuf) -> Result<PathBuf> {
 
     let ext = &ext[file_prefix.len()..];
 
-    // create unique file name
-    let mut u_path = path.to_path_buf();
-    let mut counter: usize = 0;
-    while u_path.exists() {
-        counter += 1;
-        let u_file_name = format!("{file_prefix}-{counter}{ext}");
+    let Some(parent) = path.parent() else {
+        return Err(Error::InvalidPath(path.to_path_buf()));
+    };
 
-        u_path = path.to_path_buf();
-        u_path.set_file_name(u_file_name);
+    // get highest counter
+    let name_pattern = Regex::new(&format!(r" \((\d+)\){ext}$")).unwrap();
+    let mut highest = None;
+    for entry in fs::read_dir(parent)? {
+        let entry = entry?;
+        let entry_path = entry.path();
+
+        let Some(entry_path_str) = entry_path.to_str() else {
+            continue;
+        };
+
+        let Some(captures) = name_pattern.captures(entry_path_str) else {
+            continue;
+        };
+
+        if let Some(n) = captures.get(1) {
+            let Ok(n) = n.as_str().parse::<u32>() else {
+                continue;
+            };
+
+            match highest {
+                None => {
+                    let n = std::cmp::max(n, 1);
+                    let _ = highest.insert(n);
+                }
+                Some(m) if n > m => {
+                    let _ = highest.insert(n);
+                }
+                _ => {}
+            }
+        }
     }
 
-    Ok(u_path)
+    // set unique file name
+    let mut file_name = file_prefix.to_string();
+    match highest {
+        None => file_name.push_str(" (1)"),
+
+        Some(n) => {
+            let match_len = &format!("({n})").len();
+            let replace_range = (file_prefix.len() - match_len)..;
+            file_name.replace_range(replace_range, &format!("({})", n + 1));
+        }
+    };
+    file_name.push_str(ext);
+
+    let mut unique_path = path.clone();
+    unique_path.set_file_name(file_name);
+    Ok(unique_path)
+}
+
+/// Replaces any non-alphanumeric or standard characters with underscore (_).
+pub fn sanitize_file_path(path: impl Into<String>) -> String {
+    let path: String = path.into();
+    let char_whitelist = vec!['-', '_', '.', ' ', '(', ')', '[', ']'];
+    path.chars()
+        .map(|char| {
+            if char.is_ascii_alphanumeric() || char_whitelist.contains(&char) {
+                char
+            } else {
+                '_'
+            }
+        })
+        .collect()
+}
+
+/// Normalizes path separators to the current systems.
+///
+/// On Windows this is `\\`.
+/// On all other systems this is `/`.
+pub fn normalize_path_separators(path: impl AsRef<Path>) -> PathBuf {
+    path.as_ref()
+        .components()
+        .fold(PathBuf::new(), |path, component| match component {
+            Component::RootDir => path.join(MAIN_SEPARATOR.to_string()),
+            Component::Prefix(prefix) => path.join(prefix.as_os_str()),
+            Component::Normal(segment) => path.join(segment),
+            _ => {
+                panic!("invalid path component");
+            }
+        })
+}
+
+/// Prefixes the path with the [Windows UNC](https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats#unc-paths) path if it is not already there.
+pub fn ensure_windows_unc(path: impl Into<PathBuf>) -> PathBuf {
+    let path: PathBuf = path.into();
+    if path.to_str().unwrap().starts_with(WINDOWS_UNC_PREFIX) {
+        path
+    } else {
+        // Must prefix UNC path as `str` because using `Path`s strips it.
+        let mut p = WINDOWS_UNC_PREFIX.to_string();
+        p.push_str(path.to_str().unwrap());
+        PathBuf::from(p)
+    }
 }
 
 // ******************
diff --git a/local/src/common_test.rs b/local/src/common_test.rs
index 84e00a4f..ed8d9c9f 100644
--- a/local/src/common_test.rs
+++ b/local/src/common_test.rs
@@ -1,7 +1,6 @@
 use super::*;
 use dev_utils::fs::TempDir;
-use fake::faker::filesystem::raw::{FileExtension, FileName, FilePath};
-use fake::faker::lorem::raw::Word;
+use fake::faker::filesystem::raw::{FileName, FilePath};
 use fake::locales::EN;
 use fake::Fake;
 use std::fs;
@@ -23,18 +22,28 @@ fn unique_file_name_should_work() {
     // basic
     let p = _dir.mkfile().expect("make temp file should work");
     let q = unique_file_name(p.clone()).expect("`unique_file_name` should work");
-    let r = postfix_file_name(p.clone(), "1".to_string());
+    let r = postfix_file_name(p.clone(), "1");
+
+    assert_ne!(p, q, "file name should change");
+    assert_eq!(r, q, "unexpected file name");
+
+    // no extension
+    let p = _dir
+        .mkfile_with_name("test (1)")
+        .expect("make temp file should work");
+    let q = unique_file_name(p.clone()).expect("`unique_file_name` should work");
+    let r = p.parent().unwrap().join("test (2)");
 
     assert_ne!(p, q, "file name should change");
     assert_eq!(r, q, "unexpected file name");
 
     // multiple extensions
     let p = _dir
-        .mkfile_with_extension(".gz.txt")
+        .mkfile_with_extension("gz.txt")
         .expect("make temp file should work");
 
     let q = unique_file_name(p.clone()).expect("`unique_file_name` should work");
-    let r = postfix_file_name(p.clone(), "1".to_string());
+    let r = postfix_file_name(p.clone(), "1");
 
     assert_ne!(p, q, "file name should change");
     assert_eq!(r, q, "unexpected file name");
@@ -48,14 +57,38 @@ fn unique_file_name_should_work() {
         .expect("could not convert path to string");
 
     let p0 = PathBuf::from(format!(".{p0}"));
-    fs::rename(p, &p0);
+    fs::rename(p, &p0).unwrap();
     let p = p0;
 
     let q = unique_file_name(p.clone()).expect("`unique_file_name` should work");
-    let r = postfix_file_name(p.clone(), "1".to_string());
+    let r = postfix_file_name(p.clone(), "1");
 
     assert_ne!(p, q, "file name should change");
     assert_eq!(r, q, "unexpected file name");
+
+    // changing digit count
+    let p = _dir
+        .mkfile_with_name("test (9).txt")
+        .expect("make temp file should work");
+    let q = unique_file_name(p.clone()).expect("`unique_file_name` should work");
+    let r = p.parent().unwrap().join("test (10).txt");
+
+    assert_ne!(p, q, "file name should change");
+    assert_eq!(r, q, "unexpected file name");
+}
+
+#[cfg(target_os = "windows")]
+#[test]
+fn ensure_windows_unc_should_work() {
+    let dir = TempDir::new().unwrap();
+    let base_path = dir.path().to_path_buf();
+    let canon_path = fs::canonicalize(&base_path).unwrap();
+
+    let unc_base = ensure_windows_unc(&base_path);
+    assert_eq!(canon_path, unc_base);
+
+    let unc_canon = ensure_windows_unc(&canon_path);
+    assert_eq!(canon_path, unc_canon);
 }
 
 // ******************
@@ -153,11 +186,11 @@ fn scripts_file_of_should_work() {
 /// Inject a postfix onto a file name.
 ///
 /// # Examples
-/// + postfix_file_name("foo.txt", "1") -> "foo-1.txt"
-/// + postfix_file_name("/a/foo.txt", "1") -> "/a/foo-1.txt"
-/// + postfix_file_name(".foo.txt", "1") -> ".foo-1.txt")
-/// + postfix_file_name("foo", "1") -> "foo-1")
-fn postfix_file_name(path: PathBuf, postfix: String) -> PathBuf {
+/// + postfix_file_name("foo.txt", "1") -> "foo (1).txt"
+/// + postfix_file_name("/a/foo.txt", "1") -> "/a/foo (1).txt"
+/// + postfix_file_name(".foo.txt", "1") -> ".foo (1).txt")
+/// + postfix_file_name("foo", "1") -> "foo (1)")
+fn postfix_file_name(path: PathBuf, postfix: impl std::fmt::Display) -> PathBuf {
     let prefix = path
         .file_prefix()
         .expect("could not get file prefix")
@@ -172,7 +205,7 @@ fn postfix_file_name(path: PathBuf, postfix: String) -> PathBuf {
 
     let ext = &ext[prefix.len()..];
 
-    let name = format!("{prefix}-{postfix}{ext}");
+    let name = format!("{prefix} ({postfix}){ext}");
     let mut p = path.clone();
     p.set_file_name(name);
     p
diff --git a/local/src/constants.rs b/local/src/constants.rs
index 0ecc50fa..ad0056cf 100644
--- a/local/src/constants.rs
+++ b/local/src/constants.rs
@@ -1,8 +1,11 @@
-/// Crate wide constant values.
+//! Crate wide constant values.
 
-// *************
-// *** files ***
-// *************
+/// Current project format version.
+pub static PROJECT_FORMAT_VERSION: &str = "0.10.0";
+
+// ************
+// *** thot ***
+// ************
 
 pub const THOT_DIR: &str = ".thot";
 pub const PROJECT_FILE: &str = "project.json";
@@ -11,3 +14,9 @@ pub const CONTAINER_FILE: &str = "container.json";
 pub const CONTAINER_SETTINGS_FILE: &str = "container_settings.json";
 pub const ASSETS_FILE: &str = "assets.json";
 pub const SCRIPTS_FILE: &str = "scripts.json";
+
+// ************
+// *** misc ***
+// ************
+
+pub const WINDOWS_UNC_PREFIX: &str = "\\\\?\\";
diff --git a/local/src/error.rs b/local/src/error.rs
index 91dcd658..05b638a4 100644
--- a/local/src/error.rs
+++ b/local/src/error.rs
@@ -3,25 +3,27 @@ use serde::{self, Deserialize, Serialize};
 use std::io;
 use std::path::PathBuf;
 use std::result::Result as StdResult;
-use thot_core::types::ResourceId;
+use thiserror::Error;
+// use thot_core::types::ResourceId;
 use thot_core::Error as CoreError;
 
-#[cfg(feature = "fs")]
-use settings_manager::Error as SettingsError;
-
 // ***********************
 // *** Settings Errors ***
 // ***********************
 
 #[cfg(feature = "fs")]
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum SettingsFileError {
-    CouldNotLoad(SettingsError),
-    CouldNotSave(SettingsError),
+    #[error("could not load `{0}`")]
+    CouldNotLoad(PathBuf),
+
+    #[error("could not save `{0}`")]
+    CouldNotSave(PathBuf),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum SettingsValidationError {
+    #[error("invalid settings")]
     InvalidSetting,
 }
 
@@ -30,12 +32,22 @@ pub enum SettingsValidationError {
 // **********************
 
 #[cfg(feature = "fs")]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum ProjectError {
+    #[error("`{0}` already registered")]
     DuplicatePath(PathBuf),
+
+    #[error("`{0}` not a Project root")]
     PathNotAProjectRoot(PathBuf),
+
+    #[error("`{0}` not in a Project")]
     PathNotInProject(PathBuf),
+
+    #[error("`{0}` is not a resource")]
     PathNotAResource(PathBuf),
+
+    #[error("`{0}` is not registered")]
+    PathNotRegistered(PathBuf),
 }
 
 // ***********************
@@ -43,13 +55,19 @@ pub enum ProjectError {
 // ***********************
 
 #[cfg(feature = "fs")]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum ContainerError {
+    #[error("`{0}` is not a child Container")]
     InvalidChildPath(PathBuf),
 
     /// If a path is expected to represent a [`Container`](crate::project::resources::Container)
     /// but does not.
+    #[error("`{0}` is not a Container")]
     PathNotAContainer(PathBuf),
+
+    /// If two Containers with the same parent have the same name.
+    #[error("clashing Container names")]
+    ContainerNameConflict,
 }
 
 // *******************
@@ -57,19 +75,28 @@ pub enum ContainerError {
 // *******************
 
 #[cfg(feature = "fs")]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum AssetError {
+    #[error("`{0}` is not a Container")]
     PathNotAContainer(PathBuf),
+
+    #[error("`{0}` is already an Asset")]
     FileAlreadyAsset(PathBuf),
+
+    #[error("`{0}` not found")]
     ContainerNotFound(PathBuf),
+
+    #[error("`{0}` is invalid: {1}")]
     InvalidPath(PathBuf, String),
 
     /// The [`AssetFileAction`](crate::types::AssetFileAction) is
     /// incompatible with the path.
+    #[error("invalid action: {0}")]
     IncompatibleAction(String),
 
     /// An error occured in the process of using the
     /// [`AssetBuilder`](crate::project::asset::AssetBuilder).
+    #[error("builder errored: {0}")]
     BuilderError(String),
 }
 
@@ -77,56 +104,66 @@ pub enum AssetError {
 // *** Users Errors ***
 // ********************
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Error, Debug)]
 pub enum UsersError {
+    #[error("email `{0}` already exists")]
     DuplicateEmail(String),
+
+    #[error("`{0}` is not a valid email")]
     InvalidEmail(String),
 }
 
-// ****************************
-// *** Resource Store Error ***
-// ****************************
+// // ****************************
+// // *** Resource Store Error ***
+// // ****************************
 
-#[cfg(feature = "fs")]
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ResourceStoreError {
-    /// If a [`ResourceId`] is expected to be present as a map key, but is not.
-    IdNotPresent(ResourceId),
+// #[cfg(feature = "fs")]
+// #[derive(Serialize, Deserialize, Error, Debug)]
+// pub enum ResourceStoreError {
+//     /// If a [`ResourceId`] is expected to be present as a map key, but is not.
+//     #[error("resource with id `{0}` is not present")]
+//     IdNotPresent(ResourceId),
 
-    /// If trying to get an empty value.
-    LoadEmptyValue,
+//     /// If trying to get an empty value.
+//     #[
+//     LoadEmptyValue,
 
-    /// If trying to set a value but the resource is already loaded.
-    ResourceAlreadyLoaded,
-}
+//     /// If trying to set a value but the resource is already loaded.
+//     ResourceAlreadyLoaded,
+// }
 
 // *******************
 // *** Local Error ***
 // *******************
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum Error {
+    #[error("{0}")]
     CoreError(CoreError),
+
+    #[error("{0}")]
     InvalidPath(PathBuf),
+
+    #[error("{0}")]
     SettingsValidationError(SettingsValidationError),
+
+    #[error("{0}")]
     UsersError(UsersError),
 
     #[cfg(feature = "fs")]
+    #[error("{0}")]
     AssetError(AssetError),
 
     #[cfg(feature = "fs")]
+    #[error("{0}")]
     ContainerError(ContainerError),
 
     #[cfg(feature = "fs")]
+    #[error("{0}")]
     ProjectError(ProjectError),
 
     #[cfg(feature = "fs")]
-    ResourceStoreError(ResourceStoreError),
-
-    #[cfg(feature = "fs")]
-    SettingsError(SettingsError),
-
-    #[cfg(feature = "fs")]
+    #[error("{0}")]
     SettingsFileError(SettingsFileError),
 }
 
@@ -137,23 +174,23 @@ impl From<CoreError> for Error {
 }
 
 #[cfg(feature = "fs")]
-impl From<ContainerError> for Error {
-    fn from(err: ContainerError) -> Self {
-        Error::ContainerError(err)
+impl From<AssetError> for Error {
+    fn from(err: AssetError) -> Self {
+        Error::AssetError(err)
     }
 }
 
 #[cfg(feature = "fs")]
-impl From<SettingsError> for Error {
-    fn from(err: SettingsError) -> Self {
-        Error::SettingsError(err)
+impl From<ContainerError> for Error {
+    fn from(err: ContainerError) -> Self {
+        Error::ContainerError(err)
     }
 }
 
 #[cfg(feature = "fs")]
-impl From<AssetError> for Error {
-    fn from(err: AssetError) -> Self {
-        Error::AssetError(err)
+impl From<ProjectError> for Error {
+    fn from(err: ProjectError) -> Self {
+        Error::ProjectError(err)
     }
 }
 
@@ -169,7 +206,6 @@ impl From<serde_json::Error> for Error {
     }
 }
 
-// @todo: Make better.
 impl Serialize for Error {
     fn serialize<S>(&self, serializer: S) -> StdResult<S::Ok, S::Error>
     where
diff --git a/local/src/error_test.rs b/local/src/error_test.rs
index 552307b4..335e3878 100644
--- a/local/src/error_test.rs
+++ b/local/src/error_test.rs
@@ -1,5 +1,4 @@
 use super::*;
-use settings_manager::Error as SettingsError;
 use std::io;
 use thot_core::Error as CoreError;
 
@@ -10,12 +9,3 @@ fn error_from_core_error_should_work() {
     let c_err: Error = o_err.into();
     assert!(matches!(c_err, Error::CoreError(_)));
 }
-
-#[test]
-fn error_from_settings_manager_error_should_work() {
-    let io_err = io::Error::new(io::ErrorKind::Other, "test");
-
-    let o_err = SettingsError::IoError(io_err);
-    let c_err: Error = o_err.into();
-    assert!(matches!(c_err, Error::SettingsError(_)));
-}
diff --git a/local/src/file_resource.rs b/local/src/file_resource.rs
new file mode 100644
index 00000000..acc6bc7f
--- /dev/null
+++ b/local/src/file_resource.rs
@@ -0,0 +1,50 @@
+//! Indicate a resource is backed by a file.
+use std::path::{Path, PathBuf};
+
+// **********************
+// *** Local Resource ***
+// **********************
+
+/// Local resources have a variable base path and fixed relative path.
+/// i.e. <variable>/<fixed>
+pub trait LocalResource<T> {
+    /// Returns the (fixed) relative path to the settings file.
+    fn rel_path() -> PathBuf;
+
+    /// Returns the (variable) base path for the settings.
+    fn base_path(&self) -> &Path;
+
+    /// Returns the absolute path to the settings file.
+    fn path(&self) -> PathBuf {
+        self.base_path().join(Self::rel_path())
+    }
+}
+
+// *********************
+// *** User Resource ***
+// *********************
+
+/// User resources have a fixed base path with a variable relative path.
+/// i.e. <fixed>/<variable>
+pub trait UserResource<T> {
+    /// Returns the (fixed) base path to the settings file.
+    fn base_path() -> PathBuf;
+
+    /// Returns the (variable) relative path for the settings.
+    fn rel_path(&self) -> &Path;
+
+    /// Returns the absolute path to the settings file.
+    fn path(&self) -> PathBuf {
+        Self::base_path().join(self.rel_path())
+    }
+}
+
+// ***********************
+// *** System Resource ***
+// ***********************
+
+/// System resources have only one file for the entire system that resides at a fixed path.
+pub trait SystemResource<T> {
+    /// Returns the path to the settings file.
+    fn path() -> PathBuf;
+}
diff --git a/local/src/graph/mod.rs b/local/src/graph/mod.rs
index 9a0d6db4..4363ee0f 100644
--- a/local/src/graph/mod.rs
+++ b/local/src/graph/mod.rs
@@ -3,7 +3,3 @@ pub mod tree;
 
 // Re-exports
 pub use tree::{ContainerTreeDuplicator, ContainerTreeLoader, ContainerTreeTransformer};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/graph/mod_test.rs b/local/src/graph/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/graph/tree.rs b/local/src/graph/tree.rs
index 79226666..03d34a6e 100644
--- a/local/src/graph/tree.rs
+++ b/local/src/graph/tree.rs
@@ -1,8 +1,7 @@
 //! Local [`ResourceTree`](CoreTres).
+use crate::common;
 use crate::project::container;
-use crate::project::resources::container::{
-    Builder as ContainerBuilder, Container, Loader as ContainerLoader,
-};
+use crate::project::resources::Container;
 use crate::Result;
 use has_id::HasId;
 use std::fs;
@@ -10,7 +9,7 @@ use std::path::Path;
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::graph::tree::{EdgeMap, NodeMap};
 use thot_core::graph::{ResourceNode, ResourceTree};
-use thot_core::project::Container as CoreContainer;
+use thot_core::project::{Asset, Container as CoreContainer};
 use thot_core::types::ResourceId;
 
 type ContainerTree = ResourceTree<Container>;
@@ -37,8 +36,9 @@ impl ContainerTreeTransformer {
         tree: &ContainerTree,
         root: &ResourceId,
     ) -> Option<ResourceTree<CoreContainer>> {
-        let Some(rids) = tree
-            .descendants(root) else {return None;};
+        let Some(rids) = tree.descendants(root) else {
+            return None;
+        };
 
         let mut core_nodes = NodeMap::new();
         let mut edges = EdgeMap::new();
@@ -63,12 +63,12 @@ impl ContainerTreeTransformer {
 // **************
 // *** Loader ***
 // **************
-
 pub struct ContainerTreeLoader;
 impl ContainerTreeLoader {
     /// Load a `Container` tree into a [`ResourceTree`].
-    pub fn load(path: &Path) -> Result<ContainerTree> {
-        let root: Container = ContainerLoader::load_or_create(path.into())?.into();
+    pub fn load(path: impl AsRef<Path>) -> Result<ContainerTree> {
+        let path = path.as_ref();
+        let root = Container::load_from(path)?;
         let rid = root.id().clone();
         let mut graph = ResourceTree::new(root);
 
@@ -91,33 +91,85 @@ impl ContainerTreeLoader {
 pub struct ContainerTreeDuplicator;
 impl ContainerTreeDuplicator {
     /// Duplicates a subtree.
-    /// Base paths of the [`Containers`] are maintained.
+    ///
+    /// # Arguments
+    /// 1. Graph.
+    /// 2. Id of the root of the subtree to duplicate.
+    ///
+    /// # Notes
+    /// + `Asset`s are duplicated.
+    #[tracing::instrument(skip(graph))]
+    pub fn duplicate(graph: &ContainerTree, root: &ResourceId) -> thot_core::Result<ContainerTree> {
+        // ensure root exists
+        let Some(node) = graph.get(root) else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist in graph",
+            )));
+        };
+
+        // duplicate container to new location
+        let mut container = Container::new(node.base_path());
+        container.properties = node.properties.clone();
+        container.scripts = node.scripts.clone();
+        for asset_base in node.assets.values() {
+            let mut asset = Asset::new(asset_base.path.clone());
+            asset.properties = asset_base.properties.clone();
+            container.insert_asset(asset);
+        }
+
+        let dup_root = container.rid.clone();
+        let mut dup_graph = ResourceTree::new(container);
+        let Some(children) = graph.children(&root).cloned() else {
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist in graph",
+            )));
+        };
+
+        for child in children {
+            let c_tree = Self::duplicate(graph, &child)?;
+            dup_graph.insert_tree(&dup_root, c_tree)?;
+        }
+
+        Ok(dup_graph)
+    }
+
+    /// Duplicates a subtree to a new file path.
+    /// Base paths of the [`Containers`] are updated.
     ///
     /// # Arguments
     /// 1. Path to duplicate the tree to.
     /// 2. Graph.
     /// 3. Id of the root of the subtree to duplicate.
+    ///
+    /// # Notes
+    /// + `Asset`s are not copied.
     #[tracing::instrument(skip(graph))]
-    pub fn duplicate_to(
+    pub fn duplicate_without_assets_to(
         path: &Path,
         graph: &ContainerTree,
         root: &ResourceId,
     ) -> Result<ContainerTree> {
         // ensure root exists
         let Some(node) = graph.get(root) else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist in graph")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist in graph",
+            ))
+            .into());
         };
 
         // duplicate container to new location
-        let mut container = ContainerBuilder::default();
-        container.container_mut().properties = node.properties.clone();
-        container.container_mut().scripts = node.scripts.clone();
-        let container = container.save(path.into())?;
+        let mut container = Container::new(path);
+        container.properties = node.properties.clone();
+        container.scripts = node.scripts.clone();
+        container.save()?;
 
         let dup_root = container.rid.clone();
         let mut dup_graph = ResourceTree::new(container);
         let Some(children) = graph.children(&root).cloned() else {
-            return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Container` does not exist in graph")).into());
+            return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+                "`Container` does not exist in graph",
+            ))
+            .into());
         };
 
         for child in children {
@@ -126,12 +178,13 @@ impl ContainerTreeDuplicator {
                 .expect("could not get child node")
                 .base_path()
                 .file_name()
-                .expect("could not get file name of `Container`");
+                .expect("could not get name of `Container`");
 
             let mut c_path = path.to_path_buf();
             c_path.push(rel_path);
+            let c_path = common::normalize_path_separators(c_path);
 
-            let c_tree = Self::duplicate_to(&c_path, graph, &child)?;
+            let c_tree = Self::duplicate_without_assets_to(&c_path, graph, &child)?;
             dup_graph.insert_tree(&dup_root, c_tree)?;
         }
 
diff --git a/local/src/graph/tree_test.rs b/local/src/graph/tree_test.rs
index 3684f832..f13bf792 100644
--- a/local/src/graph/tree_test.rs
+++ b/local/src/graph/tree_test.rs
@@ -9,13 +9,21 @@ fn container_tree_load_should_work() {
     let c1_dir = dir.mkdir().expect("could not create child dir");
     let c2_dir = dir.mkdir().expect("could not create child dir");
 
-    let rid = container::init(dir.path()).expect("could not init root `Container`");
-    let cid_1 = container::init(&c1_dir).expect("could not init child `Container`");
-    let cid_2 = container::init(&c2_dir).expect("could not init child `Container`");
+    let builder = container::InitOptions::init();
+    let rid = builder
+        .build(dir.path())
+        .expect("could not init root `Container`");
+
+    let cid_1 = builder
+        .build(&c1_dir)
+        .expect("could not init child `Container`");
+
+    let cid_2 = builder
+        .build(&c2_dir)
+        .expect("could not init child `Container`");
 
     // test
-    let graph =
-        ResourceTree::<Container>::load(dir.path()).expect("could not load `Container` tree");
+    let graph = ContainerTreeLoader::load(dir.path()).expect("could not load `Container` tree");
 
     assert_eq!(&rid, graph.root(), "incorrect root");
     assert!(
@@ -40,11 +48,13 @@ fn container_tree_load_should_work() {
 }
 
 #[test]
-fn container_tree_duplicate_should_work() {
+fn container_tree_duplicate_without_assets_to_should_work() {
     // setup
     let mut dir = TempDir::new().expect("could not create temp dir");
     let c1_dir = dir.mkdir().expect("could not create child dir");
     let c2_dir = dir.mkdir().expect("could not create child dir");
+    let dup_dir = TempDir::new().unwrap();
+    let dup_child_dir = TempDir::new().unwrap();
 
     let c1_tdir = dir
         .children
@@ -54,118 +64,90 @@ fn container_tree_duplicate_should_work() {
     let c11_dir = c1_tdir.mkdir().expect("could not create child dir");
     let c12_dir = c1_tdir.mkdir().expect("could not create child dir");
 
-    let _rid = container::init(dir.path()).expect("could not init root `Container`");
-    let cid_1 = container::init(&c1_dir).expect("could not init child `Container`");
-    let _cid_2 = container::init(&c2_dir).expect("could not init child `Container`");
-    let _cid_11 = container::init(&c11_dir).expect("could not init grandchild `Container`");
-    let _cid_12 = container::init(&c12_dir).expect("could not init grandchild `Container`");
-
-    let graph =
-        ResourceTree::<Container>::load(dir.path()).expect("could not load `Container` tree");
-
-    // test
-    let dup = graph
-        .duplicate(graph.root())
-        .expect("could not duplicate tree from root");
-
-    let root_children = dup
-        .children(graph.root())
-        .expect("could not get root children");
-
-    assert_eq!(2, root_children.len(), "incorrect number of children");
+    let builder = container::InitOptions::init();
+    let _rid = builder
+        .build(dir.path())
+        .expect("could not init root `Container`");
 
-    let c_dup = graph
-        .duplicate(&cid_1)
-        .expect("could not duplicate tree from root");
-
-    let c1_children = c_dup
-        .children(graph.root())
-        .expect("could not get root children");
+    let cid_1 = builder
+        .build(&c1_dir)
+        .expect("could not init child `Container`");
 
-    assert_eq!(2, c1_children.len(), "incorrect number of children");
-}
-
-#[test]
-fn container_tree_set_base_path_should_work() {
-    // setup
-    let mut dir = TempDir::new().expect("could not create temp dir");
-    let c1_dir = dir.mkdir().expect("could not create child dir");
-    let c2_dir = dir.mkdir().expect("could not create child dir");
-
-    let c1_tdir = dir
-        .children
-        .get_mut(&c1_dir)
-        .expect("could not get child dhirectory");
+    let _cid_2 = builder
+        .build(&c2_dir)
+        .expect("could not init child `Container`");
 
-    let c11_dir = c1_tdir.mkdir().expect("could not create child dir");
-    let c12_dir = c1_tdir.mkdir().expect("could not create child dir");
-    let c1_dir_new = dir.mkdir().expect("could not create child dir");
-    let mut c11_dir_new = c1_dir_new.clone();
-    let mut c12_dir_new = c1_dir_new.clone();
-    c11_dir_new.push(c11_dir.file_name().expect("could not get file name"));
-    c12_dir_new.push(c12_dir.file_name().expect("could not get file name"));
+    let _cid_11 = builder
+        .build(&c11_dir)
+        .expect("could not init grandchild `Container`");
 
-    let _rid = container::init(dir.path()).expect("could not init root `Container`");
-    let cid_1 = container::init(&c1_dir).expect("could not init child `Container`");
-    let cid_2 = container::init(&c2_dir).expect("could not init child `Container`");
-    let cid_11 = container::init(&c11_dir).expect("could not init grandchild `Container`");
-    let cid_12 = container::init(&c12_dir).expect("could not init grandchild `Container`");
+    let _cid_12 = builder
+        .build(&c12_dir)
+        .expect("could not init grandchild `Container`");
 
-    let mut graph =
-        ResourceTree::<Container>::load(dir.path()).expect("could not load `Container` tree");
+    let graph = ContainerTreeLoader::load(dir.path()).expect("could not load `Container` tree");
 
     // test
-    graph
-        .set_base_path(&cid_1, c1_dir_new.clone())
-        .expect("could not set new base path");
+    // root
+    let dup =
+        ContainerTreeDuplicator::duplicate_without_assets_to(dup_dir.path(), &graph, graph.root())
+            .expect("could not duplicate tree from root");
 
-    assert_eq!(
-        dir.path(),
-        &graph
-            .get(graph.root())
-            .expect("could not get graph root")
-            .base_path()
-            .expect("base path not set"),
-        "root path should not change"
-    );
+    let root_children = dup
+        .children(dup.root())
+        .expect("could not get root children");
 
     assert_eq!(
-        c1_dir,
-        graph
-            .get(&cid_1)
-            .expect("could not get `Container`")
-            .base_path()
-            .expect("base path not set"),
-        "child dir path should be changed"
+        graph.children(graph.root()).unwrap().len(),
+        root_children.len(),
+        "incorrect number of children"
     );
 
     assert_eq!(
-        c2_dir,
-        graph
-            .get(&cid_2)
-            .expect("could not get `Container`")
-            .base_path()
-            .expect("base path not set"),
-        "child dir path should not be changed"
+        graph.get(graph.root()).unwrap().properties.name,
+        dup.get(dup.root()).unwrap().properties.name
     );
 
-    assert_eq!(
-        c11_dir_new,
-        graph
-            .get(&cid_11)
-            .expect("could not get `Container`")
-            .base_path()
-            .expect("base path not set"),
-        "grandchild dir path should be changed"
-    );
+    let mut c_names = child_names(graph.root(), &graph);
+    let mut cdup_names = child_names(dup.root(), &dup);
+    c_names.sort();
+    cdup_names.sort();
+    assert_eq!(c_names, cdup_names);
+
+    // child
+    let c_dup =
+        ContainerTreeDuplicator::duplicate_without_assets_to(dup_child_dir.path(), &graph, &cid_1)
+            .expect("could not duplicate tree from root");
+
+    let c1_children = c_dup
+        .children(c_dup.root())
+        .expect("could not get root children");
 
     assert_eq!(
-        c12_dir,
-        graph
-            .get(&cid_12)
-            .expect("could not get `Container`")
-            .base_path()
-            .expect("base path not set"),
-        "grandchild dir path should be changed"
+        graph.children(&cid_1).unwrap().len(),
+        c1_children.len(),
+        "incorrect number of children"
     );
+
+    let mut c_names = child_names(&cid_1, &graph);
+    let mut cdup_names = child_names(c_dup.root(), &c_dup);
+    c_names.sort();
+    cdup_names.sort();
+    assert_eq!(c_names, cdup_names);
+}
+
+// ***************
+// *** helpers ***
+// ***************
+
+fn child_names(parent: &ResourceId, graph: &ContainerTree) -> Vec<String> {
+    graph
+        .children(parent)
+        .unwrap()
+        .iter()
+        .map(|cid| {
+            let child = graph.get(cid).unwrap();
+            child.properties.name.clone()
+        })
+        .collect()
 }
diff --git a/local/src/identifier.rs b/local/src/identifier.rs
index 14e4cb3c..94b3a097 100644
--- a/local/src/identifier.rs
+++ b/local/src/identifier.rs
@@ -3,6 +3,6 @@ pub struct Identifier;
 
 impl Identifier {
     pub fn application() -> String {
-        String::from("local")
+        String::from("thot-local")
     }
 }
diff --git a/local/src/lib.rs b/local/src/lib.rs
index b651a2fb..24bcf3ab 100644
--- a/local/src/lib.rs
+++ b/local/src/lib.rs
@@ -6,17 +6,18 @@
 pub mod common;
 pub mod constants;
 pub mod error;
-pub mod project;
+pub mod identifier;
 pub mod system;
 pub mod types;
-pub mod identifier;
+
+#[cfg(feature = "fs")]
+pub mod project;
 
 #[cfg(feature = "fs")]
 pub mod graph;
 
-#[cfg(test)]
-#[path = "./lib_test.rs"]
-mod lib_test;
+#[cfg(feature = "fs")]
+pub mod file_resource;
 
 // Re-exports
 pub use error::{Error, Result};
diff --git a/local/src/lib_test.rs b/local/src/lib_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/asset.rs b/local/src/project/asset.rs
index 3860dd4f..db28b171 100644
--- a/local/src/project/asset.rs
+++ b/local/src/project/asset.rs
@@ -4,7 +4,6 @@ use super::resources::asset::{Asset as LocalAsset, Assets};
 use crate::error::AssetError;
 use crate::types::AssetFileAction;
 use crate::{common, Error, Result};
-use settings_manager::{local_settings::Loader, Settings};
 use std::path::{Path, PathBuf};
 use std::{fs, io};
 use thot_core::project::Asset as CoreAsset;
@@ -100,7 +99,11 @@ impl AssetBuilder {
         // calculate paths
         let mut rel_path = self.bucket.clone().unwrap_or(PathBuf::new());
         let Some(file_name) = self.path.file_name() else {
-            return Err(AssetError::InvalidPath(self.path.clone(), "could not get file name".to_string()).into());
+            return Err(AssetError::InvalidPath(
+                self.path.clone(),
+                "could not get file name".to_string(),
+            )
+            .into());
         };
 
         rel_path.push(file_name);
@@ -198,8 +201,8 @@ impl AssetBuilder {
 
         // insert asset
         let container = self.container_path()?;
-        let mut assets: Assets = Loader::load_or_create::<Assets>(container)?.into();
-        assets.insert(asset.rid.clone(), asset);
+        let mut assets = Assets::load_from(container)?;
+        assets.insert(asset);
         assets.save()?;
         Ok(rid)
     }
@@ -262,8 +265,8 @@ impl AssetBuilder {
 
         // insert asset
         let container = self.container_path()?;
-        let mut assets: Assets = Loader::load_or_create::<Assets>(container)?.into();
-        assets.insert(asset.rid.clone(), asset.clone());
+        let mut assets = Assets::load_from(container)?;
+        assets.insert(asset.clone());
         assets.save()?;
 
         Ok(asset)
@@ -319,8 +322,8 @@ pub fn init(path: &Path, container: Option<&Path>) -> Result<ResourceId> {
     let rid = asset.rid.clone();
 
     // insert asset
-    let mut assets: Assets = Loader::load_or_create::<Assets>(container)?.into();
-    assets.insert(asset.rid.clone(), asset);
+    let mut assets = Assets::load_from(container)?;
+    assets.insert(asset);
     assets.save()?;
     Ok(rid)
 }
@@ -352,7 +355,8 @@ pub fn path_is_asset(path: &Path, container: &Path) -> bool {
     todo!();
 }
 
-/// Moves up the path until the first Container is reached.
+// TODO Return `Option` instead of `Result`.
+/// Moves up the path until the first `Container` is reached.
 pub fn container_from_path_ancestor(path: &Path) -> Result<PathBuf> {
     match path.ancestors().find(|p| path_is_container(p)) {
         None => {
diff --git a/local/src/project/asset_test.rs b/local/src/project/asset_test.rs
index 6b97ec1a..f1ad4b26 100644
--- a/local/src/project/asset_test.rs
+++ b/local/src/project/asset_test.rs
@@ -5,7 +5,6 @@ use dev_utils::fs::TempDir;
 use fake::faker::filesystem::raw::{FileName, FilePath};
 use fake::locales::EN;
 use fake::Fake;
-use std::fs;
 use std::path::PathBuf;
 
 // ********************
@@ -16,7 +15,10 @@ use std::path::PathBuf;
 fn asset_builder_container_path_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not initialize new `TempDir`");
-    container::init(_dir.path()).expect("could not init dir as `Container`");
+    let builder = container::InitOptions::init();
+    builder
+        .build(_dir.path())
+        .expect("could not init dir as `Container`");
 
     let mut path = _dir.path().to_path_buf();
     path.push(FileName(EN).fake::<String>());
@@ -66,7 +68,10 @@ fn asset_builder_container_path_with_invalid_container_set_should_error() {
 fn asset_builder_tentative_final_path_with_file_in_correct_location_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not initialize new `TempDir`");
-    container::init(_dir.path()).expect("could not init dir as `Container`");
+    let builder = container::InitOptions::init();
+    builder
+        .build(_dir.path())
+        .expect("could not init dir as `Container`");
 
     // test
     // container unset, bucket unset
@@ -75,7 +80,7 @@ fn asset_builder_tentative_final_path_with_file_in_correct_location_should_work(
     let file_name = PathBuf::from(FileName(EN).fake::<String>());
     path.push(file_name.clone());
 
-    let mut asset = AssetBuilder::new(path.clone());
+    let asset = AssetBuilder::new(path.clone());
 
     let final_path = asset
         .tentative_final_path(AssetFileAction::Copy)
@@ -91,7 +96,10 @@ fn asset_builder_tentative_final_path_with_file_in_correct_location_should_work(
 fn asset_builder_tentative_final_path_with_bucket_unset_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not initialize new `TempDir`");
-    container::init(_dir.path()).expect("could not init dir as `Container`");
+    let builder = container::InitOptions::init();
+    builder
+        .build(_dir.path())
+        .expect("could not init dir as `Container`");
 
     let path = PathBuf::from(FilePath(EN).fake::<String>());
     let file_name = path.file_name().expect("invalid file name");
@@ -144,7 +152,10 @@ fn asset_builder_tentative_final_path_with_bucket_unset_should_work() {
 fn asset_builder_tentative_final_path_with_bucket_set_should_work() {
     // setup
     let _dir = TempDir::new().expect("could not initialize new `TempDir`");
-    container::init(_dir.path()).expect("could not init dir as `Container`");
+    let builder = container::InitOptions::init();
+    builder
+        .build(_dir.path())
+        .expect("could not init dir as `Container`");
 
     let path = PathBuf::from(FilePath(EN).fake::<String>());
     let file_name = path.file_name().expect("invalid file name");
@@ -229,52 +240,14 @@ fn asset_builder_create_reference_should_work() {
 // *****************
 
 #[test]
-fn init_with_default_container_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let _cid = container::init(_dir.path()).expect("init container should work");
-    let file_path = _dir.path().join(FileName(EN).fake::<String>());
-
-    // test
-    let _rid = init(&file_path, None).expect("init should work");
-}
-
-#[test]
-fn init_with_provided_container_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let _cid = container::init(_dir.path()).expect("init container should work");
-    let file_path = PathBuf::from(FileName(EN).fake::<String>());
-
-    // test
-    let _rid = init(&file_path, Some(_dir.path())).expect("init should work");
-}
-
-#[test]
-#[should_panic(expected = "InvalidFilename")]
-fn init_should_error_if_path_is_invalid() {
-    todo!("may not be a reachable condition");
-    //     let file_name = FileName(EN).fake::<String>();
-    //     let file_name = Path::new(&file_name);
-    //     init(file_name, None).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "PathNotAContainer")]
-fn init_with_container_set_as_invalid_should_error() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let file_path = _dir.path().join(FileName(EN).fake::<String>());
-    let _file = fs::File::create(&file_path).expect("create file should work");
-
-    // test
-    init(&file_path, Some(&_dir.path())).unwrap();
-}
-
 fn container_from_path_ancestor_should_work() {
     // setup
     let mut _dir = TempDir::new().expect("setup should work");
-    let _cid = container::init(_dir.path()).expect("init container should work");
+    let builder = container::InitOptions::init();
+    let _cid = builder
+        .build(_dir.path())
+        .expect("init container should work");
+
     let c_dir = _dir.mkdir().expect("creating child directory should work");
     let a_path = c_dir.join(FileName(EN).fake::<String>());
 
diff --git a/local/src/project/container.rs b/local/src/project/container.rs
index 38b7c6b4..885d54b5 100644
--- a/local/src/project/container.rs
+++ b/local/src/project/container.rs
@@ -1,84 +1,304 @@
 //! High level functionality related to Containers.
 use super::project;
-use super::resources::container::{Container, Loader};
-use crate::common::{container_file_of, thot_dir_of};
-use crate::error::ContainerError;
-use crate::{Error, Result};
-use std::path::{Path, PathBuf};
+use super::resources::Container;
+use crate::common::{container_file_of, thot_dir};
+use crate::Result;
+use std::path::{self, Path, PathBuf};
 use std::{fs, io};
-use thot_core::project::Container as CoreContainer;
-use thot_core::types::ResourceId;
+use thot_core::error::{Error as CoreError, ResourceError};
+use thot_core::project::{Asset, ContainerProperties};
+use thot_core::types::{ResourceId, ResourcePath};
 
-/// Create a new Container, returning the [`ResourceId`].
-/// Creates directories as needed.
-///
-/// # Errors
-/// + [`io::ErrorKind::IsADirectory`]: A directory at the given path already exists.
-///
-/// # See also
-/// + [`init`]
-pub fn new(path: &Path) -> Result<ResourceId> {
-    if path.exists() {
-        return Err(io::Error::new(io::ErrorKind::IsADirectory, "path already exists").into());
+// ***************
+// *** Builder ***
+// ***************
+
+#[derive(Default)]
+pub struct InitNew {
+    properties: Option<ContainerProperties>,
+}
+
+impl InitNew {
+    pub fn properties(&self) -> Option<&ContainerProperties> {
+        self.properties.as_ref()
     }
 
-    fs::create_dir_all(path)?;
-    init(path)
+    pub fn set_properties(&mut self, properties: ContainerProperties) {
+        self.properties = Some(properties);
+    }
+
+    pub fn unset_properties(&mut self) {
+        self.properties = None;
+    }
 }
 
-/// Initialize folder as a [`Container`](CoreContainer).
-///
-/// # Errors
-/// + [`io::ErrorKind::NotADirectory`]: The given path does not exist.
-///
-/// # See also
-/// + [`init_from`]
-pub fn init(path: &Path) -> Result<ResourceId> {
-    if !path.exists() {
-        return Err(io::Error::new(io::ErrorKind::NotADirectory, "path does not exist").into());
-    }
-
-    // check if path is already a resource
-    if project::path_is_resource(path) {
-        if path_is_container(path) {
-            // path is already a container
-            // return resource id
-            let container: Container = Loader::load_or_create(path.to_path_buf())?.into();
-            return Ok(container.rid.clone());
-        }
-    } else {
-        // path is not a thot resource,
-        // initialize as resource
-        let thot_dir = thot_dir_of(path);
-        fs::create_dir(&thot_dir)?;
+#[derive(Default)]
+pub struct InitExisting {
+    recursive: bool,
+
+    /// glob patterns to ignore.
+    ignore: Vec<String>,
+}
+
+impl InitExisting {
+    pub fn set_recursive(&mut self, recursive: bool) {
+        self.recursive = recursive;
     }
 
-    // initialize container
-    // assets included
-    let mut container: Container = Loader::load_or_create(path.to_path_buf())?.into();
-    container.save()?;
+    pub fn ignored(&self) -> &Vec<String> {
+        &self.ignore
+    }
 
-    Ok(container.rid.clone())
+    pub fn ignore(&mut self, pattern: impl Into<String>) {
+        self.ignore.push(pattern.into());
+    }
 }
 
-/// Initializes folder as a [`Container`](CoreContainer)
-/// with initial values.
-///
-/// # See also
-/// + [`init`]
-pub fn init_from(path: &Path, container: CoreContainer) -> Result {
-    init(path)?;
-    let mut cont: Container = Loader::load_or_create(path.into())?.into();
+#[derive(Default)]
+pub struct InitOptions<I> {
+    init: I,
+    init_assets: bool,
+}
+
+impl<I> InitOptions<I> {
+    /// Initialize files as `Asset`s.
+    pub fn with_assets(&mut self) {
+        self.init_assets = true;
+    }
+
+    /// Do not initialize files as `Asset`s.
+    pub fn without_assets(&mut self) {
+        self.init_assets = false;
+    }
+}
+
+impl InitOptions<InitNew> {
+    /// Create a new folder as a `Container``.
+    pub fn new() -> Self {
+        InitOptions::default()
+    }
+
+    /// Use the given properties to initialize the `Container`.
+    ///
+    /// # Notes
+    /// + `name` is ignored and will be replaced by the folder's name.
+    pub fn properties(&mut self, properties: ContainerProperties) {
+        self.init.set_properties(properties);
+    }
+
+    /// Clears proeprties to set from.
+    pub fn unset_properties(&mut self) {
+        self.init.unset_properties();
+    }
+
+    /// Run the intialization.
+    ///
+    /// # Returns
+    /// [`ResourceId`] of the [`Container`](CoreContainer).
+    pub fn build(&self, path: impl AsRef<Path>) -> Result<ResourceId> {
+        let path = path.as_ref();
+        if path.exists() && project::path_is_resource(path) {
+            return Err(CoreError::ResourceError(ResourceError::already_exists(
+                "path is already a resource",
+            ))
+            .into());
+        }
+
+        let mut container = Container::new(path);
+        if let Some(properties) = self.init.properties() {
+            container.properties = properties.clone();
+        }
+
+        container.properties.name = container
+            .base_path()
+            .file_name()
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .to_string();
+
+        if self.init_assets {
+            for entry in fs::read_dir(container.base_path()).unwrap() {
+                let entry = entry.unwrap();
+                let entry_path = entry.path();
+                if entry_path.is_file() {
+                    let asset = Asset::new(ResourcePath::new(entry_path)?);
+                    container.insert_asset(asset);
+                }
+            }
+        }
+
+        container.save()?;
+        Ok(container.rid.clone())
+    }
+}
+
+impl InitOptions<InitExisting> {
+    /// Initialize an existing folder or folder tree as a `Container`.
+    pub fn init() -> Self {
+        InitOptions::default()
+    }
 
-    *cont = container;
-    cont.save()?;
+    /// Set whether to recurse into subfolders.
+    pub fn recurse(&mut self, recursive: bool) {
+        self.init.set_recursive(recursive);
+    }
+
+    /// Ignore a path and it's subfolders when recursing.
+    /// Ignored if `recurse` is `false`.
+    ///
+    /// # Arguments
+    /// + `pattern`: A glob pattern to ignore, relative to the
+    /// `Container` graph root.
+    pub fn ignore(&mut self, pattern: impl Into<String>) {
+        self.init.ignore(pattern);
+    }
+
+    /// Run the intialization.
+    ///
+    /// # Returns
+    /// [`ResourceId`] of the root [`Container`](CoreContainer).
+    ///
+    /// # Errors
+    /// + If a path is already a resource but can not be loaded as a Container.
+    ///
+    /// # Notes
+    /// + If `path` is already initialized as a `Container` it is re-initialized,
+    /// with all properties being maintained, but `Asset`s being updated.
+    ///  - If `recurse` is `true`, this applies for folders within the subtree, too.
+    ///
+    /// + `Container` name will be updated to match the folder.
+    pub fn build(&self, path: impl AsRef<Path>) -> Result<ResourceId> {
+        /// Initialize a path as a Container.
+        /// Used to recurse.
+        ///
+        /// # Arguments
+        /// + `ignore`: Absolute paths to ignore.
+        /// Ignored if `recurse` is `false`.
+        fn init_container(
+            path: impl AsRef<Path>,
+            init_assets: bool,
+            recurse: bool,
+            ignore: &Vec<PathBuf>,
+        ) -> Result<ResourceId> {
+            let path = path.as_ref();
+            // TODO What if path is a project?
+            let mut container = if path_is_container(path) {
+                Container::load_from(path)?
+            } else {
+                Container::new(path)
+            };
+
+            container.properties.name = container
+                .base_path()
+                .file_name()
+                .unwrap()
+                .to_str()
+                .unwrap()
+                .to_string();
+
+            let mut dirs = Vec::new();
+            let mut files = Vec::new();
+            for entry in fs::read_dir(container.base_path()).unwrap() {
+                let entry = entry.unwrap();
+                let entry_path = entry.path();
+                if entry_path.is_file() {
+                    files.push(entry_path);
+                } else if entry_path.is_dir() {
+                    if entry_path.components().any(|seg| match seg {
+                        path::Component::Normal(seg) => seg == thot_dir(),
+                        _ => false,
+                    }) {
+                        continue;
+                    }
+
+                    dirs.push(entry_path);
+                }
+            }
+
+            let container_path = fs::canonicalize(container.base_path()).unwrap();
+            let asset_paths = container
+                .assets
+                .values()
+                .map(|asset| {
+                    let asset_path = container.base_path().join(asset.path.as_path());
+                    fs::canonicalize(asset_path).unwrap()
+                })
+                .collect::<Vec<_>>();
+
+            if init_assets {
+                for file_path in files {
+                    let file_path = fs::canonicalize(file_path).unwrap();
+                    if asset_paths.contains(&file_path) {
+                        continue;
+                    }
+
+                    let rel_path = file_path
+                        .strip_prefix(&container_path)
+                        .unwrap()
+                        .to_path_buf();
+
+                    let asset = Asset::new(ResourcePath::new(rel_path)?);
+                    container.insert_asset(asset);
+                }
+            }
+            container.save()?;
+
+            if recurse {
+                for dir_path in dirs.into_iter().filter(|path| !ignore.contains(path)) {
+                    init_container(dir_path, init_assets, recurse, ignore)?;
+                }
+            }
+
+            Ok(container.rid.clone())
+        }
+
+        // main
+        let path = path.as_ref();
+        if !path.exists() {
+            return Err(io::Error::new(io::ErrorKind::NotADirectory, "path does not exist").into());
+        }
+
+        let ignore = self
+            .init
+            .ignored()
+            .iter()
+            .map(|pattern| {
+                let pattern = path.join(pattern).to_str().unwrap().to_string();
+                let mut match_options = glob::MatchOptions::new();
+                match_options.case_sensitive = false;
+
+                glob::glob_with(&pattern, match_options)
+                    .unwrap()
+                    .map(|path| PathBuf::from(path.unwrap()))
+                    .collect::<Vec<_>>()
+            })
+            .flatten()
+            .collect();
+
+        init_container(path, self.init_assets, self.init.recursive, &ignore)
+    }
+}
+
+// *****************
+// *** Functions ***
+// *****************
 
-    Ok(())
+/// Convenience function to create a new folder as a `Container`.
+///
+/// Equivalent to
+/// ```
+/// let builder = InitOptions::new();
+/// builder.build(path)?;
+/// ```
+pub fn new(path: impl AsRef<Path>) -> Result<ResourceId> {
+    let builder = InitOptions::new();
+    builder.build(path.as_ref())
 }
 
 /// Move a Container, including all its resources (children, assets, settings,
 /// etc.) a to a new location.
-pub fn mv(rid: ResourceId, to: &Path) -> Result {
+pub fn mv(rid: ResourceId, to: impl AsRef<Path>) -> Result {
     todo!();
 }
 
@@ -114,85 +334,6 @@ pub fn path_is_container(path: &Path) -> bool {
     c_path.exists()
 }
 
-/// Initialize an existing folder as a child.
-/// Initializes the child folder as a Container, then registers it with its parent as a child.
-///
-/// # Arguments
-/// + `child`: Path to the child directory.
-/// + `container`: Path to the parent Container, or None to use the child's parent directory.
-///
-/// # Errors
-/// + If `child` is not a child of the `container` directory.
-///
-/// # Notes
-/// + Currently `child` must be a child of the `container` directory.
-///     Both are provided for future proofing if children are ever allowed to
-///     not be children of their parent Container's directory.
-///
-/// # See also
-/// + `new_child`
-pub fn init_child(child: &Path, container: Option<&Path>) -> Result<ResourceId> {
-    // check child is valid
-    if !child.is_dir() {
-        return Err(io::Error::new(
-            io::ErrorKind::NotADirectory,
-            "child path is not a directory",
-        )
-        .into());
-    }
-
-    let parent = match child.parent() {
-        Some(p) => p,
-        None => {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidFilename,
-                "invalid path for container",
-            )
-            .into())
-        }
-    };
-
-    let container = match container {
-        None => parent,
-        Some(p) => p,
-    };
-
-    // ensure container and parent are the same
-    // can be removed if restriction is lifted
-    if parent != container {
-        return Err(Error::ContainerError(ContainerError::InvalidChildPath(
-            PathBuf::from(child),
-        )));
-    }
-
-    if !path_is_container(container) {
-        return Err(Error::ContainerError(ContainerError::PathNotAContainer(
-            PathBuf::from(container),
-        )));
-    }
-
-    // init and register
-    let rid = init(child)?;
-    let mut container: Container = Loader::load_or_create(container.to_path_buf())?.into();
-    container.save()?;
-
-    Ok(rid)
-}
-
-/// Create a new folder at the given path, initialize it as a [`Container`],
-/// and add it as a child to the given parent.
-///
-/// # Arguments
-/// + `child`: Path to the child directory.
-/// + `container`: Path to the parent `Container`, or `None` to use the child's parent directory.
-///
-/// # See also
-/// + `init_child`
-pub fn new_child(child: &Path, container: Option<&Path>) -> Result<ResourceId> {
-    fs::create_dir(child)?;
-    init_child(child, container)
-}
-
 #[cfg(test)]
 #[path = "./container_test.rs"]
 mod container_test;
diff --git a/local/src/project/container_test.rs b/local/src/project/container_test.rs
index 00b47ae0..a3c76de1 100644
--- a/local/src/project/container_test.rs
+++ b/local/src/project/container_test.rs
@@ -1,222 +1,131 @@
 use super::*;
-use crate::common::thot_dir_of;
-use crate::constants::{ASSETS_FILE, CONTAINER_FILE, CONTAINER_SETTINGS_FILE, THOT_DIR};
-use crate::project::resources::{Assets, Container};
+use crate::common;
+use crate::project::resources::Container;
 use dev_utils::fs::TempDir;
-use fake::faker::filesystem::raw::FileName;
 use fake::faker::lorem::raw::Words;
 use fake::locales::EN;
 use fake::Fake;
-use serde_json;
 use std::fs;
-use thot_core::project::Container as CoreContainer;
 
 #[test]
-fn init_on_non_resource_should_work() {
+fn builder_init_no_assets_no_recurse_on_non_resource_should_work() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
     let root = _dir.path().join("container");
     fs::create_dir(&root).expect("create directory should work");
 
     // test
-    init(root.as_path()).expect("init should work");
+    let builder = InitOptions::init();
+    builder.build(root.as_path()).unwrap();
 
     // check .thot folder created
-    let mut thot_dir = root.clone();
-    thot_dir.push(THOT_DIR);
-    assert!(thot_dir.exists(), ".thot folder should exist");
+    assert!(
+        common::thot_dir_of(&root).exists(),
+        ".thot folder should exist"
+    );
 
     // check files exist and are empty
-    let files = vec![CONTAINER_FILE, CONTAINER_SETTINGS_FILE, ASSETS_FILE];
-    for f in files {
-        let p = thot_dir.join(f);
-        assert!(p.exists(), "{} file should exist", f);
-    }
-
-    // ensure assets are empty
-    let assets_path = thot_dir.join(ASSETS_FILE);
-    let assets_json = fs::read_to_string(assets_path).expect("assets file should be readable");
-    let assets: Assets =
-        serde_json::from_str(assets_json.as_str()).expect("assets should be valid json");
-
-    assert_eq!(0, assets.len(), "assets not empty");
-
-    // ensure container info is correct
-    let container_path = thot_dir.join(CONTAINER_FILE);
-    let container_json =
-        fs::read_to_string(container_path).expect("container file should be readable");
-    let container: Container =
-        serde_json::from_str(container_json.as_str()).expect("container should be valid json");
-
-    assert_eq!(0, container.assets.len(), "assets should be empty");
-    assert_eq!(0, container.scripts.len(), "scripts should be empty");
-}
-
-#[test]
-fn init_should_return_resource_id_if_already_a_container() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let rid = init(_dir.path()).expect("init should work");
-
-    // test
-    let found_rid = init(_dir.path()).expect("init should return old resource id");
-    assert_eq!(rid, found_rid, "resource ids should match");
-}
-
-#[test]
-fn init_should_work_if_folder_is_a_thot_resource_but_not_a_container() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    fs::create_dir(thot_dir_of(_dir.path())).expect("creating thot directory should work");
-
-    // test
-    init(_dir.path()).expect("init should work");
-}
-
-#[test]
-#[should_panic(expected = "NotADirectory")]
-fn init_should_error_if_folder_does_not_exist() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let path = _dir.path().join("root");
-
-    // test
-    init(path.as_path()).unwrap();
-}
+    assert!(
+        common::container_file_of(&root).exists(),
+        "container file should exist"
+    );
 
-#[test]
-fn init_from_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let mut container = CoreContainer::default();
+    assert!(
+        common::container_settings_file_of(&root).exists(),
+        "container settings file should exist"
+    );
 
-    let name: Vec<String> = Words(EN, 3..5).fake();
-    let name = name.join(" ");
-    container.properties.name = Some(name);
+    assert!(
+        common::assets_file_of(&root).exists(),
+        "assets file should exist"
+    );
 
-    // test
-    init_from(_dir.path(), container.clone()).expect("`init_from` should work");
-    let c = Container::load(_dir.path()).expect("could not load `Container`");
-    assert_eq!(container.rid, c.rid, "`rid` does not match");
+    // ensure container is correct
+    let container = Container::load_from(&root).unwrap();
     assert_eq!(
-        container.properties, c.properties,
-        "`properties` do not match"
+        root.file_name().unwrap().to_str().unwrap(),
+        container.properties.name,
+        "container's name should match folder"
     );
-    // @todo: Ensure `children`, `assets`, and `scripts` match.
-}
 
-#[test]
-fn new_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-
-    // test
-    let c_path = _dir.path().join("container");
-    new(c_path.as_path()).expect("new should work");
+    assert!(
+        container.assets.is_empty(),
+        "container should not have assets"
+    );
 }
 
 #[test]
-#[should_panic(expected = "IsADirectory")]
-fn new_should_error_if_path_already_exists() {
+fn builder_init_should_return_resource_id_if_already_a_container() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
 
-    // test
-    new(_dir.path()).unwrap();
-}
-
-#[test]
-fn init_child_with_default_container_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let child = child_dir(_dir.path());
-    fs::create_dir(&child).expect("creating child folder should work");
-    init(_dir.path()).expect("init parent should work");
+    let builder = InitOptions::init();
+    let rid = builder.build(_dir.path()).expect("init should work");
 
     // test
-    init_child(&child, None).expect("init as child should work");
-}
+    let found_rid = builder
+        .build(_dir.path())
+        .expect("init should return old resource id");
 
-#[test]
-fn init_child_with_specified_container_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let child = child_dir(_dir.path());
-    fs::create_dir(&child).expect("creating child folder should work");
-    init(_dir.path()).expect("init parent should work");
-
-    // test
-    init_child(&child, Some(_dir.path())).expect("init as child should work");
+    assert_eq!(rid, found_rid, "resource ids should match");
 }
 
 #[test]
-#[should_panic(expected = "NotAContainer")]
-fn init_child_should_error_if_parent_is_not_a_container() {
+#[should_panic]
+fn builder_init_if_folder_is_a_thot_resource_but_not_a_container_should_error() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let child = child_dir(_dir.path());
-    fs::create_dir(&child).expect("creating child folder should work");
+    fs::create_dir(common::thot_dir_of(_dir.path())).expect("creating thot directory should work");
 
     // test
-    init_child(&child, None).unwrap();
+    let builder = InitOptions::init();
+    builder.build(_dir.path()).expect("init should work");
 }
 
 #[test]
 #[should_panic(expected = "NotADirectory")]
-fn init_child_should_error_if_path_does_not_exist() {
+fn builder_init_should_error_if_folder_does_not_exist() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let child = child_dir(_dir.path());
-    init(_dir.path()).expect("init parent should work");
-
-    // test
-    init_child(&child, None).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "InvalidChildPath")]
-fn init_child_should_error_if_child_is_not_a_child_folder_of_parent() {
-    // setup
-    let _dir = TempDir::new().expect("`TempDir::new` should work");
-    let child = child_dir(&child_dir(_dir.path()));
-
-    fs::create_dir_all(&child).expect("create child folder should work");
-    init(_dir.path()).expect("init parent should work");
+    let path = _dir.path().join("root");
 
     // test
-    init_child(&child, Some(_dir.path())).unwrap();
+    let builder = InitOptions::init();
+    builder.build(path.as_path()).unwrap();
 }
 
 #[test]
-fn new_child_with_default_container_should_work() {
+fn builder_new_should_work() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
-    init(_dir.path()).expect("init parent should work");
-    let child = child_dir(_dir.path());
 
     // test
-    let _rid = new_child(&child, None).expect("new child should work");
+    let c_path = _dir.path().join("container");
+    let builder = InitOptions::new();
+    builder.build(c_path.as_path()).expect("new should work");
 }
 
 #[test]
-fn new_child_with_specified_container_should_work() {
+fn builder_new_with_properties_should_work() {
     // setup
     let _dir = TempDir::new().expect("`TempDir::new` should work");
-    init(_dir.path()).expect("init parent should work");
-    let child = child_dir(_dir.path());
+    let name: Vec<String> = Words(EN, 3..5).fake();
+    let name = name.join(" ");
+    let kind: Vec<String> = Words(EN, 3..5).fake();
+    let kind = kind.join(" ");
+    let mut properties = ContainerProperties::new(name);
+    properties.kind = Some(kind);
 
     // test
-    let _rid = new_child(&child, Some(_dir.path())).expect("new child should work");
-}
+    let mut builder = InitOptions::new();
+    builder.properties(properties.clone());
+    builder.build(_dir.path()).expect("`init_from` should work");
 
-// ************************
-// *** helper functions ***
-// ************************
-
-/// Create a child directory path.
-fn child_dir(parent: &Path) -> PathBuf {
-    let mut child = FileName(EN).fake::<String>();
-    child.retain(|char| char != '.');
-
-    parent.join(child)
+    let c = Container::load_from(_dir.path()).expect("could not load `Container`");
+    assert_eq!(properties.kind, c.properties.kind, "`kind`s do not match");
+    assert_eq!(
+        _dir.path().file_name().unwrap().to_str().unwrap(),
+        c.properties.name,
+        "name should be changed to folder"
+    );
 }
diff --git a/local/src/project/mod.rs b/local/src/project/mod.rs
index 26aab544..9afbc5c2 100644
--- a/local/src/project/mod.rs
+++ b/local/src/project/mod.rs
@@ -5,22 +5,181 @@
 //! + Containers
 //! + Assets
 //! + Script Associations
-pub mod types;
-
-#[cfg(feature = "fs")]
 pub mod asset;
-
-#[cfg(feature = "fs")]
 pub mod container;
-
-#[cfg(feature = "fs")]
 pub mod project;
-
-#[cfg(feature = "fs")]
 pub mod resources;
-
-#[cfg(feature = "fs")]
 pub mod script;
 
 /// Current project format version.
 pub static PROJECT_FORMAT_VERSION: &str = "0.10.0";
+
+// *****************
+// *** functions ***
+// *****************
+
+use crate::common;
+use crate::error::{Error, ProjectError, Result};
+use crate::system::projects;
+use resources::Project;
+use std::path::{Component, Path};
+use std::{fs, io};
+use thot_core::project::{Script, ScriptLang};
+use thot_core::types::{ResourceId, ResourcePath};
+
+pub fn init(
+    root: impl AsRef<Path>,
+    data_root: impl AsRef<Path>,
+    analysis_root: impl AsRef<Path>,
+) -> Result<ResourceId> {
+    let root = root.as_ref();
+    let data_root = data_root.as_ref();
+    let analysis_root = analysis_root.as_ref();
+
+    let root = fs::canonicalize(&root)?;
+    if !data_root.is_relative() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidFilename,
+            "data root path must be relative",
+        )
+        .into());
+    }
+
+    if !analysis_root.is_relative() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidFilename,
+            "analysis root path must be relative",
+        )
+        .into());
+    }
+
+    if data_root
+        .components()
+        .any(|comp| comp == Component::ParentDir)
+    {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidFilename,
+            "data root path may not containe parent directory references (e.g. `..`)",
+        )
+        .into());
+    }
+
+    if analysis_root
+        .components()
+        .any(|comp| comp == Component::ParentDir)
+    {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidFilename,
+            "analysis root path may not contain parent directory references (e.g. `..`)",
+        )
+        .into());
+    }
+
+    // create and register project
+    let pid = match project::project_id(root.as_path())? {
+        Some(id) => id,
+        None => match project::init(root.as_path()) {
+            Ok(rid) => {
+                let mut project = Project::load_from(root.as_path())?;
+                project.data_root = Some(data_root.to_path_buf());
+                project.analysis_root = Some(analysis_root.to_path_buf());
+                project.save()?;
+                rid
+            }
+            Err(Error::ProjectError(ProjectError::PathNotRegistered(_path))) => {
+                let project = Project::load_from(&root)?;
+                projects::register_project(project.rid.clone(), root.clone())?;
+                project.rid.clone()
+            }
+            Err(err) => return Err(err),
+        },
+    };
+
+    // initialize analysis scripts
+    let data_root = root.join(data_root);
+    let analysis_root = root.join(analysis_root);
+
+    let mv_analysis = analysis_root.exists();
+    fs::create_dir_all(&analysis_root)?;
+    let analysis_root = fs::canonicalize(analysis_root)?;
+    if !analysis_root.is_dir() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidFilename,
+            "analysis root must be a directory",
+        )
+        .into());
+    }
+
+    if mv_analysis {
+        for lang_ext in ScriptLang::supported_extensions() {
+            let mut ext_pattern = root.join("**").join("*");
+            ext_pattern.set_extension(lang_ext);
+
+            let mut match_options = glob::MatchOptions::new();
+            match_options.case_sensitive = false;
+
+            for entry in glob::glob_with(ext_pattern.to_str().unwrap(), match_options).unwrap() {
+                let script_path = match entry {
+                    Ok(path) => path,
+                    Err(err) => return Err(err.into_error().into()),
+                };
+
+                let to = script_path.strip_prefix(&root).unwrap();
+                let to = analysis_root.join(to);
+                fs::rename(script_path, to)?;
+            }
+        }
+    }
+
+    let mut scripts = resources::Scripts::load_from(&root)?;
+    for entry in fs::read_dir(&analysis_root)? {
+        let entry = entry?;
+        let script_path = fs::canonicalize(entry.path())?;
+        let script_path = script_path.strip_prefix(&analysis_root).unwrap();
+        let script_path = ResourcePath::new(script_path.to_path_buf())?;
+        if scripts.contains_path(&script_path) {
+            continue;
+        }
+
+        let Ok(script) = Script::new(script_path) else {
+            continue;
+        };
+
+        scripts.insert_script(script)?;
+    }
+    scripts.save()?;
+
+    // initialize container graph
+    let mv_data = !data_root.exists();
+    fs::create_dir_all(&data_root)?;
+    let data_root = fs::canonicalize(data_root)?;
+    if mv_data {
+        for entry in fs::read_dir(&root)? {
+            let entry = entry?;
+            let entry_path = fs::canonicalize(entry.path())?;
+            if entry_path == analysis_root
+                || entry_path == data_root
+                || entry_path == common::thot_dir_of(&root)
+            {
+                continue;
+            }
+
+            let data_path = entry_path.strip_prefix(&root).unwrap();
+            let data_path = data_root.join(data_path);
+            fs::rename(entry_path, data_path)?;
+        }
+    }
+
+    let mut builder = container::InitOptions::init();
+    builder.ignore(
+        analysis_root
+            .strip_prefix(&root)
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .to_string(),
+    );
+    builder.build(&data_root)?;
+
+    Ok(pid)
+}
diff --git a/local/src/project/mod_test.rs b/local/src/project/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/project.rs b/local/src/project/project.rs
index 586b174f..80d6d6e4 100644
--- a/local/src/project/project.rs
+++ b/local/src/project/project.rs
@@ -1,15 +1,11 @@
 //! Functionality and resources related to projects.
-use super::resources::project::{Loader, Project};
+use super::resources::{Project, Scripts};
 use crate::common;
-use crate::constants::THOT_DIR;
-use crate::error::ProjectError;
+use crate::error::{Error, ProjectError, Result};
 use crate::system::collections::Projects;
 use crate::system::projects;
-use crate::{Error, Result};
-use settings_manager::{system_settings::Loader as SystemLoader, Settings};
-use std::fs;
-use std::io;
 use std::path::{Path, PathBuf};
+use std::{fs, io};
 use thot_core::error::{Error as CoreError, ProjectError as CoreProjectError, ResourceError};
 use thot_core::project::Project as CoreProject;
 use thot_core::types::ResourceId;
@@ -18,7 +14,6 @@ use thot_core::types::ResourceId;
 // *** Init ***
 // ************
 
-// @todo: reinitialize project if already a project. See Git's functionality.
 /// Initialize a new Thot project.
 /// If the path is already initialized as a Thot resource -- i.e. has a `.thot` folder -- nothing is
 /// done.
@@ -26,52 +21,35 @@ use thot_core::types::ResourceId;
 /// # Steps
 /// 1. Create `.thot` folder to store data.
 /// 2. Create [`Project`] for project info.
-/// 3. Create [`ProjectSettings`] for project settings.
+/// 3. Create `ProjectSettings` for project settings.
 /// 4. Create `Script`s registry.
 /// 5. Add [`Project`] to collections registry.
-pub fn init(path: &Path) -> Result<ResourceId> {
+pub fn init(path: impl AsRef<Path>) -> Result<ResourceId> {
+    let path = path.as_ref();
     if path_is_resource(path) {
         // project already initialized
-        let rid = project_id(path)?.expect("path is unregistered `Project`");
+        let rid = match project_id(path)? {
+            Some(rid) => rid,
+            None => {
+                return Err(ProjectError::PathNotRegistered(path.to_path_buf()).into());
+            }
+        };
+
         return Ok(rid);
     }
 
     // create directory
-    let thot_dir = path.join(THOT_DIR);
+    let thot_dir = common::thot_dir_of(path);
     fs::create_dir(&thot_dir)?;
 
     // create thot files
-    // project
-    let name = match path.file_name() {
-        None => {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidInput, // @todo: Should be InvalidFilename
-                "file name could not be extracted from path",
-            )
-            .into());
-        }
-        Some(f_name) => {
-            match f_name.to_str() {
-                None => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::InvalidInput, // @todo: Should be InvalidFilename
-                        "file name could not be converted to string",
-                    )
-                    .into());
-                }
-                Some(f_str) => String::from(f_str),
-            }
-        }
-    };
-
-    let mut project: Project = Loader::load_or_create(path)?.into();
-    project.name = name;
+    let project = Project::new(path.into())?;
     project.save()?;
 
-    // add project to collection registry
-    projects::register_project(project.rid.clone(), project.base_path().into())?;
+    let scripts = Scripts::new(path.into());
+    scripts.save()?;
 
-    // success
+    projects::register_project(project.rid.clone(), project.base_path().into())?;
     Ok(project.rid.clone().into())
 }
 
@@ -91,9 +69,12 @@ pub fn new(root: &Path) -> Result<ResourceId> {
 
 /// Move project to a new location.
 pub fn mv(rid: &ResourceId, to: &Path) -> Result {
-    let mut projects: Projects = SystemLoader::load_or_create::<Projects>()?.into();
+    let mut projects = Projects::load()?;
     let Some(project) = projects.get_mut(rid) else {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` is not registered")).into());
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+            "`Project` is not registered",
+        ))
+        .into());
     };
 
     // move folder
@@ -106,7 +87,12 @@ pub fn mv(rid: &ResourceId, to: &Path) -> Result {
 }
 
 /// Returns whether the given path is part of a Thot project.
-/// Returns true if the path has a <THOT_DIR> folder in it.
+///
+/// # Returns
+/// `true`` if the path has a <THOT_DIR> folder in it.
+///
+/// # Note
+/// + Only works with `Container`s and `Project`s, not `Asset`s.
 pub fn path_is_resource(path: &Path) -> bool {
     let path = common::thot_dir_of(path);
     path.exists()
@@ -119,6 +105,8 @@ pub fn path_is_project_root(path: &Path) -> bool {
     path.exists()
 }
 
+// TODO Should return `Result<Option>` instead of `Result`
+// to differentiate file read error and path not in project.
 /// Returns path to the project root.
 ///
 /// # See also
@@ -132,9 +120,9 @@ pub fn project_root_path(path: &Path) -> Result<PathBuf> {
         }
 
         // TODO[h] Should not create.
-        let prj: Project = Loader::load_or_create(path.clone())?.into();
+        let prj = Project::load_from(path.clone())?;
         if prj.meta_level == 0 {
-            return common::canonicalize_path(path);
+            return Ok(fs::canonicalize(path)?);
         }
     }
 
@@ -148,7 +136,8 @@ pub fn project_root_path(path: &Path) -> Result<PathBuf> {
 ///
 /// # See also
 /// + [`project_root_path`]
-pub fn project_resource_root_path(path: &Path) -> Result<PathBuf> {
+pub fn project_resource_root_path(path: impl AsRef<Path>) -> Result<PathBuf> {
+    let path = path.as_ref();
     if !path_is_resource(path) {
         return Err(Error::ProjectError(ProjectError::PathNotInProject(
             PathBuf::from(path),
@@ -164,11 +153,11 @@ pub fn project_resource_root_path(path: &Path) -> Result<PathBuf> {
         }
 
         let Ok(prj_json) = fs::read_to_string(prj_file) else {
-            // @todo: Handle metalevel.
+            // TODO Handle metalevel.
             // Currently assumed that if project file can't be read, it is because
             // the file is being controlled by another process, likely the database
             // so just return the path.
-            return common::canonicalize_path(path);
+            return Ok(fs::canonicalize(path)?);
         };
 
         let prj: CoreProject = match serde_json::from_str(prj_json.as_str()) {
@@ -177,16 +166,23 @@ pub fn project_resource_root_path(path: &Path) -> Result<PathBuf> {
         };
 
         if prj.meta_level == 0 {
-            return common::canonicalize_path(path);
+            return Ok(fs::canonicalize(path)?);
         }
     }
 
-    Err(CoreError::ProjectError(CoreProjectError::Misconfigured("project has no root.")).into())
+    Err(CoreError::ProjectError(CoreProjectError::misconfigured("project has no root.")).into())
 }
 
-/// Returns the [`ResourceId`] of the containing [`Project`] if it exists..
-pub fn project_id(path: &Path) -> Result<Option<ResourceId>> {
-    let root = project_resource_root_path(path)?;
+/// # Returns
+/// + [`ResourceId`] of the containing [`Project`] if it exists.
+/// + `None` if the path is not inside a `Project``.
+pub fn project_id(path: impl AsRef<Path>) -> Result<Option<ResourceId>> {
+    let root = match project_resource_root_path(path.as_ref()) {
+        Ok(root) => root,
+        Err(Error::ProjectError(ProjectError::PathNotInProject(_))) => return Ok(None),
+        Err(err) => return Err(err),
+    };
+
     projects::get_id(root.as_path())
 }
 
diff --git a/local/src/project/project_test.rs b/local/src/project/project_test.rs
index 086def01..b0d9fbe3 100644
--- a/local/src/project/project_test.rs
+++ b/local/src/project/project_test.rs
@@ -1,12 +1,12 @@
 use super::*;
 use crate::common::{project_file_of, project_settings_file_of, thot_dir_of};
-use crate::project::resources::project::Project;
 use dev_utils::fs::TempDir;
 use fake::faker::filesystem::raw::DirPath;
 use fake::locales::EN;
 use fake::Fake;
 use serde_json;
 use std::fs;
+use thot_core::project::Project as CoreProject;
 
 // ******************
 // *** new + init ***
@@ -37,7 +37,7 @@ fn new_should_work() {
     // ensure meta level is 0
     let prj_file = project_file_of(root);
     let prj_json = fs::read_to_string(prj_file.as_path()).expect("could not read project file");
-    let prj: Project = serde_json::from_str(&prj_json).expect("project should be valid json");
+    let prj: CoreProject = serde_json::from_str(&prj_json).expect("project should be valid json");
     assert_eq!(0, prj.meta_level, "project should have meta level 0");
 }
 
@@ -73,7 +73,7 @@ fn init_should_work() {
     // ensure project has meta level 0
     let prj_file = project_file_of(root);
     let prj_json = fs::read_to_string(prj_file).expect("could not read project file");
-    let prj: Project = serde_json::from_str(&prj_json).expect("project should be valid json");
+    let prj: CoreProject = serde_json::from_str(&prj_json).expect("project should be valid json");
     assert_eq!(0, prj.meta_level, "project has incorrect meta level");
 }
 
@@ -116,15 +116,15 @@ fn mv_moves_project_to_new_location_and_updates_resources() {
     mv(&rid, &n_root).expect("move should work");
 
     // test
-    let prj = projects::project_by_id(&rid)
-        .expect("project_by_id should work")
-        .unwrap();
-    assert_eq!(&n_root, &prj.path, "path was not updated in registry");
+    let projects = Projects::load().unwrap();
+    let prj_path = projects.get(&rid).unwrap();
+
+    assert_eq!(&n_root, prj_path, "path was not updated in registry");
     assert!(n_root.exists(), "project was not moved to new path");
 
     let prj_file = project_file_of(&n_root);
     let prj_json = fs::read_to_string(prj_file).expect("could not read project file");
-    let prj: Project =
+    let prj: CoreProject =
         serde_json::from_str(&prj_json).expect("project file should be parsable json");
 
     assert_eq!(rid, prj.rid, "resource ids do not match");
@@ -163,11 +163,10 @@ fn project_root_path_should_work_for_root() {
     // test
     let found = project_root_path(root).expect("project_root_path should work");
 
-    let prj = projects::project_by_id(&rid)
-        .expect("project_by_id should work")
-        .unwrap();
+    let projects = Projects::load().unwrap();
+    let prj_path = projects.get(&rid).unwrap();
 
-    assert_eq!(prj.path, found, "project path is incorrect");
+    assert_eq!(prj_path, &found, "project path is incorrect");
 }
 
 #[test]
@@ -226,11 +225,10 @@ fn project_resource_root_path_for_root_should_work() {
     // test
     let found = project_resource_root_path(root).expect("project_root_path should work");
 
-    let prj = projects::project_by_id(&rid)
-        .expect("project_by_id should work")
-        .unwrap();
+    let projects = Projects::load().unwrap();
+    let prj_path = projects.get(&rid).unwrap();
 
-    assert_eq!(prj.path, found, "project path is incorrect");
+    assert_eq!(prj_path, &found, "project path is incorrect");
 }
 
 #[test]
@@ -250,37 +248,3 @@ fn project_resource_root_path_should_error_if_path_is_not_in_a_project() {
 fn project_resource_root_path_should_error_if_no_root_is_found() {
     todo!();
 }
-
-// ****************************
-// *** project registration ***
-// ****************************
-
-#[test]
-fn project_registration_should_work_for_root() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let root = _dir.path();
-    let rid = init(root).expect("init should work");
-
-    // test
-    let prj = project_registration(root).expect("project_registration should work");
-    assert_eq!(rid, prj.rid, "ids do not match");
-}
-
-#[test]
-fn project_registration_should_work_for_descendents() {
-    todo!();
-}
-
-#[test]
-#[should_panic(expected = "PathNotInProject")]
-fn project_registration_should_error_if_path_is_not_in_project() {
-    let root: PathBuf = DirPath(EN).fake();
-    project_registration(root.as_path()).unwrap();
-}
-
-#[test]
-#[should_panic(expected = "Misconfigured")]
-fn project_registration_should_error_if_project_does_not_have_root() {
-    todo!();
-}
diff --git a/local/src/project/resources/asset.rs b/local/src/project/resources/asset.rs
index 7f4efe40..c3bdfc08 100644
--- a/local/src/project/resources/asset.rs
+++ b/local/src/project/resources/asset.rs
@@ -1,28 +1,49 @@
 /// Asset and Assets.
-use super::standard_properties::StandardProperties;
-use crate::common::assets_file;
+use crate::common;
+use crate::file_resource::LocalResource;
+use crate::system::settings::UserSettings;
 use crate::Result;
-use cluFlock::FlockLock;
-use settings_manager::local_settings::{Components, Loader, LocalSettings};
-use settings_manager::Settings;
-use std::fs::File;
+use std::fs;
+use std::io::BufReader;
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use thot_core::project::container::AssetMap;
-use thot_core::project::Asset as CoreAsset;
+use thot_core::project::{Asset as CoreAsset, AssetProperties as CoreAssetProperties};
+use thot_core::types::{Creator, UserId};
 use thot_core::types::{ResourceId, ResourcePath};
 
+// ******************************
+// *** Local Asset Properties ***
+// ******************************
+
+pub struct AssetProperties;
+impl AssetProperties {
+    /// Creates a new [`AssetProperties`](CoreAssetProperties) with fields actively filled from system settings.
+    pub fn new() -> Result<CoreAssetProperties> {
+        let settings = UserSettings::load()?;
+        let creator = match settings.active_user.as_ref() {
+            Some(uid) => Some(UserId::Id(uid.clone().into())),
+            None => None,
+        };
+
+        let creator = Creator::User(creator);
+        let mut props = CoreAssetProperties::new();
+        props.creator = creator;
+
+        Ok(props)
+    }
+}
+
 // *******************
 // *** Local Asset ***
 // *******************
 
 pub struct Asset;
-
 impl Asset {
-    /// Creates an [] with the `properties` field filled actively from
+    /// Creates an [Asset](CoreAsset) with the `properties` field filled actively from
     /// [`LocalStandardProperties`].
     pub fn new(path: ResourcePath) -> Result<CoreAsset> {
-        let props = StandardProperties::new()?;
+        let props = AssetProperties::new()?;
         Ok(CoreAsset {
             rid: ResourceId::new(),
             properties: props,
@@ -41,16 +62,32 @@ impl Asset {
 /// + A [`Container`] may only reference a file in a single [`Asset`].
 /// This functionality is enforced in the `insert_asset` method, which
 /// should be prefered over `insert`.
-#[derive(Settings)]
 pub struct Assets {
-    #[settings(file_lock = "AssetMap")]
-    file_lock: FlockLock<File>,
     base_path: PathBuf,
-
-    #[settings(priority = "Local")]
     assets: AssetMap,
 }
 
+impl Assets {
+    pub fn load_from(base_path: impl Into<PathBuf>) -> Result<Self> {
+        let base_path = base_path.into();
+        let path = base_path.join(Self::rel_path());
+        let file = fs::File::open(path)?;
+        let reader = BufReader::new(file);
+        let assets = serde_json::from_reader(reader)?;
+
+        Ok(Self { base_path, assets })
+    }
+
+    pub fn save(&self) -> Result {
+        let file = fs::OpenOptions::new().write(true).open(self.path())?;
+        Ok(serde_json::to_writer_pretty(file, &self.assets)?)
+    }
+
+    pub fn insert(&mut self, asset: CoreAsset) -> Option<CoreAsset> {
+        self.assets.insert(asset.rid.clone(), asset)
+    }
+}
+
 impl Deref for Assets {
     type Target = AssetMap;
 
@@ -65,27 +102,12 @@ impl DerefMut for Assets {
     }
 }
 
-impl LocalSettings<AssetMap> for Assets {
+impl LocalResource<AssetMap> for Assets {
     fn rel_path() -> PathBuf {
-        assets_file()
+        common::assets_file()
     }
 
     fn base_path(&self) -> &Path {
         &self.base_path
     }
 }
-
-impl From<Loader<AssetMap>> for Assets {
-    fn from(loader: Loader<AssetMap>) -> Self {
-        let loader: Components<AssetMap> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            base_path: loader.base_path,
-            assets: loader.data,
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/local/src/project/resources/asset_test.rs b/local/src/project/resources/asset_test.rs
deleted file mode 100644
index 2698bf61..00000000
--- a/local/src/project/resources/asset_test.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use super::*;
-use dev_utils::path::resource_path::resource_path;
-
-// *************
-// *** Asset ***
-// *************
-
-#[test]
-fn local_asset_new_should_work() {
-    let file = resource_path(Some("py"));
-    let asset = Asset::new(file.clone()).expect("new should work");
-}
-
-// **************
-// *** Assets ***
-// **************
-
-#[test]
-fn assets_insert_asset_should_work() {
-    // setup
-    let mut assets = Assets::new();
-    let a0 = Asset::new(resource_path(Some("py"))).expect("new `Asset` should work");
-    let rid0 = a0.rid.clone();
-
-    let a1 = Asset::new(resource_path(Some("py"))).expect("new `Asset` should work");
-    let mut a0r = Asset::new(resource_path(Some("py"))).expect("new `Asset` should work");
-    a0r.rid = rid0;
-
-    // test
-    let a0_res = assets.insert_asset(a0).expect("inert asset should work");
-    assert_eq!(1, assets.len(), "assets not inserted correctly");
-    assert!(a0_res.is_none(), "asset already existed");
-
-    let a1_res = assets.insert_asset(a1).expect("inert asset should work");
-    assert_eq!(2, assets.len(), "assets not inserted correctly");
-    assert!(a1_res.is_none(), "asset already existed");
-
-    let a0r_res = assets.insert_asset(a0r).expect("inert asset should work");
-    assert_eq!(2, assets.len(), "assets not inserted correctly");
-    assert!(a0r_res.is_some(), "asset did not exist");
-}
-
-#[test]
-#[should_panic(expected = "FileAlreadyAsset")]
-fn assets_insert_asset_for_file_that_already_exists_should_error() {
-    // setup
-    let mut assets = Assets::new();
-    let path = resource_path(Some("py"));
-    let a0 = Asset::new(path.clone()).expect("new `Asset` should work");
-    let a1 = Asset::new(path).expect("new `Asset` should work");
-
-    // test
-    assets.insert_asset(a0).expect("insert asset should work");
-    assets.insert_asset(a1).unwrap();
-}
-
-#[test]
-fn assets_get_path_should_work() {
-    // setup
-    let mut assets = Assets::new();
-    let p0 = resource_path(Some("py"));
-    let a0 = Asset::new(p0.clone()).expect("new `Asset` should work");
-    assets.insert_asset(a0);
-
-    // test
-    let found = assets.get_path(&p0);
-    assert!(found.is_some(), "should find inserted `Asset`");
-
-    let found = assets.get_path(&resource_path(Some("py")));
-    assert!(
-        found.is_none(),
-        "should not find `Asset`s that were not inserted"
-    );
-}
diff --git a/local/src/project/resources/container.rs b/local/src/project/resources/container.rs
index 033fd9ed..8f85fd8d 100644
--- a/local/src/project/resources/container.rs
+++ b/local/src/project/resources/container.rs
@@ -1,58 +1,163 @@
 //! Container and container settings.
-use super::super::types::{
-    ContainerProperties as ContainerProps, ContainerSettings as ContainerSets,
-};
-use super::asset::Assets;
-use crate::common::{assets_file, container_file, container_settings_file};
+use crate::common;
 use crate::error::{Error, Result};
-use cluFlock::FlockLock;
+use crate::file_resource::LocalResource;
+use crate::system::settings::UserSettings;
+use crate::types::ContainerSettings;
 use has_id::HasId;
-use settings_manager::error::Result as SettingsResult;
-use settings_manager::local_settings::{
-    Components as LocalComponents, Loader as LocalLoader, LocalSettings,
-};
-use settings_manager::types::Priority as SettingsPriority;
-use settings_manager::{settings, Settings};
-use std::borrow::Cow;
-use std::fs::File;
+use serde::{Deserialize, Serialize};
+use std::fs;
 use std::hash::{Hash, Hasher};
+use std::io::BufReader;
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::project::container::AssetMap;
-use thot_core::project::{Asset, Container as CoreContainer, ScriptAssociation};
-use thot_core::types::ResourceId;
+use thot_core::project::{
+    container::ScriptMap, Container as CoreContainer,
+    ContainerProperties as CoreContainerProperties, ScriptAssociation,
+};
+use thot_core::types::{Creator, ResourceId, UserId};
+
+// **********************************
+// *** Local Container Properties ***
+// **********************************
+
+pub struct ContainerProperties;
+impl ContainerProperties {
+    /// Creates a new [`ContainerProperties`](CoreContainerProperties) with fields actively filled from system settings.
+    pub fn new(name: String) -> Result<CoreContainerProperties> {
+        let settings = UserSettings::load()?;
+        let creator = match settings.active_user.as_ref() {
+            Some(uid) => Some(UserId::Id(uid.clone().into())),
+            None => None,
+        };
+
+        let creator = Creator::User(creator);
+        let mut props = CoreContainerProperties::new(name);
+        props.creator = creator;
+
+        Ok(props)
+    }
+}
+
+// ***********************************
+// *** Stored Container Properties ***
+// ***********************************
+
+/// Properties for a Container.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct StoredContainerProperties {
+    pub rid: ResourceId,
+    pub properties: CoreContainerProperties,
+    pub scripts: ScriptMap,
+}
+
+impl From<CoreContainer> for StoredContainerProperties {
+    fn from(container: CoreContainer) -> Self {
+        Self {
+            rid: container.rid,
+            properties: container.properties,
+            scripts: container.scripts,
+        }
+    }
+}
 
 // *****************
 // *** Container ***
 // *****************
 
-#[derive(Settings)]
+#[derive(Debug)]
 pub struct Container {
-    container_file_lock: FlockLock<File>,
-    assets_file_lock: FlockLock<File>,
-
-    #[settings(file_lock = "ContainerSets")]
-    settings_file_lock: FlockLock<File>,
-
     base_path: PathBuf,
     container: CoreContainer,
-
-    #[settings(priority = "Local")]
-    settings: ContainerSets,
+    settings: ContainerSettings,
 }
 
 impl Container {
-    /// Adds the given [`Asset`](LocalAsset) to the `Container`.
-    pub fn insert_asset(&mut self, asset: Asset) -> Option<Asset> {
-        self.container.assets.insert(asset.rid.clone(), asset)
+    /// Create a new Container at the given base path.
+    ///
+    /// # Arguments
+    /// 1. Path to the Container.
+    ///
+    /// # Notes
+    /// + No changes or checks are made to the file system.
+    pub fn new(path: impl Into<PathBuf>) -> Self {
+        let path = path.into();
+        let name = PathBuf::from(path.clone());
+        let name = name.file_name().expect("invalid path");
+        let name: String = name.to_string_lossy().to_string();
+
+        Self {
+            base_path: path,
+            container: CoreContainer::new(name),
+            settings: ContainerSettings::default(),
+        }
+    }
+
+    pub fn load_from(base_path: impl AsRef<Path>) -> thot_core::Result<Self> {
+        let base_path = fs::canonicalize(base_path.as_ref())?;
+        let properties_path =
+            base_path.join(<Container as LocalResource<StoredContainerProperties>>::rel_path());
+
+        let assets_path = base_path.join(<Container as LocalResource<AssetMap>>::rel_path());
+        let settings_path =
+            base_path.join(<Container as LocalResource<ContainerSettings>>::rel_path());
+
+        let properties_file = fs::File::open(properties_path)?;
+        let assets_file = fs::File::open(assets_path)?;
+        let settings_file = fs::File::open(settings_path)?;
+
+        let properties_reader = BufReader::new(properties_file);
+        let assets_reader = BufReader::new(assets_file);
+        let settings_reader = BufReader::new(settings_file);
+
+        let container: StoredContainerProperties = serde_json::from_reader(properties_reader)?;
+        let assets = serde_json::from_reader(assets_reader)?;
+        let settings = serde_json::from_reader(settings_reader)?;
+
+        let container = CoreContainer {
+            rid: container.rid,
+            properties: container.properties,
+            assets,
+            scripts: container.scripts,
+        };
+
+        Ok(Self {
+            base_path,
+            container,
+            settings,
+        })
+    }
+
+    /// Save all data.
+    pub fn save(&self) -> Result {
+        let properties_path = <Container as LocalResource<StoredContainerProperties>>::path(self);
+        let assets_path = <Container as LocalResource<AssetMap>>::path(self);
+        let settings_path = <Container as LocalResource<ContainerSettings>>::path(self);
+
+        fs::create_dir_all(properties_path.parent().expect("invalid Container path"))?;
+        let properties: StoredContainerProperties = self.container.clone().into();
+        fs::write(properties_path, serde_json::to_string_pretty(&properties)?)?;
+        fs::write(assets_path, serde_json::to_string_pretty(&self.assets)?)?;
+        fs::write(settings_path, serde_json::to_string_pretty(&self.settings)?)?;
+
+        Ok(())
+    }
+
+    pub fn base_path(&self) -> &Path {
+        &self.base_path
     }
 
-    /// Removes an [`Asset`](CoreAsset).
-    /// Returns the removed `Asset` if it was present,
-    /// or `None` otherwise.
-    pub fn remove_asset(&mut self, rid: &ResourceId) -> Option<Asset> {
-        self.assets.remove(rid)
+    pub fn set_base_path(&mut self, path: impl Into<PathBuf>) {
+        self.base_path = path.into();
+    }
+
+    pub fn buckets(&self) -> Vec<PathBuf> {
+        self.assets
+            .values()
+            .filter_map(|asset| asset.bucket())
+            .collect()
     }
 
     // ---------------
@@ -73,7 +178,7 @@ impl Container {
     pub fn add_script_association(&mut self, assoc: ScriptAssociation) -> Result {
         if self.contains_script_association(&assoc.script) {
             return Err(Error::CoreError(CoreError::ResourceError(
-                ResourceError::AlreadyExists("Association with script already exists"),
+                ResourceError::already_exists("Association with script already exists"),
             )));
         }
 
@@ -100,16 +205,12 @@ impl Container {
         old.is_some()
     }
 
-    pub fn base_path(&self) -> &Path {
-        &self.base_path
+    pub fn settings(&self) -> &ContainerSettings {
+        &self.settings
     }
 
-    /// Save all data.
-    pub fn save(&mut self) -> Result {
-        <Container as Settings<ContainerProps>>::save(self)?;
-        <Container as Settings<AssetMap>>::save(self)?;
-        <Container as Settings<ContainerSets>>::save(self)?;
-        Ok(())
+    pub fn settings_mut(&mut self) -> &mut ContainerSettings {
+        &mut self.settings
     }
 }
 
@@ -149,36 +250,9 @@ impl HasId for Container {
     }
 }
 
-// --- Container Properties ---
-impl Settings<ContainerProps> for Container {
-    fn settings(&self) -> Cow<ContainerProps> {
-        Cow::Owned(ContainerProps {
-            rid: self.rid.clone(),
-            properties: self.properties.clone(),
-            scripts: self.scripts.clone(),
-        })
-    }
-
-    fn file(&self) -> &File {
-        &*self.container_file_lock
-    }
-
-    fn file_mut(&mut self) -> &mut File {
-        &mut *self.container_file_lock
-    }
-
-    fn file_lock(&self) -> &FlockLock<File> {
-        &self.container_file_lock
-    }
-
-    fn priority(&self) -> SettingsPriority {
-        SettingsPriority::Local
-    }
-}
-
-impl LocalSettings<ContainerProps> for Container {
+impl LocalResource<StoredContainerProperties> for Container {
     fn rel_path() -> PathBuf {
-        container_file()
+        common::container_file()
     }
 
     fn base_path(&self) -> &Path {
@@ -186,32 +260,9 @@ impl LocalSettings<ContainerProps> for Container {
     }
 }
 
-// --- Assets ---
-impl Settings<AssetMap> for Container {
-    fn settings(&self) -> Cow<AssetMap> {
-        Cow::Borrowed(&self.assets)
-    }
-
-    fn file(&self) -> &File {
-        &*self.assets_file_lock
-    }
-
-    fn file_mut(&mut self) -> &mut File {
-        &mut *self.assets_file_lock
-    }
-
-    fn file_lock(&self) -> &FlockLock<File> {
-        &self.assets_file_lock
-    }
-
-    fn priority(&self) -> SettingsPriority {
-        SettingsPriority::Local
-    }
-}
-
-impl LocalSettings<AssetMap> for Container {
+impl LocalResource<AssetMap> for Container {
     fn rel_path() -> PathBuf {
-        assets_file()
+        common::assets_file()
     }
 
     fn base_path(&self) -> &Path {
@@ -219,11 +270,9 @@ impl LocalSettings<AssetMap> for Container {
     }
 }
 
-// --- Container Settings ---
-
-impl LocalSettings<ContainerSets> for Container {
+impl LocalResource<ContainerSettings> for Container {
     fn rel_path() -> PathBuf {
-        container_settings_file()
+        common::container_settings_file()
     }
 
     fn base_path(&self) -> &Path {
@@ -231,211 +280,6 @@ impl LocalSettings<ContainerSets> for Container {
     }
 }
 
-impl From<Loader> for Container {
-    fn from(loader: Loader) -> Self {
-        let loader: Components = loader.into();
-        Self {
-            container_file_lock: loader.container_file_lock,
-            assets_file_lock: loader.assets_file_lock,
-            settings_file_lock: loader.settings_file_lock,
-
-            base_path: loader.base_path,
-            container: loader.container.clone(),
-            settings: loader.settings,
-        }
-    }
-}
-
-// ****************************
-// *** Container Properties ***
-// ****************************
-
-#[derive(Settings)]
-pub struct ContainerProperties {
-    #[settings(file_lock = "ContainerProps")]
-    file_lock: FlockLock<File>,
-    base_path: PathBuf,
-
-    #[settings(priority = "Local")]
-    properties: ContainerProps,
-}
-
-impl Deref for ContainerProperties {
-    type Target = ContainerProps;
-    fn deref(&self) -> &Self::Target {
-        &self.properties
-    }
-}
-
-impl DerefMut for ContainerProperties {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.properties
-    }
-}
-
-impl LocalSettings<ContainerProps> for ContainerProperties {
-    fn rel_path() -> PathBuf {
-        container_file()
-    }
-
-    fn base_path(&self) -> &Path {
-        &self.base_path
-    }
-}
-
-impl From<LocalLoader<ContainerProps>> for ContainerProperties {
-    fn from(loader: LocalLoader<ContainerProps>) -> Self {
-        let loader: LocalComponents<ContainerProps> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            base_path: loader.base_path,
-            properties: loader.data,
-        }
-    }
-}
-
-// **************************
-// *** Container Settings ***
-// **************************
-
-#[derive(Settings)]
-pub struct ContainerSettings {
-    #[settings(file_lock = "ContainerSets")]
-    file_lock: FlockLock<File>,
-    base_path: PathBuf,
-
-    #[settings(priority = "Local")]
-    settings: ContainerSets,
-}
-
-impl LocalSettings<ContainerSets> for ContainerSettings {
-    fn rel_path() -> PathBuf {
-        container_settings_file()
-    }
-
-    fn base_path(&self) -> &Path {
-        &self.base_path
-    }
-}
-
-// ***************
-// *** Builder ***
-// ***************
-
-#[derive(Default)]
-pub struct Builder {
-    container: CoreContainer,
-    settings: ContainerSets,
-}
-
-impl Builder {
-    pub fn container_mut(&mut self) -> &mut CoreContainer {
-        &mut self.container
-    }
-
-    pub fn settings_mut(&mut self) -> &mut ContainerSets {
-        &mut self.settings
-    }
-
-    /// Convert to a [`Container`], creating files if needed.
-    #[tracing::instrument(skip(self))]
-    pub fn save(self, base_path: PathBuf) -> Result<Container> {
-        let container_path = base_path.join(ContainerProperties::rel_path());
-        let assets_path = base_path.join(Assets::rel_path());
-        let settings_path = base_path.join(ContainerSettings::rel_path());
-
-        let container_file = settings::ensure_file(&container_path)?;
-        let assets_file = settings::ensure_file(&assets_path)?;
-        let settings_file = settings::ensure_file(&settings_path)?;
-
-        let container_file_lock = settings::lock(container_file)?;
-        let assets_file_lock = settings::lock(assets_file)?;
-        let settings_file_lock = settings::lock(settings_file)?;
-
-        let mut container = Container {
-            container_file_lock,
-            assets_file_lock,
-            settings_file_lock,
-            base_path,
-
-            container: self.container.clone(),
-            settings: self.settings,
-        };
-
-        container.save()?;
-        Ok(container)
-    }
-}
-
-// **************
-// *** Loader ***
-// **************
-
-pub struct Loader {
-    container_file_lock: FlockLock<File>,
-    assets_file_lock: FlockLock<File>,
-    settings_file_lock: FlockLock<File>,
-
-    base_path: PathBuf,
-    container: CoreContainer,
-    settings: ContainerSets,
-}
-
-impl Loader {
-    pub fn load_or_create(base_path: PathBuf) -> SettingsResult<Self> {
-        let properties_loader =
-            LocalLoader::load_or_create::<ContainerProperties>(base_path.clone())?;
-        let assets_loader = LocalLoader::load_or_create::<Assets>(base_path.clone())?;
-        let settings_loader = LocalLoader::load_or_create::<ContainerSettings>(base_path)?;
-
-        let properties_loader: LocalComponents<ContainerProps> = properties_loader.into();
-        let assets_loader: LocalComponents<AssetMap> = assets_loader.into();
-        let settings_loader: LocalComponents<ContainerSets> = settings_loader.into();
-
-        let local_properties = properties_loader.data;
-        let container = CoreContainer {
-            rid: local_properties.rid,
-            properties: local_properties.properties,
-            scripts: local_properties.scripts,
-            assets: assets_loader.data,
-        };
-
-        Ok(Self {
-            container_file_lock: properties_loader.file_lock,
-            assets_file_lock: assets_loader.file_lock,
-            settings_file_lock: settings_loader.file_lock,
-
-            base_path: properties_loader.base_path,
-            container,
-            settings: settings_loader.data,
-        })
-    }
-}
-
-impl Into<Components> for Loader {
-    fn into(self) -> Components {
-        Components {
-            container_file_lock: self.container_file_lock,
-            assets_file_lock: self.assets_file_lock,
-            settings_file_lock: self.settings_file_lock,
-
-            base_path: self.base_path,
-            container: self.container,
-            settings: self.settings,
-        }
-    }
-}
-
-pub struct Components {
-    pub container_file_lock: FlockLock<File>,
-    pub assets_file_lock: FlockLock<File>,
-    pub settings_file_lock: FlockLock<File>,
-
-    pub base_path: PathBuf,
-    pub container: CoreContainer,
-    pub settings: ContainerSets,
-}
-
 #[cfg(test)]
 #[path = "./container_test.rs"]
 mod container_test;
diff --git a/local/src/project/resources/container_test.rs b/local/src/project/resources/container_test.rs
index f4be64ac..e1e65a78 100644
--- a/local/src/project/resources/container_test.rs
+++ b/local/src/project/resources/container_test.rs
@@ -1,177 +1,12 @@
 use super::*;
-use crate::common::{container_file_of, container_settings_file_of};
-use crate::project::container;
 use dev_utils::fs::TempDir;
-use dev_utils::path::resource_path::resource_path;
-use fake::faker::filesystem::raw::FilePath;
-use fake::faker::lorem::raw::Words;
-use fake::locales::EN;
-use fake::Fake;
-use settings_manager::types::Priority as SettingsPriority;
-use std::path::Path;
-use thot_core::project::{
-    Asset as CoreAsset, Container as CoreContainer, RunParameters, ScriptAssociation,
-};
+use thot_core::project::{RunParameters, ScriptAssociation};
 use thot_core::types::ResourceId;
 
 // *****************
 // *** Container ***
 // *****************
 
-#[test]
-fn container_new_works() {
-    let container = Container::new().expect("new should work");
-
-    assert_eq!(0, container.scripts.len(), "scripts should be an empty Vec");
-    assert_eq!(0, container.assets.len(), "assets should be empty");
-}
-
-#[test]
-fn container_default_works() {
-    let container = Container::default();
-
-    assert_eq!(0, container.scripts.len(), "scripts should be an empty Vec");
-    assert_eq!(0, container.assets.len(), "assets should be empty");
-}
-
-#[test]
-fn container_priority_should_be_correct() {
-    let container = Container::default();
-
-    assert_eq!(
-        SettingsPriority::Local,
-        container.priority(),
-        "priority should be correct"
-    );
-}
-
-#[test]
-fn container_rel_path_should_be_correct() {
-    let path = Container::rel_path().expect("rel_path should work");
-
-    assert_eq!(
-        container_file_of(Path::new("")),
-        path,
-        "rel_path should be correct"
-    );
-}
-
-#[test]
-fn duplicate_with_no_children_should_work() {
-    // setup
-    let mut o_root = Container::new().expect("could not create `Container`");
-    let name: Vec<String> = Words(EN, 3..5).fake();
-    let name = name.join(" ");
-    o_root.properties.name = Some(name);
-
-    let path: PathBuf = FilePath(EN).fake();
-    o_root.set_base_path(path).expect("could not set base path");
-
-    // test
-    let root = o_root.duplicate().expect("could not duplicate tree");
-
-    assert_ne!(o_root.rid, root.rid, "`ResourceId` should not match");
-    assert_eq!(
-        o_root.properties, root.properties,
-        "properties do not match"
-    );
-
-    assert!(root.base_path().is_err(), "path should not be set");
-}
-
-#[test]
-fn duplicate_should_work() {
-    // setup
-    let mut o_root = Container::new().expect("could not create root `Container`");
-    let mut oc1 = Container::new().expect("could not create child `Container`");
-    let mut oc2 = Container::new().expect("could not create child `Container`");
-
-    let name: Vec<String> = Words(EN, 3..5).fake();
-    let name = name.join(" ");
-    o_root.properties.name = Some(name);
-
-    let name: Vec<String> = Words(EN, 3..5).fake();
-    let name = name.join(" ");
-    oc1.properties.name = Some(name);
-
-    let name: Vec<String> = Words(EN, 3..5).fake();
-    let name = name.join(" ");
-    oc2.properties.name = Some(name);
-
-    let path: PathBuf = FilePath(EN).fake();
-
-    // test
-    let root = o_root.duplicate().expect("could not duplicate tree");
-    assert_ne!(o_root.rid, root.rid, "`ResourceId` should not match");
-    assert_eq!(
-        o_root.properties, root.properties,
-        "properties do not match"
-    );
-}
-
-// -------------
-// --- asset ---
-// -------------
-
-#[test]
-fn container_new_asset_should_work() {
-    // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    let mut cont = Container::new().expect("new `Container` should work");
-    cont.set_base_path(_dir.path().to_path_buf());
-
-    // test
-    let file = _dir
-        .mkfile_with_extension("py")
-        .expect("mkfile should work");
-
-    let rid = cont.new_asset(&file).expect("new asset should work");
-    assert!(cont.assets.contains_key(&rid), "asset was not inserted");
-}
-
-#[test]
-#[should_panic(expected = "PathNotSet")]
-fn container_new_asset_without_base_path_should_error() {
-    todo!()
-}
-
-#[test]
-fn container_remove_asset_should_work() {
-    // setup
-    let mut cont = Container::new().expect("new `Container` should work");
-
-    let file_path = resource_path(Some("py"));
-    let asset = CoreAsset::new(file_path);
-    let rid = asset.rid.clone();
-
-    cont.insert_asset(asset).expect("insert asset should work");
-
-    // test
-    let res = cont.remove_asset(&rid);
-    assert!(res.is_some(), "asset should have been registered");
-    assert!(
-        !cont.assets.contains_key(&rid),
-        "container should not have asset registered"
-    );
-}
-
-#[test]
-fn container_remove_asset_should_do_nothing_if_asset_is_not_present() {
-    // setup
-    let _dir = TempDir::new().expect("new `TempDir` should work");
-    container::init(_dir.path()).expect("init container should work");
-    let mut cont = Container::load(_dir.path()).expect("load container should work");
-    let rid = ResourceId::new();
-
-    // test
-    let res = cont.remove_asset(&rid);
-    assert_eq!(None, res, "asset should not be present");
-    assert!(
-        !cont.assets.contains_key(&rid),
-        "container should not be present"
-    );
-}
-
 // --------------------------
 // --- script assocations ---
 // --------------------------
@@ -179,7 +14,8 @@ fn container_remove_asset_should_do_nothing_if_asset_is_not_present() {
 #[test]
 fn container_contains_script_association_should_work() {
     // setup
-    let mut container = Container::new().expect("creating container should work");
+    let dir = TempDir::new().unwrap();
+    let mut container = Container::new(dir.path());
     let sid = ResourceId::new();
     let assoc = ScriptAssociation::new(sid.clone());
     container.scripts.insert(sid.clone(), assoc.into());
@@ -199,7 +35,8 @@ fn container_contains_script_association_should_work() {
 #[test]
 fn container_add_script_association_should_work() {
     // setup
-    let mut container = Container::new().expect("creating container should work");
+    let dir = TempDir::new().unwrap();
+    let mut container = Container::new(dir.path());
     let sid = ResourceId::new();
     let assoc = ScriptAssociation::new(sid.clone());
 
@@ -217,7 +54,8 @@ fn container_add_script_association_should_work() {
 #[should_panic(expected = "AlreadyExists")]
 fn container_add_script_association_if_already_exists_should_error() {
     // setup
-    let mut container = Container::new().expect("creating container should work");
+    let dir = TempDir::new().unwrap();
+    let mut container = Container::new(dir.path());
     let sid = ResourceId::new();
     let assoc = ScriptAssociation::new(sid.clone());
     container
@@ -231,7 +69,8 @@ fn container_add_script_association_if_already_exists_should_error() {
 #[test]
 fn container_set_script_association_should_work() {
     // setup
-    let mut container = Container::new().expect("creating container should work");
+    let dir = TempDir::new().unwrap();
+    let mut container = Container::new(dir.path());
     let sid = ResourceId::new();
     let mut assoc = ScriptAssociation::new(sid.clone());
 
@@ -270,7 +109,8 @@ fn container_set_script_association_should_work() {
 #[test]
 fn container_remove_script_association_should_work() {
     // setup
-    let mut container = Container::new().expect("creating container should work");
+    let dir = TempDir::new().unwrap();
+    let mut container = Container::new(dir.path());
     let sid = ResourceId::new();
     let params = RunParameters::new();
     container.scripts.insert(sid.clone(), params);
@@ -289,123 +129,3 @@ fn container_remove_script_association_should_work() {
     let sec = container.remove_script_association(&sid);
     assert_eq!(false, sec, "remove should return false");
 }
-
-// ----------------------
-// --- Core Container ---
-// ----------------------
-
-#[test]
-fn container_from_core_should_work() {
-    // setup
-    let core_container = CoreContainer::default();
-    let rid = core_container.rid.clone();
-
-    // test
-    let container: Container = Container::from(core_container);
-    assert_eq!(rid, container.rid, "resource ids should match");
-}
-
-#[test]
-fn container_into_core_should_work() {
-    // setup
-    let container = Container::new().expect("new should work");
-    let rid = container.rid.clone();
-
-    // test
-    let core: CoreContainer = container.into();
-    assert_eq!(rid, core.rid, "resource ids should match");
-}
-
-// -------------
-// --- serde ---
-// -------------
-
-#[test]
-fn container_serde_serialization_should_work() {
-    // setup
-    let mut _dir = TempDir::new().expect("new `TempDir` should work");
-    container::init(_dir.path()).expect("init container should work");
-    let mut container = Container::load(_dir.path()).expect("load container should work");
-    container
-        .set_base_path(_dir.path().to_path_buf())
-        .expect("set base path should work");
-
-    // asset
-    let a_path = _dir.mkfile().expect("mkfile should work");
-    container
-        .new_asset(&a_path)
-        .expect("register asset should work");
-
-    // script association
-    let sid = ResourceId::new();
-    let assoc = ScriptAssociation::new(sid.clone());
-    container
-        .add_script_association(assoc.clone())
-        .expect("adding script association should work");
-
-    // test
-    let _json = serde_json::to_string(&container).expect("serialization should work");
-    println!("{:?}", _json);
-}
-
-#[test]
-fn container_serde_deserialization_should_work() {
-    // setup
-    let json = r#"{
-        "rid":"761474b7-0b71-47de-8751-f28d44958100",
-        "properties":{
-            "created":"2022-10-19T20:45:38.194421359Z",
-            "creator":{
-                "User":null
-            },
-            "permissions":{
-                
-            },
-            "name":null,
-            "kind":null,
-            "description":null,
-            "tags":[
-                
-            ],
-            "metadata":{
-                
-            }
-        },
-        "children":[
-                "d228cc54-bba2-40cb-a77b-50562415ff52"
-        ],
-        "assets":[
-                "956581ec-3a50-4399-9d2c-e54ed6776a86"
-        ],
-        "scripts":[
-            {
-                "script":"9983bfd5-8d85-41ea-af51-d16ac0e188e7",
-                "autorun":true,
-                "priority":0
-            }
-        ]
-    }"#;
-
-    // test
-    let _container: Container = serde_json::from_str(&json).expect("deserialize should work");
-}
-
-// **************************
-// *** Container Settings ***
-// **************************
-
-#[test]
-fn container_settings_new_should_work() {
-    let sets = ContainerSettings::new();
-    assert_eq!(0, sets.permissions.len(), "permissions should be empty");
-}
-
-#[test]
-fn container_settings_relative_path_is_correct() {
-    let path = ContainerSettings::rel_path().expect("relative path should work");
-    assert_eq!(
-        container_settings_file_of(Path::new("")),
-        path,
-        "realtive path should be correct"
-    );
-}
diff --git a/local/src/project/resources/mod.rs b/local/src/project/resources/mod.rs
index 92d8230c..5db03848 100644
--- a/local/src/project/resources/mod.rs
+++ b/local/src/project/resources/mod.rs
@@ -3,11 +3,9 @@ pub mod asset;
 pub mod container;
 pub mod project;
 pub mod script;
-pub mod standard_properties;
 
 // Re-exports
 pub use asset::{Asset, Assets};
 pub use container::Container;
-pub use project::{Project, ProjectSettings};
+pub use project::Project;
 pub use script::{Script, Scripts};
-pub use standard_properties::StandardProperties;
diff --git a/local/src/project/resources/mod_test.rs b/local/src/project/resources/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/resources/notes.rs b/local/src/project/resources/notes.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/resources/notes_test.rs b/local/src/project/resources/notes_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/resources/project.rs b/local/src/project/resources/project.rs
index 6b4a487d..3e961836 100644
--- a/local/src/project/resources/project.rs
+++ b/local/src/project/resources/project.rs
@@ -1,44 +1,86 @@
 //! Project and project settings.
-use super::super::types::ProjectSettings as PrjSettings;
 use crate::common::{project_file, project_settings_file};
+use crate::file_resource::LocalResource;
+use crate::types::ProjectSettings;
 use crate::Result;
-use cluFlock::FlockLock;
-use settings_manager::error::Result as SettingsResult;
-use settings_manager::local_settings::{Components, Loader as LocalLoader, LocalSettings};
-use settings_manager::Settings;
-use std::fs::File;
+use std::fs;
+use std::io::{self, BufReader};
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use thot_core::project::Project as CoreProject;
 
-// ***************
-// *** Project ***
-// ***************
-
 /// Represents a Thot project.
-#[derive(Settings, Debug)]
 pub struct Project {
-    #[settings(file_lock = "CoreProject")]
-    project_file_lock: FlockLock<File>,
-
-    #[settings(file_lock = "PrjSettings")]
-    settings_file_lock: FlockLock<File>,
-
     base_path: PathBuf,
-
-    #[settings(priority = "Local")]
     project: CoreProject,
-
-    #[settings(priority = "Local")]
-    settings: PrjSettings,
+    settings: ProjectSettings,
 }
 
 impl Project {
-    pub fn settings(&self) -> &PrjSettings {
+    /// Create a new `Project` with the given path.
+    /// Name of the `Project` is taken from the last component of the path.
+    pub fn new(path: PathBuf) -> Result<Self> {
+        let Some(name) = path.file_name() else {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidFilename,
+                "file name could not be extracted from path",
+            )
+            .into());
+        };
+
+        let Some(name) = name.to_str() else {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidFilename,
+                "file name could not be converted to string",
+            )
+            .into());
+        };
+
+        let name = name.to_string();
+        Ok(Self {
+            base_path: path,
+            project: CoreProject::new(name),
+            settings: ProjectSettings::default(),
+        })
+    }
+
+    pub fn load_from(base_path: impl Into<PathBuf>) -> Result<Self> {
+        let base_path = fs::canonicalize(base_path.into())?;
+        let project_path = base_path.join(<Project as LocalResource<CoreProject>>::rel_path());
+        let settings_path = base_path.join(<Project as LocalResource<ProjectSettings>>::rel_path());
+
+        let project_file = fs::File::open(project_path)?;
+        let settings_file = fs::File::open(settings_path)?;
+
+        let project_reader = BufReader::new(project_file);
+        let settings_reader = BufReader::new(settings_file);
+
+        let project = serde_json::from_reader(project_reader)?;
+        let settings = serde_json::from_reader(settings_reader)?;
+
+        Ok(Self {
+            base_path,
+            project,
+            settings,
+        })
+    }
+
+    /// Save all data.
+    pub fn save(&self) -> Result {
+        let project_path = <Project as LocalResource<CoreProject>>::path(self);
+        let settings_path = <Project as LocalResource<ProjectSettings>>::path(self);
+
+        fs::create_dir_all(project_path.parent().expect("invalid path"))?;
+        fs::write(project_path, serde_json::to_string_pretty(&self.project)?)?;
+        fs::write(settings_path, serde_json::to_string_pretty(&self.settings)?)?;
+        Ok(())
+    }
+
+    pub fn settings(&self) -> &ProjectSettings {
         &self.settings
     }
 
-    pub fn settings_mut(&mut self) -> &mut PrjSettings {
+    pub fn settings_mut(&mut self) -> &mut ProjectSettings {
         &mut self.settings
     }
 
@@ -46,11 +88,22 @@ impl Project {
         self.base_path.as_path()
     }
 
-    /// Save all data.
-    pub fn save(&mut self) -> Result {
-        <Project as Settings<CoreProject>>::save(self)?;
-        <Project as Settings<PrjSettings>>::save(self)?;
-        Ok(())
+    /// Get the full path of the data root.
+    pub fn data_root_path(&self) -> Option<PathBuf> {
+        let Some(data_root) = self.data_root.as_ref() else {
+            return None;
+        };
+
+        Some(self.base_path.join(data_root))
+    }
+
+    /// Get the full path of the analysis root.
+    pub fn analysis_root_path(&self) -> Option<PathBuf> {
+        let Some(analysis_root) = self.analysis_root.as_ref() else {
+            return None;
+        };
+
+        Some(self.base_path.join(analysis_root))
     }
 }
 
@@ -74,8 +127,7 @@ impl Into<CoreProject> for Project {
     }
 }
 
-// --- Core Project ---
-impl LocalSettings<CoreProject> for Project {
+impl LocalResource<CoreProject> for Project {
     fn rel_path() -> PathBuf {
         project_file()
     }
@@ -85,47 +137,7 @@ impl LocalSettings<CoreProject> for Project {
     }
 }
 
-// --- Project Settings ---
-
-impl LocalSettings<PrjSettings> for Project {
-    fn rel_path() -> PathBuf {
-        project_settings_file()
-    }
-
-    fn base_path(&self) -> &Path {
-        &self.base_path
-    }
-}
-
-impl From<Loader> for Project {
-    fn from(loader: Loader) -> Self {
-        Self {
-            project_file_lock: loader.project_file_lock,
-            settings_file_lock: loader.settings_file_lock,
-
-            base_path: loader.base_path,
-            project: loader.project,
-            settings: loader.settings,
-        }
-    }
-}
-
-// ************************
-// *** Project Settings ***
-// ************************
-
-/// Settings for a Thot project.
-#[derive(Settings)]
-pub struct ProjectSettings {
-    #[settings(file_lock = "PrjSettings")]
-    file_lock: FlockLock<File>,
-    base_path: PathBuf,
-
-    #[settings(priority = "Local")]
-    settings: PrjSettings,
-}
-
-impl LocalSettings<PrjSettings> for ProjectSettings {
+impl LocalResource<ProjectSettings> for Project {
     fn rel_path() -> PathBuf {
         project_settings_file()
     }
@@ -134,40 +146,3 @@ impl LocalSettings<PrjSettings> for ProjectSettings {
         &self.base_path
     }
 }
-
-// **************
-// *** Loader ***
-// **************
-
-pub struct Loader {
-    project_file_lock: FlockLock<File>,
-    settings_file_lock: FlockLock<File>,
-
-    base_path: PathBuf,
-    project: CoreProject,
-    settings: PrjSettings,
-}
-
-impl Loader {
-    pub fn load_or_create(path: impl Into<PathBuf>) -> SettingsResult<Self> {
-        let path = path.into();
-        let project_loader = LocalLoader::load_or_create::<Project>(path.clone())?;
-        let settings_loader = LocalLoader::load_or_create::<ProjectSettings>(path)?;
-
-        let project_loader: Components<CoreProject> = project_loader.into();
-        let settings_loader: Components<PrjSettings> = settings_loader.into();
-
-        Ok(Self {
-            project_file_lock: project_loader.file_lock,
-            settings_file_lock: settings_loader.file_lock,
-
-            base_path: project_loader.base_path,
-            project: project_loader.data,
-            settings: settings_loader.data,
-        })
-    }
-}
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/local/src/project/resources/project_test.rs b/local/src/project/resources/project_test.rs
deleted file mode 100644
index a82d622f..00000000
--- a/local/src/project/resources/project_test.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use super::*;
-use crate::common::{project_file_of, project_settings_file_of};
-use settings_manager::types::Priority as SettingsPriority;
-use std::path::Path;
-
-// ***************
-// *** Project ***
-// ***************
-
-#[test]
-fn project_new_w_defaults() {
-    let p_name = String::from("test");
-    let project = Project::new(p_name.as_str()).expect("new should work");
-
-    assert_eq!(p_name, project.name, "incorrect project name");
-    assert_eq!(None, project.description, "incorrect default description");
-    assert_eq!(None, project.data_root, "incorrect default data path");
-    assert_eq!(
-        None, project.universal_root,
-        "incorrect defualt universal root"
-    );
-    assert_eq!(
-        None, project.analysis_root,
-        "incorrect default analysis root"
-    );
-    assert_eq!(0, project.meta_level, "incorrect default meta level");
-}
-
-#[test]
-fn project_rel_path_should_be_correct() {
-    let rel_path = Project::rel_path().expect("rel_path should not error");
-
-    assert_eq!(
-        project_file_of(Path::new("")),
-        rel_path,
-        "realtive path is incorrect"
-    );
-}
-
-#[test]
-fn project_priority_should_be_correct() {
-    let prj = Project::new("test").expect("new should work");
-    assert_eq!(
-        SettingsPriority::Local,
-        prj.priority(),
-        "incorrect priority level"
-    );
-}
-
-// ************************
-// *** Project Settings ***
-// ************************
-
-#[test]
-fn project_settings_new_should_work() {
-    let _sets = ProjectSettings::new();
-}
-
-#[test]
-fn project_settings_rel_path_should_be_correct() {
-    let rel_path = ProjectSettings::rel_path().expect("rel_path should not error");
-
-    assert_eq!(
-        project_settings_file_of(Path::new("")),
-        rel_path,
-        "incorrect relative path"
-    );
-}
-
-#[test]
-fn project_settings_priority_should_be_correct() {
-    let sets = ProjectSettings::new();
-    assert_eq!(
-        SettingsPriority::Local,
-        sets.priority(),
-        "incorrect priority"
-    );
-}
diff --git a/local/src/project/resources/script.rs b/local/src/project/resources/script.rs
index 5973cccb..d144e71f 100644
--- a/local/src/project/resources/script.rs
+++ b/local/src/project/resources/script.rs
@@ -1,17 +1,14 @@
 //! Local [`Script`].
 use crate::common::scripts_file;
+use crate::file_resource::LocalResource;
 use crate::system::settings::user_settings::UserSettings;
 use crate::Result;
-use cluFlock::FlockLock;
-use settings_manager::local_settings::{Components, Loader};
-use settings_manager::{system_settings::Loader as SystemLoader, LocalSettings, Settings};
-use std::borrow::Cow;
-use std::fs::File;
+use std::fs;
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::project::{Script as CoreScript, Scripts as CoreScripts};
-use thot_core::types::{ResourceMap, ResourcePath};
+use thot_core::types::ResourcePath;
 
 // **************
 // *** Script ***
@@ -21,10 +18,14 @@ pub struct Script;
 impl Script {
     /// Creates a new [`Script`] with the `creator` field matching the current active creator.
     pub fn new(path: ResourcePath) -> Result<CoreScript> {
-        let settings: UserSettings = SystemLoader::load_or_create::<UserSettings>()?.into();
+        let settings = UserSettings::load()?;
         let creator = settings.active_user.clone().map(|c| c.into());
 
-        let mut script = CoreScript::new(path)?;
+        let mut script = match CoreScript::new(path) {
+            Ok(script) => script,
+            Err(err) => return Err(CoreError::ScriptError(err).into()),
+        };
+
         script.creator = creator;
         Ok(script)
     }
@@ -34,17 +35,33 @@ impl Script {
 // *** Scripts ***
 // ***************
 
-#[derive(Settings, Debug)]
 pub struct Scripts {
-    #[settings(file_lock = "CoreScripts")]
-    file_lock: FlockLock<File>,
     base_path: PathBuf,
-
-    #[settings(priority = "Local")]
     scripts: CoreScripts,
 }
 
 impl Scripts {
+    pub fn new(path: PathBuf) -> Self {
+        Self {
+            base_path: path,
+            scripts: CoreScripts::default(),
+        }
+    }
+
+    pub fn load_from(base_path: impl Into<PathBuf>) -> Result<Self> {
+        let base_path = base_path.into();
+        let path = base_path.join(Self::rel_path());
+        let fh = fs::OpenOptions::new().read(true).open(path)?;
+        let scripts = serde_json::from_reader(fh)?;
+
+        Ok(Self { base_path, scripts })
+    }
+
+    pub fn save(&self) -> Result {
+        fs::write(self.path(), serde_json::to_string_pretty(&self.scripts)?)?;
+        Ok(())
+    }
+
     /// Inserts a script.
     ///
     /// # Errors
@@ -52,7 +69,7 @@ impl Scripts {
     /// already present.
     pub fn insert_script(&mut self, script: CoreScript) -> Result {
         if self.scripts.contains_path(&script.path) {
-            return Err(CoreError::ResourceError(ResourceError::AlreadyExists(
+            return Err(CoreError::ResourceError(ResourceError::already_exists(
                 "`Script` with same path is already present",
             ))
             .into());
@@ -64,16 +81,16 @@ impl Scripts {
 }
 
 impl Deref for Scripts {
-    type Target = ResourceMap<CoreScript>;
+    type Target = CoreScripts;
 
     fn deref(&self) -> &Self::Target {
-        &*self.scripts
+        &self.scripts
     }
 }
 
 impl DerefMut for Scripts {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut *self.scripts
+        &mut self.scripts
     }
 }
 
@@ -83,7 +100,7 @@ impl Into<CoreScripts> for Scripts {
     }
 }
 
-impl LocalSettings<CoreScripts> for Scripts {
+impl LocalResource<CoreScripts> for Scripts {
     fn rel_path() -> PathBuf {
         scripts_file()
     }
@@ -93,17 +110,6 @@ impl LocalSettings<CoreScripts> for Scripts {
     }
 }
 
-impl From<Loader<CoreScripts>> for Scripts {
-    fn from(loader: Loader<CoreScripts>) -> Self {
-        let loader: Components<CoreScripts> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            base_path: loader.base_path,
-            scripts: loader.data,
-        }
-    }
-}
-
 #[cfg(test)]
 #[path = "./script_test.rs"]
 mod script_test;
diff --git a/local/src/project/resources/standard_properties.rs b/local/src/project/resources/standard_properties.rs
deleted file mode 100644
index 0a5da3c7..00000000
--- a/local/src/project/resources/standard_properties.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use crate::system::settings::user_settings::UserSettings;
-use crate::Result;
-use settings_manager::system_settings::Loader;
-use thot_core::project::StandardProperties as CoreStandardProperties;
-use thot_core::types::{Creator, UserId};
-
-pub struct StandardProperties;
-
-impl StandardProperties {
-    /// Creates a new [`StandardProperties`] with fields actively filled from system settings.
-    pub fn new() -> Result<CoreStandardProperties> {
-        let settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
-        let creator = match settings.active_user.as_ref() {
-            Some(uid) => Some(UserId::Id(uid.clone().into())),
-            None => None,
-        };
-
-        let creator = Creator::User(creator);
-        let mut props = CoreStandardProperties::new();
-        props.creator = creator;
-
-        Ok(props)
-    }
-}
-
-#[cfg(test)]
-#[path = "standard_properties_test.rs"]
-mod standard_properties_test;
diff --git a/local/src/project/resources/standard_properties_test.rs b/local/src/project/resources/standard_properties_test.rs
deleted file mode 100644
index 1f984e7a..00000000
--- a/local/src/project/resources/standard_properties_test.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use super::*;
-
-#[test]
-fn new_should_work() {
-    StandardProperties::new().expect("new should work");
-}
diff --git a/local/src/project/script.rs b/local/src/project/script.rs
index 2e958c60..5599b40f 100644
--- a/local/src/project/script.rs
+++ b/local/src/project/script.rs
@@ -1,17 +1,11 @@
 //! High level functionality for handling `Scripts`.
 use super::container;
-use super::resources::{
-    container::ContainerProperties, Script as ProjectScript, Scripts as ProjectScripts,
-};
+use super::resources::{Container, Script as ProjectScript, Scripts as ProjectScripts};
 use crate::error::{ContainerError, Result};
-use crate::system::collections::Projects;
-use crate::system::collections::Scripts as SystemScripts;
-use settings_manager::{
-    local_settings::Loader as LocalLoader, system_settings::Loader as SystemLoader, Settings,
-};
+use crate::system::collections::{Projects, Scripts as SystemScripts};
 use std::path::{Path, PathBuf};
 use thot_core::error::{Error as CoreError, ProjectError as CoreProjectError, ResourceError};
-use thot_core::project::RunParameters;
+use thot_core::project::ScriptAssociation;
 use thot_core::types::{ResourceId, ResourcePath};
 
 // ***************
@@ -20,14 +14,15 @@ use thot_core::types::{ResourceId, ResourcePath};
 
 /// Initialize a file as a [`Script`](CoreScript).
 pub fn init(project: ResourceId, path: PathBuf) -> Result<ResourceId> {
-    let projects: Projects = SystemLoader::load_or_create::<Projects>()?.into();
+    let projects = Projects::load()?;
     let Some(project) = projects.get(&project) else {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist("`Project` does not exist")).into());
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
+            "`Project` does not exist",
+        ))
+        .into());
     };
 
-    let mut scripts: ProjectScripts =
-        LocalLoader::load_or_create::<ProjectScripts>(project.clone())?.into();
-
+    let mut scripts = ProjectScripts::load_from(project.clone())?;
     let path = ResourcePath::new(path)?;
     let script = ProjectScript::new(path)?;
 
@@ -58,22 +53,19 @@ pub fn add_association(script: &ResourceId, container: &Path) -> Result {
     }
 
     // get script
-    let scripts: SystemScripts = SystemLoader::load_or_create::<SystemScripts>()?.into();
+    let scripts = SystemScripts::load()?;
     let Some(script) = scripts.get(script) else {
-        return Err(CoreError::ProjectError(
-            CoreProjectError::NotRegistered(Some(script.clone()), None)).into()
-        )
+        return Err(CoreError::ProjectError(CoreProjectError::NotRegistered(
+            Some(script.clone()),
+            None,
+        ))
+        .into());
     };
 
     // add association
-    let mut container: ContainerProperties =
-        LocalLoader::load_or_create::<ContainerProperties>(container.into())?.into();
-    container
-        .scripts_mut()
-        .insert(script.rid.clone(), RunParameters::new());
-
-    container.save()?;
-    Ok(())
+    let mut container = Container::load_from(container)?;
+    container.add_script_association(ScriptAssociation::new(script.rid.clone()))?;
+    container.save()
 }
 
 #[cfg(test)]
diff --git a/local/src/project/script_test.rs b/local/src/project/script_test.rs
index 4766890c..99448b93 100644
--- a/local/src/project/script_test.rs
+++ b/local/src/project/script_test.rs
@@ -4,88 +4,14 @@ use crate::project::{container, project};
 use crate::system::scripts;
 use dev_utils::fs::TempDir;
 
-// **************
-// *** Script ***
-// **************
-
-// #[test]
-// fn init_with_default_project_should_work() {
-//     // setup
-//     let mut _dir = init_project().expect("setup should work");
-//     let s_path = _dir
-//         .mkfile_with_extension("py")
-//         .expect("mkfile should work");
-
-//     // test
-//     let rid = init(s_path.as_path(), None).expect("init should work");
-//     let scripts = Scripts::load(_dir.path()).expect("load scripts should work");
-//     assert!(scripts.contains(&rid), "script should be registered");
-// }
-
-// #[test]
-// fn init_with_specified_project_should_work() {
-//     // setup
-//     let mut _dir = TempDir::new().expect("setup should work");
-//     let p_dir = _dir
-//         .mkdir()
-//         .expect("creating project directory should work");
-//     let s_dir = _dir.mkdir().expect("creating script directory should work");
-
-//     project::init(&p_dir).expect("init project should work");
-//     let mut s_path = s_dir.join(FileName(EN).fake::<String>());
-//     s_path.set_extension(".py");
-
-//     // test
-//     let rid = init(&s_path, Some(&p_dir)).expect("init should work");
-//     let scripts = Scripts::load(&p_dir).expect("load scripts should work");
-//     assert!(scripts.contains(&rid), "script should be registered");
-// }
-
-// #[test]
-// fn init_should_do_nothing_if_path_already_initialized_as_script() {
-//     // setup
-//     let mut _dir = init_project().expect("setup should work");
-//     let s_path = _dir
-//         .mkfile_with_extension("py")
-//         .expect("mkfile should work");
-//     let rid = init(&s_path, None).expect("initial script init should work");
-
-//     // test
-//     let found = init(&s_path, None).expect("second script init should work");
-//     assert_eq!(rid, found, "resource ids should match");
-// }
-
-// #[test]
-// #[should_panic(expected = "PathNotInProject")]
-// fn init_with_default_project_but_not_in_project_should_error() {
-//     // setup
-//     let _dir = TempDir::new().expect("setup should work");
-//     let s_path = _dir.path().join(FileName(EN).fake::<String>());
-
-//     // test
-//     init(&s_path, None).unwrap();
-// }
-
-// #[test]
-// #[should_panic(expected = "PathNotAProjectRoot")]
-// fn init_if_project_root_is_invalid_should_error() {
-//     // setup
-//     let _dir = TempDir::new().expect("setup should work");
-//     let s_path = create_path_in(_dir.path());
-
-//     // test
-//     init(&s_path.as_path(), Some(_dir.path())).unwrap();
-// }
-
-// **************************
-// *** Script Association ***
-// **************************
-
 #[test]
 fn add_association_should_work() {
     // setup
     let mut _dir = init_project().expect("setup should work");
-    let _cid = container::init(_dir.path()).expect("init as container should work");
+    let builder = container::InitOptions::init();
+    let _cid = builder
+        .build(_dir.path())
+        .expect("init as container should work");
     let s_path = _dir
         .mkfile_with_extension("py")
         .expect("mkfile should work");
@@ -94,7 +20,7 @@ fn add_association_should_work() {
 
     // test
     let _rid = add_association(&sid, _dir.path()).expect("add association should work");
-    let container = Container::load(_dir.path()).expect("load container should work");
+    let container = Container::load_from(_dir.path()).expect("load container should work");
     assert_eq!(
         1,
         container.scripts.len(),
diff --git a/local/src/project/types/container.rs b/local/src/project/types/container.rs
deleted file mode 100644
index a95d4948..00000000
--- a/local/src/project/types/container.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! Container types.
-use serde::{Deserialize, Serialize};
-use thot_core::project::container::{Container as CoreContainer, ScriptMap};
-use thot_core::project::StandardProperties;
-use thot_core::types::{ResourceId, UserPermissions};
-
-// ****************************
-// *** Container Properties ***
-// ****************************
-
-/// Container properties for persistance.
-#[derive(Serialize, Deserialize, Clone)]
-pub struct ContainerProperties {
-    pub rid: ResourceId,
-    pub properties: StandardProperties,
-    pub scripts: ScriptMap,
-}
-
-impl ContainerProperties {
-    pub fn scripts_mut(&mut self) -> &mut ScriptMap {
-        &mut self.scripts
-    }
-}
-
-impl Default for ContainerProperties {
-    fn default() -> Self {
-        Self {
-            rid: ResourceId::new(),
-            properties: StandardProperties::default(),
-            scripts: ScriptMap::default(),
-        }
-    }
-}
-
-impl From<CoreContainer> for ContainerProperties {
-    fn from(container: CoreContainer) -> Self {
-        Self {
-            rid: container.rid,
-            properties: container.properties,
-            scripts: container.scripts,
-        }
-    }
-}
-
-// **************************
-// *** Container Settings ***
-// **************************
-
-#[derive(Serialize, Deserialize, Clone, Default, Debug)]
-pub struct ContainerSettings {
-    pub permissions: Vec<UserPermissions>,
-}
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/local/src/project/types/container_test.rs b/local/src/project/types/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/types/mod.rs b/local/src/project/types/mod.rs
deleted file mode 100644
index 7587a6b9..00000000
--- a/local/src/project/types/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Basic types for local `Project`s.
-pub mod container;
-pub mod project_settings;
-
-// Re-exports
-pub use container::{ContainerProperties, ContainerSettings};
-pub use project_settings::ProjectSettings;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/project/types/mod_test.rs b/local/src/project/types/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/types/project_settings_test.rs b/local/src/project/types/project_settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/collections/mod.rs b/local/src/system/collections/mod.rs
index 40cf8695..ae2e0a9b 100644
--- a/local/src/system/collections/mod.rs
+++ b/local/src/system/collections/mod.rs
@@ -14,7 +14,3 @@ pub use projects::Projects;
 pub use scripts::Scripts;
 pub use templates::Templates;
 pub use users::Users;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/system/collections/mod_test.rs b/local/src/system/collections/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/collections/projects.rs b/local/src/system/collections/projects.rs
index 95f96a69..17c6a7c1 100644
--- a/local/src/system/collections/projects.rs
+++ b/local/src/system/collections/projects.rs
@@ -1,10 +1,10 @@
 //! Projects collection.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use settings_manager::system_settings::{Components, Loader, SystemSettings};
-use settings_manager::Settings;
-use std::fs::File;
+use crate::Result;
+use serde::{Deserialize, Serialize};
+use std::fs;
+use std::io::{self, BufReader};
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
 use thot_core::types::ResourceMap;
@@ -12,35 +12,50 @@ use thot_core::types::ResourceMap;
 /// Map from a [`Project`]'s id to its path.
 pub type ProjectMap = ResourceMap<PathBuf>;
 
-// ****************
-// *** Projects ***
-// ****************
+#[derive(Deserialize, Serialize, Default, Debug)]
+#[serde(transparent)]
+pub struct Projects(ProjectMap);
 
-#[derive(Derivative, Settings)]
-#[derivative(Debug)]
-pub struct Projects {
-    #[settings(file_lock = "ProjectMap")]
-    file_lock: FlockLock<File>,
+impl Projects {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
+    }
+
+    pub fn load_or_default() -> Result<Self> {
+        match fs::File::open(Self::path()) {
+            Ok(file) => {
+                let reader = BufReader::new(file);
+                Ok(serde_json::from_reader(reader)?)
+            }
+
+            Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(Self::default()),
+            Err(err) => Err(err.into()),
+        }
+    }
 
-    #[settings(priority = "User")]
-    projects: ProjectMap,
+    pub fn save(&self) -> Result {
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
+    }
 }
 
 impl Deref for Projects {
     type Target = ProjectMap;
 
     fn deref(&self) -> &Self::Target {
-        &self.projects
+        &self.0
     }
 }
 
 impl DerefMut for Projects {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.projects
+        &mut self.0
     }
 }
 
-impl SystemSettings<ProjectMap> for Projects {
+impl SystemResource<ProjectMap> for Projects {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
         let settings_dir = config_dir_path().expect("could not get settings directory");
@@ -48,16 +63,6 @@ impl SystemSettings<ProjectMap> for Projects {
     }
 }
 
-impl From<Loader<ProjectMap>> for Projects {
-    fn from(loader: Loader<ProjectMap>) -> Projects {
-        let loader: Components<ProjectMap> = loader.into();
-        Projects {
-            file_lock: loader.file_lock,
-            projects: loader.data,
-        }
-    }
-}
-
 #[cfg(test)]
 #[path = "./projects_test.rs"]
 mod projects_test;
diff --git a/local/src/system/collections/scripts.rs b/local/src/system/collections/scripts.rs
index 7934248d..53e38cc9 100644
--- a/local/src/system/collections/scripts.rs
+++ b/local/src/system/collections/scripts.rs
@@ -1,11 +1,11 @@
 //! Script collection for the system.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use settings_manager::system_settings::{Components, Loader, SystemSettings};
-use settings_manager::Settings;
+use crate::Result;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::fs::File;
+use std::fs;
+use std::io::BufReader;
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
 use thot_core::project::Script as CoreScript;
@@ -13,21 +13,22 @@ use thot_core::types::{ResourceId, ResourcePath};
 
 pub type ScriptMap = HashMap<ResourceId, CoreScript>;
 
-// ****************
-// *** Scripts ***
-// ****************
+#[derive(Serialize, Deserialize, Default, Debug)]
+#[serde(transparent)]
+pub struct Scripts(ScriptMap);
 
-#[derive(Derivative, Settings)]
-#[derivative(Debug)]
-pub struct Scripts {
-    #[settings(file_lock = "ScriptMap")]
-    file_lock: FlockLock<File>,
+impl Scripts {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
+    }
 
-    #[settings(priority = "User")]
-    scripts: ScriptMap,
-}
+    pub fn save(&self) -> Result {
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
+    }
 
-impl Scripts {
     /// Returns whether a script with the given path is registered.
     pub fn contains_path(&self, path: &ResourcePath) -> bool {
         self.by_path(path).len() > 0
@@ -45,17 +46,17 @@ impl Deref for Scripts {
     type Target = ScriptMap;
 
     fn deref(&self) -> &Self::Target {
-        &self.scripts
+        &self.0
     }
 }
 
 impl DerefMut for Scripts {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.scripts
+        &mut self.0
     }
 }
 
-impl SystemSettings<ScriptMap> for Scripts {
+impl SystemResource<ScriptMap> for Scripts {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
         let settings_dir = config_dir_path().expect("could not get settings directory");
@@ -63,16 +64,6 @@ impl SystemSettings<ScriptMap> for Scripts {
     }
 }
 
-impl From<Loader<ScriptMap>> for Scripts {
-    fn from(loader: Loader<ScriptMap>) -> Self {
-        let loader: Components<ScriptMap> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            scripts: loader.data,
-        }
-    }
-}
-
 #[cfg(test)]
 #[path = "./scripts_test.rs"]
 mod scripts_test;
diff --git a/local/src/system/collections/templates.rs b/local/src/system/collections/templates.rs
index 77a4db1e..fb19f986 100644
--- a/local/src/system/collections/templates.rs
+++ b/local/src/system/collections/templates.rs
@@ -1,11 +1,11 @@
 //! Collection of templates.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use settings_manager::system_settings::SystemSettings;
-use settings_manager::Settings;
+use crate::Result;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::fs::File;
+use std::fs;
+use std::io::BufReader;
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
 use thot_core::system::template::Project as ProjectTemplate;
@@ -13,17 +13,23 @@ use thot_core::types::ResourceId;
 
 pub type TemplateMap = HashMap<ResourceId, ProjectTemplate>;
 
-#[derive(Derivative, Settings)]
-#[derivative(Debug)]
-pub struct Templates {
-    #[settings(file_lock = "TemplateMap")]
-    file_lock: FlockLock<File>,
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(transparent)]
+pub struct Templates(TemplateMap);
+impl Templates {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
+    }
 
-    #[settings(priority = "User")]
-    templates: TemplateMap,
+    pub fn save(&self) -> Result {
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
+    }
 }
 
-impl SystemSettings<TemplateMap> for Templates {
+impl SystemResource<TemplateMap> for Templates {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
         let settings_dir = config_dir_path().expect("could not get settings directory");
@@ -35,16 +41,12 @@ impl Deref for Templates {
     type Target = TemplateMap;
 
     fn deref(&self) -> &Self::Target {
-        &self.templates
+        &self.0
     }
 }
 
 impl DerefMut for Templates {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.templates
+        &mut self.0
     }
 }
-
-#[cfg(test)]
-#[path = "./templates_test.rs"]
-mod templates_test;
diff --git a/local/src/system/collections/templates_test.rs b/local/src/system/collections/templates_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/collections/users.rs b/local/src/system/collections/users.rs
index 24e53070..ba257c6c 100644
--- a/local/src/system/collections/users.rs
+++ b/local/src/system/collections/users.rs
@@ -1,11 +1,11 @@
 //! User collection.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use settings_manager::system_settings::{Components, Loader, SystemSettings};
-use settings_manager::Settings;
+use crate::Result;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::fs::File;
+use std::fs;
+use std::io::BufReader;
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
 use thot_core::system::User;
@@ -13,48 +13,52 @@ use thot_core::types::ResourceId;
 
 pub type UserMap = HashMap<ResourceId, User>;
 
-#[derive(Derivative, Settings)]
-#[derivative(Debug)]
-pub struct Users {
-    #[settings(file_lock = "UserMap")]
-    file_lock: FlockLock<File>,
+#[derive(Serialize, Deserialize, Debug, Default)]
+#[serde(transparent)]
+pub struct Users(UserMap);
 
-    #[settings(priority = "User")]
-    pub users: UserMap,
+impl Users {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
+    }
+
+    pub fn load_or_default() -> Result<Self> {
+        match fs::File::open(Self::path()) {
+            Ok(file) => {
+                let reader = BufReader::new(file);
+                Ok(serde_json::from_reader(reader)?)
+            }
+
+            Err(_) => Ok(Self::default()),
+        }
+    }
+
+    pub fn save(&self) -> Result {
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
+    }
 }
 
 impl Deref for Users {
     type Target = UserMap;
 
     fn deref(&self) -> &Self::Target {
-        &self.users
+        &self.0
     }
 }
 
 impl DerefMut for Users {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.users
+        &mut self.0
     }
 }
 
-impl SystemSettings<UserMap> for Users {
+impl SystemResource<UserMap> for Users {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
         let settings_dir = config_dir_path().expect("could not get settings directory");
         settings_dir.join("users.json")
     }
 }
-
-impl From<Loader<UserMap>> for Users {
-    fn from(loader: Loader<UserMap>) -> Self {
-        let loader: Components<UserMap> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            users: loader.data,
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "./users_test.rs"]
-mod users_test;
diff --git a/local/src/system/collections/users_test.rs b/local/src/system/collections/users_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/common.rs b/local/src/system/common.rs
index f02893e6..54efeba9 100644
--- a/local/src/system/common.rs
+++ b/local/src/system/common.rs
@@ -1,13 +1,13 @@
 //! Common implmentation for system functionality.
+use crate::identifier::Identifier;
 use directories::ProjectDirs;
-use settings_manager::{Error as SettingsError, Result as SettingsResult};
 use std::io;
 use std::path::PathBuf;
 use thot_core::identifier::Identifier as CoreIdentifier;
-use crate::identifier::Identifier;
+use thot_core::Result;
 
 /// Returns directories for the user's Thot.
-pub fn system_dirs() -> SettingsResult<ProjectDirs> {
+pub fn system_dirs() -> Result<ProjectDirs> {
     let dirs_opt = ProjectDirs::from(
         &CoreIdentifier::qualifier(),
         &CoreIdentifier::organization(),
@@ -16,20 +16,17 @@ pub fn system_dirs() -> SettingsResult<ProjectDirs> {
 
     match dirs_opt {
         Some(dirs) => Ok(dirs),
-        None => Err(SettingsError::IoError(io::Error::new(
+        None => Err(io::Error::new(
             io::ErrorKind::NotFound,
             "system settings directory not found",
-        ))),
+        )
+        .into()),
     }
 }
 
 /// Returns the path to the user's config directory for Thot.
-pub fn config_dir_path() -> SettingsResult<PathBuf> {
+pub fn config_dir_path() -> Result<PathBuf> {
     let dirs = system_dirs()?;
     let path = dirs.config_dir();
     Ok(path.to_path_buf())
 }
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/local/src/system/common_test.rs b/local/src/system/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/mod.rs b/local/src/system/mod.rs
index a4e1ee4d..cf18647c 100644
--- a/local/src/system/mod.rs
+++ b/local/src/system/mod.rs
@@ -23,7 +23,3 @@ pub mod scripts;
 pub mod users;
 
 pub mod resources;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/system/mod_test.rs b/local/src/system/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/projects.rs b/local/src/system/projects.rs
index 1028e1a5..32d3efde 100644
--- a/local/src/system/projects.rs
+++ b/local/src/system/projects.rs
@@ -2,8 +2,7 @@
 use super::collections::projects::Projects;
 use crate::error::{Error, ProjectError, Result, SettingsValidationError};
 use crate::system::settings::user_settings::UserSettings;
-use settings_manager::system_settings::Loader;
-use settings_manager::Settings;
+use std::fs;
 use std::path::{Path, PathBuf};
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::types::ResourceId;
@@ -20,7 +19,8 @@ use thot_core::types::ResourceId;
 /// # See also
 /// + `insert_project`
 pub fn register_project(rid: ResourceId, path: PathBuf) -> Result {
-    let mut projects: Projects = Loader::load_or_create::<Projects>()?.into();
+    let path = fs::canonicalize(path)?;
+    let mut projects = Projects::load_or_default()?;
 
     // check if project is already registered.
     if projects.contains_key(&rid) {
@@ -31,13 +31,12 @@ pub fn register_project(rid: ResourceId, path: PathBuf) -> Result {
 
     projects.insert(rid, path);
     projects.save()?;
-
     Ok(())
 }
 
 /// Deregister a [`Project`].
 pub fn deregister_project(id: &ResourceId) -> Result {
-    let mut projects: Projects = Loader::load_or_create::<Projects>()?.into();
+    let mut projects = Projects::load()?;
     projects.remove(&id);
     projects.save()?;
     Ok(())
@@ -46,14 +45,16 @@ pub fn deregister_project(id: &ResourceId) -> Result {
 /// Retrieves a [`Project`] by its [`ResourceId`].
 /// Returns `None` if project is not found.
 pub fn get_path(id: &ResourceId) -> Result<Option<PathBuf>> {
-    let projects: Projects = Loader::load_or_create::<Projects>()?.into();
+    let projects = Projects::load()?;
     Ok(projects.get(id).cloned())
 }
 
 /// Returns a [`Project`] by its path.
-/// Returns None if project is not found.
-pub fn get_id(path: &Path) -> Result<Option<ResourceId>> {
-    let projects: Projects = Loader::load_or_create::<Projects>()?.into();
+/// # Returns
+/// `None` if path is not found.
+pub fn get_id(path: impl AsRef<Path>) -> Result<Option<ResourceId>> {
+    let path = path.as_ref();
+    let projects = Projects::load()?;
     let projects = &projects
         .iter()
         .filter_map(
@@ -79,7 +80,7 @@ pub fn get_id(path: &Path) -> Result<Option<ResourceId>> {
 /// Updates a [`Project`].
 /// Replaces the project in the projects collection with the same id.
 pub fn insert_project(rid: ResourceId, path: PathBuf) -> Result {
-    let mut projects: Projects = Loader::load_or_create::<Projects>()?.into();
+    let mut projects = Projects::load()?;
     projects.insert(rid, path);
 
     projects.save()?;
@@ -94,7 +95,7 @@ pub fn set_active_project(id: &ResourceId) -> Result {
         ));
     };
 
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut settings = UserSettings::load()?;
     settings.active_project = Some((*id).clone().into());
     settings.save()?;
     Ok(())
@@ -110,14 +111,14 @@ pub fn set_active_project_by_path(path: &Path) -> Result {
         Some(p) => p,
     };
 
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut settings = UserSettings::load()?;
     settings.active_project = Some(project);
     settings.save()?;
     Ok(())
 }
 
 pub fn unset_active_project() -> Result {
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut settings = UserSettings::load()?;
     settings.active_project = None;
     settings.save()?;
     Ok(())
@@ -127,12 +128,12 @@ pub fn unset_active_project() -> Result {
 // *** private functions ***
 // *************************
 
-// @todo
+// TODO
 fn validate_project(id: &ResourceId) -> bool {
     true
 }
 
-// @todo
+// TODO
 fn validate_project_path(path: &Path) -> bool {
     true
 }
diff --git a/local/src/system/projects_test.rs b/local/src/system/projects_test.rs
index a1fe967a..f84601e7 100644
--- a/local/src/system/projects_test.rs
+++ b/local/src/system/projects_test.rs
@@ -1,6 +1,5 @@
 // @todo: Tests must be run with `--test-threads=1`.
 use super::*;
-use crate::system::resources::project::Project;
 use crate::Error;
 use dev_utils::{create_lock, lock::get_lock};
 use fake::faker::filesystem::raw::DirPath;
@@ -13,9 +12,9 @@ use thot_core::types::ResourceId;
 fn register_project_should_work() {
     let _m = get_lock(&MTX);
 
-    let prj = create_project();
-    let rid = prj.rid.clone();
-    register_project(prj).expect("register__project should work");
+    let (prj, path) = create_project();
+    let rid = prj.clone();
+    register_project(prj, path).expect("register__project should work");
 
     let mut projects = Projects::load().expect("could not load Projects");
     let project = projects.get(&rid);
@@ -32,11 +31,11 @@ fn register_project_should_work() {
 fn register_project_should_error_if_id_already_exists() {
     let _m = get_lock(&MTX);
 
-    let prj0 = create_project();
+    let (prj0, path) = create_project();
     let prj1 = prj0.clone();
 
-    register_project(prj0).expect("register_project should work");
-    match register_project(prj1) {
+    register_project(prj0, path.clone()).expect("register_project should work");
+    match register_project(prj1, path) {
         Err(Error::CoreError(CoreError::ResourceError(ResourceError::DuplicateId(_)))) => {} // expected error
         res => panic!(
             "Unexpected result. Expected duplicate id error found {:?}",
@@ -49,12 +48,12 @@ fn register_project_should_error_if_id_already_exists() {
 fn deregister_project_should_work() {
     let _m = get_lock(&MTX);
 
-    let prj = create_project();
-    register_project(prj.clone()).expect("register_project should work");
-    deregister_project(&prj.rid).expect("deregister_project should work");
+    let (prj, path) = create_project();
+    register_project(prj.clone(), path).expect("register_project should work");
+    deregister_project(&prj).expect("deregister_project should work");
 
     let projects = Projects::load().expect("could not load projects");
-    let project = projects.get(&prj.rid);
+    let project = projects.get(&prj);
 
     assert!(project.is_none(), "project not removed");
 }
@@ -63,48 +62,18 @@ fn deregister_project_should_work() {
 fn deregister_project_should_exit_silently_if_project_did_not_exist() {
     let _m = get_lock(&MTX);
 
-    let prj = create_project();
-    deregister_project(&prj.rid).expect("deregister_project should work");
-}
-
-#[test]
-fn project_by_id_should_work() {
-    let _m = get_lock(&MTX);
-
-    let prj = create_project();
-    let rid = prj.rid.clone();
-    register_project(prj).expect("register_project should work");
-
-    let found_prj = project_by_id(&rid).expect("find project should work");
-
-    let Some(found_prj) = found_prj else {
-        panic!("project not found");
-    };
-
-    assert_eq!(rid, found_prj.rid, "resource ids should match");
-
-    // clean up
-    deregister_project(&rid).expect("deregister_project should work");
-}
-
-#[test]
-fn project_by_id_should_return_none_if_project_does_not_exist() {
-    let _m = get_lock(&MTX);
-
-    let prj = create_project();
-    let prj = project_by_id(&prj.rid).expect("should not error");
-
-    assert_eq!(None, prj, "project should be none");
+    let (prj, _path) = create_project();
+    deregister_project(&prj).expect("deregister_project should work");
 }
 
 // ************************
 // *** helper functions ***
 // ************************
 
-fn create_project() -> Project {
+fn create_project() -> (ResourceId, PathBuf) {
     let rid = ResourceId::new();
     let path = DirPath(EN).fake();
-    Project::new(rid, path)
+    (rid, path)
 }
 
 create_lock!(MTX);
diff --git a/local/src/system/resources/mod_test.rs b/local/src/system/resources/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/resources/user_preferences.rs b/local/src/system/resources/user_preferences.rs
index 774daf6d..b9605bf0 100644
--- a/local/src/system/resources/user_preferences.rs
+++ b/local/src/system/resources/user_preferences.rs
@@ -58,7 +58,3 @@ impl Default for AnalysisUserPreferences {
         Self {}
     }
 }
-
-#[cfg(test)]
-#[path = "./user_preferences_test.rs"]
-mod user_preferences_test;
diff --git a/local/src/system/resources/user_preferences_test.rs b/local/src/system/resources/user_preferences_test.rs
deleted file mode 100644
index e1fa9bba..00000000
--- a/local/src/system/resources/user_preferences_test.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use super::*;
-
-#[test]
-fn user_preferences_new_should_work() {
-    let _prefs = UserPreferences::new();
-}
-
-#[test]
-fn project_user_preferences_new_should_work() {
-    let prefs = ProjectUserPreferences::new();
-
-    assert_eq!(
-        AssetFileAction::Move,
-        prefs.asset_file_action,
-        "asset_file_action should default to move"
-    );
-
-    assert_eq!(
-        true, prefs.rename_folder_on_name_change,
-        "rename_folder_on_name_change should default to true"
-    );
-
-    assert_eq!(
-        false, prefs.delete_on_exclude,
-        "delete_on_exclude should default to false"
-    );
-
-    assert_eq!(
-        true, prefs.format_metdata_objects,
-        "format_metdata_objects should default to true"
-    );
-
-    assert_eq!(
-        false, prefs.show_inherited_metadata,
-        "show_inherited_metadata should defualt to false"
-    );
-}
-
-#[test]
-fn analysis_user_preferences_new_should_work() {
-    let _prefs = AnalysisUserPreferences::new();
-}
diff --git a/local/src/system/scripts.rs b/local/src/system/scripts.rs
index 926a5515..719f6248 100644
--- a/local/src/system/scripts.rs
+++ b/local/src/system/scripts.rs
@@ -1,11 +1,11 @@
 //! Functionality to handle Scripts at a system level.
 use super::collections::scripts::Scripts;
 use crate::Result;
-use settings_manager::{system_settings::Loader, Settings};
 use std::path::Path;
 use std::{fs, io};
 use thot_core::project::Script;
 use thot_core::types::{ResourceId, ResourcePath};
+use thot_core::Error as CoreError;
 use uuid::Uuid;
 
 // **************
@@ -24,16 +24,14 @@ pub fn make_script(file: &Path) -> Result<ResourceId> {
         );
     }
 
-    let abs_path = match fs::canonicalize(file) {
-        Ok(path) => path,
-        Err(err) => return Err(err.into()),
+    let abs_path = ResourcePath::new(fs::canonicalize(file)?)?;
+    let script = match Script::new(abs_path) {
+        Ok(script) => script,
+        Err(err) => return Err(CoreError::ScriptError(err).into()),
     };
-
-    let abs_path = ResourcePath::new(abs_path)?;
-    let script = Script::new(abs_path)?;
     let rid = script.rid.clone();
 
-    let mut scripts: Scripts = Loader::load_or_create::<Scripts>()?.into();
+    let mut scripts = Scripts::load()?;
     scripts.insert(rid.clone(), script);
     scripts.save()?;
 
diff --git a/local/src/system/settings/mod.rs b/local/src/system/settings/mod.rs
index 6eeb0e46..2e7ab1fd 100644
--- a/local/src/system/settings/mod.rs
+++ b/local/src/system/settings/mod.rs
@@ -5,7 +5,3 @@ pub mod user_settings;
 // Re-exports
 pub use runner_settings::RunnerSettings;
 pub use user_settings::UserSettings;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/system/settings/mod_test.rs b/local/src/system/settings/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/settings/runner_settings.rs b/local/src/system/settings/runner_settings.rs
index 12572295..d81d2234 100644
--- a/local/src/system/settings/runner_settings.rs
+++ b/local/src/system/settings/runner_settings.rs
@@ -1,20 +1,12 @@
-/// Runner settings.
+//! Runner settings.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
+use crate::Result;
 use serde::{Deserialize, Serialize};
-use settings_manager::settings::Settings;
-use settings_manager::system_settings::{Components, Loader, SystemSettings};
-use settings_manager::types::Priority as SettingsPriority;
-use settings_manager::Result as SettingsResult;
-use std::borrow::Cow;
-use std::fs::File;
-use std::ops::{Deref, DerefMut};
+use std::fs;
+use std::io::BufReader;
 use std::path::PathBuf;
 
-// *********************
-// *** Runner Settings ***
-// *********************
-
 /// Represents Thot runner settings.
 ///
 /// # Default
@@ -25,85 +17,31 @@ use std::path::PathBuf;
 /// # Fields
 /// + **python_path:** Option for the python binary path.
 /// + **r_path:** Option for the r binary path.
-pub struct RunnerSettings {
-    file_lock: FlockLock<File>,
-    settings: LocalRunnerSettings,
-}
-
-//@todo[m]: Code duplication from user_settings.rs
-impl RunnerSettings {
-    /// Returns the path to the users config directory for Thot.
-    pub fn dir_path() -> SettingsResult<PathBuf> {
-        let path = config_dir_path()?;
-        Ok(path.to_path_buf())
-    }
-}
-
-impl Deref for RunnerSettings {
-    type Target = LocalRunnerSettings;
-
-    fn deref(&self) -> &Self::Target {
-        &self.settings
-    }
-}
-
-impl DerefMut for RunnerSettings {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.settings
-    }
-}
-
-/// Runner settings.
 #[derive(Serialize, Deserialize, Clone, Default)]
-pub struct LocalRunnerSettings {
+pub struct RunnerSettings {
     pub python_path: Option<String>,
     pub r_path: Option<String>,
 }
 
-impl Settings<LocalRunnerSettings> for RunnerSettings {
-    fn settings(&self) -> Cow<LocalRunnerSettings> {
-        Cow::Owned(LocalRunnerSettings {
-            python_path: self.python_path.clone(),
-            r_path: self.r_path.clone(),
-        })
-    }
-
-    fn file(&self) -> &File {
-        &*self.file_lock
-    }
-
-    fn file_mut(&mut self) -> &mut File {
-        &mut *self.file_lock
-    }
-
-    fn file_lock(&self) -> &FlockLock<File> {
-        &self.file_lock
+impl RunnerSettings {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
     }
 
-    fn priority(&self) -> SettingsPriority {
-        SettingsPriority::User
+    pub fn save(&self) -> Result {
+        fs::create_dir_all(Self::path().parent().expect("invalid path"))?;
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
     }
 }
 
-impl SystemSettings<LocalRunnerSettings> for RunnerSettings {
+// TODO Should probably be a `UserResource`.
+impl SystemResource<RunnerSettings> for RunnerSettings {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
-        let settings_dir = Self::dir_path().expect("could not get settings directory");
+        let settings_dir = config_dir_path().expect("could not get config directory");
         settings_dir.join("runner_settings.json")
     }
 }
-
-impl From<Loader<LocalRunnerSettings>> for RunnerSettings {
-    fn from(loader: Loader<LocalRunnerSettings>) -> Self {
-        let loader: Components<LocalRunnerSettings> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            settings: loader.data,
-        }
-    }
-}
-
-//@todo[l]: Add tests, not urgent since code logic similar to user_settings.rs
-// #[cfg(test)]
-// #[path = "./runner_settings_test.rs"]
-// mod runner_settings_test;
diff --git a/local/src/system/settings/user_settings.rs b/local/src/system/settings/user_settings.rs
index f4c17fd1..8068f06c 100644
--- a/local/src/system/settings/user_settings.rs
+++ b/local/src/system/settings/user_settings.rs
@@ -1,108 +1,50 @@
-/// User settings.
+use crate::file_resource::SystemResource;
 use crate::system::common::config_dir_path;
-use cluFlock::FlockLock;
+use crate::Result;
 use serde::{Deserialize, Serialize};
-use settings_manager::settings::Settings;
-use settings_manager::system_settings::{Components, Loader, SystemSettings};
-use settings_manager::types::Priority as SettingsPriority;
-use settings_manager::Result as SettingsResult;
-use std::borrow::Cow;
-use std::fs::File;
-use std::ops::{Deref, DerefMut};
+use std::fs;
+use std::io::BufReader;
 use std::path::PathBuf;
 use thot_core::types::ResourceId;
 
-// *********************
-// *** User Settings ***
-// *********************
-
-/// Represents Thot user settings.
-///
-/// # Default
-/// UserSettings::default is derived so does not automatically obtain a file lock.
-/// This is done intentionally as it may not reflect the current state of the persisted settings.
-/// To obtain the file lock use the `UserSettings#acquire_lock` method.
-///
-/// # Fields
-/// + **active_user:** Option of the active User id.
-/// + **active_project:** Option of the active Project id.
-pub struct UserSettings {
-    file_lock: FlockLock<File>,
-    settings: LocalUserSettings,
-}
-
-impl UserSettings {
-    /// Returns the path to the users config directory for Thot.
-    pub fn dir_path() -> SettingsResult<PathBuf> {
-        let path = config_dir_path()?;
-        Ok(path.to_path_buf())
-    }
-}
-
-impl Deref for UserSettings {
-    type Target = LocalUserSettings;
-
-    fn deref(&self) -> &Self::Target {
-        &self.settings
-    }
-}
-
-impl DerefMut for UserSettings {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.settings
-    }
-}
-
 /// User settings.
 #[derive(Serialize, Deserialize, Clone, Default)]
-pub struct LocalUserSettings {
+pub struct UserSettings {
     pub active_user: Option<ResourceId>,
     pub active_project: Option<ResourceId>,
 }
 
-impl Settings<LocalUserSettings> for UserSettings {
-    fn settings(&self) -> Cow<LocalUserSettings> {
-        Cow::Owned(LocalUserSettings {
-            active_user: self.active_user.clone(),
-            active_project: self.active_project.clone(),
-        })
-    }
-
-    fn file(&self) -> &File {
-        &*self.file_lock
+impl UserSettings {
+    pub fn load() -> Result<Self> {
+        let file = fs::File::open(Self::path())?;
+        let reader = BufReader::new(file);
+        Ok(serde_json::from_reader(reader)?)
     }
 
-    fn file_mut(&mut self) -> &mut File {
-        &mut *self.file_lock
-    }
+    pub fn load_or_default() -> Result<Self> {
+        match fs::File::open(Self::path()) {
+            Ok(file) => {
+                let reader = BufReader::new(file);
+                Ok(serde_json::from_reader(reader)?)
+            }
 
-    fn file_lock(&self) -> &FlockLock<File> {
-        &self.file_lock
+            Err(_) => Ok(Self::default()),
+        }
     }
 
-    fn priority(&self) -> SettingsPriority {
-        SettingsPriority::User
+    pub fn save(&self) -> Result {
+        fs::write(Self::path(), serde_json::to_string_pretty(&self)?)?;
+        Ok(())
     }
 }
 
-impl SystemSettings<LocalUserSettings> for UserSettings {
+impl SystemResource<UserSettings> for UserSettings {
     /// Returns the path to the system settings file.
     fn path() -> PathBuf {
-        let settings_dir = Self::dir_path().expect("could not get settings directory");
-        settings_dir.join("settings.json")
-    }
-}
+        let settings_dir = config_dir_path()
+            .expect("could not get config dir")
+            .to_path_buf();
 
-impl From<Loader<LocalUserSettings>> for UserSettings {
-    fn from(loader: Loader<LocalUserSettings>) -> Self {
-        let loader: Components<LocalUserSettings> = loader.into();
-        Self {
-            file_lock: loader.file_lock,
-            settings: loader.data,
-        }
+        settings_dir.join("settings.json")
     }
 }
-
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/local/src/system/settings/user_settings_test.rs b/local/src/system/settings/user_settings_test.rs
deleted file mode 100644
index 5f9dd2f9..00000000
--- a/local/src/system/settings/user_settings_test.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use super::*;
-use directories::ProjectDirs;
-use thot_core::identifier::Identifier;
-
-#[test]
-fn user_settings_dir_path_should_work() {
-    let ref_dirs = ProjectDirs::from(
-        &Identifier::qualifier(),
-        &Identifier::organization(),
-        &Identifier::application(),
-    )
-    .expect("could not find project directories.");
-
-    match UserSettings::dir_path() {
-        Ok(prj_dirs) => {
-            assert_eq!(ref_dirs.config_dir(), prj_dirs, "incorrect directory");
-        }
-        Err(err) => {
-            assert_eq!(false, true, "should not error: {:?}", err);
-        }
-    }
-}
-
-#[test]
-fn user_settings_file_path_should_work() {
-    let ref_dirs = ProjectDirs::from(
-        &Identifier::qualifier(),
-        &Identifier::organization(),
-        &Identifier::application(),
-    )
-    .expect("could not load user settings directory");
-
-    let ref_path = ref_dirs.config_dir().join("settings.json");
-    match UserSettings::path() {
-        Ok(path) => {
-            assert_eq!(
-                ref_path, path,
-                "should be in the settings directory with file name settings.json"
-            );
-        }
-        Err(err) => {
-            panic!("should not error: {:?}", err);
-        }
-    }
-}
-
-#[test]
-fn user_settings_load_should_work() {
-    let _settings = match UserSettings::load() {
-        Ok(sets) => sets,
-        Err(err) => {
-            panic!("should not error: {:?}", err);
-        }
-    };
-}
-
-#[test]
-fn user_settings_save_should_work() {
-    let mut settings = UserSettings::default();
-    settings.acquire_lock().expect("file lock not acquired");
-
-    if let Err(err) = settings.save() {
-        panic!("should not cause error: {:?}", err);
-    };
-}
-
-#[test]
-fn user_settings_save_should_error_if_lock_not_obtained() {
-    let mut settings = UserSettings::default();
-    assert!(
-        settings.file().is_none(),
-        "default settings should not control file initially"
-    );
-
-    match settings.save() {
-        Ok(_) => {
-            panic!("settings saved without having obtained lock");
-        }
-        Err(err) => {
-            match err {
-                SettingsError::IoError(ioerr)
-                    if ioerr.kind() == io::ErrorKind::PermissionDenied =>
-                {
-                    // correct, pass
-                }
-
-                _ => {
-                    panic!("unexpected error kind: {:?}", err);
-                }
-            }
-        }
-    };
-}
-
-#[test]
-fn user_settings_default_should_not_acquire_file_lock() {
-    let settings = UserSettings::default();
-    assert!(
-        !settings.file().is_none(),
-        "default user settings should not lock file"
-    )
-}
diff --git a/local/src/system/template/mod.rs b/local/src/system/template/mod.rs
index ee7b6832..e7f9ad8e 100644
--- a/local/src/system/template/mod.rs
+++ b/local/src/system/template/mod.rs
@@ -3,7 +3,3 @@ pub mod project;
 
 // Re-exports
 pub use project::Project;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/local/src/system/template/mod_test.rs b/local/src/system/template/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/template/project.rs b/local/src/system/template/project.rs
index 38e72333..9aef1fbc 100644
--- a/local/src/system/template/project.rs
+++ b/local/src/system/template/project.rs
@@ -1,26 +1,17 @@
 //! Project template.
+use crate::file_resource::UserResource;
 use crate::system::common::config_dir_path;
 use crate::Result;
-use cluFlock::FlockLock;
 use has_id::{HasId, HasIdSerde};
-use serde::{Deserialize, Serialize};
-use settings_manager::error::Result as SettingsResult;
-use settings_manager::{Priority as SettingsPriority, Settings, UserSettings};
-use std::borrow::Cow;
-use std::fs::File;
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use thot_core::graph::ResourceTree;
 use thot_core::project::Project as CoreProject;
-use thot_core::system::template::{Project as ProjectTemplate, ResourceTree as TreeTemplate};
+use thot_core::system::template::Project as ProjectTemplate;
 use thot_core::types::ResourceId;
 
-#[derive(Settings)]
 pub struct Project {
-    #[settings(file_lock = "ProjectTemplate")]
-    file_lock: FlockLock<File>,
     rel_path: PathBuf,
-    #[settings(priority = "System")]
     project: ProjectTemplate,
 }
 
@@ -57,7 +48,7 @@ impl DerefMut for Project {
     }
 }
 
-impl UserSettings<ProjectTemplate> for Project {
+impl UserResource<ProjectTemplate> for Project {
     /// Returns the base path to the settings file.
     fn base_path() -> PathBuf {
         let mut path = config_dir_path().expect("could not get config path");
@@ -71,7 +62,3 @@ impl UserSettings<ProjectTemplate> for Project {
         &self.rel_path
     }
 }
-
-#[cfg(test)]
-#[path = "./project_test.rs"]
-mod project_test;
diff --git a/local/src/system/template/project_test.rs b/local/src/system/template/project_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/system/users.rs b/local/src/system/users.rs
index 930741b6..c4b012be 100644
--- a/local/src/system/users.rs
+++ b/local/src/system/users.rs
@@ -1,7 +1,6 @@
 use super::collections::users::Users;
 use super::settings::user_settings::UserSettings;
 use crate::error::{Error, Result, UsersError};
-use settings_manager::{system_settings::Loader, Settings};
 use std::collections::HashMap;
 use thot_core::error::{Error as CoreError, ResourceError};
 use thot_core::system::User;
@@ -14,7 +13,7 @@ use validator;
 
 /// Returns a user by the given id if it exists, otherwise returns an error.
 pub fn user_by_id(rid: &ResourceId) -> Result<Option<User>> {
-    let users: Users = Loader::load_or_create::<Users>()?.into();
+    let users = Users::load()?;
     Ok(users.get(&rid).cloned())
 }
 
@@ -23,7 +22,7 @@ pub fn user_by_id(rid: &ResourceId) -> Result<Option<User>> {
 /// # Errors
 /// + [`UsersError::DuplicateEmail`]: If multiple users are registered with the given email.
 pub fn user_by_email(email: &str) -> Result<Option<User>> {
-    let users: Users = Loader::load_or_create::<Users>()?.into();
+    let users = Users::load()?;
     let users: Vec<&User> = users.values().filter(|user| user.email == email).collect();
 
     match users.len() {
@@ -42,7 +41,7 @@ pub fn add_user(user: User) -> Result {
         return Err(Error::UsersError(UsersError::InvalidEmail(user.email)));
     }
 
-    let mut users: Users = Loader::load_or_create::<Users>()?.into();
+    let mut users = Users::load_or_default()?;
 
     // check if email already exists
     let user_count = user_count_by_email(&user.email, &users);
@@ -61,8 +60,8 @@ pub fn add_user(user: User) -> Result {
 
 /// Delete a user by id.
 pub fn delete_user(rid: &ResourceId) -> Result {
-    let mut users: Users = Loader::load_or_create::<Users>()?.into();
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut users = Users::load()?;
+    let mut settings = UserSettings::load()?;
 
     users.remove(&rid);
 
@@ -95,7 +94,7 @@ pub fn update_user(user: User) -> Result {
         return Err(Error::UsersError(UsersError::InvalidEmail(user.email)));
     }
 
-    let mut users: Users = Loader::load_or_create::<Users>()?.into();
+    let mut users = Users::load()?;
     validate_id_is_present(&user.rid, &users)?;
 
     users.insert(user.rid.clone(), user);
@@ -105,7 +104,7 @@ pub fn update_user(user: User) -> Result {
 
 /// Gets the active user.
 pub fn get_active_user() -> Result<Option<User>> {
-    let user_settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let user_settings = UserSettings::load_or_default()?;
     let Some(active_user) = user_settings.active_user.as_ref() else {
         return Ok(None);
     };
@@ -119,12 +118,12 @@ pub fn get_active_user() -> Result<Option<User>> {
 /// + If the user represented by the id is not registered.
 pub fn set_active_user(rid: &ResourceId) -> Result {
     // ensure valid users
-    let users: Users = Loader::load_or_create::<Users>()?.into();
+    let users = Users::load()?;
     validate_id_is_present(&rid, &users)?;
 
     // set active user
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
-    settings.active_user = Some((*rid).clone().into());
+    let mut settings = UserSettings::load_or_default()?;
+    settings.active_user = Some(rid.clone());
     settings.save()?;
     Ok(())
 }
@@ -137,11 +136,11 @@ pub fn set_active_user_by_email(email: &str) -> Result {
     let user = user_by_email(email)?;
     let Some(user) = user else {
         return Err(Error::CoreError(CoreError::ResourceError(
-            ResourceError::DoesNotExist("email does not exist"),
+            ResourceError::does_not_exist("email does not exist"),
         )));
     };
 
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut settings = UserSettings::load()?;
     settings.active_user = Some(user.rid.into());
     settings.save()?;
     Ok(())
@@ -149,7 +148,7 @@ pub fn set_active_user_by_email(email: &str) -> Result {
 
 /// Unsets the active user.
 pub fn unset_active_user() -> Result {
-    let mut settings: UserSettings = Loader::load_or_create::<UserSettings>()?.into();
+    let mut settings = UserSettings::load()?;
     settings.active_user = None;
     settings.save()?;
     Ok(())
@@ -173,7 +172,7 @@ fn user_count_by_email(email: &str, users: &Users) -> usize {
 fn validate_id_is_present<V>(rid: &ResourceId, store: &HashMap<ResourceId, V>) -> Result {
     // validate id
     if !store.contains_key(&rid) {
-        return Err(CoreError::ResourceError(ResourceError::DoesNotExist(
+        return Err(CoreError::ResourceError(ResourceError::does_not_exist(
             "`User` does not exist.",
         ))
         .into());
diff --git a/local/src/types/asset.rs b/local/src/types/asset.rs
index 7da88e3a..cb371017 100644
--- a/local/src/types/asset.rs
+++ b/local/src/types/asset.rs
@@ -44,11 +44,7 @@ impl AssetFileAction {
             "move" => Ok(AssetFileAction::Move),
             "copy" => Ok(AssetFileAction::Copy),
             "reference" => Ok(AssetFileAction::Reference),
-            _ => Err(CoreError::ValueError("invalid `AssetFileAction` string").into()),
+            _ => Err(CoreError::value("invalid `AssetFileAction` string").into()),
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./asset_test.rs"]
-mod asset_test;
diff --git a/local/src/types/asset_test.rs b/local/src/types/asset_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/types/container.rs b/local/src/types/container.rs
new file mode 100644
index 00000000..a92a2434
--- /dev/null
+++ b/local/src/types/container.rs
@@ -0,0 +1,14 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use thot_core::types::UserPermissions;
+
+// *************************
+// *** ContainerSettings ***
+// *************************
+
+/// Settings for a Container
+#[derive(Serialize, Deserialize, Clone, Default, Debug)]
+pub struct ContainerSettings {
+    #[serde(default)]
+    pub permissions: Vec<UserPermissions>,
+}
diff --git a/local/src/types/mod.rs b/local/src/types/mod.rs
index 3b4c142d..259f2753 100644
--- a/local/src/types/mod.rs
+++ b/local/src/types/mod.rs
@@ -1,14 +1,8 @@
 pub mod asset;
-
-// #[cfg(feature = "fs")]
-// pub mod resource_store;
+pub mod container;
+pub mod project_settings;
 
 // Re-exports
 pub use asset::AssetFileAction;
-
-// #[cfg(feature = "fs")]
-// pub use resource_store::{LocalResourceMap, ResourceStore, ResourceValue};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub use container::ContainerSettings;
+pub use project_settings::ProjectSettings;
diff --git a/local/src/types/mod_test.rs b/local/src/types/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/local/src/project/types/project_settings.rs b/local/src/types/project_settings.rs
similarity index 77%
rename from local/src/project/types/project_settings.rs
rename to local/src/types/project_settings.rs
index a55fa858..b18f6940 100644
--- a/local/src/project/types/project_settings.rs
+++ b/local/src/types/project_settings.rs
@@ -1,8 +1,8 @@
-//! Local `Project` settings.
-use super::super::PROJECT_FORMAT_VERSION;
+use crate::constants::PROJECT_FORMAT_VERSION;
 use serde::{Deserialize, Serialize};
 use thot_core::types::{ResourceMap, UserPermissions};
 
+/// Settings for a local Project.
 #[derive(Serialize, Deserialize, PartialEq, Clone, Debug)]
 pub struct ProjectSettings {
     /// Format standard for the Project.
@@ -18,7 +18,3 @@ impl Default for ProjectSettings {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "./project_settings_test.rs"]
-mod project_settings_test;
diff --git a/local/src/types/resource_store.rs b/local/src/types/resource_store.rs
deleted file mode 100644
index 9a741180..00000000
--- a/local/src/types/resource_store.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-//! Resource map for local resources with a filesystem location.
-use crate::error::{Error, ResourceStoreError, Result};
-use serde::{Deserialize, Serialize};
-use settings_manager::LocalSettings;
-use std::collections::HashMap;
-use std::ops::{Deref, DerefMut};
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
-use thot_core::types::ResourceId;
-
-// *************
-// *** types ***
-// *************
-
-pub type ResourceWrapper<T> = Arc<Mutex<T>>;
-
-/// Types of items able to be stored.
-#[derive(Clone, Debug)]
-pub enum ResourceValue<T> {
-    /// No value set.
-    Empty,
-
-    /// Path to load resouce from.
-    Path(PathBuf),
-
-    /// Loaded resource.
-    Resource(ResourceWrapper<T>),
-}
-
-pub type LocalResourceMap<T> = HashMap<ResourceId, ResourceValue<T>>;
-
-// **********************
-// *** Resource Store ***
-// **********************
-
-#[cfg_attr(doc, aquamarine::aquamarine)]
-/// Store for local resources with an associated filesystem location.
-///
-/// # Store Values
-/// ```mermaid
-/// flowchart TD
-///     start(" ") -- "insert_id(ResourceId)" --> empty(Empty)
-///     empty -- "insert_path(ResourcId, PathBuf)" --> path("Path(PathBuf)")
-///     path -- "get_resource(ResourceId)" --> resource("Resource(Resource)")
-///     start -- "insert_resource(ResourceId, Resource)" --> resource
-/// ```
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ResourceStore<T>(
-    #[serde(with = "serialize_local_resource_map_keys_only")] LocalResourceMap<T>,
-)
-where
-    T: LocalSettings;
-
-impl<T> ResourceStore<T>
-where
-    T: LocalSettings,
-{
-    pub fn new() -> ResourceStore<T> {
-        ResourceStore(LocalResourceMap::<T>::new())
-    }
-
-    pub fn with_capacity(c: usize) -> ResourceStore<T> {
-        ResourceStore(LocalResourceMap::<T>::with_capacity(c))
-    }
-
-    /// Inserts a [`ResourceId`] with an [`ResourceValue::Empty`] if the
-    /// `ResourceId` is not already present, otherwise does nothing.
-    pub fn insert_id(&mut self, rid: ResourceId) {
-        if self.0.contains_key(&rid) {
-            return;
-        }
-
-        self.insert(rid, ResourceValue::Empty);
-    }
-
-    /// Associates a path with a `ResourceId` by setting its value to a
-    /// [`ResourceValue::Path`].
-    ///
-    /// # Returns
-    /// Previous value of the path if it was a [`ResourceValue::Path`] or `None` otherwise.
-    ///
-    /// # Errors
-    /// + [`ResourceStoreError::ResourceAlreadyLoaded`]: If the resource is already loaded,
-    ///     i.e. Has a [`ResourceValue::Resource`] associated with it.
-    pub fn insert_path(&mut self, rid: ResourceId, path: PathBuf) -> Result<Option<PathBuf>> {
-        if let Some(ResourceValue::Resource(_)) = self.get(&rid) {
-            return Err(Error::ResourceStoreError(
-                ResourceStoreError::ResourceAlreadyLoaded,
-            ));
-        }
-
-        let o_val = self.insert(rid.clone(), ResourceValue::Path(path));
-        match o_val {
-            Some(ResourceValue::Resource(_)) => panic!("Resource already set"),
-            Some(ResourceValue::Path(p)) => Ok(Some(p)),
-            Some(ResourceValue::Empty) => Ok(None),
-            None => Ok(None),
-        }
-    }
-
-    /// Gets the resourcs associated to the given [`ResourceId`].
-    ///
-    /// # Returns
-    /// Reference to the resource with the given [`ResourceId`],
-    /// or `None` if it is not a valid key.
-    ///
-    /// # Errors
-    /// + [`ResourceStoreError::LoadEmptyValue`]: If the value is [`ResourceValue::Empty`].
-    pub fn get_resource(&mut self, rid: &ResourceId) -> Option<Result<Arc<Mutex<T>>>> {
-        let res = self.get(rid);
-        let Some(res) = res else {
-            // id not found
-            return None;
-        };
-
-        match res {
-            ResourceValue::Empty => Some(Err(Error::ResourceStoreError(
-                ResourceStoreError::LoadEmptyValue,
-            ))),
-
-            ResourceValue::Resource(res) => return Some(Ok(res.clone())),
-
-            ResourceValue::Path(path) => {
-                // load resource and store in cache
-                let res = T::load(&path);
-                if let Err(err) = res {
-                    // error loading object
-                    return Some(Err(err.into()));
-                };
-
-                // store object
-                let res = res.expect("could not unwrap resource");
-                let res = Arc::new(Mutex::new(res));
-                self.insert(rid.clone(), ResourceValue::Resource(res.clone()));
-
-                Some(Ok(res))
-            }
-        }
-    }
-
-    /// Associates a [`ResourceId`] with a [`ResourceValue::Resource`].
-    ///
-    /// # Returns
-    /// The previous value if it was a [`ResourceValue::Resource`] or `None` otherwise.
-    pub fn insert_resource(&mut self, rid: ResourceId, res: T) -> Option<ResourceWrapper<T>> {
-        let o_val = self.insert(rid, ResourceValue::Resource(Arc::new(Mutex::new(res))));
-        match o_val {
-            Some(ResourceValue::Resource(res)) => Some(res),
-            _ => None,
-        }
-    }
-}
-
-impl<T> Deref for ResourceStore<T>
-where
-    T: LocalSettings,
-{
-    type Target = LocalResourceMap<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> DerefMut for ResourceStore<T>
-where
-    T: LocalSettings,
-{
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl<T> IntoIterator for ResourceStore<T>
-where
-    T: LocalSettings,
-{
-    type Item = (ResourceId, ResourceValue<T>);
-    type IntoIter = std::collections::hash_map::IntoIter<ResourceId, ResourceValue<T>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-/// Serialize and deserialize resource maps only using the keys.
-pub mod serialize_local_resource_map_keys_only {
-    use super::{LocalResourceMap, ResourceId, ResourceValue};
-    use serde::de;
-    use serde::ser::{SerializeSeq, Serializer};
-    use std::fmt;
-    use std::marker::PhantomData;
-
-    struct RidVisitor<S> {
-        marker: PhantomData<fn() -> LocalResourceMap<S>>,
-    }
-
-    impl<S> RidVisitor<S> {
-        fn new() -> Self {
-            RidVisitor {
-                marker: PhantomData,
-            }
-        }
-    }
-
-    impl<'de, S> de::Visitor<'de> for RidVisitor<S> {
-        type Value = LocalResourceMap<S>;
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            formatter.write_str("resource ids")
-        }
-
-        fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
-        where
-            A: de::SeqAccess<'de>,
-        {
-            let mut rmap = match seq.size_hint() {
-                None => LocalResourceMap::new(),
-                Some(c) => LocalResourceMap::with_capacity(c),
-            };
-
-            while let Some(rid) = seq.next_element::<ResourceId>()? {
-                rmap.insert(rid, ResourceValue::Empty);
-            }
-
-            Ok(rmap)
-        }
-    }
-
-    /// Serialize only the keys
-    pub fn serialize<S, T>(rmap: &LocalResourceMap<T>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut seq = serializer.serialize_seq(Some(rmap.len()))?;
-        for (rid, _) in rmap.iter() {
-            seq.serialize_element(&rid)?;
-        }
-
-        seq.end()
-    }
-
-    /// Deserialize from only keys, initializing values to None.
-    pub fn deserialize<'de, D, T>(deserializer: D) -> Result<LocalResourceMap<T>, D::Error>
-    where
-        D: de::Deserializer<'de>,
-    {
-        deserializer.deserialize_seq(RidVisitor::new())
-    }
-}
-
-#[cfg(test)]
-#[path = "./resource_store_test.rs"]
-mod resource_store_test;
diff --git a/local/src/types/resource_store_test.rs b/local/src/types/resource_store_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 726d1f1d..d145a99e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 # component history: https://rust-lang.github.io/rustup-components-history/
 [toolchain]
-channel = "nightly-2022-11-01"
+channel = "nightly-2023-10-02"
diff --git a/settings_manager/Cargo.lock b/settings_manager/Cargo.lock
deleted file mode 100644
index f52c9959..00000000
--- a/settings_manager/Cargo.lock
+++ /dev/null
@@ -1,603 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
-
-[[package]]
-name = "async-trait"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cluFlock"
-version = "1.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "config"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86"
-dependencies = [
- "async-trait",
- "json5",
- "lazy_static",
- "nom",
- "pathdiff",
- "ron",
- "rust-ini",
- "serde",
- "serde_json",
- "toml",
- "yaml-rust",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "directories"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dlv-list"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
-
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.123"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "ordered-multimap"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
-dependencies = [
- "dlv-list",
- "hashbrown",
-]
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-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.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ron"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678"
-dependencies = [
- "base64",
- "bitflags",
- "serde",
-]
-
-[[package]]
-name = "rust-ini"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "serde"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "settings_mangager"
-version = "0.1.0"
-dependencies = [
- "cluFlock",
- "config",
- "derivative",
- "directories",
- "tempfile",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer",
- "digest",
- "fake-simd",
- "opaque-debug",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[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 = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
diff --git a/settings_manager/Cargo.toml b/settings_manager/Cargo.toml
deleted file mode 100644
index 7366220c..00000000
--- a/settings_manager/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "settings_manager"
-version = "0.0.2"
-edition = "2021"
-
-authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
-description = "Settings manager."
-license = "MIT OR Apache-2.0"
-
-repository = "https://github.com/thot-data/settings_manager"
-keywords = [ "settings" ]
-categories = [ "config" ]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-derivative = "2.2"
-tempfile = "3.3"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-directories = "4.0"
-cluFlock = "1.2"
-
-settings_manager_derive = { path = "settings_manager_derive", optional = true }
-
-[dev-dependencies]
-rand = "0.8"
-fake = "2.4"
-
-dev_utils = { path = "../dev_utils" }
-
-[features]
-default = ["derive"]
-derive = ["dep:settings_manager_derive"]
diff --git a/settings_manager/LICENSE-APACHE b/settings_manager/LICENSE-APACHE
deleted file mode 100644
index ae435aba..00000000
--- a/settings_manager/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2022 Brian Carlsen
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/settings_manager/LICENSE-MIT b/settings_manager/LICENSE-MIT
deleted file mode 100644
index 9403ab38..00000000
--- a/settings_manager/LICENSE-MIT
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Brian Carlsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/settings_manager/README.md b/settings_manager/README.md
deleted file mode 100644
index cc43f9ed..00000000
--- a/settings_manager/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Settings Manager
-
-> Crate for managing settings.
-
-## Settings
-
-This is the base trait required to implement all other setting types. Settings
-objects lock their file while they exist so other processes can not modify them 
-
-## System Settings
-
-Represents settings that are used system wide. i.e. These represent settings
-that should be singletons.
-
-## Local Settings
-
-Represents settings that are local to a specific resource. i.e. Multiple
-instances of this type of settings can exist at once.
-
-## List Setting
-
-Represents a setting that is a simple list of objects.
diff --git a/settings_manager/settings_manager_change_path/Cargo.toml b/settings_manager/settings_manager_change_path/Cargo.toml
deleted file mode 100644
index 09c1d2c4..00000000
--- a/settings_manager/settings_manager_change_path/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "settings_manager_change_path"
-version = "0.0.1"
-edition = "2021"
-
-authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
-description = "Macro for setting the path of a Settings object. Used for testing."
-license = 'GPL-3.0'
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1.0"
-tempfile = "3.3"
-syn = { version = "1.0", features = [ "full", "extra-traits", "printing",
-"fold", "parsing" ] }
-quote = "1.0"
-settings_manager = { path = ".." }
-
-[dev-dependencies]
-macrotest = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-cluFlock = "1.2"
diff --git a/settings_manager/settings_manager_change_path/src/lib.rs b/settings_manager/settings_manager_change_path/src/lib.rs
deleted file mode 100644
index 0415daf2..00000000
--- a/settings_manager/settings_manager_change_path/src/lib.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Attribute macro to change the path of SettingsManager's.
- */
-use proc_macro::TokenStream;
-use proc_macro2::Span;
-use quote::{quote, ToTokens};
-use std::path::PathBuf;
-use syn::fold::Fold;
-use syn::token::Brace;
-use syn::{
-    parse2, parse_macro_input, AttributeArgs, Block, Expr, ExprBlock, ExprCall, ExprMethodCall,
-    ItemFn, Lit, NestedMeta, Stmt, Token,
-};
-use tempfile::NamedTempFile;
-
-struct ReplacePathCalls {
-    var_name: String,
-    path: PathBuf,
-    method: String,
-}
-
-impl ReplacePathCalls {
-    pub fn new(var_name: String, path: PathBuf) -> ReplacePathCalls {
-        ReplacePathCalls {
-            var_name,
-            path,
-            method: String::from("path"),
-        }
-    }
-
-    fn should_replace_path(&self, expr: &ExprMethodCall) -> bool {
-        // match receiver
-        let valid_recv = match &*expr.receiver {
-            Expr::Path(e_path) => match e_path.path.segments.first() {
-                Some(seg) => seg.ident == self.var_name,
-                None => false,
-            },
-
-            _ => return false,
-        };
-
-        // match method, #path
-        let valid_method = expr.method == self.method;
-
-        valid_recv && valid_method
-    }
-
-    fn replace_path(&self, expr: ExprMethodCall) -> Block {
-        let semi_token = Token![;];
-        let o_stmt = Stmt::Semi(Expr::MethodCall(expr), semi_token(Span::call_site()));
-        let path_stmt = Stmt::Expr(Expr::Call(self.path_expr()));
-
-        let brace_token = Brace {
-            span: Span::call_site(),
-        };
-
-        let mut stmts = Vec::<Stmt>::new();
-        stmts.push(o_stmt);
-        stmts.push(path_stmt);
-
-        Block { brace_token, stmts }
-    }
-
-    fn path_expr(&self) -> ExprCall {
-        let l_path = match self.path.to_str() {
-            Some(p) => p,
-            None => panic!("Invalid path"),
-        };
-
-        let expr = quote! {Ok(PathBuf::from(#l_path))};
-        let expr = match parse2(expr) {
-            Err(err) => panic!("{:?} Could not parse new PathBuf.", err),
-            Ok(res) => res,
-        };
-
-        expr
-    }
-}
-
-impl Fold for ReplacePathCalls {
-    fn fold_expr(&mut self, expr: Expr) -> Expr {
-        match expr {
-            Expr::MethodCall(ref e_call) => {
-                if self.should_replace_path(e_call) {
-                    Expr::Block(ExprBlock {
-                        attrs: Vec::new(),
-                        label: None,
-                        block: self.replace_path(e_call.clone()),
-                    })
-                } else {
-                    expr
-                }
-            }
-            _ => expr,
-        }
-    }
-}
-
-/**
- * Change the path of a SettingsManager.
- *
- * # Parameters
- * 1. **SettingsManager Instance:** Variable of the SettingsManager to target.
- * 2. **Replacement Path:** (optional) Path to replace with, otherwise is random.
- */
-#[proc_macro_attribute]
-pub fn settings_path(args: TokenStream, input: TokenStream) -> TokenStream {
-    // parse args
-    let p_args = parse_macro_input!(args as AttributeArgs);
-    if p_args.is_empty() {
-        // compile_error!("Must pass variable name");
-        panic!("Must provide variable name");
-    }
-
-    let mut i_args = p_args.into_iter();
-
-    // first arg is vairable name
-    let v_name = match i_args.next() {
-        Some(NestedMeta::Meta(v)) => {
-            // @todo [1]: Allow for Meta to be passed
-            //      e.g. #settings_path(a)
-            //      i.e. without quotes.
-            panic!("Invalid varibale name {:?}", v)
-        }
-
-        Some(NestedMeta::Lit(v)) => match v {
-            Lit::Str(vn) => vn,
-            _ => panic!("Invalid variable name {:?}", v),
-        },
-
-        v => panic!("Invalid variable name {:?}", v),
-    };
-
-    // second arg is desired path if given
-    // otherwise create temporary file
-    let path = match i_args.next() {
-        None => {
-            // file not give, create path from temp file
-            match NamedTempFile::new() {
-                Ok(f) => f.path().to_path_buf(),
-                Err(err) => {
-                    panic!("Could not create temporary file: {:?}", err);
-                }
-            }
-        }
-        Some(NestedMeta::Lit(p)) => match p {
-            Lit::Str(ps) => PathBuf::from(ps.value()),
-            _ => panic!("Invalid path {:?}", p),
-        },
-        p => panic!("Invalid path {:?}", p),
-    };
-
-    // parse function
-    let mut path_replacer = ReplacePathCalls::new(v_name.value(), path.clone());
-    let ast = parse_macro_input!(input as ItemFn);
-
-    let ast = path_replacer.fold_item_fn(ast);
-    ast.into_token_stream().into()
-}
diff --git a/settings_manager/settings_manager_change_path/tests/expand/file_passed.expanded.rs b/settings_manager/settings_manager_change_path/tests/expand/file_passed.expanded.rs
deleted file mode 100644
index b64f77a6..00000000
--- a/settings_manager/settings_manager_change_path/tests/expand/file_passed.expanded.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use settings_manager_change_path::settings_path;
-fn main() {
-    let a = BasicSettings::new();
-    let p = {
-        a.path();
-        Ok(PathBuf::from("/tmp/my_test_file.json"))
-    };
-}
diff --git a/settings_manager/settings_manager_change_path/tests/expand/file_passed.rs b/settings_manager/settings_manager_change_path/tests/expand/file_passed.rs
deleted file mode 100644
index d5b8995c..00000000
--- a/settings_manager/settings_manager_change_path/tests/expand/file_passed.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use settings_manager_change_path::settings_path;
-
-#[settings_path("a", "/tmp/my_test_file.json")]
-fn main() {
-    let a = BasicSettings::new();
-    let p = a.path();
-}
diff --git a/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.expanded.rs b/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.expanded.rs
deleted file mode 100644
index 3b3f5e9a..00000000
--- a/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.expanded.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use settings_manager_change_path::settings_path;
-fn main() {
-    let a = BasicSettings::new();
-    let p = {
-        a.path();
-        Ok(PathBuf::from("/tmp/asdlkjfak"))
-    };
-}
diff --git a/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.rs b/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.rs
deleted file mode 100644
index 47f12cdc..00000000
--- a/settings_manager/settings_manager_change_path/tests/expand/no_file_passed.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use settings_manager_change_path::settings_path;
-
-#[settings_path("a")]
-fn main() {
-    let a = BasicSettings::new();
-    let p = a.path();
-}
diff --git a/settings_manager/settings_manager_change_path/tests/main.rs b/settings_manager/settings_manager_change_path/tests/main.rs
deleted file mode 100644
index 528d328d..00000000
--- a/settings_manager/settings_manager_change_path/tests/main.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use cluFlock::FlockLock;
-use macrotest;
-use serde::{Deserialize, Serialize};
-use settings_manager::prelude::{Settings, SettingsPriority, SettingsResult};
-use settings_manager_change_path::settings_path;
-use std::fs::File;
-use std::path::{Path, PathBuf};
-
-// *************
-// *** setup ***
-// *************
-
-#[derive(Default, Serialize, Deserialize)]
-struct BasicSettings {
-    #[serde(skip)]
-    _path: PathBuf,
-
-    pub name: String,
-    pub age: u8,
-}
-
-impl BasicSettings {
-    fn set_path(&mut self, path: PathBuf) {
-        self._path = path;
-    }
-
-    fn path(&self) -> &Path {
-        &self._path
-    }
-}
-
-impl Settings for BasicSettings {
-    #[allow(unused_variables)]
-    fn store_lock(&mut self, lock: FlockLock<File>) {}
-
-    fn controls_file(&self) -> bool {
-        false
-    }
-
-    fn priority(&self) -> SettingsPriority {
-        SettingsPriority::System
-    }
-}
-
-// *************
-// *** tests ***
-// *************
-
-// --- integration tests ---
-
-#[test]
-#[settings_path("s")]
-fn path_should_be_changed_randomly_if_not_provided() {
-    let o_path = PathBuf::from("/tmp/my_temp_settings.json");
-
-    let mut s = BasicSettings::default();
-    s.set_path(o_path.clone());
-
-    let r_path: SettingsResult<PathBuf> = s.path();
-    let r_path = match r_path {
-        Ok(p) => p,
-        Err(err) => panic!("{:?}", err),
-    };
-
-    assert_ne!(o_path, r_path, "path was not changed");
-}
-
-#[test]
-#[settings_path("s", "/tmp/new_path.json")]
-fn path_should_be_changed_to_that_provided() {
-    let n_path = Path::new("/tmp/new_path.json");
-    let o_path = PathBuf::from("/tmp/my_temp_settings.json");
-
-    let mut s = BasicSettings::default();
-    s.set_path(o_path.clone());
-
-    let r_path: SettingsResult<PathBuf> = s.path();
-    let r_path = match r_path {
-        Ok(p) => p,
-        Err(err) => panic!("{:?}", err),
-    };
-
-    assert_ne!(o_path, r_path, "path was not changed");
-    assert_eq!(n_path, r_path, "path was not changed to the one provided");
-}
-
-#[test]
-#[settings_path("s")]
-fn random_path_should_not_change_across_calls() {
-    let mut s = BasicSettings::default();
-
-    let r1_path: SettingsResult<PathBuf> = s.path();
-    let r1_path = match r1_path {
-        Ok(p) => p,
-        Err(err) => panic!("{:?}", err),
-    };
-
-    let r2_path: SettingsResult<PathBuf> = s.path();
-    let r2_path = match r2_path {
-        Ok(p) => p,
-        Err(err) => panic!("{:?}", err),
-    };
-
-    assert_eq!(r1_path, r2_path, "path changed across calls");
-}
-
-// #[test]
-// #[settings_path("s")]
-// fn should_expand_in_match_statement() {
-//     let o_path = PathBuf::from("/tmp/my_temp_settings.json");
-//
-//     let mut s = BasicSettings::default();
-//     s.set_path(o_path.clone());
-//
-//     let r_path: PathBuf = match s.path() {
-//         Ok(p) => p,
-//         Err(err) => panic!("{:?}", err),
-//     };
-//
-//     assert_ne!(o_path, r_path, "path was not changed");
-// }
-//
-// #[test]
-// #[should_panic(expected = "Must provide variable name")]
-// #[settings_path]
-// fn should_panic_if_variable_name_not_given() {}
-
-// --- expansion tests ---
-
-#[test]
-fn expansion_tests() {
-    macrotest::expand("tests/expand/*.rs");
-}
diff --git a/settings_manager/settings_manager_derive/Cargo.toml b/settings_manager/settings_manager_derive/Cargo.toml
deleted file mode 100644
index 63112700..00000000
--- a/settings_manager/settings_manager_derive/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "settings_manager_derive"
-version = "0.1.0"
-edition = "2021"
-
-authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
-description = "Custom derive for the `settings_manager` crate."
-license = "MIT OR Apache-2.0"
-
-repository = "https://github.com/thot-data/settings_manager"
-keywords = []
-categories = []
-
-[lib]
-proc-macro = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-quote = "1.0"
-syn = { version = "2.0", features = ["full", "extra-traits"] }
-proc-macro2 = "1.0"
diff --git a/settings_manager/settings_manager_derive/LICENSE-APACHE b/settings_manager/settings_manager_derive/LICENSE-APACHE
deleted file mode 100644
index ae435aba..00000000
--- a/settings_manager/settings_manager_derive/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2022 Brian Carlsen
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/settings_manager/settings_manager_derive/LICENSE-MIT b/settings_manager/settings_manager_derive/LICENSE-MIT
deleted file mode 100644
index 9403ab38..00000000
--- a/settings_manager/settings_manager_derive/LICENSE-MIT
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Brian Carlsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/settings_manager/settings_manager_derive/README.md b/settings_manager/settings_manager_derive/README.md
deleted file mode 100644
index b5a26bc3..00000000
--- a/settings_manager/settings_manager_derive/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Settings Manager Derive
-Derive functionality for the `settings_manager` crate.
diff --git a/settings_manager/settings_manager_derive/src/common.rs b/settings_manager/settings_manager_derive/src/common.rs
deleted file mode 100644
index 127f73ec..00000000
--- a/settings_manager/settings_manager_derive/src/common.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Common functionality.
-
-pub(crate) static IDENT: &str = "settings";
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/settings_manager/settings_manager_derive/src/common_test.rs b/settings_manager/settings_manager_derive/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/settings_manager/settings_manager_derive/src/lib.rs b/settings_manager/settings_manager_derive/src/lib.rs
deleted file mode 100644
index 312e320e..00000000
--- a/settings_manager/settings_manager_derive/src/lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Derive functionality for the `settings_manager` crate.
-mod common;
-mod settings;
-
-use proc_macro::TokenStream;
-
-#[proc_macro_derive(Settings, attributes(settings))]
-pub fn settings_derive(input: TokenStream) -> TokenStream {
-    let ast = syn::parse(input).expect("could not parse input");
-    settings::impl_settings(&ast)
-}
diff --git a/settings_manager/settings_manager_derive/src/settings.rs b/settings_manager/settings_manager_derive/src/settings.rs
deleted file mode 100644
index b9b76018..00000000
--- a/settings_manager/settings_manager_derive/src/settings.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-//! Derive the `settings_manager#Settings` trait.
-use crate::common::IDENT;
-use proc_macro::TokenStream;
-use proc_macro2::Span;
-use quote::quote;
-use std::collections::HashMap;
-use std::convert::TryFrom;
-use syn::parse::Error as ParseError;
-use syn::{Data, Expr, Fields, Ident, Lit, Path, Type};
-
-const PRIORITY_IDENT: &str = "priority";
-const FILE_LOCK_IDENT: &str = "file_lock";
-
-// *********************
-// *** Settings Info ***
-// *********************
-
-#[derive(Default)]
-struct SettingsDataInfo {
-    pub data_field: Option<Ident>,
-    pub priority: Option<Ident>,
-    pub file_lock: Option<Ident>,
-}
-
-impl<'a> SettingsDataInfo {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
-struct SettingsInfoBuilder(HashMap<Path, SettingsDataInfo>);
-impl SettingsInfoBuilder {
-    pub fn new() -> Self {
-        Self(HashMap::new())
-    }
-
-    pub fn set_data_field(&mut self, key: Path, value: Ident) -> Result<(), ParseError> {
-        let info = self.0.entry(key).or_insert(SettingsDataInfo::new());
-        if info.data_field.is_some() {
-            return Err(ParseError::new(
-                Span::call_site(),
-                "data field already defined",
-            ));
-        }
-
-        let _ = info.data_field.insert(value);
-        Ok(())
-    }
-
-    pub fn set_priority(&mut self, key: Path, value: Ident) -> Result<(), ParseError> {
-        let info = self.0.entry(key).or_insert(SettingsDataInfo::new());
-        if info.priority.is_some() {
-            return Err(ParseError::new(
-                Span::call_site(),
-                "priority already defined",
-            ));
-        }
-
-        let _ = info.priority.insert(value);
-        Ok(())
-    }
-
-    pub fn set_file_lock(&mut self, key: Path, value: Ident) -> Result<(), ParseError> {
-        let info = self.0.entry(key).or_insert(SettingsDataInfo::new());
-        if info.file_lock.is_some() {
-            return Err(ParseError::new(
-                Span::call_site(),
-                "file lock already defined",
-            ));
-        }
-
-        let _ = info.file_lock.insert(value);
-        Ok(())
-    }
-}
-
-struct SettingsInfo {
-    ty: Path,
-    data_field: Ident,
-    priority: Ident,
-    file_lock: Ident,
-}
-
-impl TryFrom<SettingsInfoBuilder> for Vec<SettingsInfo> {
-    type Error = ParseError;
-
-    fn try_from(builder: SettingsInfoBuilder) -> Result<Self, Self::Error> {
-        let mut info = Self::with_capacity(builder.0.len());
-        for (key, data) in builder.0.into_iter() {
-            let Some(data_field) = data.data_field else {
-                return Err(ParseError::new(
-                    Span::call_site(),
-                    format!("`data_field` not set for `{key:?}`"),
-                ));
-            };
-
-            let Some(priority) = data.priority else {
-                return Err(ParseError::new(
-                    Span::call_site(),
-                    format!("`priority` not set for `{key:?}`"),
-                ));
-            };
-
-            let Some(file_lock) = data.file_lock else {
-                return Err(ParseError::new(
-                    Span::call_site(),
-                    format!("`file_lock` not set for `{key:?}`"),
-                ));
-            };
-
-            info.push(SettingsInfo {
-                ty: key,
-                data_field,
-                priority,
-                file_lock,
-            });
-        }
-
-        Ok(info)
-    }
-}
-
-// **************
-// *** Derive ***
-// **************
-
-pub(crate) fn impl_settings(ast: &syn::DeriveInput) -> TokenStream {
-    let name = &ast.ident;
-    let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
-
-    // get marked fields
-    let Data::Struct(obj) = &ast.data else {
-        panic!("`Settings` can only be derived for structs.");
-    };
-
-    let fields = match &obj.fields {
-        Fields::Named(fields) => &fields.named,
-        Fields::Unnamed(fields) => &fields.unnamed,
-        Fields::Unit => {
-            panic!("cannot derive `Settings` for unit structs");
-        }
-    };
-
-    let mut settings_info = SettingsInfoBuilder::new();
-
-    for field in fields.into_iter() {
-        let attrs = &field.attrs;
-        for attr in attrs.iter() {
-            if !attr.path().is_ident(IDENT) {
-                continue;
-            }
-
-            attr.parse_nested_meta(|meta| {
-                let field_ident = field
-                    .ident
-                    .clone()
-                    .expect("could not get `file_lock` field ident");
-
-                if meta.path.is_ident(FILE_LOCK_IDENT) {
-                    let data_type: Expr = meta
-                        .value()
-                        .expect("could not get data type for `file_lock`")
-                        .parse()
-                        .expect("could not parse data type for `file_lock`");
-
-                    let Expr::Lit(data_type) = data_type else {
-                        return Err(meta.error("could not parse `file_lock`"));
-                    };
-
-                    let Lit::Str(data_type) = data_type.lit else {
-                        return Err(meta.error("could not parse `file_lock`"));
-                    };
-
-                    let data_type: Path = syn::parse_str(&data_type.value())
-                        .expect("could not parse `file_lock` value as `Path`");
-
-                    settings_info.set_file_lock(data_type, field_ident)?;
-                } else if meta.path.is_ident(PRIORITY_IDENT) {
-                    let Type::Path(data_type) = &field.ty else {
-                        panic!("invalid data type");
-                    };
-
-                    let data_type = data_type.path.clone();
-
-                    let data_field = field_ident;
-                    let priority: Expr = meta
-                        .value()
-                        .expect("could not get `priority` value")
-                        .parse()
-                        .expect("could not parse `priority`");
-
-                    let Expr::Lit(priority) = priority else {
-                                return Err(meta.error("could not parse `priority`"));
-                            };
-
-                    let Lit::Str(priority) = priority.lit else {
-                                return Err(meta.error("could not parse `priority`"));
-                            };
-
-                    let priority = Ident::new(&priority.value(), Span::call_site());
-
-                    settings_info.set_data_field(data_type.clone(), data_field)?;
-                    settings_info.set_priority(data_type, priority)?;
-                } else {
-                    return Err(meta.error(&format!(
-                        "invalid field attribute `{:}`",
-                        meta.path
-                            .get_ident()
-                            .expect("could not get field attribute")
-                    )));
-                }
-
-                Ok(())
-            })
-            .expect("could not parse attirbute data");
-        }
-    }
-
-    let settings_info: Vec<SettingsInfo> = settings_info.try_into().expect("invalid setting");
-    let mut impls = Vec::with_capacity(settings_info.len());
-    for SettingsInfo {
-        ty: data_type,
-        data_field: data_field_ident,
-        file_lock: file_lock_field,
-        priority,
-    } in settings_info.iter()
-    {
-        let gen = quote! {
-            impl #impl_generics Settings<#data_type> for #name #ty_generics #where_clause {
-                fn settings(&self) -> std::borrow::Cow<#data_type> {
-                    std::borrow::Cow::Borrowed(&self.#data_field_ident)
-                }
-
-                fn file(&self) -> &File {
-                    &*self.#file_lock_field
-                }
-
-                fn file_mut(&mut self) -> &mut File {
-                    &mut *self.#file_lock_field
-                }
-
-                fn file_lock(&self) -> &FlockLock<File> {
-                    &self.#file_lock_field
-                }
-
-                fn priority(&self) -> settings_manager::Priority {
-                    settings_manager::Priority::#priority
-                }
-            }
-        };
-
-        impls.push(gen);
-    }
-
-    let gen = quote! {
-        #(#impls) *
-    };
-
-    gen.into()
-}
-
-#[cfg(test)]
-#[path = "./settings_test.rs"]
-mod settings_test;
diff --git a/settings_manager/settings_manager_derive/src/settings_test.rs b/settings_manager/settings_manager_derive/src/settings_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/settings_manager/src/error.rs b/settings_manager/src/error.rs
deleted file mode 100644
index e3576263..00000000
--- a/settings_manager/src/error.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-//! Errors and Result.
-use serde::{Deserialize, Serialize};
-use serde_json;
-use std::io;
-use std::path::PathBuf;
-use std::result::Result as StdResult;
-
-// **************
-// *** Errors ***
-// **************
-
-/// Used for errors specifically related to settings.
-#[derive(Serialize, Deserialize, Debug)]
-pub enum SettingsError {
-    InvalidPath(PathBuf),
-
-    /// A required path has not yet been set.
-    PathNotSet,
-
-    /// The path should not be set or changed.
-    StaticPath,
-}
-
-#[derive(Debug)]
-pub enum Error {
-    IoError(io::Error),
-    SerdeError(serde_json::Error),
-    SettingsError(SettingsError),
-}
-
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Self {
-        Self::IoError(err)
-    }
-}
-
-impl From<serde_json::Error> for Error {
-    fn from(err: serde_json::Error) -> Self {
-        Self::SerdeError(err)
-    }
-}
-
-impl From<SettingsError> for Error {
-    fn from(err: SettingsError) -> Self {
-        Self::SettingsError(err)
-    }
-}
-
-// ***************
-// *** Results ***
-// ***************
-
-pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/settings_manager/src/error_test.rs b/settings_manager/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/settings_manager/src/lib.rs b/settings_manager/src/lib.rs
deleted file mode 100644
index 3ff99ab7..00000000
--- a/settings_manager/src/lib.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-//! `settings_manager` provides multiple interfaces for reading and writing
-//! settings files to disk.
-//!
-//! # Types of settings
-//! Settings are distinguished by how the path referencing the file is constructed.
-//! Each setting is composed of two parts: a base path and relative path.
-//! Together, these components create the path referencing the settings file on disk:
-//! > \<path\> = \<base path\>/\<relative path\>.
-//!
-//! + `SystemSettings`: Have a fixed path.
-//! + `UserSettings`: Have a fixed base path with variable relative path.
-//! + `LocalSettings`: Have a variable base path with fixed relative path.
-//!
-//! # Locking settings files
-//! In order to load or save a settings file a file lock must be acquired.
-//! This ensures that another process can not overwrite the settings while
-//! it is in use, thus poisoning the settings.
-pub mod error;
-pub mod local_settings;
-pub mod settings;
-pub mod system_settings;
-pub mod types;
-pub mod user_settings;
-
-#[cfg(feature = "derive")]
-use settings_manager_derive;
-
-// Re-exports
-pub use error::{Error, Result};
-pub use local_settings::LocalSettings;
-pub use settings::Settings;
-pub use system_settings::SystemSettings;
-pub use types::Priority;
-pub use user_settings::UserSettings;
-
-#[cfg(feature = "derive")]
-pub use settings_manager_derive::Settings;
-
-#[cfg(test)]
-#[path = "./lib_test.rs"]
-mod lib_test;
diff --git a/settings_manager/src/lib_test.rs b/settings_manager/src/lib_test.rs
deleted file mode 100644
index 35ba3908..00000000
--- a/settings_manager/src/lib_test.rs
+++ /dev/null
@@ -1 +0,0 @@
-// use super::*;
diff --git a/settings_manager/src/local_settings.rs b/settings_manager/src/local_settings.rs
deleted file mode 100644
index 3ac15505..00000000
--- a/settings_manager/src/local_settings.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-//! Settings meant for local use.
-//! Local settings all have the same realtive path, with a variable base path.
-use crate::settings::{self, Settings};
-use crate::Result;
-use cluFlock::FlockLock;
-use serde::{de::DeserializeOwned, Serialize};
-use std::fs::File;
-use std::path::{Path, PathBuf};
-
-// **********************
-// *** Local Settings ***
-// **********************
-
-/// Local settings have a variable base path and fixed relative path.
-pub trait LocalSettings<S>: Settings<S>
-where
-    S: Serialize + DeserializeOwned + Clone,
-{
-    /// Returns the relative path to the settings file.
-    fn rel_path() -> PathBuf;
-
-    /// Returns the base path for the settings.
-    fn base_path(&self) -> &Path;
-
-    /// Returns the absolute path to the settings file.
-    fn path(&self) -> PathBuf {
-        self.base_path().join(Self::rel_path())
-    }
-}
-
-// **************
-// *** Loader ***
-// **************
-
-pub struct Loader<S> {
-    data: S,
-    base_path: PathBuf,
-    file_lock: FlockLock<File>,
-}
-
-impl<S> Loader<S> {
-    /// Loads the settings from the file given by path.
-    pub fn load_or_create<T>(base_path: PathBuf) -> Result<Loader<S>>
-    where
-        T: LocalSettings<S>,
-        S: Serialize + DeserializeOwned + Clone + Default,
-    {
-        let mut path = base_path.clone();
-        path.push(T::rel_path());
-
-        let (data, file_lock) = settings::load_or_create::<S>(path.as_path())?;
-        Ok(Loader {
-            data,
-            base_path,
-            file_lock,
-        })
-    }
-
-    /// Loads the settings from the file given by path.
-    pub fn load_or_create_with<T>(base_path: PathBuf, default: S) -> Result<Loader<S>>
-    where
-        T: LocalSettings<S>,
-        S: Serialize + DeserializeOwned + Clone + Default,
-    {
-        let mut path = base_path.clone();
-        path.push(T::rel_path());
-
-        let (data, file_lock) = settings::load_or_create_with::<S>(path.as_path(), default)?;
-        Ok(Loader {
-            data,
-            base_path,
-            file_lock,
-        })
-    }
-}
-
-impl<S> Loader<S> {
-    pub fn base_path(self) -> PathBuf {
-        self.base_path
-    }
-
-    pub fn data(self) -> S {
-        self.data
-    }
-
-    pub fn file_lock(self) -> FlockLock<File> {
-        self.file_lock
-    }
-}
-
-impl<S> Into<Components<S>> for Loader<S> {
-    fn into(self) -> Components<S> {
-        Components {
-            data: self.data,
-            base_path: self.base_path,
-            file_lock: self.file_lock,
-        }
-    }
-}
-
-pub struct Components<S> {
-    pub data: S,
-    pub base_path: PathBuf,
-    pub file_lock: FlockLock<File>,
-}
-
-#[cfg(test)]
-#[path = "./local_settings_test.rs"]
-mod local_settings_test;
diff --git a/settings_manager/src/local_settings_test.rs b/settings_manager/src/local_settings_test.rs
deleted file mode 100644
index 8fc8d488..00000000
--- a/settings_manager/src/local_settings_test.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use super::*;
-use crate::settings::Settings;
-use crate::types::Priority;
-use crate::{Error, Result};
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use dev_utils::fs::TempDir;
-use fake::faker::filesystem::raw::DirPath;
-use fake::faker::lorem::raw::Words;
-use fake::locales::EN;
-use fake::Fake;
-use serde::{Deserialize, Serialize};
-use std::fs::File;
-use std::path::PathBuf;
-use std::{fs, io};
-
-// *************
-// *** setup ***
-// *************
-const FILENAME: &str = "mock_settings.json";
-
-#[derive(Serialize, Deserialize, Derivative, Default)]
-#[derivative(Debug)]
-pub struct MockLocalSettings {
-    #[serde(skip)]
-    _file_lock: Option<FlockLock<File>>,
-
-    #[serde(skip)]
-    _base_path: Option<PathBuf>,
-
-    pub id: String,
-}
-
-impl MockLocalSettings {
-    pub fn new() -> Self {
-        let id: Vec<String> = Words(EN, 10..11).fake();
-        let id = id.join("-");
-
-        MockLocalSettings {
-            _file_lock: None,
-            _base_path: None,
-            id,
-        }
-    }
-}
-
-impl Settings for MockLocalSettings {
-    fn store_lock(&mut self, file_lock: FlockLock<File>) {
-        self._file_lock = Some(file_lock);
-    }
-
-    fn file(&self) -> Option<&File> {
-        match self._file_lock.as_ref() {
-            None => None,
-            Some(lock) => Some(&*lock),
-        }
-    }
-
-    fn file_mut(&mut self) -> Option<&mut File> {
-        match self._file_lock.as_mut() {
-            None => None,
-            Some(lock) => Some(&mut *lock),
-        }
-    }
-
-    fn priority(&self) -> Priority {
-        Priority::Local
-    }
-}
-
-impl LocalSettings for MockLocalSettings {
-    fn rel_path() -> Result<PathBuf> {
-        Ok(PathBuf::from(FILENAME))
-    }
-
-    fn base_path(&self) -> Result<PathBuf> {
-        if self._base_path.is_none() {
-            return Err(Error::IoError(io::Error::new(
-                io::ErrorKind::NotFound,
-                "base path not set",
-            )));
-        }
-
-        let path = self._base_path.clone().unwrap();
-        Ok(path)
-    }
-
-    fn set_base_path(&mut self, path: PathBuf) -> Result {
-        self._base_path = Some(path);
-        Ok(())
-    }
-}
-
-impl LockSettingsFile for MockLocalSettings {}
-
-// *************
-// *** tests ***
-// *************
-
-// -----------------------
-// --- Local Settings ---
-// -----------------------
-
-#[test]
-fn local_settings_path_should_concatenate_base_and_relative_paths() {
-    let base_path: PathBuf = DirPath(EN).fake();
-    let mut sets = MockLocalSettings::new();
-    sets.set_base_path(base_path.clone())
-        .expect("set_base_path should work");
-
-    let sets_path = sets.path().expect("path should return a value");
-    assert_eq!(base_path.join(FILENAME), sets_path, "incorrect path");
-}
-
-#[test]
-fn local_settings_load_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let mut sets = MockLocalSettings::new();
-    let sets_id = sets.id.clone();
-    sets.set_base_path(_dir.path().to_path_buf())
-        .expect("set_base_path should work");
-
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-    drop(sets);
-
-    // test
-    let loaded = MockLocalSettings::load(_dir.path()).expect("load should work");
-    assert_eq! {
-        sets_id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-#[test]
-fn local_settings_save_should_work() {
-    // setup
-    let _dir = TempDir::new().expect("setup should work");
-    let mut sets = MockLocalSettings::new();
-    sets.set_base_path(_dir.path().to_path_buf())
-        .expect("set_base_path should work");
-
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-
-    // test
-    let sets_path = sets.path().expect("path should work");
-    let loaded_str = fs::read_to_string(sets_path).expect("settings file should be readable");
-
-    let loaded: MockLocalSettings =
-        serde_json::from_str(loaded_str.as_str()).expect("value should be valid json");
-
-    assert_eq! {
-        sets.id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-// --------------------------
-// --- Lock Settings File ---
-// --------------------------
-
-#[test]
-fn lock_file_settings_acquire_lock_should_obtain_file_lock() {
-    let _dir = TempDir::new().expect("setup should work");
-    let mut settings = MockLocalSettings::new();
-    settings
-        .set_base_path(_dir.path().to_path_buf())
-        .expect("set_base_path should work");
-
-    settings.acquire_lock().expect("acquire lock panicked");
-
-    assert!(settings.file().is_some(), "acquire lock failed")
-}
-
-#[test]
-fn lock_file_settings_acquire_lock_should_exit_silently_if_lock_already_obtained() {
-    let _dir = TempDir::new().expect("setup should work");
-    let mut settings = MockLocalSettings::new();
-    settings
-        .set_base_path(_dir.path().to_path_buf())
-        .expect("set_base_path should work");
-
-    settings
-        .acquire_lock()
-        .expect("file lock could not be acquired");
-
-    if let Err(_) = settings.acquire_lock() {
-        assert!(false, "acquiring file lock failed");
-    }
-}
diff --git a/settings_manager/src/settings.rs b/settings_manager/src/settings.rs
deleted file mode 100644
index 2ae8b2bd..00000000
--- a/settings_manager/src/settings.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use crate::types::Priority;
-use crate::{Error, Result};
-use cluFlock::{ExclusiveFlock, FlockLock};
-use serde::{de::DeserializeOwned, Serialize};
-use std::borrow::Cow;
-use std::default::Default;
-use std::fs::{self, File, OpenOptions};
-use std::io::{self, BufReader, Read, Seek};
-use std::path::Path;
-
-/// Settings lock their respective file while in existence.
-pub trait Settings<S>
-where
-    S: Serialize + DeserializeOwned + Clone,
-{
-    /// The settings.
-    fn settings(&self) -> Cow<S>;
-
-    /// The settings file if it is controlled.
-    fn file(&self) -> &File;
-
-    /// A mutable reference to the settings file if it is controlled.
-    fn file_mut(&mut self) -> &mut File;
-
-    /// The file lock.
-    fn file_lock(&self) -> &FlockLock<File>;
-
-    /// The priority of the settings object.
-    fn priority(&self) -> Priority;
-
-    /// Save the current object to a file.
-    fn save(&mut self) -> Result {
-        {
-            // delete all data
-            let file = self.file_mut();
-            file.set_len(0)?;
-            file.rewind()?;
-        }
-
-        serde_json::to_writer_pretty(self.file(), &*self.settings())
-            .map_err(|err| Error::SerdeError(err))?;
-
-        Ok(())
-    }
-}
-
-/// Create a new settings object from a file.
-/// Creates a default object of the type if the file did not exist or is empty.
-pub fn load_or_create<T: Serialize + DeserializeOwned + Default>(
-    path: &Path,
-) -> Result<(T, FlockLock<File>)> {
-    // get settings file and lock
-    let settings_file = ensure_file(path)?;
-    let file_lock = lock(settings_file)?;
-
-    // get current settings
-    let mut reader = BufReader::new(file_lock.as_ref());
-    let mut settings_str = String::new();
-    reader.read_to_string(&mut settings_str)?;
-
-    let settings: T = if settings_str.is_empty() {
-        // no content in file, create default
-        let default = T::default();
-        serde_json::to_writer_pretty(&*file_lock, &default)?;
-        default
-    } else {
-        serde_json::from_str(&settings_str)?
-    };
-
-    Ok((settings, file_lock))
-}
-
-/// Create a new settings object from a file.
-/// Creates a new object if the file did not exist or is empty.
-pub fn load_or_create_with<T: Serialize + DeserializeOwned>(
-    path: &Path,
-    default: T,
-) -> Result<(T, FlockLock<File>)> {
-    // get settings file and lock
-    let settings_file = ensure_file(path)?;
-    let file_lock = lock(settings_file)?;
-
-    // get current settings
-    let mut reader = BufReader::new(file_lock.as_ref());
-    let mut settings_str = String::new();
-    reader.read_to_string(&mut settings_str)?;
-
-    let settings: T = if settings_str.is_empty() {
-        // no content in file, create default
-        serde_json::to_writer_pretty(&*file_lock, &default)?;
-        default
-    } else {
-        serde_json::from_str(&settings_str)?
-    };
-
-    Ok((settings, file_lock))
-}
-
-/// Obtain an exclusive file lock on the system settings file
-/// to prevent other programs from accessing it.
-pub fn lock(file: File) -> Result<FlockLock<File>> {
-    match ExclusiveFlock::wait_lock(file) {
-        Ok(lock) => Ok(lock),
-        Err(flock_err) => Err(Error::IoError(flock_err.into_err())),
-    }
-}
-
-/// Returns a file, ensuring it exists by creating it if needed.
-pub fn ensure_file(path: &Path) -> Result<File> {
-    // ensure settings directory exists
-    let settings_dir = match path.parent() {
-        Some(path) => path,
-        None => {
-            return Err(Error::IoError(io::Error::new(
-                io::ErrorKind::NotFound,
-                "invalid path",
-            )))
-        }
-    };
-
-    match fs::create_dir_all(settings_dir) {
-        Ok(()) => {}                                                     // ok, continue
-        Err(ref err) if err.kind() == io::ErrorKind::AlreadyExists => {} // directories already exist, continue
-        Err(err) => return Err(Error::IoError(err)),
-    }
-
-    // create file if needed
-    let file_res = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .create(true)
-        .open(path);
-
-    match file_res {
-        Ok(file) => Ok(file),
-        Err(err) => Err(Error::IoError(err)),
-    }
-}
-
-#[cfg(test)]
-#[path = "./settings_test.rs"]
-mod settings_test;
diff --git a/settings_manager/src/settings_test.rs b/settings_manager/src/settings_test.rs
deleted file mode 100644
index 17f98fbf..00000000
--- a/settings_manager/src/settings_test.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use super::*;
-use crate::types::Priority;
-use cluFlock::{ExclusiveFlock, FlockLock};
-use fake::faker::name::raw::Name;
-use fake::locales::EN;
-use fake::Fake;
-use serde::{Deserialize, Serialize};
-use std::default::Default;
-use std::fs::File;
-use std::path::PathBuf;
-use std::thread;
-use std::time::Duration;
-use tempfile::NamedTempFile;
-
-// *************
-// *** setup ***
-// *************
-
-///  Create settings file for BasicSettings
-fn create_basic_settings_file() -> NamedTempFile {
-    let mut settings = BasicSettings::default();
-    settings.name = Name(EN).fake(); // randomize name
-
-    let settings_file = NamedTempFile::new().expect("could not create temporary file");
-
-    serde_json::to_writer_pretty(&settings_file, &settings)
-        .expect("could not save settings to file");
-
-    settings_file
-}
-
-#[derive(Default, Serialize, Deserialize)]
-struct BasicSettings {
-    #[serde(skip)]
-    _file_lock: Option<FlockLock<File>>,
-
-    #[serde(skip)]
-    _path: PathBuf,
-
-    pub name: String,
-    pub age: u8,
-}
-
-impl BasicSettings {
-    fn set_path(&mut self, path: PathBuf) {
-        self._path = path;
-    }
-
-    fn path(&self) -> &Path {
-        &self._path
-    }
-}
-
-impl Settings for BasicSettings {
-    fn store_lock(&mut self, lock: FlockLock<File>) {
-        self._file_lock = Some(lock);
-    }
-
-    fn file(&self) -> Option<&File> {
-        match self._file_lock.as_ref() {
-            None => None,
-            Some(lock) => Some(&*lock),
-        }
-    }
-
-    fn file_mut(&mut self) -> Option<&mut File> {
-        match self._file_lock.as_mut() {
-            None => None,
-            Some(lock) => Some(&mut *lock),
-        }
-    }
-
-    fn priority(&self) -> Priority {
-        Priority::System
-    }
-}
-
-// *************
-// *** tests ***
-// *************
-
-#[test]
-fn load_should_work() {
-    let settings_file = create_basic_settings_file();
-    let _settings: BasicSettings = match load(settings_file.path()) {
-        Ok(sets) => sets,
-        Err(err) => {
-            return assert!(false, "could not load file: {:?}", err);
-        }
-    };
-}
-
-#[test]
-fn save_should_work() {
-    // setup
-    let mut settings = BasicSettings::default();
-    let name: String = Name(EN).fake();
-    let age = 10;
-    settings.name = name.clone();
-    settings.age = age.clone();
-
-    let settings_file = NamedTempFile::new().expect("could not create settings file");
-    let settings_path = settings_file.path().to_path_buf();
-    settings.set_path(settings_path.clone());
-    let file_lock =
-        ExclusiveFlock::wait_lock(settings_file.reopen().expect("could not reopen file"))
-            .expect("could not lock file");
-
-    settings.store_lock(file_lock);
-
-    // test
-    save(&mut settings).expect("should not cause error");
-
-    let mut f = File::open(&settings_path).unwrap();
-    let mut res = String::new();
-    f.read_to_string(&mut res).expect("could not read file");
-    let res: BasicSettings = serde_json::from_str(&res).expect("could not convert string to JSON");
-
-    assert_eq!(name, res.name, "names don't match");
-    assert_eq!(age, res.age, "ages don't match");
-}
-
-#[test]
-fn file_locking_should_work() {
-    // setup
-    let mut s1 = BasicSettings::default();
-    let mut s2 = BasicSettings::default();
-    let sf = NamedTempFile::new().expect("could not create settings file");
-
-    let (sf, path) = sf.into_parts();
-    s1.set_path(path.to_path_buf());
-    s2.set_path(path.to_path_buf());
-
-    // lock file
-    let fl1 = ExclusiveFlock::wait_lock(sf).expect("could not lock file");
-
-    s1.store_lock(fl1);
-    assert!(s1.file().is_some(), "initial file lock was not obtained");
-
-    // test
-    // new thread for second file access
-    let t = thread::spawn(move || {
-        let sf2 = File::open(s2.path()).expect("could not open file");
-
-        let fl2 = ExclusiveFlock::wait_lock(sf2).expect("could not lock file after initial");
-
-        s2.store_lock(fl2);
-        assert!(s2.file().is_some(), "second file lock was not obtained");
-    });
-
-    // sleep before drop
-    thread::sleep(Duration::from_millis(500));
-    drop(s1);
-
-    t.join().expect("couldn't join");
-}
diff --git a/settings_manager/src/system_settings.rs b/settings_manager/src/system_settings.rs
deleted file mode 100644
index ebaef6a3..00000000
--- a/settings_manager/src/system_settings.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-//! Settings meant for system wide use.
-//! These settings have a fixed path.
-use crate::settings::{self, Settings};
-use crate::Result;
-use cluFlock::FlockLock;
-use serde::{de::DeserializeOwned, Serialize};
-use std::fs::File;
-use std::path::PathBuf;
-
-// ***********************
-// *** System Settings ***
-// ***********************
-
-/// System settings have only one file for the entire system.
-pub trait SystemSettings<S>: Settings<S>
-where
-    S: Serialize + DeserializeOwned + Clone,
-{
-    /// Returns the path to the settings file.
-    fn path() -> PathBuf;
-}
-
-// **************
-// *** Loader ***
-// **************
-
-pub struct Loader<S> {
-    data: S,
-    file_lock: FlockLock<File>,
-}
-
-impl<S> Loader<S> {
-    /// Loads the settings from the file given by path.
-    pub fn load_or_create<T>() -> Result<Loader<S>>
-    where
-        T: SystemSettings<S>,
-        S: Serialize + DeserializeOwned + Clone + Default,
-    {
-        let (data, file_lock) = settings::load_or_create::<S>(&T::path())?;
-        Ok(Loader { data, file_lock })
-    }
-
-    /// Loads the settings from the file given by path.
-    pub fn load_or_create_with<T>(default: S) -> Result<Loader<S>>
-    where
-        T: SystemSettings<S>,
-        S: Serialize + DeserializeOwned + Clone + Default,
-    {
-        let (data, file_lock) = settings::load_or_create_with::<S>(&T::path(), default)?;
-        Ok(Loader { data, file_lock })
-    }
-}
-
-impl<S> Loader<S> {
-    pub fn data(self) -> S {
-        self.data
-    }
-
-    pub fn file_lock(self) -> FlockLock<File> {
-        self.file_lock
-    }
-}
-
-impl<S> Into<Components<S>> for Loader<S> {
-    fn into(self) -> Components<S> {
-        Components {
-            data: self.data,
-            file_lock: self.file_lock,
-        }
-    }
-}
-
-pub struct Components<S> {
-    pub data: S,
-    pub file_lock: FlockLock<File>,
-}
-
-#[cfg(test)]
-#[path = "./system_settings_test.rs"]
-mod system_settings_test;
diff --git a/settings_manager/src/system_settings_test.rs b/settings_manager/src/system_settings_test.rs
deleted file mode 100644
index 13058955..00000000
--- a/settings_manager/src/system_settings_test.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use super::*;
-use crate::settings::Settings;
-use crate::types::Priority;
-use crate::Result;
-use cluFlock::FlockLock;
-use fake::faker::lorem::raw::Words;
-use fake::locales::EN;
-use fake::Fake;
-use serde::{Deserialize, Serialize};
-use std::env;
-use std::fs::{self, File};
-use std::path::PathBuf;
-
-// **********************
-// ***  Mock Settings ***
-// **********************
-
-const SETTINGS_FILE: &str = "mock_system_settings.json";
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct MockSystemSettings {
-    #[serde(skip)]
-    _file_lock: Option<FlockLock<File>>,
-
-    id: String,
-}
-
-impl MockSystemSettings {
-    pub fn new() -> Self {
-        let id: Vec<String> = Words(EN, 10..11).fake();
-        let id = id.join("-");
-
-        MockSystemSettings {
-            _file_lock: None,
-            id,
-        }
-    }
-}
-
-impl Settings for MockSystemSettings {
-    fn store_lock(&mut self, file_lock: FlockLock<File>) {
-        self._file_lock = Some(file_lock);
-    }
-
-    fn file(&self) -> Option<&File> {
-        match self._file_lock.as_ref() {
-            None => None,
-            Some(lock) => Some(&*lock),
-        }
-    }
-
-    fn file_mut(&mut self) -> Option<&mut File> {
-        match self._file_lock.as_mut() {
-            None => None,
-            Some(lock) => Some(&mut *lock),
-        }
-    }
-
-    fn priority(&self) -> Priority {
-        Priority::User
-    }
-}
-
-impl SystemSettings for MockSystemSettings {
-    fn path() -> Result<PathBuf> {
-        let path = env::temp_dir().join(SETTINGS_FILE);
-        Ok(path)
-    }
-}
-
-impl LockSettingsFile for MockSystemSettings {}
-
-// *************
-// *** tests ***
-// *************
-
-// -----------------------
-// --- System Settings ---
-// -----------------------
-
-#[test]
-fn system_settings_path_should_work() {
-    let file = MockSystemSettings::path().expect("path should work");
-    assert!(file.ends_with(SETTINGS_FILE), "incorrect settings file");
-}
-
-#[test]
-fn system_settings_load_should_work() {
-    // setup
-    let mut sets = MockSystemSettings::new();
-    let sets_id = sets.id.clone();
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-    drop(sets);
-
-    // test
-    let loaded = MockSystemSettings::load().expect("load should work");
-    assert_eq! {
-        sets_id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-#[test]
-fn system_settings_save_should_work() {
-    // setup
-    let mut sets = MockSystemSettings::new();
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-
-    // test
-    let sets_path = MockSystemSettings::path().expect("path should work");
-    let loaded_str = fs::read_to_string(sets_path).expect("settings file should be readable");
-    let loaded: MockSystemSettings =
-        serde_json::from_str(loaded_str.as_str()).expect("value should be valid json");
-
-    assert_eq! {
-        sets.id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-// --------------------------
-// --- Lock File Settings ---
-// --------------------------
-
-#[test]
-fn lock_file_settings_acquire_lock_should_obtain_file_lock() {
-    let mut settings = MockSystemSettings::new();
-    settings.acquire_lock().expect("acquire lock panicked");
-
-    assert!(settings.file().is_some(), "acquire lock failed")
-}
-
-#[test]
-fn lock_file_settings_acquire_lock_should_exit_silently_if_lock_already_obtained() {
-    let mut settings = MockSystemSettings::new();
-    settings
-        .acquire_lock()
-        .expect("file lock could not be acquired");
-
-    if let Err(_) = settings.acquire_lock() {
-        assert!(false, "acquiring file lock failed");
-    }
-}
diff --git a/settings_manager/src/types.rs b/settings_manager/src/types.rs
deleted file mode 100644
index 04b98eed..00000000
--- a/settings_manager/src/types.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::cmp::{PartialEq, PartialOrd};
-use std::mem::{self, Discriminant};
-
-///  Priority level of the settings.
-///  Settings defined in lower priority settings are overwritten by higher ones.
-///
-/// # Variants
-/// 0. `System`
-/// 1. `User`
-/// 2. `Local`
-#[derive(Serialize, Deserialize, PartialEq, PartialOrd, Debug)]
-pub enum Priority {
-    System = 0,
-    User = 1,
-    Local = 2,
-}
-
-impl Priority {
-    pub fn priority(&self) -> Discriminant<Priority> {
-        mem::discriminant(&self)
-    }
-}
-
-#[cfg(test)]
-#[path = "./types_test.rs"]
-mod types_test;
diff --git a/settings_manager/src/types_test.rs b/settings_manager/src/types_test.rs
deleted file mode 100644
index c3f43bce..00000000
--- a/settings_manager/src/types_test.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use super::*;
-
-#[test]
-fn level_priority_test() {
-    let s = Priority::System;
-    let u = Priority::User;
-    let l = Priority::Local;
-
-    assert!(s < u, "system priority should be less than user");
-    assert!(u < l, "user priority should be less than local");
-}
diff --git a/settings_manager/src/user_settings.rs b/settings_manager/src/user_settings.rs
deleted file mode 100644
index 9a4aac28..00000000
--- a/settings_manager/src/user_settings.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-//! Settings meant for use on a user by user basis.
-//! These settings have a fixed base path and variable relative path.
-use crate::settings::{self, Settings};
-use crate::Result;
-use cluFlock::FlockLock;
-use serde::{de::DeserializeOwned, Serialize};
-use std::fs::File;
-use std::path::{Path, PathBuf};
-
-// *********************
-// *** User Settings ***
-// *********************
-
-/// User settings have a fixed base path with a variable relative path.
-pub trait UserSettings<S>: Settings<S>
-where
-    S: Serialize + DeserializeOwned + Clone,
-{
-    /// Returns the base path to the settings file.
-    fn base_path() -> PathBuf;
-
-    /// Returns the relative path for the settings.
-    fn rel_path(&self) -> &Path;
-
-    /// Returns the absolute path to the settings file.
-    fn path(&self) -> PathBuf {
-        Self::base_path().join(self.rel_path())
-    }
-}
-
-// **************
-// *** Loader ***
-// **************
-
-pub struct Loader<S> {
-    data: S,
-    rel_path: PathBuf,
-    file_lock: FlockLock<File>,
-}
-
-impl<S> Loader<S> {
-    /// Loads the settings from the file given by path.
-    pub fn load_or_create<T>(rel_path: PathBuf) -> Result<Loader<S>>
-    where
-        T: UserSettings<S>,
-        S: Serialize + DeserializeOwned + Clone + Default,
-    {
-        let mut path = T::base_path().to_path_buf();
-        path.push(rel_path.clone());
-
-        let (data, file_lock) = settings::load_or_create::<S>(path.as_path())?;
-        Ok(Loader {
-            data,
-            rel_path,
-            file_lock,
-        })
-    }
-
-    /// Loads the settings from the file given by path if it exists,
-    /// or creates a new file with the given settings.
-    pub fn load_or_create_with<T>(rel_path: PathBuf, default: S) -> Result<Loader<S>>
-    where
-        T: UserSettings<S>,
-        S: Serialize + DeserializeOwned + Clone,
-    {
-        let mut path = T::base_path().to_path_buf();
-        path.push(rel_path.clone());
-
-        let (data, file_lock) = settings::load_or_create_with::<S>(path.as_path(), default)?;
-        Ok(Loader {
-            data,
-            rel_path,
-            file_lock,
-        })
-    }
-}
-
-impl<S> Loader<S> {
-    pub fn rel_path(self) -> PathBuf {
-        self.rel_path
-    }
-
-    pub fn data(self) -> S {
-        self.data
-    }
-
-    pub fn file_lock(self) -> FlockLock<File> {
-        self.file_lock
-    }
-}
-
-impl<S> Into<Components<S>> for Loader<S> {
-    fn into(self) -> Components<S> {
-        Components {
-            data: self.data,
-            rel_path: self.rel_path,
-            file_lock: self.file_lock,
-        }
-    }
-}
-
-pub struct Components<S> {
-    pub data: S,
-    pub rel_path: PathBuf,
-    pub file_lock: FlockLock<File>,
-}
-
-#[cfg(test)]
-#[path = "./user_settings_test.rs"]
-mod user_settings_test;
diff --git a/settings_manager/src/user_settings_test.rs b/settings_manager/src/user_settings_test.rs
deleted file mode 100644
index 07399d73..00000000
--- a/settings_manager/src/user_settings_test.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-use super::*;
-use crate::settings::Settings;
-use crate::types::Priority;
-use crate::{Error, Result};
-use cluFlock::FlockLock;
-use derivative::{self, Derivative};
-use fake::faker::filesystem::raw::FileName;
-use fake::faker::lorem::raw::Words;
-use fake::locales::EN;
-use fake::Fake;
-use serde::{Deserialize, Serialize};
-use std::fs::File;
-use std::path::PathBuf;
-use std::{fs, io};
-
-// *************
-// *** setup ***
-// *************
-
-#[derive(Serialize, Deserialize, Derivative, Default)]
-#[derivative(Debug)]
-pub struct MockUserSettings {
-    #[serde(skip)]
-    _file_lock: Option<FlockLock<File>>,
-
-    #[serde(skip)]
-    _rel_path: Option<PathBuf>,
-
-    pub id: String,
-}
-
-impl MockUserSettings {
-    pub fn new() -> Self {
-        let id: Vec<String> = Words(EN, 10..11).fake();
-        let id = id.join("-");
-
-        MockUserSettings {
-            _file_lock: None,
-            _rel_path: None,
-            id,
-        }
-    }
-}
-
-impl Settings for MockUserSettings {
-    fn store_lock(&mut self, file_lock: FlockLock<File>) {
-        self._file_lock = Some(file_lock);
-    }
-
-    fn file(&self) -> Option<&File> {
-        match self._file_lock.as_ref() {
-            None => None,
-            Some(lock) => Some(&*lock),
-        }
-    }
-
-    fn file_mut(&mut self) -> Option<&mut File> {
-        match self._file_lock.as_mut() {
-            None => None,
-            Some(lock) => Some(&mut *lock),
-        }
-    }
-
-    fn priority(&self) -> Priority {
-        Priority::User
-    }
-}
-
-impl UserSettings for MockUserSettings {
-    fn base_path() -> Result<PathBuf> {
-        Ok(std::env::temp_dir())
-    }
-
-    fn rel_path(&self) -> Result<PathBuf> {
-        if self._rel_path.is_none() {
-            return Err(Error::IoError(io::Error::new(
-                io::ErrorKind::NotFound,
-                "rel path not set",
-            )));
-        }
-
-        let path = self._rel_path.clone().unwrap();
-        Ok(path)
-    }
-
-    fn set_rel_path(&mut self, path: PathBuf) -> Result {
-        self._rel_path = Some(path);
-        Ok(())
-    }
-}
-
-impl LockSettingsFile for MockUserSettings {}
-
-// *************
-// *** tests ***
-// *************
-
-// ---------------------
-// --- User Settings ---
-// ---------------------
-
-#[test]
-fn user_settings_path_should_concatenate_base_and_relative_paths() {
-    let rel_path = PathBuf::from(FileName(EN).fake::<String>());
-    let mut sets = MockUserSettings::new();
-    sets.set_rel_path(rel_path.clone())
-        .expect("set_rel_path should work");
-
-    let base_path = MockUserSettings::base_path().expect("base path should be set");
-    let sets_path = sets.path().expect("path should return a value");
-    assert_eq!(base_path.join(rel_path), sets_path, "incorrect path");
-}
-
-#[test]
-fn user_settings_load_should_work() {
-    // setup
-    let filename = PathBuf::from(FileName(EN).fake::<String>());
-    let mut sets = MockUserSettings::new();
-    let sets_id = sets.id.clone();
-    sets.set_rel_path(filename.clone())
-        .expect("set_rel_path should work");
-
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-    drop(sets);
-
-    // test
-    let loaded = MockUserSettings::load(&filename).expect("load should work");
-    assert_eq! {
-        sets_id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-#[test]
-fn user_settings_save_should_work() {
-    // setup
-    let filename = PathBuf::from(FileName(EN).fake::<String>());
-    let mut sets = MockUserSettings::new();
-    sets.set_rel_path(filename.clone())
-        .expect("set_rel_path should work");
-
-    sets.acquire_lock().expect("acquire lock should work");
-    sets.save().expect("save should work");
-
-    // test
-    let sets_path = sets.path().expect("path should work");
-    let loaded_str = fs::read_to_string(sets_path).expect("settings file should be readable");
-
-    let loaded: MockUserSettings =
-        serde_json::from_str(loaded_str.as_str()).expect("value should be valid json");
-
-    assert_eq! {
-        sets.id, loaded.id,
-        "incorrect settings loaded"
-    };
-}
-
-// --------------------------
-// --- Lock Settings File ---
-// --------------------------
-
-#[test]
-fn lock_file_settings_acquire_lock_should_obtain_file_lock() {
-    let filename = PathBuf::from(FileName(EN).fake::<String>());
-    let mut settings = MockUserSettings::new();
-    settings
-        .set_rel_path(filename)
-        .expect("set_rel_path should work");
-
-    settings.acquire_lock().expect("acquire lock panicked");
-
-    assert!(settings.file().is_some(), "acquire lock failed")
-}
-
-#[test]
-fn lock_file_settings_acquire_lock_should_exit_silently_if_lock_already_obtained() {
-    let filename = PathBuf::from(FileName(EN).fake::<String>());
-    let mut settings = MockUserSettings::new();
-    settings
-        .set_rel_path(filename)
-        .expect("set_rel_path should work");
-
-    settings
-        .acquire_lock()
-        .expect("file lock could not be acquired");
-
-    if let Err(_) = settings.acquire_lock() {
-        assert!(false, "acquiring file lock failed");
-    }
-}
diff --git a/ui/Cargo.toml b/ui/Cargo.toml
index a2a4256d..d5b80d80 100644
--- a/ui/Cargo.toml
+++ b/ui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thot-ui"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 
 authors = [ "Brian Carlsen <carlsen.bri@gmail.com>" ]
@@ -14,21 +14,21 @@ categories = [ "gui", "science" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-indexmap = "1.9"
-js-sys = "0.3"
-serde_json = "1.0"
-tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = ["dialog", "event"] }
-tracing = "0.1.37"
-uuid = { version = "1.3", features = ["v4"] }
-wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
-yew = "0.20"
-yew-router = "0.17"
+indexmap = { workspace = true }
+js-sys = { workspace = true }
+serde_json = { workspace = true }
+tauri-sys = { workspace = true, features = ["dialog", "event"] }
+tracing = { workspace = true }
+uuid = { workspace = true }
+wasm-bindgen = { workspace = true }
+wasm-bindgen-futures = { workspace = true }
+yew = { workspace = true }
+yew-router = { workspace = true }
 
 thot-core = { path = "../core", features = ["js", "yew"] }
 
 [dependencies.web-sys]
-version = "0.3"
+workspace = true
 features=[
     "DataTransfer",
 	"DomStringMap",
@@ -41,15 +41,16 @@ features=[
     "HtmlDivElement",
 	"HtmlSelectElement",
 	"HtmlTextAreaElement",
+    "InputEvent",
 	"MediaQueryList",
 	"MediaQueryListEvent",
 	"Window",
 ]
 
 [dependencies.yew_icons]
-version = "0.7"
+workspace = true
 features=[
-    "FontAwesomeSolidCode",
+    "FontAwesomeRegularFile",
     "FontAwesomeRegularFileAudio",
     "FontAwesomeRegularFileCode",
     "FontAwesomeRegularFileExcel",
@@ -60,10 +61,12 @@ features=[
     "FontAwesomeRegularFileVideo",
     "FontAwesomeRegularFileWord",
     "FontAwesomeRegularFileZipper",
-    "FontAwesomeRegularFile",
-    "OcticonsFileBinary24",
+    "FontAwesomeSolidAngleDown",
+    "FontAwesomeSolidAngleUp",
+    "FontAwesomeSolidCode",
     "HeroiconsSolidMinus",
-    "HeroiconsSolidPlus"
+    "HeroiconsSolidPlus",
+    "OcticonsFileBinary24",
 ]
 
 [dev-dependencies]
diff --git a/ui/src/common.rs b/ui/src/common.rs
deleted file mode 100644
index 2e779c44..00000000
--- a/ui/src/common.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Common functions.
-
-#[cfg(test)]
-#[path = "./common_test.rs"]
-mod common_test;
diff --git a/ui/src/common_test.rs b/ui/src/common_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/card.rs b/ui/src/components/card.rs
index efc70663..a2d29b13 100644
--- a/ui/src/components/card.rs
+++ b/ui/src/components/card.rs
@@ -51,7 +51,3 @@ where
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./card_test.rs"]
-mod card_test;
diff --git a/ui/src/components/card_deck.rs b/ui/src/components/card_deck.rs
index 91a4c61e..891bab3b 100644
--- a/ui/src/components/card_deck.rs
+++ b/ui/src/components/card_deck.rs
@@ -43,7 +43,3 @@ where
         <div class={classes!("card-deck")}>{ cards }</div>
     }
 }
-
-#[cfg(test)]
-#[path = "./card_deck_test.rs"]
-mod card_deck_test;
diff --git a/ui/src/components/card_deck_test.rs b/ui/src/components/card_deck_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/card_test.rs b/ui/src/components/card_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/drawer.rs b/ui/src/components/drawer.rs
index 99f0eb7a..94848205 100644
--- a/ui/src/components/drawer.rs
+++ b/ui/src/components/drawer.rs
@@ -49,14 +49,10 @@ pub fn drawer(props: &DrawerProps) -> Html {
         props.class.clone()
     );
 
-    let style = r"
-        display: flex;
-    ";
-
     let contents_style = if !*props.open { "display: none;" } else { "" };
 
     html! {
-        <div {class} {style}>
+        <div {class}>
             // <div class={classes!("drawer-toggle")}
             //     onclick={toggle_open}>
 
@@ -74,7 +70,3 @@ pub fn drawer(props: &DrawerProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./drawer_test.rs"]
-mod drawer_test;
diff --git a/ui/src/components/drawer_test.rs b/ui/src/components/drawer_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/file_selector.rs b/ui/src/components/file_selector.rs
index 71716141..12576026 100644
--- a/ui/src/components/file_selector.rs
+++ b/ui/src/components/file_selector.rs
@@ -99,22 +99,19 @@ pub fn file_selector(props: &FileSelectorProps) -> Html {
         let oncancel = props.oncancel.clone();
         let path = path.clone();
 
-        use_effect_with_deps(
-            move |_| {
-                if select_on_open {
-                    spawn_local(async move {
-                        let user_path = get_user_path(title.as_str(), action, default_path).await;
-                        if user_path.is_some() {
-                            path.set(user_path);
-                        } else {
-                            // canceled
-                            oncancel.emit(());
-                        }
-                    });
-                }
-            },
-            (),
-        );
+        use_effect_with((), move |_| {
+            if select_on_open {
+                spawn_local(async move {
+                    let user_path = get_user_path(title.as_str(), action, default_path).await;
+                    if user_path.is_some() {
+                        path.set(user_path);
+                    } else {
+                        // canceled
+                        oncancel.emit(());
+                    }
+                });
+            }
+        });
     }
 
     html! {
@@ -180,7 +177,3 @@ async fn get_user_path<'a>(
     let user_path = user_path.expect("could not retrieve file");
     user_path
 }
-
-#[cfg(test)]
-#[path = "./file_selector_test.rs"]
-mod file_selector_test;
diff --git a/ui/src/components/file_selector_test.rs b/ui/src/components/file_selector_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/form/inline_input.rs b/ui/src/components/form/inline_input.rs
index 6805f0f1..57ecf09b 100644
--- a/ui/src/components/form/inline_input.rs
+++ b/ui/src/components/form/inline_input.rs
@@ -42,14 +42,11 @@ where
         let active = active.clone();
         let input_ref = input_ref.clone();
 
-        use_effect_with_deps(
-            move |_active| {
-                if let Some(input) = input_ref.cast::<web_sys::HtmlInputElement>() {
-                    input.focus().expect("could not focus input");
-                }
-            },
-            active,
-        );
+        use_effect_with(active, move |_active| {
+            if let Some(input) = input_ref.cast::<web_sys::HtmlInputElement>() {
+                input.focus().expect("could not focus input");
+            }
+        });
     }
 
     let activate = {
@@ -125,7 +122,3 @@ where
        </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./inline_input_test.rs"]
-mod inline_input_test;
diff --git a/ui/src/components/form/inline_input_test.rs b/ui/src/components/form/inline_input_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/form/inline_textarea.rs b/ui/src/components/form/inline_textarea.rs
index f1bf1b78..42b40532 100644
--- a/ui/src/components/form/inline_textarea.rs
+++ b/ui/src/components/form/inline_textarea.rs
@@ -104,7 +104,3 @@ pub fn inline_textarea(props: &InlineTextareaProps<'static>) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./inline_textarea_test.rs"]
-mod inline_textarea_test;
diff --git a/ui/src/components/form/inline_textarea_test.rs b/ui/src/components/form/inline_textarea_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/form/mod.rs b/ui/src/components/form/mod.rs
index d6b1f9da..c5179af1 100644
--- a/ui/src/components/form/mod.rs
+++ b/ui/src/components/form/mod.rs
@@ -5,7 +5,3 @@ pub mod inline_textarea;
 // Re-exports
 pub use inline_input::InlineInput;
 pub use inline_textarea::InlineTextarea;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/components/form/mod_test.rs b/ui/src/components/form/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/funnel.rs b/ui/src/components/funnel.rs
index 7c200e97..6c7fab84 100644
--- a/ui/src/components/funnel.rs
+++ b/ui/src/components/funnel.rs
@@ -41,15 +41,12 @@ fn funnel_step(props: &FunnelStepProps) -> Html {
         let step_state = step_state.clone();
         let index = props.index.clone();
 
-        use_effect_with_deps(
-            move |funnel_state| {
-                let active = funnel_state.active_step == index;
-                step_state.set(FunnelStepState { index, active });
-
-                || {}
-            },
-            funnel_state,
-        );
+        use_effect_with(funnel_state, move |funnel_state| {
+            let active = funnel_state.active_step == index;
+            step_state.set(FunnelStepState { index, active });
+        
+            || {}
+        });
     }
 
     html! {
@@ -189,7 +186,3 @@ pub fn funnel(props: &FunnelProps) -> Html {
         </ContextProvider<FunnelReducer>>
     }
 }
-
-#[cfg(test)]
-#[path = "./funnel_test.rs"]
-mod funnel_test;
diff --git a/ui/src/components/funnel_test.rs b/ui/src/components/funnel_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/messages/message.rs b/ui/src/components/messages/message.rs
index 3e48bd90..b66ff935 100644
--- a/ui/src/components/messages/message.rs
+++ b/ui/src/components/messages/message.rs
@@ -1,6 +1,7 @@
 //! Display error messages
 use crate::types::MessageType;
 use yew::prelude::*;
+use yew_icons::{Icon, IconId};
 
 // ***************
 // *** Message ***
@@ -12,6 +13,10 @@ pub struct MessageProps {
     pub class: Classes,
 
     pub message: AttrValue,
+
+    #[prop_or_default]
+    pub details: Option<AttrValue>,
+
     pub kind: MessageType,
 
     #[prop_or_default]
@@ -20,6 +25,8 @@ pub struct MessageProps {
 
 #[function_component(Message)]
 pub fn message(props: &MessageProps) -> Html {
+    let show_details = use_state(|| false);
+
     let onclick = {
         let onclick = props.onclick.clone();
 
@@ -28,21 +35,54 @@ pub fn message(props: &MessageProps) -> Html {
         })
     };
 
+    let toggle_details = {
+        let show_details = show_details.clone();
+
+        Callback::from(move |e: MouseEvent| {
+            e.stop_propagation();
+            show_details.set(!*show_details);
+        })
+    };
+
     let kind_class = match props.kind {
         MessageType::Info => "message-info",
         MessageType::Success => "message-success",
         MessageType::Error => "message-error",
+        MessageType::Warning => "message-warning",
     };
 
     let class = classes!("thot-ui-message", kind_class, props.class.clone());
+    let mut details_class = classes!("details");
+    if *show_details {
+        details_class.push("open");
+    } else {
+        details_class.push("closed");
+    }
+
+    let details_icon = if *show_details {
+        IconId::FontAwesomeSolidAngleUp
+    } else {
+        IconId::FontAwesomeSolidAngleDown
+    };
 
     html! {
         <div {class} {onclick}>
-            { &props.message }
+            <div class={classes!("message")}>
+                { &props.message }
+            </div>
+            if {props.details.is_some()} {
+                <div class={details_class}>
+                    <span onclick={toggle_details}>
+                        { "Details" }
+                        <Icon icon_id={details_icon} />
+                    </span>
+                    if *show_details {
+                        <div class={classes!("details-body")}>
+                            { props.details.as_ref().unwrap() }
+                        </div>
+                    }
+                </div>
+            }
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./message_test.rs"]
-mod message_test;
diff --git a/ui/src/components/messages/message_test.rs b/ui/src/components/messages/message_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/messages/messages.rs b/ui/src/components/messages/messages.rs
index 0af33644..2c99a9d6 100644
--- a/ui/src/components/messages/messages.rs
+++ b/ui/src/components/messages/messages.rs
@@ -24,7 +24,3 @@ pub fn messages(props: &MessagesProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./messages_test.rs"]
-mod messages_test;
diff --git a/ui/src/components/messages/messages_test.rs b/ui/src/components/messages/messages_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/messages/mod.rs b/ui/src/components/messages/mod.rs
index 0bf3461d..b87ec930 100644
--- a/ui/src/components/messages/mod.rs
+++ b/ui/src/components/messages/mod.rs
@@ -5,7 +5,3 @@ pub mod messages;
 // Re-exports
 pub use message::Message;
 pub use messages::Messages;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/components/messages/mod_test.rs b/ui/src/components/messages/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/mod.rs b/ui/src/components/mod.rs
index ff86bb97..145ba7dc 100644
--- a/ui/src/components/mod.rs
+++ b/ui/src/components/mod.rs
@@ -19,7 +19,3 @@ pub use file_selector::{FileSelector, FileSelectorAction};
 pub use funnel::Funnel;
 pub use messages::{Message, Messages};
 pub use shadow_box::ShadowBox;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/components/mod_test.rs b/ui/src/components/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/navigation/drop_down_menu.rs b/ui/src/components/navigation/drop_down_menu.rs
index ee259db4..02dff3ae 100644
--- a/ui/src/components/navigation/drop_down_menu.rs
+++ b/ui/src/components/navigation/drop_down_menu.rs
@@ -67,7 +67,3 @@ pub fn drop_down_menu(props: &DropdownMenuProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./drop_down_menu_test.rs"]
-mod drop_down_menu_test;
diff --git a/ui/src/components/navigation/drop_down_menu_test.rs b/ui/src/components/navigation/drop_down_menu_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/navigation/mod.rs b/ui/src/components/navigation/mod.rs
index 3bf24473..1108df65 100644
--- a/ui/src/components/navigation/mod.rs
+++ b/ui/src/components/navigation/mod.rs
@@ -5,7 +5,3 @@ pub mod tab_bar;
 // Re-exports
 pub use drop_down_menu::DropdownMenu;
 pub use tab_bar::{TabBar, TabCloseInfo, TabKey};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/components/navigation/mod_test.rs b/ui/src/components/navigation/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/navigation/tab_bar.rs b/ui/src/components/navigation/tab_bar.rs
index e0ca5a53..bf3961ea 100644
--- a/ui/src/components/navigation/tab_bar.rs
+++ b/ui/src/components/navigation/tab_bar.rs
@@ -48,7 +48,7 @@ where
     /// and tabs can not be closed.
     #[prop_or_default]
     pub onclick_tab_close: Option<Callback<TabCloseInfo<K>>>,
-    // @todo
+    // TODO
     // /// Allow tabs to be reordered.
     // #[prop_or(false)]
     // reorder: bool,
diff --git a/ui/src/components/navigation/tab_bar_test.rs b/ui/src/components/navigation/tab_bar_test.rs
index ba537d3b..800c48a1 100644
--- a/ui/src/components/navigation/tab_bar_test.rs
+++ b/ui/src/components/navigation/tab_bar_test.rs
@@ -53,7 +53,6 @@ fn next_tab_on_close_should_work() {
     assert_eq!(None, next, "next should be undetermined");
 
     // close tab not found
-    let active_index = tabs.len() - 4;
     let (active, _) = tabs.get_index(close_index + 1).expect("tab should exist");
     let close = ResourceId::new();
     let next = next_tab_on_close(&close, Some(active), &tabs);
diff --git a/ui/src/components/route_guard.rs b/ui/src/components/route_guard.rs
index 59c3a408..893b536c 100644
--- a/ui/src/components/route_guard.rs
+++ b/ui/src/components/route_guard.rs
@@ -40,7 +40,3 @@ where
         { for props.children.iter() }
     }
 }
-
-#[cfg(test)]
-#[path = "./route_guard_test.rs"]
-mod route_guard_test;
diff --git a/ui/src/components/route_guard_test.rs b/ui/src/components/route_guard_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/shadow_box.rs b/ui/src/components/shadow_box.rs
index d5ffdda4..2cf2d82e 100644
--- a/ui/src/components/shadow_box.rs
+++ b/ui/src/components/shadow_box.rs
@@ -20,7 +20,7 @@ pub struct ShadowBoxProps {
 }
 
 const CONTAINER_STYLE: &str = "
-    position: absolute;
+    position: fixed;
     top: 0;
     bottom: 0;
     left: 0;
@@ -74,7 +74,3 @@ pub fn shadow_box(props: &ShadowBoxProps) -> Html {
 
     create_portal(out, host.into())
 }
-
-#[cfg(test)]
-#[path = "./shadow_box_test.rs"]
-mod shadow_box_test;
diff --git a/ui/src/components/shadow_box_test.rs b/ui/src/components/shadow_box_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/tree_view/item.rs b/ui/src/components/tree_view/item.rs
index 44bd9231..e8326f63 100644
--- a/ui/src/components/tree_view/item.rs
+++ b/ui/src/components/tree_view/item.rs
@@ -7,7 +7,3 @@ pub trait TreeViewItem: PartialEq {
     fn html(&self) -> Html;
     // fn iter_children(&self) -> Box<dyn Iterator<Item = Box<dyn TreeViewItem>>>;
 }
-
-#[cfg(test)]
-#[path = "./item_test.rs"]
-mod item_test;
diff --git a/ui/src/components/tree_view/item_test.rs b/ui/src/components/tree_view/item_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/tree_view/mod.rs b/ui/src/components/tree_view/mod.rs
index 1dba4921..8f41371d 100644
--- a/ui/src/components/tree_view/mod.rs
+++ b/ui/src/components/tree_view/mod.rs
@@ -5,7 +5,3 @@ pub mod tree_view;
 // Re-exports
 pub use item::TreeViewItem;
 pub use tree_view::TreeView;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/components/tree_view/mod_test.rs b/ui/src/components/tree_view/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/components/tree_view/tree_view.rs b/ui/src/components/tree_view/tree_view.rs
index 1b9e81b1..5a7b902f 100644
--- a/ui/src/components/tree_view/tree_view.rs
+++ b/ui/src/components/tree_view/tree_view.rs
@@ -54,7 +54,3 @@ where
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./tree_view_test.rs"]
-mod tree_view_test;
diff --git a/ui/src/components/tree_view/tree_view_test.rs b/ui/src/components/tree_view/tree_view_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/error.rs b/ui/src/error.rs
index ca9a365c..f97c7239 100644
--- a/ui/src/error.rs
+++ b/ui/src/error.rs
@@ -21,7 +21,3 @@ impl From<JsValue> for Error {
 // **************
 
 pub type Result<T = ()> = StdResult<T, Error>;
-
-#[cfg(test)]
-#[path = "./error_test.rs"]
-mod error_test;
diff --git a/ui/src/error_test.rs b/ui/src/error_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/hooks/mod.rs b/ui/src/hooks/mod.rs
index 903efc90..f99c1d39 100644
--- a/ui/src/hooks/mod.rs
+++ b/ui/src/hooks/mod.rs
@@ -3,7 +3,3 @@ pub mod preferred_theme;
 
 // Re-exports
 pub use preferred_theme::use_preferred_theme;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/hooks/mod_test.rs b/ui/src/hooks/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/hooks/preferred_theme.rs b/ui/src/hooks/preferred_theme.rs
index 40670b87..6a332697 100644
--- a/ui/src/hooks/preferred_theme.rs
+++ b/ui/src/hooks/preferred_theme.rs
@@ -74,7 +74,3 @@ pub fn use_preferred_theme() -> Option<PreferredTheme> {
 
     (*state).clone()
 }
-
-#[cfg(test)]
-#[path = "./preferred_theme_test.rs"]
-mod preferred_theme_test;
diff --git a/ui/src/hooks/preferred_theme_test.rs b/ui/src/hooks/preferred_theme_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/lib.rs b/ui/src/lib.rs
index ac6c7dfa..4676d4dd 100644
--- a/ui/src/lib.rs
+++ b/ui/src/lib.rs
@@ -1,5 +1,4 @@
 #![feature(trait_alias)]
-pub mod common;
 pub mod components;
 pub mod error;
 pub mod hooks;
diff --git a/ui/src/types/container_preview.rs b/ui/src/types/container_preview.rs
index 4c62e645..5438837d 100644
--- a/ui/src/types/container_preview.rs
+++ b/ui/src/types/container_preview.rs
@@ -15,23 +15,35 @@ pub enum ContainerPreview {
     Scripts,
 }
 
-impl Into<String> for ContainerPreview {
-    fn into(self) -> String {
+impl ContainerPreview {
+    pub fn as_str(&self) -> &str {
         match self {
-            ContainerPreview::None => "None".to_string(),
-            ContainerPreview::Type => "Type".to_string(),
-            ContainerPreview::Description => "Description".to_string(),
-            ContainerPreview::Tags => "Tags".to_string(),
-            ContainerPreview::Metadata => "Metadata".to_string(),
-            ContainerPreview::Assets => "Data".to_string(),
-            ContainerPreview::Scripts => "Scripts".to_string(),
+            ContainerPreview::None => "None",
+            ContainerPreview::Type => "Type",
+            ContainerPreview::Description => "Description",
+            ContainerPreview::Tags => "Tags",
+            ContainerPreview::Metadata => "Metadata",
+            ContainerPreview::Assets => "Data",
+            ContainerPreview::Scripts => "Scripts",
         }
     }
 }
 
+impl AsRef<str> for ContainerPreview {
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+
+impl ToHtml for ContainerPreview {
+    fn to_html(&self) -> Html {
+        self.as_str().into_html()
+    }
+}
+
 impl Into<AttrValue> for ContainerPreview {
     fn into(self) -> AttrValue {
-        Into::<String>::into(self).into()
+        self.to_string().into()
     }
 }
 
@@ -57,10 +69,6 @@ impl From<String> for ContainerPreview {
 
 impl fmt::Display for ContainerPreview {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(f, "{}", Into::<String>::into(self.clone()))
+        write!(f, "{}", self.as_str())
     }
 }
-
-#[cfg(test)]
-#[path = "./container_preview_test.rs"]
-mod container_preview_test;
diff --git a/ui/src/types/container_preview_test.rs b/ui/src/types/container_preview_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/types/message.rs b/ui/src/types/message.rs
index 4976a5d8..72536640 100644
--- a/ui/src/types/message.rs
+++ b/ui/src/types/message.rs
@@ -12,53 +12,76 @@ pub enum MessageType {
 
     /// Error message.
     Error,
+
+    /// Warning message.
+    Warning,
 }
 
 /// A Message.
 #[derive(Clone, PartialEq, Debug)]
-pub struct Message<'a> {
+pub struct Message {
     id: Uuid,
 
     /// Message to display.
-    pub message: &'a str,
+    pub message: String,
+
+    /// Expandable details.
+    pub details: Option<String>,
 
     /// Type of message.
     pub kind: MessageType,
 }
 
-impl<'a> Message<'a> {
+impl Message {
     /// Create a `Message` with a `kind` of [`MessageType::Info`].
-    pub fn info(message: &'a str) -> Self {
+    pub fn info(message: impl Into<String>) -> Self {
         Self {
             id: Uuid::new_v4(),
-            message,
+            message: message.into(),
+            details: None,
             kind: MessageType::Info,
         }
     }
 
     /// Create a `Message` with a `kind` of [`MessageType::Success`].
-    pub fn success(message: &'a str) -> Self {
+    pub fn success(message: impl Into<String>) -> Self {
         Self {
             id: Uuid::new_v4(),
-            message,
+            message: message.into(),
+            details: None,
             kind: MessageType::Success,
         }
     }
 
     /// Create a `Message` with a `kind` of [`MessageType::Error`].
-    pub fn error(message: &'a str) -> Self {
+    pub fn error(message: impl Into<String>) -> Self {
         Self {
             id: Uuid::new_v4(),
-            message,
+            message: message.into(),
+            details: None,
             kind: MessageType::Error,
         }
     }
 
+    /// Create a `Message` with a `kind` of [`MessageType::Warning`].
+    pub fn warning(message: impl Into<String>) -> Self {
+        Self {
+            id: Uuid::new_v4(),
+            message: message.into(),
+            details: None,
+            kind: MessageType::Warning,
+        }
+    }
+
     pub fn id(&self) -> &Uuid {
         &self.id
     }
-}
 
-#[cfg(test)]
-#[path = "./message_test.rs"]
-mod message_test;
+    pub fn set_details(&mut self, details: impl Into<String>) {
+        self.details = Some(details.into());
+    }
+
+    pub fn clear_details(&mut self) {
+        self.details = None;
+    }
+}
diff --git a/ui/src/types/message_test.rs b/ui/src/types/message_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/types/mod.rs b/ui/src/types/mod.rs
index 10a63ac7..ed43536e 100644
--- a/ui/src/types/mod.rs
+++ b/ui/src/types/mod.rs
@@ -6,7 +6,3 @@ pub mod to_key;
 pub use container_preview::ContainerPreview;
 pub use message::{Message, MessageType};
 pub use to_key::ToKey;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/types/mod_test.rs b/ui/src/types/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/types/to_key.rs b/ui/src/types/to_key.rs
index b1fdf246..05f31e12 100644
--- a/ui/src/types/to_key.rs
+++ b/ui/src/types/to_key.rs
@@ -4,7 +4,3 @@ use yew::virtual_dom::Key;
 pub trait ToKey {
     fn key(&self) -> Key;
 }
-
-#[cfg(test)]
-#[path = "./to_key_test.rs"]
-mod to_key_test;
diff --git a/ui/src/types/to_key_test.rs b/ui/src/types/to_key_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/standard_properties_editor.rs b/ui/src/widgets/asset/asset_properties_editor.rs
similarity index 66%
rename from ui/src/widgets/standard_properties_editor.rs
rename to ui/src/widgets/asset/asset_properties_editor.rs
index 5ffd0f41..f06c95a4 100644
--- a/ui/src/widgets/standard_properties_editor.rs
+++ b/ui/src/widgets/asset/asset_properties_editor.rs
@@ -1,14 +1,14 @@
 //! Properties editor for [`Contaier`](thot_core::project::Container)s.
-use super::{MetadataEditor, TagsEditor};
+use super::super::{MetadataEditor, TagsEditor};
 use std::ops::{Deref, DerefMut};
 use std::rc::Rc;
-use thot_core::project::{Metadata, StandardProperties};
+use thot_core::project::{AssetProperties, Metadata};
 use yew::prelude::*;
 
 // ************************
 // *** Properties State ***
 // ************************
-enum StandardPropertiesStateAction {
+enum AssetPropertiesStateAction {
     SetName(String),
     ClearName,
     SetKind(String),
@@ -17,77 +17,77 @@ enum StandardPropertiesStateAction {
     ClearDescription,
     SetTags(Vec<String>),
     SetMetadata(Metadata),
-    Update(StandardProperties),
+    Update(AssetProperties),
 }
 
 #[derive(PartialEq, Clone)]
-struct StandardPropertiesState(StandardProperties);
+struct AssetPropertiesState(AssetProperties);
 
-impl From<StandardProperties> for StandardPropertiesState {
-    fn from(props: StandardProperties) -> Self {
+impl From<AssetProperties> for AssetPropertiesState {
+    fn from(props: AssetProperties) -> Self {
         Self(props)
     }
 }
 
-impl Into<StandardProperties> for StandardPropertiesState {
-    fn into(self) -> StandardProperties {
+impl Into<AssetProperties> for AssetPropertiesState {
+    fn into(self) -> AssetProperties {
         self.0
     }
 }
 
-impl Deref for StandardPropertiesState {
-    type Target = StandardProperties;
+impl Deref for AssetPropertiesState {
+    type Target = AssetProperties;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
 
-impl DerefMut for StandardPropertiesState {
+impl DerefMut for AssetPropertiesState {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.0
     }
 }
 
-impl Reducible for StandardPropertiesState {
-    type Action = StandardPropertiesStateAction;
+impl Reducible for AssetPropertiesState {
+    type Action = AssetPropertiesStateAction;
 
     fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
         let mut current = (*self).clone();
         match action {
-            StandardPropertiesStateAction::SetName(value) => {
+            AssetPropertiesStateAction::SetName(value) => {
                 let _ = current.name.insert(value);
             }
 
-            StandardPropertiesStateAction::ClearName => {
+            AssetPropertiesStateAction::ClearName => {
                 current.name.take();
             }
 
-            StandardPropertiesStateAction::SetKind(value) => {
+            AssetPropertiesStateAction::SetKind(value) => {
                 let _ = current.kind.insert(value);
             }
 
-            StandardPropertiesStateAction::ClearKind => {
+            AssetPropertiesStateAction::ClearKind => {
                 current.kind.take();
             }
 
-            StandardPropertiesStateAction::SetDescription(value) => {
+            AssetPropertiesStateAction::SetDescription(value) => {
                 let _ = current.description.insert(value);
             }
 
-            StandardPropertiesStateAction::ClearDescription => {
+            AssetPropertiesStateAction::ClearDescription => {
                 current.description.take();
             }
 
-            StandardPropertiesStateAction::SetTags(tags) => {
+            AssetPropertiesStateAction::SetTags(tags) => {
                 current.tags = tags;
             }
 
-            StandardPropertiesStateAction::SetMetadata(metadata) => {
+            AssetPropertiesStateAction::SetMetadata(metadata) => {
                 current.metadata = metadata;
             }
 
-            StandardPropertiesStateAction::Update(properties) => {
+            AssetPropertiesStateAction::Update(properties) => {
                 return Self(properties).into();
             }
         }
@@ -100,27 +100,27 @@ impl Reducible for StandardPropertiesState {
 // *** Properties Component ***
 // ****************************
 
-/// Properties for [`StandardPropertiesEditor`].
+/// Properties for [`AssetPropertiesEditor`].
 #[derive(PartialEq, Properties)]
-pub struct StandardPropertiesEditorProps {
+pub struct AssetPropertiesEditorProps {
     #[prop_or_default]
     pub class: Classes,
 
     /// Initial value.
-    #[prop_or_else(StandardProperties::new)]
-    pub properties: StandardProperties,
+    #[prop_or_else(AssetProperties::new)]
+    pub properties: AssetProperties,
 
     /// Callback when value changes.
     #[prop_or_default]
-    pub onchange: Callback<StandardProperties>,
+    pub onchange: Callback<AssetProperties>,
 }
 
-/// [`StandardProperties`] editor.
+/// [`AssetProperties`] editor.
 #[tracing::instrument(skip(props))]
-#[function_component(StandardPropertiesEditor)]
-pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html {
+#[function_component(AssetPropertiesEditor)]
+pub fn asset_properties_editor(props: &AssetPropertiesEditorProps) -> Html {
     let properties_state =
-        use_reducer(|| Into::<StandardPropertiesState>::into(props.properties.clone()));
+        use_reducer(|| Into::<AssetPropertiesState>::into(props.properties.clone()));
 
     let dirty_state = use_state(|| false);
 
@@ -132,14 +132,10 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
         let properties_state = properties_state.clone();
         let dirty_state = dirty_state.clone();
 
-        use_effect_with_deps(
-            move |properties| {
-                dirty_state.set(false);
-                properties_state
-                    .dispatch(StandardPropertiesStateAction::Update(properties.clone()));
-            },
-            props.properties.clone(),
-        );
+        use_effect_with(props.properties.clone(), move |properties| {
+            dirty_state.set(false);
+            properties_state.dispatch(AssetPropertiesStateAction::Update(properties.clone()));
+        });
     }
 
     let onchange_name = {
@@ -155,9 +151,9 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
 
             let value = elm.value().trim().to_string();
             let action = if value.is_empty() {
-                StandardPropertiesStateAction::ClearName
+                AssetPropertiesStateAction::ClearName
             } else {
-                StandardPropertiesStateAction::SetName(value)
+                AssetPropertiesStateAction::SetName(value)
             };
 
             properties_state.dispatch(action);
@@ -178,9 +174,9 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
 
             let value = elm.value().trim().to_string();
             let action = if value.is_empty() {
-                StandardPropertiesStateAction::ClearKind
+                AssetPropertiesStateAction::ClearKind
             } else {
-                StandardPropertiesStateAction::SetKind(value)
+                AssetPropertiesStateAction::SetKind(value)
             };
 
             properties_state.dispatch(action);
@@ -201,9 +197,9 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
 
             let value = elm.value().trim().to_string();
             let action = if value.is_empty() {
-                StandardPropertiesStateAction::ClearDescription
+                AssetPropertiesStateAction::ClearDescription
             } else {
-                StandardPropertiesStateAction::SetDescription(value)
+                AssetPropertiesStateAction::SetDescription(value)
             };
 
             properties_state.dispatch(action);
@@ -216,7 +212,7 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
         let dirty_state = dirty_state.clone();
 
         Callback::from(move |value: Vec<String>| {
-            properties_state.dispatch(StandardPropertiesStateAction::SetTags(value));
+            properties_state.dispatch(AssetPropertiesStateAction::SetTags(value));
             dirty_state.set(true);
         })
     };
@@ -226,7 +222,7 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
         let dirty_state = dirty_state.clone();
 
         Callback::from(move |value: Metadata| {
-            properties_state.dispatch(StandardPropertiesStateAction::SetMetadata(value));
+            properties_state.dispatch(AssetPropertiesStateAction::SetMetadata(value));
             dirty_state.set(true);
         })
     };
@@ -236,26 +232,23 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
         let dirty_state = dirty_state.clone();
         let onchange = props.onchange.clone();
 
-        use_effect_with_deps(
-            move |(properties_state, dirty_state)| {
-                if !(**dirty_state) {
-                    return;
-                }
-                onchange.emit((**properties_state).clone().into());
-            },
-            (properties_state, dirty_state),
-        );
+        use_effect_with((properties_state, dirty_state), move |(properties_state, dirty_state)| {
+            if !(**dirty_state) {
+                return;
+            }
+            onchange.emit((**properties_state).clone().into());
+        });
     }
 
     html! {
-        <form class={classes!("thot-ui-standard-properties-editor")}>
+        <form class={classes!("thot-ui-asset-properties-editor")}>
             <div class={classes!("form-field", "name")}>
                 <label>
                     <h3> { "Name" } </h3>
                     <input
                         ref={name_ref}
                         placeholder={"(no name)"}
-                        value={properties_state.name.clone()}
+                        value={properties_state.name.clone().unwrap_or("".into())}
                         onchange={onchange_name} />
                 </label>
             </div>
@@ -266,7 +259,7 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
                     <input
                         ref={kind_ref}
                         placeholder={"(no type)"}
-                        value={properties_state.kind.clone()}
+                        value={properties_state.kind.clone().unwrap_or("".into())}
                         onchange={onchange_kind} />
                 </label>
             </div>
@@ -277,7 +270,7 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
                     <textarea
                         ref={description_ref}
                         placeholder={"(no description)"}
-                        value={properties_state.description.clone()}
+                        value={properties_state.description.clone().unwrap_or("".into())}
                         onchange={onchange_description}></textarea>
                 </label>
             </div>
@@ -299,7 +292,3 @@ pub fn standard_properties_editor(props: &StandardPropertiesEditorProps) -> Html
         </form>
     }
 }
-
-#[cfg(test)]
-#[path = "./standard_properties_editor_test.rs"]
-mod standard_properties_editor_test;
diff --git a/ui/src/widgets/asset/assets_preview.rs b/ui/src/widgets/asset/assets_preview.rs
index f3afe9c0..0963754b 100644
--- a/ui/src/widgets/asset/assets_preview.rs
+++ b/ui/src/widgets/asset/assets_preview.rs
@@ -1,55 +1,56 @@
 //! Assets preview.
+use crate::widgets::common::asset as common;
 use std::collections::HashSet;
-use std::path::PathBuf;
-use thot_core::project::Asset as CoreAsset;
+use thot_core::project::Asset;
 use thot_core::types::ResourceId;
 use yew::prelude::*;
-use yew_icons::{Icon, IconId};
+use yew_icons::Icon;
 
 #[derive(Properties, PartialEq, Debug)]
 pub struct AssetsPreviewProps {
-    /// [`Asset`](CoreAsset)s to display.
-    pub assets: Vec<CoreAsset>,
+    /// [`Asset`]s to display.
+    pub assets: Vec<Asset>,
 
     /// Selected.
     #[prop_or_default]
     pub active: HashSet<ResourceId>,
 
-    /// Callback when an [`Asset`](CoreAsset) is clicked.
+    /// Callback when an [`Asset`](Asset) is clicked.
     #[prop_or_default]
     pub onclick_asset: Option<Callback<(ResourceId, MouseEvent)>>,
 
-    /// Callback when an [`Asset`](CoreAsset) is double clicked.
+    /// Callback when an [`Asset`](Asset) is double clicked.
     #[prop_or_default]
     pub ondblclick_asset: Option<Callback<(ResourceId, MouseEvent)>>,
 
-    /// Callback when an [`Asset`](CoreAsset) is to be deleted.
+    /// Callback when an [`Asset`](Asset) is to be deleted.
     #[prop_or_default]
     pub onclick_asset_remove: Option<Callback<ResourceId>>,
 }
 
-type Color = String;
-
 #[function_component(AssetsPreview)]
 #[tracing::instrument(level = "debug")]
 pub fn assets_preview(props: &AssetsPreviewProps) -> Html {
     // NOTE: Check double click was for same asset,
     // otherwise removing an asset may trigger double click.
     let clicked_asset = use_state(|| None);
+    let mut assets = props.assets.clone();
+    assets.sort_by(|a, b| a.path.as_path().cmp(b.path.as_path()));
 
     html! {
         <div class={classes!("assets-preview")}>
-            if props.assets.len() == 0 {
+            if assets.len() == 0 {
              { "(no data)" }
             } else {
                 <ol class={classes!("thot-ui-assets-list")}>
-                    { props.assets.iter().map(|asset| {
+                    { assets.iter().map(|asset| {
                         let mut class = classes!("thot-ui-asset-preview", "clickable");
                         if props.active.contains(&asset.rid) {
                             class.push("active");
                         }
 
-                       html! {
+                        let display_name = common::asset_display_name(&asset);
+                        html! {
                             <li key={asset.rid.clone()}
                                 {class}
                                 onclick={onclick_asset(
@@ -64,13 +65,13 @@ pub fn assets_preview(props: &AssetsPreviewProps) -> Html {
                                 )} >
 
                                 <div class={classes!("thot-ui-asset")}>
-
-                                    <div style={ asset_icon_color(&asset) }>
-                                        <Icon class={ classes!("thot-ui-asset-icon")} icon_id={ asset_icon_id(&asset) } />
+                                    <div style={ common::asset_icon_color(&asset) }>
+                                        <Icon class={classes!("thot-ui-asset-icon")} icon_id={common::asset_icon_id(&asset)} />
                                     </div>
 
-                                    <div class={classes!("thot-ui-asset-name")}>
-                                        { asset_display_name(&asset) }
+                                    <div class={classes!("thot-ui-asset-name")}
+                                        title={display_name.clone()}>
+                                        { display_name }
                                     </div>
                                     if props.onclick_asset_remove.is_some() {
                                         <button onclick={onclick_asset_remove(
@@ -81,7 +82,6 @@ pub fn assets_preview(props: &AssetsPreviewProps) -> Html {
                                             { "X" }
                                         </button>
                                     }
-
                                 </div>
                             </li>
                         }
@@ -96,99 +96,9 @@ pub fn assets_preview(props: &AssetsPreviewProps) -> Html {
 // *** helpers ***
 // ***************
 
-/// Gets the name to display for an [`Asset`](CoreAsset).
-///
-/// # Returns
-/// The `name` if set, otherwise the `path`'s file name.
-fn asset_display_name(asset: &CoreAsset) -> String {
-    fn shorten_file_name(file_name: &str) -> String {
-        //TODO[2]: not sure if this is the right place to max file length, should be centralized
-        let max_file_name_length = 11;
-        if file_name.len() <= max_file_name_length {
-            return file_name.to_string();
-        }
-        let mut shortened = file_name
-            .chars()
-            .take(max_file_name_length)
-            .collect::<String>();
-        shortened.push_str("...");
-        shortened
-    }
-    if let Some(name) = asset.properties.name.as_ref() {
-        name.clone()
-    } else {
-        let path = Into::<PathBuf>::into(asset.path.clone());
-        let name = path
-            .file_name()
-            .expect("`Asset.path` could not get file name");
-
-        let name = name.to_str().expect("could not convert path to str");
-        shorten_file_name(name).to_owned()
-    }
-}
-
-/// Gets the icon id to display for an [`Asset`](CoreAsset).
-///
-/// # Returns
-/// The `IconId`.
-fn asset_icon_id(asset: &CoreAsset) -> IconId {
-    fn get_icon_id(extension: &str) -> IconId {
-        match extension {
-            "mp3" | "m4a" | "flac" | "wav" => IconId::FontAwesomeRegularFileAudio,
-            "py" | "r" | "m" | "js" | "ts" | "cpp" | "c" | "rs" => {
-                IconId::FontAwesomeRegularFileCode
-            }
-            "csv" | "xlsx" | "xlsm" | "xml" | "odf" => IconId::FontAwesomeRegularFileExcel,
-            "png" | "svg" | "jpg" | "jpeg" | "tiff" | "bmp" => IconId::FontAwesomeRegularFileImage,
-            "txt" => IconId::FontAwesomeRegularFileLines,
-            "pdf" => IconId::FontAwesomeRegularFilePdf,
-            "pptx" | "pptm" | "ppt" => IconId::FontAwesomeRegularFilePowerpoint,
-            "doc" | "docm" | "docx" | "dot" => IconId::FontAwesomeRegularFileWord,
-            "mp4" | "mov" | "wmv" | "avi" => IconId::FontAwesomeRegularFileVideo,
-            "zip" | "zipx" | "rar" | "7z" | "gz" => IconId::FontAwesomeRegularFileZipper,
-            "dat" | "pkl" | "bin" | "exe" => IconId::OcticonsFileBinary24,
-            _ => IconId::FontAwesomeRegularFile,
-        }
-    }
-
-    let Some(extension) = asset.path.as_path().extension() else {
-        return IconId::FontAwesomeRegularFile;
-    };
-
-    let Some(extension) = extension.to_str() else {
-        return IconId::FontAwesomeRegularFile;
-    };
-
-    get_icon_id(&extension.to_lowercase())
-}
-
-/// Gets the icon color to display for an [`Asset`](CoreAsset).
-///
-/// # Returns
-/// The `Color`.
-fn asset_icon_color(asset: &CoreAsset) -> Color {
-    let icon_id = asset_icon_id(asset);
-    // TODO[l] Pull from stylesheet.
-    let color = match icon_id {
-        IconId::FontAwesomeRegularFileAudio => "#FFCC67",
-        IconId::FontAwesomeRegularFileCode => "#B4DCE1",
-        IconId::FontAwesomeRegularFileExcel => "#A8C764",
-        IconId::FontAwesomeRegularFileImage => "#FFB800",
-        IconId::FontAwesomeRegularFileLines => "#E0E2E8",
-        IconId::FontAwesomeRegularFilePdf => "#E05C2B",
-        IconId::FontAwesomeRegularFilePowerpoint => "#E97D55",
-        IconId::FontAwesomeRegularFileWord => "#77B9CE",
-        IconId::FontAwesomeRegularFileVideo => "#FFDC82",
-        IconId::FontAwesomeRegularFileZipper => "#C8CCD4",
-        IconId::OcticonsFileBinary24 => "#51A1C3",
-        _ => "#F3F4F7",
-    };
-    format!("color: {}", color)
-}
-
 /// Creates a [`Callback`] that passes the [`ResourceId`] through as the only parameter, and sets
 /// the asset click state.
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 fn onclick_asset(
     rid: ResourceId,
     cb: Option<Callback<(ResourceId, MouseEvent)>>,
@@ -209,7 +119,7 @@ fn onclick_asset(
 
 /// Creates a [`Callback`] that passes the [`ResourceId`] through as the only parameter.
 /// Reads the asset click state to ensure the same asset is being clicked.
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 fn ondblclick_asset(
     rid: ResourceId,
     cb: Option<Callback<(ResourceId, MouseEvent)>>,
@@ -234,7 +144,7 @@ fn ondblclick_asset(
 }
 
 /// Creates a [`Callback`] that passes the [`ResourceId`] through as the only parameter.
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument]
 fn onclick_asset_remove(
     rid: ResourceId,
     cb: Option<Callback<ResourceId>>,
@@ -252,7 +162,3 @@ fn onclick_asset_remove(
         }
     })
 }
-
-#[cfg(test)]
-#[path = "./assets_preview_test.rs"]
-mod assets_preview_test;
diff --git a/ui/src/widgets/asset/assets_preview_test.rs b/ui/src/widgets/asset/assets_preview_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/asset/editor.rs b/ui/src/widgets/asset/editor.rs
index f4e70b1a..824253ab 100644
--- a/ui/src/widgets/asset/editor.rs
+++ b/ui/src/widgets/asset/editor.rs
@@ -1,6 +1,6 @@
 //! [`Asset`](thot_core::project::Asset) editor.
-use crate::widgets::StandardPropertiesEditor;
-use thot_core::project::{Asset as CoreAsset, StandardProperties};
+use super::AssetPropertiesEditor;
+use thot_core::project::{Asset, AssetProperties};
 use yew::prelude::*;
 
 /// Properties for [`AssetEditor`].
@@ -9,9 +9,9 @@ pub struct AssetEditorProps {
     #[prop_or_default]
     pub class: Classes,
 
-    pub asset: CoreAsset,
+    pub asset: Asset,
 
-    pub onchange_properties: Callback<StandardProperties>,
+    pub onchange_properties: Callback<AssetProperties>,
 }
 
 /// [`Asset`](thot_core::project::Asset)s editor.
@@ -21,7 +21,7 @@ pub fn asset_editor(props: &AssetEditorProps) -> Html {
     let class = classes!("thot-ui-asset-editor", props.class.clone());
     html! {
         <div key={props.asset.rid.clone()} {class}>
-            <StandardPropertiesEditor
+            <AssetPropertiesEditor
                 properties={props.asset.properties.clone()}
                 onchange={props.onchange_properties.clone()}/>
 
@@ -31,7 +31,3 @@ pub fn asset_editor(props: &AssetEditorProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./editor_test.rs"]
-mod editor_test;
diff --git a/ui/src/widgets/asset/editor_test.rs b/ui/src/widgets/asset/editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/asset/mod.rs b/ui/src/widgets/asset/mod.rs
index 3c593732..18d76cde 100644
--- a/ui/src/widgets/asset/mod.rs
+++ b/ui/src/widgets/asset/mod.rs
@@ -1,11 +1,9 @@
 //! Asset widgets.
+pub mod asset_properties_editor;
 pub mod assets_preview;
 pub mod editor;
 
 // Re-exports
+pub use asset_properties_editor::AssetPropertiesEditor;
 pub use assets_preview::AssetsPreview;
 pub use editor::AssetEditor;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/asset/mod_test.rs b/ui/src/widgets/asset/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/batch_editor/metadata.rs b/ui/src/widgets/batch_editor/metadata.rs
deleted file mode 100644
index ab5ca1f8..00000000
--- a/ui/src/widgets/batch_editor/metadata.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#[cfg(test)]
-#[path = "./metadata_test.rs"]
-mod metadata_test;
diff --git a/ui/src/widgets/batch_editor/metadata_test.rs b/ui/src/widgets/batch_editor/metadata_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/batch_editor/mod.rs b/ui/src/widgets/batch_editor/mod.rs
deleted file mode 100644
index a89702a4..00000000
--- a/ui/src/widgets/batch_editor/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Batch editors.
-pub mod standard_properties;
-pub mod tags;
-pub mod metadata;
-
-// Re-exports
-pub use standard_properties::StandardPropertiesBatchEditor;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/batch_editor/mod_test.rs b/ui/src/widgets/batch_editor/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/batch_editor/standard_properties.rs b/ui/src/widgets/batch_editor/standard_properties.rs
deleted file mode 100644
index 6b024568..00000000
--- a/ui/src/widgets/batch_editor/standard_properties.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-//! Batch editor for [`StandardProperties`].
-use std::rc::Rc;
-use thot_core::project::Metadata;
-use thot_core::project::StandardProperties;
-use yew::prelude::*;
-
-// **********************
-// *** update builder ***
-// **********************
-
-#[derive(PartialEq, Default)]
-pub struct StandardPropertiesUpdateBuilder<'a> {
-    name: Option<&'a str>,
-    kind: Option<&'a str>,
-    description: Option<&'a str>,
-    // tags: Option<Vec<String>>,
-    // metadata: Option<Metadata>>,
-}
-
-impl<'a> StandardPropertiesUpdateBuilder<'a> {
-    pub fn name(&self) -> Option<&'a str> {
-        self.name
-    }
-
-    pub fn set_name(&mut self, name: &'a str) {
-        self.name.insert(name);
-    }
-
-    pub fn clear_name(&mut self) {
-        self.name.take();
-    }
-
-    pub fn kind(&self) -> Option<&'a str> {
-        self.kind
-    }
-
-    pub fn set_kind(&mut self, kind: &'a str) {
-        self.kind.insert(kind);
-    }
-
-    pub fn clear_kind(&mut self) {
-        self.kind.take();
-    }
-
-    pub fn description(&self) -> Option<&'a str> {
-        self.description
-    }
-
-    pub fn set_description(&mut self, description: &'a str) {
-        self.description.insert(description);
-    }
-
-    pub fn clear_description(&mut self) {
-        self.description.take();
-    }
-}
-
-// ***************
-// *** reducer ***
-// ***************
-
-enum StandardPropertiesUpdateStateAction {
-    SetName(String),
-    ClearName,
-    SetKind(String),
-    ClearKind,
-    SetDescription(String),
-    ClearDescription,
-}
-
-#[derive(PartialEq, Clone, Default)]
-struct StandardPropertiesUpdateState {
-    pub name: Option<String>,
-    pub kind: Option<String>,
-    pub description: Option<String>,
-    pub tags: Option<Vec<String>>,
-    pub metadata: Option<Metadata>,
-}
-
-impl Reducible for StandardPropertiesUpdateState {
-    type Action = StandardPropertiesUpdateStateAction;
-
-    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
-        let mut current = (*self).clone();
-        match action {
-            StandardPropertiesUpdateStateAction::SetName(value) => {
-                let _ = current.name.insert(value);
-            }
-
-            StandardPropertiesUpdateStateAction::ClearName => {
-                current.name.take();
-            }
-
-            StandardPropertiesUpdateStateAction::SetKind(value) => {
-                let _ = current.kind.insert(value);
-            }
-
-            StandardPropertiesUpdateStateAction::ClearKind => {
-                current.kind.take();
-            }
-
-            StandardPropertiesUpdateStateAction::SetDescription(value) => {
-                let _ = current.description.insert(value);
-            }
-
-            StandardPropertiesUpdateStateAction::ClearDescription => {
-                current.description.take();
-            }
-        }
-
-        current.into()
-    }
-}
-
-// *****************
-// *** component ***
-// *****************
-
-#[derive(Properties, PartialEq)]
-pub struct StandardPropertiesBatchEditorProps {
-    pub values: Vec<StandardProperties>,
-}
-
-#[function_component(StandardPropertiesBatchEditor)]
-pub fn standard_properties_batch_editor(props: &StandardPropertiesBatchEditorProps) -> Html {
-    let updater_state = use_reducer(|| StandardPropertiesUpdateState::default());
-    let name_ref = use_node_ref();
-    let kind_ref = use_node_ref();
-    let description_ref = use_node_ref();
-
-    let onchange_name = {
-        let updater_state = updater_state.clone();
-        let elm = name_ref.clone();
-
-        Callback::from(move |_: Event| {
-            // update state
-            let elm = elm
-                .cast::<web_sys::HtmlInputElement>()
-                .expect("could not cast `NodeRef` into element");
-
-            let value = elm.value().trim().to_string();
-            let action = if value.is_empty() {
-                StandardPropertiesUpdateStateAction::ClearName
-            } else {
-                StandardPropertiesUpdateStateAction::SetName(value)
-            };
-
-            updater_state.dispatch(action);
-        })
-    };
-
-    let onchange_kind = {
-        let updater_state = updater_state.clone();
-        let elm = kind_ref.clone();
-
-        Callback::from(move |_: Event| {
-            // update state
-            let elm = elm
-                .cast::<web_sys::HtmlInputElement>()
-                .expect("could not cast `NodeRef` into element");
-
-            let value = elm.value().trim().to_string();
-            let action = if value.is_empty() {
-                StandardPropertiesUpdateStateAction::ClearKind
-            } else {
-                StandardPropertiesUpdateStateAction::SetKind(value)
-            };
-
-            updater_state.dispatch(action);
-        })
-    };
-
-    let onchange_description = {
-        let updater_state = updater_state.clone();
-        let elm = description_ref.clone();
-
-        Callback::from(move |_: Event| {
-            // update state
-            let elm = elm
-                .cast::<web_sys::HtmlTextAreaElement>()
-                .expect("could not cast `NodeRef` into element");
-
-            let value = elm.value().trim().to_string();
-            let action = if value.is_empty() {
-                StandardPropertiesUpdateStateAction::ClearDescription
-            } else {
-                StandardPropertiesUpdateStateAction::SetDescription(value)
-            };
-
-            updater_state.dispatch(action);
-        })
-    };
-
-    html! {
-        <form class={classes!("thot-ui-standard-properties-editor")}>
-            <div class={classes!("form-field", "name")}>
-                <label>
-                    { "Name" }
-                    <input
-                        ref={name_ref}
-                        placeholder={"(no change)"}
-                        value={updater_state.name.clone()}
-                        onchange={onchange_name} />
-                </label>
-            </div>
-
-            <div class={classes!("form-field", "kind")}>
-                <label>
-                    { "Type" }
-                    <input
-                        ref={kind_ref}
-                        placeholder={"(no type)"}
-                        value={updater_state.kind.clone()}
-                        onchange={onchange_kind} />
-                </label>
-            </div>
-
-            <div class={classes!("form-field", "description")}>
-                <label>{ "Description" }
-                    <textarea
-                        ref={description_ref}
-                        placeholder={"(no description)"}
-                        value={updater_state.description.clone()}
-                        onchange={onchange_description}></textarea>
-                </label>
-            </div>
-
-            // @todo
-            // <div class={classes!("form-field", "tags")}>
-            //     <label>
-            //         { "Tags" }
-            //         <TagsEditor
-            //             value={properties_state.tags.clone()}
-            //             onchange={onchange_tags} />
-            //     </label>
-            // </div>
-
-            // @todo
-            // <div class={classes!("form-field", "metadata")}>
-            //     <h4>{ "Metadata" }</h4>
-            //     <MetadataBatchEditor
-            //         value={properties_state.metadata.clone()}
-            //         onchange={onchange_metadata} />
-            // </div>
-    </form>
-    }
-}
-
-#[cfg(test)]
-#[path = "./standard_properties_test.rs"]
-mod standard_properties_test;
diff --git a/ui/src/widgets/batch_editor/standard_properties_test.rs b/ui/src/widgets/batch_editor/standard_properties_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/batch_editor/tags.rs b/ui/src/widgets/batch_editor/tags.rs
deleted file mode 100644
index a7e5decf..00000000
--- a/ui/src/widgets/batch_editor/tags.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#[cfg(test)]
-#[path = "./tags_test.rs"]
-mod tags_test;
diff --git a/ui/src/widgets/batch_editor/tags_test.rs b/ui/src/widgets/batch_editor/tags_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/bulk_editor/asset_properties.rs b/ui/src/widgets/bulk_editor/asset_properties.rs
new file mode 100644
index 00000000..96eca358
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/asset_properties.rs
@@ -0,0 +1,362 @@
+use super::tags::TagsBulkEditor;
+use super::types::BulkValue;
+use crate::widgets::metadata::{MetadataBulk, MetadataBulkEditor, Metadatum};
+use serde_json::Value as JsValue;
+use std::rc::Rc;
+use thot_core::project::AssetProperties;
+use yew::prelude::*;
+
+// ***************
+// *** reducer ***
+// ***************
+
+enum AssetPropertiesUpdateStateAction {
+    /// Set all values from properties.
+    SetValues(Vec<AssetProperties>),
+}
+
+#[derive(PartialEq, Clone)]
+struct AssetPropertiesUpdateState {
+    name: BulkValue<Option<String>>,
+    kind: BulkValue<Option<String>>,
+    description: BulkValue<Option<String>>,
+    tags: Vec<String>,
+    metadata: MetadataBulk,
+}
+
+impl AssetPropertiesUpdateState {
+    pub fn new(properties: &Vec<AssetProperties>) -> Self {
+        let n_props = properties.len();
+        let mut names = Vec::with_capacity(n_props);
+        let mut kinds = Vec::with_capacity(n_props);
+        let mut descriptions = Vec::with_capacity(n_props);
+        for prop in properties.iter() {
+            names.push(prop.name.clone());
+            kinds.push(prop.kind.clone());
+            descriptions.push(prop.description.clone());
+        }
+
+        names.sort();
+        names.dedup();
+        kinds.sort();
+        kinds.dedup();
+        descriptions.sort();
+        descriptions.dedup();
+
+        let name = match names.len() {
+            1 => BulkValue::Equal(names[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let kind = match kinds.len() {
+            1 => BulkValue::Equal(kinds[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let description = match descriptions.len() {
+            1 => BulkValue::Equal(descriptions[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let mut tags = properties
+            .iter()
+            .map(|props| props.tags.clone())
+            .flatten()
+            .collect::<Vec<String>>();
+
+        tags.sort();
+        tags.dedup();
+
+        let mut metadata = MetadataBulk::new();
+        for props in properties.iter() {
+            // initialize all keys
+            for key in props.metadata.keys() {
+                metadata.insert(key.clone(), Vec::new());
+            }
+        }
+
+        for props in properties {
+            // insert values
+            for (key, md) in metadata.iter_mut() {
+                let value = props.metadata.get(key).unwrap_or(&JsValue::Null);
+                if !md.contains(value) {
+                    md.push(value.clone());
+                }
+            }
+        }
+
+        Self {
+            name,
+            kind,
+            description,
+            tags,
+            metadata,
+        }
+    }
+
+    pub fn name(&self) -> &BulkValue<Option<String>> {
+        &self.name
+    }
+
+    pub fn kind(&self) -> &BulkValue<Option<String>> {
+        &self.kind
+    }
+
+    pub fn description(&self) -> &BulkValue<Option<String>> {
+        &self.description
+    }
+
+    pub fn tags(&self) -> &Vec<String> {
+        &self.tags
+    }
+
+    pub fn metadata(&self) -> &MetadataBulk {
+        &self.metadata
+    }
+}
+
+impl Reducible for AssetPropertiesUpdateState {
+    type Action = AssetPropertiesUpdateStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        match action {
+            AssetPropertiesUpdateStateAction::SetValues(properties) => {
+                Self::new(&properties).into()
+            }
+        }
+    }
+}
+
+// *****************
+// *** component ***
+// *****************
+
+#[derive(Properties, PartialEq)]
+pub struct AssetPropertiesBulkEditorProps {
+    pub properties: Vec<AssetProperties>,
+
+    #[prop_or_default]
+    pub onchange_name: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onchange_kind: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onchange_description: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onadd_tag: Callback<Vec<String>>,
+
+    #[prop_or_default]
+    pub onremove_tag: Callback<String>,
+
+    /// Called when metadatum is added.
+    #[prop_or_default]
+    pub onadd_metadata: Callback<Metadatum>,
+
+    /// Called when metadatum is removed.
+    ///
+    /// # Arguments
+    /// 1. Key to be removed.
+    #[prop_or_default]
+    pub onremove_metadata: Callback<String>,
+
+    /// Called when a metadatum value is changed.
+    #[prop_or_default]
+    pub onchange_metadata: Callback<Metadatum>,
+}
+
+#[function_component(AssetPropertiesBulkEditor)]
+pub fn standard_properties_bulk_editor(props: &AssetPropertiesBulkEditorProps) -> Html {
+    assert!(
+        props.properties.len() > 1,
+        "bulk editor should not be used with fewer than two items."
+    );
+
+    let updater_state = use_reducer(|| AssetPropertiesUpdateState::new(&props.properties));
+    let name_ref = use_node_ref();
+    let kind_ref = use_node_ref();
+    let description_ref = use_node_ref();
+
+    {
+        let properties = props.properties.clone();
+        let updater_state = updater_state.clone();
+
+        use_effect_with(properties, move |properties| {
+            updater_state.dispatch(AssetPropertiesUpdateStateAction::SetValues(
+                properties.clone(),
+            ));
+        });
+    }
+
+    // -----------------------
+    // --- change handlers ---
+    // -----------------------
+
+    let onchange_name = {
+        let onchange_name = props.onchange_name.clone();
+        let elm = name_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_name.emit(value);
+        })
+    };
+
+    let onchange_kind = {
+        let onchange_kind = props.onchange_kind.clone();
+        let elm = kind_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_kind.emit(value.clone());
+        })
+    };
+
+    let onchange_description = {
+        let onchange_description = props.onchange_description.clone();
+        let elm = description_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_description.emit(value);
+        })
+    };
+
+    let onadd_tag = {
+        let onadd_tag = props.onadd_tag.clone();
+        Callback::from(move |tags: Vec<String>| {
+            onadd_tag.emit(tags);
+        })
+    };
+
+    let onremove_tag = {
+        let onremove_tag = props.onremove_tag.clone();
+        Callback::from(move |tag: String| {
+            onremove_tag.emit(tag);
+        })
+    };
+
+    let onadd_metadata = {
+        let onadd_metadata = props.onadd_metadata.clone();
+        Callback::from(move |metadata: Metadatum| {
+            onadd_metadata.emit(metadata);
+        })
+    };
+
+    let onremove_metadata = {
+        let onremove_metadata = props.onremove_metadata.clone();
+        Callback::from(move |key: String| {
+            onremove_metadata.emit(key);
+        })
+    };
+
+    let onchange_metadata = {
+        let onchange_metadata = props.onchange_metadata.clone();
+        Callback::from(move |metadatum: Metadatum| {
+            onchange_metadata.emit(metadatum);
+        })
+    };
+
+    // ------------
+    // --- html ---
+    // ------------
+
+    let onsubmit = Callback::from(|e: SubmitEvent| {
+        e.prevent_default();
+    });
+
+    html! {
+        <form class={classes!("thot-ui-bulk-asset-properties-editor")} {onsubmit}>
+            <div class={classes!("form-field", "name")}>
+                <label>
+                    <h3> { "Name" } </h3>
+                    <input
+                        ref={name_ref}
+                        placeholder={value_placeholder(updater_state.name())}
+                        value={value_string(updater_state.name())}
+                        onchange={onchange_name} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "kind")}>
+                <label>
+                    <h3> { "Type" } </h3>
+                    <input
+                        ref={kind_ref}
+                        placeholder={value_placeholder(updater_state.kind())}
+                        value={value_string(updater_state.kind())}
+                        onchange={onchange_kind} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "description")}>
+                <label>
+                    <h3> { "Description" } </h3>
+                    <textarea
+                        ref={description_ref}
+                        placeholder={value_placeholder(updater_state.description())}
+                        value={value_string(updater_state.description())}
+                        onchange={onchange_description}></textarea>
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "tags")}>
+                <label>
+                    <h3> { "Tags" } </h3>
+                    <TagsBulkEditor
+                        value={updater_state.tags().clone()}
+                        onadd={onadd_tag}
+                        onremove={onremove_tag} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "metadata")}>
+                <MetadataBulkEditor
+                    value={updater_state.metadata().clone()}
+                    onadd={onadd_metadata}
+                    onremove={onremove_metadata}
+                    onchange={onchange_metadata} />
+            </div>
+    </form>
+    }
+}
+
+// ***************
+// *** helpers ***
+// ***************
+
+fn value_string(value: &BulkValue<Option<String>>) -> Option<String> {
+    match value {
+        BulkValue::Equal(val) => val.clone(),
+        BulkValue::Mixed => None,
+    }
+}
+
+fn value_placeholder<T>(value: &BulkValue<T>) -> &'static str
+where
+    T: PartialEq + Clone,
+{
+    match value {
+        BulkValue::Equal(_) => "",
+        BulkValue::Mixed => "(mixed)",
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/container_properties.rs b/ui/src/widgets/bulk_editor/container_properties.rs
new file mode 100644
index 00000000..f8afe478
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/container_properties.rs
@@ -0,0 +1,374 @@
+use super::tags::TagsBulkEditor;
+use super::types::BulkValue;
+use crate::widgets::metadata::{MetadataBulk, MetadataBulkEditor, Metadatum};
+use serde_json::Value as JsValue;
+use std::rc::Rc;
+use thot_core::project::ContainerProperties;
+use yew::prelude::*;
+
+// ***************
+// *** reducer ***
+// ***************
+
+enum ContainerPropertiesUpdateStateAction {
+    /// Set all values from properties.
+    SetValues(Vec<ContainerProperties>),
+}
+
+#[derive(PartialEq, Clone)]
+struct ContainerPropertiesUpdateState {
+    name: BulkValue<String>,
+    kind: BulkValue<Option<String>>,
+    description: BulkValue<Option<String>>,
+    tags: Vec<String>,
+    metadata: MetadataBulk,
+}
+
+impl ContainerPropertiesUpdateState {
+    pub fn new(properties: &Vec<ContainerProperties>) -> Self {
+        let n_props = properties.len();
+        let mut names = Vec::with_capacity(n_props);
+        let mut kinds = Vec::with_capacity(n_props);
+        let mut descriptions = Vec::with_capacity(n_props);
+        for prop in properties.iter() {
+            names.push(Some(prop.name.clone()));
+            kinds.push(prop.kind.clone());
+            descriptions.push(prop.description.clone());
+        }
+
+        names.sort();
+        names.dedup();
+        kinds.sort();
+        kinds.dedup();
+        descriptions.sort();
+        descriptions.dedup();
+
+        let name = match names.len() {
+            1 => match names[0].as_ref() {
+                None => panic!("name can not be `None`"),
+                Some(name) => BulkValue::Equal(name.clone()),
+            },
+
+            _ => BulkValue::Mixed,
+        };
+
+        let kind = match kinds.len() {
+            1 => BulkValue::Equal(kinds[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let description = match descriptions.len() {
+            1 => BulkValue::Equal(descriptions[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let mut tags = properties
+            .iter()
+            .map(|props| props.tags.clone())
+            .flatten()
+            .collect::<Vec<String>>();
+
+        tags.sort();
+        tags.dedup();
+
+        let mut metadata = MetadataBulk::new();
+        for props in properties.iter() {
+            // initialize all keys
+            for key in props.metadata.keys() {
+                metadata.insert(key.clone(), Vec::new());
+            }
+        }
+
+        for props in properties {
+            // insert values
+            for (key, md) in metadata.iter_mut() {
+                let value = props.metadata.get(key).unwrap_or(&JsValue::Null);
+                if !md.contains(value) {
+                    md.push(value.clone());
+                }
+            }
+        }
+
+        Self {
+            name,
+            kind,
+            description,
+            tags,
+            metadata,
+        }
+    }
+
+    pub fn name(&self) -> &BulkValue<String> {
+        &self.name
+    }
+
+    pub fn kind(&self) -> &BulkValue<Option<String>> {
+        &self.kind
+    }
+
+    pub fn description(&self) -> &BulkValue<Option<String>> {
+        &self.description
+    }
+
+    pub fn tags(&self) -> &Vec<String> {
+        &self.tags
+    }
+
+    pub fn metadata(&self) -> &MetadataBulk {
+        &self.metadata
+    }
+}
+
+impl Reducible for ContainerPropertiesUpdateState {
+    type Action = ContainerPropertiesUpdateStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        match action {
+            ContainerPropertiesUpdateStateAction::SetValues(properties) => {
+                Self::new(&properties).into()
+            }
+        }
+    }
+}
+
+// *****************
+// *** component ***
+// *****************
+
+#[derive(Properties, PartialEq)]
+pub struct ContainerPropertiesBulkEditorProps {
+    pub properties: Vec<ContainerProperties>,
+
+    #[prop_or_default]
+    pub onchange_name: Callback<String>,
+
+    #[prop_or_default]
+    pub onchange_kind: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onchange_description: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onadd_tag: Callback<Vec<String>>,
+
+    #[prop_or_default]
+    pub onremove_tag: Callback<String>,
+
+    /// Called when metadatum is added.
+    #[prop_or_default]
+    pub onadd_metadata: Callback<Metadatum>,
+
+    /// Called when metadatum is removed.
+    ///
+    /// # Arguments
+    /// 1. Key to be removed.
+    #[prop_or_default]
+    pub onremove_metadata: Callback<String>,
+
+    /// Called when a metadatum value is changed.
+    #[prop_or_default]
+    pub onchange_metadata: Callback<Metadatum>,
+}
+
+#[function_component(ContainerPropertiesBulkEditor)]
+pub fn standard_properties_bulk_editor(props: &ContainerPropertiesBulkEditorProps) -> Html {
+    assert!(
+        props.properties.len() > 1,
+        "bulk editor should not be used with fewer than two items."
+    );
+
+    let updater_state = use_reducer(|| ContainerPropertiesUpdateState::new(&props.properties));
+    let name_ref = use_node_ref();
+    let kind_ref = use_node_ref();
+    let description_ref = use_node_ref();
+
+    {
+        let properties = props.properties.clone();
+        let updater_state = updater_state.clone();
+
+        use_effect_with(properties, move |properties| {
+            updater_state.dispatch(ContainerPropertiesUpdateStateAction::SetValues(
+                properties.clone(),
+            ));
+        });
+    }
+
+    // -----------------------
+    // --- change handlers ---
+    // -----------------------
+
+    let onchange_name = {
+        let onchange_name = props.onchange_name.clone();
+        let elm = name_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            if !value.is_empty() {
+                onchange_name.emit(value);
+            }
+        })
+    };
+
+    let onchange_kind = {
+        let onchange_kind = props.onchange_kind.clone();
+        let elm = kind_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_kind.emit(value.clone());
+        })
+    };
+
+    let onchange_description = {
+        let onchange_description = props.onchange_description.clone();
+        let elm = description_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_description.emit(value);
+        })
+    };
+
+    let onadd_tag = {
+        let onadd_tag = props.onadd_tag.clone();
+        Callback::from(move |tags: Vec<String>| {
+            onadd_tag.emit(tags);
+        })
+    };
+
+    let onremove_tag = {
+        let onremove_tag = props.onremove_tag.clone();
+        Callback::from(move |tag: String| {
+            onremove_tag.emit(tag);
+        })
+    };
+
+    let onadd_metadata = {
+        let onadd_metadata = props.onadd_metadata.clone();
+        Callback::from(move |metadata: Metadatum| {
+            onadd_metadata.emit(metadata);
+        })
+    };
+
+    let onremove_metadata = {
+        let onremove_metadata = props.onremove_metadata.clone();
+        Callback::from(move |key: String| {
+            onremove_metadata.emit(key);
+        })
+    };
+
+    let onchange_metadata = {
+        let onchange_metadata = props.onchange_metadata.clone();
+        Callback::from(move |metadatum: Metadatum| {
+            onchange_metadata.emit(metadatum);
+        })
+    };
+
+    // ------------
+    // --- html ---
+    // ------------
+
+    let onsubmit = Callback::from(|e: SubmitEvent| {
+        e.prevent_default();
+    });
+
+    html! {
+        <form class={classes!("thot-ui-bulk-container-properties-editor")} {onsubmit}>
+            <div class={classes!("form-field", "name")}>
+                <label>
+                    <h3> { "Name" } </h3>
+                    <input
+                        ref={name_ref}
+                        placeholder={value_placeholder(updater_state.name())}
+                        value={value_name(updater_state.name())}
+                        onchange={onchange_name} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "kind")}>
+                <label>
+                    <h3> { "Type" } </h3>
+                    <input
+                        ref={kind_ref}
+                        placeholder={value_placeholder(updater_state.kind())}
+                        value={value_string(updater_state.kind())}
+                        onchange={onchange_kind} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "description")}>
+                <label>
+                    <h3> { "Description" } </h3>
+                    <textarea
+                        ref={description_ref}
+                        placeholder={value_placeholder(updater_state.description())}
+                        value={value_string(updater_state.description())}
+                        onchange={onchange_description}></textarea>
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "tags")}>
+                <label>
+                    <h3> { "Tags" } </h3>
+                    <TagsBulkEditor
+                        value={updater_state.tags().clone()}
+                        onadd={onadd_tag}
+                        onremove={onremove_tag} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "metadata")}>
+                <MetadataBulkEditor
+                    value={updater_state.metadata().clone()}
+                    onadd={onadd_metadata}
+                    onremove={onremove_metadata}
+                    onchange={onchange_metadata} />
+            </div>
+    </form>
+    }
+}
+
+// ***************
+// *** helpers ***
+// ***************
+
+fn value_name(value: &BulkValue<String>) -> Option<String> {
+    match value {
+        BulkValue::Equal(val) => Some(val.clone()),
+        BulkValue::Mixed => None,
+    }
+}
+
+fn value_string(value: &BulkValue<Option<String>>) -> Option<String> {
+    match value {
+        BulkValue::Equal(val) => val.clone(),
+        BulkValue::Mixed => None,
+    }
+}
+
+fn value_placeholder<T>(value: &BulkValue<T>) -> &'static str
+where
+    T: PartialEq + Clone,
+{
+    match value {
+        BulkValue::Equal(_) => "",
+        BulkValue::Mixed => "(mixed)",
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/metadata.rs b/ui/src/widgets/bulk_editor/metadata.rs
new file mode 100644
index 00000000..67236f89
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/metadata.rs
@@ -0,0 +1,46 @@
+//! Bulk metadata editor.
+use serde_json::Value as JsValue;
+use std::collections::HashMap;
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+#[derive(Properties, PartialEq)]
+pub struct MetadataBulkEditorProps {
+    metadata: HashMap<String, JsValue>,
+}
+
+#[function_component(MetadataBulkEditor)]
+pub fn metadata_bulk_editor(props: &MetadataBulkEditorProps) -> Html {
+    html! {
+        <div class={classes!("thot-ui-metadata-bulk-editor")}>
+            <div class={classes!("metadata-header")}>
+                <button class={classes!("add-button")} type="button" onclick={onadd}>
+                    <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidPlus}/>
+                </button>
+            </div>
+            <div class={classes!("add-metadatum-controls")}>
+                if *add_metadatum_visible {
+                    <MetadatumBuilder
+                        {name_filter}
+                        onsave={add_metadatum}
+                        oncancel={oncancel_add_metadatum} />
+                }
+            </div>
+            <ol class={classes!("metadata-editor")}>
+                { props.value.clone().into_iter().map(|(name, value)| html! {
+                    <li key={name.clone()}>
+                        <MetadatumEditor
+                            name={name.clone()}
+                            {value}
+                            onchange={onchange(name.clone())}/>
+
+                        <button class={classes!("remove-button")} type="button" onclick={remove_metadatum(name)}>
+                            <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidMinus}/>
+                        </button>
+                    </li>
+                }).collect::<Html>() }
+            </ol>
+        </div>
+
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/mod.rs b/ui/src/widgets/bulk_editor/mod.rs
new file mode 100644
index 00000000..8fc5d8a1
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/mod.rs
@@ -0,0 +1,13 @@
+//! Bulk editors.
+pub mod asset_properties;
+pub mod container_properties;
+pub mod resource_properties;
+pub mod script_associations;
+pub mod tags;
+pub mod types;
+
+// Re-exports
+pub use asset_properties::AssetPropertiesBulkEditor;
+pub use container_properties::ContainerPropertiesBulkEditor;
+pub use resource_properties::ResourcePropertiesBulkEditor;
+pub use script_associations::{RunParametersUpdate, ScriptAssociationsBulkEditor, ScriptBulkMap};
diff --git a/ui/src/widgets/bulk_editor/resource_properties.rs b/ui/src/widgets/bulk_editor/resource_properties.rs
new file mode 100644
index 00000000..c667a402
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/resource_properties.rs
@@ -0,0 +1,410 @@
+use super::tags::TagsBulkEditor;
+use super::types::BulkValue;
+use crate::widgets::metadata::{MetadataBulk, MetadataBulkEditor, Metadatum};
+use serde_json::Value as JsValue;
+use std::rc::Rc;
+use thot_core::project::resources::ResourceProperties;
+use yew::prelude::*;
+
+// ***************
+// *** reducer ***
+// ***************
+
+enum ResourcePropertiesUpdateStateAction {
+    /// Set all values from properties.
+    SetValues(Vec<ResourceProperties>),
+}
+
+#[derive(PartialEq, Clone)]
+struct ResourcePropertiesUpdateState {
+    name: BulkValue<String>,
+    kind: BulkValue<Option<String>>,
+    description: BulkValue<Option<String>>,
+    tags: Vec<String>,
+    metadata: MetadataBulk,
+}
+
+impl ResourcePropertiesUpdateState {
+    pub fn new(properties: &Vec<ResourceProperties>) -> Self {
+        let n_props = properties.len();
+        let mut names = Vec::with_capacity(n_props);
+        let mut kinds = Vec::with_capacity(n_props);
+        let mut descriptions = Vec::with_capacity(n_props);
+        for prop in properties.iter() {
+            match &prop {
+                &ResourceProperties::Container(prop) => {
+                    names.push(Some(prop.name.clone()));
+                    kinds.push(prop.kind.clone());
+                    descriptions.push(prop.description.clone());
+                }
+
+                &ResourceProperties::Asset(prop) => {
+                    names.push(prop.name.clone());
+                    kinds.push(prop.kind.clone());
+                    descriptions.push(prop.description.clone());
+                }
+            }
+        }
+
+        names.sort();
+        names.dedup();
+        kinds.sort();
+        kinds.dedup();
+        descriptions.sort();
+        descriptions.dedup();
+
+        let name = match names.len() {
+            1 => match names[0].as_ref() {
+                None => panic!("name can not be `None`"),
+                Some(name) => BulkValue::Equal(name.clone()),
+            },
+
+            _ => BulkValue::Mixed,
+        };
+
+        let kind = match kinds.len() {
+            1 => BulkValue::Equal(kinds[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let description = match descriptions.len() {
+            1 => BulkValue::Equal(descriptions[0].clone()),
+            _ => BulkValue::Mixed,
+        };
+
+        let mut tags = properties
+            .iter()
+            .map(|props| match props {
+                ResourceProperties::Container(props) => props.tags.clone(),
+                ResourceProperties::Asset(props) => props.tags.clone(),
+            })
+            .flatten()
+            .collect::<Vec<String>>();
+
+        tags.sort();
+        tags.dedup();
+
+        let mut metadata = MetadataBulk::new();
+        for props in properties.iter() {
+            // initialize all keys
+            match props {
+                ResourceProperties::Container(props) => {
+                    for key in props.metadata.keys() {
+                        metadata.insert(key.clone(), Vec::new());
+                    }
+                }
+
+                ResourceProperties::Asset(props) => {
+                    for key in props.metadata.keys() {
+                        metadata.insert(key.clone(), Vec::new());
+                    }
+                }
+            }
+        }
+
+        for props in properties {
+            // insert values
+            match props {
+                ResourceProperties::Container(props) => {
+                    for (key, md) in metadata.iter_mut() {
+                        let value = props.metadata.get(key).unwrap_or(&JsValue::Null);
+                        if !md.contains(value) {
+                            md.push(value.clone());
+                        }
+                    }
+                }
+
+                ResourceProperties::Asset(props) => {
+                    for (key, md) in metadata.iter_mut() {
+                        let value = props.metadata.get(key).unwrap_or(&JsValue::Null);
+                        if !md.contains(value) {
+                            md.push(value.clone());
+                        }
+                    }
+                }
+            }
+        }
+
+        Self {
+            name,
+            kind,
+            description,
+            tags,
+            metadata,
+        }
+    }
+
+    pub fn name(&self) -> &BulkValue<String> {
+        &self.name
+    }
+
+    pub fn kind(&self) -> &BulkValue<Option<String>> {
+        &self.kind
+    }
+
+    pub fn description(&self) -> &BulkValue<Option<String>> {
+        &self.description
+    }
+
+    pub fn tags(&self) -> &Vec<String> {
+        &self.tags
+    }
+
+    pub fn metadata(&self) -> &MetadataBulk {
+        &self.metadata
+    }
+}
+
+impl Reducible for ResourcePropertiesUpdateState {
+    type Action = ResourcePropertiesUpdateStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        match action {
+            ResourcePropertiesUpdateStateAction::SetValues(properties) => {
+                Self::new(&properties).into()
+            }
+        }
+    }
+}
+
+// *****************
+// *** component ***
+// *****************
+
+#[derive(Properties, PartialEq)]
+pub struct ResourcePropertiesBulkEditorProps {
+    pub properties: Vec<ResourceProperties>,
+
+    #[prop_or_default]
+    pub onchange_name: Callback<String>,
+
+    #[prop_or_default]
+    pub onchange_kind: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onchange_description: Callback<Option<String>>,
+
+    #[prop_or_default]
+    pub onadd_tag: Callback<Vec<String>>,
+
+    #[prop_or_default]
+    pub onremove_tag: Callback<String>,
+
+    /// Called when metadatum is added.
+    #[prop_or_default]
+    pub onadd_metadata: Callback<Metadatum>,
+
+    /// Called when metadatum is removed.
+    ///
+    /// # Arguments
+    /// 1. Key to be removed.
+    #[prop_or_default]
+    pub onremove_metadata: Callback<String>,
+
+    /// Called when a metadatum value is changed.
+    #[prop_or_default]
+    pub onchange_metadata: Callback<Metadatum>,
+}
+
+#[function_component(ResourcePropertiesBulkEditor)]
+pub fn standard_properties_bulk_editor(props: &ResourcePropertiesBulkEditorProps) -> Html {
+    assert!(
+        props.properties.len() > 1,
+        "bulk editor should not be used with fewer than two items."
+    );
+
+    let updater_state = use_reducer(|| ResourcePropertiesUpdateState::new(&props.properties));
+    let name_ref = use_node_ref();
+    let kind_ref = use_node_ref();
+    let description_ref = use_node_ref();
+
+    {
+        let properties = props.properties.clone();
+        let updater_state = updater_state.clone();
+
+        use_effect_with(properties, move |properties| {
+            updater_state.dispatch(ResourcePropertiesUpdateStateAction::SetValues(
+                properties.clone(),
+            ));
+        });
+    }
+
+    // -----------------------
+    // --- change handlers ---
+    // -----------------------
+
+    let onchange_name = {
+        let onchange_name = props.onchange_name.clone();
+        let elm = name_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            if !value.is_empty() {
+                onchange_name.emit(value);
+            }
+        })
+    };
+
+    let onchange_kind = {
+        let onchange_kind = props.onchange_kind.clone();
+        let elm = kind_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_kind.emit(value.clone());
+        })
+    };
+
+    let onchange_description = {
+        let onchange_description = props.onchange_description.clone();
+        let elm = description_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let value = Some(value).filter(|value| !value.is_empty());
+            onchange_description.emit(value);
+        })
+    };
+
+    let onadd_tag = {
+        let onadd_tag = props.onadd_tag.clone();
+        Callback::from(move |tags: Vec<String>| {
+            onadd_tag.emit(tags);
+        })
+    };
+
+    let onremove_tag = {
+        let onremove_tag = props.onremove_tag.clone();
+        Callback::from(move |tag: String| {
+            onremove_tag.emit(tag);
+        })
+    };
+
+    let onadd_metadata = {
+        let onadd_metadata = props.onadd_metadata.clone();
+        Callback::from(move |metadata: Metadatum| {
+            onadd_metadata.emit(metadata);
+        })
+    };
+
+    let onremove_metadata = {
+        let onremove_metadata = props.onremove_metadata.clone();
+        Callback::from(move |key: String| {
+            onremove_metadata.emit(key);
+        })
+    };
+
+    let onchange_metadata = {
+        let onchange_metadata = props.onchange_metadata.clone();
+        Callback::from(move |metadatum: Metadatum| {
+            onchange_metadata.emit(metadatum);
+        })
+    };
+
+    // ------------
+    // --- html ---
+    // ------------
+
+    let onsubmit = Callback::from(|e: SubmitEvent| {
+        e.prevent_default();
+    });
+
+    html! {
+        <form class={classes!("thot-ui-bulk-resource-properties-editor")} {onsubmit}>
+            <div class={classes!("form-field", "name")}>
+                <label>
+                    <h3> { "Name" } </h3>
+                    <input
+                        ref={name_ref}
+                        placeholder={value_placeholder(updater_state.name())}
+                        value={value_name(updater_state.name())}
+                        onchange={onchange_name} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "kind")}>
+                <label>
+                    <h3> { "Type" } </h3>
+                    <input
+                        ref={kind_ref}
+                        placeholder={value_placeholder(updater_state.kind())}
+                        value={value_string(updater_state.kind())}
+                        onchange={onchange_kind} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "description")}>
+                <label>
+                    <h3> { "Description" } </h3>
+                    <textarea
+                        ref={description_ref}
+                        placeholder={value_placeholder(updater_state.description())}
+                        value={value_string(updater_state.description())}
+                        onchange={onchange_description}></textarea>
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "tags")}>
+                <label>
+                    <h3> { "Tags" } </h3>
+                    <TagsBulkEditor
+                        value={updater_state.tags().clone()}
+                        onadd={onadd_tag}
+                        onremove={onremove_tag} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "metadata")}>
+                <MetadataBulkEditor
+                    value={updater_state.metadata().clone()}
+                    onadd={onadd_metadata}
+                    onremove={onremove_metadata}
+                    onchange={onchange_metadata} />
+            </div>
+    </form>
+    }
+}
+
+// ***************
+// *** helpers ***
+// ***************
+
+fn value_name(value: &BulkValue<String>) -> Option<String> {
+    match value {
+        BulkValue::Equal(val) => Some(val.clone()),
+        BulkValue::Mixed => None,
+    }
+}
+
+fn value_string(value: &BulkValue<Option<String>>) -> Option<String> {
+    match value {
+        BulkValue::Equal(val) => val.clone(),
+        BulkValue::Mixed => None,
+    }
+}
+
+fn value_placeholder<T>(value: &BulkValue<T>) -> &'static str
+where
+    T: PartialEq + Clone,
+{
+    match value {
+        BulkValue::Equal(_) => "",
+        BulkValue::Mixed => "(mixed)",
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/script_associations.rs b/ui/src/widgets/bulk_editor/script_associations.rs
new file mode 100644
index 00000000..7b0c0b50
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/script_associations.rs
@@ -0,0 +1,308 @@
+//! Bulk editor for [`ScriptAssociation`]s.
+use super::types::BulkValue;
+use std::rc::Rc;
+use thot_core::project::RunParameters;
+use thot_core::types::{ResourceId, ResourceMap};
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+const PLACEHOLDER: &'static str = "(mixed)";
+
+pub type NameMap = ResourceMap<String>;
+pub type ScriptBulkMap = ResourceMap<Vec<RunParameters>>;
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct RunParametersUpdate {
+    pub script: ResourceId,
+    pub priority: Option<i32>,
+    pub autorun: Option<bool>,
+}
+
+impl RunParametersUpdate {
+    pub fn new(script: ResourceId) -> Self {
+        Self {
+            script,
+            priority: None,
+            autorun: None,
+        }
+    }
+
+    pub fn set_priority(&mut self, priority: i32) {
+        self.priority = Some(priority);
+    }
+
+    pub fn unset_priority(&mut self) {
+        self.priority = None;
+    }
+
+    pub fn set_autorun(&mut self, autorun: bool) {
+        self.autorun = Some(autorun);
+    }
+
+    pub fn unset_autorun(&mut self) {
+        self.autorun = None;
+    }
+}
+
+// **************************
+// *** Association Editor ***
+// **************************
+
+pub enum ScriptAssociationStateAction {
+    SetValue(Vec<RunParameters>),
+}
+
+#[derive(PartialEq, Clone)]
+pub struct ScriptAssociationState {
+    priority: BulkValue<i32>,
+    autorun: BulkValue<bool>,
+}
+
+impl ScriptAssociationState {
+    pub fn new(params: Vec<RunParameters>) -> Self {
+        assert!(params.len() > 0, "no run parameters provided");
+
+        let mut priority = params
+            .iter()
+            .map(|p| p.priority.clone())
+            .collect::<Vec<_>>();
+        let mut autorun = params.iter().map(|p| p.autorun.clone()).collect::<Vec<_>>();
+        priority.sort();
+        priority.dedup();
+        autorun.sort();
+        autorun.dedup();
+
+        let priority = if priority.len() == 1 {
+            BulkValue::Equal(priority[0])
+        } else {
+            BulkValue::Mixed
+        };
+
+        let autorun = if autorun.len() == 1 {
+            BulkValue::Equal(autorun[0])
+        } else {
+            BulkValue::Mixed
+        };
+
+        Self { priority, autorun }
+    }
+
+    pub fn priority(&self) -> &BulkValue<i32> {
+        &self.priority
+    }
+
+    pub fn autorun(&self) -> &BulkValue<bool> {
+        &self.autorun
+    }
+}
+
+impl Reducible for ScriptAssociationState {
+    type Action = ScriptAssociationStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        match action {
+            ScriptAssociationStateAction::SetValue(params) => {
+                let current = Self::new(params);
+                current.into()
+            }
+        }
+    }
+}
+
+#[derive(PartialEq, Properties)]
+pub struct ScriptAssociationEditorProps {
+    pub name: String,
+    pub run_parameters: Vec<RunParameters>,
+
+    #[prop_or_default]
+    pub onchange_priority: Callback<i32>,
+
+    #[prop_or_default]
+    pub onchange_autorun: Callback<bool>,
+}
+
+#[function_component(ScriptAssociationEditor)]
+pub fn script_association_editor(props: &ScriptAssociationEditorProps) -> Html {
+    let association_state =
+        use_reducer(|| ScriptAssociationState::new(props.run_parameters.clone()));
+
+    let priority_ref = use_node_ref();
+    let autorun_ref = use_node_ref();
+
+    {
+        let association_state = association_state.clone();
+
+        use_effect_with(props.run_parameters.clone(), move |params| {
+            association_state.dispatch(ScriptAssociationStateAction::SetValue(params.clone()));
+        });
+    }
+
+    {
+        let association_state = association_state.clone();
+        let autorun_ref = autorun_ref.clone();
+
+        use_effect_with((association_state, autorun_ref), move |(association_state, autorun_ref)| {
+            if association_state.autorun() == &BulkValue::Mixed {
+                let input = autorun_ref
+                    .cast::<web_sys::HtmlInputElement>()
+                    .expect("could not cast node ref to input element");
+        
+                input.set_indeterminate(true);
+            }
+        });
+    }
+
+    // ***********************
+    // *** change handlers ***
+    // ***********************
+
+    let onchange_priority = {
+        let onchange_priority = props.onchange_priority.clone();
+        let priority_ref = priority_ref.clone();
+
+        Callback::from(move |_: Event| {
+            let priority_ref = priority_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let priority = priority_ref
+                .value()
+                .parse()
+                .expect("could not parse input as number");
+
+            onchange_priority.emit(priority);
+        })
+    };
+
+    let onchange_autorun = {
+        let onchange_autorun = props.onchange_autorun.clone();
+        let autorun_ref = autorun_ref.clone();
+
+        Callback::from(move |_: Event| {
+            let autorun_ref = autorun_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            onchange_autorun.emit(autorun_ref.checked())
+        })
+    };
+
+    let priority = match association_state.priority() {
+        BulkValue::Mixed => "".to_string(),
+        BulkValue::Equal(priority) => priority.to_string(),
+    };
+
+    let placeholder_priority = match association_state.priority() {
+        BulkValue::Mixed => PLACEHOLDER,
+        BulkValue::Equal(_) => "",
+    };
+
+    let autorun = match association_state.autorun() {
+        BulkValue::Mixed => true,
+        BulkValue::Equal(autorun) => autorun.clone(),
+    };
+
+    html! {
+        <div class={classes!("thot-ui-script-association-editor")}>
+            <label class={classes!("script-association-script")}>
+                { &props.name }
+            </label>
+            <input
+                ref={priority_ref}
+                class={classes!("script-association-priority")}
+                type={"number"}
+                placeholder={placeholder_priority}
+                value={priority}
+                onchange={onchange_priority} />
+
+            <input
+                ref={autorun_ref}
+                class={classes!("script-association-autorun")}
+                type={"checkbox"}
+                checked={autorun}
+                onchange={onchange_autorun} />
+        </div>
+    }
+}
+
+// ***************************
+// *** Associations Editor ***
+// ***************************
+
+#[derive(PartialEq, Properties)]
+pub struct ScriptAssociationsBulkEditorProps {
+    /// [`ScriptAssociation`]s to edit.
+    pub associations: ScriptBulkMap,
+
+    /// Map of [`Script`] [`ResourceId`]s to display names.
+    #[prop_or_default]
+    pub name_map: Option<NameMap>,
+
+    /// Called when an association is removed.
+    pub onremove: Callback<ResourceId>,
+
+    /// Called when the value of an association changes.
+    pub onchange: Callback<RunParametersUpdate>,
+}
+
+#[function_component(ScriptAssociationsBulkEditor)]
+pub fn script_associations_bulk_editor(props: &ScriptAssociationsBulkEditorProps) -> Html {
+    let onchange_priority = move |script: ResourceId| {
+        let onchange = props.onchange.clone();
+
+        Callback::from(move |priority: i32| {
+            let mut update = RunParametersUpdate::new(script.clone());
+            update.set_priority(priority);
+            onchange.emit(update);
+        })
+    };
+
+    let onchange_autorun = move |script: ResourceId| {
+        let onchange = props.onchange.clone();
+        let script = script.clone();
+
+        Callback::from(move |autorun: bool| {
+            let mut update = RunParametersUpdate::new(script.clone());
+            update.set_autorun(autorun);
+            onchange.emit(update);
+        })
+    };
+
+    let remove_script = move |script: ResourceId| {
+        let onremove = props.onremove.clone();
+
+        Callback::from(move |_: MouseEvent| {
+            onremove.emit(script.clone());
+        })
+    };
+
+    html! {
+        <form class="thot-ui-script-associations-editor">
+            <ol>
+                { props.associations.iter().map(|(script, run_parameters)|{
+                     let script_name = script.clone().to_string();
+                     let name = if let Some(name_map) = props.name_map.as_ref() {
+                         name_map.get(&script).map(|name| name.clone()).unwrap_or(script_name)
+                     } else {
+                         script_name
+                     };
+                     html! {
+                        <li key={script.clone()}
+                            class={classes!("script-association")} >
+
+                            <ScriptAssociationEditor
+                                {name}
+                                run_parameters={run_parameters.clone()}
+                                onchange_priority={onchange_priority(script.clone())}
+                                onchange_autorun={onchange_autorun(script.clone())} />
+
+                            <button class={ classes!("remove-button") } type={"button"} onclick={remove_script(script.clone())}>
+                                <Icon class={ classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidMinus }/>
+                            </button>
+                        </li>
+                    }
+                }).collect::<Html>() }
+            </ol>
+        </form>
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/tags.rs b/ui/src/widgets/bulk_editor/tags.rs
new file mode 100644
index 00000000..40067277
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/tags.rs
@@ -0,0 +1,81 @@
+//! Tags bulk editor.
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+#[derive(PartialEq, Properties)]
+pub struct TagsBulkEditorProps {
+    pub value: Vec<String>,
+
+    #[prop_or_default]
+    pub onadd: Option<Callback<Vec<String>>>,
+
+    #[prop_or_default]
+    pub onremove: Option<Callback<String>>,
+}
+
+#[function_component(TagsBulkEditor)]
+pub fn tags_bulk_editor(props: &TagsBulkEditorProps) -> Html {
+    let input_ref = use_node_ref();
+    let onadd = match props.onadd.as_ref() {
+        None => None,
+        Some(onadd) => {
+            let onadd = onadd.clone();
+            let input_ref = input_ref.clone();
+            Some(Callback::from(move |_: MouseEvent| {
+                let elm = input_ref
+                    .cast::<web_sys::HtmlInputElement>()
+                    .expect("could not cast `NodeRef` into element");
+
+                let value = elm.value().trim().to_string();
+                if value.is_empty() {
+                    return;
+                }
+
+                let value = value.split(",").map(|s| s.trim().into()).collect();
+                onadd.emit(value);
+                elm.set_value("");
+            }))
+        }
+    };
+
+    let onremove = {
+        let Some(onremove) = props.onremove.as_ref() else {
+            panic!("`onremove` not provided");
+        };
+
+        move |tag: String| -> Callback<MouseEvent> {
+            let onremove = onremove.clone();
+            Callback::from(move |e: MouseEvent| {
+                e.stop_propagation();
+                onremove.emit(tag.clone());
+            })
+        }
+    };
+
+    html! {
+        <div class={classes!("thot-ui-bulk-tag-editor")}>
+            if let Some(onadd) = onadd {
+                <div class={classes!("add-tags")}>
+                    <input ref={input_ref}/>
+                    <button class={classes!("add-button")} type="button" onclick={onadd}>
+                        <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidPlus }/>
+                    </button>
+                </div>
+            }
+            <div class={classes!("existing-tags")}>
+                <ul>
+                    {props.value.iter().map(|tag| html! {
+                        <li>
+                            <span>{ tag }</span>
+                            if props.onremove.is_some() {
+                                <button class={classes!("remove-button")} type="button" onclick={onremove(tag.into())}>
+                                    <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidMinus}/>
+                                </button>
+                            }
+                        </li>
+                    }).collect::<Html>()}
+                </ul>
+            </div>
+        </div>
+    }
+}
diff --git a/ui/src/widgets/bulk_editor/types.rs b/ui/src/widgets/bulk_editor/types.rs
new file mode 100644
index 00000000..d8871067
--- /dev/null
+++ b/ui/src/widgets/bulk_editor/types.rs
@@ -0,0 +1,26 @@
+//! Types for bulk editing.
+
+#[derive(PartialEq, Clone)]
+pub enum BulkValue<T>
+where
+    T: PartialEq + Clone,
+{
+    Equal(T),
+    Mixed,
+}
+
+impl<T> BulkValue<T>
+where
+    T: PartialEq + Clone,
+{
+    pub fn is_equal(&self) -> bool {
+        match self {
+            Self::Equal(_) => true,
+            Self::Mixed => false,
+        }
+    }
+
+    pub fn is_mixed(&self) -> bool {
+        !self.is_equal()
+    }
+}
diff --git a/ui/src/widgets/common.rs b/ui/src/widgets/common.rs
new file mode 100644
index 00000000..5ca82171
--- /dev/null
+++ b/ui/src/widgets/common.rs
@@ -0,0 +1,80 @@
+pub mod asset {
+    //! Common Asset functionality.
+    use thot_core::project::Asset;
+    use yew_icons::IconId;
+
+    type Color = String;
+
+    /// Gets the name to display for an [`Asset`].
+    ///
+    /// # Returns
+    /// The `name` if set, otherwise the `path`'s file name.
+    pub fn asset_display_name(asset: &Asset) -> String {
+        if let Some(name) = asset.properties.name.as_ref() {
+            name.clone()
+        } else {
+            asset.path.as_path().to_str().unwrap().to_string()
+        }
+    }
+
+    /// Gets the icon id to display for an [`Asset`].
+    ///
+    /// # Returns
+    /// The `IconId`.
+    pub fn asset_icon_id(asset: &Asset) -> IconId {
+        fn get_icon_id(extension: &str) -> IconId {
+            match extension {
+                "mp3" | "m4a" | "flac" | "wav" => IconId::FontAwesomeRegularFileAudio,
+                "py" | "r" | "m" | "js" | "ts" | "cpp" | "c" | "rs" => {
+                    IconId::FontAwesomeRegularFileCode
+                }
+                "csv" | "xlsx" | "xlsm" | "xml" | "odf" => IconId::FontAwesomeRegularFileExcel,
+                "png" | "svg" | "jpg" | "jpeg" | "tiff" | "bmp" => {
+                    IconId::FontAwesomeRegularFileImage
+                }
+                "txt" => IconId::FontAwesomeRegularFileLines,
+                "pdf" => IconId::FontAwesomeRegularFilePdf,
+                "pptx" | "pptm" | "ppt" => IconId::FontAwesomeRegularFilePowerpoint,
+                "doc" | "docm" | "docx" | "dot" => IconId::FontAwesomeRegularFileWord,
+                "mp4" | "mov" | "wmv" | "avi" => IconId::FontAwesomeRegularFileVideo,
+                "zip" | "zipx" | "rar" | "7z" | "gz" => IconId::FontAwesomeRegularFileZipper,
+                "dat" | "pkl" | "bin" | "exe" => IconId::OcticonsFileBinary24,
+                _ => IconId::FontAwesomeRegularFile,
+            }
+        }
+
+        let Some(extension) = asset.path.as_path().extension() else {
+            return IconId::FontAwesomeRegularFile;
+        };
+
+        let Some(extension) = extension.to_str() else {
+            return IconId::FontAwesomeRegularFile;
+        };
+
+        get_icon_id(&extension.to_lowercase())
+    }
+
+    /// Gets the icon color to display for an [`Asset`](Asset).
+    ///
+    /// # Returns
+    /// The `Color`.
+    pub fn asset_icon_color(asset: &Asset) -> Color {
+        let icon_id = asset_icon_id(asset);
+        // TODO[l] Pull from stylesheet.
+        let color = match icon_id {
+            IconId::FontAwesomeRegularFileAudio => "#FFCC67",
+            IconId::FontAwesomeRegularFileCode => "#B4DCE1",
+            IconId::FontAwesomeRegularFileExcel => "#A8C764",
+            IconId::FontAwesomeRegularFileImage => "#FFB800",
+            IconId::FontAwesomeRegularFileLines => "#E0E2E8",
+            IconId::FontAwesomeRegularFilePdf => "#E05C2B",
+            IconId::FontAwesomeRegularFilePowerpoint => "#E97D55",
+            IconId::FontAwesomeRegularFileWord => "#77B9CE",
+            IconId::FontAwesomeRegularFileVideo => "#FFDC82",
+            IconId::FontAwesomeRegularFileZipper => "#C8CCD4",
+            IconId::OcticonsFileBinary24 => "#51A1C3",
+            _ => "#F3F4F7",
+        };
+        format!("color: {}", color)
+    }
+}
diff --git a/ui/src/widgets/container/container_properties_editor.rs b/ui/src/widgets/container/container_properties_editor.rs
new file mode 100644
index 00000000..86a9cc9f
--- /dev/null
+++ b/ui/src/widgets/container/container_properties_editor.rs
@@ -0,0 +1,282 @@
+//! Properties editor for [`Contaier`](thot_core::project::Container)s.
+use super::super::{MetadataEditor, TagsEditor};
+use std::ops::{Deref, DerefMut};
+use std::rc::Rc;
+use thot_core::project::{ContainerProperties, Metadata};
+use yew::prelude::*;
+
+// ************************
+// *** Properties State ***
+// ************************
+enum ContainerPropertiesStateAction {
+    SetName(String),
+    SetKind(String),
+    ClearKind,
+    SetDescription(String),
+    ClearDescription,
+    SetTags(Vec<String>),
+    SetMetadata(Metadata),
+    Update(ContainerProperties),
+}
+
+#[derive(PartialEq, Clone, Debug)]
+struct ContainerPropertiesState(ContainerProperties);
+
+impl From<ContainerProperties> for ContainerPropertiesState {
+    fn from(props: ContainerProperties) -> Self {
+        Self(props)
+    }
+}
+
+impl Into<ContainerProperties> for ContainerPropertiesState {
+    fn into(self) -> ContainerProperties {
+        self.0
+    }
+}
+
+impl Deref for ContainerPropertiesState {
+    type Target = ContainerProperties;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for ContainerPropertiesState {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl Reducible for ContainerPropertiesState {
+    type Action = ContainerPropertiesStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        let mut current = (*self).clone();
+        match action {
+            ContainerPropertiesStateAction::SetName(value) => {
+                current.name = value;
+            }
+
+            ContainerPropertiesStateAction::SetKind(value) => {
+                let _ = current.kind.insert(value);
+            }
+
+            ContainerPropertiesStateAction::ClearKind => {
+                current.kind.take();
+            }
+
+            ContainerPropertiesStateAction::SetDescription(value) => {
+                let _ = current.description.insert(value);
+            }
+
+            ContainerPropertiesStateAction::ClearDescription => {
+                current.description.take();
+            }
+
+            ContainerPropertiesStateAction::SetTags(tags) => {
+                current.tags = tags;
+            }
+
+            ContainerPropertiesStateAction::SetMetadata(metadata) => {
+                current.metadata = metadata;
+            }
+
+            ContainerPropertiesStateAction::Update(properties) => {
+                return Self(properties).into();
+            }
+        }
+
+        current.into()
+    }
+}
+
+// ****************************
+// *** Properties Component ***
+// ****************************
+
+/// Properties for [`ContainerPropertiesEditor`].
+#[derive(PartialEq, Properties)]
+pub struct ContainerPropertiesEditorProps {
+    #[prop_or_default]
+    pub class: Classes,
+
+    /// Initial value.
+    pub properties: ContainerProperties,
+
+    /// Callback when value changes.
+    #[prop_or_default]
+    pub onchange: Callback<ContainerProperties>,
+}
+
+/// [`ContainerProperties`] editor.
+#[tracing::instrument(skip(props))]
+#[function_component(ContainerPropertiesEditor)]
+pub fn container_properties_editor(props: &ContainerPropertiesEditorProps) -> Html {
+    let properties_state =
+        use_reducer(|| Into::<ContainerPropertiesState>::into(props.properties.clone()));
+    let dirty_state = use_state(|| false);
+    let name_ref = use_node_ref();
+    let kind_ref = use_node_ref();
+    let description_ref = use_node_ref();
+
+    {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+
+        use_effect_with(props.properties.clone(), move |properties| {
+            dirty_state.set(false);
+            properties_state
+                .dispatch(ContainerPropertiesStateAction::Update(properties.clone()));
+        });
+    }
+
+    let onchange_name = {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+        let elm = name_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            properties_state.dispatch(ContainerPropertiesStateAction::SetName(value));
+            dirty_state.set(true);
+        })
+    };
+
+    let onchange_kind = {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+        let elm = kind_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let action = if value.is_empty() {
+                ContainerPropertiesStateAction::ClearKind
+            } else {
+                ContainerPropertiesStateAction::SetKind(value)
+            };
+
+            properties_state.dispatch(action);
+            dirty_state.set(true);
+        })
+    };
+
+    let onchange_description = {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+        let elm = description_ref.clone();
+
+        Callback::from(move |_: Event| {
+            // update state
+            let elm = elm
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast `NodeRef` into element");
+
+            let value = elm.value().trim().to_string();
+            let action = if value.is_empty() {
+                ContainerPropertiesStateAction::ClearDescription
+            } else {
+                ContainerPropertiesStateAction::SetDescription(value)
+            };
+
+            properties_state.dispatch(action);
+            dirty_state.set(true);
+        })
+    };
+
+    let onchange_tags = {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+
+        Callback::from(move |value: Vec<String>| {
+            properties_state.dispatch(ContainerPropertiesStateAction::SetTags(value));
+            dirty_state.set(true);
+        })
+    };
+
+    let onchange_metadata = {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+
+        Callback::from(move |value: Metadata| {
+            properties_state.dispatch(ContainerPropertiesStateAction::SetMetadata(value));
+            dirty_state.set(true);
+        })
+    };
+
+    {
+        let properties_state = properties_state.clone();
+        let dirty_state = dirty_state.clone();
+        let onchange = props.onchange.clone();
+
+        use_effect_with((properties_state, dirty_state), move |(properties_state, dirty_state)| {
+            if !(**dirty_state) {
+                return;
+            }
+            onchange.emit((**properties_state).clone().into());
+        });
+    }
+
+    html! {
+        <form class={classes!("thot-ui-container-properties-editor")}>
+            <div class={classes!("form-field", "name")}>
+                <label>
+                    <h3>{ "Name" }</h3>
+                    <input
+                        ref={name_ref}
+                        placeholder={"(no name)"}
+                        min={"1"}
+                        value={properties_state.name.clone()}
+                        onchange={onchange_name} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "kind")}>
+                <label>
+                    <h3>{ "Type" }</h3>
+                    <input
+                        ref={kind_ref}
+                        placeholder={"(no type)"}
+                        value={properties_state.kind.clone().unwrap_or("".into())}
+                        onchange={onchange_kind} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "description")}>
+                <label>
+                    <h3>{ "Description" }</h3>
+                    <textarea
+                        ref={description_ref}
+                        placeholder={"(no description)"}
+                        value={properties_state.description.clone().unwrap_or("".into())}
+                        onchange={onchange_description}></textarea>
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "tags")}>
+                <label>
+                    <h3>{ "Tags" }</h3>
+                    <TagsEditor
+                        value={properties_state.tags.clone()}
+                        onchange={onchange_tags} />
+                </label>
+            </div>
+
+            <div class={classes!("form-field", "metadata")}>
+                <MetadataEditor
+                    value={properties_state.metadata.clone()}
+                    onchange={onchange_metadata} />
+            </div>
+        </form>
+    }
+}
diff --git a/ui/src/widgets/container/container_tree/container.rs b/ui/src/widgets/container/container_tree/container.rs
index 65961e5d..4aa05181 100644
--- a/ui/src/widgets/container/container_tree/container.rs
+++ b/ui/src/widgets/container/container_tree/container.rs
@@ -6,7 +6,7 @@ use crate::widgets::metadata::MetadataPreview;
 use crate::widgets::Tags;
 use std::collections::HashSet;
 use thot_core::project::container::{AssetMap, ScriptMap};
-use thot_core::project::{Asset as CoreAsset, StandardProperties};
+use thot_core::project::{Asset as CoreAsset, ContainerProperties};
 use thot_core::types::{ResourceId, ResourceMap};
 use yew::prelude::*;
 
@@ -14,7 +14,7 @@ use yew::prelude::*;
 // *** Menu ***
 // ************
 
-// @todo: Possible items:
+// TODO Possible items:
 // + Analyze: Analyze subtree.
 /// Menu items available in the [`Container`]'s menu.
 #[derive(PartialEq, Clone, Debug)]
@@ -35,6 +35,9 @@ pub enum ContainerMenuEvent {
 /// Properties for [`ContainerMenu`].
 #[derive(PartialEq, Properties)]
 struct ContainerMenuProps {
+    #[prop_or_default]
+    pub class: Classes,
+
     #[prop_or_default]
     pub r#ref: NodeRef,
 
@@ -62,35 +65,30 @@ fn container_menu(props: &ContainerMenuProps) -> Html {
         }
     };
 
-    html! {
-        <div ref={props.r#ref.clone()}
-            class={classes!("container-menu")}>
+    let mut class = props.class.clone();
+    class.push("container-menu");
 
-            <ul>
-                <li class={classes!("clickable")}
-                    onclick={onclick(ContainerMenuEvent::OpenFolder)}>
-                    { "Open folder" }
+    html! {
+        <ul ref={props.r#ref.clone()} {class}>
+            <li onclick={onclick(ContainerMenuEvent::OpenFolder)}>
+                { "Open folder" }
+            </li>
+
+            <li onclick={onclick(ContainerMenuEvent::AddAssets)}>
+                { "Add data" }
+            </li>
+
+            { if props.is_root { html!{} } else { html!{
+                <>
+                <li onclick={onclick(ContainerMenuEvent::DuplicateTree)}>
+                    { "Duplicate tree" }
                 </li>
-
-                <li class={classes!("clickable")}
-                    onclick={onclick(ContainerMenuEvent::AddAssets)}>
-                    { "Add data" }
+                <li onclick={onclick(ContainerMenuEvent::Remove)}>
+                    { "Remove tree" }
                 </li>
-
-                { if props.is_root { html!{} } else { html!{
-                    <>
-                    <li class={classes!("clickable")}
-                        onclick={onclick(ContainerMenuEvent::DuplicateTree)}>
-                        { "Duplicate Tree" }
-                    </li>
-                    <li class={classes!("clickable")}
-                        onclick={onclick(ContainerMenuEvent::Remove)}>
-                        { "Remove Tree" }
-                    </li>
-                    </>
-                }}}
-            </ul>
-        </div>
+                </>
+            }}}
+        </ul>
     }
 }
 
@@ -101,7 +99,7 @@ fn container_menu(props: &ContainerMenuProps) -> Html {
 #[derive(Properties, PartialEq)]
 pub struct ContainerProps {
     pub rid: ResourceId,
-    pub properties: StandardProperties,
+    pub properties: ContainerProperties,
     pub assets: AssetMap,
     pub scripts: ScriptMap,
     pub script_names: ResourceMap<String>,
@@ -124,6 +122,9 @@ pub struct ContainerProps {
     #[prop_or_default]
     pub active_assets: HashSet<ResourceId>,
 
+    #[prop_or_default]
+    pub onmousedown: Callback<MouseEvent>,
+
     /// Callback to run when the `Container` is clicked.
     #[prop_or_default]
     pub onclick: Callback<MouseEvent>,
@@ -178,7 +179,6 @@ pub struct ContainerProps {
 /// A Container node within a Container tree.
 #[function_component(Container)]
 pub fn container(props: &ContainerProps) -> Html {
-    let show_menu = use_state(|| false);
     let dragover_counter = use_state(|| 0);
     let menu_ref = use_node_ref();
 
@@ -237,15 +237,6 @@ pub fn container(props: &ContainerProps) -> Html {
         })
     };
 
-    let onclick_menu = {
-        let show_menu = show_menu.clone();
-
-        Callback::from(move |e: MouseEvent| {
-            e.stop_propagation();
-            show_menu.set(!*show_menu);
-        })
-    };
-
     let onadd_child = {
         let onadd_child = props.onadd_child.clone();
         let rid = props.rid.clone();
@@ -260,11 +251,8 @@ pub fn container(props: &ContainerProps) -> Html {
 
     // inject closing setings menu on click to `on_menu_event` callback
     let on_menu_event = props.on_menu_event.clone().map(|on_menu_event| {
-        let show_menu = show_menu.clone();
-
         Callback::from(move |event: ContainerMenuEvent| {
-            show_menu.set(false); // close settigns menu
-            on_menu_event.emit(event); // trigger callback
+            on_menu_event.emit(event);
         })
     });
 
@@ -276,6 +264,7 @@ pub fn container(props: &ContainerProps) -> Html {
     html! {
         <div ref={props.r#ref.clone()}
             {class}
+            onmousedown={props.onmousedown.clone()}
             onclick={props.onclick.clone()}
             ondblclick={props.ondblclick.clone()}
             {ondragenter}
@@ -285,26 +274,21 @@ pub fn container(props: &ContainerProps) -> Html {
             data-rid={props.rid.clone()} >
 
             if let Some(on_menu_event) = on_menu_event {
-                <div class={classes!("container-menu-control")}>
-                    <button
-                        class={classes!("container-menu-toggle")}
-                        onclick={onclick_menu}>{ "\u{22ee}" }</button>
-
-                    if *show_menu {
-                        <ContainerMenu
-                            r#ref={menu_ref}
-                            onclick={on_menu_event}
-                            is_root={props.is_root} />
-                    }
+                <div class={classes!("container-menu-control", "dropdown-group")}>
+                    <span class={classes!("container-menu-toggle")}>
+                        { "\u{22ee}" }
+                    </span>
+
+                    <ContainerMenu
+                        class={classes!("dropdown-menu")}
+                        r#ref={menu_ref}
+                        onclick={on_menu_event}
+                        is_root={props.is_root} />
                 </div>
             }
 
             <div class={classes!("container-name")}>
-                if let Some(name) = props.properties.name.as_ref() {
-                    { &name }
-                } else {
-                    { "(no name)" }
-                }
+                { &props.properties.name }
             </div>
 
             <div class={classes!("container-preview")}>
@@ -358,7 +342,3 @@ pub fn container(props: &ContainerProps) -> Html {
        </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./container_test.rs"]
-mod container_test;
diff --git a/ui/src/widgets/container/container_tree/container_preview_select.rs b/ui/src/widgets/container/container_tree/container_preview_select.rs
index 713ab739..5cdeb0d6 100644
--- a/ui/src/widgets/container/container_tree/container_preview_select.rs
+++ b/ui/src/widgets/container/container_tree/container_preview_select.rs
@@ -45,7 +45,3 @@ pub fn container_preview_select(props: &ContainerPreviewSelectProps) -> Html {
         </select>
     }
 }
-
-#[cfg(test)]
-#[path = "./container_preview_select_test.rs"]
-mod container_preview_select_test;
diff --git a/ui/src/widgets/container/container_tree/container_preview_select_test.rs b/ui/src/widgets/container/container_tree/container_preview_select_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/container_tree/container_test.rs b/ui/src/widgets/container/container_tree/container_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/container_tree/mod.rs b/ui/src/widgets/container/container_tree/mod.rs
index fcd6df51..2647ea59 100644
--- a/ui/src/widgets/container/container_tree/mod.rs
+++ b/ui/src/widgets/container/container_tree/mod.rs
@@ -5,7 +5,3 @@ pub mod container_preview_select;
 // Re-exports
 pub use container::Container;
 pub use container_preview_select::ContainerPreviewSelect;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/container/container_tree/mod_test.rs b/ui/src/widgets/container/container_tree/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/mod.rs b/ui/src/widgets/container/mod.rs
index 79847743..9c276b3b 100644
--- a/ui/src/widgets/container/mod.rs
+++ b/ui/src/widgets/container/mod.rs
@@ -1,9 +1,6 @@
 //! Containers.
+pub mod container_properties_editor;
 pub mod container_tree;
 pub mod script_associations;
 
-// Re-exports
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub use container_properties_editor::ContainerPropertiesEditor;
diff --git a/ui/src/widgets/container/mod_test.rs b/ui/src/widgets/container/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/script_associations/add_script_association.rs b/ui/src/widgets/container/script_associations/add_script_association.rs
index 6656d57d..09825136 100644
--- a/ui/src/widgets/container/script_associations/add_script_association.rs
+++ b/ui/src/widgets/container/script_associations/add_script_association.rs
@@ -8,7 +8,7 @@ use yew_icons::{Icon, IconId};
 #[derive(Properties, PartialEq)]
 pub struct AddScriptAssociationProps {
     /// Available `Script`s.
-    pub scripts: Vec<CoreScript>, // @todo: Use indexmap::IndexSet.
+    pub scripts: Vec<CoreScript>, // TODO Use indexmap::IndexSet.
     pub onadd: Callback<ResourceId>,
 }
 
@@ -81,7 +81,3 @@ pub fn add_script_association(props: &AddScriptAssociationProps) -> Html {
         </>
     }
 }
-
-#[cfg(test)]
-#[path = "./add_script_association_test.rs"]
-mod add_script_association_test;
diff --git a/ui/src/widgets/container/script_associations/add_script_association_test.rs b/ui/src/widgets/container/script_associations/add_script_association_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/script_associations/mod.rs b/ui/src/widgets/container/script_associations/mod.rs
index a9a46015..b40871b3 100644
--- a/ui/src/widgets/container/script_associations/mod.rs
+++ b/ui/src/widgets/container/script_associations/mod.rs
@@ -5,9 +5,5 @@ pub mod script_associations_preview;
 
 // Re-exports
 pub use add_script_association::AddScriptAssociation;
-pub use script_associations_editor::ScriptAssociationsEditor;
+pub use script_associations_editor::{NameMap, ScriptAssociationsEditor};
 pub use script_associations_preview::ScriptAssociationsPreview;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/container/script_associations/mod_test.rs b/ui/src/widgets/container/script_associations/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/script_associations/script_associations_editor.rs b/ui/src/widgets/container/script_associations/script_associations_editor.rs
index b0c4c31b..190d4f01 100644
--- a/ui/src/widgets/container/script_associations/script_associations_editor.rs
+++ b/ui/src/widgets/container/script_associations/script_associations_editor.rs
@@ -1,19 +1,19 @@
 //! Editor for [`ScriptAssociation`]s.
-use std::collections::HashMap;
 use std::rc::Rc;
 use thot_core::project::container::ScriptMap;
 use thot_core::project::RunParameters;
-use thot_core::types::ResourceId;
+use thot_core::types::{ResourceId, ResourceMap};
 use yew::prelude::*;
 use yew_icons::{Icon, IconId};
 
-pub type NameMap = HashMap<ResourceId, String>;
+pub type NameMap = ResourceMap<String>;
 
 // **************************
 // *** Association Editor ***
 // **************************
 
 pub enum ScriptAssociationStateAction {
+    SetValue(RunParameters),
     SetPriority(i32),
     SetAutorun(bool),
 }
@@ -29,9 +29,14 @@ impl Reducible for ScriptAssociationState {
     fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
         let mut current = (*self).clone();
         match action {
+            ScriptAssociationStateAction::SetValue(params) => {
+                current.run_parameters = params;
+            }
+
             ScriptAssociationStateAction::SetPriority(priority) => {
                 current.run_parameters.priority = priority;
             }
+
             ScriptAssociationStateAction::SetAutorun(autorun) => {
                 current.run_parameters.autorun = autorun;
             }
@@ -56,25 +61,36 @@ pub fn script_association_editor(props: &ScriptAssociationEditorProps) -> Html {
     let association_state = use_reducer(|| ScriptAssociationState {
         run_parameters: props.run_parameters.clone(),
     });
+
     let priority_ref = use_node_ref();
     let autorun_ref = use_node_ref();
 
+    {
+        let association_state = association_state.clone();
+        let dirty_state = dirty_state.clone();
+
+        use_effect_with(props.run_parameters.clone(), move |run_parameters| {
+            association_state.dispatch(ScriptAssociationStateAction::SetValue(
+                run_parameters.clone(),
+            ));
+        
+            dirty_state.set(false);
+        });
+    }
+
     {
         let onchange = props.onchange.clone();
         let dirty_state = dirty_state.clone();
         let association_state = association_state.clone();
 
-        use_effect_with_deps(
-            move |association_state| {
-                if !*dirty_state {
-                    return;
-                }
-
-                onchange.emit(association_state.run_parameters.clone());
-                dirty_state.set(false);
-            },
-            association_state,
-        );
+        use_effect_with(association_state, move |association_state| {
+            if !*dirty_state {
+                return;
+            }
+        
+            onchange.emit(association_state.run_parameters.clone());
+            dirty_state.set(false);
+        });
     }
 
     let onchange_priority = {
@@ -205,7 +221,3 @@ pub fn script_associations_editor(props: &ScriptAssociationsEditorProps) -> Html
         </form>
     }
 }
-
-#[cfg(test)]
-#[path = "./script_associations_editor_test.rs"]
-mod script_associations_editor_test;
diff --git a/ui/src/widgets/container/script_associations/script_associations_editor_test.rs b/ui/src/widgets/container/script_associations/script_associations_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/container/script_associations/script_associations_preview.rs b/ui/src/widgets/container/script_associations/script_associations_preview.rs
index d7d00146..09cfa4e6 100644
--- a/ui/src/widgets/container/script_associations/script_associations_preview.rs
+++ b/ui/src/widgets/container/script_associations/script_associations_preview.rs
@@ -14,7 +14,6 @@ struct ScriptAssociationPreviewProps {
 
 #[function_component(ScriptAssociationPreview)]
 fn script_association_preview(props: &ScriptAssociationPreviewProps) -> Html {
-    // @todo: Add `RunParameters` functionality.
     let mut class = classes!("thot-ui-script-association-preview");
     if props.run_parameters.autorun {
         class.push("autorun-true");
@@ -35,24 +34,33 @@ pub struct ScriptAssociationsPreviewProps {
     pub scripts: ScriptMap,
     pub names: ResourceMap<String>,
 
-    /// MAp from `Script` id to name.
+    /// Map from `Script` id to name.
     #[prop_or_default]
     pub name_map: Option<NameMap>,
 }
 
 #[function_component(ScriptAssociationsPreview)]
 pub fn script_associations_preview(props: &ScriptAssociationsPreviewProps) -> Html {
+    let mut scripts = props.scripts.iter().collect::<Vec<_>>();
+    scripts.sort_by(
+        |(_, RunParameters { priority: p1, .. }), (_, RunParameters { priority: p2, .. })| {
+            p2.cmp(p1)
+        },
+    );
+
     html! {
         <div class={classes!("thot-ui-script-associations-preview")}>
             if props.scripts.len() == 0 {
                 { "(no scripts)" }
             } else {
                 <ol class={classes!("thot-ui-script-associations-list")}>
-                    { props.scripts.iter().map(|(script, run_parameters)| {
+                    { scripts.into_iter().map(|(script, run_parameters)| {
                         let name = props.names.get(script).expect("script name not found.");
                         html! {
                             <li>
-                                <ScriptAssociationPreview name={name.clone()} run_parameters={run_parameters.clone()} />
+                                <ScriptAssociationPreview
+                                    name={name.clone()}
+                                    run_parameters={run_parameters.clone()} />
                             </li>
                         }
                     }).collect::<Html>() }
@@ -61,7 +69,3 @@ pub fn script_associations_preview(props: &ScriptAssociationsPreviewProps) -> Ht
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./script_associations_preview_test.rs"]
-mod script_associations_preview_test;
diff --git a/ui/src/widgets/container/script_associations/script_associations_preview_test.rs b/ui/src/widgets/container/script_associations/script_associations_preview_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/common.rs b/ui/src/widgets/metadata/common.rs
new file mode 100644
index 00000000..b4f4de38
--- /dev/null
+++ b/ui/src/widgets/metadata/common.rs
@@ -0,0 +1,169 @@
+//! Common functions to metadata.
+use super::MetadatumType;
+use serde_json::{Result as JsResult, Value as JsValue};
+use std::result::Result as StdResult;
+use std::str::FromStr;
+use yew::prelude::NodeRef;
+
+/// Converts a string to a number.
+/// Is restrictive as possible in conversion.
+/// i.e. First tries to convert to `u64`, then `i64`, then `f64`.
+///
+/// # Returns
+/// A [`serde_json::Value`] that is a
+/// + [`Number`](serde_json::value::Number) if the value is finite and parsed correctly.
+/// + `Null` if the value is parsed correclty but `nan`.
+/// + 0 if the value is empty. (This also occurs if the string is an invalid number.)
+///
+/// # Errors
+/// + If the value can not be parsed as a number.
+#[tracing::instrument]
+pub fn str_to_number(input: &str) -> StdResult<JsValue, <f64 as FromStr>::Err> {
+    fn parse_as_int(input: &str) -> Option<JsValue> {
+        if let Ok(val) = input.parse::<u64>() {
+            return Some(JsValue::from(val));
+        }
+
+        if let Ok(val) = input.parse::<i64>() {
+            return Some(JsValue::from(val));
+        }
+
+        None
+    }
+
+    if input.is_empty() {
+        return Ok(JsValue::from(0 as u64));
+    }
+
+    match input.split_once('.') {
+        None => Ok(parse_as_int(input).expect("could not parse as number")),
+        Some((_, decs)) => {
+            if decs.is_empty() {
+                Ok(parse_as_int(input).expect("could not parse as number"))
+            } else {
+                let val = input.parse::<f64>()?;
+                match val.is_nan() {
+                    true => Ok(JsValue::Null),
+                    false => Ok(JsValue::from(val)),
+                }
+            }
+        }
+    }
+}
+
+/// # Returns
+/// The input value converted to a [`serde_json::Value`].
+/// `Null` is used to indicate an error occurred.
+#[tracing::instrument(skip(value_ref))]
+pub fn value_from_input(value_ref: NodeRef, kind: &MetadatumType) -> JsResult<JsValue> {
+    let value = match kind {
+        MetadatumType::String => {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not convert value node ref into input");
+
+            let val = v_in.value().trim().to_owned();
+            match val.is_empty() {
+                true => JsValue::Null,
+                false => JsValue::String(val),
+            }
+        }
+
+        MetadatumType::Number => {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not convert value node ref into input");
+
+            match str_to_number(v_in.value().trim()) {
+                Ok(val) => val,
+                Err(_) => JsValue::Null,
+            }
+        }
+
+        MetadatumType::Bool => {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not convert value node ref into input");
+
+            JsValue::Bool(v_in.checked())
+        }
+
+        MetadatumType::Array => {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast value node ref as textarea");
+
+            let val = v_in.value().trim().to_owned();
+            match val.is_empty() {
+                true => JsValue::Null,
+                false => serde_json::from_str(&val)?,
+            }
+        }
+
+        MetadatumType::Object => {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlTextAreaElement>()
+                .expect("could not cast value node ref as textarea");
+
+            let val = v_in.value().trim().to_owned();
+            match val.is_empty() {
+                true => JsValue::Null,
+                false => serde_json::from_str(&val)?,
+            }
+        }
+    };
+
+    Ok(value)
+}
+
+/// Converts between [`serde_json::Value`] types.
+/// If a reasonable conversion can not be made, the default value for that type is returned.
+#[tracing::instrument]
+pub fn convert_value(value: JsValue, target: &MetadatumType) -> JsValue {
+    match (value.clone(), target.clone()) {
+        (JsValue::String(_), MetadatumType::String)
+        | (JsValue::Number(_), MetadatumType::Number)
+        | (JsValue::Bool(_), MetadatumType::Bool)
+        | (JsValue::Array(_), MetadatumType::Array)
+        | (JsValue::Object(_), MetadatumType::Object) => value,
+
+        (JsValue::String(value), MetadatumType::Number) => match str_to_number(&value) {
+            Ok(val) => val,
+            Err(_) => JsValue::from(0 as u64),
+        },
+
+        (JsValue::Number(value), MetadatumType::String) => value.to_string().into(),
+
+        (JsValue::Array(value), MetadatumType::String) => serde_json::to_string_pretty(&value)
+            .unwrap_or(String::default())
+            .into(),
+
+        (JsValue::Object(value), MetadatumType::String) => serde_json::to_string_pretty(&value)
+            .unwrap_or(String::default())
+            .into(),
+
+        (JsValue::String(value), MetadatumType::Array) => {
+            let value = serde_json::to_value(value).unwrap_or_default();
+            if value.is_array() {
+                value
+            } else {
+                JsValue::Array(Vec::default())
+            }
+        }
+
+        (JsValue::String(value), MetadatumType::Object) => {
+            let value = serde_json::to_value(value).unwrap_or_default();
+            if value.is_object() {
+                value
+            } else {
+                JsValue::Object(serde_json::Map::default())
+            }
+        }
+
+        (_, MetadatumType::String) => JsValue::String(String::default()),
+        (_, MetadatumType::Number) => JsValue::Number(0.into()),
+        (_, MetadatumType::Bool) => JsValue::Bool(false),
+        (_, MetadatumType::Array) => JsValue::Array(Vec::default()),
+        (_, MetadatumType::Object) => JsValue::Object(serde_json::Map::default()),
+    }
+}
diff --git a/ui/src/widgets/metadata/metadata_bulk_editor.rs b/ui/src/widgets/metadata/metadata_bulk_editor.rs
new file mode 100644
index 00000000..8deb4fe8
--- /dev/null
+++ b/ui/src/widgets/metadata/metadata_bulk_editor.rs
@@ -0,0 +1,112 @@
+//! Bulk metadata editor.
+use super::{MetadataBulk, Metadatum, MetadatumBuilder, MetadatumBulkEditor};
+use serde_json::Value as JsValue;
+use std::collections::HashSet;
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+#[derive(Properties, PartialEq)]
+pub struct MetadataBulkEditorProps {
+    pub value: MetadataBulk,
+
+    /// Called when a metadatum is added.
+    #[prop_or_default]
+    pub onadd: Option<Callback<Metadatum>>,
+
+    /// Called when a metadatum is removed.
+    #[prop_or_default]
+    pub onremove: Option<Callback<String>>,
+
+    /// Called when the value of a metadatum is changed.
+    #[prop_or_default]
+    pub onchange: Option<Callback<Metadatum>>,
+}
+
+#[tracing::instrument(skip(props))]
+#[function_component(MetadataBulkEditor)]
+pub fn metadata_bulk_editor(props: &MetadataBulkEditorProps) -> Html {
+    let add_metadatum_visible = use_state(|| false);
+
+    let show_add_metadatum = {
+        let add_metadatum_visible = add_metadatum_visible.clone();
+
+        Callback::from(move |_: MouseEvent| {
+            add_metadatum_visible.set(true);
+        })
+    };
+
+    let add_metadatum = {
+        let onadd = props.onadd.clone();
+        let add_metadatum_visible = add_metadatum_visible.clone();
+
+        Callback::from(move |metadatum: Metadatum| {
+            if let Some(onadd) = onadd.as_ref() {
+                onadd.emit(metadatum.clone());
+            }
+            add_metadatum_visible.set(false);
+        })
+    };
+
+    let oncancel_add_metadatum = {
+        let add_metadatum_visible = add_metadatum_visible.clone();
+
+        Callback::from(move |_| {
+            add_metadatum_visible.set(false);
+        })
+    };
+
+    let remove_metadatum = move |key: String| {
+        let onremove = props.onremove.clone();
+        Callback::from(move |_: MouseEvent| {
+            if let Some(onremove) = onremove.as_ref() {
+                onremove.emit(key.clone());
+            }
+        })
+    };
+
+    let onchange = move |key: String| {
+        let onchange = props.onchange.clone();
+        Callback::from(move |value: JsValue| {
+            if let Some(onchange) = onchange.as_ref() {
+                onchange.emit((key.clone(), value.clone()));
+            }
+        })
+    };
+
+    let name_filter = props.value.clone().into_keys().collect::<HashSet<String>>();
+    let mut value = props.value.clone().into_iter().collect::<Vec<_>>();
+    value.sort_by_key(|v| v.0.clone());
+
+    html! {
+        <div class={classes!("thot-ui-metadata-editor")}>
+            <div class={classes!("metadata-header")}>
+                <h3>{ "Metadata" }</h3>
+                <button class={classes!("add-button")} type="button" onclick={show_add_metadatum}>
+                    <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidPlus }/>
+                </button>
+            </div>
+            <div class={classes!("add-metadatum-controls")}>
+                if *add_metadatum_visible {
+                    <MetadatumBuilder
+                        {name_filter}
+                        onsave={add_metadatum}
+                        oncancel={oncancel_add_metadatum} />
+                }
+            </div>
+            <ol class={classes!("metadata-editor")}>
+                { value.into_iter().map(|(name, value)| html! {
+                    <li key={name.clone()}>
+                        <MetadatumBulkEditor
+                            name={name.clone()}
+                            {value}
+                            onchange={onchange(name.clone())}/>
+
+                        <button class={classes!("remove-button")} type="button" onclick={remove_metadatum(name)}>
+                            <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidMinus}/>
+                        </button>
+                    </li>
+                }).collect::<Html>() }
+            </ol>
+        </div>
+    }
+}
diff --git a/ui/src/widgets/metadata/metadata_editor.rs b/ui/src/widgets/metadata/metadata_editor.rs
index cae957fa..a42132c5 100644
--- a/ui/src/widgets/metadata/metadata_editor.rs
+++ b/ui/src/widgets/metadata/metadata_editor.rs
@@ -94,8 +94,8 @@ pub fn metadata_editor(props: &MetadataEditorProps) -> Html {
         <div {class}>
             <div class={classes!("metadata-header")}>
                 <h3>{ "Metadata" }</h3>
-                <button classes={ "add-button" } type="button" onclick={show_add_metadatum}>
-                    <Icon class={ classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidPlus }/>
+                <button class={classes!("add-button")} type="button" onclick={show_add_metadatum}>
+                    <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidPlus}/>
                 </button>
             </div>
             <div class={classes!("add-metadatum-controls")}>
@@ -114,8 +114,8 @@ pub fn metadata_editor(props: &MetadataEditorProps) -> Html {
                             {value}
                             onchange={onchange(name.clone())}/>
 
-                        <button classes={ "add-button" } type="button" onclick={remove_metadatum(name)}>
-                            <Icon class={ classes!("thot-ui-add-remove-icon")} icon_id={ IconId::HeroiconsSolidMinus }/>
+                        <button class={classes!("remove-button")} type="button" onclick={remove_metadatum(name)}>
+                            <Icon class={classes!("thot-ui-add-remove-icon")} icon_id={IconId::HeroiconsSolidMinus}/>
                         </button>
                     </li>
                 }).collect::<Html>() }
@@ -123,7 +123,3 @@ pub fn metadata_editor(props: &MetadataEditorProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./metadata_editor_test.rs"]
-mod metadata_editor_test;
diff --git a/ui/src/widgets/metadata/metadata_editor_test.rs b/ui/src/widgets/metadata/metadata_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/metadata_preview.rs b/ui/src/widgets/metadata/metadata_preview.rs
index 4909c07b..2804b118 100644
--- a/ui/src/widgets/metadata/metadata_preview.rs
+++ b/ui/src/widgets/metadata/metadata_preview.rs
@@ -13,8 +13,9 @@ pub fn metadata_preview(props: &MetadataPreviewProps) -> Html {
         <ol class={classes!("thot-ui-metadata-preview")}>
             { props.value.iter().map(|(name, value)| html! {
                 <li key={name.clone()}>
-                    <span class={classes!("metadatum-key")}>
-                            { &name }
+                    <span class={classes!("metadatum-key")}
+                        title={name.clone()}>
+                        { &name }
                     </span>
 
                     <span class={classes!("metadatum-value")}>
@@ -29,7 +30,3 @@ pub fn metadata_preview(props: &MetadataPreviewProps) -> Html {
         </ol>
     }
 }
-
-#[cfg(test)]
-#[path = "./metadata_preview_test.rs"]
-mod metadata_preview_test;
diff --git a/ui/src/widgets/metadata/metadata_preview_test.rs b/ui/src/widgets/metadata/metadata_preview_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/metadatum_builder.rs b/ui/src/widgets/metadata/metadatum_builder.rs
index eed0a057..7f85fe5d 100644
--- a/ui/src/widgets/metadata/metadatum_builder.rs
+++ b/ui/src/widgets/metadata/metadatum_builder.rs
@@ -4,7 +4,7 @@ use serde_json::Value as JsValue;
 use std::collections::HashSet;
 use yew::prelude::*;
 
-#[derive(Properties, PartialEq)]
+#[derive(Properties, PartialEq, Debug)]
 pub struct MetadatumBuilderProps {
     /// Initial name.
     #[prop_or_default]
@@ -25,9 +25,10 @@ pub struct MetadatumBuilderProps {
     pub oncancel: Callback<()>,
 }
 
+#[tracing::instrument]
 #[function_component(MetadatumBuilder)]
 pub fn metadatum_builder(props: &MetadatumBuilderProps) -> Html {
-    // @note: `kind` and `value` are set to default values if they can not be
+    // NOTE `kind` and `value` are set to default values if they can not be
     // interpreted correctly. It may be better to return an error instead,
     // although this situation should likely never arise due to their types.
     let value = use_state(|| props.value.clone());
@@ -44,13 +45,12 @@ pub fn metadatum_builder(props: &MetadatumBuilderProps) -> Html {
                 .cast::<web_sys::HtmlInputElement>()
                 .expect("could not cast node ref to input");
 
-            key.set(key_input.value());
+            key.set(key_input.value().trim().into());
         })
     };
 
     let onchange_value = {
         let value = value.clone();
-
         Callback::from(move |val| {
             value.set(val);
         })
@@ -58,9 +58,8 @@ pub fn metadatum_builder(props: &MetadatumBuilderProps) -> Html {
 
     let onerror = {
         let error = error.clone();
-
         Callback::from(move |message: String| {
-            error.set(Some(message));
+            error.set(message.into());
         })
     };
 
@@ -85,50 +84,51 @@ pub fn metadatum_builder(props: &MetadatumBuilderProps) -> Html {
                 return;
             }
 
+            if (*error).is_some() {
+                return;
+            }
+
             onsave.emit(((*key).clone(), (*value).clone()));
         })
     };
 
     let oncancel = {
         let oncancel = props.oncancel.clone();
-
         Callback::from(move |_: MouseEvent| {
             oncancel.emit(());
         })
     };
 
     html! {
-        <form class={classes!("thot-ui-metadatum-builder")} {onsubmit}>
-            <div class={classes!("form-fields")}>
-                <input
-                    ref={key_ref}
-                    placeholder="Name"
-                    value={(*key).clone()}
-                    minlength="1"
-                    onchange={onchange_key}
-                    required={true} />
-
-                <MetadatumValueEditor
-                    class={classes!("metadatum-value")}
-                    value={props.value.clone()}
-                    onchange={onchange_value}
-                    {onerror} />
-
-                <div class={classes!("error")}>
-                    if let Some(msg) = error.as_ref() {
-                        { msg }
-                    }
+        <div class={classes!("thot-ui-metadatum-builder")}>
+            <form {onsubmit}>
+                <div class={classes!("form-fields")}>
+                    <input
+                        ref={key_ref}
+                        placeholder="Name"
+                        value={(*key).clone()}
+                        minlength="1"
+                        onchange={onchange_key}
+                        required={true} />
+
+                    <MetadatumValueEditor
+                        class={classes!("metadatum-value")}
+                        value={props.value.clone()}
+                        onchange={onchange_value}
+                        {onerror} />
+
+                    <div class={classes!("form-controls")}>
+                        <button>{ "Add" }</button>
+                        <button type="button" onclick={oncancel}>{ "Cancel" }</button>
+                    </div>
                 </div>
-            </div>
+            </form>
 
-            <div class={classes!("form-controls")}>
-                <button>{ "Add" }</button>
-                <button type="button" onclick={oncancel}>{ "Cancel" }</button>
+            <div class={classes!("error")}>
+                if let Some(msg) = error.as_ref() {
+                    { msg }
+                }
             </div>
-        </form>
+        </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./metadatum_builder_test.rs"]
-mod metadatum_builder_test;
diff --git a/ui/src/widgets/metadata/metadatum_builder_test.rs b/ui/src/widgets/metadata/metadatum_builder_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/metadatum_bulk_editor.rs b/ui/src/widgets/metadata/metadatum_bulk_editor.rs
new file mode 100644
index 00000000..51299a1e
--- /dev/null
+++ b/ui/src/widgets/metadata/metadatum_bulk_editor.rs
@@ -0,0 +1,58 @@
+//! Inline editor for a single metadatum.
+use super::MetadatumBulkValueEditor;
+use serde_json::Value as JsValue;
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq, Debug)]
+pub struct MetadatumBulkEditorProps {
+    pub name: String,
+
+    pub value: Vec<JsValue>,
+
+    #[prop_or_default]
+    pub onchange: Callback<JsValue>,
+}
+
+#[tracing::instrument]
+#[function_component(MetadatumBulkEditor)]
+pub fn metadatum_bulk_editor(props: &MetadatumBulkEditorProps) -> Html {
+    let error = use_state(|| None);
+    let onerror = {
+        let error = error.clone();
+
+        Callback::from(move |message: String| {
+            error.set(Some(message));
+        })
+    };
+
+    let onchange = {
+        let onchange = props.onchange.clone();
+        let error = error.clone();
+
+        Callback::from(move |value| {
+            error.set(None);
+            onchange.emit(value);
+        })
+    };
+
+    // ui
+    html! {
+        <div class={classes!("thot-ui-metadatum")}>
+            <div class={classes!("metadatum-fields")}>
+                <span class={classes!("metadatum-key")}>
+                    { &props.name }
+                </span>
+
+                <MetadatumBulkValueEditor
+                    class={classes!("metadatum-value")}
+                    value={props.value.clone()}
+                    {onchange}
+                    {onerror} />
+            </div>
+
+            if let Some(msg) = error.as_ref() {
+                <span class={classes!("error")}>{ msg }</span>
+            }
+        </div>
+    }
+}
diff --git a/ui/src/widgets/metadata/metadatum_bulk_value_editor.rs b/ui/src/widgets/metadata/metadatum_bulk_value_editor.rs
new file mode 100644
index 00000000..81819244
--- /dev/null
+++ b/ui/src/widgets/metadata/metadatum_bulk_value_editor.rs
@@ -0,0 +1,335 @@
+//! Editor for a `Metadatum` value.
+use super::common;
+use super::{type_from_string, type_of_value, MetadatumType};
+use serde_json::Value as JsValue;
+use std::rc::Rc;
+use yew::prelude::*;
+
+const PLACEHOLDER: &'static str = "(mixed)";
+
+#[derive(PartialEq, Clone)]
+enum BulkValue {
+    MixedType,
+    MixedValue(MetadatumType),
+    EqualValue(JsValue),
+}
+
+// ***************
+// *** reducer ***
+// ***************
+
+enum MetadatumStateAction {
+    New(Vec<JsValue>),
+    Set(BulkValue),
+}
+
+#[derive(PartialEq, Clone)]
+struct MetadatumState {
+    value: BulkValue,
+    dirty: bool,
+}
+
+impl MetadatumState {
+    pub fn new(values: &Vec<JsValue>) -> Self {
+        let mut vals = values.clone();
+        vals.dedup();
+        if vals.len() == 1 {
+            return Self {
+                value: BulkValue::EqualValue(vals[0].clone()),
+                dirty: false,
+            };
+        }
+
+        // check if value types are equal
+        let mut kinds = values.iter().map(|v| type_of_value(v)).collect::<Vec<_>>();
+        kinds.dedup();
+        if kinds.len() == 1 {
+            let kind = kinds[0].clone().expect("invalid metadatum type");
+            return Self {
+                value: BulkValue::MixedValue(kind),
+                dirty: false,
+            };
+        }
+
+        Self {
+            value: BulkValue::MixedType,
+            dirty: false,
+        }
+    }
+
+    pub fn value(&self) -> &BulkValue {
+        &self.value
+    }
+
+    pub fn kind(&self) -> Option<MetadatumType> {
+        match &self.value {
+            BulkValue::MixedType => None,
+            BulkValue::MixedValue(kind) => Some(kind.clone()),
+            BulkValue::EqualValue(value) => type_of_value(&value),
+        }
+    }
+}
+
+impl Reducible for MetadatumState {
+    type Action = MetadatumStateAction;
+
+    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
+        match action {
+            MetadatumStateAction::New(value) => Self::new(&value).into(),
+
+            MetadatumStateAction::Set(value) => {
+                let current = Self { value, dirty: true };
+                current.into()
+            }
+        }
+    }
+}
+
+// *****************
+// *** component ***
+// *****************
+
+#[derive(Properties, PartialEq)]
+pub struct MetadatumBulkValueEditorProps {
+    #[prop_or_default]
+    pub class: Classes,
+
+    #[prop_or_default]
+    pub value: Vec<JsValue>,
+
+    #[prop_or_default]
+    pub onchange: Callback<JsValue>,
+
+    #[prop_or_default]
+    pub onerror: Callback<String>,
+}
+
+#[function_component(MetadatumBulkValueEditor)]
+pub fn metadatum_bulk_value_editor(props: &MetadatumBulkValueEditorProps) -> Html {
+    assert!(props.value.len() > 0, "at least one value must be assigned");
+
+    // NOTE `value` are set to default values if they can not be
+    // interpreted correctly. It may be better to return an error instead,
+    // although this situation should likely never arise due to their types.
+    let state = use_reducer(|| MetadatumState::new(&props.value));
+    let kind_ref = use_node_ref();
+    let value_ref = use_node_ref();
+
+    {
+        // update states if prop value changes
+        let state = state.clone();
+        use_effect_with(props.value.clone(), move |value| {
+            state.dispatch(MetadatumStateAction::New(value.clone()));
+        });
+    }
+
+    {
+        let state = state.clone();
+        let value_ref = value_ref.clone();
+
+        use_effect_with((state, value_ref), move |(state, value_ref)| {
+            if state.kind() != Some(MetadatumType::Bool) {
+                return;
+            }
+        
+            match state.value() {
+                &BulkValue::EqualValue(_) => {}
+                _ => {
+                    let input = value_ref
+                        .cast::<web_sys::HtmlInputElement>()
+                        .expect("could not cast node ref to input element");
+        
+                    input.set_indeterminate(true);
+                }
+            };
+        });
+    }
+
+    {
+        // emit changes
+        let onchange = props.onchange.clone();
+        let state = state.clone();
+        use_effect_with(state, move |state| {
+            if let BulkValue::EqualValue(value) = state.value() {
+                onchange.emit(value.clone());
+            }
+        });
+    }
+
+    let onchange_kind = {
+        let state = state.clone();
+        let kind_ref = kind_ref.clone();
+        let onerror = props.onerror.clone();
+
+        Callback::from(move |_: Event| {
+            // get kind
+            let kind_val = kind_ref
+                .cast::<web_sys::HtmlSelectElement>()
+                .expect("could not cast kind node ref into select");
+
+            let Some(kind_val) = type_from_string(&kind_val.value()) else {
+                // @unreachble
+                onerror.emit("Invalid data type".to_string());
+                return;
+            };
+
+            state.dispatch(MetadatumStateAction::Set(BulkValue::EqualValue(
+                common::convert_value(JsValue::Null, &kind_val),
+            )));
+        })
+    };
+
+    let onchange_value = {
+        let state = state.clone();
+        let value_ref = value_ref.clone();
+        let onerror = props.onerror.clone();
+
+        Callback::from(move |_: Event| {
+            if let Ok(val) = common::value_from_input(
+                value_ref.clone(),
+                &state.kind().expect("invalid metadatum type"),
+            ) {
+                state.dispatch(MetadatumStateAction::Set(BulkValue::EqualValue(val)));
+            } else {
+                // invalid input for type
+                onerror.emit("Invalid value".to_string());
+            };
+        })
+    };
+
+    // create <options> for `kind` <select>
+    let kind_opts = [
+        MetadatumType::String,
+        MetadatumType::Number,
+        MetadatumType::Bool,
+        MetadatumType::Array,
+        MetadatumType::Object,
+    ];
+
+    let kind = match state.value().clone() {
+        BulkValue::MixedType => None,
+        BulkValue::MixedValue(kind) => Some(kind),
+        BulkValue::EqualValue(value) => type_of_value(&value),
+    };
+
+    let kind_opts = html! {
+        <>
+        if kind.is_none() {
+            <option selected={true} disabled={true}>{ "(mixed)" }</option>
+        }
+
+        { kind_opts.into_iter().map(|k| { html! {
+                <option
+                    value={k.clone()}
+                    selected={Some(k.clone()) == kind}>
+
+                    { Into::<String>::into(k) }
+                </option>
+            }}).collect::<Html>()
+        }
+        </>
+    };
+
+    // ui
+    let class = classes!("thot-ui-metadatum-value-editor", props.class.clone());
+
+    html! {
+        <span {class}>
+            <select ref={kind_ref} onchange={onchange_kind.clone()}>
+                { kind_opts }
+            </select>
+
+            if let BulkValue::MixedValue(kind) = state.value() {
+                { match kind {
+                    MetadatumType::String => html! {
+                        <input
+                            ref={value_ref.clone()}
+                            value={""}
+                            {PLACEHOLDER}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    MetadatumType::Number => html! {
+                        <input
+                            ref={value_ref.clone()}
+                            type={"number"}
+                            {PLACEHOLDER}
+                            value={""}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    MetadatumType::Bool => html! {
+                        <input
+                            ref={value_ref.clone()}
+                            type={"checkbox"}
+                            checked={true}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    MetadatumType::Array => html! {
+                        <textarea
+                            ref={value_ref.clone()}
+                            {PLACEHOLDER}
+                            value={""}
+                            onchange={onchange_value.clone()}>
+                        </textarea>
+                    },
+
+                    MetadatumType::Object => html! {
+                        <textarea
+                            ref={value_ref.clone()}
+                            {PLACEHOLDER}
+                            value={""}
+                            onchange={onchange_value.clone()}>
+                        </textarea>
+                    },
+                }}
+            }
+
+            if let BulkValue::EqualValue(value) = state.value() {
+                { match value {
+                    JsValue::String(value) => html! {
+                        <input
+                            ref={value_ref}
+                            value={value.clone()}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    JsValue::Number(value) => html! {
+                        <input
+                            ref={value_ref}
+                            type={"number"}
+                            value={value.to_string()}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    JsValue::Bool(value) => html! {
+                        <input
+                            ref={value_ref}
+                            type={"checkbox"}
+                            checked={value.clone()}
+                            onchange={onchange_value.clone()} />
+                    },
+
+                    JsValue::Array(value) => html! {
+                        <textarea
+                            ref={value_ref}
+                            value={serde_json::to_string_pretty(&value).unwrap_or(String::default())}
+                            onchange={onchange_value.clone()}>
+                        </textarea>
+                    },
+
+                    JsValue::Object(value) => html! {
+                        <textarea
+                            ref={value_ref}
+                            value={serde_json::to_string_pretty(&value).unwrap_or(String::default())}
+                            onchange={onchange_value.clone()}>
+                        </textarea>
+                    },
+
+                    JsValue::Null => html! {}
+                }}
+            }
+        </span>
+    }
+}
diff --git a/ui/src/widgets/metadata/metadatum_editor.rs b/ui/src/widgets/metadata/metadatum_editor.rs
index 8b510b0c..dca71837 100644
--- a/ui/src/widgets/metadata/metadatum_editor.rs
+++ b/ui/src/widgets/metadata/metadatum_editor.rs
@@ -3,7 +3,7 @@ use super::MetadatumValueEditor;
 use serde_json::Value as JsValue;
 use yew::prelude::*;
 
-#[derive(Properties, PartialEq)]
+#[derive(Properties, PartialEq, Debug)]
 pub struct MetadatumEditorProps {
     pub name: String,
 
@@ -14,14 +14,14 @@ pub struct MetadatumEditorProps {
     pub onchange: Callback<JsValue>,
 }
 
+#[tracing::instrument]
 #[function_component(MetadatumEditor)]
 pub fn metadatum_editor(props: &MetadatumEditorProps) -> Html {
     let error = use_state(|| None);
     let onerror = {
         let error = error.clone();
-
         Callback::from(move |message: String| {
-            error.set(Some(message));
+            error.set(message.into());
         })
     };
 
@@ -37,16 +37,19 @@ pub fn metadatum_editor(props: &MetadatumEditorProps) -> Html {
 
     // ui
     html! {
-        <div class={classes!("metadatum")}>
-            <span class={classes!("metadatum-key")}>
-                { &props.name }
-            </span>
-
-            <MetadatumValueEditor
-                class={classes!("metadatum-value")}
-                value={props.value.clone()}
-                {onchange}
-                {onerror} />
+        <div class={classes!("thot-ui-metadatum")}>
+            <div class={classes!("metadatum-fields")}>
+                <span class={classes!("metadatum-key")}
+                    title={props.name.clone()}>
+                    { &props.name }
+                </span>
+
+                <MetadatumValueEditor
+                    class={classes!("metadatum-value")}
+                    value={props.value.clone()}
+                    {onchange}
+                    {onerror} />
+            </div>
 
             if let Some(msg) = error.as_ref() {
                 <span class={classes!("error")}>{ msg }</span>
@@ -54,7 +57,3 @@ pub fn metadatum_editor(props: &MetadatumEditorProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./metadatum_editor_test.rs"]
-mod metadatum_editor_test;
diff --git a/ui/src/widgets/metadata/metadatum_editor_test.rs b/ui/src/widgets/metadata/metadatum_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/metadatum_value_editor.rs b/ui/src/widgets/metadata/metadatum_value_editor.rs
index 261dda3c..486927c1 100644
--- a/ui/src/widgets/metadata/metadatum_value_editor.rs
+++ b/ui/src/widgets/metadata/metadatum_value_editor.rs
@@ -1,9 +1,10 @@
 //! Editor for a `Metadatum` value.
+use super::common;
 use super::{type_from_string, type_of_value, MetadatumType};
-use serde_json::{Result as JsResult, Value as JsValue};
+use serde_json::Value as JsValue;
 use yew::prelude::*;
 
-#[derive(Properties, PartialEq)]
+#[derive(Properties, PartialEq, Debug)]
 pub struct MetadatumValueEditorProps {
     #[prop_or_default]
     pub class: Classes,
@@ -18,25 +19,33 @@ pub struct MetadatumValueEditorProps {
     pub onerror: Callback<String>,
 }
 
+#[tracing::instrument]
 #[function_component(MetadatumValueEditor)]
 pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
-    // @note: `value` are set to default values if they can not be
+    // NOTE `value` are set to default values if they can not be
     // interpreted correctly. It may be better to return an error instead,
     // although this situation should likely never arise due to their types.
     let value = use_state(|| props.value.clone());
+    let value_str = use_state(|| {
+        serde_json::to_string_pretty(&props.value).expect("could not stringify value")
+    });
+    let number_step = use_state(|| match value_str.split_once('.') {
+        None => 1_f64,
+        Some((_, decs)) => 10_f64.powi(-(decs.len() as i32)),
+    });
     let kind_ref = use_node_ref();
     let value_ref = use_node_ref();
 
     {
         // update states if prop value changes
         let value = value.clone();
+        let value_str = value_str.clone();
 
-        use_effect_with_deps(
-            move |val| {
-                value.set(val.clone());
-            },
-            props.value.clone(),
-        );
+        use_effect_with(props.value.clone(), move |val| {
+            let val_str = serde_json::to_string_pretty(val).expect("could not stringify value");
+            value_str.set(val_str);
+            value.set(val.clone());
+        });
     }
 
     {
@@ -44,14 +53,39 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
         let onchange = props.onchange.clone();
         let value = value.clone();
 
-        use_effect_with_deps(
-            move |value| {
-                onchange.emit((**value).clone());
-            },
-            value,
-        );
+        use_effect_with(value, move |value| {
+            onchange.emit((**value).clone());
+        });
     }
 
+    {
+        let value_str = value_str.clone();
+        let number_step = number_step.clone();
+
+        use_effect_with(value_str, move |value_str| {
+            let step = match value_str.split_once('.') {
+                None => 1_f64,
+                Some((_, decs)) => 10_f64.powi(-(decs.len() as i32)),
+            };
+        
+            number_step.set(step);
+        });
+    }
+
+    let oninput_number = {
+        let value_str = value_str.clone();
+        let value_ref = value_ref.clone();
+
+        Callback::from(move |_: InputEvent| {
+            let v_in = value_ref
+                .cast::<web_sys::HtmlInputElement>()
+                .expect("could not convert value node ref into input");
+
+            let val_str = v_in.value().trim().to_owned();
+            value_str.set(val_str);
+        })
+    };
+
     let onchange_kind = {
         let value = value.clone();
         let kind_ref = kind_ref.clone();
@@ -69,7 +103,7 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
                 return;
             };
 
-            value.set(convert_value((*value).clone(), &kind_val));
+            value.set(common::convert_value((*value).clone(), &kind_val));
         })
     };
 
@@ -85,8 +119,13 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
             };
 
             // get value
-            if let Ok(val) = value_from_input(value_ref.clone(), &kind) {
-                value.set(convert_value(val, &kind));
+            if let Ok(val) = common::value_from_input(value_ref.clone(), &kind) {
+                if kind == MetadatumType::Number && val == JsValue::Null {
+                    onerror.emit("Invalid number".to_string());
+                    return;
+                }
+
+                value.set(common::convert_value(val, &kind));
             } else {
                 // invalid input for type
                 onerror.emit("Invalid value".to_string());
@@ -118,7 +157,6 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
 
     // ui
     let class = classes!("thot-ui-metadatum-value-editor", props.class.clone());
-
     html! {
         <span {class}>
             <select ref={kind_ref} onchange={onchange_kind.clone()}>
@@ -130,15 +168,17 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
                     <input
                         ref={value_ref}
                         {value}
-                        placeholder="Value"
+                        placeholder={"Value"}
                         onchange={onchange_value.clone()} />
                 },
 
-                JsValue::Number(value) => html! {
+                JsValue::Number(_value) => html! {
                     <input
                         ref={value_ref}
                         type={"number"}
-                        value={value.to_string()}
+                        step={number_step.to_string()}
+                        value={(*value_str).clone()}
+                        oninput={oninput_number}
                         onchange={onchange_value.clone()} />
                 },
 
@@ -171,118 +211,3 @@ pub fn metadatum_value_editor(props: &MetadatumValueEditorProps) -> Html {
         </span>
     }
 }
-
-// ***************
-// *** helpers ***
-// ***************
-
-fn value_from_input(value_ref: NodeRef, kind: &MetadatumType) -> JsResult<JsValue> {
-    let value = match kind {
-        MetadatumType::String => {
-            let v_in = value_ref
-                .cast::<web_sys::HtmlInputElement>()
-                .expect("could not convert value node ref into input");
-
-            let val = v_in.value().trim().to_owned();
-            match val.is_empty() {
-                true => JsValue::Null,
-                false => JsValue::String(val),
-            }
-        }
-        MetadatumType::Number => {
-            let v_in = value_ref
-                .cast::<web_sys::HtmlInputElement>()
-                .expect("could not convert value node ref into input");
-
-            let val = v_in.value_as_number();
-            match val.is_nan() {
-                true => JsValue::Null,
-                false => JsValue::from(val),
-            }
-        }
-        MetadatumType::Bool => {
-            let v_in = value_ref
-                .cast::<web_sys::HtmlInputElement>()
-                .expect("could not convert value node ref into input");
-
-            JsValue::Bool(v_in.checked())
-        }
-        MetadatumType::Array => {
-            let v_in = value_ref
-                .cast::<web_sys::HtmlTextAreaElement>()
-                .expect("could not cast value node ref as textarea");
-
-            let val = v_in.value().trim().to_owned();
-            match val.is_empty() {
-                true => JsValue::Null,
-                false => serde_json::from_str(&val)?,
-            }
-        }
-        MetadatumType::Object => {
-            let v_in = value_ref
-                .cast::<web_sys::HtmlTextAreaElement>()
-                .expect("could not cast value node ref as textarea");
-
-            let val = v_in.value().trim().to_owned();
-            match val.is_empty() {
-                true => JsValue::Null,
-                false => serde_json::from_str(&val)?,
-            }
-        }
-    };
-
-    Ok(value)
-}
-
-fn convert_value(value: JsValue, target: &MetadatumType) -> JsValue {
-    match (value.clone(), target.clone()) {
-        (JsValue::String(_), MetadatumType::String)
-        | (JsValue::Number(_), MetadatumType::Number)
-        | (JsValue::Bool(_), MetadatumType::Bool)
-        | (JsValue::Array(_), MetadatumType::Array)
-        | (JsValue::Object(_), MetadatumType::Object) => value,
-
-        (JsValue::String(value), MetadatumType::Number) => {
-            let value = value.parse::<u64>().unwrap_or(0);
-            value.into()
-        }
-
-        (JsValue::Number(value), MetadatumType::String) => value.to_string().into(),
-
-        (JsValue::Array(value), MetadatumType::String) => serde_json::to_string_pretty(&value)
-            .unwrap_or(String::default())
-            .into(),
-
-        (JsValue::Object(value), MetadatumType::String) => serde_json::to_string_pretty(&value)
-            .unwrap_or(String::default())
-            .into(),
-
-        (JsValue::String(value), MetadatumType::Array) => {
-            let value = serde_json::to_value(value).unwrap_or_default();
-            if value.is_array() {
-                value
-            } else {
-                JsValue::Array(Vec::default())
-            }
-        }
-
-        (JsValue::String(value), MetadatumType::Object) => {
-            let value = serde_json::to_value(value).unwrap_or_default();
-            if value.is_object() {
-                value
-            } else {
-                JsValue::Object(serde_json::Map::default())
-            }
-        }
-
-        (_, MetadatumType::String) => JsValue::String(String::default()),
-        (_, MetadatumType::Number) => JsValue::Number(0.into()),
-        (_, MetadatumType::Bool) => JsValue::Bool(false),
-        (_, MetadatumType::Array) => JsValue::Array(Vec::default()),
-        (_, MetadatumType::Object) => JsValue::Object(serde_json::Map::default()),
-    }
-}
-
-#[cfg(test)]
-#[path = "./metadatum_value_editor_test.rs"]
-mod metadatum_value_editor_test;
diff --git a/ui/src/widgets/metadata/metadatum_value_editor_test.rs b/ui/src/widgets/metadata/metadatum_value_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/mod.rs b/ui/src/widgets/metadata/mod.rs
index 0118bd41..7780f867 100644
--- a/ui/src/widgets/metadata/mod.rs
+++ b/ui/src/widgets/metadata/mod.rs
@@ -1,19 +1,22 @@
 //! Metadata widgets.
+pub mod common;
+pub mod metadata_bulk_editor;
 pub mod metadata_editor;
 pub mod metadata_preview;
 pub mod metadatum_builder;
+pub mod metadatum_bulk_editor;
+pub mod metadatum_bulk_value_editor;
 pub mod metadatum_editor;
 pub mod metadatum_value_editor;
 pub mod types;
 
 // Re-exports
+pub use metadata_bulk_editor::MetadataBulkEditor;
 pub use metadata_editor::MetadataEditor;
 pub use metadata_preview::MetadataPreview;
 pub use metadatum_builder::MetadatumBuilder;
+pub use metadatum_bulk_editor::MetadatumBulkEditor;
+pub use metadatum_bulk_value_editor::MetadatumBulkValueEditor;
 pub use metadatum_editor::MetadatumEditor;
 pub use metadatum_value_editor::MetadatumValueEditor;
-pub use types::{type_from_string, type_of_value, Metadatum, MetadatumType};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
+pub use types::{type_from_string, type_of_value, MetadataBulk, Metadatum, MetadatumType};
diff --git a/ui/src/widgets/metadata/mod_test.rs b/ui/src/widgets/metadata/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/metadata/types.rs b/ui/src/widgets/metadata/types.rs
index fb7a962d..989f8f28 100644
--- a/ui/src/widgets/metadata/types.rs
+++ b/ui/src/widgets/metadata/types.rs
@@ -1,9 +1,11 @@
 //! Common types for metadata.
 use serde_json::Value as JsValue;
+use std::collections::HashMap;
 use yew::html::IntoPropValue;
 use yew::virtual_dom::AttrValue;
 
 pub type Metadatum = (String, JsValue);
+pub type MetadataBulk = HashMap<String, Vec<JsValue>>;
 
 /// Types a metadatum value can assume.
 #[derive(PartialEq, Clone, Debug)]
@@ -68,7 +70,3 @@ pub fn type_of_value(value: &JsValue) -> Option<MetadatumType> {
         JsValue::Object(_) => Some(MetadatumType::Object),
     }
 }
-
-#[cfg(test)]
-#[path = "./types_test.rs"]
-mod types_test;
diff --git a/ui/src/widgets/metadata/types_test.rs b/ui/src/widgets/metadata/types_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/mod.rs b/ui/src/widgets/mod.rs
index 82d54e0b..f1f6fc08 100644
--- a/ui/src/widgets/mod.rs
+++ b/ui/src/widgets/mod.rs
@@ -1,19 +1,14 @@
 //! UI Widgets
 pub mod asset;
+pub mod bulk_editor;
+pub mod common;
 pub mod container;
 pub mod metadata;
 pub mod project;
 pub mod script;
-pub mod standard_properties_editor;
 pub mod suspense;
 pub mod tags;
-pub mod batch_editor;
 
 // Re-exports
 pub use metadata::MetadataEditor;
-pub use standard_properties_editor::StandardPropertiesEditor;
 pub use tags::{Tags, TagsEditor};
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/mod_test.rs b/ui/src/widgets/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/project/mod.rs b/ui/src/widgets/project/mod.rs
index 4cd40378..954759a3 100644
--- a/ui/src/widgets/project/mod.rs
+++ b/ui/src/widgets/project/mod.rs
@@ -1,12 +1,7 @@
 //! Project related UI widgets.
 pub mod project_card;
 pub mod project_deck;
-pub mod project_properties;
 
 // Reexports
 pub use project_card::ProjectCard;
 pub use project_deck::ProjectDeck;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/project/mod_test.rs b/ui/src/widgets/project/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/project/project_card.rs b/ui/src/widgets/project/project_card.rs
index 9777553f..b4c0be83 100644
--- a/ui/src/widgets/project/project_card.rs
+++ b/ui/src/widgets/project/project_card.rs
@@ -20,7 +20,3 @@ pub fn project_card(props: &ProjectCardProps) -> Html {
         <Card<Project> item={props.item.clone()} onclick={&props.onclick} />
     }
 }
-
-#[cfg(test)]
-#[path = "./project_card_test.rs"]
-mod project_card_test;
diff --git a/ui/src/widgets/project/project_card_test.rs b/ui/src/widgets/project/project_card_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/project/project_deck.rs b/ui/src/widgets/project/project_deck.rs
index a0ef003f..3ca33d66 100644
--- a/ui/src/widgets/project/project_deck.rs
+++ b/ui/src/widgets/project/project_deck.rs
@@ -11,7 +11,3 @@ impl ToKey for Project {
         self.rid.clone().into()
     }
 }
-
-#[cfg(test)]
-#[path = "./project_deck_test.rs"]
-mod project_deck_test;
diff --git a/ui/src/widgets/project/project_deck_test.rs b/ui/src/widgets/project/project_deck_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/project/project_properties.rs b/ui/src/widgets/project/project_properties.rs
deleted file mode 100644
index 3975acb1..00000000
--- a/ui/src/widgets/project/project_properties.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Project properties.
-
-#[cfg(test)]
-#[path = "./project_properties_test.rs"]
-mod project_properties_test;
diff --git a/ui/src/widgets/project/project_properties_test.rs b/ui/src/widgets/project/project_properties_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/script/create_script.rs b/ui/src/widgets/script/create_script.rs
index da156fea..7a684c1f 100644
--- a/ui/src/widgets/script/create_script.rs
+++ b/ui/src/widgets/script/create_script.rs
@@ -26,8 +26,8 @@ pub fn create_script(props: &CreateScriptProps) -> Html {
             spawn_local(async move {
                 let mut path = FileDialogBuilder::new();
                 path.set_title("Script files")
-                    .add_filter("Scripts", &["py", "R"]); // @todo: Pull valid extensions from `Script`.
-                                                          // @todo: Set default path.
+                    .add_filter("Scripts", &["py", "R", "r"]); // @todo: Pull valid extensions from `Script`.
+                                                               // @todo: Set default path.
 
                 let paths = path
                     .pick_files()
@@ -46,7 +46,3 @@ pub fn create_script(props: &CreateScriptProps) -> Html {
         <button {onclick}>{ &props.text }</button>
     }
 }
-
-#[cfg(test)]
-#[path = "./create_script_test.rs"]
-mod create_script_test;
diff --git a/ui/src/widgets/script/create_script_test.rs b/ui/src/widgets/script/create_script_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/script/mod.rs b/ui/src/widgets/script/mod.rs
index 6c9f4f87..fd1a9872 100644
--- a/ui/src/widgets/script/mod.rs
+++ b/ui/src/widgets/script/mod.rs
@@ -3,7 +3,3 @@ pub mod create_script;
 
 // Re-exports
 pub use create_script::CreateScript;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/script/mod_test.rs b/ui/src/widgets/script/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/standard_properties_editor_test.rs b/ui/src/widgets/standard_properties_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/suspense/fallback_loading.rs b/ui/src/widgets/suspense/fallback_loading.rs
index b5d0a372..f7651f7e 100644
--- a/ui/src/widgets/suspense/fallback_loading.rs
+++ b/ui/src/widgets/suspense/fallback_loading.rs
@@ -21,7 +21,3 @@ pub fn loading(props: &LoadingProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./fallback_loading_test.rs"]
-mod fallback_loading_test;
diff --git a/ui/src/widgets/suspense/fallback_loading_test.rs b/ui/src/widgets/suspense/fallback_loading_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/suspense/mod.rs b/ui/src/widgets/suspense/mod.rs
index 2c1cce35..2e1eb5b7 100644
--- a/ui/src/widgets/suspense/mod.rs
+++ b/ui/src/widgets/suspense/mod.rs
@@ -3,7 +3,3 @@ pub mod fallback_loading;
 
 // Re-exports
 pub use fallback_loading::Loading;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/suspense/mod_test.rs b/ui/src/widgets/suspense/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/tags/mod.rs b/ui/src/widgets/tags/mod.rs
index 746280e5..2025d4b4 100644
--- a/ui/src/widgets/tags/mod.rs
+++ b/ui/src/widgets/tags/mod.rs
@@ -1,11 +1,7 @@
 //! Tag widgets.
-pub mod tags_editor;
 pub mod tags;
+pub mod tags_editor;
 
 // Re-exports
 pub use tags::Tags;
 pub use tags_editor::TagsEditor;
-
-#[cfg(test)]
-#[path = "./mod_test.rs"]
-mod mod_test;
diff --git a/ui/src/widgets/tags/mod_test.rs b/ui/src/widgets/tags/mod_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/tags/tags.rs b/ui/src/widgets/tags/tags.rs
index ce55867d..63b2281a 100644
--- a/ui/src/widgets/tags/tags.rs
+++ b/ui/src/widgets/tags/tags.rs
@@ -20,7 +20,3 @@ pub fn tags_editor(props: &TagsProps) -> Html {
         </div>
     }
 }
-
-#[cfg(test)]
-#[path = "./tags_test.rs"]
-mod tags_test;
diff --git a/ui/src/widgets/tags/tags_editor.rs b/ui/src/widgets/tags/tags_editor.rs
index f6208f2d..aeefe927 100644
--- a/ui/src/widgets/tags/tags_editor.rs
+++ b/ui/src/widgets/tags/tags_editor.rs
@@ -51,7 +51,3 @@ pub fn tags_editor(props: &TagsEditorProps) -> Html {
             {onchange} />
     }
 }
-
-#[cfg(test)]
-#[path = "./tags_editor_test.rs"]
-mod tags_editor_test;
diff --git a/ui/src/widgets/tags/tags_editor_test.rs b/ui/src/widgets/tags/tags_editor_test.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/src/widgets/tags/tags_test.rs b/ui/src/widgets/tags/tags_test.rs
deleted file mode 100644
index e69de29b..00000000