feat: postgres

2025-07-03 16:46:47 -04:00
81 changed files with 461 additions and 4092 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 target
 private_repos
 log/
 *.tgz
 .gitignore
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -219,15 +219,6 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "atomic"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
 dependencies = [
 "bytemuck",
 ]
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -418,12 +409,6 @@ version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -1358,7 +1343,6 @@ dependencies = [
 "cidr",
 "env_logger",
 "harmony",
 "harmony_cli",
 "harmony_macros",
 "harmony_tui",
 "harmony_types",
@@ -1367,11 +1351,20 @@ dependencies = [
 "url",
 ]
 [[package]]
 name = "example-postgres"
 version = "0.1.0"
 dependencies = [
 "async-trait",
 "harmony",
 "serde",
 "tokio",
 ]
 [[package]]
 name = "example-rust"
 version = "0.1.0"
 dependencies = [
 "base64 0.22.1",
 "env_logger",
 "harmony",
 "harmony_cli",
@@ -1444,31 +1437,6 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 [[package]]
 name = "figment"
 version = "0.10.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
 dependencies = [
 "atomic",
 "pear",
 "serde",
 "uncased",
 "version_check",
 ]
 [[package]]
 name = "filetime"
 version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
 "cfg-if",
 "libc",
 "libredox",
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "flate2"
 version = "1.1.2"
@@ -1768,8 +1736,6 @@ name = "harmony"
 version = "0.1.0"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
 "bollard",
 "chrono",
 "cidr",
 "convert_case",
@@ -1779,7 +1745,6 @@ dependencies = [
 "dyn-clone",
 "email_address",
 "env_logger",
 "figment",
 "fqdn",
 "futures-util",
 "harmony_macros",
@@ -1797,7 +1762,6 @@ dependencies = [
 "non-blank-string-rs",
 "opnsense-config",
 "opnsense-config-xml",
 "pretty_assertions",
 "rand 0.9.1",
 "reqwest 0.11.27",
 "russh",
@@ -1806,14 +1770,11 @@ dependencies = [
 "serde",
 "serde-value",
 "serde_json",
 "serde_with",
 "serde_yaml",
 "similar",
 "strum 0.27.1",
 "tar",
 "temp-dir",
 "temp-file",
 "tempfile",
 "tokio",
 "tokio-util",
 "url",
@@ -2445,12 +2406,6 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 [[package]]
 name = "inlinable_string"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 [[package]]
 name = "inout"
 version = "0.1.4"
@@ -2780,7 +2735,6 @@ checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
 "bitflags 2.9.1",
 "libc",
 "redox_syscall",
 ]
 [[package]]
@@ -3272,29 +3226,6 @@ dependencies = [
 "hmac",
 ]
 [[package]]
 name = "pear"
 version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467"
 dependencies = [
 "inlinable_string",
 "pear_codegen",
 "yansi",
 ]
 [[package]]
 name = "pear_codegen"
 version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147"
 dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
 "syn",
 ]
 [[package]]
 name = "pem"
 version = "3.0.5"
@@ -3557,19 +3488,6 @@ dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "proc-macro2-diagnostics"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 "version_check",
 "yansi",
 ]
 [[package]]
 name = "punycode"
 version = "0.4.1"
@@ -4171,18 +4089,6 @@ dependencies = [
 "serde_json",
 ]
 [[package]]
 name = "schemars"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1375ba8ef45a6f15d83fa8748f1079428295d403d6ea991d09ab100155fbc06d"
 dependencies = [
 "dyn-clone",
 "ref-cast",
 "serde",
 "serde_json",
 ]
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -4383,36 +4289,22 @@ dependencies = [
 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42"
 dependencies = [
 "base64 0.22.1",
 "chrono",
 "hex",
 "indexmap 1.9.3",
 "indexmap 2.10.0",
- "schemars 0.9.0",
+ "schemars",
 "schemars 1.0.3",
 "serde",
 "serde_derive",
 "serde_json",
 "serde_with_macros",
 "time",
 ]
 [[package]]
 name = "serde_with_macros"
 version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
 "darling",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
@@ -4785,17 +4677,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 [[package]]
 name = "tar"
 version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
 dependencies = [
 "filetime",
 "libc",
 "xattr",
 ]
 [[package]]
 name = "temp-dir"
 version = "0.1.16"
@@ -4936,6 +4817,7 @@ dependencies = [
 "bytes",
 "libc",
 "mio 1.0.4",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2",
@@ -5212,15 +5094,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 [[package]]
 name = "uncased"
 version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
 dependencies = [
 "version_check",
 ]
 [[package]]
 name = "unicode-ident"
 version = "1.0.18"
@@ -5850,16 +5723,6 @@ dependencies = [
 "tap",
 ]
 [[package]]
 name = "xattr"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
 dependencies = [
 "libc",
 "rustix 1.0.7",
 ]
 [[package]]
 name = "xml-rs"
 version = "0.8.26"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,8 +52,3 @@ convert_case = "0.8"
 chrono = "0.4"
 similar = "2"
 uuid = { version = "1.11", features = ["v4", "fast-rng", "macro-diagnostics"] }
 pretty_assertions = "1.4.1"
 bollard = "0.19.1"
 base64 = "0.22.1"
 tar = "0.4.44"
 figment = { version = "0.10.19", features = ["env"] }
--- a/examples/nanodc/src/main.rs
+++ b/examples/nanodc/src/main.rs
@@ -10,7 +10,7 @@ use harmony::{
    inventory::Inventory,
    maestro::Maestro,
    modules::{
-        http::StaticFilesHttpScore,
+        http::HttpScore,
        ipxe::IpxeScore,
        okd::{
            bootstrap_dhcp::OKDBootstrapDhcpScore,
@@ -126,7 +126,7 @@ async fn main() {
        harmony::modules::okd::load_balancer::OKDLoadBalancerScore::new(&topology);
    let tftp_score = TftpScore::new(Url::LocalFolder("./data/watchguard/tftpboot".to_string()));
-    let http_score = StaticFilesHttpScore::new(Url::LocalFolder(
+    let http_score = HttpScore::new(Url::LocalFolder(
        "./data/watchguard/pxe-http-files".to_string(),
    ));
    let ipxe_score = IpxeScore::new();
--- a/examples/ntfy/src/main.rs
+++ b/examples/ntfy/src/main.rs
@@ -14,7 +14,6 @@ async fn main() {
    maestro.register_all(vec![Box::new(NtfyScore {
        namespace: "monitoring".to_string(),
        host: "localhost".to_string(),
    })]);
    harmony_cli::init(maestro, None).await.unwrap();
 }
--- a/examples/opnsense/Cargo.toml
+++ b/examples/opnsense/Cargo.toml
@@ -16,4 +16,3 @@ harmony_macros = { path = "../../harmony_macros" }
 log = { workspace = true }
 env_logger = { workspace = true }
 url = { workspace = true }
 harmony_cli = { version = "0.1.0", path = "../../harmony_cli" }
--- a/examples/opnsense/src/main.rs
+++ b/examples/opnsense/src/main.rs
@@ -11,9 +11,9 @@ use harmony::{
    maestro::Maestro,
    modules::{
        dummy::{ErrorScore, PanicScore, SuccessScore},
-        http::StaticFilesHttpScore,
+        http::HttpScore,
        okd::{dhcp::OKDDhcpScore, dns::OKDDnsScore, load_balancer::OKDLoadBalancerScore},
-        opnsense::{OPNSenseLaunchUpgrade, OPNsenseShellCommandScore},
+        opnsense::OPNsenseShellCommandScore,
        tftp::TftpScore,
    },
    topology::{LogicalHost, UnmanagedRouter, Url},
@@ -22,10 +22,8 @@ use harmony_macros::{ip, mac_address};
 #[tokio::main]
 async fn main() {
    env_logger::init();
    let firewall = harmony::topology::LogicalHost {
-        ip: ip!("192.168.122.106"),
+        ip: ip!("192.168.5.229"),
        name: String::from("opnsense-1"),
    };
@@ -83,7 +81,7 @@ async fn main() {
    let load_balancer_score = OKDLoadBalancerScore::new(&topology);
    let tftp_score = TftpScore::new(Url::LocalFolder("./data/watchguard/tftpboot".to_string()));
-    let http_score = StaticFilesHttpScore::new(Url::LocalFolder(
+    let http_score = HttpScore::new(Url::LocalFolder(
        "./data/watchguard/pxe-http-files".to_string(),
    ));
    let mut maestro = Maestro::initialize(inventory, topology).await.unwrap();
@@ -97,12 +95,9 @@ async fn main() {
            opnsense: opnsense.get_opnsense_config(),
            command: "touch /tmp/helloharmonytouching".to_string(),
        }),
        // Box::new(OPNSenseLaunchUpgrade {
        //     opnsense: opnsense.get_opnsense_config(),
        // }),
        Box::new(SuccessScore {}),
        Box::new(ErrorScore {}),
        Box::new(PanicScore {}),
    ]);
-    harmony_cli::init(maestro, None).await.unwrap();
+    harmony_tui::init(maestro).await.unwrap();
 }
--- a/examples/postgres/Cargo.toml
+++ b/examples/postgres/Cargo.toml
@@ -0,0 +1,10 @@
 [package]
 name = "example-postgres"
 version = "0.1.0"
 edition = "2021"
 [dependencies]
 harmony = { path = "../../harmony" }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 async-trait = "0.1.80"
--- a/examples/postgres/src/main.rs
+++ b/examples/postgres/src/main.rs
@@ -0,0 +1,84 @@
 use async_trait::async_trait;
 use harmony::{
    data::{PostgresDatabase, PostgresUser},
    interpret::InterpretError,
    inventory::Inventory,
    maestro::Maestro,
    modules::postgres::PostgresScore,
    topology::{PostgresServer, Topology},
 };
 use std::error::Error;
 #[derive(Debug, Clone)]
 struct MockTopology;
 #[async_trait]
 impl Topology for MockTopology {
    fn name(&self) -> &str {
        "MockTopology"
    }
    async fn ensure_ready(&self) -> Result<harmony::interpret::Outcome, InterpretError> {
        Ok(harmony::interpret::Outcome::new(
            harmony::interpret::InterpretStatus::SUCCESS,
            "Mock topology is always ready".to_string(),
        ))
    }
 }
 #[async_trait]
 impl PostgresServer for MockTopology {
    async fn ensure_users_exist(&self, users: Vec<PostgresUser>) -> Result<(), InterpretError> {
        println!("Ensuring users exist:");
        for user in users {
            println!("  - {}: {}", user.name, user.password);
        }
        Ok(())
    }
    async fn ensure_databases_exist(
        &self,
        databases: Vec<PostgresDatabase>,
    ) -> Result<(), InterpretError> {
        println!("Ensuring databases exist:");
        for db in databases {
            println!("  - {}: owner={}", db.name, db.owner);
        }
        Ok(())
    }
 }
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
    let users = vec![
        PostgresUser {
            name: "admin".to_string(),
            password: "password".to_string(),
        },
        PostgresUser {
            name: "user".to_string(),
            password: "password".to_string(),
        },
    ];
    let databases = vec![
        PostgresDatabase {
            name: "app_db".to_string(),
            owner: "admin".to_string(),
        },
        PostgresDatabase {
            name: "user_db".to_string(),
            owner: "user".to_string(),
        },
    ];
    let postgres_score = PostgresScore::new(users, databases);
    let inventory = Inventory::empty();
    let topology = MockTopology;
    let maestro = Maestro::new(inventory, topology);
    maestro.interpret(Box::new(postgres_score)).await?;
    Ok(())
 }
--- a/examples/rust/Cargo.toml
+++ b/examples/rust/Cargo.toml
@@ -12,4 +12,3 @@ tokio = { workspace = true }
 log = { workspace = true }
 env_logger = { workspace = true }
 url = { workspace = true }
 base64.workspace = true
--- a/examples/rust/src/main.rs
+++ b/examples/rust/src/main.rs
@@ -1,43 +1,20 @@
 use std::{path::PathBuf, sync::Arc};
 use harmony::{
    inventory::Inventory,
    maestro::Maestro,
-    modules::application::{
+    modules::application::{RustWebappScore, features::ContinuousDelivery},
        ApplicationScore, RustWebFramework, RustWebapp,
        features::{ContinuousDelivery, Monitoring},
    },
    topology::{K8sAnywhereTopology, Url},
 };
 #[tokio::main]
 async fn main() {
-    env_logger::init();
+    let app = RustWebappScore {
-
+        name: "Example Rust Webapp".to_string(),
    let topology = K8sAnywhereTopology::from_env();
    let mut maestro = Maestro::initialize(Inventory::autoload(), topology)
        .await
        .unwrap();
    let application = Arc::new(RustWebapp {
        name: "harmony-example-rust-webapp".to_string(),
        domain: Url::Url(url::Url::parse("https://rustapp.harmony.example.com").unwrap()),
-        project_root: PathBuf::from("./examples/rust/webapp"),
+        features: vec![Box::new(ContinuousDelivery {})],
        framework: Some(RustWebFramework::Leptos),
    });
    let app = ApplicationScore {
        features: vec![
            Box::new(ContinuousDelivery {
                application: application.clone(),
            }), // TODO add monitoring, backups, multisite ha, etc
            Box::new(Monitoring {
                application: application.clone(),
            }),
        ],
        application,
    };
    let topology = K8sAnywhereTopology::from_env();
    let mut maestro = Maestro::new(Inventory::autoload(), topology);
    maestro.register_all(vec![Box::new(app)]);
    harmony_cli::init(maestro, None).await.unwrap();
 }
--- a/examples/rust/webapp/.gitignore
+++ b/examples/rust/webapp/.gitignore
@@ -1,14 +0,0 @@
 # Generated by Cargo
 # will have compiled files and executables
 debug/
 target/
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock
 # These are backup files generated by rustfmt
 **/*.rs.bk
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
--- a/examples/rust/webapp/Cargo.toml
+++ b/examples/rust/webapp/Cargo.toml
@@ -1,93 +0,0 @@
 [package]
 name = "harmony-example-rust-webapp"
 version = "0.1.0"
 edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 [workspace]
 [dependencies]
 actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", optional = true, features = ["macros"] }
 console_error_panic_hook = "0.1"
 http = { version = "1.0.0", optional = true }
 leptos = { version = "0.7.0" }
 leptos_meta = { version = "0.7.0" }
 leptos_actix = { version = "0.7.0", optional = true }
 leptos_router = { version = "0.7.0" }
 wasm-bindgen = "=0.2.100"
 [features]
 csr = ["leptos/csr"]
 hydrate = ["leptos/hydrate"]
 ssr = [
  "dep:actix-files",
  "dep:actix-web",
  "dep:leptos_actix",
  "leptos/ssr",
  "leptos_meta/ssr",
  "leptos_router/ssr",
 ]
 # Defines a size-optimized profile for the WASM bundle in release mode
 [profile.wasm-release]
 inherits = "release"
 opt-level = 'z'
 lto = true
 codegen-units = 1
 panic = "abort"
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
 output-name = "harmony-example-rust-webapp"
 # The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
 site-root = "target/site"
 # The site-root relative folder where all compiled output (JS, WASM and CSS) is written
 # Defaults to pkg
 site-pkg-dir = "pkg"
 # [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
 style-file = "style/main.scss"
 # Assets source dir. All files found here will be copied and synchronized to site-root.
 # The assets-dir cannot have a sub directory with the same name/path as site-pkg-dir.
 #
 # Optional. Env: LEPTOS_ASSETS_DIR.
 assets-dir = "assets"
 # The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
 site-addr = "0.0.0.0:3000"
 # The port to use for automatic reload monitoring
 reload-port = 3001
 # [Optional] Command to use when running end2end tests. It will run in the end2end dir.
 #   [Windows] for non-WSL use "npx.cmd playwright test"
 #   This binary name can be checked in Powershell with Get-Command npx
 end2end-cmd = "npx playwright test"
 end2end-dir = "end2end"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"
 # The features to use when compiling the bin target
 #
 # Optional. Can be over-ridden with the command line parameter --bin-features
 bin-features = ["ssr"]
 # If the --no-default-features flag should be used when compiling the bin target
 #
 # Optional. Defaults to false.
 bin-default-features = false
 # The features to use when compiling the lib target
 #
 # Optional. Can be over-ridden with the command line parameter --lib-features
 lib-features = ["hydrate"]
 # If the --no-default-features flag should be used when compiling the lib target
 #
 # Optional. Defaults to false.
 lib-default-features = false
 # The profile to use for the lib target when compiling for release
 #
 # Optional. Defaults to "release".
 lib-profile-release = "wasm-release"
--- a/examples/rust/webapp/Dockerfile.harmony
+++ b/examples/rust/webapp/Dockerfile.harmony
@@ -1,16 +0,0 @@
 FROM rust:bookworm as builder
 RUN apt-get update && apt-get install -y --no-install-recommends clang wget && wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && cp cargo-binstall /usr/local/cargo/bin && rm cargo-binstall-x86_64-unknown-linux-musl.tgz cargo-binstall && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN cargo binstall cargo-leptos -y
 RUN rustup target add wasm32-unknown-unknown
 WORKDIR /app
 COPY . .
 RUN cargo leptos build --release -vv
 FROM debian:bookworm-slim
 RUN groupadd -r appgroup && useradd -r -s /bin/false -g appgroup appuser
 ENV LEPTOS_SITE_ADDR=0.0.0.0:3000
 EXPOSE 3000/tcp
 WORKDIR /home/appuser
 COPY --from=builder /app/target/site/pkg /home/appuser/pkg
 COPY --from=builder /app/target/release/harmony-example-rust-webapp /home/appuser/harmony-example-rust-webapp
 USER appuser
 CMD /home/appuser/harmony-example-rust-webapp
--- a/examples/rust/webapp/LICENSE
+++ b/examples/rust/webapp/LICENSE
@@ -1,24 +0,0 @@
 This is free and unencumbered software released into the public domain.
 Anyone is free to copy, modify, publish, use, compile, sell, or
 distribute this software, either in source code form or as a compiled
 binary, for any purpose, commercial or non-commercial, and by any
 means.
 In jurisdictions that recognize copyright laws, the author or authors
 of this software dedicate any and all copyright interest in the
 software to the public domain. We make this dedication for the benefit
 of the public at large and to the detriment of our heirs and
 successors. We intend this dedication to be an overt act of
 relinquishment in perpetuity of all present and future rights to this
 software under copyright law.
 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 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.
 For more information, please refer to <https://unlicense.org>
--- a/examples/rust/webapp/README.md
+++ b/examples/rust/webapp/README.md
@@ -1,72 +0,0 @@
 <picture>
    <source srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_Solid_White.svg" media="(prefers-color-scheme: dark)">
    <img src="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg" alt="Leptos Logo">
 </picture>
 # Leptos Starter Template
 This is a template for use with the [Leptos](https://github.com/leptos-rs/leptos) web framework and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
 ## Creating your template repo
 If you don't have `cargo-leptos` installed you can install it with
 `cargo install cargo-leptos --locked`
 Then run
 `cargo leptos new --git leptos-rs/start-actix`
 to generate a new project template (you will be prompted to enter a project name).
 `cd {projectname}`
 to go to your newly created project.
 Of course, you should explore around the project structure, but the best place to start with your application code is in `src/app.rs`.
 ## Running your project
 `cargo leptos watch`  
 By default, you can access your local project at `http://localhost:3000`
 ## Installing Additional Tools
 By default, `cargo-leptos` uses `nightly` Rust, `cargo-generate`, and `sass`. If you run into any trouble, you may need to install one or more of these tools.
 1. `rustup toolchain install nightly --allow-downgrade` - make sure you have Rust nightly
 2. `rustup target add wasm32-unknown-unknown` - add the ability to compile Rust to WebAssembly
 3. `cargo install cargo-generate` - install `cargo-generate` binary (should be installed automatically in future)
 4. `npm install -g sass` - install `dart-sass` (should be optional in future)
 ## Executing a Server on a Remote Machine Without the Toolchain
 After running a `cargo leptos build --release` the minimum files needed are:
 1. The server binary located in `target/server/release`
 2. The `site` directory and all files within located in `target/site`
 Copy these files to your remote server. The directory structure should be:
 ```text
 leptos_start
 site/
 ```
 Set the following environment variables (updating for your project as needed):
 ```sh
 export LEPTOS_OUTPUT_NAME="leptos_start"
 export LEPTOS_SITE_ROOT="site"
 export LEPTOS_SITE_PKG_DIR="pkg"
 export LEPTOS_SITE_ADDR="127.0.0.1:3000"
 export LEPTOS_RELOAD_PORT="3001"
 ```
 Finally, run the server binary.
 ## Notes about CSR and Trunk:
 Although it is not recommended, you can also run your project without server integration using the feature `csr` and `trunk serve`:
 `trunk serve --open --features csr`
 This may be useful for integrating external tools which require a static site, e.g. `tauri`.
 ## Licensing
 This template itself is released under the Unlicense. You should replace the LICENSE for your own application with an appropriate license if you plan to release it publicly.
--- a/examples/rust/webapp/assets/favicon.ico
+++ b/examples/rust/webapp/assets/favicon.ico
--- a/examples/rust/webapp/end2end/package-lock.json
+++ b/examples/rust/webapp/end2end/package-lock.json
@@ -1,112 +0,0 @@
 {
  "name": "end2end",
  "version": "1.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "end2end",
      "version": "1.0.0",
      "license": "ISC",
      "devDependencies": {
        "@playwright/test": "^1.44.1",
        "@types/node": "^20.12.12",
        "typescript": "^5.4.5"
      }
    },
    "node_modules/@playwright/test": {
      "version": "1.44.1",
      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz",
      "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "playwright": "1.44.1"
      },
      "bin": {
        "playwright": "cli.js"
      },
      "engines": {
        "node": ">=16"
      }
    },
    "node_modules/@types/node": {
      "version": "20.12.12",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz",
      "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "undici-types": "~5.26.4"
      }
    },
    "node_modules/fsevents": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
      "hasInstallScript": true,
      "license": "MIT",
      "optional": true,
      "os": [
        "darwin"
      ],
      "engines": {
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
    "node_modules/playwright": {
      "version": "1.44.1",
      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz",
      "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "playwright-core": "1.44.1"
      },
      "bin": {
        "playwright": "cli.js"
      },
      "engines": {
        "node": ">=16"
      },
      "optionalDependencies": {
        "fsevents": "2.3.2"
      }
    },
    "node_modules/playwright-core": {
      "version": "1.44.1",
      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz",
      "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
        "playwright-core": "cli.js"
      },
      "engines": {
        "node": ">=16"
      }
    },
    "node_modules/typescript": {
      "version": "5.4.5",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
      },
      "engines": {
        "node": ">=14.17"
      }
    },
    "node_modules/undici-types": {
      "version": "5.26.5",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
      "dev": true,
      "license": "MIT"
    }
  }
 }
--- a/examples/rust/webapp/end2end/package.json
+++ b/examples/rust/webapp/end2end/package.json
@@ -1,15 +0,0 @@
 {
  "name": "end2end",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
  "scripts": {},
  "keywords": [],
  "author": "",
  "license": "ISC",
  "devDependencies": {
    "@playwright/test": "^1.44.1",
    "@types/node": "^20.12.12",
    "typescript": "^5.4.5"
  }
 }
--- a/examples/rust/webapp/end2end/playwright.config.ts
+++ b/examples/rust/webapp/end2end/playwright.config.ts
@@ -1,104 +0,0 @@
 import { devices, defineConfig } from "@playwright/test";
 /**
 * Read environment variables from file.
 * https://github.com/motdotla/dotenv
 */
 // require('dotenv').config();
 /**
 * See https://playwright.dev/docs/test-configuration.
 */
 export default defineConfig({
  testDir: "./tests",
  /* Maximum time one test can run for. */
  timeout: 30 * 1000,
  expect: {
    /**
     * Maximum time expect() should wait for the condition to be met.
     * For example in `await expect(locator).toHaveText();`
     */
    timeout: 5000,
  },
  /* Run tests in files in parallel */
  fullyParallel: true,
  /* Fail the build on CI if you accidentally left test.only in the source code. */
  forbidOnly: !!process.env.CI,
  /* Retry on CI only */
  retries: process.env.CI ? 2 : 0,
  /* Opt out of parallel tests on CI. */
  workers: process.env.CI ? 1 : undefined,
  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
  reporter: "html",
  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
  use: {
    /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
    actionTimeout: 0,
    /* Base URL to use in actions like `await page.goto('/')`. */
    // baseURL: 'http://localhost:3000',
    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
    trace: "on-first-retry",
  },
  /* Configure projects for major browsers */
  projects: [
    {
      name: "chromium",
      use: {
        ...devices["Desktop Chrome"],
      },
    },
    {
      name: "firefox",
      use: {
        ...devices["Desktop Firefox"],
      },
    },
    {
      name: "webkit",
      use: {
        ...devices["Desktop Safari"],
      },
    },
    /* Test against mobile viewports. */
    // {
    //   name: 'Mobile Chrome',
    //   use: {
    //     ...devices['Pixel 5'],
    //   },
    // },
    // {
    //   name: 'Mobile Safari',
    //   use: {
    //     ...devices['iPhone 12'],
    //   },
    // },
    /* Test against branded browsers. */
    // {
    //   name: 'Microsoft Edge',
    //   use: {
    //     channel: 'msedge',
    //   },
    // },
    // {
    //   name: 'Google Chrome',
    //   use: {
    //     channel: 'chrome',
    //   },
    // },
  ],
  /* Folder for test artifacts such as screenshots, videos, traces, etc. */
  // outputDir: 'test-results/',
  /* Run your local dev server before starting the tests */
  // webServer: {
  //   command: 'npm run start',
  //   port: 3000,
  // },
 });
--- a/examples/rust/webapp/end2end/tests/example.spec.ts
+++ b/examples/rust/webapp/end2end/tests/example.spec.ts
@@ -1,9 +0,0 @@
 import { test, expect } from "@playwright/test";
 test("homepage has title and links to intro page", async ({ page }) => {
  await page.goto("http://localhost:3000/");
  await expect(page).toHaveTitle("Welcome to Leptos");
  await expect(page.locator("h1")).toHaveText("Welcome to Leptos!");
 });
--- a/examples/rust/webapp/end2end/tsconfig.json
+++ b/examples/rust/webapp/end2end/tsconfig.json
@@ -1,109 +0,0 @@
 {
  "compilerOptions": {
    /* Visit https://aka.ms/tsconfig to read more about this file */
    /* Projects */
    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
    /* Language and Environment */
    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
    /* Modules */
    "module": "commonjs",                                /* Specify what module code is generated. */
    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
    // "resolveJsonModule": true,                        /* Enable importing .json files. */
    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
    /* JavaScript Support */
    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
    /* Emit */
    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
    // "removeComments": true,                           /* Disable emitting comments. */
    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
    /* Interop Constraints */
    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
    /* Type Checking */
    "strict": true,                                      /* Enable all strict type-checking options. */
    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
    /* Completeness */
    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
  }
 }
--- a/examples/rust/webapp/src/app.rs
+++ b/examples/rust/webapp/src/app.rs
@@ -1,66 +0,0 @@
 use leptos::prelude::*;
 use leptos_meta::{provide_meta_context, Stylesheet, Title};
 use leptos_router::{
    components::{Route, Router, Routes},
    StaticSegment, WildcardSegment,
 };
 #[component]
 pub fn App() -> impl IntoView {
    // Provides context that manages stylesheets, titles, meta tags, etc.
    provide_meta_context();
    view! {
        // injects a stylesheet into the document <head>
        // id=leptos means cargo-leptos will hot-reload this stylesheet
        <Stylesheet id="leptos" href="/pkg/harmony-example-rust-webapp.css"/>
        // sets the document title
        <Title text="Welcome to Leptos"/>
        // content for this welcome page
        <Router>
            <main>
                <Routes fallback=move || "Not found.">
                    <Route path=StaticSegment("") view=HomePage/>
                    <Route path=WildcardSegment("any") view=NotFound/>
                </Routes>
            </main>
        </Router>
    }
 }
 /// Renders the home page of your application.
 #[component]
 fn HomePage() -> impl IntoView {
    // Creates a reactive value to update the button
    let count = RwSignal::new(0);
    let on_click = move |_| *count.write() += 1;
    view! {
        <h1>"Welcome to Leptos!"</h1>
        <button on:click=on_click>"Click Me: " {count}</button>
    }
 }
 /// 404 - Not Found
 #[component]
 fn NotFound() -> impl IntoView {
    // set an HTTP status code 404
    // this is feature gated because it can only be done during
    // initial server-side rendering
    // if you navigate to the 404 page subsequently, the status
    // code will not be set because there is not a new HTTP request
    // to the server
    #[cfg(feature = "ssr")]
    {
        // this can be done inline because it's synchronous
        // if it were async, we'd use a server function
        let resp = expect_context::<leptos_actix::ResponseOptions>();
        resp.set_status(actix_web::http::StatusCode::NOT_FOUND);
    }
    view! {
        <h1>"Not Found"</h1>
    }
 }
--- a/examples/rust/webapp/src/lib.rs
+++ b/examples/rust/webapp/src/lib.rs
@@ -1,9 +0,0 @@
 pub mod app;
 #[cfg(feature = "hydrate")]
 #[wasm_bindgen::prelude::wasm_bindgen]
 pub fn hydrate() {
    use app::*;
    console_error_panic_hook::set_once();
    leptos::mount::hydrate_body(App);
 }
--- a/examples/rust/webapp/src/main.rs
+++ b/examples/rust/webapp/src/main.rs
@@ -1,88 +0,0 @@
 #[cfg(feature = "ssr")]
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
    use actix_files::Files;
    use actix_web::*;
    use leptos::prelude::*;
    use leptos::config::get_configuration;
    use leptos_meta::MetaTags;
    use leptos_actix::{generate_route_list, LeptosRoutes};
    use harmony_example_rust_webapp::app::*;
    let conf = get_configuration(None).unwrap();
    let addr = conf.leptos_options.site_addr;
    HttpServer::new(move || {
        // Generate the list of routes in your Leptos App
        let routes = generate_route_list(App);
        let leptos_options = &conf.leptos_options;
        let site_root = leptos_options.site_root.clone().to_string();
        println!("listening on http://{}", &addr);
        App::new()
            // serve JS/WASM/CSS from `pkg`
            .service(Files::new("/pkg", format!("{site_root}/pkg")))
            // serve other assets from the `assets` directory
            .service(Files::new("/assets", &site_root))
            // serve the favicon from /favicon.ico
            .service(favicon)
            .leptos_routes(routes, {
                let leptos_options = leptos_options.clone();
                move || {
                    view! {
                        <!DOCTYPE html>
                        <html lang="en">
                            <head>
                                <meta charset="utf-8"/>
                                <meta name="viewport" content="width=device-width, initial-scale=1"/>
                                <AutoReload options=leptos_options.clone() />
                                <HydrationScripts options=leptos_options.clone()/>
                                <MetaTags/>
                            </head>
                            <body>
                                <App/>
                            </body>
                        </html>
                    }
                }
            })
            .app_data(web::Data::new(leptos_options.to_owned()))
        //.wrap(middleware::Compress::default())
    })
    .bind(&addr)?
    .run()
    .await
 }
 #[cfg(feature = "ssr")]
 #[actix_web::get("favicon.ico")]
 async fn favicon(
    leptos_options: actix_web::web::Data<leptos::config::LeptosOptions>,
 ) -> actix_web::Result<actix_files::NamedFile> {
    let leptos_options = leptos_options.into_inner();
    let site_root = &leptos_options.site_root;
    Ok(actix_files::NamedFile::open(format!(
        "{site_root}/favicon.ico"
    ))?)
 }
 #[cfg(not(any(feature = "ssr", feature = "csr")))]
 pub fn main() {
    // no client-side main function
    // unless we want this to work with e.g., Trunk for pure client-side testing
    // see lib.rs for hydration function instead
    // see optional feature `csr` instead
 }
 #[cfg(all(not(feature = "ssr"), feature = "csr"))]
 pub fn main() {
    // a client-side main function is required for using `trunk serve`
    // prefer using `cargo leptos serve` instead
    // to run: `trunk serve --open --features csr`
    use harmony_example_rust_webapp::app::*;
    console_error_panic_hook::set_once();
    leptos::mount_to_body(App);
 }
--- a/examples/rust/webapp/style/main.scss
+++ b/examples/rust/webapp/style/main.scss
@@ -1,4 +0,0 @@
 body {
 	font-family: sans-serif;
 	text-align: center;
 }
--- a/harmony/Cargo.toml
+++ b/harmony/Cargo.toml
@@ -13,7 +13,7 @@ reqwest = { version = "0.11", features = ["blocking", "json"] }
 russh = "0.45.0"
 rust-ipmi = "0.1.1"
 semver = "1.0.23"
-serde = { version = "1.0.209", features = ["derive", "rc"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_json = "1.0.127"
 tokio.workspace = true
 derive-new.workspace = true
@@ -57,12 +57,3 @@ similar.workspace = true
 futures-util = "0.3.31"
 tokio-util = "0.7.15"
 strum = { version = "0.27.1", features = ["derive"] }
 tempfile = "3.20.0"
 serde_with = "3.14.0"
 bollard.workspace = true
 tar.workspace = true
 base64.workspace = true
 figment.workspace = true
 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/harmony/src/domain/config.rs
+++ b/harmony/src/domain/config.rs
@@ -1,66 +1,15 @@
 use figment::{
    Error, Figment, Metadata, Profile, Provider,
    providers::{Env, Format},
    value::{Dict, Map},
 };
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
-#[derive(Debug, Deserialize, Serialize)]
+lazy_static! {
-pub struct Config {
+    pub static ref HARMONY_CONFIG_DIR: PathBuf = directories::BaseDirs::new()
-    pub data_dir: PathBuf,
+        .unwrap()
-    pub registry_url: String,
+        .data_dir()
-    pub registry_project: String,
+        .join("harmony");
-    pub dry_run: bool,
+    pub static ref REGISTRY_URL: String =
-    pub run_upgrades: bool,
+        std::env::var("HARMONY_REGISTRY_URL").unwrap_or_else(|_| "hub.nationtech.io".to_string());
-}
+    pub static ref REGISTRY_PROJECT: String =
-
+        std::env::var("HARMONY_REGISTRY_PROJECT").unwrap_or_else(|_| "harmony".to_string());
-impl Default for Config {
+    pub static ref DRY_RUN: bool =
-    fn default() -> Self {
+        std::env::var("HARMONY_DRY_RUN").map_or(true, |value| value.parse().unwrap_or(true));
        Config {
            data_dir: directories::BaseDirs::new()
                .unwrap()
                .data_dir()
                .join("harmony"),
            registry_url: "hub.nationtech.io".to_string(),
            registry_project: "harmony".to_string(),
            dry_run: true,
            run_upgrades: false,
        }
    }
 }
 impl Config {
    pub fn load() -> Result<Self, figment::Error> {
        Figment::from(Config::default())
            .merge(Env::prefixed("HARMONY_"))
            .extract()
    }
    fn from<T: Provider>(provider: T) -> Result<Config, Error> {
        Figment::from(provider).extract()
    }
    fn figment() -> Figment {
        use figment::providers::Env;
        // In reality, whatever the library desires.
        Figment::from(Config::default()).merge(Env::prefixed("HARMONY_"))
    }
 }
 impl Provider for Config {
    fn metadata(&self) -> Metadata {
        Metadata::named("Harmony Config")
    }
    fn data(&self) -> Result<Map<Profile, Dict>, Error> {
        figment::providers::Serialized::defaults(Config::default()).data()
    }
    fn profile(&self) -> Option<Profile> {
        // Optionally, a profile that's selected by default.
        Some(Profile::Default)
    }
 }
--- a/harmony/src/domain/data/mod.rs
+++ b/harmony/src/domain/data/mod.rs
@@ -2,3 +2,6 @@ mod id;
 mod version;
 pub use id::*;
 pub use version::*;
 mod postgres;
 pub use postgres::*;
--- a/harmony/src/domain/data/postgres.rs
+++ b/harmony/src/domain/data/postgres.rs
@@ -0,0 +1,13 @@
 use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PostgresUser {
    pub name: String,
    pub password: String, // In a real scenario, this should be a secret type
 }
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PostgresDatabase {
    pub name: String,
    pub owner: String,
 }
--- a/harmony/src/domain/interpret/mod.rs
+++ b/harmony/src/domain/interpret/mod.rs
@@ -22,7 +22,7 @@ pub enum InterpretName {
    K3dInstallation,
    TenantInterpret,
    Application,
-    ArgoCD,
+    Postgres,
 }
 impl std::fmt::Display for InterpretName {
@@ -40,7 +40,7 @@ impl std::fmt::Display for InterpretName {
            InterpretName::K3dInstallation => f.write_str("K3dInstallation"),
            InterpretName::TenantInterpret => f.write_str("Tenant"),
            InterpretName::Application => f.write_str("Application"),
-            InterpretName::ArgoCD => f.write_str("ArgoCD"),
+            InterpretName::Postgres => f.write_str("Postgres"),
        }
    }
 }
--- a/harmony/src/domain/maestro/mod.rs
+++ b/harmony/src/domain/maestro/mod.rs
@@ -19,10 +19,7 @@ pub struct Maestro<T: Topology> {
 }
 impl<T: Topology> Maestro<T> {
-    /// Creates a bare maestro without initialization.
+    pub fn new(inventory: Inventory, topology: T) -> Self {
    ///
    /// This should rarely be used. Most of the time Maestro::initialize should be used instead.
    pub fn new_without_initialization(inventory: Inventory, topology: T) -> Self {
        Self {
            inventory,
            topology,
@@ -32,7 +29,7 @@ impl<T: Topology> Maestro<T> {
    }
    pub async fn initialize(inventory: Inventory, topology: T) -> Result<Self, InterpretError> {
-        let instance = Self::new_without_initialization(inventory, topology);
+        let instance = Self::new(inventory, topology);
        instance.prepare_topology().await?;
        Ok(instance)
    }
--- a/harmony/src/domain/score_with_dep.rs
+++ b/harmony/src/domain/score_with_dep.rs
@@ -1,59 +0,0 @@
 ////////////////////
 /// Working idea 
 ///
 ///
 trait ScoreWithDep<T> {
    fn create_interpret(&self) -> Box<dyn Interpret<T>>;
    fn name(&self) -> String;
    fn get_dependencies(&self) -> Vec<TypeId>; // Force T to impl Installer<TypeId> or something
                                               // like that
 }
 struct PrometheusAlertScore;
 impl <T> ScoreWithDep<T> for PrometheusAlertScore {
    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
        todo!()
    }
    fn name(&self) -> String {
        todo!()
    }
    fn get_dependencies(&self) -> Vec<TypeId> {
        // We have to find a way to constrait here so at compile time we are only allowed to return
        // TypeId for types which can be installed by T 
        //
        // This means, for example that T must implement HelmCommand if the impl <T: HelmCommand> Installable<T> for
        // KubePrometheus calls for HelmCommand.
        vec![TypeId::of::<KubePrometheus>()]
    }
 }
 trait Installable{}
 struct KubePrometheus;
 impl Installable for KubePrometheus;
 struct Maestro<T> {
    topology: T
 }
 impl <T>Maestro<T> {
  fn execute_store(&self, score: ScoreWithDep<T>) {
      score.get_dependencies().iter().for_each(|dep| {
          self.topology.ensure_dependency_ready(dep);
      });
  }
 }
 struct TopologyWithDep {
 }
 impl TopologyWithDep {
    fn ensure_dependency_ready(&self, type_id: TypeId) -> Result<(), String> {
        self.installer
    }
 }
--- a/harmony/src/domain/topology/ha_cluster.rs
+++ b/harmony/src/domain/topology/ha_cluster.rs
@@ -1,15 +1,11 @@
 use async_trait::async_trait;
 use harmony_macros::ip;
 use harmony_types::net::MacAddress;
 use log::error;
 use log::info;
 use crate::config::Config;
 use crate::executors::ExecutorError;
 use crate::interpret::InterpretError;
 use crate::interpret::Outcome;
 use crate::inventory::Inventory;
 use crate::topology::upgradeable::Upgradeable;
 use super::DHCPStaticEntry;
 use super::DhcpServer;
@@ -29,12 +25,9 @@ use super::TftpServer;
 use super::Topology;
 use super::Url;
 use super::k8s::K8sClient;
 use std::fmt::Debug;
 use std::net::IpAddr;
 use std::str::FromStr;
 use std::sync::Arc;
-#[derive(Clone, Debug)]
+#[derive(Debug, Clone)]
 pub struct HAClusterTopology {
    pub domain_name: String,
    pub router: Arc<dyn Router>,
@@ -56,15 +49,9 @@ impl Topology for HAClusterTopology {
        "HAClusterTopology"
    }
    async fn ensure_ready(&self) -> Result<Outcome, InterpretError> {
-        error!(
+        todo!(
            "ensure_ready, not entirely sure what it should do here, probably something like verify that the hosts are reachable and all services are up and ready."
-        );
+        )
        let config = Config::load().expect("couldn't load config");
        if config.run_upgrades {
            self.upgrade(&Inventory::empty(), self).await?;
        }
        Ok(Outcome::success("for now do nothing".to_string()))
    }
 }
@@ -264,13 +251,6 @@ impl Topology for DummyInfra {
    }
 }
 #[async_trait]
 impl<T: Topology> Upgradeable<T> for DummyInfra {
    async fn upgrade(&self, _inventory: &Inventory, _topology: &T) -> Result<(), InterpretError> {
        unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
    }
 }
 const UNIMPLEMENTED_DUMMY_INFRA: &str = "This is a dummy infrastructure, no operation is supported";
 impl Router for DummyInfra {
@@ -437,12 +417,3 @@ impl DnsServer for DummyInfra {
        unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
    }
 }
 #[async_trait]
 impl<T: Topology> Upgradeable<T> for HAClusterTopology {
    async fn upgrade(&self, inventory: &Inventory, topology: &T) -> Result<(), InterpretError> {
        error!("TODO implement upgrades for all parts of the cluster");
        self.firewall.upgrade(inventory, topology).await?;
        Ok(())
    }
 }
--- a/harmony/src/domain/topology/k8s.rs
+++ b/harmony/src/domain/topology/k8s.rs
@@ -4,6 +4,8 @@ use k8s_openapi::{
    ClusterResourceScope, NamespaceResourceScope,
    api::{apps::v1::Deployment, core::v1::Pod},
 };
 use kube::runtime::conditions;
 use kube::runtime::wait::await_condition;
 use kube::{
    Client, Config, Error, Resource,
    api::{Api, AttachParams, ListParams, Patch, PatchParams, ResourceExt},
@@ -11,17 +13,10 @@ use kube::{
    core::ErrorResponse,
    runtime::reflector::Lookup,
 };
 use kube::{api::DynamicObject, runtime::conditions};
 use kube::{
    api::{ApiResource, GroupVersionKind},
    runtime::wait::await_condition,
 };
 use log::{debug, error, trace};
 use serde::de::DeserializeOwned;
 use similar::{DiffableStr, TextDiff};
 use crate::config::Config as HarmonyConfig;
 #[derive(new, Clone)]
 pub struct K8sClient {
    client: Client,
@@ -156,9 +151,7 @@ impl K8sClient {
            .as_ref()
            .expect("K8s Resource should have a name");
-        let config = HarmonyConfig::load().expect("couldn't load config");
+        if *crate::config::DRY_RUN {
        if config.dry_run {
            match api.get(name).await {
                Ok(current) => {
                    trace!("Received current value {current:#?}");
@@ -246,70 +239,6 @@ impl K8sClient {
        Ok(result)
    }
    pub async fn apply_yaml_many(
        &self,
        yaml: &Vec<serde_yaml::Value>,
        ns: Option<&str>,
    ) -> Result<(), Error> {
        for y in yaml.iter() {
            self.apply_yaml(y, ns).await?;
        }
        Ok(())
    }
    pub async fn apply_yaml(
        &self,
        yaml: &serde_yaml::Value,
        ns: Option<&str>,
    ) -> Result<(), Error> {
        let obj: DynamicObject = serde_yaml::from_value(yaml.clone()).expect("TODO do not unwrap");
        let name = obj.metadata.name.as_ref().expect("YAML must have a name");
        let api_version = yaml
            .get("apiVersion")
            .expect("couldn't get apiVersion from YAML")
            .as_str()
            .expect("couldn't get apiVersion as str");
        let kind = yaml
            .get("kind")
            .expect("couldn't get kind from YAML")
            .as_str()
            .expect("couldn't get kind as str");
        let split: Vec<&str> = api_version.splitn(2, "/").collect();
        let g = split[0];
        let v = split[1];
        let gvk = GroupVersionKind::gvk(g, v, kind);
        let api_resource = ApiResource::from_gvk(&gvk);
        let namespace = match ns {
            Some(n) => n,
            None => obj
                .metadata
                .namespace
                .as_ref()
                .expect("YAML must have a namespace"),
        };
        // 5. Create a dynamic API client for this resource type.
        let api: Api<DynamicObject> =
            Api::namespaced_with(self.client.clone(), namespace, &api_resource);
        // 6. Apply the object to the cluster using Server-Side Apply.
        //    This will create the resource if it doesn't exist, or update it if it does.
        println!(
            "Applying Argo Application '{}' in namespace '{}'...",
            name, namespace
        );
        let patch_params = PatchParams::apply("harmony"); // Use a unique field manager name
        let result = api.patch(name, &patch_params, &Patch::Apply(&obj)).await?;
        println!("Successfully applied '{}'.", result.name_any());
        Ok(())
    }
    pub(crate) async fn from_kubeconfig(path: &str) -> Option<K8sClient> {
        let k = match Kubeconfig::read_from(path) {
            Ok(k) => k,
--- a/harmony/src/domain/topology/k8s_anywhere.rs
+++ b/harmony/src/domain/topology/k8s_anywhere.rs
@@ -1,10 +1,9 @@
 use std::{process::Command, sync::Arc};
 use async_trait::async_trait;
 use figment::{Figment, providers::Env};
 use inquire::Confirm;
 use log::{debug, info, warn};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use tokio::sync::OnceCell;
 use crate::{
@@ -17,7 +16,7 @@ use crate::{
 };
 use super::{
-    DeploymentTarget, HelmCommand, K8sclient, MultiTargetTopology, Topology,
+    HelmCommand, K8sclient, Topology,
    k8s::K8sClient,
    tenant::{TenantConfig, TenantManager, k8s::K8sTenantManager},
 };
@@ -124,47 +123,39 @@ impl K8sAnywhereTopology {
    async fn try_get_or_install_k8s_client(&self) -> Result<Option<K8sState>, InterpretError> {
        let k8s_anywhere_config = &self.config;
-        // TODO this deserves some refactoring, it is becoming a bit hard to figure out
+        if let Some(kubeconfig) = &k8s_anywhere_config.kubeconfig {
-        // be careful when making modifications here
+            debug!("Loading kubeconfig {kubeconfig}");
-        if k8s_anywhere_config.use_local_k3d {
+            match self.try_load_kubeconfig(&kubeconfig).await {
-            info!("Using local k3d cluster because of use_local_k3d set to true");
+                Some(client) => {
-        } else {
+                    return Ok(Some(K8sState {
-            if let Some(kubeconfig) = &k8s_anywhere_config.kubeconfig {
+                        client: Arc::new(client),
-                debug!("Loading kubeconfig {kubeconfig}");
+                        _source: K8sSource::Kubeconfig,
-                match self.try_load_kubeconfig(&kubeconfig).await {
+                        message: format!("Loaded k8s client from kubeconfig {kubeconfig}"),
-                    Some(client) => {
+                    }));
-                        return Ok(Some(K8sState {
+                }
-                            client: Arc::new(client),
+                None => {
-                            _source: K8sSource::Kubeconfig,
+                    return Err(InterpretError::new(format!(
-                            message: format!("Loaded k8s client from kubeconfig {kubeconfig}"),
+                        "Failed to load kubeconfig from {kubeconfig}"
-                        }));
+                    )));
                    }
                    None => {
                        return Err(InterpretError::new(format!(
                            "Failed to load kubeconfig from {kubeconfig}"
                        )));
                    }
                }
            }
            if k8s_anywhere_config.use_system_kubeconfig {
                debug!("Loading system kubeconfig");
                match self.try_load_system_kubeconfig().await {
                    Some(_client) => todo!(),
                    None => todo!(),
                }
            }
            info!("No kubernetes configuration found");
        }
        if k8s_anywhere_config.use_system_kubeconfig {
            debug!("Loading system kubeconfig");
            match self.try_load_system_kubeconfig().await {
                Some(_client) => todo!(),
                None => todo!(),
            }
        }
        info!("No kubernetes configuration found");
        if !k8s_anywhere_config.autoinstall {
            debug!("Autoinstall confirmation prompt");
            let confirmation = Confirm::new( "Harmony autoinstallation is not activated, do you wish to launch autoinstallation? : ")
                .with_default(false)
                .prompt()
                .expect("Unexpected prompt error");
            debug!("Autoinstall confirmation {confirmation}");
            if !confirmation {
                warn!(
@@ -220,7 +211,7 @@ impl K8sAnywhereTopology {
    }
 }
-#[derive(Clone, Debug, Deserialize)]
+#[derive(Clone, Debug)]
 pub struct K8sAnywhereConfig {
    /// The path of the KUBECONFIG file that Harmony should use to interact with the Kubernetes
    /// cluster
@@ -238,38 +229,19 @@ pub struct K8sAnywhereConfig {
    ///
    /// When enabled, autoinstall will setup a K3D cluster on the localhost. https://k3d.io/stable/
    ///
-    /// Default: false
+    /// Default: true
    pub autoinstall: bool,
    /// Whether to use local k3d cluster.
    ///
    /// Takes precedence over other options, useful to avoid messing up a remote cluster by mistake
    ///
    /// default: true
    pub use_local_k3d: bool,
    pub profile: String,
 }
 impl Default for K8sAnywhereConfig {
    fn default() -> Self {
        Self {
            kubeconfig: None,
            use_system_kubeconfig: false,
            autoinstall: false,
            // TODO harmony_profile should be managed at a more core level than this
            profile: "dev".to_string(),
            use_local_k3d: true,
        }
    }
 }
 impl K8sAnywhereConfig {
    fn from_env() -> Self {
-        Figment::new()
+        Self {
-            .merge(Env::prefixed("HARMONY_"))
+            kubeconfig: std::env::var("KUBECONFIG").ok().map(|v| v.to_string()),
-            .merge(Env::raw().only(&["KUBECONFIG"]))
+            use_system_kubeconfig: std::env::var("HARMONY_USE_SYSTEM_KUBECONFIG")
-            .extract()
+                .map_or_else(|_| false, |v| v.parse().ok().unwrap_or(false)),
-            .expect("couldn't load config from env")
+            autoinstall: std::env::var("HARMONY_AUTOINSTALL")
                .map_or_else(|_| false, |v| v.parse().ok().unwrap_or(false)),
        }
    }
 }
@@ -303,20 +275,6 @@ impl Topology for K8sAnywhereTopology {
    }
 }
 impl MultiTargetTopology for K8sAnywhereTopology {
    fn current_target(&self) -> DeploymentTarget {
        if self.config.use_local_k3d {
            return DeploymentTarget::LocalDev;
        }
        match self.config.profile.to_lowercase().as_str() {
            "staging" => DeploymentTarget::Staging,
            "production" => DeploymentTarget::Production,
            _ => todo!("HARMONY_PROFILE must be set when use_local_k3d is not set"),
        }
    }
 }
 impl HelmCommand for K8sAnywhereTopology {}
 #[async_trait]
--- a/harmony/src/domain/topology/mod.rs
+++ b/harmony/src/domain/topology/mod.rs
@@ -6,7 +6,6 @@ mod k8s_anywhere;
 mod localhost;
 pub mod oberservability;
 pub mod tenant;
 pub mod upgradeable;
 pub use k8s_anywhere::*;
 pub use localhost::*;
 pub mod k8s;
@@ -24,6 +23,9 @@ pub use network::*;
 use serde::Serialize;
 pub use tftp::*;
 mod postgres;
 pub use postgres::*;
 mod helm_command;
 pub use helm_command::*;
@@ -63,17 +65,6 @@ pub trait Topology: Send + Sync {
    async fn ensure_ready(&self) -> Result<Outcome, InterpretError>;
 }
 #[derive(Debug)]
 pub enum DeploymentTarget {
    LocalDev,
    Staging,
    Production,
 }
 pub trait MultiTargetTopology: Topology {
    fn current_target(&self) -> DeploymentTarget;
 }
 pub type IpAddress = IpAddr;
 #[derive(Debug, Clone)]
--- a/harmony/src/domain/topology/network.rs
+++ b/harmony/src/domain/topology/network.rs
@@ -2,15 +2,9 @@ use std::{net::Ipv4Addr, str::FromStr, sync::Arc};
 use async_trait::async_trait;
 use harmony_types::net::MacAddress;
 use log::debug;
 use serde::Serialize;
-use crate::{
+use crate::executors::ExecutorError;
    executors::ExecutorError,
    interpret::InterpretError,
    inventory::Inventory,
    topology::{Topology, upgradeable::Upgradeable},
 };
 use super::{IpAddress, LogicalHost, k8s::K8sClient};
@@ -44,15 +38,6 @@ impl std::fmt::Debug for dyn Firewall {
    }
 }
 // #[async_trait]
 // impl<T: Topology> Upgradeable<T> for dyn Firewall {
 //     async fn upgrade(&self, inventory: &Inventory, topology: &T) -> Result<(), InterpretError> {
 //         debug!("upgrading");
 //         self.upgrade(inventory, topology).await?;
 //         Ok(())
 //     }
 // }
 pub struct NetworkDomain {
    pub name: String,
 }
--- a/harmony/src/domain/topology/postgres.rs
+++ b/harmony/src/domain/topology/postgres.rs
@@ -0,0 +1,14 @@
 use crate::{
    data::{PostgresDatabase, PostgresUser},
    interpret::InterpretError,
 };
 use async_trait::async_trait;
 #[async_trait]
 pub trait PostgresServer {
    async fn ensure_users_exist(&self, users: Vec<PostgresUser>) -> Result<(), InterpretError>;
    async fn ensure_databases_exist(
        &self,
        databases: Vec<PostgresDatabase>,
    ) -> Result<(), InterpretError>;
 }
--- a/harmony/src/domain/topology/upgradeable.rs
+++ b/harmony/src/domain/topology/upgradeable.rs
@@ -1,8 +0,0 @@
 use async_trait::async_trait;
 use crate::{interpret::InterpretError, inventory::Inventory};
 #[async_trait]
 pub trait Upgradeable<T>: Send + Sync {
    async fn upgrade(&self, inventory: &Inventory, topology: &T) -> Result<(), InterpretError>;
 }
--- a/harmony/src/infra/opnsense/mod.rs
+++ b/harmony/src/infra/opnsense/mod.rs
@@ -7,18 +7,13 @@ mod management;
 mod tftp;
 use std::sync::Arc;
 use async_trait::async_trait;
 pub use management::*;
 use opnsense_config_xml::Host;
 use tokio::sync::RwLock;
 use crate::{
    executors::ExecutorError,
-    interpret::InterpretError,
+    topology::{IpAddress, LogicalHost},
    inventory::Inventory,
    modules::opnsense::OPNSenseLaunchUpgrade,
    score::Score,
    topology::{IpAddress, LogicalHost, Topology, upgradeable::Upgradeable},
 };
 #[derive(Debug, Clone)]
@@ -54,17 +49,3 @@ impl OPNSenseFirewall {
            .map_err(|e| ExecutorError::UnexpectedError(e.to_string()))
    }
 }
 #[async_trait]
 impl<T: Topology> Upgradeable<T> for OPNSenseFirewall {
    async fn upgrade(&self, inventory: &Inventory, topology: &T) -> Result<(), InterpretError> {
        OPNSenseLaunchUpgrade {
            opnsense: self.get_opnsense_config(),
        }
        .create_interpret()
        .execute(inventory, topology)
        .await?;
        Ok(())
    }
 }
--- a/harmony/src/modules/application/feature.rs
+++ b/harmony/src/modules/application/feature.rs
@@ -2,7 +2,6 @@ use async_trait::async_trait;
 use serde::Serialize;
 use crate::topology::Topology;
 /// An ApplicationFeature provided by harmony, such as Backups, Monitoring, MultisiteAvailability,
 /// ContinuousIntegration, ContinuousDelivery
 #[async_trait]
--- a/harmony/src/modules/application/features/argo_types.rs
+++ b/harmony/src/modules/application/features/argo_types.rs
@@ -1,354 +0,0 @@
 use log::debug;
 use serde::Serialize;
 use serde_with::skip_serializing_none;
 use serde_yaml::Value;
 use crate::modules::application::features::CDApplicationConfig;
 #[skip_serializing_none]
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Helm {
    pub pass_credentials: Option<bool>,
    pub parameters: Vec<Value>,
    pub file_parameters: Vec<Value>,
    pub release_name: Option<String>,
    pub value_files: Vec<String>,
    pub ignore_missing_value_files: Option<bool>,
    pub values: Option<String>,
    pub values_object: Option<Value>,
    pub skip_crds: Option<bool>,
    pub skip_schema_validation: Option<bool>,
    pub version: Option<String>,
    pub kube_version: Option<String>,
    pub api_versions: Vec<String>,
    pub namespace: Option<String>,
 }
 #[skip_serializing_none]
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Source {
    // Using string for this because URL enforces a URL scheme at the beginning but Helm, ArgoCD, etc do not, and it can be counterproductive,
    // as the only way I've found to get OCI working isn't by using oci:// but rather no scheme at all
    #[serde(rename = "repoURL")]
    pub repo_url: String,
    pub target_revision: Option<String>,
    pub chart: String,
    pub helm: Helm,
    pub path: String,
 }
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Automated {
    pub prune: bool,
    pub self_heal: bool,
    pub allow_empty: bool,
 }
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Backoff {
    pub duration: String,
    pub factor: u32,
    pub max_duration: String,
 }
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Retry {
    pub limit: u32,
    pub backoff: Backoff,
 }
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SyncPolicy {
    pub automated: Automated,
    pub sync_options: Vec<String>,
    pub retry: Retry,
 }
 #[skip_serializing_none]
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ArgoApplication {
    pub name: String,
    pub namespace: Option<String>,
    pub project: String,
    pub source: Source,
    pub sync_policy: SyncPolicy,
    pub revision_history_limit: u32,
 }
 impl Default for ArgoApplication {
    fn default() -> Self {
        Self {
            name: Default::default(),
            namespace: Default::default(),
            project: Default::default(),
            source: Source {
                repo_url: "http://asdf".to_string(),
                target_revision: None,
                chart: "".to_string(),
                helm: Helm {
                    pass_credentials: None,
                    parameters: vec![],
                    file_parameters: vec![],
                    release_name: None,
                    value_files: vec![],
                    ignore_missing_value_files: None,
                    values: None,
                    values_object: None,
                    skip_crds: None,
                    skip_schema_validation: None,
                    version: None,
                    kube_version: None,
                    api_versions: vec![],
                    namespace: None,
                },
                path: "".to_string(),
            },
            sync_policy: SyncPolicy {
                automated: Automated {
                    prune: false,
                    self_heal: false,
                    allow_empty: false,
                },
                sync_options: vec![],
                retry: Retry {
                    limit: 5,
                    backoff: Backoff {
                        duration: "5s".to_string(),
                        factor: 2,
                        max_duration: "3m".to_string(),
                    },
                },
            },
            revision_history_limit: 10,
        }
    }
 }
 impl From<CDApplicationConfig> for ArgoApplication {
    fn from(value: CDApplicationConfig) -> Self {
        Self {
            name: value.name,
            namespace: Some(value.namespace),
            project: "default".to_string(),
            source: Source {
                repo_url: value.helm_chart_repo_url,
                target_revision: Some(value.version.to_string()),
                chart: value.helm_chart_name.clone(),
                path: value.helm_chart_name,
                helm: Helm {
                    pass_credentials: None,
                    parameters: vec![],
                    file_parameters: vec![],
                    release_name: None,
                    value_files: vec![],
                    ignore_missing_value_files: None,
                    values: None,
                    values_object: value.values_overrides,
                    skip_crds: None,
                    skip_schema_validation: None,
                    version: None,
                    kube_version: None,
                    api_versions: vec![],
                    namespace: None,
                },
            },
            sync_policy: SyncPolicy {
                automated: Automated {
                    prune: false,
                    self_heal: false,
                    allow_empty: true,
                },
                sync_options: vec![],
                retry: Retry {
                    limit: 5,
                    backoff: Backoff {
                        duration: "5s".to_string(),
                        factor: 2,
                        max_duration: "3m".to_string(),
                    },
                },
            },
            ..Self::default()
        }
    }
 }
 impl ArgoApplication {
    pub fn to_yaml(&self) -> serde_yaml::Value {
        let name = &self.name;
        let namespace = if let Some(ns) = self.namespace.as_ref() {
            &ns
        } else {
            "argocd"
        };
        let project = &self.project;
        let source = &self.source;
        let yaml_str = format!(
            r#"
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
  name: {name}
  # You'll usually want to add your resources to the argocd namespace.
  namespace: {namespace}
 spec:
  # The project the application belongs to.
  project: {project}
  # Destination cluster and namespace to deploy the application
  destination:
    # cluster API URL
    server: https://kubernetes.default.svc
    # or cluster name
    # name: in-cluster
    # The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace
    namespace: {namespace}
 "#
        );
        let mut yaml_value: Value =
            serde_yaml::from_str(yaml_str.as_str()).expect("couldn't parse string to YAML");
        let spec = yaml_value
            .get_mut("spec")
            .expect("couldn't get spec from yaml")
            .as_mapping_mut()
            .expect("couldn't unwrap spec as mutable mapping");
        let source =
            serde_yaml::to_value(&self.source).expect("couldn't serialize source to value");
        let sync_policy = serde_yaml::to_value(&self.sync_policy)
            .expect("couldn't serialize sync_policy to value");
        let revision_history_limit = serde_yaml::to_value(&self.revision_history_limit)
            .expect("couldn't serialize revision_history_limit to value");
        spec.insert(
            serde_yaml::to_value("source").expect("string to value failed"),
            source,
        );
        spec.insert(
            serde_yaml::to_value("syncPolicy").expect("string to value failed"),
            sync_policy,
        );
        spec.insert(
            serde_yaml::to_value("revisionHistoryLimit")
                .expect("couldn't convert str to yaml value"),
            revision_history_limit,
        );
        debug!("spec: {}", serde_yaml::to_string(spec).unwrap());
        debug!(
            "entire yaml_value: {}",
            serde_yaml::to_string(&yaml_value).unwrap()
        );
        yaml_value
    }
 }
 #[cfg(test)]
 mod tests {
    use pretty_assertions::assert_eq;
    use crate::modules::application::features::{
        ArgoApplication, Automated, Backoff, Helm, Retry, Source, SyncPolicy,
    };
    #[test]
    fn test_argo_application_to_yaml_happy_path() {
        let app = ArgoApplication {
            name: "test".to_string(),
            namespace: Some("test-ns".to_string()),
            project: "test-project".to_string(),
            source: Source {
                repo_url: "http://test".to_string(),
                target_revision: None,
                chart: "test-chart".to_string(),
                helm: Helm {
                    pass_credentials: None,
                    parameters: vec![],
                    file_parameters: vec![],
                    release_name: Some("test-release-neame".to_string()),
                    value_files: vec![],
                    ignore_missing_value_files: None,
                    values: None,
                    values_object: None,
                    skip_crds: None,
                    skip_schema_validation: None,
                    version: None,
                    kube_version: None,
                    api_versions: vec![],
                    namespace: None,
                },
                path: "".to_string(),
            },
            sync_policy: SyncPolicy {
                automated: Automated {
                    prune: false,
                    self_heal: false,
                    allow_empty: false,
                },
                sync_options: vec![],
                retry: Retry {
                    limit: 5,
                    backoff: Backoff {
                        duration: "5s".to_string(),
                        factor: 2,
                        max_duration: "3m".to_string(),
                    },
                },
            },
            revision_history_limit: 10,
        };
        let expected_yaml_output = r#"apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
  name: test
  namespace: test-ns
 spec:
  project: test-project
  destination:
    server: https://kubernetes.default.svc
    namespace: test-ns
  source:
    repoURL: http://test
    chart: test-chart
    helm:
      parameters: []
      fileParameters: []
      releaseName: test-release-neame
      valueFiles: []
      apiVersions: []
    path: ''
  syncPolicy:
    automated:
      prune: false
      selfHeal: false
      allowEmpty: false
    syncOptions: []
    retry:
      limit: 5
      backoff:
        duration: 5s
        factor: 2
        maxDuration: 3m
  revisionHistoryLimit: 10"#;
        assert_eq!(
            expected_yaml_output.trim(),
            serde_yaml::to_string(&app.clone().to_yaml())
                .unwrap()
                .trim()
        );
    }
 }
--- a/harmony/src/modules/application/features/continuous_delivery.rs
+++ b/harmony/src/modules/application/features/continuous_delivery.rs
@@ -1,20 +1,13 @@
 use std::{io::Write, process::Command, sync::Arc};
 use async_trait::async_trait;
-use log::{error, info};
+use log::info;
-use serde_yaml::Value;
+use serde_json::Value;
 use tempfile::NamedTempFile;
 use crate::{
    config::Config,
    data::Version,
    inventory::Inventory,
-    modules::application::{
+    modules::{application::ApplicationFeature, helm::chart::HelmChartScore},
        Application, ApplicationFeature, HelmPackage, OCICompliant,
        features::{ArgoApplication, ArgoHelmScore},
    },
    score::Score,
-    topology::{DeploymentTarget, HelmCommand, K8sclient, MultiTargetTopology, Topology},
+    topology::{HelmCommand, Topology, Url},
 };
 /// ContinuousDelivery in Harmony provides this functionality :
@@ -45,168 +38,33 @@ use crate::{
 /// - ArgoCD to install/upgrade/rollback/inspect k8s resources
 /// - Kubernetes for runtime orchestration
 #[derive(Debug, Default, Clone)]
-pub struct ContinuousDelivery<A: OCICompliant + HelmPackage> {
+pub struct ContinuousDelivery {}
    pub application: Arc<A>,
 }
 impl<A: OCICompliant + HelmPackage> ContinuousDelivery<A> {
    async fn deploy_to_local_k3d(
        &self,
        app_name: String,
        chart_url: String,
        image_name: String,
    ) -> Result<(), String> {
        let config = Config::load().expect("couldn't load config");
        error!(
            "FIXME This works only with local k3d installations, which is fine only for current demo purposes. We assume usage of K8sAnywhereTopology"
        );
        error!("TODO hardcoded k3d bin path is wrong");
        let k3d_bin_path = config.data_dir.join("k3d").join("k3d");
        // --- 1. Import the container image into the k3d cluster ---
        info!(
            "Importing image '{}' into k3d cluster 'harmony'",
            image_name
        );
        let import_output = Command::new(&k3d_bin_path)
            .args(["image", "import", &image_name, "--cluster", "harmony"])
            .output()
            .map_err(|e| format!("Failed to execute k3d image import: {}", e))?;
        if !import_output.status.success() {
            return Err(format!(
                "Failed to import image to k3d: {}",
                String::from_utf8_lossy(&import_output.stderr)
            ));
        }
        // --- 2. Get the kubeconfig for the k3d cluster and write it to a temp file ---
        info!("Retrieving kubeconfig for k3d cluster 'harmony'");
        let kubeconfig_output = Command::new(&k3d_bin_path)
            .args(["kubeconfig", "get", "harmony"])
            .output()
            .map_err(|e| format!("Failed to execute k3d kubeconfig get: {}", e))?;
        if !kubeconfig_output.status.success() {
            return Err(format!(
                "Failed to get kubeconfig from k3d: {}",
                String::from_utf8_lossy(&kubeconfig_output.stderr)
            ));
        }
        let mut temp_kubeconfig = NamedTempFile::new()
            .map_err(|e| format!("Failed to create temp file for kubeconfig: {}", e))?;
        temp_kubeconfig
            .write_all(&kubeconfig_output.stdout)
            .map_err(|e| format!("Failed to write to temp kubeconfig file: {}", e))?;
        let kubeconfig_path = temp_kubeconfig.path().to_str().unwrap();
        // --- 3. Install or upgrade the Helm chart in the cluster ---
        info!(
            "Deploying Helm chart '{}' to namespace '{}'",
            chart_url, app_name
        );
        let release_name = app_name.to_lowercase(); // Helm release names are often lowercase
        let helm_output = Command::new("helm")
            .args([
                "upgrade",
                "--install",
                &release_name,
                &chart_url,
                "--namespace",
                &app_name,
                "--create-namespace",
                "--wait", // Wait for the deployment to be ready
                "--kubeconfig",
                kubeconfig_path,
            ])
            .spawn()
            .map_err(|e| format!("Failed to execute helm upgrade: {}", e))?
            .wait_with_output()
            .map_err(|e| format!("Failed to execute helm upgrade: {}", e))?;
        if !helm_output.status.success() {
            return Err(format!(
                "Failed to deploy Helm chart: {}",
                String::from_utf8_lossy(&helm_output.stderr)
            ));
        }
        info!("Successfully deployed '{}' to local k3d cluster.", app_name);
        Ok(())
    }
 }
 #[async_trait]
-impl<
+impl<T: Topology + HelmCommand + 'static> ApplicationFeature<T> for ContinuousDelivery {
    A: OCICompliant + HelmPackage + Clone + 'static,
    T: Topology + HelmCommand + MultiTargetTopology + K8sclient + 'static,
 > ApplicationFeature<T> for ContinuousDelivery<A>
 {
    async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
        let image = self.application.image_name();
        // TODO
        error!(
            "TODO reverse helm chart packaging and docker image build. I put helm package first for faster iterations"
        );
        // TODO Write CI/CD workflow files
        // we can autotedect the CI type using the remote url (default to github action for github
        // url, etc..)
        // Or ask for it when unknown
        let helm_chart = self.application.build_push_helm_package(&image).await?;
        info!("Pushed new helm chart {helm_chart}");
        error!("TODO Make building image configurable/skippable");
        let image = self.application.build_push_oci_image().await?;
        info!("Pushed new docker image {image}");
        info!("Installing ContinuousDelivery feature");
-        // TODO this is a temporary hack for demo purposes, the deployment target should be driven
+        let cd_server = HelmChartScore {
-        // by the topology only and we should not have to know how to perform tasks like this for
+            namespace: todo!(
-        // which the topology should be responsible.
+                "ArgoCD Helm chart with proper understanding of Tenant, see how Will did it for Monitoring for now"
-        //
+            ),
-        // That said, this will require some careful architectural decisions, since the concept of
+            release_name: todo!("argocd helm chart whatever"),
-        // deployment targets / profiles is probably a layer of complexity that we won't be
+            chart_name: todo!(),
-        // completely able to avoid
+            chart_version: todo!(),
-        //
+            values_overrides: todo!(),
-        // I'll try something for now that must be thought through after : att a deployment_profile
+            values_yaml: todo!(),
-        // function to the topology trait that returns a profile, then anybody who needs it can
+            create_namespace: todo!(),
-        // access it. This forces every Topology to understand the concept of targets though... So
+            install_only: todo!(),
-        // instead I'll create a new Capability which is MultiTargetTopology and we'll see how it
+            repository: todo!(),
        // goes. It still does not feel right though.
        match topology.current_target() {
            DeploymentTarget::LocalDev => {
                self.deploy_to_local_k3d(self.application.name(), helm_chart, image)
                    .await?;
            }
            target => {
                info!("Deploying to target {target:?}");
                let score = ArgoHelmScore {
                    namespace: "harmonydemo-staging".to_string(),
                    openshift: false,
                    domain: "argo.harmonydemo.apps.st.mcd".to_string(),
                    argo_apps: vec![ArgoApplication::from(CDApplicationConfig {
                        // helm pull oci://hub.nationtech.io/harmony/harmony-example-rust-webapp-chart --version 0.1.0
                        version: Version::from("0.1.0").unwrap(),
                        helm_chart_repo_url: "hub.nationtech.io/harmony".to_string(),
                        helm_chart_name: "harmony-example-rust-webapp-chart".to_string(),
                        values_overrides: None,
                        name: "harmony-demo-rust-webapp".to_string(),
                        namespace: "harmonydemo-staging".to_string(),
                    })],
                };
                score
                    .create_interpret()
                    .execute(&Inventory::empty(), topology)
                    .await
                    .unwrap();
            }
        };
-        Ok(())
+        let interpret = cd_server.create_interpret();
        interpret.execute(&Inventory::empty(), topology);
        todo!("1. Create ArgoCD score that installs argo using helm chart, see if Taha's already done it
            2. Package app (docker image, helm chart)
            3. Push to registry if staging or prod
            4. Poke Argo
            5. Ensure app is up")
    }
    fn name(&self) -> String {
        "ContinuousDelivery".to_string()
@@ -216,12 +74,9 @@ impl<
 /// For now this is entirely bound to K8s / ArgoCD, will have to be revisited when we support
 /// more CD systems
 pub struct CDApplicationConfig {
-    pub version: Version,
+    version: Version,
-    pub helm_chart_repo_url: String,
+    helm_chart_url: Url,
-    pub helm_chart_name: String,
+    values_overrides: Value,
    pub values_overrides: Option<Value>,
    pub name: String,
    pub namespace: String,
 }
 pub trait ContinuousDeliveryApplication {
--- a/harmony/src/modules/application/features/helm_argocd_score.rs
+++ b/harmony/src/modules/application/features/helm_argocd_score.rs
--- a/harmony/src/modules/application/features/mod.rs
+++ b/harmony/src/modules/application/features/mod.rs
@@ -6,9 +6,3 @@ pub use monitoring::*;
 mod continuous_delivery;
 pub use continuous_delivery::*;
 mod helm_argocd_score;
 pub use helm_argocd_score::*;
 mod argo_types;
 pub use argo_types::*;
--- a/harmony/src/modules/application/features/monitoring.rs
+++ b/harmony/src/modules/application/features/monitoring.rs
@@ -1,109 +1,19 @@
 use std::sync::Arc;
 use async_trait::async_trait;
-use base64::{Engine as _, engine::general_purpose};
+use log::info;
 use log::{debug, info};
 use crate::{
-    inventory::Inventory,
+    modules::application::ApplicationFeature,
-    modules::{
+    topology::{HelmCommand, Topology},
        application::{ApplicationFeature, OCICompliant},
        monitoring::{
            alert_channel::webhook_receiver::WebhookReceiver,
            kube_prometheus::{
                helm_prometheus_alert_score::HelmPrometheusAlertingScore,
                types::{NamespaceSelector, ServiceMonitor},
            },
            ntfy::ntfy::NtfyScore,
        },
    },
    score::Score,
    topology::{HelmCommand, K8sclient, Topology, Url, tenant::TenantManager},
 };
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
-pub struct Monitoring {
+pub struct Monitoring {}
    pub application: Arc<dyn OCICompliant>,
 }
 #[async_trait]
-impl<T: Topology + HelmCommand + K8sclient + 'static + TenantManager> ApplicationFeature<T>
+impl<T: Topology + HelmCommand + 'static> ApplicationFeature<T> for Monitoring {
-    for Monitoring
+    async fn ensure_installed(&self, _topology: &T) -> Result<(), String> {
 {
    async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
        info!("Ensuring monitoring is available for application");
-
+        todo!("create and execute k8s prometheus score, depends on Will's work")
        let ntfy = NtfyScore {
            // namespace: topology
            //     .get_tenant_config()
            //     .await
            //     .expect("couldn't get tenant config")
            //     .name,
            namespace: self.application.name(),
            host: "localhost".to_string(),
        };
        ntfy.create_interpret()
            .execute(&Inventory::empty(), topology)
            .await
            .expect("couldn't create interpret for ntfy");
        let ntfy_default_auth_username = "harmony";
        let ntfy_default_auth_password = "harmony";
        let ntfy_default_auth_header = format!(
            "Basic {}",
            general_purpose::STANDARD.encode(format!(
                "{ntfy_default_auth_username}:{ntfy_default_auth_password}"
            ))
        );
        debug!("ntfy_default_auth_header: {ntfy_default_auth_header}");
        let ntfy_default_auth_param = general_purpose::STANDARD
            .encode(ntfy_default_auth_header)
            .replace("=", "");
        debug!("ntfy_default_auth_param: {ntfy_default_auth_param}");
        let ntfy_receiver = WebhookReceiver {
            name: "ntfy-webhook".to_string(),
            url: Url::Url(
                url::Url::parse(
                    format!(
                        "http://ntfy.{}.svc.cluster.local/rust-web-app?auth={ntfy_default_auth_param}",
                        self.application.name()
                    )
                    .as_str(),
                )
                .unwrap(),
            ),
        };
        let mut service_monitor = ServiceMonitor::default();
        service_monitor.namespace_selector = Some(NamespaceSelector {
            any: true,
            match_names: vec![],
        });
        service_monitor.name = "rust-webapp".to_string();
        // let alerting_score = ApplicationPrometheusMonitoringScore {
        //     receivers: vec![Box::new(ntfy_receiver)],
        //     rules: vec![],
        //     service_monitors: vec![service_monitor],
        // };
        let alerting_score = HelmPrometheusAlertingScore {
            receivers: vec![Box::new(ntfy_receiver)],
            rules: vec![],
            service_monitors: vec![service_monitor],
        };
        alerting_score
            .create_interpret()
            .execute(&Inventory::empty(), topology)
            .await
            .unwrap();
        Ok(())
    }
    fn name(&self) -> String {
        "Monitoring".to_string()
--- a/harmony/src/modules/application/mod.rs
+++ b/harmony/src/modules/application/mod.rs
@@ -1,12 +1,8 @@
 mod feature;
 pub mod features;
 pub mod oci;
 mod rust;
 use std::sync::Arc;
 pub use feature::*;
 use log::info;
 pub use oci::*;
 pub use rust::*;
 use async_trait::async_trait;
@@ -23,13 +19,13 @@ pub trait Application: std::fmt::Debug + Send + Sync {
 }
 #[derive(Debug)]
-pub struct ApplicationInterpret<A: Application, T: Topology + std::fmt::Debug> {
+pub struct ApplicationInterpret<T: Topology + std::fmt::Debug> {
    features: Vec<Box<dyn ApplicationFeature<T>>>,
-    application: Arc<A>,
+    application: Box<dyn Application>,
 }
 #[async_trait]
-impl<A: Application, T: Topology + std::fmt::Debug> Interpret<T> for ApplicationInterpret<A, T> {
+impl<T: Topology + std::fmt::Debug> Interpret<T> for ApplicationInterpret<T> {
    async fn execute(
        &self,
        _inventory: &Inventory,
@@ -59,7 +55,9 @@ impl<A: Application, T: Topology + std::fmt::Debug> Interpret<T> for Application
                }
            };
        }
-        Ok(Outcome::success("successfully created app".to_string()))
+        todo!(
            "Do I need to do anything more than this here?? I feel like the Application trait itself should expose something like ensure_ready but its becoming redundant. We'll see as this evolves."
        )
    }
    fn get_name(&self) -> InterpretName {
--- a/harmony/src/modules/application/oci.rs
+++ b/harmony/src/modules/application/oci.rs
@@ -1,21 +0,0 @@
 use async_trait::async_trait;
 use super::Application;
 #[async_trait]
 pub trait OCICompliant: Application {
    async fn build_push_oci_image(&self) -> Result<String, String>; // TODO consider using oci-spec and friends crates here
    fn image_name(&self) -> String;
    fn local_image_name(&self) -> String;
 }
 #[async_trait]
 pub trait HelmPackage: Application {
    /// Generates, packages, and pushes a Helm chart for the web application to an OCI registry.
    ///
    /// # Arguments
    /// * `image_url` - The full URL of the OCI container image to be used in the Deployment.
    async fn build_push_helm_package(&self, image_url: &str) -> Result<String, String>;
 }
--- a/harmony/src/modules/application/rust.rs
+++ b/harmony/src/modules/application/rust.rs
@@ -1,67 +1,37 @@
 use std::fs;
 use std::path::PathBuf;
 use std::process;
 use std::sync::Arc;
 use async_trait::async_trait;
 use bollard::query_parameters::PushImageOptionsBuilder;
 use bollard::{Docker, body_full};
 use dockerfile_builder::Dockerfile;
 use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, USER, WORKDIR};
 use dockerfile_builder::instruction_builder::CopyBuilder;
 use futures_util::StreamExt;
 use log::{debug, error, info};
 use serde::Serialize;
 use tar::Archive;
 use crate::config::Config;
 use crate::{
    score::Score,
    topology::{Topology, Url},
 };
-use super::{Application, ApplicationFeature, ApplicationInterpret, HelmPackage, OCICompliant};
+use super::{Application, ApplicationFeature, ApplicationInterpret};
 #[derive(Debug, Serialize, Clone)]
-pub struct ApplicationScore<A: Application + Serialize, T: Topology + Clone + Serialize>
+pub struct RustWebappScore<T: Topology + Clone + Serialize> {
-where
+    pub name: String,
-    Arc<A>: Serialize + Clone,
+    pub domain: Url,
 {
    pub features: Vec<Box<dyn ApplicationFeature<T>>>,
    pub application: Arc<A>,
 }
-impl<
+impl<T: Topology + std::fmt::Debug + Clone + Serialize + 'static> Score<T> for RustWebappScore<T> {
    A: Application + Serialize + Clone + 'static,
    T: Topology + std::fmt::Debug + Clone + Serialize + 'static,
 > Score<T> for ApplicationScore<A, T>
 where
    Arc<A>: Serialize,
 {
    fn create_interpret(&self) -> Box<dyn crate::interpret::Interpret<T>> {
        Box::new(ApplicationInterpret {
            features: self.features.clone(),
-            application: self.application.clone(),
+            application: Box::new(RustWebapp {
                name: self.name.clone(),
            }),
        })
    }
    fn name(&self) -> String {
-        format!("Application: {}", self.application.name())
+        format!("{}-RustWebapp", self.name)
    }
 }
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug)]
-pub enum RustWebFramework {
+struct RustWebapp {
-    Leptos,
+    name: String,
 }
 #[derive(Debug, Clone, Serialize)]
 pub struct RustWebapp {
    pub name: String,
    pub domain: Url,
    /// The path to the root of the Rust project to be containerized.
    pub project_root: PathBuf,
    pub framework: Option<RustWebFramework>,
 }
 impl Application for RustWebapp {
@@ -69,537 +39,3 @@ impl Application for RustWebapp {
        self.name.clone()
    }
 }
 #[async_trait]
 impl HelmPackage for RustWebapp {
    async fn build_push_helm_package(&self, image_url: &str) -> Result<String, String> {
        info!("Starting Helm chart build and push for '{}'", self.name);
        // 1. Create the Helm chart files on disk.
        let chart_dir = self
            .create_helm_chart_files(image_url)
            .map_err(|e| format!("Failed to create Helm chart files: {}", e))?;
        info!("Successfully created Helm chart files in {:?}", chart_dir);
        // 2. Package the chart into a .tgz archive.
        let packaged_chart_path = self
            .package_helm_chart(&chart_dir)
            .map_err(|e| format!("Failed to package Helm chart: {}", e))?;
        info!(
            "Successfully packaged Helm chart: {}",
            packaged_chart_path.to_string_lossy()
        );
        // 3. Push the packaged chart to the OCI registry.
        let oci_chart_url = self
            .push_helm_chart(&packaged_chart_path)
            .map_err(|e| format!("Failed to push Helm chart: {}", e))?;
        info!("Successfully pushed Helm chart to: {}", oci_chart_url);
        Ok(oci_chart_url)
    }
 }
 #[async_trait]
 impl OCICompliant for RustWebapp {
    /// Builds a Docker image for the Rust web application using a multi-stage build,
    /// pushes it to the configured OCI registry, and returns the full image tag.
    async fn build_push_oci_image(&self) -> Result<String, String> {
        // This function orchestrates the build and push process.
        // It's async to match the trait definition, though the underlying docker commands are blocking.
        info!("Starting OCI image build and push for '{}'", self.name);
        // 1. Build the local image by calling the synchronous helper function.
        let local_image_name = self.local_image_name();
        self.build_docker_image(&local_image_name)
            .await
            .map_err(|e| format!("Failed to build Docker image: {}", e))?;
        info!(
            "Successfully built local Docker image: {}",
            local_image_name
        );
        let remote_image_name = self.image_name();
        // 2. Push the image to the registry.
        self.push_docker_image(&local_image_name, &remote_image_name)
            .await
            .map_err(|e| format!("Failed to push Docker image: {}", e))?;
        info!("Successfully pushed Docker image to: {}", remote_image_name);
        Ok(remote_image_name)
    }
    fn local_image_name(&self) -> String {
        self.name.clone()
    }
    fn image_name(&self) -> String {
        let config = Config::load().expect("couldn't load config");
        format!(
            "{}/{}/{}",
            config.registry_url,
            config.registry_project,
            &self.local_image_name()
        )
    }
 }
 /// Implementation of helper methods for building and pushing the Docker image.
 impl RustWebapp {
    /// Generates a multi-stage Dockerfile for a Rust application.
    fn build_dockerfile(&self) -> Result<PathBuf, Box<dyn std::error::Error>> {
        let mut dockerfile = Dockerfile::new();
        self.build_builder_image(&mut dockerfile);
        // Save the Dockerfile to a uniquely named file in the project root to avoid conflicts.
        let dockerfile_path = self.project_root.join("Dockerfile.harmony");
        fs::write(&dockerfile_path, dockerfile.to_string())?;
        Ok(dockerfile_path)
    }
    /// Builds the Docker image using the generated Dockerfile.
    pub async fn build_docker_image(
        &self,
        image_name: &str,
    ) -> Result<String, Box<dyn std::error::Error>> {
        info!("Generating Dockerfile for '{}'", self.name);
        let _dockerfile_path = self.build_dockerfile()?;
        let docker = Docker::connect_with_socket_defaults().unwrap();
        let build_image_options = bollard::query_parameters::BuildImageOptionsBuilder::default()
            .dockerfile("Dockerfile.harmony")
            .t(image_name)
            .q(false)
            .version(bollard::query_parameters::BuilderVersion::BuilderV1)
            .platform("linux/x86_64");
        let mut temp_tar_builder = tar::Builder::new(Vec::new());
        let _ = temp_tar_builder
            .append_dir_all("", self.project_root.clone())
            .unwrap();
        let archive = temp_tar_builder
            .into_inner()
            .expect("couldn't finish creating tar");
        let archived_files = Archive::new(archive.as_slice())
            .entries()
            .unwrap()
            .map(|entry| entry.unwrap().path().unwrap().into_owned())
            .collect::<Vec<_>>();
        debug!("files in docker tar: {:#?}", archived_files);
        let mut image_build_stream = docker.build_image(
            build_image_options.build(),
            None,
            Some(body_full(archive.into())),
        );
        while let Some(msg) = image_build_stream.next().await {
            println!("Message: {msg:?}");
        }
        Ok(image_name.to_string())
    }
    /// Tags and pushes a Docker image to the configured remote registry.
    async fn push_docker_image(
        &self,
        image_name: &str,
        full_tag: &str,
    ) -> Result<String, Box<dyn std::error::Error>> {
        info!("Pushing docker image {full_tag}");
        let docker = Docker::connect_with_socket_defaults().unwrap();
        // let push_options = PushImageOptionsBuilder::new().tag(tag);
        let mut push_image_stream =
            docker.push_image(full_tag, Some(PushImageOptionsBuilder::new().build()), None);
        while let Some(msg) = push_image_stream.next().await {
            println!("Message: {msg:?}");
        }
        Ok(full_tag.to_string())
    }
    /// Checks the output of a process command for success.
    fn check_output(
        &self,
        output: &process::Output,
        msg: &str,
    ) -> Result<(), Box<dyn std::error::Error>> {
        if !output.status.success() {
            let error_message = format!("{}: {}", msg, String::from_utf8_lossy(&output.stderr));
            return Err(error_message.into());
        }
        Ok(())
    }
    fn build_builder_image(&self, dockerfile: &mut Dockerfile) {
        match self.framework {
            Some(RustWebFramework::Leptos) => {
                // --- Stage 1: Builder for Leptos ---
                dockerfile.push(FROM::from("rust:bookworm as builder"));
                // Install dependencies, cargo-binstall, and clean up in one layer
                dockerfile.push(RUN::from(
                    "apt-get update && \
                     apt-get install -y --no-install-recommends clang wget && \
                     wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && \
                     tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && \
                     cp cargo-binstall /usr/local/cargo/bin && \
                     rm cargo-binstall-x86_64-unknown-linux-musl.tgz cargo-binstall && \
                     apt-get clean && \
                     rm -rf /var/lib/apt/lists/*"
                ));
                // Install cargo-leptos
                dockerfile.push(RUN::from("cargo binstall cargo-leptos -y"));
                // Add the WASM target
                dockerfile.push(RUN::from("rustup target add wasm32-unknown-unknown"));
                // Set up workdir, copy source, and build
                dockerfile.push(WORKDIR::from("/app"));
                dockerfile.push(COPY::from(". ."));
                dockerfile.push(RUN::from("cargo leptos build --release -vv"));
                // --- Stage 2: Final Image ---
                dockerfile.push(FROM::from("debian:bookworm-slim"));
                // Create a non-root user for security.
                dockerfile.push(RUN::from(
                    "groupadd -r appgroup && useradd -r -s /bin/false -g appgroup appuser",
                ));
                dockerfile.push(ENV::from("LEPTOS_SITE_ADDR=0.0.0.0:3000"));
                dockerfile.push(EXPOSE::from("3000/tcp"));
                dockerfile.push(WORKDIR::from("/home/appuser"));
                // Copy static files
                dockerfile.push(
                    CopyBuilder::builder()
                        .from("builder")
                        .src("/app/target/site/pkg")
                        .dest("/home/appuser/pkg")
                        .build()
                        .unwrap(),
                );
                // Copy the compiled binary from the builder stage.
                error!(
                    "FIXME Should not be using score name here, instead should use name from Cargo.toml"
                );
                let binary_path_in_builder = format!("/app/target/release/{}", self.name);
                let binary_path_in_final = format!("/home/appuser/{}", self.name);
                dockerfile.push(
                    CopyBuilder::builder()
                        .from("builder")
                        .src(binary_path_in_builder)
                        .dest(&binary_path_in_final)
                        .build()
                        .unwrap(),
                );
                // Run as the non-root user.
                dockerfile.push(USER::from("appuser"));
                // Set the command to run the application.
                dockerfile.push(CMD::from(binary_path_in_final));
            }
            None => {
                // --- Stage 1: Builder for a generic Rust app ---
                dockerfile.push(FROM::from("rust:latest as builder"));
                // Install the wasm32 target as required.
                dockerfile.push(RUN::from("rustup target add wasm32-unknown-unknown"));
                dockerfile.push(WORKDIR::from("/app"));
                // Copy the source code and build the application.
                dockerfile.push(COPY::from(". ."));
                dockerfile.push(RUN::from("cargo build --release --locked"));
                // --- Stage 2: Final Image ---
                dockerfile.push(FROM::from("debian:bookworm-slim"));
                // Create a non-root user for security.
                dockerfile.push(RUN::from(
                    "groupadd -r appgroup && useradd -r -s /bin/false -g appgroup appuser",
                ));
                // Copy only the compiled binary from the builder stage.
                error!(
                    "FIXME Should not be using score name here, instead should use name from Cargo.toml"
                );
                let binary_path_in_builder = format!("/app/target/release/{}", self.name);
                let binary_path_in_final = format!("/usr/local/bin/{}", self.name);
                dockerfile.push(
                    CopyBuilder::builder()
                        .from("builder")
                        .src(binary_path_in_builder)
                        .dest(&binary_path_in_final)
                        .build()
                        .unwrap(),
                );
                // Run as the non-root user.
                dockerfile.push(USER::from("appuser"));
                // Set the command to run the application.
                dockerfile.push(CMD::from(binary_path_in_final));
            }
        }
    }
    /// Creates all necessary files for a basic Helm chart.
    fn create_helm_chart_files(
        &self,
        image_url: &str,
    ) -> Result<PathBuf, Box<dyn std::error::Error>> {
        let chart_name = format!("{}-chart", self.name);
        let chart_dir = self
            .project_root
            .join(".harmony_generated")
            .join("helm")
            .join(&chart_name);
        let templates_dir = chart_dir.join("templates");
        fs::create_dir_all(&templates_dir)?;
        let (image_repo, image_tag) = image_url.rsplit_once(':').unwrap_or((image_url, "latest"));
        // Create Chart.yaml
        let chart_yaml = format!(
            r#"
 apiVersion: v2
 name: {}
 description: A Helm chart for the {} web application.
 type: application
 version: 0.1.0
 appVersion: "{}"
 "#,
            chart_name, self.name, image_tag
        );
        fs::write(chart_dir.join("Chart.yaml"), chart_yaml)?;
        // Create values.yaml
        let values_yaml = format!(
            r#"
 # Default values for {}.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 replicaCount: 1
 image:
  repository: {}
  pullPolicy: IfNotPresent
  # Overridden by the chart's appVersion
  tag: "{}"
 service:
  type: ClusterIP
  port: 3000
 ingress:
  enabled: true
  # Annotations for cert-manager to handle SSL.
  annotations:
    cert-manager.io/cluster-issuer: "letsencrypt-prod"
    # Add other annotations like nginx ingress class if needed
    # kubernetes.io/ingress.class: nginx
  hosts:
    - host: chart-example.local
      paths:
        - path: /
          pathType: ImplementationSpecific
  tls:
   - secretName: {}-tls
     hosts:
       - chart-example.local
 "#,
            chart_name, image_repo, image_tag, self.name
        );
        fs::write(chart_dir.join("values.yaml"), values_yaml)?;
        // Create templates/_helpers.tpl
        let helpers_tpl = r#"
 {{/*
 Expand the name of the chart.
 */}}
 {{- define "chart.name" -}}
 {{- default .Chart.Name $.Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "chart.fullname" -}}
 {{- $name := default .Chart.Name $.Values.nameOverride }}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 "#;
        fs::write(templates_dir.join("_helpers.tpl"), helpers_tpl)?;
        // Create templates/service.yaml
        let service_yaml = r#"
 apiVersion: v1
 kind: Service
 metadata:
  name: {{ include "chart.fullname" . }}
 spec:
  type: {{ $.Values.service.type }}
  ports:
    - name: main
      port: {{ $.Values.service.port | default 3000 }}
      targetPort: {{ $.Values.service.port | default 3000 }}
      protocol: TCP
  selector:
    app: {{ include "chart.name" . }}
 "#;
        fs::write(templates_dir.join("service.yaml"), service_yaml)?;
        // Create templates/deployment.yaml
        let deployment_yaml = r#"
 apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ include "chart.fullname" . }}
 spec:
  replicas: {{ $.Values.replicaCount }}
  selector:
    matchLabels:
      app: {{ include "chart.name" . }}
  template:
    metadata:
      labels:
        app: {{ include "chart.name" . }}
    spec:
      containers:
        - name: {{ .Chart.Name }}
          image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default .Chart.AppVersion }}"
          imagePullPolicy: {{ $.Values.image.pullPolicy }}
          ports:
            - name: main
              containerPort: {{ $.Values.service.port | default 3000 }}
              protocol: TCP
 "#;
        fs::write(templates_dir.join("deployment.yaml"), deployment_yaml)?;
        // Create templates/ingress.yaml
        let ingress_yaml = r#"
 {{- if $.Values.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: {{ include "chart.fullname" . }}
  annotations:
    {{- toYaml $.Values.ingress.annotations | nindent 4 }}
 spec:
  {{- if $.Values.ingress.tls }}
  tls:
    {{- range $.Values.ingress.tls }}
    - hosts:
        {{- range .hosts }}
        - {{ . | quote }}
        {{- end }}
      secretName: {{ .secretName }}
    {{- end }}
  {{- end }}
  rules:
    {{- range $.Values.ingress.hosts }}
    - host: {{ .host | quote }}
      http:
        paths:
          {{- range .paths }}
          - path: {{ .path }}
            pathType: {{ .pathType }}
            backend:
              service:
                name: {{ include "chart.fullname" $ }}
                port:
                  number: {{ $.Values.service.port | default 3000 }}
          {{- end }}
    {{- end }}
 {{- end }}
 "#;
        fs::write(templates_dir.join("ingress.yaml"), ingress_yaml)?;
        Ok(chart_dir)
    }
    /// Packages a Helm chart directory into a .tgz file.
    fn package_helm_chart(
        &self,
        chart_dir: &PathBuf,
    ) -> Result<PathBuf, Box<dyn std::error::Error>> {
        let chart_dirname = chart_dir.file_name().expect("Should find a chart dirname");
        info!(
            "Launching `helm package {}` cli with CWD {}",
            chart_dirname.to_string_lossy(),
            &self
                .project_root
                .join(".harmony_generated")
                .join("helm")
                .to_string_lossy()
        );
        let output = process::Command::new("helm")
            .args(["package", chart_dirname.to_str().unwrap()])
            .current_dir(&self.project_root.join(".harmony_generated").join("helm")) // Run package from the parent dir
            .output()?;
        self.check_output(&output, "Failed to package Helm chart")?;
        // Helm prints the path of the created chart to stdout.
        let tgz_name = String::from_utf8(output.stdout)?
            .trim()
            .split_whitespace()
            .last()
            .unwrap_or_default()
            .to_string();
        if tgz_name.is_empty() {
            return Err("Could not determine packaged chart filename.".into());
        }
        // The output from helm is relative, so we join it with the execution directory.
        Ok(self
            .project_root
            .join(".harmony_generated")
            .join("helm")
            .join(tgz_name))
    }
    /// Pushes a packaged Helm chart to an OCI registry.
    fn push_helm_chart(
        &self,
        packaged_chart_path: &PathBuf,
    ) -> Result<String, Box<dyn std::error::Error>> {
        let config = Config::load().expect("couldn't load config");
        // The chart name is the file stem of the .tgz file
        let chart_file_name = packaged_chart_path.file_stem().unwrap().to_str().unwrap();
        let oci_push_url = format!("oci://{}/{}", config.registry_url, config.registry_project);
        let oci_pull_url = format!("{oci_push_url}/{}-chart", self.name);
        info!(
            "Pushing Helm chart {} to {}",
            packaged_chart_path.to_string_lossy(),
            oci_push_url
        );
        let output = process::Command::new("helm")
            .args(["push", packaged_chart_path.to_str().unwrap(), &oci_push_url])
            .output()?;
        self.check_output(&output, "Pushing Helm chart failed")?;
        // The final URL includes the version tag, which is part of the file name
        let version = chart_file_name.rsplit_once('-').unwrap().1;
        debug!("pull url {oci_pull_url}");
        debug!("push url {oci_push_url}");
        Ok(format!("{}:{}", oci_pull_url, version))
    }
 }
--- a/harmony/src/modules/http.rs
+++ b/harmony/src/modules/http.rs
@@ -10,25 +10,14 @@ use crate::{
    topology::{HttpServer, Topology, Url},
 };
 /// Configure an HTTP server that is provided by the Topology
 ///
 /// This Score will let you easily specify a file path to be served by the HTTP server
 ///
 /// For example, if you have a folder of assets at `/var/www/assets` simply do :
 ///
 /// ```rust,ignore
 /// StaticFilesHttpScore {
 ///   files_to_serve: url!("file:///var/www/assets"),
 /// }
 /// ```
 #[derive(Debug, new, Clone, Serialize)]
-pub struct StaticFilesHttpScore {
+pub struct HttpScore {
    files_to_serve: Url,
 }
-impl<T: Topology + HttpServer> Score<T> for StaticFilesHttpScore {
+impl<T: Topology + HttpServer> Score<T> for HttpScore {
    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
-        Box::new(StaticFilesHttpInterpret::new(self.clone()))
+        Box::new(HttpInterpret::new(self.clone()))
    }
    fn name(&self) -> String {
@@ -37,12 +26,12 @@ impl<T: Topology + HttpServer> Score<T> for StaticFilesHttpScore {
 }
 #[derive(Debug, new, Clone)]
-pub struct StaticFilesHttpInterpret {
+pub struct HttpInterpret {
-    score: StaticFilesHttpScore,
+    score: HttpScore,
 }
 #[async_trait]
-impl<T: Topology + HttpServer> Interpret<T> for StaticFilesHttpInterpret {
+impl<T: Topology + HttpServer> Interpret<T> for HttpInterpret {
    async fn execute(
        &self,
        _inventory: &Inventory,
--- a/harmony/src/modules/k3d/install.rs
+++ b/harmony/src/modules/k3d/install.rs
@@ -5,7 +5,7 @@ use log::info;
 use serde::Serialize;
 use crate::{
-    config::Config,
+    config::HARMONY_CONFIG_DIR,
    data::{Id, Version},
    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
    inventory::Inventory,
@@ -21,10 +21,8 @@ pub struct K3DInstallationScore {
 impl Default for K3DInstallationScore {
    fn default() -> Self {
        let config = Config::load().expect("couldn't load config");
        Self {
-            installation_path: config.data_dir.join("k3d"),
+            installation_path: HARMONY_CONFIG_DIR.join("k3d"),
            cluster_name: "harmony".to_string(),
        }
    }
--- a/harmony/src/modules/lamp.rs
+++ b/harmony/src/modules/lamp.rs
@@ -14,7 +14,7 @@ use async_trait::async_trait;
 use log::{debug, info};
 use serde::Serialize;
-use crate::config::Config as HarmonyConfig;
+use crate::config::{REGISTRY_PROJECT, REGISTRY_URL};
 use crate::modules::k8s::ingress::K8sIngressScore;
 use crate::topology::HelmCommand;
 use crate::{
@@ -355,12 +355,7 @@ opcache.fast_shutdown=1
    }
    fn push_docker_image(&self, image_name: &str) -> Result<String, Box<dyn std::error::Error>> {
-        let config = HarmonyConfig::load().expect("couldn't load config");
+        let full_tag = format!("{}/{}/{}", *REGISTRY_URL, *REGISTRY_PROJECT, &image_name);
        let full_tag = format!(
            "{}/{}/{}",
            config.registry_url, config.registry_project, &image_name
        );
        let output = std::process::Command::new("docker")
            .args(["tag", image_name, &full_tag])
            .output()?;
--- a/harmony/src/modules/mod.rs
+++ b/harmony/src/modules/mod.rs
@@ -16,3 +16,4 @@ pub mod opnsense;
 pub mod prometheus;
 pub mod tenant;
 pub mod tftp;
 pub mod postgres;
--- a/harmony/src/modules/monitoring/alert_channel/discord_alert_channel.rs
+++ b/harmony/src/modules/monitoring/alert_channel/discord_alert_channel.rs
@@ -4,12 +4,9 @@ use serde_yaml::{Mapping, Value};
 use crate::{
    interpret::{InterpretError, Outcome},
-    modules::monitoring::{
+    modules::monitoring::kube_prometheus::{
-        kube_prometheus::{
+        prometheus::{Prometheus, PrometheusReceiver},
-            prometheus::{KubePrometheus, KubePrometheusReceiver},
+        types::{AlertChannelConfig, AlertManagerChannelConfig},
            types::{AlertChannelConfig, AlertManagerChannelConfig},
        },
        prometheus::prometheus::{Prometheus, PrometheusReceiver},
    },
    topology::{Url, oberservability::monitoring::AlertReceiver},
 };
@@ -40,26 +37,6 @@ impl PrometheusReceiver for DiscordWebhook {
    }
 }
 #[async_trait]
 impl AlertReceiver<KubePrometheus> for DiscordWebhook {
    async fn install(&self, sender: &KubePrometheus) -> Result<Outcome, InterpretError> {
        sender.install_receiver(self).await
    }
    fn clone_box(&self) -> Box<dyn AlertReceiver<KubePrometheus>> {
        Box::new(self.clone())
    }
 }
 #[async_trait]
 impl KubePrometheusReceiver for DiscordWebhook {
    fn name(&self) -> String {
        self.name.clone()
    }
    async fn configure_receiver(&self) -> AlertManagerChannelConfig {
        self.get_config().await
    }
 }
 #[async_trait]
 impl AlertChannelConfig for DiscordWebhook {
    async fn get_config(&self) -> AlertManagerChannelConfig {
--- a/harmony/src/modules/monitoring/alert_channel/webhook_receiver.rs
+++ b/harmony/src/modules/monitoring/alert_channel/webhook_receiver.rs
@@ -4,12 +4,9 @@ use serde_yaml::{Mapping, Value};
 use crate::{
    interpret::{InterpretError, Outcome},
-    modules::monitoring::{
+    modules::monitoring::kube_prometheus::{
-        kube_prometheus::{
+        prometheus::{Prometheus, PrometheusReceiver},
-            prometheus::{KubePrometheus, KubePrometheusReceiver},
+        types::{AlertChannelConfig, AlertManagerChannelConfig},
            types::{AlertChannelConfig, AlertManagerChannelConfig},
        },
        prometheus::prometheus::{Prometheus, PrometheusReceiver},
    },
    topology::{Url, oberservability::monitoring::AlertReceiver},
 };
@@ -39,25 +36,6 @@ impl PrometheusReceiver for WebhookReceiver {
        self.get_config().await
    }
 }
 #[async_trait]
 impl AlertReceiver<KubePrometheus> for WebhookReceiver {
    async fn install(&self, sender: &KubePrometheus) -> Result<Outcome, InterpretError> {
        sender.install_receiver(self).await
    }
    fn clone_box(&self) -> Box<dyn AlertReceiver<KubePrometheus>> {
        Box::new(self.clone())
    }
 }
 #[async_trait]
 impl KubePrometheusReceiver for WebhookReceiver {
    fn name(&self) -> String {
        self.name.clone()
    }
    async fn configure_receiver(&self) -> AlertManagerChannelConfig {
        self.get_config().await
    }
 }
 #[async_trait]
 impl AlertChannelConfig for WebhookReceiver {
--- a/harmony/src/modules/monitoring/alert_rule/prometheus_alert_rule.rs
+++ b/harmony/src/modules/monitoring/alert_rule/prometheus_alert_rule.rs
@@ -5,26 +5,13 @@ use serde::Serialize;
 use crate::{
    interpret::{InterpretError, Outcome},
-    modules::monitoring::{
+    modules::monitoring::kube_prometheus::{
-        kube_prometheus::{
+        prometheus::{Prometheus, PrometheusRule},
-            prometheus::{KubePrometheus, KubePrometheusRule},
+        types::{AlertGroup, AlertManagerAdditionalPromRules},
            types::{AlertGroup, AlertManagerAdditionalPromRules},
        },
        prometheus::prometheus::{Prometheus, PrometheusRule},
    },
    topology::oberservability::monitoring::AlertRule,
 };
 #[async_trait]
 impl AlertRule<KubePrometheus> for AlertManagerRuleGroup {
    async fn install(&self, sender: &KubePrometheus) -> Result<Outcome, InterpretError> {
        sender.install_rule(&self).await
    }
    fn clone_box(&self) -> Box<dyn AlertRule<KubePrometheus>> {
        Box::new(self.clone())
    }
 }
 #[async_trait]
 impl AlertRule<Prometheus> for AlertManagerRuleGroup {
    async fn install(&self, sender: &Prometheus) -> Result<Outcome, InterpretError> {
@@ -54,25 +41,6 @@ impl PrometheusRule for AlertManagerRuleGroup {
        }
    }
 }
 #[async_trait]
 impl KubePrometheusRule for AlertManagerRuleGroup {
    fn name(&self) -> String {
        self.name.clone()
    }
    async fn configure_rule(&self) -> AlertManagerAdditionalPromRules {
        let mut additional_prom_rules = BTreeMap::new();
        additional_prom_rules.insert(
            self.name.clone(),
            AlertGroup {
                groups: vec![self.clone()],
            },
        );
        AlertManagerAdditionalPromRules {
            rules: additional_prom_rules,
        }
    }
 }
 impl AlertManagerRuleGroup {
    pub fn new(name: &str, rules: Vec<PrometheusAlertRule>) -> AlertManagerRuleGroup {
--- a/harmony/src/modules/monitoring/application_monitoring/k8s_application_monitoring_score.rs
+++ b/harmony/src/modules/monitoring/application_monitoring/k8s_application_monitoring_score.rs
@@ -1,44 +0,0 @@
 use std::sync::{Arc, Mutex};
 use serde::Serialize;
 use crate::{
    modules::monitoring::{
        kube_prometheus::types::ServiceMonitor,
        prometheus::{prometheus::Prometheus, prometheus_config::PrometheusConfig},
    },
    score::Score,
    topology::{
        HelmCommand, Topology,
        oberservability::monitoring::{AlertReceiver, AlertRule, AlertingInterpret},
        tenant::TenantManager,
    },
 };
 #[derive(Clone, Debug, Serialize)]
 pub struct ApplicationPrometheusMonitoringScore {
    pub receivers: Vec<Box<dyn AlertReceiver<Prometheus>>>,
    pub rules: Vec<Box<dyn AlertRule<Prometheus>>>,
    pub service_monitors: Vec<ServiceMonitor>,
 }
 impl<T: Topology + HelmCommand + TenantManager> Score<T> for ApplicationPrometheusMonitoringScore {
    fn create_interpret(&self) -> Box<dyn crate::interpret::Interpret<T>> {
        let mut prom_config = PrometheusConfig::new();
        prom_config.alert_manager = true;
        let config = Arc::new(Mutex::new(prom_config));
        config
            .try_lock()
            .expect("couldn't lock config")
            .additional_service_monitors = self.service_monitors.clone();
        Box::new(AlertingInterpret {
            sender: Prometheus::new(),
            receivers: self.receivers.clone(),
            rules: self.rules.clone(),
        })
    }
    fn name(&self) -> String {
        "ApplicationPrometheusMonitoringScore".to_string()
    }
 }
--- a/harmony/src/modules/monitoring/application_monitoring/mod.rs
+++ b/harmony/src/modules/monitoring/application_monitoring/mod.rs
@@ -1 +0,0 @@
 pub mod k8s_application_monitoring_score;
--- a/harmony/src/modules/monitoring/grafana/helm/helm_grafana.rs
+++ b/harmony/src/modules/monitoring/grafana/helm/helm_grafana.rs
@@ -1,28 +0,0 @@
 use non_blank_string_rs::NonBlankString;
 use std::str::FromStr;
 use crate::modules::helm::chart::HelmChartScore;
 pub fn grafana_helm_chart_score(ns: &str) -> HelmChartScore {
    let values = format!(
        r#"
 rbac:
  namespaced: true
 sidecar:
  dashboards:
    enabled: true
        "#
    );
    HelmChartScore {
        namespace: Some(NonBlankString::from_str(ns).unwrap()),
        release_name: NonBlankString::from_str("grafana").unwrap(),
        chart_name: NonBlankString::from_str("oci://ghcr.io/grafana/helm-charts/grafana").unwrap(),
        chart_version: None,
        values_overrides: None,
        values_yaml: Some(values.to_string()),
        create_namespace: true,
        install_only: true,
        repository: None,
    }
 }
--- a/harmony/src/modules/monitoring/grafana/helm/mod.rs
+++ b/harmony/src/modules/monitoring/grafana/helm/mod.rs
@@ -1 +0,0 @@
 pub mod helm_grafana;
--- a/harmony/src/modules/monitoring/grafana/mod.rs
+++ b/harmony/src/modules/monitoring/grafana/mod.rs
@@ -1 +0,0 @@
 pub mod helm;
--- a/harmony/src/modules/monitoring/kube_prometheus/helm/config.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/helm/config.rs
@@ -38,15 +38,15 @@ impl KubePrometheusConfig {
            node_exporter: false,
            prometheus: true,
            kubernetes_service_monitors: true,
-            kubernetes_api_server: true,
+            kubernetes_api_server: false,
            kubelet: true,
-            kube_controller_manager: true,
+            kube_controller_manager: false,
-            kube_etcd: true,
+            kube_etcd: false,
-            kube_proxy: true,
+            kube_proxy: false,
            kube_state_metrics: true,
            prometheus_operator: true,
-            core_dns: true,
+            core_dns: false,
-            kube_scheduler: true,
+            kube_scheduler: false,
            alert_receiver_configs: vec![],
            alert_rules: vec![],
            additional_service_monitors: vec![],
--- a/harmony/src/modules/monitoring/kube_prometheus/helm/kube_prometheus_helm_chart.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/helm/kube_prometheus_helm_chart.rs
@@ -68,9 +68,6 @@ pub fn kube_prometheus_helm_chart_score(
    let mut values = format!(
        r#"
 global:
  rbac:
    create: true
 prometheus:
  enabled: {prometheus}
  prometheusSpec:
@@ -245,7 +242,7 @@ prometheus-node-exporter:
      cpu: 200m
      memory: 250Mi
 prometheusOperator:
-  enabled: true
+  enabled: {prometheus_operator}
  resources:
    requests: 
      cpu: 100m
--- a/harmony/src/modules/monitoring/kube_prometheus/helm_prometheus_alert_score.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/helm_prometheus_alert_score.rs
@@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex};
 use serde::Serialize;
-use super::{helm::config::KubePrometheusConfig, prometheus::KubePrometheus};
+use super::{helm::config::KubePrometheusConfig, prometheus::Prometheus};
 use crate::{
    modules::monitoring::kube_prometheus::types::ServiceMonitor,
    score::Score,
@@ -15,8 +15,8 @@ use crate::{
 #[derive(Clone, Debug, Serialize)]
 pub struct HelmPrometheusAlertingScore {
-    pub receivers: Vec<Box<dyn AlertReceiver<KubePrometheus>>>,
+    pub receivers: Vec<Box<dyn AlertReceiver<Prometheus>>>,
-    pub rules: Vec<Box<dyn AlertRule<KubePrometheus>>>,
+    pub rules: Vec<Box<dyn AlertRule<Prometheus>>>,
    pub service_monitors: Vec<ServiceMonitor>,
 }
@@ -28,7 +28,7 @@ impl<T: Topology + HelmCommand + TenantManager> Score<T> for HelmPrometheusAlert
            .expect("couldn't lock config")
            .additional_service_monitors = self.service_monitors.clone();
        Box::new(AlertingInterpret {
-            sender: KubePrometheus { config },
+            sender: Prometheus::new(),
            receivers: self.receivers.clone(),
            rules: self.rules.clone(),
        })
--- a/harmony/src/modules/monitoring/kube_prometheus/prometheus.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/prometheus.rs
@@ -10,7 +10,7 @@ use crate::{
    modules::monitoring::alert_rule::prometheus_alert_rule::AlertManagerRuleGroup,
    score,
    topology::{
-        HelmCommand, Topology,
+        HelmCommand, K8sAnywhereTopology, Topology,
        installable::Installable,
        oberservability::monitoring::{AlertReceiver, AlertRule, AlertSender},
        tenant::TenantManager,
@@ -27,14 +27,14 @@ use super::{
 };
 #[async_trait]
-impl AlertSender for KubePrometheus {
+impl AlertSender for Prometheus {
    fn name(&self) -> String {
        "HelmKubePrometheus".to_string()
    }
 }
 #[async_trait]
-impl<T: Topology + HelmCommand + TenantManager> Installable<T> for KubePrometheus {
+impl<T: Topology + HelmCommand + TenantManager> Installable<T> for Prometheus {
    async fn configure(&self, _inventory: &Inventory, topology: &T) -> Result<(), InterpretError> {
        self.configure_with_topology(topology).await;
        Ok(())
@@ -51,11 +51,11 @@ impl<T: Topology + HelmCommand + TenantManager> Installable<T> for KubePrometheu
 }
 #[derive(Debug)]
-pub struct KubePrometheus {
+pub struct Prometheus {
    pub config: Arc<Mutex<KubePrometheusConfig>>,
 }
-impl KubePrometheus {
+impl Prometheus {
    pub fn new() -> Self {
        Self {
            config: Arc::new(Mutex::new(KubePrometheusConfig::new())),
@@ -75,7 +75,7 @@ impl KubePrometheus {
    pub async fn install_receiver(
        &self,
-        prometheus_receiver: &dyn KubePrometheusReceiver,
+        prometheus_receiver: &dyn PrometheusReceiver,
    ) -> Result<Outcome, InterpretError> {
        let prom_receiver = prometheus_receiver.configure_receiver().await;
        debug!(
@@ -120,12 +120,12 @@ impl KubePrometheus {
 }
 #[async_trait]
-pub trait KubePrometheusReceiver: Send + Sync + std::fmt::Debug {
+pub trait PrometheusReceiver: Send + Sync + std::fmt::Debug {
    fn name(&self) -> String;
    async fn configure_receiver(&self) -> AlertManagerChannelConfig;
 }
-impl Serialize for Box<dyn AlertReceiver<KubePrometheus>> {
+impl Serialize for Box<dyn AlertReceiver<Prometheus>> {
    fn serialize<S>(&self, _serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
@@ -134,19 +134,19 @@ impl Serialize for Box<dyn AlertReceiver<KubePrometheus>> {
    }
 }
-impl Clone for Box<dyn AlertReceiver<KubePrometheus>> {
+impl Clone for Box<dyn AlertReceiver<Prometheus>> {
    fn clone(&self) -> Self {
        self.clone_box()
    }
 }
 #[async_trait]
-pub trait KubePrometheusRule: Send + Sync + std::fmt::Debug {
+pub trait PrometheusRule: Send + Sync + std::fmt::Debug {
    fn name(&self) -> String;
    async fn configure_rule(&self) -> AlertManagerAdditionalPromRules;
 }
-impl Serialize for Box<dyn AlertRule<KubePrometheus>> {
+impl Serialize for Box<dyn AlertRule<Prometheus>> {
    fn serialize<S>(&self, _serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
@@ -155,7 +155,7 @@ impl Serialize for Box<dyn AlertRule<KubePrometheus>> {
    }
 }
-impl Clone for Box<dyn AlertRule<KubePrometheus>> {
+impl Clone for Box<dyn AlertRule<Prometheus>> {
    fn clone(&self) -> Self {
        self.clone_box()
    }
--- a/harmony/src/modules/monitoring/kube_prometheus/types.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/types.rs
@@ -212,7 +212,7 @@ pub struct ServiceMonitor {
    pub name: String,
    // # Additional labels to set used for the ServiceMonitorSelector. Together with standard labels from the chart
-    pub additional_labels: Option<HashMap<String, String>>,
+    pub additional_labels: Option<Mapping>,
    // # Service label for use in assembling a job name of the form <label value>-<port>
    // # If no label is specified, the service name is used.
@@ -240,7 +240,7 @@ pub struct ServiceMonitor {
    //   any: bool,
    //   # Explicit list of namespace names to select
    //   matchNames: Vec,
-    pub namespace_selector: Option<NamespaceSelector>,
+    pub namespace_selector: Option<Mapping>,
    // # Endpoints of the selected service to be monitored
    pub endpoints: Vec<ServiceMonitorEndpoint>,
@@ -250,13 +250,6 @@ pub struct ServiceMonitor {
    pub fallback_scrape_protocol: Option<String>,
 }
 #[derive(Debug, Serialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct NamespaceSelector {
    pub any: bool,
    pub match_names: Vec<String>,
 }
 impl Default for ServiceMonitor {
    fn default() -> Self {
        Self {
--- a/harmony/src/modules/monitoring/mod.rs
+++ b/harmony/src/modules/monitoring/mod.rs
@@ -1,7 +1,4 @@
 pub mod alert_channel;
 pub mod alert_rule;
 pub mod application_monitoring;
 pub mod grafana;
 pub mod kube_prometheus;
 pub mod ntfy;
 pub mod prometheus;
--- a/harmony/src/modules/monitoring/ntfy/helm/ntfy_helm_chart.rs
+++ b/harmony/src/modules/monitoring/ntfy/helm/ntfy_helm_chart.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use crate::modules::helm::chart::{HelmChartScore, HelmRepository};
-pub fn ntfy_helm_chart_score(namespace: String, host: String) -> HelmChartScore {
+pub fn ntfy_helm_chart_score(namespace: String) -> HelmChartScore {
    let values = format!(
        r#"
 replicaCount: 1
@@ -28,12 +28,12 @@ service:
  port: 80
 ingress:
-  enabled: true
+  enabled: false
 #  annotations:
    # kubernetes.io/ingress.class: nginx
    # kubernetes.io/tls-acme: "true"
  hosts:
-    - host: {host}
+    - host: ntfy.host.com
      paths:
        - path: /
          pathType: ImplementationSpecific
--- a/harmony/src/modules/monitoring/ntfy/ntfy.rs
+++ b/harmony/src/modules/monitoring/ntfy/ntfy.rs
@@ -17,7 +17,6 @@ use crate::{
 #[derive(Debug, Clone, Serialize)]
 pub struct NtfyScore {
    pub namespace: String,
    pub host: String,
 }
 impl<T: Topology + HelmCommand + K8sclient> Score<T> for NtfyScore {
@@ -127,7 +126,7 @@ impl<T: Topology + HelmCommand + K8sclient> Interpret<T> for NtfyInterpret {
        inventory: &Inventory,
        topology: &T,
    ) -> Result<Outcome, InterpretError> {
-        ntfy_helm_chart_score(self.score.namespace.clone(), self.score.host.clone())
+        ntfy_helm_chart_score(self.score.namespace.clone())
            .create_interpret()
            .execute(inventory, topology)
            .await?;
--- a/harmony/src/modules/monitoring/prometheus/helm/mod.rs
+++ b/harmony/src/modules/monitoring/prometheus/helm/mod.rs
@@ -1 +0,0 @@
 pub mod prometheus_helm;
--- a/harmony/src/modules/monitoring/prometheus/helm/prometheus_helm.rs
+++ b/harmony/src/modules/monitoring/prometheus/helm/prometheus_helm.rs
@@ -1,47 +0,0 @@
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use non_blank_string_rs::NonBlankString;
 use crate::modules::{
    helm::chart::HelmChartScore, monitoring::prometheus::prometheus_config::PrometheusConfig,
 };
 pub fn prometheus_helm_chart_score(config: Arc<Mutex<PrometheusConfig>>) -> HelmChartScore {
    let config = config.lock().unwrap();
    let ns = config.namespace.clone().unwrap();
    let values = format!(
        r#"
 rbac:
  create: true
 kube-state-metrics:
  enabled: false
 nodeExporter:
  enabled: false
 alertmanager:
  enabled: false
 pushgateway:
  enabled: false
 server:
  serviceAccount:
    create: false
  rbac:
    create: true
 fullnameOverride: prometheus-{ns}
 "#
    );
    HelmChartScore {
        namespace: Some(NonBlankString::from_str(&config.namespace.clone().unwrap()).unwrap()),
        release_name: NonBlankString::from_str("prometheus").unwrap(),
        chart_name: NonBlankString::from_str(
            "oci://ghcr.io/prometheus-community/charts/prometheus",
        )
        .unwrap(),
        chart_version: None,
        values_overrides: None,
        values_yaml: Some(values.to_string()),
        create_namespace: true,
        install_only: true,
        repository: None,
    }
 }
--- a/harmony/src/modules/monitoring/prometheus/mod.rs
+++ b/harmony/src/modules/monitoring/prometheus/mod.rs
@@ -1,3 +0,0 @@
 pub mod helm;
 pub mod prometheus;
 pub mod prometheus_config;
--- a/harmony/src/modules/monitoring/prometheus/prometheus.rs
+++ b/harmony/src/modules/monitoring/prometheus/prometheus.rs
@@ -1,190 +0,0 @@
 use std::sync::{Arc, Mutex};
 use async_trait::async_trait;
 use log::{debug, error};
 use serde::Serialize;
 use crate::{
    interpret::{InterpretError, Outcome},
    inventory::Inventory,
    modules::monitoring::{
        alert_rule::prometheus_alert_rule::AlertManagerRuleGroup,
        grafana::helm::helm_grafana::grafana_helm_chart_score,
        kube_prometheus::types::{AlertManagerAdditionalPromRules, AlertManagerChannelConfig},
    },
    score::Score,
    topology::{
        HelmCommand, Topology,
        installable::Installable,
        oberservability::monitoring::{AlertReceiver, AlertRule, AlertSender},
        tenant::TenantManager,
    },
 };
 use super::{
    helm::prometheus_helm::prometheus_helm_chart_score, prometheus_config::PrometheusConfig,
 };
 #[derive(Debug)]
 pub struct Prometheus {
    pub config: Arc<Mutex<PrometheusConfig>>,
 }
 #[async_trait]
 impl AlertSender for Prometheus {
    fn name(&self) -> String {
        "Prometheus".to_string()
    }
 }
 impl Prometheus {
    pub fn new() -> Self {
        Self {
            config: Arc::new(Mutex::new(PrometheusConfig::new())),
        }
    }
    pub async fn configure_with_topology<T: TenantManager>(&self, topology: &T) {
        let ns = topology
            .get_tenant_config()
            .await
            .map(|cfg| cfg.name.clone())
            .unwrap_or_else(|| "monitoring".to_string());
        error!("This must be refactored, see comments in pr #74");
        debug!("NS: {}", ns);
        self.config.lock().unwrap().namespace = Some(ns);
    }
    pub async fn install_receiver(
        &self,
        prometheus_receiver: &dyn PrometheusReceiver,
    ) -> Result<Outcome, InterpretError> {
        let prom_receiver = prometheus_receiver.configure_receiver().await;
        debug!(
            "adding alert receiver to prometheus config: {:#?}",
            &prom_receiver
        );
        let mut config = self.config.lock().unwrap();
        config.alert_receiver_configs.push(prom_receiver);
        let prom_receiver_name = prometheus_receiver.name();
        debug!("installed alert receiver {}", &prom_receiver_name);
        Ok(Outcome::success(format!(
            "Sucessfully installed receiver {}",
            prom_receiver_name
        )))
    }
    pub async fn install_rule(
        &self,
        prometheus_rule: &AlertManagerRuleGroup,
    ) -> Result<Outcome, InterpretError> {
        let prometheus_rule = prometheus_rule.configure_rule().await;
        let mut config = self.config.lock().unwrap();
        config.alert_rules.push(prometheus_rule.clone());
        Ok(Outcome::success(format!(
            "Successfully installed alert rule: {:#?},",
            prometheus_rule
        )))
    }
    pub async fn install_prometheus<T: Topology + HelmCommand + Send + Sync>(
        &self,
        inventory: &Inventory,
        topology: &T,
    ) -> Result<Outcome, InterpretError> {
        prometheus_helm_chart_score(self.config.clone())
            .create_interpret()
            .execute(inventory, topology)
            .await
    }
    pub async fn install_grafana<T: Topology + HelmCommand + Send + Sync>(
        &self,
        inventory: &Inventory,
        topology: &T,
    ) -> Result<Outcome, InterpretError> {
        let namespace = {
            let config = self.config.lock().unwrap();
            config.namespace.clone()
        };
        if let Some(ns) = namespace.as_deref() {
            grafana_helm_chart_score(ns)
                .create_interpret()
                .execute(inventory, topology)
                .await
        } else {
            Err(InterpretError::new(format!(
                "could not install grafana, missing namespace",
            )))
        }
    }
 }
 #[async_trait]
 impl<T: Topology + HelmCommand + TenantManager> Installable<T> for Prometheus {
    async fn configure(&self, _inventory: &Inventory, topology: &T) -> Result<(), InterpretError> {
        self.configure_with_topology(topology).await;
        Ok(())
    }
    async fn ensure_installed(
        &self,
        inventory: &Inventory,
        topology: &T,
    ) -> Result<(), InterpretError> {
        self.install_prometheus(inventory, topology).await?;
        let install_grafana = {
            let config = self.config.lock().unwrap();
            config.grafana
        };
        if install_grafana {
            self.install_grafana(inventory, topology).await?;
        }
        Ok(())
    }
 }
 #[async_trait]
 pub trait PrometheusReceiver: Send + Sync + std::fmt::Debug {
    fn name(&self) -> String;
    async fn configure_receiver(&self) -> AlertManagerChannelConfig;
 }
 impl Serialize for Box<dyn AlertReceiver<Prometheus>> {
    fn serialize<S>(&self, _serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
    {
        todo!()
    }
 }
 impl Clone for Box<dyn AlertReceiver<Prometheus>> {
    fn clone(&self) -> Self {
        self.clone_box()
    }
 }
 #[async_trait]
 pub trait PrometheusRule: Send + Sync + std::fmt::Debug {
    fn name(&self) -> String;
    async fn configure_rule(&self) -> AlertManagerAdditionalPromRules;
 }
 impl Serialize for Box<dyn AlertRule<Prometheus>> {
    fn serialize<S>(&self, _serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
    {
        todo!()
    }
 }
 impl Clone for Box<dyn AlertRule<Prometheus>> {
    fn clone(&self) -> Self {
        self.clone_box()
    }
 }
--- a/harmony/src/modules/monitoring/prometheus/prometheus_config.rs
+++ b/harmony/src/modules/monitoring/prometheus/prometheus_config.rs
@@ -1,34 +0,0 @@
 use crate::modules::monitoring::kube_prometheus::types::{
    AlertManagerAdditionalPromRules, AlertManagerChannelConfig, ServiceMonitor,
 };
 #[derive(Debug)]
 pub struct PrometheusConfig {
    pub namespace: Option<String>,
    pub default_rules: bool,
    pub alert_manager: bool,
    pub node_exporter: bool,
    pub kube_state_metrics: bool,
    pub grafana: bool,
    pub prometheus_pushgateway: bool,
    pub alert_receiver_configs: Vec<AlertManagerChannelConfig>,
    pub alert_rules: Vec<AlertManagerAdditionalPromRules>,
    pub additional_service_monitors: Vec<ServiceMonitor>,
 }
 impl PrometheusConfig {
    pub fn new() -> Self {
        Self {
            namespace: None,
            default_rules: true,
            alert_manager: true,
            node_exporter: false,
            kube_state_metrics: false,
            grafana: true,
            prometheus_pushgateway: false,
            alert_receiver_configs: vec![],
            alert_rules: vec![],
            additional_service_monitors: vec![],
        }
    }
 }
--- a/harmony/src/modules/postgres.rs
+++ b/harmony/src/modules/postgres.rs
@@ -0,0 +1,119 @@
 use async_trait::async_trait;
 use derive_new::new;
 use log::info;
 use serde::{Deserialize, Serialize};
 use crate::{
    data::{PostgresDatabase, PostgresUser, Version},
    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
    inventory::Inventory,
    score::Score,
    topology::{PostgresServer, Topology},
 };
 #[derive(Debug, new, Clone, Serialize, Deserialize)]
 pub struct PostgresScore {
    users: Vec<PostgresUser>,
    databases: Vec<PostgresDatabase>,
 }
 impl<T: Topology + PostgresServer> Score<T> for PostgresScore {
    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
        Box::new(PostgresInterpret::new(self.clone()))
    }
    fn name(&self) -> String {
        "PostgresScore".to_string()
    }
 }
 #[derive(Debug, Clone)]
 pub struct PostgresInterpret {
    score: PostgresScore,
    version: Version,
    status: InterpretStatus,
 }
 impl PostgresInterpret {
    pub fn new(score: PostgresScore) -> Self {
        let version = Version::from("1.0.0").expect("Version should be valid");
        Self {
            version,
            score,
            status: InterpretStatus::QUEUED,
        }
    }
    async fn ensure_users_exist<P: PostgresServer>(
        &self,
        postgres_server: &P,
    ) -> Result<Outcome, InterpretError> {
        let users = &self.score.users;
        postgres_server.ensure_users_exist(users.clone()).await?;
        Ok(Outcome::new(
            InterpretStatus::SUCCESS,
            format!(
                "PostgresInterpret ensured {} users exist successfully",
                users.len()
            ),
        ))
    }
    async fn ensure_databases_exist<P: PostgresServer>(
        &self,
        postgres_server: &P,
    ) -> Result<Outcome, InterpretError> {
        let databases = &self.score.databases;
        postgres_server
            .ensure_databases_exist(databases.clone())
            .await?;
        Ok(Outcome::new(
            InterpretStatus::SUCCESS,
            format!(
                "PostgresInterpret ensured {} databases exist successfully",
                databases.len()
            ),
        ))
    }
 }
 #[async_trait]
 impl<T: Topology + PostgresServer> Interpret<T> for PostgresInterpret {
    fn get_name(&self) -> InterpretName {
        InterpretName::Postgres
    }
    fn get_version(&self) -> crate::domain::data::Version {
        self.version.clone()
    }
    fn get_status(&self) -> InterpretStatus {
        self.status.clone()
    }
    fn get_children(&self) -> Vec<crate::domain::data::Id> {
        todo!()
    }
    async fn execute(
        &self,
        inventory: &Inventory,
        topology: &T,
    ) -> Result<Outcome, InterpretError> {
        info!(
            "Executing {} on inventory {inventory:?})",
            <PostgresInterpret as Interpret<T>>::get_name(self)
        );
        self.ensure_users_exist(topology).await?;
        self.ensure_databases_exist(topology).await?;
        Ok(Outcome::new(
            InterpretStatus::SUCCESS,
            "Postgres Interpret execution successful".to_string(),
        ))
    }
 }
--- a/harmony_cli/src/lib.rs
+++ b/harmony_cli/src/lib.rs
@@ -153,7 +153,7 @@ mod test {
    fn init_test_maestro() -> Maestro<HAClusterTopology> {
        let inventory = Inventory::autoload();
        let topology = HAClusterTopology::autoload();
-        let mut maestro = Maestro::new_without_initialization(inventory, topology);
+        let mut maestro = Maestro::new(inventory, topology);
        maestro.register_all(vec![
            Box::new(SuccessScore {}),
--- a/harmony_tui/src/lib.rs
+++ b/harmony_tui/src/lib.rs
@@ -41,7 +41,7 @@ pub mod tui {
 /// async fn main() {
 ///     let inventory = Inventory::autoload();
 ///     let topology = HAClusterTopology::autoload();
-///     let mut maestro = Maestro::new_without_initialization(inventory, topology);
+///     let mut maestro = Maestro::new(inventory, topology);
 ///
 ///     maestro.register_all(vec![
 ///         Box::new(SuccessScore {}),
--- a/opnsense-config-xml/src/data/interfaces.rs
+++ b/opnsense-config-xml/src/data/interfaces.rs
@@ -83,7 +83,6 @@ pub struct Interface {
    pub adv_dhcp_config_advanced: Option<MaybeString>,
    pub adv_dhcp_config_file_override: Option<MaybeString>,
    pub adv_dhcp_config_file_override_path: Option<MaybeString>,
    pub mtu: Option<u32>,
 }
 #[cfg(test)]
--- a/opnsense-config-xml/src/data/opnsense.rs
+++ b/opnsense-config-xml/src/data/opnsense.rs
@@ -1,6 +1,6 @@
 use crate::HAProxy;
 use crate::{data::dhcpd::DhcpInterface, xml_utils::to_xml_str};
-use log::{debug, error};
+use log::error;
 use uuid::Uuid;
 use yaserde::{MaybeString, NamedList, RawXml};
 use yaserde_derive::{YaDeserialize, YaSerialize};
@@ -17,12 +17,12 @@ pub struct OPNsense {
    pub dhcpd: NamedList<DhcpInterface>,
    pub snmpd: Snmpd,
    pub syslog: Syslog,
-    pub nat: Option<Nat>,
+    pub nat: Nat,
    pub filter: Filters,
    pub load_balancer: Option<LoadBalancer>,
    pub rrd: Option<RawXml>,
    pub ntpd: Ntpd,
-    pub widgets: Option<Widgets>,
+    pub widgets: Widgets,
    pub revision: Revision,
    #[yaserde(rename = "OPNsense")]
    pub opnsense: OPNsenseXmlSection,
@@ -46,12 +46,10 @@ pub struct OPNsense {
    pub pischem: Option<Pischem>,
    pub ifgroups: Ifgroups,
    pub dnsmasq: Option<RawXml>,
    pub wizardtemp: Option<RawXml>,
 }
 impl From<String> for OPNsense {
    fn from(content: String) -> Self {
        debug!("XML content: {content}");
        yaserde::de::from_str(&content)
            .map_err(|e| println!("{}", e.to_string()))
            .expect("OPNSense received invalid string, should be full XML")
@@ -244,7 +242,6 @@ pub struct Ssh {
    pub passwordauth: u8,
    pub keysig: MaybeString,
    pub permitrootlogin: u8,
    pub rekeylimit: MaybeString,
 }
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -274,7 +271,6 @@ pub struct Group {
    pub member: Vec<u32>,
    #[yaserde(rename = "priv")]
    pub priv_field: String,
    pub source_networks: Vec<MaybeString>,
 }
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1510,7 +1506,7 @@ pub struct Vlans {
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct Bridges {
-    pub bridged: Option<MaybeString>,
+    pub bridged: MaybeString,
 }
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
--- a/opnsense-config/Cargo.toml
+++ b/opnsense-config/Cargo.toml
@@ -22,4 +22,4 @@ tokio-util = { version = "0.7.13", features = [ "codec" ] }
 tokio-stream = "0.1.17"
 [dev-dependencies]
-pretty_assertions.workspace = true
+pretty_assertions = "1.4.1"