diff --git a/services/bao-console/Cargo.toml b/services/bao-console/Cargo.toml
new file mode 100644
index 000000000..5aebf891b
--- /dev/null
+++ b/services/bao-console/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "bao-console"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+utralib = { version = "0.1.25", optional = true, default-features = false }
+xous-names = { package = "xous-api-names", version = "0.9.63" }
+ticktimer = { package = "xous-api-ticktimer", version = "0.9.61" }
+xous = "0.9.64"
+log-server = { package = "xous-api-log", version = "0.1.61" }
+log = "0.4.14"
+num-derive = { version = "0.3.3", default-features = false }
+num-traits = { version = "0.2.14", default-features = false }
+cramium-hal = { path = "../../libs/cramium-hal", features = ["std"] }
+cram-hal-service = { path = "../cram-hal-service" }
+
+[features]
+cramium-soc = ["utralib/cramium-soc"]
+default = []
diff --git a/services/bao-console/src/cmds.rs b/services/bao-console/src/cmds.rs
new file mode 100644
index 000000000..6eb78c466
--- /dev/null
+++ b/services/bao-console/src/cmds.rs
@@ -0,0 +1,218 @@
+use core::fmt::Write;
+use std::collections::HashMap;
+
+use String;
+use cram_hal_service::trng;
+use xous::MessageEnvelope;
+
+/////////////////////////// Common items to all commands
+pub trait ShellCmdApi<'a> {
+ // user implemented:
+ // called to process the command with the remainder of the string attached
+ fn process(&mut self, args: String, env: &mut CommonEnv) -> Result