diff --git a/.dist/lwatch.fish b/.dist/lwatch.fish
new file mode 100755
index 0000000..c71a0bc
--- /dev/null
+++ b/.dist/lwatch.fish
@@ -0,0 +1,13 @@
+#!/usr/bin/env fish
+
+set DIRECTORY_TO_WATCH "./"
+set SCRIPT_TO_RUN "leptosfmt ./ && rustywind --write ./"
+
+while true
+    # Wait for any change in the directory
+    inotifywait -e modify,create,delete,move $DIRECTORY_TO_WATCH
+
+    # Run your script
+    bash -c "$SCRIPT_TO_RUN"
+    sleep 5
+end
diff --git a/llama_forge_rs/.forgejo/workflows/cargo.yml b/.forgejo/workflows/cargo.yml
similarity index 100%
rename from llama_forge_rs/.forgejo/workflows/cargo.yml
rename to .forgejo/workflows/cargo.yml
diff --git a/llama_forge_rs/.forgejo/workflows/demo.yaml b/.forgejo/workflows/demo.yaml
similarity index 89%
rename from llama_forge_rs/.forgejo/workflows/demo.yaml
rename to .forgejo/workflows/demo.yaml
index 17a7fee..95d438e 100644
--- a/llama_forge_rs/.forgejo/workflows/demo.yaml
+++ b/.forgejo/workflows/demo.yaml
@@ -9,6 +9,9 @@ jobs:
       - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
       - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Forgejo!"
       - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - run: echo PATH: $PATH
+      - run: ls $PATH
+      - run: echo =====================================================
       - name: Check out repository code
         uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
       - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
diff --git a/llama_forge_rs/.forgejo/workflows/publish_docker.yml b/.forgejo/workflows/publish_docker.yml
similarity index 100%
rename from llama_forge_rs/.forgejo/workflows/publish_docker.yml
rename to .forgejo/workflows/publish_docker.yml
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 0000000..ed5f760
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,91 @@
+[config]
+load_cargo_aliases = false
+
+[env]
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
+# leptos repos
+LEPTOS_REPOS = "llama_forge_rs"
+#
+# DB_REPOS
+
+[tasks.default]
+alias = "all"
+
+[tasks.test123]
+script = "echo test123-${CARGO_MAKE_CRATE_CURRENT_WORKSPACE_MEMBER}"
+
+[tasks.refresh-all]
+description = "clean the repo and rebuild everything"
+dependencies = ["clean", "all", "lall"]
+
+[tasks.mksitedir]
+workspace = false
+script = "mkdir -p ./target/site"
+
+[tasks.all]
+description = "rebuild everything"
+dependencies = ["mksitedir", "docset", "check", "clippy", "build", "build-release", "format",  "lformat", "lbuild", "lbuild-release"]
+
+[tasks.lformat]
+scripts = "leptosfmt . && rustywind . --write"
+
+[tasks.lbuild]
+category = "Build"
+script = '''
+#!/usr/bin/env fish
+set current "$CARGO_MAKE_CRATE_CURRENT_WORKSPACE_MEMBER"
+if contains "$LEPTOS_REPOS" $current
+  cargo leptos build
+else
+  $current is not a leptos repo!
+end
+'''
+
+[tasks.lbuild-release]
+category = "Build"
+command = "cargo"
+args = ["leptos", "build", "--release"]
+
+[tasks.lserve]
+command = "cargo"
+args = ["leptos", "serve"]
+
+[tasks.lwatch]
+command = "cargo"
+args = ["leptos", "watch", "--hot-reload"]
+
+[tasks.docset]
+workspace = false
+script = '''
+cargo docset --workspace --platform-family redvault-ai \
+  && cp -r target/docset/redvault-ai.docset ~/.local/share/Zeal/Zeal/docsets/
+'''
+
+[tasks.watch-test]
+command = "cargo"
+args = [
+  "watch",
+  "--",
+  "cargo",
+  "ltest",
+  "--target-dir",
+  "target/test",
+  "--all-features",
+]
+
+[tasks.watch-check]
+command = "cargo"
+args = ["watch", "--", "cargo", "lcheck", "--all-features"]
+
+[tasks.lwatch-fmt]
+command = "fish"
+args = ["./.dist/watch.fish"]
+
+[tasks.reset-db]
+# env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = ["vewa_xls_export"] }
+script = '''
+DB_FILE=${CARGO_MAKE_CRATE_CURRENT_WORKSPACE_MEMBER}.sqlite3
+rm ../$DB_FILE \
+  && touch ../$DB_FILE \
+  && cargo sqlx migrate run --database-url="sqlite:../$DB_FILE"
+'''
diff --git a/llama_forge_rs/.dist/watch.fish b/llama_forge_rs/.dist/watch.fish
deleted file mode 100755
index 9f1cb00..0000000
--- a/llama_forge_rs/.dist/watch.fish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env fish
-
-echo "watchPWD: $(pwd)"
-
-set DIRECTORY_TO_WATCH "./src"
-set SCRIPT_TO_RUN "echo a && leptosfmt $(pwd) && rustywind --write ./src && echo b"
-
-while true
-    # Wait for any change in the directory
-    inotifywait -r -e modify,create,delete,move $DIRECTORY_TO_WATCH
-
-    # Run your script
-    bash -c "$SCRIPT_TO_RUN"
-    sleep 5
-end
diff --git a/llama_forge_rs/.nix/cargo-leptos.nix b/llama_forge_rs/.nix/cargo-leptos.nix
deleted file mode 100644
index c9fa95b..0000000
--- a/llama_forge_rs/.nix/cargo-leptos.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  pkg-config,
-  rustPlatform,
-  stdenv,
-}: let
-  inherit (lib) optionals;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "cargo-leptos";
-    version = "0.2.16";
-
-    src = fetchFromGitHub {
-      owner = "leptos-rs";
-      repo = pname;
-      rev = "v0.2.16";
-      hash = "sha256-yDBVo3GarKvcuMX7mxdxx0SJSJ5VOX3bUx6XmYxLfq4=";
-    };
-
-    cargoHash = "sha256-DZbZ3SHGWvje0gEqlx2mdLvCR4U3Xzkp8gS9FIbxW6g=";
-
-    # https://github.com/leptos-rs/cargo-leptos#dependencies
-    buildFeatures = ["no_downloads"]; # cargo-leptos will try to install missing dependencies on its own otherwise
-    doCheck = false; # Check phase tries to query crates.io
-
-    meta = with lib; {
-      description = "A build tool for the Leptos web framework";
-      homepage = "https://github.com/leptos-rs/cargo-leptos";
-      changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/${version}";
-      license = with licenses; [mit];
-      maintainers = with maintainers; [benwis];
-    };
-  }