diff --git a/.github/workflows/hero_build.yml b/.github/workflows/hero_build.yml
index 61956e8d..a4f231b9 100644
--- a/.github/workflows/hero_build.yml
+++ b/.github/workflows/hero_build.yml
@@ -34,6 +34,11 @@ jobs:
       - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
       - run: echo "🔎 The name of your branch is ${{ github.ref_name }} and your repository is ${{ github.repository }}."
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: runner.os == 'macOS'
+        with:
+          xcode-version: latest-stable      
+
       - name: Check out repository code
         uses: actions/checkout@v4
 
diff --git a/.gitignore b/.gitignore
index eaf2caf4..e5faecbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,6 @@ HTTP_REST_MCP_DEMO.md
 MCP_HTTP_REST_IMPLEMENTATION_PLAN.md
 .roo
 .kilocode
-.continue
\ No newline at end of file
+.continue
+tmux_logger
+release
\ No newline at end of file
diff --git a/README.md b/README.md
index 6ef3ec78..003ddd46 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ bash /tmp/install_v.sh --analyzer --herolib
 
 #do not forget to do the following this makes sure vtest and vrun exists
 cd ~/code/github/freeflowuniverse/herolib
-bash install_herolib.vsh
+v install_herolib.vsh
 
 # IMPORTANT: Start a new shell after installation for paths to be set correctly
 
diff --git a/cli/hero.v b/cli/hero.v
index 22bad431..fbb73f73 100644
--- a/cli/hero.v
+++ b/cli/hero.v
@@ -48,7 +48,7 @@ fn do() ! {
 	mut cmd := Command{
 		name:        'hero'
 		description: 'Your HERO toolset.'
-		version:     '1.0.29'
+		version:     '1.0.33'
 	}
 
 	// herocmds.cmd_run_add_flags(mut cmd)
@@ -103,4 +103,4 @@ fn main() {
 
 // fn pre_func(cmd Command) ! {
 // 	herocmds.plbook_run(cmd)!
-// }
+// }
\ No newline at end of file
diff --git a/examples/clients/zinit_rpc.vsh b/examples/clients/zinit_rpc.vsh
index 7c991be1..a0a78877 100755
--- a/examples/clients/zinit_rpc.vsh
+++ b/examples/clients/zinit_rpc.vsh
@@ -52,7 +52,6 @@ println('  - API title: ${spec.info.title}')
 println('  - API version: ${spec.info.version}')
 println('  - Methods available: ${spec.methods.len}')
 
-
 // 2. List all services
 println('\n2. Listing all services...')
 services := client.service_list() or {
diff --git a/examples/osal/sshagent/sshagent b/examples/osal/sshagent/sshagent
new file mode 100755
index 00000000..aee7f9da
Binary files /dev/null and b/examples/osal/sshagent/sshagent differ
diff --git a/examples/osal/sshagent/sshagent.vsh b/examples/osal/sshagent/sshagent.vsh
index 038c720b..b9abe1fa 100755
--- a/examples/osal/sshagent/sshagent.vsh
+++ b/examples/osal/sshagent/sshagent.vsh
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S v -n -w -gc none  -cc tcc -d use_openssl -enable-globals run
+#!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
 
 import freeflowuniverse.herolib.osal.sshagent
 import freeflowuniverse.herolib.builder
diff --git a/examples/osal/sshagent/sshagent_example.vsh b/examples/osal/sshagent/sshagent_example.vsh
index b6d45294..13d484e7 100755
--- a/examples/osal/sshagent/sshagent_example.vsh
+++ b/examples/osal/sshagent/sshagent_example.vsh
@@ -141,28 +141,26 @@ fn test_user_mgmt() ! {
 	*/
 }
 
-fn main() {
-	console.print_header('🔑 SSH Agent Example - HeroLib')
+console.print_header('🔑 SSH Agent Example - HeroLib')
 
-	demo_sshagent_basic() or {
-		console.print_stderr('❌ Basic demo failed: ${err}')
-		return
-	}
-
-	demo_sshagent_key_management() or {
-		console.print_stderr('❌ Key management demo failed: ${err}')
-		return
-	}
-
-	demo_sshagent_with_existing_keys() or {
-		console.print_stderr('❌ Existing keys demo failed: ${err}')
-		return
-	}
-
-	test_user_mgmt() or {
-		console.print_stderr('❌ User management test failed: ${err}')
-		return
-	}
-
-	console.print_header('🎉 All SSH Agent demos completed successfully!')
+demo_sshagent_basic() or {
+	console.print_stderr('❌ Basic demo failed: ${err}')
+	return
 }
+
+demo_sshagent_key_management() or {
+	console.print_stderr('❌ Key management demo failed: ${err}')
+	return
+}
+
+demo_sshagent_with_existing_keys() or {
+	console.print_stderr('❌ Existing keys demo failed: ${err}')
+	return
+}
+
+test_user_mgmt() or {
+	console.print_stderr('❌ User management test failed: ${err}')
+	return
+}
+
+console.print_header('🎉 All SSH Agent demos completed successfully!')
diff --git a/examples/osal/tmux/heroscripts/enhanced_declarative_test.heroscript b/examples/osal/tmux/heroscripts/enhanced_declarative_test.heroscript
new file mode 100644
index 00000000..3f5b6a37
--- /dev/null
+++ b/examples/osal/tmux/heroscripts/enhanced_declarative_test.heroscript
@@ -0,0 +1,114 @@
+#!/usr/bin/env hero
+
+// Enhanced Declarative Tmux Test with Redis State Tracking
+// This demonstrates the new intelligent command management features
+
+// Ensure a test session exists
+!!tmux.session_ensure
+    name:"enhanced_test"
+
+// Ensure a 4-pane window exists
+!!tmux.window_ensure
+    name:"enhanced_test|demo"
+    cat:"4pane"
+
+// Configure panes with intelligent state management
+// The system will now:
+// 1. Check if commands have changed using MD5 hashing
+// 2. Verify if previous commands are still running
+// 3. Kill and restart only when necessary
+// 4. Ensure bash is the parent process
+// 5. Reset panes when needed
+// 6. Track all state in Redis
+
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|1"
+    label:"web_server"
+    cmd:"echo \"Starting web server...\" && python3 -m http.server 8000"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+    logreset:true
+
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|2"
+    label:"monitor"
+    cmd:"echo \"Starting system monitor...\" && htop"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|3"
+    label:"logs"
+    cmd:"echo \"Monitoring logs...\" && tail -f /var/log/system.log"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|4"
+    label:"development"
+    cmd:"
+        echo \"Setting up development environment...\"
+        mkdir -p /tmp/dev_workspace
+        cd /tmp/dev_workspace
+        echo \"Development environment ready!\"
+        echo \"Current directory:\" && pwd
+        echo \"Available commands: ls, vim, git, etc.\"
+    "
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+// Test the intelligent state management by running the same commands again
+// The system should detect that commands haven't changed and skip re-execution
+// for commands that are still running
+
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|1"
+    label:"web_server"
+    cmd:"echo \"Starting web server...\" && python3 -m http.server 8000"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+// Test command change detection by modifying a command slightly
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|2"
+    label:"monitor"
+    cmd:"echo \"Starting UPDATED system monitor...\" && htop"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+// This should kill the previous htop and start a new one because the command changed
+
+// Test with a completely different command
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|3"
+    label:"network"
+    cmd:"echo \"Switching to network monitoring...\" && netstat -tuln"
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+// This should kill the tail command and start netstat
+
+// Test multi-line command with state tracking
+!!tmux.pane_ensure
+    name:"enhanced_test|demo|4"
+    label:"advanced_dev"
+    cmd:"
+        echo \"Advanced development setup...\"
+        cd /tmp/dev_workspace
+        echo \"Creating project structure...\"
+        mkdir -p src tests docs
+        echo \"Project structure created:\"
+        ls -la
+        echo \"Ready for development!\"
+    "
+    log:true
+    logpath:"/tmp/enhanced_logs"
+
+// The system will:
+// - Compare MD5 hash of this multi-line command with the previous one
+// - Detect that it's different
+// - Kill the previous command
+// - Execute this new command
+// - Store the new state in Redis
+// - Ensure bash is the parent process
+// - Enable logging with the tmux_logger binary
diff --git a/examples/osal/tmux/heroscripts/multiline_commands_demo.heroscript b/examples/osal/tmux/heroscripts/multiline_commands_demo.heroscript
new file mode 100644
index 00000000..dfb912c0
--- /dev/null
+++ b/examples/osal/tmux/heroscripts/multiline_commands_demo.heroscript
@@ -0,0 +1,74 @@
+#!/usr/bin/env hero
+
+// Demonstration of multi-line command support in tmux heroscripts
+// This example shows how to use multi-line commands in pane configurations
+
+// Create a development session
+!!tmux.session_create
+    name:"dev_multiline"
+    reset:true
+
+// Create a 4-pane development workspace
+!!tmux.window_ensure
+    name:"dev_multiline|workspace"
+    cat:"4pane"
+
+// Pane 1: Development environment setup
+!!tmux.pane_ensure
+    name:"dev_multiline|workspace|1"
+    label:"dev_setup"
+    cmd:'
+        echo "=== Development Environment Setup ==="
+        echo "Current directory: $(pwd)"
+        echo "Git status:"
+        git status --porcelain || echo "Not a git repository"
+        echo "Available disk space:"
+        df -h .
+        echo "Development setup complete"
+    '
+
+// Pane 2: System monitoring
+!!tmux.pane_ensure
+    name:"dev_multiline|workspace|2"
+    label:"monitoring"
+    cmd:'
+        echo "=== System Monitoring ==="
+        echo "System uptime:"
+        uptime
+        echo "Memory usage:"
+        free -h 2>/dev/null || vm_stat | head -5
+        echo "CPU info:"
+        sysctl -n machdep.cpu.brand_string 2>/dev/null || cat /proc/cpuinfo | grep "model name" | head -1
+        echo "Monitoring setup complete"
+    '
+
+// Pane 3: Network diagnostics
+!!tmux.pane_ensure
+    name:"dev_multiline|workspace|3"
+    label:"network"
+    cmd:'
+        echo "=== Network Diagnostics ==="
+        echo "Network interfaces:"
+        ifconfig | grep -E "^[a-z]|inet " | head -10
+        echo "DNS configuration:"
+        cat /etc/resolv.conf 2>/dev/null || scutil --dns | head -10
+        echo "Network diagnostics complete"
+    '
+
+// Pane 4: File operations and cleanup
+!!tmux.pane_ensure
+    name:"dev_multiline|workspace|4"
+    label:"file_ops"
+    cmd:'
+        echo "=== File Operations ==="
+        echo "Creating temporary workspace..."
+        mkdir -p /tmp/dev_workspace
+        cd /tmp/dev_workspace
+        echo "Current location: $(pwd)"
+        echo "Creating sample files..."
+        echo "Sample content" > sample.txt
+        echo "Another file" > another.txt
+        echo "Files created:"
+        ls -la
+        echo "File operations complete"
+    '
diff --git a/examples/osal/ubuntu/.gitignore b/examples/osal/ubuntu/.gitignore
new file mode 100644
index 00000000..752ef2fd
--- /dev/null
+++ b/examples/osal/ubuntu/.gitignore
@@ -0,0 +1 @@
+ubuntu_do
\ No newline at end of file
diff --git a/examples/osal/ubuntu/ubuntu_do.vsh b/examples/osal/ubuntu/ubuntu_do.vsh
new file mode 100755
index 00000000..eac8320f
--- /dev/null
+++ b/examples/osal/ubuntu/ubuntu_do.vsh
@@ -0,0 +1,7 @@
+#!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
+
+import freeflowuniverse.herolib.osal.ubuntu
+import os
+import time
+
+ubuntu.fix_mirrors()!
diff --git a/examples/virt/heropods/heropods.vsh b/examples/virt/heropods/heropods.vsh
new file mode 100755
index 00000000..7fc57890
--- /dev/null
+++ b/examples/virt/heropods/heropods.vsh
@@ -0,0 +1,62 @@
+#!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
+
+import freeflowuniverse.herolib.virt.heropods
+
+// Initialize factory
+mut factory := heropods.new(
+	reset:      false
+	use_podman: true
+) or { panic('Failed to init ContainerFactory: ${err}') }
+
+println('=== HeroPods Refactored API Demo ===')
+
+// Step 1: factory.new() now only creates a container definition/handle
+// It does NOT create the actual container in the backend yet
+mut container := factory.new(
+	name:              'myalpine'
+	image:             .custom
+	custom_image_name: 'alpine_3_20'
+	docker_url:        'docker.io/library/alpine:3.20'
+)!
+
+println('✓ Container definition created: ${container.name}')
+println('  (No actual container created in backend yet)')
+
+// Step 2: container.start() handles creation and starting
+// - Checks if container exists in backend
+// - Creates it if it doesn't exist
+// - Starts it if it exists but is stopped
+println('\n--- First start() call ---')
+container.start()!
+println('✓ Container started successfully')
+
+// Step 3: Multiple start() calls are now idempotent
+println('\n--- Second start() call (should be idempotent) ---')
+container.start()!
+println('✓ Second start() call successful - no errors!')
+
+// Step 4: Execute commands in the container and save results
+println('\n--- Executing commands in container ---')
+result1 := container.exec(cmd: 'ls -la /')!
+println('✓ Command executed: ls -la /')
+println('Result: ${result1}')
+
+result2 := container.exec(cmd: 'echo "Hello from container!"')!
+println('✓ Command executed: echo "Hello from container!"')
+println('Result: ${result2}')
+
+result3 := container.exec(cmd: 'uname -a')!
+println('✓ Command executed: uname -a')
+println('Result: ${result3}')
+
+// Step 5: container.delete() works naturally on the instance
+println('\n--- Deleting container ---')
+container.delete()!
+println('✓ Container deleted successfully')
+
+println('\n=== Demo completed! ===')
+println('The refactored API now works as expected:')
+println('- factory.new() creates definition only')
+println('- container.start() is idempotent')
+println('- container.exec() works and returns results')
+println('- container.delete() works on instances')
diff --git a/examples/virt/heropods/runcommands.vsh b/examples/virt/heropods/runcommands.vsh
new file mode 100644
index 00000000..f54fc43b
--- /dev/null
+++ b/examples/virt/heropods/runcommands.vsh
@@ -0,0 +1,19 @@
+#!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
+
+import freeflowuniverse.herolib.virt.heropods
+
+mut factory := heropods.new(
+	reset:      false
+	use_podman: true
+) or { panic('Failed to init ContainerFactory: ${err}') }
+
+mut container := factory.new(
+	name:              'myalpine'
+	image:             .custom
+	custom_image_name: 'alpine_3_20'
+	docker_url:        'docker.io/library/alpine:3.20'
+)!
+
+container.start()!
+container.exec(cmd: 'ls')!
+container.stop()!
diff --git a/examples/virt/runc/busybox.sh b/examples/virt/runc/busybox.sh
deleted file mode 100644
index 96efe2a0..00000000
--- a/examples/virt/runc/busybox.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-
- mkdir -p cd /tmp/busyb
-cd /tmp/busyb
-podman export $(podman create busybox) | tar -C /tmp/busyb -xvf -
\ No newline at end of file
diff --git a/examples/virt/runc/install.sh b/examples/virt/runc/install.sh
deleted file mode 100644
index 3ea6352a..00000000
--- a/examples/virt/runc/install.sh
+++ /dev/null
@@ -1 +0,0 @@
-apt install 
\ No newline at end of file
diff --git a/examples/virt/runc/readme.md b/examples/virt/runc/readme.md
deleted file mode 100644
index 38d70aa6..00000000
--- a/examples/virt/runc/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-## busybox
-
-- use docker, expand it into a directory
-
diff --git a/herolib.code-workspace b/herolib.code-workspace
index f5ad65e3..9c90acca 100644
--- a/herolib.code-workspace
+++ b/herolib.code-workspace
@@ -1,23 +1,8 @@
 {
 	"folders": [
 		{
-			"path": "lib"
+			"path": "."
 		},
-		{
-			"path": "aiprompts"
-		},
-		{
-			"path": "research"
-		},
-		{
-			"path": "examples"
-		},		
-		{
-			"path": "cli"
-		},
-		{
-			"path": "manual"
-		}		
 	],
 	"settings": {
 		"extensions.ignoreRecommendations": false
@@ -43,4 +28,4 @@
 			"tomoki1207.pdf"
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/install_hero.sh b/install_hero.sh
index 720f70dd..d9232744 100755
--- a/install_hero.sh
+++ b/install_hero.sh
@@ -4,7 +4,7 @@ set -e
 
 os_name="$(uname -s)"
 arch_name="$(uname -m)"
-version='1.0.29'
+version='1.0.33'
 
 
 # Base URL for GitHub releases
@@ -121,7 +121,9 @@ echo "Download URL for your platform: $url"
 # Download the file
 curl -o /tmp/downloaded_file -L "$url"
 
-# Check if file size is greater than 10 MB
+set -e
+
+# Check if file size is greater than 2 MB
 file_size=$(du -m  /tmp/downloaded_file | cut -f1)
 if [ "$file_size" -ge 2 ]; then
     # Create the target directory if it doesn't exist
@@ -139,6 +141,6 @@ if [ "$file_size" -ge 2 ]; then
     export PATH=$PATH:$hero_bin_path
     hero -version
 else
-    echo "Downloaded file is less than 10 MB. Process aborted."
+    echo "Downloaded file is less than 2 MB. Process aborted."
     exit 1
 fi
\ No newline at end of file
diff --git a/install_herolib.vsh b/install_herolib.vsh
index 4148a0e2..30ffa9ee 100755
--- a/install_herolib.vsh
+++ b/install_herolib.vsh
@@ -5,11 +5,11 @@ import flag
 
 fn addtoscript(tofind string, toadd string) ! {
 	home_dir := os.home_dir()
-	mut rc_file := '${home_dir}/.zshrc'
+	mut rc_file := '${home_dir}/.zprofile'
 	if !os.exists(rc_file) {
 		rc_file = '${home_dir}/.bashrc'
 		if !os.exists(rc_file) {
-			return error('No .zshrc or .bashrc found in home directory')
+			return error('No .zprofile or .bashrc found in home directory')
 		}
 	}
 
@@ -65,15 +65,18 @@ println('Herolib installation completed successfully!')
 // Add vtest alias
 addtoscript('alias vtest=', "alias vtest='v -stats -enable-globals -show-c-output -n -w -cg -gc none  -cc tcc test' ") or {
 	eprintln('Failed to add vtest alias: ${err}')
+	exit(1)
 }
 
 // Add vrun alias
 addtoscript('alias vrun=', "alias vrun='v -stats -enable-globals -show-c-output -n -w -cg -gc none  -cc tcc run' ") or {
 	eprintln('Failed to add vrun alias: ${err}')
+	exit(1)
 }
 
 addtoscript('HOME/hero/bin', 'export PATH="\$PATH:\$HOME/hero/bin"') or {
 	eprintln('Failed to add path to hero, ${err}')
+	exit(1)
 }
 
 //  ulimit -n 32000
diff --git a/install_v.sh b/install_v.sh
index decdd91c..49c74a9a 100755
--- a/install_v.sh
+++ b/install_v.sh
@@ -34,24 +34,24 @@ for arg in "$@"; do
         -h|--help)
             print_help
             exit 0
-            ;;
+        ;;
         --reset)
             RESET=true
-            ;;
+        ;;
         --remove)
             REMOVE=true
-            ;;
+        ;;
         --herolib)
             HEROLIB=true
-            ;;            
+        ;;
         --analyzer)
             INSTALL_ANALYZER=true
-            ;;
+        ;;
         *)
             echo "Unknown option: $arg"
             echo "Use -h or --help to see available options"
             exit 1
-            ;;
+        ;;
     esac
 done
 
@@ -66,8 +66,8 @@ function run_sudo() {
     if [ "$(id -u)" -eq 0 ]; then
         # We are root, run the command directly
         "$@"
-    # Check if sudo is installed
-    elif command_exists sudo; then
+        # Check if sudo is installed
+        elif command_exists sudo; then
         # Use sudo to run the command
         sudo "$@"
     else
@@ -81,6 +81,65 @@ export DIR_BUILD="/tmp"
 export DIR_CODE="$DIR_BASE/code"
 export DIR_CODE_V="$DIR_BASE/_code"
 
+check_release() {
+    if ! command -v lsb_release >/dev/null 2>&1; then
+        echo "❌ lsb_release command not found. Install 'lsb-release' package first."
+        exit 1
+    fi
+    
+    CODENAME=$(lsb_release -sc)
+    RELEASE=$(lsb_release -rs)
+    
+    if dpkg --compare-versions "$RELEASE" lt "24.04"; then
+        echo "ℹ️ Detected Ubuntu $RELEASE ($CODENAME). Skipping mirror fix (requires 24.04+)."
+        return 1
+    fi
+    
+    return 0
+}
+
+ubuntu_sources_fix() {
+    # Check if we're on Ubuntu
+    if [[ "${OSNAME}" != "ubuntu" ]]; then
+        echo "ℹ️ Not running on Ubuntu. Skipping mirror fix."
+        return 1
+    fi
+    
+    if check_release; then
+        local CODENAME
+        CODENAME=$(lsb_release -sc)
+        local TIMESTAMP
+        TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+        
+        echo "🔎 Fixing apt mirror setup for Ubuntu $(lsb_release -rs) ($CODENAME)..."
+        
+        if [ -f /etc/apt/sources.list ]; then
+            echo "📦 Backing up /etc/apt/sources.list -> /etc/apt/sources.list.backup.$TIMESTAMP"
+            sudo mv /etc/apt/sources.list /etc/apt/sources.list.backup.$TIMESTAMP
+        fi
+        
+        if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then
+            echo "📦 Backing up /etc/apt/sources.list.d/ubuntu.sources -> /etc/apt/sources.list.d/ubuntu.sources.backup.$TIMESTAMP"
+            sudo mv /etc/apt/sources.list.d/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources.backup.$TIMESTAMP
+        fi
+        
+        echo "📝 Writing new /etc/apt/sources.list.d/ubuntu.sources"
+    sudo tee /etc/apt/sources.list.d/ubuntu.sources >/dev/null <<EOF
+Types: deb
+URIs: mirror://mirrors.ubuntu.com/mirrors.txt
+Suites: $CODENAME $CODENAME-updates $CODENAME-backports $CODENAME-security
+Components: main restricted universe multiverse
+EOF
+        
+        echo "🔄 Running apt update..."
+        sudo apt update -qq
+        
+        echo "✅ Done! Your system now uses the rotating Ubuntu mirror list."
+    fi
+}
+
+
+
 function sshknownkeysadd {
     mkdir -p ~/.ssh
     touch ~/.ssh/known_hosts
@@ -91,16 +150,16 @@ function sshknownkeysadd {
     if ! grep git.threefold.info ~/.ssh/known_hosts > /dev/null
     then
         ssh-keyscan git.threefold.info >> ~/.ssh/known_hosts
-    fi    
+    fi
     git config --global pull.rebase false
-
+    
 }
 
 function package_check_install {
     local command_name="$1"
     if command -v "$command_name" >/dev/null 2>&1; then
         echo "command '$command_name' is already installed."
-    else    
+    else
         package_install '$command_name'
     fi
 }
@@ -109,16 +168,16 @@ function package_install {
     local command_name="$1"
     if [[ "${OSNAME}" == "ubuntu" ]]; then
         if is_github_actions; then
-            run_sudo apt -o Dpkg::Options::="--force-confold" -o Dpkg::Options::="--force-confdef" install $1 -q -y --allow-downgrades --allow-remove-essential 
+            run_sudo apt -o Dpkg::Options::="--force-confold" -o Dpkg::Options::="--force-confdef" install $1 -q -y --allow-downgrades --allow-remove-essential
         else
-            apt -o Dpkg::Options::="--force-confold" -o Dpkg::Options::="--force-confdef" install $1 -q -y --allow-downgrades --allow-remove-essential 
+            apt -o Dpkg::Options::="--force-confold" -o Dpkg::Options::="--force-confdef" install $1 -q -y --allow-downgrades --allow-remove-essential
         fi
         
-    elif [[ "${OSNAME}" == "darwin"* ]]; then
+        elif [[ "${OSNAME}" == "darwin"* ]]; then
         brew install $command_name
-    elif [[ "${OSNAME}" == "alpine"* ]]; then
+        elif [[ "${OSNAME}" == "alpine"* ]]; then
         apk add $command_name
-    elif [[ "${OSNAME}" == "arch"* ]]; then
+        elif [[ "${OSNAME}" == "arch"* ]]; then
         pacman --noconfirm -Su $command_name
     else
         echo "platform : ${OSNAME} not supported"
@@ -142,36 +201,39 @@ is_github_actions() {
 function myplatform {
     if [[ "${OSTYPE}" == "darwin"* ]]; then
         export OSNAME='darwin'
-    elif [ -e /etc/os-release ]; then
+        elif [ -e /etc/os-release ]; then
         # Read the ID field from the /etc/os-release file
         export OSNAME=$(grep '^ID=' /etc/os-release | cut -d= -f2)
         if [ "${os_id,,}" == "ubuntu" ]; then
-            export OSNAME="ubuntu"          
+            export OSNAME="ubuntu"
         fi
         if [ "${OSNAME}" == "archarm" ]; then
-            export OSNAME="arch"          
-        fi        
+            export OSNAME="arch"
+        fi
         if [ "${OSNAME}" == "debian" ]; then
-            export OSNAME="ubuntu"          
-        fi            
+            export OSNAME="ubuntu"
+        fi
     else
         echo "Unable to determine the operating system."
-        exit 1        
+        exit 1
     fi
-
-
+    
+    
     # if [ "$(uname -m)" == "x86_64" ]; then
     #     echo "This system is running a 64-bit processor."
     # else
     #     echo "This system is not running a 64-bit processor."
     #     exit 1
-    # fi    
-
+    # fi
+    
 }
 
 myplatform
 
 function os_update {
+    if [[ "${OSNAME}" == "ubuntu" ]]; then
+        ubuntu_sources_fix
+    fi
     echo ' - os update'
     if [[ "${OSNAME}" == "ubuntu" ]]; then
         if is_github_actions; then
@@ -179,53 +241,53 @@ function os_update {
         else
             rm -f /var/lib/apt/lists/lock
             rm -f /var/cache/apt/archives/lock
-            rm -f /var/lib/dpkg/lock*		
-        fi    
+            rm -f /var/lib/dpkg/lock*
+        fi
         export TERM=xterm
         export DEBIAN_FRONTEND=noninteractive
-        run_sudo dpkg --configure -a        
+        run_sudo dpkg --configure -a
         run_sudo apt update -y
         if is_github_actions; then
             echo "** IN GITHUB ACTIONS, DON'T DO UPDATE"
-        else            
-            set +e            
+        else
+            set +e
             echo "** UPDATE"
             apt-mark hold grub-efi-amd64-signed
             set -e
             apt upgrade  -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
             apt autoremove  -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
-        fi 
+        fi
         #apt install apt-transport-https ca-certificates curl software-properties-common  -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
-        package_install "apt-transport-https ca-certificates curl wget software-properties-common tmux make tcc gcc"
+        package_install "apt-transport-https ca-certificates curl wget software-properties-common tmux make gcc"
         package_install "rclone rsync mc redis-server screen net-tools git dnsutils htop ca-certificates screen lsb-release binutils pkg-config libssl-dev iproute2"
-
-    elif [[ "${OSNAME}" == "darwin"* ]]; then
+        
+        elif [[ "${OSNAME}" == "darwin"* ]]; then
         if command -v brew >/dev/null 2>&1; then
             echo ' - homebrew installed'
-        else 
+        else
             export NONINTERACTIVE=1
-            /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"            
+            /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
             unset NONINTERACTIVE
         fi
         set +e
         brew install mc redis curl tmux screen htop wget rclone tcc
         set -e
-    elif [[ "${OSNAME}" == "alpine"* ]]; then
+        elif [[ "${OSNAME}" == "alpine"* ]]; then
         apk update screen git htop tmux
         apk add mc curl rsync htop redis bash bash-completion screen git rclone
-        sed -i 's#/bin/ash#/bin/bash#g' /etc/passwd             
-    elif [[ "${OSNAME}" == "arch"* ]]; then
+        sed -i 's#/bin/ash#/bin/bash#g' /etc/passwd
+        elif [[ "${OSNAME}" == "arch"* ]]; then
         pacman -Syy --noconfirm
         pacman -Syu --noconfirm
         pacman -Su --noconfirm arch-install-scripts gcc mc git tmux curl htop redis wget screen net-tools git sudo htop ca-certificates lsb-release screen rclone
-
+        
         # Check if builduser exists, create if not
         if ! id -u builduser > /dev/null 2>&1; then
             useradd -m builduser
             echo "builduser:$(openssl rand -base64 32 | sha256sum | base64 | head -c 32)" | chpasswd
             echo 'builduser ALL=(ALL) NOPASSWD: ALL' | tee /etc/sudoers.d/builduser
         fi
-
+        
         # if [[ -n "${DEBUG}" ]]; then
         #     execute_with_marker "paru_install" paru_install
         # fi
@@ -235,7 +297,7 @@ function os_update {
 
 
 function hero_lib_pull {
-    pushd $DIR_CODE/github/freeflowuniverse/herolib 2>&1 >> /dev/null     
+    pushd $DIR_CODE/github/freeflowuniverse/herolib 2>&1 >> /dev/null
     if [[ $(git status -s) ]]; then
         echo "There are uncommitted changes in the Git repository herolib."
         return 1
@@ -254,7 +316,7 @@ function hero_lib_get {
         pushd $DIR_CODE/github/freeflowuniverse 2>&1 >> /dev/null
         git clone --depth 1 --no-single-branch https://github.com/freeflowuniverse/herolib.git
         popd 2>&1 >> /dev/null
-    fi    
+    fi
 }
 
 # function install_secp256k1 {
@@ -283,7 +345,7 @@ function hero_lib_get {
 #         else
 #             make install
 #         fi
-        
+
 #         # Cleanup
 #         cd ..
 #         rm -rf secp256k1-0.3.2 v0.3.2.tar.gz
@@ -311,7 +373,7 @@ remove_all() {
         echo "Removing v-analyzer from system..."
         run_sudo rm -f $(which v-analyzer)
     fi
-
+    
     # Remove v-analyzer path from rc files
     for RC_FILE in ~/.zshrc ~/.bashrc; do
         if [ -f "$RC_FILE" ]; then
@@ -327,7 +389,7 @@ remove_all() {
             echo "Cleaned up $RC_FILE"
         fi
     done
-
+    
     echo "V removal complete"
 }
 
@@ -335,31 +397,31 @@ remove_all() {
 
 # Function to check if a service is running and start it if needed
 check_and_start_redis() {
-
+    
     # Normal service management for non-container environments
     if [[ "${OSNAME}" == "ubuntu" ]] || [[ "${OSNAME}" == "debian" ]]; then
-
+        
         # Handle Redis installation for GitHub Actions environment
         if is_github_actions; then
-
-                # Import Redis GPG key
+            
+            # Import Redis GPG key
             curl -fsSL https://packages.redis.io/gpg | run_sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
             # Add Redis repository
             echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | run_sudo tee /etc/apt/sources.list.d/redis.list
             # Install Redis
             run_sudo apt-get update
             run_sudo apt-get install -y redis
-                
+            
             # Start Redis
             redis-server --daemonize yes
-
+            
             # Print versions
             redis-cli --version
             redis-server --version
-
+            
             return
         fi
-    
+        
         # Check if running inside a container
         if grep -q "/docker/" /proc/1/cgroup || [ ! -d "/run/systemd/system" ]; then
             echo "Running inside a container. Starting redis directly."
@@ -378,7 +440,7 @@ check_and_start_redis() {
             fi
             return
         fi
-
+        
         if systemctl is-active --quiet "redis"; then
             echo "redis is already running."
         else
@@ -391,7 +453,7 @@ check_and_start_redis() {
                 exit 1
             fi
         fi
-    elif [[ "${OSNAME}" == "darwin"* ]]; then
+        elif [[ "${OSNAME}" == "darwin"* ]]; then
         # Check if we're in GitHub Actions
         if is_github_actions; then
             echo "Running in GitHub Actions on macOS. Starting redis directly..."
@@ -416,14 +478,14 @@ check_and_start_redis() {
                 brew services start redis
             fi
         fi
-    elif [[ "${OSNAME}" == "alpine"* ]]; then
+        elif [[ "${OSNAME}" == "alpine"* ]]; then
         if rc-service "redis" status | grep -q "running"; then
             echo "redis is already running."
         else
             echo "redis is not running. Starting it..."
             rc-service "redis" start
         fi
-    elif [[ "${OSNAME}" == "arch"* ]]; then
+        elif [[ "${OSNAME}" == "arch"* ]]; then
         if systemctl is-active --quiet "redis"; then
             echo "redis is already running."
         else
@@ -437,7 +499,7 @@ check_and_start_redis() {
 }
 
 v-install() {
-
+    
     # Check if v is already installed and in PATH
     if command_exists v; then
         echo "V is already installed and in PATH."
@@ -445,8 +507,8 @@ v-install() {
         # For now, just exit the function assuming it's okay
         return 0
     fi
-
-
+    
+    
     # Only clone and install if directory doesn't exist
     # Note: The original check was for ~/code/v, but the installation happens in ~/_code/v.
     if [ ! -d ~/_code/v ]; then
@@ -459,8 +521,8 @@ v-install() {
             exit 1
         fi
     fi
-
-
+    
+    
     # Only clone and install if directory doesn't exist
     # Note: The original check was for ~/code/v, but the installation happens in ~/_code/v.
     # Adjusting the check to the actual installation directory.
@@ -474,48 +536,48 @@ v-install() {
     fi
     # Check if the built executable can report its version
     if ! ~/_code/v/v -version > /dev/null 2>&1; then
-            echo "Error: Built V executable (~/_code/v/v) failed to report version."
-            exit 1
+        echo "Error: Built V executable (~/_code/v/v) failed to report version."
+        exit 1
     fi
     echo "V built successfully. Creating symlink..."
     run_sudo ./v symlink
-
+    
     # Verify v is in path
     if ! command_exists v; then
         echo "Error: V installation failed or not in PATH"
         echo "Please ensure ~/code/v is in your PATH"
         exit 1
     fi
-
+    
     echo "V installation successful!"
-
+    
 }
 
 
 v-analyzer() {
-
+    
     set -ex
-
+    
     # Install v-analyzer if requested
     if [ "$INSTALL_ANALYZER" = true ]; then
         echo "Installing v-analyzer..."
         cd /tmp
         v download -RD https://raw.githubusercontent.com/vlang/v-analyzer/main/install.vsh
-
+        
         # Check if v-analyzer bin directory exists
         if [ ! -d "$HOME/.config/v-analyzer/bin" ]; then
             echo "Error: v-analyzer bin directory not found at $HOME/.config/v-analyzer/bin"
             echo "Please ensure v-analyzer was installed correctly"
             exit 1
         fi
-
+        
         echo "v-analyzer installation successful!"
     fi
-
+    
     # Add v-analyzer to PATH if installed
     if [ -d "$HOME/.config/v-analyzer/bin" ]; then
         V_ANALYZER_PATH='export PATH="$PATH:$HOME/.config/v-analyzer/bin"'
-
+        
         # Function to add path to rc file if not present
         add_to_rc() {
             local RC_FILE="$1"
@@ -529,7 +591,7 @@ v-analyzer() {
                 fi
             fi
         }
-
+        
         # Add to both .zshrc and .bashrc if they exist
         add_to_rc ~/.zshrc
         if [ "$(uname)" = "Darwin" ] && [ -f ~/.bashrc ]; then
@@ -546,29 +608,23 @@ if [ "$REMOVE" = true ]; then
     exit 0
 fi
 
-# Handle reset if requested
-if [ "$RESET" = true ]; then
-    remove_all
-    echo "Reset complete"
-fi
-
 # Create code directory if it doesn't exist
 mkdir -p ~/code
 
 
 # Check if v needs to be installed
 if [ "$RESET" = true ] || ! command_exists v; then
-
+    
     os_update
-
+    
     sshknownkeysadd
-
+    
     # Install secp256k1
-
+    
     v-install
-
-
-
+    
+    
+    
 fi
 
 
diff --git a/lib/builder/bootstrapper.v b/lib/builder/bootstrapper.v
index 90117531..5c0a73f2 100644
--- a/lib/builder/bootstrapper.v
+++ b/lib/builder/bootstrapper.v
@@ -3,9 +3,7 @@ module builder
 import os
 import freeflowuniverse.herolib.core.texttools
 import freeflowuniverse.herolib.core.pathlib
-import freeflowuniverse.herolib.osal.core as osal
 import freeflowuniverse.herolib.ui.console
-import v.embed_file
 
 const heropath_ = os.dir(@FILE) + '/../'
 
@@ -52,10 +50,10 @@ pub mut:
 
 pub fn (mut node Node) hero_install(args HeroInstallArgs) ! {
 	console.print_debug('install hero')
-	mut bs := bootstrapper()
+	bootstrapper()
 
 	myenv := node.environ_get()!
-	homedir := myenv['HOME'] or { return error("can't find HOME in env") }
+	_ := myenv['HOME'] or { return error("can't find HOME in env") }
 
 	mut todo := []string{}
 	if !args.compile {
diff --git a/lib/builder/executor.v b/lib/builder/executor.v
index 2029dd46..5c9326d2 100644
--- a/lib/builder/executor.v
+++ b/lib/builder/executor.v
@@ -2,7 +2,7 @@ module builder
 
 import freeflowuniverse.herolib.data.ipaddress
 
-type Executor = ExecutorLocal | ExecutorSSH
+type Executor = ExecutorLocal | ExecutorSSH | ExecutorCrun
 
 pub struct ExecutorNewArguments {
 pub mut:
diff --git a/lib/builder/executor_crun.v b/lib/builder/executor_crun.v
new file mode 100644
index 00000000..990c5d0a
--- /dev/null
+++ b/lib/builder/executor_crun.v
@@ -0,0 +1,217 @@
+module builder
+
+import os
+import rand
+import freeflowuniverse.herolib.osal.core as osal
+import freeflowuniverse.herolib.core.pathlib
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.core.texttools
+
+@[heap]
+pub struct ExecutorCrun {
+pub mut:
+	container_id string // container ID for crun
+	retry        int  = 1
+	debug        bool = true
+}
+
+pub fn (mut executor ExecutorCrun) init() ! {
+	// Verify container exists and is running
+	result := osal.exec(cmd: 'crun state ${executor.container_id}', stdout: false) or {
+		return error('Container ${executor.container_id} not found or not accessible')
+	}
+
+	// Parse state to ensure container is running
+	if !result.output.contains('"status": "running"') {
+		return error('Container ${executor.container_id} is not running')
+	}
+}
+
+pub fn (mut executor ExecutorCrun) debug_on() {
+	executor.debug = true
+}
+
+pub fn (mut executor ExecutorCrun) debug_off() {
+	executor.debug = false
+}
+
+pub fn (mut executor ExecutorCrun) exec(args_ ExecArgs) !string {
+	mut args := args_
+	if executor.debug {
+		console.print_debug('execute in container ${executor.container_id}: ${args.cmd}')
+	}
+
+	mut cmd := 'crun exec ${executor.container_id} ${args.cmd}'
+	if args.cmd.contains('\n') {
+		// For multiline commands, write to temp file first
+		temp_script := '/tmp/crun_script_${rand.uuid_v4()}.sh'
+		script_content := texttools.dedent(args.cmd)
+		os.write_file(temp_script, script_content)!
+
+		// Copy script into container and execute
+		executor.file_write('/tmp/exec_script.sh', script_content)!
+		cmd = 'crun exec ${executor.container_id} bash /tmp/exec_script.sh'
+	}
+
+	res := osal.exec(cmd: cmd, stdout: args.stdout, debug: executor.debug)!
+	return res.output
+}
+
+pub fn (mut executor ExecutorCrun) exec_interactive(args_ ExecArgs) ! {
+	mut args := args_
+
+	if args.cmd.contains('\n') {
+		args.cmd = texttools.dedent(args.cmd)
+		executor.file_write('/tmp/interactive_script.sh', args.cmd)!
+		args.cmd = 'bash /tmp/interactive_script.sh'
+	}
+
+	cmd := 'crun exec -t ${executor.container_id} ${args.cmd}'
+	console.print_debug(cmd)
+	osal.execute_interactive(cmd)!
+}
+
+pub fn (mut executor ExecutorCrun) file_write(path string, text string) ! {
+	if executor.debug {
+		console.print_debug('Container ${executor.container_id} file write: ${path}')
+	}
+
+	// Write to temp file first, then copy into container
+	temp_file := '/tmp/crun_file_${rand.uuid_v4()}'
+	os.write_file(temp_file, text)!
+	defer { os.rm(temp_file) or {} }
+
+	// Use crun exec to copy file content
+	cmd := 'cat ${temp_file} | crun exec -i ${executor.container_id} tee ${path} > /dev/null'
+	osal.exec(cmd: cmd, stdout: false)!
+}
+
+pub fn (mut executor ExecutorCrun) file_read(path string) !string {
+	if executor.debug {
+		console.print_debug('Container ${executor.container_id} file read: ${path}')
+	}
+
+	return executor.exec(cmd: 'cat ${path}', stdout: false)
+}
+
+pub fn (mut executor ExecutorCrun) file_exists(path string) bool {
+	if executor.debug {
+		console.print_debug('Container ${executor.container_id} file exists: ${path}')
+	}
+
+	output := executor.exec(cmd: 'test -f ${path} && echo found || echo not found', stdout: false) or {
+		return false
+	}
+	return output.trim_space() == 'found'
+}
+
+pub fn (mut executor ExecutorCrun) delete(path string) ! {
+	if executor.debug {
+		console.print_debug('Container ${executor.container_id} delete: ${path}')
+	}
+	executor.exec(cmd: 'rm -rf ${path}', stdout: false)!
+}
+
+pub fn (mut executor ExecutorCrun) upload(args SyncArgs) ! {
+	// For container uploads, we need to copy files from host to container
+	// Use crun exec with tar for efficient transfer
+
+	mut src_path := pathlib.get(args.source)
+	if !src_path.exists() {
+		return error('Source path ${args.source} does not exist')
+	}
+
+	if src_path.is_dir() {
+		// For directories, use tar to transfer
+		temp_tar := '/tmp/crun_upload_${rand.uuid_v4()}.tar'
+		osal.exec(
+			cmd:    'tar -cf ${temp_tar} -C ${src_path.path_dir()} ${src_path.name()}'
+			stdout: false
+		)!
+		defer { os.rm(temp_tar) or {} }
+
+		// Extract in container
+		cmd := 'cat ${temp_tar} | crun exec -i ${executor.container_id} tar -xf - -C ${args.dest}'
+		osal.exec(cmd: cmd, stdout: args.stdout)!
+	} else {
+		// For single files
+		executor.file_write(args.dest, src_path.read()!)!
+	}
+}
+
+pub fn (mut executor ExecutorCrun) download(args SyncArgs) ! {
+	// Download from container to host
+	if executor.dir_exists(args.source) {
+		// For directories
+		temp_tar := '/tmp/crun_download_${rand.uuid_v4()}.tar'
+		cmd := 'crun exec ${executor.container_id} tar -cf - -C ${args.source} . > ${temp_tar}'
+		osal.exec(cmd: cmd, stdout: false)!
+		defer { os.rm(temp_tar) or {} }
+
+		// Extract on host
+		osal.exec(
+			cmd:    'mkdir -p ${args.dest} && tar -xf ${temp_tar} -C ${args.dest}'
+			stdout: args.stdout
+		)!
+	} else {
+		// For single files
+		content := executor.file_read(args.source)!
+		os.write_file(args.dest, content)!
+	}
+}
+
+pub fn (mut executor ExecutorCrun) environ_get() !map[string]string {
+	env := executor.exec(cmd: 'env', stdout: false) or {
+		return error('Cannot get environment from container ${executor.container_id}')
+	}
+
+	mut res := map[string]string{}
+	for line in env.split('\n') {
+		if line.contains('=') {
+			mut key, mut val := line.split_once('=') or { continue }
+			key = key.trim(' ')
+			val = val.trim(' ')
+			res[key] = val
+		}
+	}
+	return res
+}
+
+pub fn (mut executor ExecutorCrun) info() map[string]string {
+	return {
+		'category':     'crun'
+		'container_id': executor.container_id
+		'runtime':      'crun'
+	}
+}
+
+pub fn (mut executor ExecutorCrun) shell(cmd string) ! {
+	if cmd.len > 0 {
+		osal.execute_interactive('crun exec -t ${executor.container_id} ${cmd}')!
+	} else {
+		osal.execute_interactive('crun exec -t ${executor.container_id} /bin/sh')!
+	}
+}
+
+pub fn (mut executor ExecutorCrun) list(path string) ![]string {
+	if !executor.dir_exists(path) {
+		return error('Directory ${path} does not exist in container')
+	}
+
+	output := executor.exec(cmd: 'ls ${path}', stdout: false)!
+	mut res := []string{}
+	for line in output.split('\n') {
+		line_trimmed := line.trim_space()
+		if line_trimmed != '' {
+			res << line_trimmed
+		}
+	}
+	return res
+}
+
+pub fn (mut executor ExecutorCrun) dir_exists(path string) bool {
+	output := executor.exec(cmd: 'test -d ${path} && echo found || echo not found', stdout: false) or {
+		return false
+	}
+	return output.trim_space() == 'found'
+}
diff --git a/lib/builder/node_executor.v b/lib/builder/node_executor.v
index 729b6d51..3d4d0723 100644
--- a/lib/builder/node_executor.v
+++ b/lib/builder/node_executor.v
@@ -14,6 +14,8 @@ pub fn (mut node Node) exec(args ExecArgs) !string {
 		return node.executor.exec(cmd: args.cmd, stdout: args.stdout)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.exec(cmd: args.cmd, stdout: args.stdout)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.exec(cmd: args.cmd, stdout: args.stdout)
 	}
 	panic('did not find right executor')
 }
@@ -80,6 +82,8 @@ pub fn (mut node Node) exec_silent(cmd string) !string {
 		return node.executor.exec(cmd: cmd, stdout: false)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.exec(cmd: cmd, stdout: false)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.exec(cmd: cmd, stdout: false)
 	}
 	panic('did not find right executor')
 }
@@ -89,8 +93,11 @@ pub fn (mut node Node) exec_interactive(cmd_ string) ! {
 		node.executor.exec_interactive(cmd: cmd_)!
 	} else if mut node.executor is ExecutorSSH {
 		node.executor.exec_interactive(cmd: cmd_)!
+	} else if mut node.executor is ExecutorCrun {
+		node.executor.exec_interactive(cmd: cmd_)!
+	} else {
+		panic('did not find right executor')
 	}
-	panic('did not find right executor')
 }
 
 pub fn (mut node Node) file_write(path string, text string) ! {
@@ -98,6 +105,8 @@ pub fn (mut node Node) file_write(path string, text string) ! {
 		return node.executor.file_write(path, text)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.file_write(path, text)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.file_write(path, text)
 	}
 	panic('did not find right executor')
 }
@@ -107,6 +116,8 @@ pub fn (mut node Node) file_read(path string) !string {
 		return node.executor.file_read(path)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.file_read(path)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.file_read(path)
 	}
 	panic('did not find right executor')
 }
@@ -116,6 +127,8 @@ pub fn (mut node Node) file_exists(path string) bool {
 		return node.executor.file_exists(path)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.file_exists(path)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.file_exists(path)
 	}
 	panic('did not find right executor')
 }
@@ -137,6 +150,8 @@ pub fn (mut node Node) delete(path string) ! {
 		return node.executor.delete(path)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.delete(path)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.delete(path)
 	}
 	panic('did not find right executor')
 }
@@ -179,6 +194,8 @@ pub fn (mut node Node) download(args_ SyncArgs) ! {
 		return node.executor.download(args)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.download(args)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.download(args)
 	}
 	panic('did not find right executor')
 }
@@ -208,6 +225,8 @@ pub fn (mut node Node) upload(args_ SyncArgs) ! {
 		return node.executor.upload(args)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.upload(args)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.upload(args)
 	}
 	panic('did not find right executor')
 }
@@ -224,6 +243,8 @@ pub fn (mut node Node) environ_get(args EnvGetParams) !map[string]string {
 			return node.executor.environ_get()
 		} else if mut node.executor is ExecutorSSH {
 			return node.executor.environ_get()
+		} else if mut node.executor is ExecutorCrun {
+			return node.executor.environ_get()
 		}
 		panic('did not find right executor')
 	}
@@ -235,6 +256,8 @@ pub fn (mut node Node) info() map[string]string {
 		return node.executor.info()
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.info()
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.info()
 	}
 	panic('did not find right executor')
 }
@@ -244,6 +267,8 @@ pub fn (mut node Node) shell(cmd string) ! {
 		return node.executor.shell(cmd)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.shell(cmd)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.shell(cmd)
 	}
 	panic('did not find right executor')
 }
@@ -257,6 +282,8 @@ pub fn (mut node Node) list(path string) ![]string {
 		return node.executor.list(path)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.list(path)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.list(path)
 	}
 	panic('did not find right executor')
 }
@@ -266,6 +293,8 @@ pub fn (mut node Node) dir_exists(path string) bool {
 		return node.executor.dir_exists(path)
 	} else if mut node.executor is ExecutorSSH {
 		return node.executor.dir_exists(path)
+	} else if mut node.executor is ExecutorCrun {
+		return node.executor.dir_exists(path)
 	}
 	panic('did not find right executor')
 }
@@ -275,8 +304,11 @@ pub fn (mut node Node) debug_off() {
 		node.executor.debug_off()
 	} else if mut node.executor is ExecutorSSH {
 		node.executor.debug_off()
+	} else if mut node.executor is ExecutorCrun {
+		node.executor.debug_off()
+	} else {
+		panic('did not find right executor')
 	}
-	panic('did not find right executor')
 }
 
 pub fn (mut node Node) debug_on() {
@@ -284,6 +316,9 @@ pub fn (mut node Node) debug_on() {
 		node.executor.debug_on()
 	} else if mut node.executor is ExecutorSSH {
 		node.executor.debug_on()
+	} else if mut node.executor is ExecutorCrun {
+		node.executor.debug_on()
+	} else {
+		panic('did not find right executor')
 	}
-	panic('did not find right executor')
 }
diff --git a/lib/builder/this_remote.v b/lib/builder/this_remote.v
index 703e561f..60ecffa0 100644
--- a/lib/builder/this_remote.v
+++ b/lib/builder/this_remote.v
@@ -18,6 +18,7 @@ pub mut:
 pub fn this_remote_exec(args_ ThisRemoteArgs) !bool {
 	mut args := args_
 	if args.script.trim_space().starts_with('/tmp/remote_') {
+		// TODO: don't understand this
 		return false // means we need to execute
 	}
 	addr := texttools.to_array(args.nodes)
diff --git a/lib/builder/ubuntu_solutions.v b/lib/builder/ubuntu_solutions.v
new file mode 100644
index 00000000..313f3ae5
--- /dev/null
+++ b/lib/builder/ubuntu_solutions.v
@@ -0,0 +1,4 @@
+module builder
+
+pub fn (mut node Node) ubuntu_sources_fix() {
+}
diff --git a/lib/clients/mycelium/mycelium_check.v b/lib/clients/mycelium/mycelium_check.v
index 06297bd8..2c13e874 100644
--- a/lib/clients/mycelium/mycelium_check.v
+++ b/lib/clients/mycelium/mycelium_check.v
@@ -1,13 +1,8 @@
 module mycelium
 
 import freeflowuniverse.herolib.osal.core as osal
-import freeflowuniverse.herolib.core
-import freeflowuniverse.herolib.installers.lang.rust
 import freeflowuniverse.herolib.ui.console
-import freeflowuniverse.herolib.core.texttools
-import freeflowuniverse.herolib.ui
 import os
-import time
 import json
 
 pub fn check() bool {
diff --git a/lib/clients/mycelium/mycelium_factory_.v b/lib/clients/mycelium/mycelium_factory_.v
index 03bb9dce..f1b95ce0 100644
--- a/lib/clients/mycelium/mycelium_factory_.v
+++ b/lib/clients/mycelium/mycelium_factory_.v
@@ -2,7 +2,6 @@ module mycelium
 
 import freeflowuniverse.herolib.core.base
 import freeflowuniverse.herolib.core.playbook { PlayBook }
-import freeflowuniverse.herolib.ui.console
 import json
 
 __global (
diff --git a/lib/core/herocmds/playbook_lib.v b/lib/core/herocmds/playbook_lib.v
index 518274d5..1ad2a1d9 100644
--- a/lib/core/herocmds/playbook_lib.v
+++ b/lib/core/herocmds/playbook_lib.v
@@ -150,21 +150,20 @@ pub fn plbook_code_get(cmd Command) !string {
 
 // same as session_run_get but will also run the plbook
 pub fn plbook_run(cmd Command) !(&playbook.PlayBook, string) {
-	heroscript := cmd.flags.get_string('heroscript') or { '' } 
+	heroscript := cmd.flags.get_string('heroscript') or { '' }
 	mut path := ''
 
 	mut plbook := if heroscript.len > 0 {
 		playbook.new(text: heroscript)!
 	} else {
-		path 
-		= plbook_code_get(cmd)!
+		path = plbook_code_get(cmd)!
 		if path.len == 0 {
 			return error(cmd.help_message())
 		}
 		// add all actions inside to the plbook
-		playbook.new(path: path)!		
+		playbook.new(path: path)!
 	}
-	
+
 	dagu := cmd.flags.get_bool('dagu') or { false }
 
 	playcmds.run(plbook: plbook)!
diff --git a/lib/core/logger/log_test.v b/lib/core/logger/log_test.v
index 1a959343..28fa7252 100644
--- a/lib/core/logger/log_test.v
+++ b/lib/core/logger/log_test.v
@@ -11,7 +11,9 @@ fn testsuite_begin() {
 }
 
 fn test_logger() {
-	mut logger := new('/tmp/testlogs')!
+	mut logger := new(LoggerFactoryArgs{
+		path: '/tmp/testlogs'
+	})!
 
 	// Test stdout logging
 	logger.log(LogItemArgs{
diff --git a/lib/core/playbook/playbook_include.v b/lib/core/playbook/playbook_include.v
index dcc595b5..b23c78e2 100644
--- a/lib/core/playbook/playbook_include.v
+++ b/lib/core/playbook/playbook_include.v
@@ -1,6 +1,6 @@
 module playbook
 
-import freeflowuniverse.herolib.develop.gittools // Added import for gittools
+// import freeflowuniverse.herolib.develop.gittools // Added import for gittools
 
 // REMARK: include is done in play_core	
 
diff --git a/lib/data/encoder/auto.v b/lib/data/encoder/auto.v
index 75b2ec8d..729b4625 100644
--- a/lib/data/encoder/auto.v
+++ b/lib/data/encoder/auto.v
@@ -25,6 +25,8 @@ pub fn encode[T](obj T) ![]u8 {
 			d.add_u32(u32(obj.$(field.name)))
 		} $else $if field.typ is u64 {
 			d.add_u64(u64(obj.$(field.name)))
+		}$else $if field.typ is i64 {
+			d.add_i64(i64(obj.$(field.name)))
 		} $else $if field.typ is time.Time {
 			d.add_time(time.new(obj.$(field.name)))
 			// Arrays of primitive types
diff --git a/lib/data/encoderhero/decoder.v b/lib/data/encoderhero/decoder.v
index 7e5bda35..9dddd513 100644
--- a/lib/data/encoderhero/decoder.v
+++ b/lib/data/encoderhero/decoder.v
@@ -1,8 +1,6 @@
 module encoderhero
 
-import time
 import freeflowuniverse.herolib.data.paramsparser
-import freeflowuniverse.herolib.core.texttools
 
 pub struct Decoder[T] {
 pub mut:
diff --git a/lib/data/encoderhero/encoder.v b/lib/data/encoderhero/encoder.v
index 06ecba6d..4bc9e74d 100644
--- a/lib/data/encoderhero/encoder.v
+++ b/lib/data/encoderhero/encoder.v
@@ -4,7 +4,6 @@ import freeflowuniverse.herolib.data.paramsparser
 import time
 import v.reflection
 import freeflowuniverse.herolib.data.ourtime
-import freeflowuniverse.herolib.core.texttools
 // import freeflowuniverse.herolib.ui.console
 
 // Encoder encodes the an `Any` type into HEROSCRIPT representation.
diff --git a/lib/data/encoderhero/types.v b/lib/data/encoderhero/types.v
index 68108f13..3c9253f9 100644
--- a/lib/data/encoderhero/types.v
+++ b/lib/data/encoderhero/types.v
@@ -1,7 +1,5 @@
 module encoderhero
 
-import time
-
 // byte array versions of the most common tokens/chars to avoid reallocations
 const null_in_bytes = 'null'
 
diff --git a/lib/data/ipaddress/ipaddress_test.v b/lib/data/ipaddress/ipaddress_test.v
index 1a49f207..47666723 100644
--- a/lib/data/ipaddress/ipaddress_test.v
+++ b/lib/data/ipaddress/ipaddress_test.v
@@ -25,7 +25,7 @@ fn test_ping() {
 	mut addr := IPAddress{
 		addr: '127.0.0.1'
 	}
-	assert addr.ping(timeout: 3)!
+	assert addr.ping(nr_ok: 3)!
 	assert addr.port == 0
 }
 
@@ -33,7 +33,7 @@ fn test_ping_fails() {
 	mut addr := IPAddress{
 		addr: '22.22.22.22'
 	}
-	assert addr.ping(timeout: 3)! == false
+	assert addr.ping(nr_ok: 3)! == false
 	assert addr.port == 0
 	assert addr.addr == '22.22.22.22'
 }
@@ -56,7 +56,7 @@ fn test_ipv6() {
 	mut addr := new('202:6a34:cd78:b0d7:5521:8de7:218e:6680') or { panic(err) }
 	assert addr.cat == .ipv6
 	assert addr.port == 0
-	// assert addr.ping(timeout: 3)! == false
+	// assert addr.ping(nr_ok: 3)! == false
 }
 
 fn test_ipv6b() {
diff --git a/lib/data/ourdb_syncer/streamer/nodes.v b/lib/data/ourdb_syncer/streamer/nodes.v
index 768f40e1..5d2e000a 100644
--- a/lib/data/ourdb_syncer/streamer/nodes.v
+++ b/lib/data/ourdb_syncer/streamer/nodes.v
@@ -23,7 +23,7 @@ pub mut:
 }
 
 // is_running checks if the node is operational by pinging its address
-fn (node &StreamerNode) is_running() bool {
+fn (node &StreamerNode) is_running() !bool {
 	return osal.ping(address: node.address, retry: 2)!
 }
 
@@ -198,7 +198,7 @@ pub fn (mut node StreamerNode) handle_ping_nodes() ! {
 		mut i := 0
 		for i < node.workers.len {
 			worker := &node.workers[i]
-			if !worker.is_running() {
+			if !(worker.is_running() or { false }) {
 				log_event(event_type: 'logs', message: 'Worker ${worker.address} is not running')
 				log_event(event_type: 'logs', message: 'Removing worker ${worker.public_key}')
 				node.workers.delete(i)
@@ -212,7 +212,7 @@ pub fn (mut node StreamerNode) handle_ping_nodes() ! {
 			}
 		}
 	} else {
-		if !node.is_running() {
+		if !(node.is_running() or { false }) {
 			return error('Worker node is not running')
 		}
 		if node.master_public_key.len == 0 {
diff --git a/lib/data/ourdb_syncer/streamer/streamer.v b/lib/data/ourdb_syncer/streamer/streamer.v
index 88c6625d..25b2eb02 100644
--- a/lib/data/ourdb_syncer/streamer/streamer.v
+++ b/lib/data/ourdb_syncer/streamer/streamer.v
@@ -244,7 +244,7 @@ pub fn (mut self Streamer) add_worker(params StreamerNodeParams) !StreamerNode {
 
 	mut worker_node := self.new_node(params)!
 
-	if !worker_node.is_running() {
+	if !(worker_node.is_running() or { false }) {
 		return error('Worker node is not running')
 	}
 
diff --git a/lib/data/paramsparser/params_get_kwargs_test.v b/lib/data/paramsparser/params_get_kwargs_test.v
index 5a8ac5f1..c4ffe23f 100644
--- a/lib/data/paramsparser/params_get_kwargs_test.v
+++ b/lib/data/paramsparser/params_get_kwargs_test.v
@@ -175,7 +175,7 @@ fn test_get_u64_default() {
 	assert params.get_u64_default('key3', 17)! == 17
 }
 
-fn test_get_u32()! {
+fn test_get_u32() ! {
 	text := '
 		key1: val1
 		key2: 19
diff --git a/lib/develop/gittools/gitstructure.v b/lib/develop/gittools/gitstructure.v
index 00051abb..40374de5 100644
--- a/lib/develop/gittools/gitstructure.v
+++ b/lib/develop/gittools/gitstructure.v
@@ -2,7 +2,7 @@ module gittools
 
 import crypto.md5
 import freeflowuniverse.herolib.core.pathlib
-import freeflowuniverse.herolib.ui.console
+// import freeflowuniverse.herolib.ui.console
 import os
 import json
 
diff --git a/lib/develop/gittools/gittools_do.v b/lib/develop/gittools/gittools_do.v
index 6b28f626..48de0da1 100644
--- a/lib/develop/gittools/gittools_do.v
+++ b/lib/develop/gittools/gittools_do.v
@@ -65,7 +65,7 @@ pub fn (mut gs GitStructure) do(args_ ReposActionsArgs) !string {
 			// means current dir
 			args.path = os.getwd()
 			mut curdiro := pathlib.get_dir(path: args.path, create: false)!
-			mut parentpath := curdiro.parent_find('.git') or { pathlib.Path{} }
+			// mut parentpath := curdiro.parent_find('.git') or { pathlib.Path{} }
 			args.path = curdiro.path
 		}
 		if !os.exists(args.path) {
diff --git a/lib/develop/gittools/repos_get.v b/lib/develop/gittools/repos_get.v
index 2f6ec4fe..e78f6e5f 100644
--- a/lib/develop/gittools/repos_get.v
+++ b/lib/develop/gittools/repos_get.v
@@ -1,8 +1,8 @@
 module gittools
 
-import freeflowuniverse.herolib.core.redisclient
+// import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.ui.console
-import time
+// import time
 
 // ReposGetArgs defines arguments to retrieve repositories from the git structure.
 // It includes filters by name, account, provider, and an option to clone a missing repo.
diff --git a/lib/develop/gittools/repository_cache.v b/lib/develop/gittools/repository_cache.v
index 1f857fd5..db44a757 100644
--- a/lib/develop/gittools/repository_cache.v
+++ b/lib/develop/gittools/repository_cache.v
@@ -27,7 +27,7 @@ fn (mut repo GitRepo) cache_get() ! {
 	if repo_json.len > 0 {
 		mut cached := json.decode(GitRepo, repo_json)!
 		cached.gs = repo.gs
-		cached.config.remote_check_period = 3600 * 24 * 7 
+		cached.config.remote_check_period = 3600 * 24 * 7
 		repo = cached
 	}
 }
diff --git a/lib/develop/gittools/repository_clone.v b/lib/develop/gittools/repository_clone.v
index 96df8142..d5759747 100644
--- a/lib/develop/gittools/repository_clone.v
+++ b/lib/develop/gittools/repository_clone.v
@@ -2,7 +2,7 @@ module gittools
 
 import freeflowuniverse.herolib.ui.console
 import os
-import freeflowuniverse.herolib.core.pathlib
+// import freeflowuniverse.herolib.core.pathlib
 
 @[params]
 pub struct GitCloneArgs {
@@ -40,17 +40,17 @@ pub fn (mut gitstructure GitStructure) clone(args GitCloneArgs) !&GitRepo {
 	gitstructure.repos[key_] = &repo
 
 	if repo.exists() {
-		console.print_green("Repository already exists at ${repo.path()}")
+		console.print_green('Repository already exists at ${repo.path()}')
 		// Load the existing repository status
 		repo.load_internal() or {
 			console.print_debug('Could not load existing repository status: ${err}')
 		}
 		return &repo
 	}
-	
+
 	// Check if path exists but is not a git repository
 	if os.exists(repo.path()) {
-		return error("Path exists but is not a git repository: ${repo.path()}")
+		return error('Path exists but is not a git repository: ${repo.path()}')
 	}
 
 	if args.sshkey.len > 0 {
diff --git a/lib/develop/gittools/repository_load.v b/lib/develop/gittools/repository_load.v
index 6f898642..ef292133 100644
--- a/lib/develop/gittools/repository_load.v
+++ b/lib/develop/gittools/repository_load.v
@@ -2,7 +2,7 @@ module gittools
 
 import time
 import freeflowuniverse.herolib.ui.console
-import os
+// import os
 
 @[params]
 pub struct StatusUpdateArgs {
diff --git a/lib/develop/gittools/repository_utils.v b/lib/develop/gittools/repository_utils.v
index ae0dd97d..6c8caf24 100644
--- a/lib/develop/gittools/repository_utils.v
+++ b/lib/develop/gittools/repository_utils.v
@@ -182,7 +182,7 @@ pub fn (mut gs GitStructure) check_repos_exist(args ReposActionsArgs) !string {
 		account:  args.account
 		provider: args.provider
 	)!
-	
+
 	if repos.len > 0 {
 		// Repository exists - print path and return success
 		if !args.script {
diff --git a/lib/hero/herocluster/example/example.vsh b/lib/hero/herocluster/example/example.vsh
old mode 100644
new mode 100755
index 6c1300dc..59250d70
--- a/lib/hero/herocluster/example/example.vsh
+++ b/lib/hero/herocluster/example/example.vsh
@@ -1,67 +1,107 @@
 #!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
 
+import crypto.ed25519
+import freeflowuniverse.herolib.core.base
+import freeflowuniverse.herolib.core.redisclient
+import freeflowuniverse.herolib.hero.herocluster
+import os
+import rand
+
+mut ctx := base.context()!
+redis := ctx.redis()!
+
 if os.args.len < 3 {
-    eprintln('Usage: ./prog <node_id> <status>')
-    eprintln('  status: active|buffer')
-    return
+	eprintln('Usage: ./prog <node_id> <status>')
+	eprintln('  status: active|buffer')
+	return
 }
 node_id := os.args[1]
 status_str := os.args[2]
 
 status := match status_str {
-    'active' { NodeStatus.active }
-    'buffer' { NodeStatus.buffer }
-    else { 
-        eprintln('Invalid status. Use: active|buffer')
-        return
-    }
+	'active' {
+		herocluster.NodeStatus.active
+	}
+	'buffer' {
+		herocluster.NodeStatus.buffer
+	}
+	else {
+		eprintln('Invalid status. Use: active|buffer')
+		return
+	}
 }
 
 // --- Generate ephemeral keys for demo ---
 // In real use: load from PEM files
-priv, pub := ed25519.generate_key(rand.reader) or { panic(err) }
+pub_, priv := ed25519.generate_key()!
 
 mut pubkeys := map[string]ed25519.PublicKey{}
-pubkeys[node_id] = pub
+pubkeys[node_id] = pub_
 // TODO: load all pubkeys from config file so every node knows others
 
 // Initialize all nodes (in real scenario, load from config)
-mut all_nodes := map[string]Node{}
-all_nodes['node1'] = Node{id: 'node1', status: .active}
-all_nodes['node2'] = Node{id: 'node2', status: .active}
-all_nodes['node3'] = Node{id: 'node3', status: .active}
-all_nodes['node4'] = Node{id: 'node4', status: .buffer}
+mut all_nodes := map[string]herocluster.Node{}
+all_nodes['node1'] = herocluster.Node{
+	id:     'node1'
+	status: .active
+}
+all_nodes['node2'] = herocluster.Node{
+	id:     'node2'
+	status: .active
+}
+all_nodes['node3'] = herocluster.Node{
+	id:     'node3'
+	status: .active
+}
+all_nodes['node4'] = herocluster.Node{
+	id:     'node4'
+	status: .buffer
+}
 
 // Set current node status
 all_nodes[node_id].status = status
 
 servers := ['127.0.0.1:6379', '127.0.0.1:6380', '127.0.0.1:6381', '127.0.0.1:6382']
-mut conns := []redis.Connection{}
+mut conns := []&redisclient.Redis{}
 for s in servers {
-    mut c := redis.connect(redis.Options{ server: s }) or {
-        panic('could not connect to redis $s: $err')
-    }
-    conns << c
+	redis_url := redisclient.get_redis_url(s) or {
+		eprintln('Warning: could not parse redis url ${s}: ${err}')
+		continue
+	}
+	mut c := redisclient.core_get(redis_url) or {
+		eprintln('Warning: could not connect to redis ${s}: ${err}')
+		continue
+	}
+	conns << c
+	println('Connected to Redis server: ${s}')
 }
 
-mut election := Election{
-    clients: conns
-    pubkeys: pubkeys
-    self: Node{
-        id: node_id
-        term: 0
-        leader: false
-        status: status
-    }
-    keys: Keys{ priv: priv, pub: pub }
-    all_nodes: all_nodes
-    buffer_nodes: ['node4'] // Initially node4 is buffer
+if conns.len == 0 {
+	eprintln('Error: No Redis servers available. Please start at least one Redis server.')
+	return
 }
 
-println('[$node_id] started as $status_str, connected to 4 redis servers.')
+mut election := &herocluster.Election{
+	clients:      conns
+	pubkeys:      pubkeys
+	self:         herocluster.Node{
+		id:     node_id
+		term:   0
+		leader: false
+		status: status
+	}
+	keys:         herocluster.Keys{
+		priv: priv
+		pub:  pub_
+	}
+	all_nodes:    all_nodes
+	buffer_nodes: ['node4'] // Initially node4 is buffer
+}
+
+println('[${node_id}] started as ${status_str}, connected to 4 redis servers.')
 
 // Start health monitoring in background
-go election.health_monitor_loop()
+spawn election.health_monitor_loop()
 
 // Start main heartbeat loop
 election.heartbeat_loop()
diff --git a/lib/hero/herocluster/factory.v b/lib/hero/herocluster/factory.v
index d2319dad..e9b99022 100644
--- a/lib/hero/herocluster/factory.v
+++ b/lib/hero/herocluster/factory.v
@@ -1,10 +1,8 @@
 module herocluster
 
-import db.redis
+import freeflowuniverse.herolib.core.redisclient
 import crypto.ed25519
-import crypto.rand
 import encoding.hex
-import os
 import time
 
 const election_timeout_ms = 3000
@@ -14,295 +12,318 @@ const health_check_interval_ms = 30000 // 30 seconds
 
 // --- Crypto helpers ---
 
-struct Keys {
-    priv ed25519.PrivateKey
-    pub  ed25519.PublicKey
+pub struct Keys {
+pub mut:
+	priv ed25519.PrivateKey
+	pub  ed25519.PublicKey
 }
 
 // sign a message
 fn (k Keys) sign(msg string) string {
-    sig := ed25519.sign(k.priv, msg.bytes())
-    return hex.encode(sig)
+	sig := ed25519.sign(k.priv, msg.bytes()) or { panic('Failed to sign message: ${err}') }
+	return hex.encode(sig)
 }
 
 // verify signature
-fn verify(pub ed25519.PublicKey, msg string, sig_hex string) bool {
-    sig := hex.decode(sig_hex) or { return false }
-    return ed25519.verify(pub, msg.bytes(), sig)
+fn verify(pubkey ed25519.PublicKey, msg string, sig_hex string) bool {
+	sig := hex.decode(sig_hex) or { return false }
+	return ed25519.verify(pubkey, msg.bytes(), sig) or { false }
 }
 
 // --- Node & Election ---
 
-enum NodeStatus {
-    active
-    buffer
-    unavailable
+pub enum NodeStatus {
+	active
+	buffer
+	unavailable
 }
 
-struct Node {
-    id    string
-    mut:
-        term      int
-        leader    bool
-        voted_for string
-        status    NodeStatus
-        last_seen i64 // timestamp
+pub struct Node {
+pub:
+	id string
+pub mut:
+	term      int
+	leader    bool
+	voted_for string
+	status    NodeStatus
+	last_seen i64 // timestamp
 }
 
 struct HealthReport {
-    reporter_id   string
-    target_id     string
-    status        string // "available" or "unavailable"
-    timestamp     i64
-    signature     string
+	reporter_id string
+	target_id   string
+	status      string // "available" or "unavailable"
+	timestamp   i64
+	signature   string
 }
 
-struct Election {
-    mut:
-        clients []redis.Connection
-        pubkeys map[string]ed25519.PublicKey
-        self    Node
-        keys    Keys
-        all_nodes map[string]Node
-        buffer_nodes []string
+pub struct Election {
+pub mut:
+	clients      []&redisclient.Redis
+	pubkeys      map[string]ed25519.PublicKey
+	self         Node
+	keys         Keys
+	all_nodes    map[string]Node
+	buffer_nodes []string
 }
 
 // Redis keys
-fn vote_key(term int, node_id string) string { return 'vote:${term}:${node_id}' }
-fn health_key(reporter_id string, target_id string) string { return 'health:${reporter_id}:${target_id}' }
-fn node_status_key(node_id string) string { return 'node_status:${node_id}' }
+fn vote_key(term int, node_id string) string {
+	return 'vote:${term}:${node_id}'
+}
+
+fn health_key(reporter_id string, target_id string) string {
+	return 'health:${reporter_id}:${target_id}'
+}
+
+fn node_status_key(node_id string) string {
+	return 'node_status:${node_id}'
+}
 
 // Write vote (signed) to ALL redis servers
 fn (mut e Election) vote_for(candidate string) {
-    msg := '${e.self.term}:${candidate}'
-    sig_hex := e.keys.sign(msg)
-    for mut c in e.clients {
-        k := vote_key(e.self.term, e.self.id)
-        c.hset(k, 'candidate', candidate) or {}
-        c.hset(k, 'sig', sig_hex) or {}
-        c.expire(k, 5) or {}
-    }
-    println('[${e.self.id}] voted for $candidate (term=${e.self.term})')
+	msg := '${e.self.term}:${candidate}'
+	sig_hex := e.keys.sign(msg)
+	for mut c in e.clients {
+		k := vote_key(e.self.term, e.self.id)
+		c.hset(k, 'candidate', candidate) or {}
+		c.hset(k, 'sig', sig_hex) or {}
+		c.expire(k, 5) or {}
+	}
+	println('[${e.self.id}] voted for ${candidate} (term=${e.self.term})')
 }
 
 // Report node health status
 fn (mut e Election) report_node_health(target_id string, status string) {
-    now := time.now().unix()
-    msg := '${target_id}:${status}:${now}'
-    sig_hex := e.keys.sign(msg)
-    
-    report := HealthReport{
-        reporter_id: e.self.id
-        target_id: target_id
-        status: status
-        timestamp: now
-        signature: sig_hex
-    }
-    
-    for mut c in e.clients {
-        k := health_key(e.self.id, target_id)
-        c.hset(k, 'status', status) or {}
-        c.hset(k, 'timestamp', now.str()) or {}
-        c.hset(k, 'signature', sig_hex) or {}
-        c.expire(k, 86400) or {} // expire after 24 hours
-    }
-    println('[${e.self.id}] reported $target_id as $status')
+	now := time.now().unix()
+	msg := '${target_id}:${status}:${now}'
+	sig_hex := e.keys.sign(msg)
+
+	_ := HealthReport{
+		reporter_id: e.self.id
+		target_id:   target_id
+		status:      status
+		timestamp:   now
+		signature:   sig_hex
+	}
+
+	for mut c in e.clients {
+		k := health_key(e.self.id, target_id)
+		c.hset(k, 'status', status) or {}
+		c.hset(k, 'timestamp', now.str()) or {}
+		c.hset(k, 'signature', sig_hex) or {}
+		c.expire(k, 86400) or {} // expire after 24 hours
+	}
+	println('[${e.self.id}] reported ${target_id} as ${status}')
 }
 
 // Collect health reports and check for consensus on unavailable nodes
 fn (mut e Election) check_node_availability() {
-    now := time.now().unix()
-    mut unavailable_reports := map[string]map[string]i64{} // target_id -> reporter_id -> timestamp
-    
-    for mut c in e.clients {
-        keys := c.keys('health:*') or { continue }
-        for k in keys {
-            parts := k.split(':')
-            if parts.len != 3 { continue }
-            reporter_id := parts[1]
-            target_id := parts[2]
-            
-            vals := c.hgetall(k) or { continue }
-            status := vals['status']
-            timestamp_str := vals['timestamp']
-            sig_hex := vals['signature']
-            
-            if reporter_id !in e.pubkeys { continue }
-            
-            timestamp := timestamp_str.i64()
-            msg := '${target_id}:${status}:${timestamp}'
-            
-            if verify(e.pubkeys[reporter_id], msg, sig_hex) {
-                if status == 'unavailable' && (now - timestamp) >= (node_unavailable_threshold_ms / 1000) {
-                    if target_id !in unavailable_reports {
-                        unavailable_reports[target_id] = map[string]i64{}
-                    }
-                    unavailable_reports[target_id][reporter_id] = timestamp
-                }
-            }
-        }
-    }
-    
-    // Check for consensus (2 out of 3 active nodes agree)
-    for target_id, reports in unavailable_reports {
-        if reports.len >= 2 && target_id in e.all_nodes {
-            if e.all_nodes[target_id].status == .active {
-                println('[${e.self.id}] Consensus reached: $target_id is unavailable for >1 day')
-                e.promote_buffer_node(target_id)
-            }
-        }
-    }
+	now := time.now().unix()
+	mut unavailable_reports := map[string]map[string]i64{} // target_id -> reporter_id -> timestamp
+
+	for mut c in e.clients {
+		keys := c.keys('health:*') or { continue }
+		for k in keys {
+			parts := k.split(':')
+			if parts.len != 3 {
+				continue
+			}
+			reporter_id := parts[1]
+			target_id := parts[2]
+
+			vals := c.hgetall(k) or { continue }
+			status := vals['status']
+			timestamp_str := vals['timestamp']
+			sig_hex := vals['signature']
+
+			if reporter_id !in e.pubkeys {
+				continue
+			}
+
+			timestamp := timestamp_str.i64()
+			msg := '${target_id}:${status}:${timestamp}'
+
+			if verify(e.pubkeys[reporter_id], msg, sig_hex) {
+				if status == 'unavailable'
+					&& (now - timestamp) >= (node_unavailable_threshold_ms / 1000) {
+					if target_id !in unavailable_reports {
+						unavailable_reports[target_id] = map[string]i64{}
+					}
+					unavailable_reports[target_id][reporter_id] = timestamp
+				}
+			}
+		}
+	}
+
+	// Check for consensus (2 out of 3 active nodes agree)
+	for target_id, reports in unavailable_reports {
+		if reports.len >= 2 && target_id in e.all_nodes {
+			if e.all_nodes[target_id].status == .active {
+				println('[${e.self.id}] Consensus reached: ${target_id} is unavailable for >1 day')
+				e.promote_buffer_node(target_id)
+			}
+		}
+	}
 }
 
 // Promote a buffer node to active status
 fn (mut e Election) promote_buffer_node(failed_node_id string) {
-    if e.buffer_nodes.len == 0 {
-        println('[${e.self.id}] No buffer nodes available for promotion')
-        return
-    }
-    
-    // Select first available buffer node
-    buffer_id := e.buffer_nodes[0]
-    
-    // Update node statuses
-    if failed_node_id in e.all_nodes {
-        e.all_nodes[failed_node_id].status = .unavailable
-    }
-    if buffer_id in e.all_nodes {
-        e.all_nodes[buffer_id].status = .active
-    }
-    
-    // Remove from buffer list
-    e.buffer_nodes = e.buffer_nodes.filter(it != buffer_id)
-    
-    // Announce the promotion
-    for mut c in e.clients {
-        k := node_status_key(buffer_id)
-        c.hset(k, 'status', 'active') or {}
-        c.hset(k, 'promoted_at', time.now().unix().str()) or {}
-        c.hset(k, 'replaced_node', failed_node_id) or {}
-        
-        // Mark failed node as unavailable
-        failed_k := node_status_key(failed_node_id)
-        c.hset(failed_k, 'status', 'unavailable') or {}
-        c.hset(failed_k, 'failed_at', time.now().unix().str()) or {}
-    }
-    
-    println('[${e.self.id}] Promoted buffer node $buffer_id to replace failed node $failed_node_id')
+	if e.buffer_nodes.len == 0 {
+		println('[${e.self.id}] No buffer nodes available for promotion')
+		return
+	}
+
+	// Select first available buffer node
+	buffer_id := e.buffer_nodes[0]
+
+	// Update node statuses
+	if failed_node_id in e.all_nodes {
+		e.all_nodes[failed_node_id].status = .unavailable
+	}
+	if buffer_id in e.all_nodes {
+		e.all_nodes[buffer_id].status = .active
+	}
+
+	// Remove from buffer list
+	e.buffer_nodes = e.buffer_nodes.filter(it != buffer_id)
+
+	// Announce the promotion
+	for mut c in e.clients {
+		k := node_status_key(buffer_id)
+		c.hset(k, 'status', 'active') or {}
+		c.hset(k, 'promoted_at', time.now().unix().str()) or {}
+		c.hset(k, 'replaced_node', failed_node_id) or {}
+
+		// Mark failed node as unavailable
+		failed_k := node_status_key(failed_node_id)
+		c.hset(failed_k, 'status', 'unavailable') or {}
+		c.hset(failed_k, 'failed_at', time.now().unix().str()) or {}
+	}
+
+	println('[${e.self.id}] Promoted buffer node ${buffer_id} to replace failed node ${failed_node_id}')
 }
 
 // Collect votes from ALL redis servers, verify signatures (only from active nodes)
 fn (mut e Election) collect_votes(term int) map[string]int {
-    mut counts := map[string]int{}
-    mut seen := map[string]bool{} // avoid double-counting same vote from multiple servers
+	mut counts := map[string]int{}
+	mut seen := map[string]bool{} // avoid double-counting same vote from multiple servers
 
-    for mut c in e.clients {
-        keys := c.keys('vote:${term}:*') or { continue }
-        for k in keys {
-            if seen[k] { continue }
-            seen[k] = true
-            vals := c.hgetall(k) or { continue }
-            candidate := vals['candidate']
-            sig_hex := vals['sig']
-            voter_id := k.split(':')[2]
-            
-            // Only count votes from active nodes
-            if voter_id !in e.pubkeys || voter_id !in e.all_nodes { continue }
-            if e.all_nodes[voter_id].status != .active { continue }
-            
-            msg := '${term}:${candidate}'
-            if verify(e.pubkeys[voter_id], msg, sig_hex) {
-                counts[candidate]++
-            } else {
-                println('[${e.self.id}] invalid signature from $voter_id')
-            }
-        }
-    }
-    return counts
+	for mut c in e.clients {
+		keys := c.keys('vote:${term}:*') or { continue }
+		for k in keys {
+			if seen[k] {
+				continue
+			}
+			seen[k] = true
+			vals := c.hgetall(k) or { continue }
+			candidate := vals['candidate']
+			sig_hex := vals['sig']
+			voter_id := k.split(':')[2]
+
+			// Only count votes from active nodes
+			if voter_id !in e.pubkeys || voter_id !in e.all_nodes {
+				continue
+			}
+			if e.all_nodes[voter_id].status != .active {
+				continue
+			}
+
+			msg := '${term}:${candidate}'
+			if verify(e.pubkeys[voter_id], msg, sig_hex) {
+				counts[candidate]++
+			} else {
+				println('[${e.self.id}] invalid signature from ${voter_id}')
+			}
+		}
+	}
+	return counts
 }
 
 // Run election (only active nodes participate)
 fn (mut e Election) run_election() {
-    if e.self.status != .active {
-        return // Buffer nodes don't participate in elections
-    }
-    
-    e.self.term++
-    e.vote_for(e.self.id)
+	if e.self.status != .active {
+		return
+	}
 
-    // wait a bit for other nodes to also vote
-    time.sleep(500 * time.millisecond)
+	e.self.term++
+	e.vote_for(e.self.id)
 
-    votes := e.collect_votes(e.self.term)
-    active_node_count := e.all_nodes.values().filter(it.status == .active).len
-    majority_threshold := (active_node_count / 2) + 1
-    
-    for cand, cnt in votes {
-        if cnt >= majority_threshold {
-            if cand == e.self.id {
-                println('[${e.self.id}] I AM LEADER (term=${e.self.term}, votes=$cnt, active_nodes=$active_node_count)')
-                e.self.leader = true
-            } else {
-                println('[${e.self.id}] sees LEADER = $cand (term=${e.self.term}, votes=$cnt, active_nodes=$active_node_count)')
-                e.self.leader = false
-            }
-        }
-    }
+	// wait a bit for other nodes to also vote
+	time.sleep(500 * time.millisecond)
+
+	votes := e.collect_votes(e.self.term)
+	active_node_count := e.all_nodes.values().filter(it.status == .active).len
+	majority_threshold := (active_node_count / 2) + 1
+
+	for cand, cnt in votes {
+		if cnt >= majority_threshold {
+			if cand == e.self.id {
+				println('[${e.self.id}] I AM LEADER (term=${e.self.term}, votes=${cnt}, active_nodes=${active_node_count})')
+				e.self.leader = true
+			} else {
+				println('[${e.self.id}] sees LEADER = ${cand} (term=${e.self.term}, votes=${cnt}, active_nodes=${active_node_count})')
+				e.self.leader = false
+			}
+		}
+	}
 }
 
 // Health monitoring loop (runs in background)
-fn (mut e Election) health_monitor_loop() {
-    for {
-        if e.self.status == .active {
-            // Check health of other nodes
-            for node_id, node in e.all_nodes {
-                if node_id == e.self.id { continue }
-                
-                // Simple health check: try to read a heartbeat key
-                mut is_available := false
-                for mut c in e.clients {
-                    heartbeat_key := 'heartbeat:${node_id}'
-                    val := c.get(heartbeat_key) or { continue }
-                    last_heartbeat := val.i64()
-                    if (time.now().unix() - last_heartbeat) < 60 { // 60 seconds threshold
-                        is_available = true
-                        break
-                    }
-                }
-                
-                status := if is_available { 'available' } else { 'unavailable' }
-                e.report_node_health(node_id, status)
-            }
-            
-            // Check for consensus on failed nodes
-            e.check_node_availability()
-        }
-        
-        time.sleep(health_check_interval_ms * time.millisecond)
-    }
+pub fn (mut e Election) health_monitor_loop() {
+	for {
+		if e.self.status == .active {
+			// Check health of other nodes
+			for node_id, _ in e.all_nodes {
+				if node_id == e.self.id {
+					continue
+				}
+
+				// Simple health check: try to read a heartbeat key
+				mut is_available := false
+				for mut c in e.clients {
+					heartbeat_key := 'heartbeat:${node_id}'
+					val := c.get(heartbeat_key) or { continue }
+					last_heartbeat := val.i64()
+					if (time.now().unix() - last_heartbeat) < 60 { // 60 seconds threshold
+						is_available = true
+						break
+					}
+				}
+
+				status := if is_available { 'available' } else { 'unavailable' }
+				e.report_node_health(node_id, status)
+			}
+
+			// Check for consensus on failed nodes
+			e.check_node_availability()
+		}
+
+		time.sleep(health_check_interval_ms * time.millisecond)
+	}
 }
 
 // Heartbeat loop
-fn (mut e Election) heartbeat_loop() {
-    for {
-        // Update own heartbeat
-        now := time.now().unix()
-        for mut c in e.clients {
-            heartbeat_key := 'heartbeat:${e.self.id}'
-            c.set(heartbeat_key, now.str()) or {}
-            c.expire(heartbeat_key, 120) or {} // expire after 2 minutes
-        }
-        
-        if e.self.status == .active {
-            if e.self.leader {
-                println('[${e.self.id}] Heartbeat term=${e.self.term} (LEADER)')
-            } else {
-                e.run_election()
-            }
-        } else if e.self.status == .buffer {
-            println('[${e.self.id}] Buffer node monitoring cluster')
-        }
-        
-        time.sleep(heartbeat_interval_ms * time.millisecond)
-    }
+pub fn (mut e Election) heartbeat_loop() {
+	for {
+		// Update own heartbeat
+		now := time.now().unix()
+		for mut c in e.clients {
+			heartbeat_key := 'heartbeat:${e.self.id}'
+			c.set(heartbeat_key, now.str()) or {}
+			c.expire(heartbeat_key, 120) or {} // expire after 2 minutes
+		}
+
+		if e.self.status == .active {
+			if e.self.leader {
+				println('[${e.self.id}] Heartbeat term=${e.self.term} (LEADER)')
+			} else {
+				e.run_election()
+			}
+		} else if e.self.status == .buffer {
+			println('[${e.self.id}] Buffer node monitoring cluster')
+		}
+
+		time.sleep(heartbeat_interval_ms * time.millisecond)
+	}
 }
diff --git a/lib/hero/heromodels/calendar.v b/lib/hero/heromodels/calendar.v
index 76b2a17f..4e1ee49c 100644
--- a/lib/hero/heromodels/calendar.v
+++ b/lib/hero/heromodels/calendar.v
@@ -6,24 +6,24 @@ import time
 // Calendar represents a collection of events
 @[heap]
 pub struct Calendar {
-    Base
+	Base
 pub mut:
-    group_id    u32   // Associated group for permissions
-    events      []u32 // IDs of calendar events (changed to u32 to match CalendarEvent)
-    color       string   // Hex color code
-    timezone    string
-    is_public   bool
+	group_id  u32    // Associated group for permissions
+	events    []u32  // IDs of calendar events (changed to u32 to match CalendarEvent)
+	color     string // Hex color code
+	timezone  string
+	is_public bool
 }
 
 @[params]
 pub struct CalendarArgs {
-    BaseArgs
+	BaseArgs
 pub mut:
-    group_id    u32
-    events      []u32
-    color       string
-    timezone    string
-    is_public   bool
+	group_id  u32
+	events    []u32
+	color     string
+	timezone  string
+	is_public bool
 }
 
 pub fn calendar_new(args CalendarArgs) !Calendar {
@@ -47,18 +47,18 @@ pub fn calendar_new(args CalendarArgs) !Calendar {
 }
 
 pub fn (mut c Calendar) add_event(event_id u32) { // Changed event_id to u32
-    if event_id !in c.events {
-        c.events << event_id
-        c.updated_at = ourtime.now().unix() // Use Base's updated_at
-    }
+	if event_id !in c.events {
+		c.events << event_id
+		c.updated_at = ourtime.now().unix() // Use Base's updated_at
+	}
 }
 
 pub fn (mut c Calendar) dump() []u8 {
-    //TODO: implement based on lib/data/encoder/readme.md
-    return []u8{}
+	// TODO: implement based on lib/data/encoder/readme.md
+	return []u8{}
 }
 
 pub fn calendar_load(data []u8) Calendar {
-    //TODO: implement based on lib/data/encoder/readme.md
-    return Calendar{}
-}
\ No newline at end of file
+	// TODO: implement based on lib/data/encoder/readme.md
+	return Calendar{}
+}
diff --git a/lib/hero/heromodels/calendar_event.v b/lib/hero/heromodels/calendar_event.v
index b59e1a81..db3205f1 100644
--- a/lib/hero/heromodels/calendar_event.v
+++ b/lib/hero/heromodels/calendar_event.v
@@ -9,256 +9,253 @@ import freeflowuniverse.herolib.core.redisclient
 // CalendarEvent represents a single event in a calendar
 @[heap]
 pub struct CalendarEvent {
-    Base
+	Base
 pub mut:
-    title          string
-    start_time     i64         // Unix timestamp
-    end_time       i64         // Unix timestamp
-    location       string
-    attendees      []u32       // IDs of user groups
-    fs_items       []u32    // IDs of linked files or dirs
-    calendar_id    u32      // Associated calendar
-    status         EventStatus
-    is_all_day     bool
-    is_recurring   bool
-    recurrence     []RecurrenceRule //normally empty
-    reminder_mins  []int       // Minutes before event for reminders
-    color          string      // Hex color code
-    timezone       string
+	title         string
+	start_time    i64 // Unix timestamp
+	end_time      i64 // Unix timestamp
+	location      string
+	attendees     []u32 // IDs of user groups
+	fs_items      []u32 // IDs of linked files or dirs
+	calendar_id   u32   // Associated calendar
+	status        EventStatus
+	is_all_day    bool
+	is_recurring  bool
+	recurrence    []RecurrenceRule // normally empty
+	reminder_mins []int            // Minutes before event for reminders
+	color         string           // Hex color code
+	timezone      string
 }
 
 pub struct Attendee {
 pub mut:
-    user_id u32
-    status  AttendanceStatus
-    role    AttendeeRole
+	user_id u32
+	status  AttendanceStatus
+	role    AttendeeRole
 }
 
 pub enum AttendanceStatus {
-    no_response
-    accepted
-    declined
-    tentative
+	no_response
+	accepted
+	declined
+	tentative
 }
 
 pub enum AttendeeRole {
-    required
-    optional
-    organizer
+	required
+	optional
+	organizer
 }
 
 pub enum EventStatus {
-    draft
-    published
-    cancelled
-    completed
+	draft
+	published
+	cancelled
+	completed
 }
 
 pub struct RecurrenceRule {
 pub mut:
-    frequency     RecurrenceFreq
-    interval      int    // Every N frequencies
-    until         i64    // End date (Unix timestamp)
-    count         int    // Number of occurrences
-    by_weekday    []int  // Days of week (0=Sunday)
-    by_monthday   []int  // Days of month
+	frequency   RecurrenceFreq
+	interval    int   // Every N frequencies
+	until       i64   // End date (Unix timestamp)
+	count       int   // Number of occurrences
+	by_weekday  []int // Days of week (0=Sunday)
+	by_monthday []int // Days of month
 }
 
 pub enum RecurrenceFreq {
-    none
-    daily
-    weekly
-    monthly
-    yearly
+	none
+	daily
+	weekly
+	monthly
+	yearly
 }
 
-
 @[params]
 pub struct CalendarEventArgs {
-    BaseArgs
+	BaseArgs
 pub mut:
-    title          string
-    start_time     string         // use ourtime module to go from string to epoch
-    end_time       string         // use ourtime module to go from string to epoch
-    location       string
-    attendees      []u32       // IDs of user groups
-    fs_items       []u32    // IDs of linked files or dirs
-    calendar_id    u32      // Associated calendar
-    status         EventStatus
-    is_all_day     bool
-    is_recurring   bool
-    recurrence     []RecurrenceRule
-    reminder_mins  []int       // Minutes before event for reminders
-    color          string      // Hex color code
-    timezone       string
+	title         string
+	start_time    string // use ourtime module to go from string to epoch
+	end_time      string // use ourtime module to go from string to epoch
+	location      string
+	attendees     []u32 // IDs of user groups
+	fs_items      []u32 // IDs of linked files or dirs
+	calendar_id   u32   // Associated calendar
+	status        EventStatus
+	is_all_day    bool
+	is_recurring  bool
+	recurrence    []RecurrenceRule
+	reminder_mins []int  // Minutes before event for reminders
+	color         string // Hex color code
+	timezone      string
 }
 
-
 pub fn calendar_event_new(args CalendarEventArgs) !CalendarEvent {
-    // Convert tags to u32 ID
-    tags_id := tags2id(args.tags)!
-    
+	// Convert tags to u32 ID
+	tags_id := tags2id(args.tags)!
 
-    return CalendarEvent{
-        // Base fields
-        id: args.id or { 0 }
-        name: args.name
-        description: args.description
-        created_at: ourtime.now().unix()
-        updated_at: ourtime.now().unix()
-        securitypolicy: args.securitypolicy or { 0 }
-        tags: tags_id
-        comments: comments2ids(args.comments)!
+	return CalendarEvent{
+		// Base fields
+		id:             args.id or { 0 }
+		name:           args.name
+		description:    args.description
+		created_at:     ourtime.now().unix()
+		updated_at:     ourtime.now().unix()
+		securitypolicy: args.securitypolicy or { 0 }
+		tags:           tags_id
+		comments:       comments2ids(args.comments)!
 
-        // CalendarEvent specific fields
-        title: args.title
-        start_time: ourtime.new(args.start_time)!.unix()
-        end_time: ourtime.new(args.end_time)!.unix()
-        location: args.location
-        attendees: args.attendees
-        fs_items: args.fs_items
-        calendar_id: args.calendar_id
-        status: args.status
-        is_all_day: args.is_all_day
-        is_recurring: args.is_recurring
-        recurrence: args.recurrence
-        reminder_mins: args.reminder_mins
-        color: args.color
-        timezone: args.timezone
-    }
+		// CalendarEvent specific fields
+		title:         args.title
+		start_time:    ourtime.new(args.start_time)!.unix()
+		end_time:      ourtime.new(args.end_time)!.unix()
+		location:      args.location
+		attendees:     args.attendees
+		fs_items:      args.fs_items
+		calendar_id:   args.calendar_id
+		status:        args.status
+		is_all_day:    args.is_all_day
+		is_recurring:  args.is_recurring
+		recurrence:    args.recurrence
+		reminder_mins: args.reminder_mins
+		color:         args.color
+		timezone:      args.timezone
+	}
 }
 
 pub fn (mut e CalendarEvent) dump() ![]u8 {
-    // Create a new encoder
-    mut enc := encoder.new()
-    
-    // Add version byte
-    enc.add_u8(1)
-    
-    // Encode Base fields
-    enc.add_u32(e.id)
-    enc.add_string(e.name)
-    enc.add_string(e.description)
-    enc.add_i64(e.created_at)
-    enc.add_i64(e.updated_at)
-    enc.add_u32(e.securitypolicy)
-    enc.add_u32(e.tags)
-    enc.add_list_u32(e.comments)
-    
-    // Encode CalendarEvent specific fields
-    enc.add_string(e.title)
-    enc.add_string(e.description)
-    enc.add_i64(e.start_time)
-    enc.add_i64(e.end_time)
-    enc.add_string(e.location)
-    enc.add_list_u32(e.attendees)
-    enc.add_list_u32(e.fs_items)
-    enc.add_u32(e.calendar_id)
-    enc.add_u8(u8(e.status))
-    enc.add_bool(e.is_all_day)
-    enc.add_bool(e.is_recurring)
-    
-    // Encode recurrence array
-    enc.add_u16(u16(e.recurrence.len))
-    for rule in e.recurrence {
-        enc.add_u8(u8(rule.frequency))
-        enc.add_int(rule.interval)
-        enc.add_i64(rule.until)
-        enc.add_int(rule.count)
-        enc.add_list_int(rule.by_weekday)
-        enc.add_list_int(rule.by_monthday)
-    }
-    
-    enc.add_list_int(e.reminder_mins)
-    enc.add_string(e.color)
-    enc.add_string(e.timezone)
-    
-    return enc.data
+	// Create a new encoder
+	mut enc := encoder.new()
+
+	// Add version byte
+	enc.add_u8(1)
+
+	// Encode Base fields
+	enc.add_u32(e.id)
+	enc.add_string(e.name)
+	enc.add_string(e.description)
+	enc.add_i64(e.created_at)
+	enc.add_i64(e.updated_at)
+	enc.add_u32(e.securitypolicy)
+	enc.add_u32(e.tags)
+	enc.add_list_u32(e.comments)
+
+	// Encode CalendarEvent specific fields
+	enc.add_string(e.title)
+	enc.add_string(e.description)
+	enc.add_i64(e.start_time)
+	enc.add_i64(e.end_time)
+	enc.add_string(e.location)
+	enc.add_list_u32(e.attendees)
+	enc.add_list_u32(e.fs_items)
+	enc.add_u32(e.calendar_id)
+	enc.add_u8(u8(e.status))
+	enc.add_bool(e.is_all_day)
+	enc.add_bool(e.is_recurring)
+
+	// Encode recurrence array
+	enc.add_u16(u16(e.recurrence.len))
+	for rule in e.recurrence {
+		enc.add_u8(u8(rule.frequency))
+		enc.add_int(rule.interval)
+		enc.add_i64(rule.until)
+		enc.add_int(rule.count)
+		enc.add_list_int(rule.by_weekday)
+		enc.add_list_int(rule.by_monthday)
+	}
+
+	enc.add_list_int(e.reminder_mins)
+	enc.add_string(e.color)
+	enc.add_string(e.timezone)
+
+	return enc.data
 }
 
 pub fn (ce CalendarEvent) load(data []u8) !CalendarEvent {
-    // Create a new decoder
-    mut dec := encoder.decoder_new(data)
-    
-    // Read version byte
-    version := dec.get_u8()!
-    if version != 1 {
-        return error('wrong version in calendar event load')
-    }
-    
-    // Decode Base fields
-    id := dec.get_u32()!
-    name := dec.get_string()!
-    description := dec.get_string()!
-    created_at := dec.get_i64()!
-    updated_at := dec.get_i64()!
-    securitypolicy := dec.get_u32()!
-    tags := dec.get_u32()!
-    comments := dec.get_list_u32()!
-    
-    // Decode CalendarEvent specific fields
-    title := dec.get_string()!
-    description2 := dec.get_string()!  // Second description field
-    start_time := dec.get_i64()!
-    end_time := dec.get_i64()!
-    location := dec.get_string()!
-    attendees := dec.get_list_u32()!
-    fs_items := dec.get_list_u32()!
-    calendar_id := dec.get_u32()!
-    status := unsafe { EventStatus(dec.get_u8()!) }
-    is_all_day := dec.get_bool()!
-    is_recurring := dec.get_bool()!
-    
-    // Decode recurrence array
-    recurrence_len := dec.get_u16()!
-    mut recurrence := []RecurrenceRule{}
-    for _ in 0..recurrence_len {
-        frequency := unsafe{RecurrenceFreq(dec.get_u8()!)}
-        interval := dec.get_int()!
-        until := dec.get_i64()!
-        count := dec.get_int()!
-        by_weekday := dec.get_list_int()!
-        by_monthday := dec.get_list_int()!
-        
-        recurrence << RecurrenceRule{
-            frequency: frequency
-            interval: interval
-            until: until
-            count: count
-            by_weekday: by_weekday
-            by_monthday: by_monthday
-        }
-    }
-    
-    reminder_mins := dec.get_list_int()!
-    color := dec.get_string()!
-    timezone := dec.get_string()!
-    
-    return CalendarEvent{
-        // Base fields
-        id: id
-        name: name
-        description: description
-        created_at: created_at
-        updated_at: updated_at
-        securitypolicy: securitypolicy
-        tags: tags
-        comments: comments
-        
-        // CalendarEvent specific fields
-        title: title
-        start_time: start_time
-        end_time: end_time
-        location: location
-        attendees: attendees
-        fs_items: fs_items
-        calendar_id: calendar_id
-        status: status
-        is_all_day: is_all_day
-        is_recurring: is_recurring
-        recurrence: recurrence
-        reminder_mins: reminder_mins
-        color: color
-        timezone: timezone
-    }
+	// Create a new decoder
+	mut dec := encoder.decoder_new(data)
+
+	// Read version byte
+	version := dec.get_u8()!
+	if version != 1 {
+		return error('wrong version in calendar event load')
+	}
+
+	// Decode Base fields
+	id := dec.get_u32()!
+	name := dec.get_string()!
+	description := dec.get_string()!
+	created_at := dec.get_i64()!
+	updated_at := dec.get_i64()!
+	securitypolicy := dec.get_u32()!
+	tags := dec.get_u32()!
+	comments := dec.get_list_u32()!
+
+	// Decode CalendarEvent specific fields
+	title := dec.get_string()!
+	description2 := dec.get_string()! // Second description field
+	start_time := dec.get_i64()!
+	end_time := dec.get_i64()!
+	location := dec.get_string()!
+	attendees := dec.get_list_u32()!
+	fs_items := dec.get_list_u32()!
+	calendar_id := dec.get_u32()!
+	status := unsafe { EventStatus(dec.get_u8()!) }
+	is_all_day := dec.get_bool()!
+	is_recurring := dec.get_bool()!
+
+	// Decode recurrence array
+	recurrence_len := dec.get_u16()!
+	mut recurrence := []RecurrenceRule{}
+	for _ in 0 .. recurrence_len {
+		frequency := unsafe { RecurrenceFreq(dec.get_u8()!) }
+		interval := dec.get_int()!
+		until := dec.get_i64()!
+		count := dec.get_int()!
+		by_weekday := dec.get_list_int()!
+		by_monthday := dec.get_list_int()!
+
+		recurrence << RecurrenceRule{
+			frequency:   frequency
+			interval:    interval
+			until:       until
+			count:       count
+			by_weekday:  by_weekday
+			by_monthday: by_monthday
+		}
+	}
+
+	reminder_mins := dec.get_list_int()!
+	color := dec.get_string()!
+	timezone := dec.get_string()!
+
+	return CalendarEvent{
+		// Base fields
+		id:             id
+		name:           name
+		description:    description
+		created_at:     created_at
+		updated_at:     updated_at
+		securitypolicy: securitypolicy
+		tags:           tags
+		comments:       comments
+
+		// CalendarEvent specific fields
+		title:         title
+		start_time:    start_time
+		end_time:      end_time
+		location:      location
+		attendees:     attendees
+		fs_items:      fs_items
+		calendar_id:   calendar_id
+		status:        status
+		is_all_day:    is_all_day
+		is_recurring:  is_recurring
+		recurrence:    recurrence
+		reminder_mins: reminder_mins
+		color:         color
+		timezone:      timezone
+	}
 }
diff --git a/lib/hero/heromodels/chat_group.v b/lib/hero/heromodels/chat_group.v
index b0b915d9..3b973483 100644
--- a/lib/hero/heromodels/chat_group.v
+++ b/lib/hero/heromodels/chat_group.v
@@ -8,57 +8,57 @@ import json
 @[heap]
 pub struct ChatGroup {
 pub mut:
-    id          string     // blake192 hash
-    name        string
-    description string
-    group_id    string     // Associated group for permissions
-    chat_type   ChatType
-    messages    []string   // IDs of chat messages
-    created_at  i64
-    updated_at  i64
-    last_activity i64
-    is_archived bool
-    tags        []string
+	id            string // blake192 hash
+	name          string
+	description   string
+	group_id      string // Associated group for permissions
+	chat_type     ChatType
+	messages      []string // IDs of chat messages
+	created_at    i64
+	updated_at    i64
+	last_activity i64
+	is_archived   bool
+	tags          []string
 }
 
 pub enum ChatType {
-    public_channel
-    private_channel
-    direct_message
-    group_message
+	public_channel
+	private_channel
+	direct_message
+	group_message
 }
 
 pub fn (mut c ChatGroup) calculate_id() {
-    content := json.encode(ChatGroupContent{
-        name: c.name
-        description: c.description
-        group_id: c.group_id
-        chat_type: c.chat_type
-        is_archived: c.is_archived
-        tags: c.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    c.id = hash.hex()[..48]
+	content := json.encode(ChatGroupContent{
+		name:        c.name
+		description: c.description
+		group_id:    c.group_id
+		chat_type:   c.chat_type
+		is_archived: c.is_archived
+		tags:        c.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	c.id = hash.hex()[..48]
 }
 
 struct ChatGroupContent {
-    name        string
-    description string
-    group_id    string
-    chat_type   ChatType
-    is_archived bool
-    tags        []string
+	name        string
+	description string
+	group_id    string
+	chat_type   ChatType
+	is_archived bool
+	tags        []string
 }
 
 pub fn new_chat_group(name string, group_id string, chat_type ChatType) ChatGroup {
-    mut chat_group := ChatGroup{
-        name: name
-        group_id: group_id
-        chat_type: chat_type
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-        last_activity: time.now().unix()
-    }
-    chat_group.calculate_id()
-    return chat_group
-}
\ No newline at end of file
+	mut chat_group := ChatGroup{
+		name:          name
+		group_id:      group_id
+		chat_type:     chat_type
+		created_at:    time.now().unix()
+		updated_at:    time.now().unix()
+		last_activity: time.now().unix()
+	}
+	chat_group.calculate_id()
+	return chat_group
+}
diff --git a/lib/hero/heromodels/chat_message.v b/lib/hero/heromodels/chat_message.v
index b4f542f7..65d3fe98 100644
--- a/lib/hero/heromodels/chat_message.v
+++ b/lib/hero/heromodels/chat_message.v
@@ -8,97 +8,97 @@ import json
 @[heap]
 pub struct ChatMessage {
 pub mut:
-    id           string           // blake192 hash
-    content      string
-    chat_group_id string          // Associated chat group
-    sender_id    string           // User ID of sender
-    parent_messages []MessageLink // Referenced/replied messages
-    fs_files     []string         // IDs of linked files
-    message_type MessageType
-    status       MessageStatus
-    created_at   i64
-    updated_at   i64
-    edited_at    i64
-    deleted_at   i64
-    reactions    []MessageReaction
-    mentions     []string         // User IDs mentioned in message
-    tags         []string
+	id              string // blake192 hash
+	content         string
+	chat_group_id   string        // Associated chat group
+	sender_id       string        // User ID of sender
+	parent_messages []MessageLink // Referenced/replied messages
+	fs_files        []string      // IDs of linked files
+	message_type    MessageType
+	status          MessageStatus
+	created_at      i64
+	updated_at      i64
+	edited_at       i64
+	deleted_at      i64
+	reactions       []MessageReaction
+	mentions        []string // User IDs mentioned in message
+	tags            []string
 }
 
 pub struct MessageLink {
 pub mut:
-    message_id string
-    link_type  MessageLinkType
+	message_id string
+	link_type  MessageLinkType
 }
 
 pub enum MessageLinkType {
-    reply
-    reference
-    forward
-    quote
+	reply
+	reference
+	forward
+	quote
 }
 
 pub enum MessageType {
-    text
-    image
-    file
-    voice
-    video
-    system
-    announcement
+	text
+	image
+	file
+	voice
+	video
+	system
+	announcement
 }
 
 pub enum MessageStatus {
-    sent
-    delivered
-    read
-    failed
-    deleted
+	sent
+	delivered
+	read
+	failed
+	deleted
 }
 
 pub struct MessageReaction {
 pub mut:
-    user_id   string
-    emoji     string
-    timestamp i64
+	user_id   string
+	emoji     string
+	timestamp i64
 }
 
 pub fn (mut m ChatMessage) calculate_id() {
-    content := json.encode(MessageContent{
-        content: m.content
-        chat_group_id: m.chat_group_id
-        sender_id: m.sender_id
-        parent_messages: m.parent_messages
-        fs_files: m.fs_files
-        message_type: m.message_type
-        mentions: m.mentions
-        tags: m.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    m.id = hash.hex()[..48]
+	content := json.encode(MessageContent{
+		content:         m.content
+		chat_group_id:   m.chat_group_id
+		sender_id:       m.sender_id
+		parent_messages: m.parent_messages
+		fs_files:        m.fs_files
+		message_type:    m.message_type
+		mentions:        m.mentions
+		tags:            m.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	m.id = hash.hex()[..48]
 }
 
 struct MessageContent {
-    content         string
-    chat_group_id   string
-    sender_id       string
-    parent_messages []MessageLink
-    fs_files        []string
-    message_type    MessageType
-    mentions        []string
-    tags            []string
+	content         string
+	chat_group_id   string
+	sender_id       string
+	parent_messages []MessageLink
+	fs_files        []string
+	message_type    MessageType
+	mentions        []string
+	tags            []string
 }
 
 pub fn new_chat_message(content string, chat_group_id string, sender_id string) ChatMessage {
-    mut message := ChatMessage{
-        content: content
-        chat_group_id: chat_group_id
-        sender_id: sender_id
-        message_type: .text
-        status: .sent
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-    }
-    message.calculate_id()
-    return message
-}
\ No newline at end of file
+	mut message := ChatMessage{
+		content:       content
+		chat_group_id: chat_group_id
+		sender_id:     sender_id
+		message_type:  .text
+		status:        .sent
+		created_at:    time.now().unix()
+		updated_at:    time.now().unix()
+	}
+	message.calculate_id()
+	return message
+}
diff --git a/lib/hero/heromodels/comment.v b/lib/hero/heromodels/comment.v
new file mode 100644
index 00000000..cc2274bf
--- /dev/null
+++ b/lib/hero/heromodels/comment.v
@@ -0,0 +1,117 @@
+module heromodels
+
+import freeflowuniverse.herolib.data.encoder
+import crypto.md5
+import freeflowuniverse.herolib.core.redisclient
+import freeflowuniverse.herolib.data.ourtime
+
+
+@[heap]
+pub struct Comment {
+    Base
+pub mut:
+    // id           u32
+    comment         string
+    parent u32 //id of parent comment if any, 0 means none
+    updated_at   i64
+    author      u32 //links to user
+}
+
+pub fn (self Comment) type_name() string {
+    return 'comments'
+}
+
+pub fn (self Comment) load(data []u8) !Comment {
+    return comment_load(data)!
+}
+
+pub fn (self Comment) dump() ![]u8{
+    // Create a new encoder
+    mut e := encoder.new()
+    e.add_u8(1)
+    e.add_u32(self.id)
+    e.add_string(self.comment)
+    e.add_u32(self.parent)
+    e.add_i64(self.updated_at)
+    e.add_u32(self.author)
+    return e.data
+}
+
+pub fn comment_load(data []u8) !Comment{
+    // Create a new decoder
+    mut e := encoder.decoder_new(data)
+    version := e.get_u8()!
+    if version != 1 {
+        panic("wrong version in comment load")
+    }
+    mut comment := Comment{}
+    comment.id = e.get_u32()!
+    comment.comment = e.get_string()!
+    comment.parent = e.get_u32()!
+    comment.updated_at = e.get_i64()!
+    comment.author = e.get_u32()!
+    return comment
+}
+
+
+pub struct CommentArg {
+pub mut:
+    comment string
+    parent u32
+    author u32
+}
+
+pub fn comment_multiset(args []CommentArg) ![]u32 {
+    return comments2ids(args)!
+}
+
+pub fn comments2ids(args []CommentArg) ![]u32 {
+    return args.map(comment2id(it.comment)!)
+}
+
+pub fn comment2id(comment string) !u32 {
+    comment_fixed := comment.to_lower_ascii().trim_space()
+    mut redis := redisclient.core_get()!
+    return if comment_fixed.len > 0{
+        hash := md5.hexhash(comment_fixed)
+        comment_found := redis.hget("db:comments", hash)!
+        if comment_found == ""{            
+            id := u32(redis.incr("db:comments:id")!)
+            redis.hset("db:comments", hash, id.str())!
+            redis.hset("db:comments", id.str(), comment_fixed)!
+            id
+        }else{
+            comment_found.u32()
+        }
+    } else { 0 }
+}
+
+
+//get new comment, not from the DB
+pub fn comment_new(args CommentArg) !Comment{
+    mut o := Comment {
+        comment: args.comment
+        parent: args.parent
+        updated_at: ourtime.now().unix()
+        author: args.author
+    }
+    return o
+}
+
+pub fn comment_set(args CommentArg) !u32{
+    mut o := comment_new(args)!
+    // Use openrpcserver set function which now returns the ID
+    return set[Comment](mut o)!
+}
+
+pub fn comment_delete(id u32) ! {
+    delete[Comment](id)!
+}
+
+pub fn comment_exist(id u32) !bool{
+    return exists[Comment](id)!
+}
+
+pub fn comment_get(id u32) !Comment{
+    return get[Comment](id)!
+}
diff --git a/lib/hero/heromodels/core_methods.v b/lib/hero/heromodels/core_methods.v
index 5e9080e6..8287b08a 100644
--- a/lib/hero/heromodels/core_methods.v
+++ b/lib/hero/heromodels/core_methods.v
@@ -4,12 +4,13 @@ import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.data.encoder
 
 pub fn set[T](mut obj_ T) !u32 {
-    // mut obj_ := T{...obj}
     mut redis := redisclient.core_get()!
-    id := u32(redis.llen(db_name[T]())!)
+    id := u32(redis.llen(db_name[T]()) or {0})
     obj_.id = id
-    // data := encoder.encode(obj_)!
-    redis.hset(db_name[T](),id.str(),'data.bytestr()')!
+    data := encoder.encode(obj_) or {
+        return err
+    }
+    redis.hset(db_name[T](),id.str(),data.bytestr())!
     return id
 }
 
@@ -40,11 +41,11 @@ pub fn list[T]() ![]T {
     return result
 }
 
-//make it easy to get a base object
+// make it easy to get a base object
 pub fn new_from_base[T](args BaseArgs) !Base {
     return T { Base: new_base(args)! }
 }
 
 fn db_name[T]() string {
     return "db:${T.name}"
-}
\ No newline at end of file
+}
diff --git a/lib/hero/heromodels/core_models.v b/lib/hero/heromodels/core_models.v
new file mode 100644
index 00000000..9d8f5626
--- /dev/null
+++ b/lib/hero/heromodels/core_models.v
@@ -0,0 +1,93 @@
+module heromodels
+
+import crypto.md5
+
+import freeflowuniverse.herolib.core.redisclient
+import freeflowuniverse.herolib.data.ourtime
+
+// Group represents a collection of users with roles and permissions
+@[heap]
+pub struct Base {
+pub mut:
+    id           u32
+    name         string
+    description  string
+    created_at   i64
+    updated_at   i64
+    securitypolicy u32
+    tags         u32 //when we set/get we always do as []string but this can then be sorted and md5ed this gies the unique id of tags
+    comments     []u32
+}
+ 
+@[heap]
+pub struct SecurityPolicy {
+pub mut:
+    id           u32
+    read      []u32 //links to users & groups
+    write     []u32 //links to users & groups
+    delete    []u32 //links to users & groups
+    public bool
+    md5 string //this sorts read, write and delete u32 + hash, then do md5 hash, this allows to go from a random read/write/delete/public config to a hash
+}
+
+
+@[heap]
+pub struct Tags {
+pub mut:
+    id           u32
+    names       []string //unique per id
+    md5         string //of sorted names, to make easy to find unique id, each name lowercased and made ascii
+}
+    
+
+/////////////////
+
+@[params]
+pub struct BaseArgs {
+pub mut:
+    id           ?u32
+    name         string
+    description  string
+    securitypolicy ?u32
+    tags         []string
+    comments []CommentArg
+}
+
+//make it easy to get a base object
+pub fn new_base(args BaseArgs) !Base {
+    mut redis := redisclient.core_get()!
+
+    commentids:=comment_multiset(args.comments)!
+    tags:=tags2id(args.tags)!
+
+    return Base {
+        id: args.id or { 0 }
+        name: args.name
+        description: args.description
+        created_at: ourtime.now().unix()
+        updated_at: ourtime.now().unix()
+        securitypolicy: args.securitypolicy or { 0 }
+        tags: tags
+        comments: commentids
+    }
+}
+
+pub fn tags2id(tags []string) !u32 {
+    mut redis := redisclient.core_get()!
+    return if tags.len>0{
+        mut tags_fixed := tags.map(it.to_lower_ascii().trim_space()).filter(it != "")
+        tags_fixed.sort_ignore_case() 
+        hash :=md5.hexhash(tags_fixed.join(","))
+        tags_found := redis.hget("db:tags", hash)!
+        return if tags_found == ""{            
+            id := u32(redis.incr("db:tags:id")!)
+            redis.hset("db:tags", hash, id.str())!
+            redis.hset("db:tags", id.str(), tags_fixed.join(","))!
+            id
+        }else{
+            tags_found.u32()
+        }
+    } else {
+        0
+    }
+}
diff --git a/lib/hero/heromodels/examples/client_example.vsh b/lib/hero/heromodels/examples/client_example.vsh
index c4822354..d5c6218f 100755
--- a/lib/hero/heromodels/examples/client_example.vsh
+++ b/lib/hero/heromodels/examples/client_example.vsh
@@ -5,7 +5,6 @@ import json
 import freeflowuniverse.herolib.ui.console
 import freeflowuniverse.herolib.hero.heromodels.openrpc
 
-
 fn send_request(mut conn unix.StreamConn, request openrpc.JsonRpcRequest) ! {
 	request_json := json.encode(request)
 	conn.write_string(request_json)!
@@ -31,9 +30,9 @@ console.print_item('Connected to server')
 console.print_header('Test 1: Discover OpenRPC Specification')
 discover_request := openrpc.JsonRpcRequest{
 	jsonrpc: '2.0'
-	method: 'discover'
-	params: 'null'
-	id: '1'
+	method:  'discover'
+	params:  'null'
+	id:      '1'
 }
 
 send_request(mut conn, discover_request)!
@@ -46,9 +45,9 @@ comment_json := '{"comment": "This is a test comment from OpenRPC client", "pare
 
 create_request := openrpc.JsonRpcRequest{
 	jsonrpc: '2.0'
-	method: 'comment_set'
-	params: comment_json
-	id: '2'
+	method:  'comment_set'
+	params:  comment_json
+	id:      '2'
 }
 
 send_request(mut conn, create_request)!
@@ -59,9 +58,9 @@ console.print_item('Comment created: ${create_response}')
 console.print_header('Test 3: List All Comments')
 list_request := openrpc.JsonRpcRequest{
 	jsonrpc: '2.0'
-	method: 'comment_list'
-	params: 'null'
-	id: '3'
+	method:  'comment_list'
+	params:  'null'
+	id:      '3'
 }
 
 send_request(mut conn, list_request)!
@@ -74,9 +73,9 @@ get_args_json := '{"author": 1}'
 
 get_request := openrpc.JsonRpcRequest{
 	jsonrpc: '2.0'
-	method: 'comment_get'
-	params: get_args_json
-	id: '4'
+	method:  'comment_get'
+	params:  get_args_json
+	id:      '4'
 }
 
 send_request(mut conn, get_request)!
@@ -84,5 +83,3 @@ get_response := read_response(mut conn)!
 console.print_item('Comments by author: ${get_response}')
 
 console.print_header('All tests completed successfully!')
-
-
diff --git a/lib/hero/heromodels/examples/example1.vsh b/lib/hero/heromodels/examples/example1.vsh
index c98e7f87..e490c861 100755
--- a/lib/hero/heromodels/examples/example1.vsh
+++ b/lib/hero/heromodels/examples/example1.vsh
@@ -1,6 +1,5 @@
 #!/usr/bin/env -S v -n -w -cg -gc none  -cc tcc -d use_openssl -enable-globals run
 
-
 // Create a user
 mut user := new_user('John Doe', 'john@example.com')
 
@@ -18,7 +17,8 @@ mut issue := new_project_issue('Fix login bug', project.id, user.id, .bug)
 mut calendar := new_calendar('Team Calendar', group.id)
 
 // Create an event
-mut event := new_calendar_event('Sprint Planning', 1672531200, 1672534800, calendar.id, user.id)
+mut event := new_calendar_event('Sprint Planning', 1672531200, 1672534800, calendar.id,
+	user.id)
 calendar.add_event(event.id)
 
 // Create a filesystem
@@ -34,4 +34,4 @@ println('Issue ID: ${issue.id}')
 println('Calendar ID: ${calendar.id}')
 println('Event ID: ${event.id}')
 println('Filesystem ID: ${fs.id}')
-println('Blob ID: ${blob.id}')
\ No newline at end of file
+println('Blob ID: ${blob.id}')
diff --git a/lib/hero/heromodels/examples/server_example.vsh b/lib/hero/heromodels/examples/server_example.vsh
index 6fa64a9b..566abab3 100755
--- a/lib/hero/heromodels/examples/server_example.vsh
+++ b/lib/hero/heromodels/examples/server_example.vsh
@@ -20,4 +20,4 @@ console.print_item('Press Ctrl+C to stop the server')
 // Keep the main thread alive
 for {
 	time.sleep(1 * time.second)
-}
\ No newline at end of file
+}
diff --git a/lib/hero/heromodels/fs.v b/lib/hero/heromodels/fs.v
index 7bb28212..5787fde1 100644
--- a/lib/hero/heromodels/fs.v
+++ b/lib/hero/heromodels/fs.v
@@ -8,45 +8,45 @@ import json
 @[heap]
 pub struct Fs {
 pub mut:
-    id          string   // blake192 hash
-    name        string
-    description string
-    group_id    string   // Associated group for permissions
-    root_dir_id string   // ID of root directory
-    created_at  i64
-    updated_at  i64
-    quota_bytes i64      // Storage quota in bytes
-    used_bytes  i64      // Current usage in bytes
-    tags        []string
+	id          string // blake192 hash
+	name        string
+	description string
+	group_id    string // Associated group for permissions
+	root_dir_id string // ID of root directory
+	created_at  i64
+	updated_at  i64
+	quota_bytes i64 // Storage quota in bytes
+	used_bytes  i64 // Current usage in bytes
+	tags        []string
 }
 
 pub fn (mut f Fs) calculate_id() {
-    content := json.encode(FsContent{
-        name: f.name
-        description: f.description
-        group_id: f.group_id
-        quota_bytes: f.quota_bytes
-        tags: f.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    f.id = hash.hex()[..48]
+	content := json.encode(FsContent{
+		name:        f.name
+		description: f.description
+		group_id:    f.group_id
+		quota_bytes: f.quota_bytes
+		tags:        f.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	f.id = hash.hex()[..48]
 }
 
 struct FsContent {
-    name        string
-    description string
-    group_id    string
-    quota_bytes i64
-    tags        []string
+	name        string
+	description string
+	group_id    string
+	quota_bytes i64
+	tags        []string
 }
 
 pub fn new_fs(name string, group_id string) Fs {
-    mut fs := Fs{
-        name: name
-        group_id: group_id
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-    }
-    fs.calculate_id()
-    return fs
-}
\ No newline at end of file
+	mut fs := Fs{
+		name:       name
+		group_id:   group_id
+		created_at: time.now().unix()
+		updated_at: time.now().unix()
+	}
+	fs.calculate_id()
+	return fs
+}
diff --git a/lib/hero/heromodels/fs_blob.v b/lib/hero/heromodels/fs_blob.v
index 3d0d9aa7..d97aca66 100644
--- a/lib/hero/heromodels/fs_blob.v
+++ b/lib/hero/heromodels/fs_blob.v
@@ -7,35 +7,35 @@ import crypto.blake3
 @[heap]
 pub struct FsBlob {
 pub mut:
-    id         string // blake192 hash of content
-    data       []u8   // Binary data (max 1MB)
-    size_bytes int    // Size in bytes
-    created_at i64
-    mime_type  string
-    encoding   string // e.g., "gzip", "none"
+	id         string // blake192 hash of content
+	data       []u8   // Binary data (max 1MB)
+	size_bytes int    // Size in bytes
+	created_at i64
+	mime_type  string
+	encoding   string // e.g., "gzip", "none"
 }
 
 pub fn (mut b FsBlob) calculate_id() {
-    hash := blake3.sum256(b.data)
-    b.id = hash.hex()[..48] // blake192 = first 192 bits = 48 hex chars
+	hash := blake3.sum256(b.data)
+	b.id = hash.hex()[..48] // blake192 = first 192 bits = 48 hex chars
 }
 
 pub fn new_fs_blob(data []u8) !FsBlob {
-    if data.len > 1024 * 1024 { // 1MB limit
-        return error('Blob size exceeds 1MB limit')
-    }
-    
-    mut blob := FsBlob{
-        data: data
-        size_bytes: data.len
-        created_at: time.now().unix()
-        encoding: 'none'
-    }
-    blob.calculate_id()
-    return blob
+	if data.len > 1024 * 1024 { // 1MB limit
+		return error('Blob size exceeds 1MB limit')
+	}
+
+	mut blob := FsBlob{
+		data:       data
+		size_bytes: data.len
+		created_at: time.now().unix()
+		encoding:   'none'
+	}
+	blob.calculate_id()
+	return blob
 }
 
 pub fn (b FsBlob) verify_integrity() bool {
-    hash := blake3.sum256(b.data)
-    return hash.hex()[..48] == b.id
-}
\ No newline at end of file
+	hash := blake3.sum256(b.data)
+	return hash.hex()[..48] == b.id
+}
diff --git a/lib/hero/heromodels/fs_dir.v b/lib/hero/heromodels/fs_dir.v
index 9ebd5218..d32bf643 100644
--- a/lib/hero/heromodels/fs_dir.v
+++ b/lib/hero/heromodels/fs_dir.v
@@ -8,46 +8,46 @@ import json
 @[heap]
 pub struct FsDir {
 pub mut:
-    id         string   // blake192 hash
-    name       string
-    fs_id      string   // Associated filesystem
-    parent_id  string   // Parent directory ID (empty for root)
-    group_id   string   // Associated group for permissions
-    children   []string // Child directory and file IDs
-    created_at i64
-    updated_at i64
-    tags       []string
+	id         string // blake192 hash
+	name       string
+	fs_id      string   // Associated filesystem
+	parent_id  string   // Parent directory ID (empty for root)
+	group_id   string   // Associated group for permissions
+	children   []string // Child directory and file IDs
+	created_at i64
+	updated_at i64
+	tags       []string
 }
 
 pub fn (mut d FsDir) calculate_id() {
-    content := json.encode(DirContent{
-        name: d.name
-        fs_id: d.fs_id
-        parent_id: d.parent_id
-        group_id: d.group_id
-        tags: d.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    d.id = hash.hex()[..48]
+	content := json.encode(DirContent{
+		name:      d.name
+		fs_id:     d.fs_id
+		parent_id: d.parent_id
+		group_id:  d.group_id
+		tags:      d.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	d.id = hash.hex()[..48]
 }
 
 struct DirContent {
-    name      string
-    fs_id     string
-    parent_id string
-    group_id  string
-    tags      []string
+	name      string
+	fs_id     string
+	parent_id string
+	group_id  string
+	tags      []string
 }
 
 pub fn new_fs_dir(name string, fs_id string, parent_id string, group_id string) FsDir {
-    mut dir := FsDir{
-        name: name
-        fs_id: fs_id
-        parent_id: parent_id
-        group_id: group_id
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-    }
-    dir.calculate_id()
-    return dir
-}
\ No newline at end of file
+	mut dir := FsDir{
+		name:       name
+		fs_id:      fs_id
+		parent_id:  parent_id
+		group_id:   group_id
+		created_at: time.now().unix()
+		updated_at: time.now().unix()
+	}
+	dir.calculate_id()
+	return dir
+}
diff --git a/lib/hero/heromodels/fs_file.v b/lib/hero/heromodels/fs_file.v
index 0156bdbb..2e3117b0 100644
--- a/lib/hero/heromodels/fs_file.v
+++ b/lib/hero/heromodels/fs_file.v
@@ -8,58 +8,58 @@ import json
 @[heap]
 pub struct FsFile {
 pub mut:
-    id          string   // blake192 hash
-    name        string
-    fs_id       string   // Associated filesystem
-    directories []string // Directory IDs where this file exists
-    blobs       []string // Blake192 IDs of file content blobs
-    size_bytes  i64      // Total file size
-    mime_type   string
-    checksum    string   // Overall file checksum
-    created_at  i64
-    updated_at  i64
-    accessed_at i64
-    tags        []string
-    metadata    map[string]string // Custom metadata
+	id          string // blake192 hash
+	name        string
+	fs_id       string   // Associated filesystem
+	directories []string // Directory IDs where this file exists
+	blobs       []string // Blake192 IDs of file content blobs
+	size_bytes  i64      // Total file size
+	mime_type   string
+	checksum    string // Overall file checksum
+	created_at  i64
+	updated_at  i64
+	accessed_at i64
+	tags        []string
+	metadata    map[string]string // Custom metadata
 }
 
 pub fn (mut f FsFile) calculate_id() {
-    content := json.encode(FileContent{
-        name: f.name
-        fs_id: f.fs_id
-        directories: f.directories
-        blobs: f.blobs
-        size_bytes: f.size_bytes
-        mime_type: f.mime_type
-        checksum: f.checksum
-        tags: f.tags
-        metadata: f.metadata
-    })
-    hash := blake3.sum256(content.bytes())
-    f.id = hash.hex()[..48]
+	content := json.encode(FileContent{
+		name:        f.name
+		fs_id:       f.fs_id
+		directories: f.directories
+		blobs:       f.blobs
+		size_bytes:  f.size_bytes
+		mime_type:   f.mime_type
+		checksum:    f.checksum
+		tags:        f.tags
+		metadata:    f.metadata
+	})
+	hash := blake3.sum256(content.bytes())
+	f.id = hash.hex()[..48]
 }
 
 struct FileContent {
-    name        string
-    fs_id       string
-    directories []string
-    blobs       []string
-    size_bytes  i64
-    mime_type   string
-    checksum    string
-    tags        []string
-    metadata    map[string]string
+	name        string
+	fs_id       string
+	directories []string
+	blobs       []string
+	size_bytes  i64
+	mime_type   string
+	checksum    string
+	tags        []string
+	metadata    map[string]string
 }
 
 pub fn new_fs_file(name string, fs_id string, directories []string) FsFile {
-    mut file := FsFile{
-        name: name
-        fs_id: fs_id
-        directories: directories
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-        accessed_at: time.now().unix()
-    }
-    file.calculate_id()
-    return file
-}
\ No newline at end of file
+	mut file := FsFile{
+		name:        name
+		fs_id:       fs_id
+		directories: directories
+		created_at:  time.now().unix()
+		updated_at:  time.now().unix()
+		accessed_at: time.now().unix()
+	}
+	file.calculate_id()
+	return file
+}
diff --git a/lib/hero/heromodels/fs_symlink.v b/lib/hero/heromodels/fs_symlink.v
index b64f073e..0996a8ef 100644
--- a/lib/hero/heromodels/fs_symlink.v
+++ b/lib/hero/heromodels/fs_symlink.v
@@ -8,54 +8,54 @@ import json
 @[heap]
 pub struct FsSymlink {
 pub mut:
-    id         string     // blake192 hash
-    name       string
-    fs_id      string     // Associated filesystem
-    parent_id  string     // Parent directory ID
-    target_id  string     // ID of target file or directory
-    target_type SymlinkTargetType
-    created_at i64
-    updated_at i64
-    tags       []string
+	id          string // blake192 hash
+	name        string
+	fs_id       string // Associated filesystem
+	parent_id   string // Parent directory ID
+	target_id   string // ID of target file or directory
+	target_type SymlinkTargetType
+	created_at  i64
+	updated_at  i64
+	tags        []string
 }
 
 pub enum SymlinkTargetType {
-    file
-    directory
+	file
+	directory
 }
 
 pub fn (mut s FsSymlink) calculate_id() {
-    content := json.encode(SymlinkContent{
-        name: s.name
-        fs_id: s.fs_id
-        parent_id: s.parent_id
-        target_id: s.target_id
-        target_type: s.target_type
-        tags: s.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    s.id = hash.hex()[..48]
+	content := json.encode(SymlinkContent{
+		name:        s.name
+		fs_id:       s.fs_id
+		parent_id:   s.parent_id
+		target_id:   s.target_id
+		target_type: s.target_type
+		tags:        s.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	s.id = hash.hex()[..48]
 }
 
 struct SymlinkContent {
-    name        string
-    fs_id       string
-    parent_id   string
-    target_id   string
-    target_type SymlinkTargetType
-    tags        []string
+	name        string
+	fs_id       string
+	parent_id   string
+	target_id   string
+	target_type SymlinkTargetType
+	tags        []string
 }
 
 pub fn new_fs_symlink(name string, fs_id string, parent_id string, target_id string, target_type SymlinkTargetType) FsSymlink {
-    mut symlink := FsSymlink{
-        name: name
-        fs_id: fs_id
-        parent_id: parent_id
-        target_id: target_id
-        target_type: target_type
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-    }
-    symlink.calculate_id()
-    return symlink
-}
\ No newline at end of file
+	mut symlink := FsSymlink{
+		name:        name
+		fs_id:       fs_id
+		parent_id:   parent_id
+		target_id:   target_id
+		target_type: target_type
+		created_at:  time.now().unix()
+		updated_at:  time.now().unix()
+	}
+	symlink.calculate_id()
+	return symlink
+}
diff --git a/lib/hero/heromodels/group.v b/lib/hero/heromodels/group.v
index 6831b5c3..e501d47d 100644
--- a/lib/hero/heromodels/group.v
+++ b/lib/hero/heromodels/group.v
@@ -8,74 +8,74 @@ import json
 @[heap]
 pub struct Group {
 pub mut:
-    id           string        // blake192 hash
-    name         string
-    description  string
-    members      []GroupMember
-    subgroups    []string      // IDs of child groups
-    parent_group string        // ID of parent group
-    created_at   i64
-    updated_at   i64
-    is_public    bool
-    tags         []string
+	id           string // blake192 hash
+	name         string
+	description  string
+	members      []GroupMember
+	subgroups    []string // IDs of child groups
+	parent_group string   // ID of parent group
+	created_at   i64
+	updated_at   i64
+	is_public    bool
+	tags         []string
 }
 
 pub struct GroupMember {
 pub mut:
-    user_id string
-    role    GroupRole
-    joined_at i64
+	user_id   string
+	role      GroupRole
+	joined_at i64
 }
 
 pub enum GroupRole {
-    reader
-    writer
-    admin
-    owner
+	reader
+	writer
+	admin
+	owner
 }
 
 pub fn (mut g Group) calculate_id() {
-    content := json.encode(GroupContent{
-        name: g.name
-        description: g.description
-        members: g.members
-        subgroups: g.subgroups
-        parent_group: g.parent_group
-        is_public: g.is_public
-        tags: g.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    g.id = hash.hex()[..48]
+	content := json.encode(GroupContent{
+		name:         g.name
+		description:  g.description
+		members:      g.members
+		subgroups:    g.subgroups
+		parent_group: g.parent_group
+		is_public:    g.is_public
+		tags:         g.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	g.id = hash.hex()[..48]
 }
 
 struct GroupContent {
-    name         string
-    description  string
-    members      []GroupMember
-    subgroups    []string
-    parent_group string
-    is_public    bool
-    tags         []string
+	name         string
+	description  string
+	members      []GroupMember
+	subgroups    []string
+	parent_group string
+	is_public    bool
+	tags         []string
 }
 
 pub fn new_group(name string, description string) Group {
-    mut group := Group{
-        name: name
-        description: description
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-        is_public: false
-    }
-    group.calculate_id()
-    return group
+	mut group := Group{
+		name:        name
+		description: description
+		created_at:  time.now().unix()
+		updated_at:  time.now().unix()
+		is_public:   false
+	}
+	group.calculate_id()
+	return group
 }
 
 pub fn (mut g Group) add_member(user_id string, role GroupRole) {
-    g.members << GroupMember{
-        user_id: user_id
-        role: role
-        joined_at: time.now().unix()
-    }
-    g.updated_at = time.now().unix()
-    g.calculate_id()
-}
\ No newline at end of file
+	g.members << GroupMember{
+		user_id:   user_id
+		role:      role
+		joined_at: time.now().unix()
+	}
+	g.updated_at = time.now().unix()
+	g.calculate_id()
+}
diff --git a/lib/hero/heromodels/openrpc_interface.v b/lib/hero/heromodels/openrpc_interface.v
index b1e95865..6005ef22 100644
--- a/lib/hero/heromodels/openrpc_interface.v
+++ b/lib/hero/heromodels/openrpc_interface.v
@@ -44,4 +44,4 @@ import freeflowuniverse.herolib.schemas.openrpc
 
 // pub fn new_base(args BaseArgs) !Base {
 // 	return openrpcserver.new_base(args)!
-// }
\ No newline at end of file
+// }
diff --git a/lib/hero/heromodels/project.v b/lib/hero/heromodels/project.v
index 059cdddf..3fa5db7b 100644
--- a/lib/hero/heromodels/project.v
+++ b/lib/hero/heromodels/project.v
@@ -8,80 +8,80 @@ import json
 @[heap]
 pub struct Project {
 pub mut:
-    id          string       // blake192 hash
-    name        string
-    description string
-    group_id    string       // Associated group for permissions
-    swimlanes   []Swimlane
-    milestones  []Milestone
-    issues      []string     // IDs of project issues
-    fs_files    []string     // IDs of linked files
-    status      ProjectStatus
-    start_date  i64
-    end_date    i64
-    created_at  i64
-    updated_at  i64
-    tags        []string
+	id          string // blake192 hash
+	name        string
+	description string
+	group_id    string // Associated group for permissions
+	swimlanes   []Swimlane
+	milestones  []Milestone
+	issues      []string // IDs of project issues
+	fs_files    []string // IDs of linked files
+	status      ProjectStatus
+	start_date  i64
+	end_date    i64
+	created_at  i64
+	updated_at  i64
+	tags        []string
 }
 
 pub struct Swimlane {
 pub mut:
-    id          string
-    name        string
-    description string
-    order       int
-    color       string
-    is_done     bool
+	id          string
+	name        string
+	description string
+	order       int
+	color       string
+	is_done     bool
 }
 
 pub struct Milestone {
 pub mut:
-    id          string
-    name        string
-    description string
-    due_date    i64
-    completed   bool
-    issues      []string // IDs of issues in this milestone
+	id          string
+	name        string
+	description string
+	due_date    i64
+	completed   bool
+	issues      []string // IDs of issues in this milestone
 }
 
 pub enum ProjectStatus {
-    planning
-    active
-    on_hold
-    completed
-    cancelled
+	planning
+	active
+	on_hold
+	completed
+	cancelled
 }
 
 pub fn (mut p Project) calculate_id() {
-    content := json.encode(ProjectContent{
-        name: p.name
-        description: p.description
-        group_id: p.group_id
-        swimlanes: p.swimlanes
-        milestones: p.milestones
-        issues: p.issues
-        fs_files: p.fs_files
-        status: p.status
-        start_date: p.start_date
-        end_date: p.end_date
-        tags: p.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    p.id = hash.hex()[..48]
+	content := json.encode(ProjectContent{
+		name:        p.name
+		description: p.description
+		group_id:    p.group_id
+		swimlanes:   p.swimlanes
+		milestones:  p.milestones
+		issues:      p.issues
+		fs_files:    p.fs_files
+		status:      p.status
+		start_date:  p.start_date
+		end_date:    p.end_date
+		tags:        p.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	p.id = hash.hex()[..48]
 }
 
 struct ProjectContent {
-    name        string
-    description string
-    group_id    string
-    swimlanes   []Swimlane
-    milestones  []Milestone
-    issues      []string
-    fs_files    []string
-    status      ProjectStatus
-    start_date  i64
-    end_date    i64
-    tags        []string
+	name        string
+	description string
+	group_id    string
+	swimlanes   []Swimlane
+	milestones  []Milestone
+	issues      []string
+	fs_files    []string
+	status      ProjectStatus
+	start_date  i64
+	end_date    i64
+	tags        []string
 }
 
 pub struct NewProject {
@@ -107,4 +107,4 @@ pub fn new_project(params NewProject) !Project {
     }
     project.calculate_id()
     return project
-}
\ No newline at end of file
+}
diff --git a/lib/hero/heromodels/project_issue.v b/lib/hero/heromodels/project_issue.v
index cb615eb7..e42affba 100644
--- a/lib/hero/heromodels/project_issue.v
+++ b/lib/hero/heromodels/project_issue.v
@@ -8,109 +8,109 @@ import json
 @[heap]
 pub struct ProjectIssue {
 pub mut:
-    id          string       // blake192 hash
-    title       string
-    description string
-    project_id  string       // Associated project
-    issue_type  IssueType
-    priority    IssuePriority
-    status      IssueStatus
-    swimlane_id string       // Current swimlane
-    assignees   []string     // User IDs
-    reporter    string       // User ID who created the issue
-    milestone_id string      // Associated milestone
-    deadline    i64          // Unix timestamp
-    estimate    int          // Story points or hours
-    fs_files    []string     // IDs of linked files
-    parent_id   string       // Parent issue ID (for sub-tasks)
-    children    []string     // Child issue IDs
-    created_at  i64
-    updated_at  i64
-    tags        []string
+	id           string // blake192 hash
+	title        string
+	description  string
+	project_id   string // Associated project
+	issue_type   IssueType
+	priority     IssuePriority
+	status       IssueStatus
+	swimlane_id  string   // Current swimlane
+	assignees    []string // User IDs
+	reporter     string   // User ID who created the issue
+	milestone_id string   // Associated milestone
+	deadline     i64      // Unix timestamp
+	estimate     int      // Story points or hours
+	fs_files     []string // IDs of linked files
+	parent_id    string   // Parent issue ID (for sub-tasks)
+	children     []string // Child issue IDs
+	created_at   i64
+	updated_at   i64
+	tags         []string
 }
 
 pub enum IssueType {
-    task
-    story
-    bug
-    question
-    epic
-    subtask
+	task
+	story
+	bug
+	question
+	epic
+	subtask
 }
 
 pub enum IssuePriority {
-    lowest
-    low
-    medium
-    high
-    highest
-    critical
+	lowest
+	low
+	medium
+	high
+	highest
+	critical
 }
 
 pub enum IssueStatus {
-    open
-    in_progress
-    blocked
-    review
-    testing
-    done
-    closed
+	open
+	in_progress
+	blocked
+	review
+	testing
+	done
+	closed
 }
 
 pub fn (mut i ProjectIssue) calculate_id() {
-    content := json.encode(IssueContent{
-        title: i.title
-        description: i.description
-        project_id: i.project_id
-        issue_type: i.issue_type
-        priority: i.priority
-        status: i.status
-        swimlane_id: i.swimlane_id
-        assignees: i.assignees
-        reporter: i.reporter
-        milestone_id: i.milestone_id
-        deadline: i.deadline
-        estimate: i.estimate
-        fs_files: i.fs_files
-        parent_id: i.parent_id
-        children: i.children
-        tags: i.tags
-    })
-    hash := blake3.sum256(content.bytes())
-    i.id = hash.hex()[..48]
+	content := json.encode(IssueContent{
+		title:        i.title
+		description:  i.description
+		project_id:   i.project_id
+		issue_type:   i.issue_type
+		priority:     i.priority
+		status:       i.status
+		swimlane_id:  i.swimlane_id
+		assignees:    i.assignees
+		reporter:     i.reporter
+		milestone_id: i.milestone_id
+		deadline:     i.deadline
+		estimate:     i.estimate
+		fs_files:     i.fs_files
+		parent_id:    i.parent_id
+		children:     i.children
+		tags:         i.tags
+	})
+	hash := blake3.sum256(content.bytes())
+	i.id = hash.hex()[..48]
 }
 
 struct IssueContent {
-    title       string
-    description string
-    project_id  string
-    issue_type  IssueType
-    priority    IssuePriority
-    status      IssueStatus
-    swimlane_id string
-    assignees   []string
-    reporter    string
-    milestone_id string
-    deadline    i64
-    estimate    int
-    fs_files    []string
-    parent_id   string
-    children    []string
-    tags        []string
+	title        string
+	description  string
+	project_id   string
+	issue_type   IssueType
+	priority     IssuePriority
+	status       IssueStatus
+	swimlane_id  string
+	assignees    []string
+	reporter     string
+	milestone_id string
+	deadline     i64
+	estimate     int
+	fs_files     []string
+	parent_id    string
+	children     []string
+	tags         []string
 }
 
 pub fn new_project_issue(title string, project_id string, reporter string, issue_type IssueType) ProjectIssue {
-    mut issue := ProjectIssue{
-        title: title
-        project_id: project_id
-        reporter: reporter
-        issue_type: issue_type
-        priority: .medium
-        status: .open
-        swimlane_id: 'todo'
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-    }
-    issue.calculate_id()
-    return issue
-}
\ No newline at end of file
+	mut issue := ProjectIssue{
+		title:       title
+		project_id:  project_id
+		reporter:    reporter
+		issue_type:  issue_type
+		priority:    .medium
+		status:      .open
+		swimlane_id: 'todo'
+		created_at:  time.now().unix()
+		updated_at:  time.now().unix()
+	}
+	issue.calculate_id()
+	return issue
+}
diff --git a/lib/hero/heromodels/user.v b/lib/hero/heromodels/user.v
index eafa6b49..454a1918 100644
--- a/lib/hero/heromodels/user.v
+++ b/lib/hero/heromodels/user.v
@@ -8,61 +8,61 @@ import json
 @[heap]
 pub struct User {
 pub mut:
-    id          string    // blake192 hash
-    name        string
-    email       string
-    public_key  string    // for encryption/signing
-    phone       string
-    address     string
-    avatar_url  string
-    bio         string
-    timezone    string
-    created_at  i64
-    updated_at  i64
-    status      UserStatus
+	id         string // blake192 hash
+	name       string
+	email      string
+	public_key string // for encryption/signing
+	phone      string
+	address    string
+	avatar_url string
+	bio        string
+	timezone   string
+	created_at i64
+	updated_at i64
+	status     UserStatus
 }
 
 pub enum UserStatus {
-    active
-    inactive
-    suspended
-    pending
+	active
+	inactive
+	suspended
+	pending
 }
 
 pub fn (mut u User) calculate_id() {
-    content := json.encode(UserContent{
-        name: u.name
-        email: u.email
-        public_key: u.public_key
-        phone: u.phone
-        address: u.address
-        bio: u.bio
-        timezone: u.timezone
-        status: u.status
-    })
-    hash := blake3.sum256(content.bytes())
-    u.id = hash.hex()[..48] // blake192 = first 192 bits = 48 hex chars
+	content := json.encode(UserContent{
+		name:       u.name
+		email:      u.email
+		public_key: u.public_key
+		phone:      u.phone
+		address:    u.address
+		bio:        u.bio
+		timezone:   u.timezone
+		status:     u.status
+	})
+	hash := blake3.sum256(content.bytes())
+	u.id = hash.hex()[..48] // blake192 = first 192 bits = 48 hex chars
 }
 
 struct UserContent {
-    name       string
-    email      string
-    public_key string
-    phone      string
-    address    string
-    bio        string
-    timezone   string
-    status     UserStatus
+	name       string
+	email      string
+	public_key string
+	phone      string
+	address    string
+	bio        string
+	timezone   string
+	status     UserStatus
 }
 
 pub fn new_user(name string, email string) User {
-    mut user := User{
-        name: name
-        email: email
-        created_at: time.now().unix()
-        updated_at: time.now().unix()
-        status: .active
-    }
-    user.calculate_id()
-    return user
-}
\ No newline at end of file
+	mut user := User{
+		name:       name
+		email:      email
+		created_at: time.now().unix()
+		updated_at: time.now().unix()
+		status:     .active
+	}
+	user.calculate_id()
+	return user
+}
diff --git a/lib/hero/heromodels/version_history.v b/lib/hero/heromodels/version_history.v
index 7c8b5ad1..b3e0fd68 100644
--- a/lib/hero/heromodels/version_history.v
+++ b/lib/hero/heromodels/version_history.v
@@ -6,32 +6,32 @@ import time
 @[heap]
 pub struct VersionHistory {
 pub mut:
-    current_id   string // blake192 hash of current version
-    previous_id  string // blake192 hash of previous version
-    next_id      string // blake192 hash of next version (if exists)
-    object_type  string // Type of object (User, Group, etc.)
-    change_type  ChangeType
-    changed_by   string // User ID who made the change
-    changed_at   i64    // Unix timestamp
-    change_notes string // Optional description of changes
+	current_id   string // blake192 hash of current version
+	previous_id  string // blake192 hash of previous version
+	next_id      string // blake192 hash of next version (if exists)
+	object_type  string // Type of object (User, Group, etc.)
+	change_type  ChangeType
+	changed_by   string // User ID who made the change
+	changed_at   i64    // Unix timestamp
+	change_notes string // Optional description of changes
 }
 
 pub enum ChangeType {
-    create
-    update
-    delete
-    restore
+	create
+	update
+	delete
+	restore
 }
 
 pub fn new_version_history(current_id string, previous_id string, object_type string, change_type ChangeType, changed_by string) VersionHistory {
-    return VersionHistory{
-        current_id: current_id
-        previous_id: previous_id
-        object_type: object_type
-        change_type: change_type
-        changed_by: changed_by
-        changed_at: time.now().unix()
-    }
+	return VersionHistory{
+		current_id:  current_id
+		previous_id: previous_id
+		object_type: object_type
+		change_type: change_type
+		changed_by:  changed_by
+		changed_at:  time.now().unix()
+	}
 }
 
 // Database indexes needed:
@@ -39,4 +39,4 @@ pub fn new_version_history(current_id string, previous_id string, object_type st
 // - Index on previous_id for walking backward
 // - Index on next_id for walking forward
 // - Index on object_type for filtering by type
-// - Index on changed_by for user activity tracking
\ No newline at end of file
+// - Index on changed_by for user activity tracking
diff --git a/lib/installers/virt/herorunner/.heroscript b/lib/installers/virt/herorunner/.heroscript
new file mode 100644
index 00000000..aad50adc
--- /dev/null
+++ b/lib/installers/virt/herorunner/.heroscript
@@ -0,0 +1,13 @@
+
+!!hero_code.generate_installer
+    name:'herorunner'
+    classname:'HeroRunner'
+    singleton:0
+    templates:0
+    default:1
+    title:''
+    supported_platforms:''
+    reset:0
+    startupmanager:0
+	hasconfig:0
+    build:0
\ No newline at end of file
diff --git a/lib/installers/virt/herorunner/herorunner_actions.v b/lib/installers/virt/herorunner/herorunner_actions.v
new file mode 100644
index 00000000..8ea53f05
--- /dev/null
+++ b/lib/installers/virt/herorunner/herorunner_actions.v
@@ -0,0 +1,67 @@
+module herorunner
+
+import freeflowuniverse.herolib.osal.core as osal
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.core.texttools
+import freeflowuniverse.herolib.core.pathlib
+import freeflowuniverse.herolib.installers.ulist
+import os
+
+//////////////////// following actions are not specific to instance of the object
+
+fn installed() !bool {
+	return false
+}
+
+// get the Upload List of the files
+fn ulist_get() !ulist.UList {
+	return ulist.UList{}
+}
+
+fn upload() ! {
+}
+
+fn install() ! {
+	console.print_header('install herorunner')
+	osal.package_install('crun')!
+
+	// osal.exec(
+	// 	cmd:    '
+
+	// 	'
+	// 	stdout: true
+	// 	name:   'herorunner_install'
+	// )!
+}
+
+fn destroy() ! {
+	// mut systemdfactory := systemd.new()!
+	// systemdfactory.destroy("zinit")!
+
+	// osal.process_kill_recursive(name:'zinit')!
+	// osal.cmd_delete('zinit')!
+
+	// osal.package_remove('
+	//    podman
+	//    conmon
+	//    buildah
+	//    skopeo
+	//    runc
+	// ')!
+
+	// //will remove all paths where go/bin is found
+	// osal.profile_path_add_remove(paths2delete:"go/bin")!
+
+	// osal.rm("
+	//    podman
+	//    conmon
+	//    buildah
+	//    skopeo
+	//    runc
+	//    /var/lib/containers
+	//    /var/lib/podman
+	//    /var/lib/buildah
+	//    /tmp/podman
+	//    /tmp/conmon
+	// ")!
+}
diff --git a/lib/installers/virt/herorunner/herorunner_factory_.v b/lib/installers/virt/herorunner/herorunner_factory_.v
new file mode 100644
index 00000000..dbf50fce
--- /dev/null
+++ b/lib/installers/virt/herorunner/herorunner_factory_.v
@@ -0,0 +1,79 @@
+module herorunner
+
+import freeflowuniverse.herolib.core.playbook { PlayBook }
+import freeflowuniverse.herolib.ui.console
+import json
+import freeflowuniverse.herolib.osal.startupmanager
+
+__global (
+	herorunner_global  map[string]&HeroRunner
+	herorunner_default string
+)
+
+/////////FACTORY
+
+@[params]
+pub struct ArgsGet {
+pub mut:
+	name string = 'default'
+}
+
+pub fn new(args ArgsGet) !&HeroRunner {
+	return &HeroRunner{}
+}
+
+pub fn get(args ArgsGet) !&HeroRunner {
+	return new(args)!
+}
+
+pub fn play(mut plbook PlayBook) ! {
+	if !plbook.exists(filter: 'herorunner.') {
+		return
+	}
+	mut install_actions := plbook.find(filter: 'herorunner.configure')!
+	if install_actions.len > 0 {
+		return error("can't configure herorunner, because no configuration allowed for this installer.")
+	}
+	mut other_actions := plbook.find(filter: 'herorunner.')!
+	for other_action in other_actions {
+		if other_action.name in ['destroy', 'install', 'build'] {
+			mut p := other_action.params
+			reset := p.get_default_false('reset')
+			if other_action.name == 'destroy' || reset {
+				console.print_debug('install action herorunner.destroy')
+				destroy()!
+			}
+			if other_action.name == 'install' {
+				console.print_debug('install action herorunner.install')
+				install()!
+			}
+		}
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+@[params]
+pub struct InstallArgs {
+pub mut:
+	reset bool
+}
+
+pub fn (mut self HeroRunner) install(args InstallArgs) ! {
+	switch(self.name)
+	if args.reset || (!installed()!) {
+		install()!
+	}
+}
+
+pub fn (mut self HeroRunner) destroy() ! {
+	switch(self.name)
+	destroy()!
+}
+
+// switch instance to be used for herorunner
+pub fn switch(name string) {
+	herorunner_default = name
+}
diff --git a/lib/installers/virt/herorunner/herorunner_model.v b/lib/installers/virt/herorunner/herorunner_model.v
new file mode 100644
index 00000000..e08ae618
--- /dev/null
+++ b/lib/installers/virt/herorunner/herorunner_model.v
@@ -0,0 +1,34 @@
+module herorunner
+
+import freeflowuniverse.herolib.data.paramsparser
+import freeflowuniverse.herolib.data.encoderhero
+import os
+
+pub const version = '0.0.0'
+const singleton = false
+const default = true
+
+// THIS THE THE SOURCE OF THE INFORMATION OF THIS FILE, HERE WE HAVE THE CONFIG OBJECT CONFIGURED AND MODELLED
+@[heap]
+pub struct HeroRunner {
+pub mut:
+	name string = 'default'
+}
+
+// your checking & initialization code if needed
+fn obj_init(mycfg_ HeroRunner) !HeroRunner {
+	mut mycfg := mycfg_
+	return mycfg
+}
+
+// called before start if done
+fn configure() ! {
+	// mut installer := get()!
+}
+
+/////////////NORMALLY NO NEED TO TOUCH
+
+pub fn heroscript_loads(heroscript string) !HeroRunner {
+	mut obj := encoderhero.decode[HeroRunner](heroscript)!
+	return obj
+}
diff --git a/lib/installers/virt/herorunner/readme.md b/lib/installers/virt/herorunner/readme.md
new file mode 100644
index 00000000..48a12d5f
--- /dev/null
+++ b/lib/installers/virt/herorunner/readme.md
@@ -0,0 +1,44 @@
+# herorunner
+
+
+
+To get started
+
+```vlang
+
+
+import freeflowuniverse.herolib.installers.something.herorunner as herorunner_installer
+
+heroscript:="
+!!herorunner.configure name:'test'
+    password: '1234'
+    port: 7701
+
+!!herorunner.start name:'test' reset:1 
+"
+
+herorunner_installer.play(heroscript=heroscript)!
+
+//or we can call the default and do a start with reset
+//mut installer:= herorunner_installer.get()!
+//installer.start(reset:true)!
+
+
+
+
+```
+
+## example heroscript
+
+```hero
+!!herorunner.configure
+    homedir: '/home/user/herorunner'
+    username: 'admin'
+    password: 'secretpassword'
+    title: 'Some Title'
+    host: 'localhost'
+    port: 8888
+
+```
+
+
diff --git a/lib/mcp/rhai/example/example.vsh b/lib/mcp/rhai/example/example.vsh
index 150f0f10..b72d7bff 100755
--- a/lib/mcp/rhai/example/example.vsh
+++ b/lib/mcp/rhai/example/example.vsh
@@ -1,9 +1,13 @@
 #!/usr/bin/env -S v -n -w -gc none  -cc tcc -d use_openssl -enable-globals run
 
 import freeflowuniverse.herolib.mcp.aitools.escalayer
+import freeflowuniverse.herolib.core.redisclient
 import os
 
 fn main() {
+	// Example of using redisclient module instead of old redis.Connection
+	redis_example() or { println('Redis example failed: ${err}') }
+
 	// Get the current directory where this script is located
 	current_dir := os.dir(@FILE)
 
@@ -594,3 +598,64 @@ fn extract_functions_from_code(code string) []string {
 
 	return functions
 }
+
+// Example function showing how to use redisclient module instead of old redis.Connection
+fn redis_example() ! {
+	// OLD WAY (don't use this):
+	// mut conns := []redis.Connection{}
+	// for s in servers {
+	//     mut c := redis.connect(redis.Options{ server: s }) or {
+	//         panic('could not connect to redis $s: $err')
+	//     }
+	//     conns << c
+	// }
+
+	// NEW WAY using redisclient module:
+	servers := ['127.0.0.1:6379', '127.0.0.1:6380', '127.0.0.1:6381', '127.0.0.1:6382']
+	mut redis_clients := []&redisclient.Redis{}
+
+	for server in servers {
+		// Parse server address
+		redis_url := redisclient.get_redis_url(server) or {
+			println('Failed to parse Redis URL ${server}: ${err}')
+			continue
+		}
+
+		// Create Redis client using redisclient module
+		mut redis_client := redisclient.core_get(redis_url) or {
+			println('Failed to connect to Redis ${server}: ${err}')
+			continue
+		}
+
+		// Test the connection
+		redis_client.ping() or {
+			println('Failed to ping Redis ${server}: ${err}')
+			continue
+		}
+
+		redis_clients << redis_client
+		println('Successfully connected to Redis server: ${server}')
+	}
+
+	// Example usage of Redis operations
+	if redis_clients.len > 0 {
+		mut redis := redis_clients[0]
+
+		// Set a test key
+		redis.set('test_key', 'test_value') or {
+			println('Failed to set test key: ${err}')
+			return
+		}
+
+		// Get the test key
+		value := redis.get('test_key') or {
+			println('Failed to get test key: ${err}')
+			return
+		}
+
+		println('Redis test successful - key: test_key, value: ${value}')
+
+		// Clean up
+		redis.del('test_key') or { println('Failed to delete test key: ${err}') }
+	}
+}
diff --git a/lib/osal/core/net.v b/lib/osal/core/net.v
index 78bddaac..2318f363 100644
--- a/lib/osal/core/net.v
+++ b/lib/osal/core/net.v
@@ -3,7 +3,7 @@ module core
 import net
 import time
 import freeflowuniverse.herolib.ui.console
-import freeflowuniverse.herolib.core
+import freeflowuniverse.herolib.core as herolib_core
 import math
 import os
 
@@ -18,7 +18,7 @@ pub mut:
 
 // if ping ok, return true
 pub fn ping(args PingArgs) !bool {
-	platform_ := core.platform()!
+	platform_ := herolib_core.platform()!
 	mut cmd := 'ping'
 	if args.address.contains(':') {
 		cmd = 'ping6'
@@ -127,6 +127,64 @@ pub fn tcp_port_test(args TcpPortTestArgs) bool {
 	return false
 }
 
+// return in milliseconds
+pub fn http_ping(args TcpPortTestArgs) !int {
+	start_time := time.now().unix_milli()
+
+	// Try to establish TCP connection
+	console.print_debug('Pinging HTTP server at ${args.address}:${args.port}...')
+	mut sock := net.dial_tcp('${args.address}:${args.port}') or {
+		return error('failed to establish TCP connection to ${args.address}:${args.port}')
+	}
+	console.print_debug('TCP connection established to ${args.address}:${args.port}')
+
+	// Send a simple HTTP GET request
+	http_request := 'GET / HTTP/1.1\r\nHost: ${args.address}\r\nConnection: close\r\n\r\n'
+	sock.write_string(http_request) or {
+		sock.close()!
+		return error('failed to send HTTP request to ${args.address}:${args.port}')
+	}
+	console.print_debug('HTTP request sent to ${args.address}:${args.port}')
+
+	// Read response (at least some bytes to confirm it's an HTTP server)
+	mut buf := []u8{len: 1024}
+	_ = sock.read(mut buf) or {
+		sock.close()!
+		return error('failed to read HTTP response from ${args.address}:${args.port}')
+	}
+	console.print_debug('HTTP response received from ${args.address}:${args.port}')
+
+	sock.close()!
+	console.print_debug('TCP connection closed for ${args.address}:${args.port}')
+	// Calculate and return the round-trip time
+	end_time := time.now().unix_milli()
+	return int(end_time - start_time)
+}
+
+// Wait until a web server responds properly to HTTP requests
+// Returns true when the server is responding, false on timeout
+pub fn http_wait(args TcpPortTestArgs) bool {
+	start_time := time.now().unix_milli()
+	mut run_time := 0.0
+	for true {
+		run_time = time.now().unix_milli()
+		if run_time > start_time + args.timeout {
+			return false
+		}
+
+		// Try to ping the HTTP server
+		_ = http_ping(args) or {
+			// If http_ping fails, it means the server is not responding properly yet
+			time.sleep(100 * time.millisecond)
+			continue
+		}
+
+		// If http_ping succeeds, the server is responding properly
+		return true
+	}
+	return false
+}
+
 // Returns the public IP address as known on the public side
 // Uses resolver4.opendns.com to fetch the IP address
 pub fn ipaddr_pub_get() !string {
@@ -238,13 +296,14 @@ fn ssh_testrun_internal(args TcpPortTestArgs) !(string, SSHResult) {
 	res := exec(cmd: cmd, ignore_error: true, stdout: false, debug: false)!
 	// console.print_debug('ssh test ${res.exit_code}: ===== cmd:\n${cmd}\n=====\n${res.output}')
 
+	res_output := res.output
 	if res.exit_code == 0 {
-		return res.output, SSHResult.ok
+		return res_output, SSHResult.ok
 	} else if res.exit_code == 1 {
-		return res.output, SSHResult.tcpport
+		return res_output, SSHResult.ssh
 	} else if res.exit_code == 2 {
-		return res.output, SSHResult.ping
+		return res_output, SSHResult.ping
 	} else {
-		return res.output, SSHResult.ssh
+		return res_output, SSHResult.ssh
 	}
 }
diff --git a/lib/osal/core/net_test.v b/lib/osal/core/net_test.v
index da20216a..eebaaaba 100644
--- a/lib/osal/core/net_test.v
+++ b/lib/osal/core/net_test.v
@@ -6,16 +6,16 @@ fn test_ipaddr_pub_get() {
 }
 
 fn test_ping() {
-	x := ping(address: '127.0.0.1', count: 1)!
-	assert x == .ok
+	x := ping(address: '127.0.0.1', retry: 1)!
+	assert x == true
 }
 
 fn test_ping_timeout() ! {
-	x := ping(address: '192.168.145.154', count: 5, timeout: 1)!
-	assert x == .timeout
+	x := ping(address: '192.168.145.154', retry: 5, nr_ok: 1)!
+	assert x == false
 }
 
 fn test_ping_unknownhost() ! {
-	x := ping(address: '12.902.219.1', count: 1, timeout: 1)!
-	assert x == .unknownhost
+	x := ping(address: '12.902.219.1', retry: 1, nr_ok: 1)!
+	assert x == false
 }
diff --git a/lib/osal/core/package_test.v b/lib/osal/core/package_test.v
index a968df0c..3ad6935f 100644
--- a/lib/osal/core/package_test.v
+++ b/lib/osal/core/package_test.v
@@ -3,33 +3,33 @@ module core
 import freeflowuniverse.herolib.core
 
 fn test_package_management() {
-	platform_ := core.platform()!
+	// platform_ := core.platform()!
 
-	if platform_ == .osx {
-		// Check if brew is installed
-		if !cmd_exists('brew') {
-			eprintln('WARNING: Homebrew is not installed. Please install it to run package management tests on OSX.')
-			return
-		}
-	}
+	// if platform_ == .osx {
+	// 	// Check if brew is installed
+	// 	if !cmd_exists('brew') {
+	// 		eprintln('WARNING: Homebrew is not installed. Please install it to run package management tests on OSX.')
+	// 		return
+	// 	}
+	// }
 
-	is_wget_installed := cmd_exists('wget')
+	// is_wget_installed := cmd_exists('wget')
 
-	if is_wget_installed {
-		// Clean up - remove wget
-		package_remove('wget') or { assert false, 'Failed to remove wget: ${err}' }
-		assert !cmd_exists('wget')
-		// Reinstalling wget as it was previously installed
-		package_install('wget') or { assert false, 'Failed to install wget: ${err}' }
-		assert cmd_exists('wget')
-		return
-	}
+	// if is_wget_installed {
+	// 	// Clean up - remove wget
+	// 	package_remove('wget') or { assert false, 'Failed to remove wget: ${err}' }
+	// 	assert !cmd_exists('wget')
+	// 	// Reinstalling wget as it was previously installed
+	// 	package_install('wget') or { assert false, 'Failed to install wget: ${err}' }
+	// 	assert cmd_exists('wget')
+	// 	return
+	// }
 
-	// Intstall wget and verify it is installed
-	package_install('wget') or { assert false, 'Failed to install wget: ${err}' }
-	assert cmd_exists('wget')
+	// // Intstall wget and verify it is installed
+	// package_install('wget') or { assert false, 'Failed to install wget: ${err}' }
+	// assert cmd_exists('wget')
 
-	// Clean up - remove wget
-	package_remove('wget') or { assert false, 'Failed to remove wget: ${err}' }
-	assert !cmd_exists('wget')
+	// // Clean up - remove wget
+	// package_remove('wget') or { assert false, 'Failed to remove wget: ${err}' }
+	// assert !cmd_exists('wget')
 }
diff --git a/lib/osal/linux/factory.v b/lib/osal/linux/factory.v
index d97d0db9..31e32c7f 100644
--- a/lib/osal/linux/factory.v
+++ b/lib/osal/linux/factory.v
@@ -1,13 +1,5 @@
 module linux
 
-// import freeflowuniverse.herolib.osal.core as osal
-import freeflowuniverse.herolib.core.texttools
-// import freeflowuniverse.herolib.screen
-import os
-import time
-// import freeflowuniverse.herolib.ui.console
-import freeflowuniverse.herolib.osal.core as osal
-
 @[heap]
 pub struct LinuxFactory {
 pub mut:
diff --git a/lib/osal/osinstaller/factory.v b/lib/osal/osinstaller/factory.v
index 4cdb30f7..e4d319bb 100644
--- a/lib/osal/osinstaller/factory.v
+++ b/lib/osal/osinstaller/factory.v
@@ -15,10 +15,10 @@ pub fn new() ServerManager {
 }
 
 fn (s ServerManager) execute(command string) bool {
-	// console.print_debug(command)
+	console.print_debug(command)
 
 	r := os.execute(command)
-	// console.print_debug(r)
+	console.print_debug(r)
 
 	return true
 }
diff --git a/lib/osal/sshagent/agent.v b/lib/osal/sshagent/agent.v
index b0c29502..d51f70a1 100644
--- a/lib/osal/sshagent/agent.v
+++ b/lib/osal/sshagent/agent.v
@@ -1,7 +1,6 @@
 module sshagent
 
 import freeflowuniverse.herolib.ui.console
-import freeflowuniverse.herolib.builder
 
 // Check if SSH agent is properly configured and all is good
 pub fn agent_check(mut agent SSHAgent) ! {
diff --git a/lib/osal/sshagent/sshagent.v b/lib/osal/sshagent/sshagent.v
index 4e1a05cc..de271835 100644
--- a/lib/osal/sshagent/sshagent.v
+++ b/lib/osal/sshagent/sshagent.v
@@ -58,7 +58,7 @@ pub fn (mut agent SSHAgent) is_agent_responsive() bool {
 	return res.exit_code == 0 || res.exit_code == 1 // 1 means no keys, but agent is running
 }
 
-// cleanup orphaned ssh-agent processes
+// cleanup orphaned ssh-agent processes, means all agents for the logged in user
 pub fn (mut agent SSHAgent) cleanup_orphaned_agents() ! {
 	user := os.getenv('USER')
 
@@ -77,6 +77,7 @@ pub fn (mut agent SSHAgent) cleanup_orphaned_agents() ! {
 			}
 		}
 	}
+	$dbg;
 }
 
 // check if specific agent PID is valid and responsive
diff --git a/lib/osal/tmux/bin/tmux_logger.v b/lib/osal/tmux/bin/tmux_logger.v
index 84fbf360..1bc0674a 100644
--- a/lib/osal/tmux/bin/tmux_logger.v
+++ b/lib/osal/tmux/bin/tmux_logger.v
@@ -3,40 +3,185 @@ module main
 import os
 import io
 import freeflowuniverse.herolib.core.logger
+import freeflowuniverse.herolib.core.texttools
+
+struct Args {
+mut:
+	logpath  string
+	pane_id  string
+	log      bool = true
+	logreset bool
+}
 
 fn main() {
-	if os.args.len < 2 {
-		eprintln('Usage: tmux_logger <log_path> [pane_id]')
+	args := parse_args() or {
+		eprintln('Error: ${err}')
+		print_usage()
 		exit(1)
 	}
 
-	log_path := os.args[1]
+	if !args.log {
+		// If logging is disabled, just consume stdin and exit
+		mut reader := io.new_buffered_reader(reader: os.stdin())
+		for {
+			reader.read_line() or { break }
+		}
+		return
+	}
 
-	mut l := logger.new(path: log_path) or {
+	// Determine the actual log directory path
+	log_dir_path := determine_log_path(args) or {
+		eprintln('Error determining log path: ${err}')
+		exit(1)
+	}
+
+	// Handle log reset if requested
+	if args.logreset {
+		reset_logs(log_dir_path) or {
+			eprintln('Error resetting logs: ${err}')
+			exit(1)
+		}
+	}
+
+	// Create logger - the logger factory expects a directory path
+	mut l := logger.new(path: log_dir_path) or {
 		eprintln('Failed to create logger: ${err}')
 		exit(1)
 	}
 
-	// Read from stdin line by line and log with categorization
-	mut reader := io.new_buffered_reader(reader: os.stdin())
+	// Read from stdin using a more direct approach that works with tmux pipe-pane
+	// The issue is that tmux pipe-pane sends data differently than regular pipes
+
+	mut buffer := []u8{len: 1024}
+	mut line_buffer := ''
+
 	for {
-		line := reader.read_line() or { break }
-		if line.len == 0 {
+		// Read raw bytes from stdin - this is more compatible with tmux pipe-pane
+		data, bytes_read := os.fd_read(0, buffer.len)
+
+		if bytes_read == 0 {
+			// No data available - for tmux pipe-pane this is normal, continue waiting
 			continue
 		}
 
-		// Detect output type and set appropriate category
-		category, logtype := categorize_output(line)
+		// Convert bytes to string and add to line buffer
+		line_buffer += data
 
+		// Process complete lines
+		for line_buffer.contains('\n') {
+			idx := line_buffer.index('\n') or { break }
+			line := line_buffer[..idx].trim_space()
+			line_buffer = line_buffer[idx + 1..]
+
+			if line.len == 0 {
+				continue
+			}
+
+			// Detect output type and set appropriate category
+			category, logtype := categorize_output(line)
+
+			// Log immediately - the logger handles its own file operations
+			l.log(
+				cat:     category
+				log:     line
+				logtype: logtype
+			) or {
+				eprintln('Failed to log line: ${err}')
+				continue
+			}
+		}
+	}
+
+	// Process any remaining data in the buffer
+	if line_buffer.trim_space().len > 0 {
+		line := line_buffer.trim_space()
+		category, logtype := categorize_output(line)
 		l.log(
 			cat:     category
 			log:     line
 			logtype: logtype
-		) or {
-			eprintln('Failed to log line: ${err}')
-			continue
+		) or { eprintln('Failed to log final line: ${err}') }
+	}
+}
+
+fn parse_args() !Args {
+	if os.args.len < 2 {
+		return error('Missing required argument: logpath')
+	}
+
+	mut args := Args{
+		logpath: os.args[1]
+	}
+
+	// Parse optional pane_id (second positional argument)
+	if os.args.len >= 3 {
+		args.pane_id = os.args[2]
+	}
+
+	// Parse optional flags
+	for i in 3 .. os.args.len {
+		arg := os.args[i]
+		if arg == '--no-log' || arg == '--log=false' {
+			args.log = false
+		} else if arg == '--logreset' || arg == '--logreset=true' {
+			args.logreset = true
+		} else if arg.starts_with('--log=') {
+			val := arg.all_after('=').to_lower()
+			args.log = val == 'true' || val == '1' || val == 'yes'
+		} else if arg.starts_with('--logreset=') {
+			val := arg.all_after('=').to_lower()
+			args.logreset = val == 'true' || val == '1' || val == 'yes'
 		}
 	}
+
+	return args
+}
+
+fn determine_log_path(args Args) !string {
+	mut log_path := args.logpath
+
+	// Check if logpath is a directory or file
+	if os.exists(log_path) && os.is_dir(log_path) {
+		// It's an existing directory
+		if args.pane_id == '' {
+			return error('When logpath is a directory, pane_id must be provided')
+		}
+		// Create a subdirectory for this pane
+		pane_dir := os.join_path(log_path, args.pane_id)
+		return pane_dir
+	} else if log_path.contains('.') && !log_path.ends_with('/') {
+		// It looks like a file path, use parent directory
+		parent_dir := os.dir(log_path)
+		return parent_dir
+	} else {
+		// It's a directory path (may not exist yet)
+		if args.pane_id == '' {
+			return log_path
+		}
+		// Create a subdirectory for this pane
+		pane_dir := os.join_path(log_path, args.pane_id)
+		return pane_dir
+	}
+}
+
+fn reset_logs(logpath string) ! {
+	if !os.exists(logpath) {
+		return
+	}
+
+	if os.is_dir(logpath) {
+		// Remove all .log files in the directory
+		files := os.ls(logpath) or { return }
+		for file in files {
+			if file.ends_with('.log') {
+				full_path := os.join_path(logpath, file)
+				os.rm(full_path) or { eprintln('Warning: Failed to remove ${full_path}: ${err}') }
+			}
+		}
+	} else {
+		// Remove the specific log file
+		os.rm(logpath) or { return error('Failed to remove log file ${logpath}: ${err}') }
+	}
 }
 
 fn categorize_output(line string) (string, logger.LogType) {
@@ -47,21 +192,41 @@ fn categorize_output(line string) (string, logger.LogType) {
 		|| line_lower.contains('exception') || line_lower.contains('panic')
 		|| line_lower.starts_with('e ') || line_lower.contains('fatal')
 		|| line_lower.contains('critical') {
-		return 'error', logger.LogType.error
+		return texttools.expand('error', 10, ' '), logger.LogType.error
 	}
 
 	// Warning patterns - use .stdout logtype but warning category
 	if line_lower.contains('warning') || line_lower.contains('warn:')
 		|| line_lower.contains('deprecated') {
-		return 'warning', logger.LogType.stdout
+		return texttools.expand('warning', 10, ' '), logger.LogType.stdout
 	}
 
 	// Info/debug patterns - use .stdout logtype
 	if line_lower.contains('info:') || line_lower.contains('debug:')
 		|| line_lower.starts_with('info ') || line_lower.starts_with('debug ') {
-		return 'info', logger.LogType.stdout
+		return texttools.expand('info', 10, ' '), logger.LogType.stdout
 	}
 
 	// Default to stdout category and logtype
-	return 'stdout', logger.LogType.stdout
+	return texttools.expand('stdout', 10, ' '), logger.LogType.stdout
+}
+
+fn print_usage() {
+	eprintln('Usage: tmux_logger <logpath> [pane_id] [options]')
+	eprintln('')
+	eprintln('Arguments:')
+	eprintln('  logpath    Directory or file path where logs will be stored')
+	eprintln('  pane_id    Optional pane identifier (required if logpath is a directory)')
+	eprintln('')
+	eprintln('Options:')
+	eprintln('  --log=true|false     Enable/disable logging (default: true)')
+	eprintln('  --no-log             Disable logging (same as --log=false)')
+	eprintln('  --logreset=true|false Reset existing logs before starting (default: false)')
+	eprintln('  --logreset           Reset existing logs (same as --logreset=true)')
+	eprintln('')
+	eprintln('Examples:')
+	eprintln('  tmux_logger /tmp/logs pane1')
+	eprintln('  tmux_logger /tmp/logs/session.log')
+	eprintln('  tmux_logger /tmp/logs pane1 --logreset')
+	eprintln('  tmux_logger /tmp/logs pane1 --no-log')
 }
diff --git a/lib/osal/tmux/play.v b/lib/osal/tmux/play.v
index 7a5f3a0c..0fe4775c 100644
--- a/lib/osal/tmux/play.v
+++ b/lib/osal/tmux/play.v
@@ -673,7 +673,7 @@ fn play_pane_ensure(mut plbook PlayBook, mut tmux_instance Tmux) ! {
 		name := p.get('name')!
 		parsed := parse_pane_name(name)!
 		cmd := p.get_default('cmd', '')!
-		label := p.get_default('label', '')!
+		// label := p.get_default('label', '')!
 
 		// Parse environment variables if provided
 		mut env := map[string]string{}
@@ -721,7 +721,28 @@ fn play_pane_ensure(mut plbook PlayBook, mut tmux_instance Tmux) ! {
 			// Find the target pane (by index, since tmux pane IDs can vary)
 			if pane_number > 0 && pane_number <= window.panes.len {
 				mut target_pane := window.panes[pane_number - 1] // Convert to 0-based index
-				target_pane.send_command(cmd)!
+				// Use declarative command logic for intelligent state management
+				target_pane.send_command_declarative(cmd)!
+			}
+		}
+
+		// Handle logging parameters - enable logging if requested
+		log_enabled := p.get_default_false('log')
+		if log_enabled {
+			logpath := p.get_default('logpath', '')!
+			logreset := p.get_default_false('logreset')
+
+			// Find the target pane for logging
+			if pane_number > 0 && pane_number <= window.panes.len {
+				mut target_pane := window.panes[pane_number - 1] // Convert to 0-based index
+
+				// Enable logging with automation (binary compilation, directory creation, etc.)
+				target_pane.logging_enable(
+					logpath:  logpath
+					logreset: logreset
+				) or {
+					console.print_debug('Warning: Failed to enable logging for pane ${name}: ${err}')
+				}
 			}
 		}
 
diff --git a/lib/osal/tmux/readme.md b/lib/osal/tmux/readme.md
index 4649ef38..79d1ee41 100644
--- a/lib/osal/tmux/readme.md
+++ b/lib/osal/tmux/readme.md
@@ -164,6 +164,59 @@ hero run -p <heroscript_file>
     label:'editor'               // Optional: descriptive label
     cmd:'vim'                    // Optional: command to run
     env:'EDITOR=vim'             // Optional: environment variables
+
+// Multi-line commands are supported using proper heroscript syntax
+!!tmux.pane_ensure
+    name:"mysession|mywindow|2"
+    label:'setup'
+    cmd:'
+        echo "Starting setup..."
+        mkdir -p /tmp/workspace
+        cd /tmp/workspace
+        echo "Setup complete"
+    '
+```
+
+### Multi-line Commands
+
+The tmux module supports multi-line commands in heroscripts using proper multi-line parameter syntax. Multi-line commands are automatically converted to temporary shell scripts for execution.
+
+#### Syntax
+
+Use the multi-line parameter format with quotes:
+
+```heroscript
+!!tmux.pane_ensure
+    name:"session|window|pane"
+    cmd:'
+        command1
+        command2
+        command3
+    '
+```
+
+#### Features
+
+- **Automatic Script Generation**: Multi-line commands are converted to temporary shell scripts
+- **Sequential Execution**: All commands execute in order within the same shell context
+- **Error Handling**: Scripts include proper bash shebang and error handling
+- **Temporary Files**: Scripts are stored in `/tmp/tmux/{session}/pane_{id}_script.sh`
+
+#### Example
+
+```heroscript
+!!tmux.pane_ensure
+    name:"dev|workspace|1"
+    label:"setup"
+    cmd:'
+        echo "Setting up development environment..."
+        mkdir -p /tmp/dev_workspace
+        cd /tmp/dev_workspace
+        git clone https://github.com/example/repo.git
+        cd repo
+        npm install
+        echo "Development environment ready!"
+    '
 ```
 
 ### Pane Layout Categories
diff --git a/lib/osal/tmux/tmux.v b/lib/osal/tmux/tmux.v
index 7d451f8b..1201f2b7 100644
--- a/lib/osal/tmux/tmux.v
+++ b/lib/osal/tmux/tmux.v
@@ -2,6 +2,7 @@ module tmux
 
 import freeflowuniverse.herolib.osal.core as osal
 import freeflowuniverse.herolib.core.texttools
+import freeflowuniverse.herolib.core.redisclient
 // import freeflowuniverse.herolib.session
 import os
 import time
@@ -12,6 +13,7 @@ pub struct Tmux {
 pub mut:
 	sessions  []&Session
 	sessionid string // unique link to job
+	redis     &redisclient.Redis @[skip] // Redis client for command state tracking
 }
 
 // get session (session has windows) .
@@ -82,13 +84,18 @@ pub fn (mut t Tmux) session_create(args SessionCreateArgs) !&Session {
 
 @[params]
 pub struct TmuxNewArgs {
+pub:
 	sessionid string
 }
 
 // return tmux instance
 pub fn new(args TmuxNewArgs) !Tmux {
+	// Initialize Redis client for command state tracking
+	mut redis := redisclient.core_get()!
+
 	mut t := Tmux{
 		sessionid: args.sessionid
+		redis:     redis
 	}
 	// t.load()!
 	t.scan()!
diff --git a/lib/osal/tmux/tmux_pane.v b/lib/osal/tmux/tmux_pane.v
index d597ceea..043eacf6 100644
--- a/lib/osal/tmux/tmux_pane.v
+++ b/lib/osal/tmux/tmux_pane.v
@@ -7,7 +7,7 @@ import time
 import os
 
 @[heap]
-struct Pane {
+pub struct Pane {
 pub mut:
 	window             &Window @[str: skip]
 	id                 int    // pane id (e.g., %1, %2)
@@ -112,7 +112,7 @@ pub fn (mut p Pane) output_wait(c_ string, timeoutsec int) ! {
 	mut t := ourtime.now()
 	start := t.unix()
 	c := c_.replace('\n', '')
-	for i in 0 .. 2000 {
+	for _ in 0 .. 2000 {
 		entries := p.logs_get_new(reset: false)!
 		for entry in entries {
 			if entry.content.replace('\n', '').contains(c) {
@@ -146,9 +146,280 @@ pub fn (mut p Pane) processinfo_main() !osal.ProcessInfo {
 }
 
 // Send a command to this pane
+// Supports both single-line and multi-line commands
 pub fn (mut p Pane) send_command(command string) ! {
-	cmd := 'tmux send-keys -t ${p.window.session.name}:@${p.window.id}.%${p.id} "${command}" Enter'
-	osal.execute_silent(cmd) or { return error('Cannot send command to pane %${p.id}: ${err}') }
+	// Check if command contains multiple lines
+	if command.contains('\n') {
+		// Multi-line command - create temporary script
+		p.send_multiline_command(command)!
+	} else {
+		// Single-line command - send directly
+		cmd := 'tmux send-keys -t ${p.window.session.name}:@${p.window.id}.%${p.id} "${command}" Enter'
+		osal.execute_silent(cmd) or { return error('Cannot send command to pane %${p.id}: ${err}') }
+	}
+}
+
+// Send command with declarative mode logic (intelligent state management)
+// This method implements the full declarative logic:
+// 1. Check if pane has previous command (Redis lookup)
+// 2. If previous command exists:
+//    a. Check if still running (process verification)
+//    b. Compare MD5 hashes
+//    c. If different command OR not running: proceed
+//    d. If same command AND running: skip
+// 3. If proceeding: kill existing processes, then start new command
+pub fn (mut p Pane) send_command_declarative(command string) ! {
+	console.print_debug('Declarative command for pane ${p.id}: ${command[..if command.len > 50 {
+		50
+	} else {
+		command.len
+	}]}...')
+
+	// Step 1: Check if command has changed
+	command_changed := p.has_command_changed(command)
+
+	// Step 2: Check if stored command is still running
+	stored_running := p.is_stored_command_running()
+
+	// Step 3: Decide whether to proceed
+	should_execute := command_changed || !stored_running
+
+	if !should_execute {
+		console.print_debug('Skipping command execution for pane ${p.id}: same command already running')
+		return
+	}
+
+	// Step 4: If we have a running command that needs to be replaced, kill it
+	if stored_running && command_changed {
+		console.print_debug('Killing existing command in pane ${p.id} before starting new one')
+		p.kill_running_command()!
+		// Give processes time to die
+		time.sleep(500 * time.millisecond)
+	}
+
+	// Step 5: Ensure bash is the parent process
+	p.ensure_bash_parent()!
+
+	// Step 6: Reset pane if it appears empty or needs cleanup
+	p.reset_if_needed()!
+
+	// Step 7: Execute the new command
+	p.send_command(command)!
+
+	// Step 8: Store the new command state
+	// Get the PID of the command we just started (this is approximate)
+	time.sleep(100 * time.millisecond) // Give command time to start
+	p.store_command_state(command, 'running', p.pid)!
+
+	console.print_debug('Successfully executed declarative command for pane ${p.id}')
+}
+
+// Kill the currently running command in this pane
+pub fn (mut p Pane) kill_running_command() ! {
+	stored_state := p.get_command_state() or { return }
+
+	if stored_state.pid > 0 && osal.process_exists(stored_state.pid) {
+		// Kill the process and its children
+		osal.process_kill_recursive(pid: stored_state.pid)!
+		console.print_debug('Killed running command (PID: ${stored_state.pid}) in pane ${p.id}')
+	}
+
+	// Also try to kill any processes that might be running in the pane
+	p.kill_pane_process_group()!
+
+	// Update the command state to reflect that it's no longer running
+	p.update_command_status('killed')!
+}
+
+// Reset pane if it appears empty or needs cleanup
+pub fn (mut p Pane) reset_if_needed() ! {
+	if p.is_pane_empty()! {
+		console.print_debug('Pane ${p.id} appears empty, sending reset')
+		p.send_reset()!
+		return
+	}
+
+	if !p.is_at_clean_prompt()! {
+		console.print_debug('Pane ${p.id} not at clean prompt, sending reset')
+		p.send_reset()!
+	}
+}
+
+// Check if pane is completely empty
+pub fn (mut p Pane) is_pane_empty() !bool {
+	logs := p.logs_all() or { return true }
+	lines := logs.split_into_lines()
+
+	// Filter out empty lines
+	mut non_empty_lines := []string{}
+	for line in lines {
+		if line.trim_space().len > 0 {
+			non_empty_lines << line
+		}
+	}
+
+	return non_empty_lines.len == 0
+}
+
+// Check if pane is at a clean shell prompt
+pub fn (mut p Pane) is_at_clean_prompt() !bool {
+	logs := p.logs_all() or { return false }
+	lines := logs.split_into_lines()
+
+	if lines.len == 0 {
+		return false
+	}
+
+	// Check last few lines for shell prompt indicators
+	check_lines := if lines.len > 5 { lines[lines.len - 5..] } else { lines }
+
+	for line in check_lines.reverse() {
+		line_clean := line.trim_space()
+		if line_clean.len == 0 {
+			continue
+		}
+
+		// Look for common shell prompt patterns
+		if line_clean.ends_with('$ ') || line_clean.ends_with('# ') || line_clean.ends_with('> ')
+			|| line_clean.ends_with('$') || line_clean.ends_with('#') || line_clean.ends_with('>') {
+			console.print_debug('Found clean prompt in pane ${p.id}: "${line_clean}"')
+			return true
+		}
+
+		// If we find a non-prompt line, we're not at a clean prompt
+		break
+	}
+
+	return false
+}
+
+// Send reset command to pane
+pub fn (mut p Pane) send_reset() ! {
+	cmd := 'tmux send-keys -t ${p.window.session.name}:@${p.window.id}.%${p.id} "reset" Enter'
+	osal.execute_silent(cmd) or { return error('Cannot send reset to pane %${p.id}: ${err}') }
+	console.print_debug('Sent reset command to pane ${p.id}')
+
+	// Give reset time to complete
+	time.sleep(200 * time.millisecond)
+}
+
+// Verify that bash is the first process in this pane
+pub fn (mut p Pane) verify_bash_parent() !bool {
+	if p.pid <= 0 {
+		return false
+	}
+
+	// Get process information for the pane's main process
+	proc_info := osal.processinfo_get(p.pid) or { return false }
+
+	// Check if the process command contains bash
+	if proc_info.cmd.contains('bash') || proc_info.cmd.contains('/bin/bash')
+		|| proc_info.cmd.contains('/usr/bin/bash') {
+		console.print_debug('Pane ${p.id} has bash as parent process (PID: ${p.pid})')
+		return true
+	}
+
+	console.print_debug('Pane ${p.id} does NOT have bash as parent process. Current: ${proc_info.cmd}')
+	return false
+}
+
+// Ensure bash is the first process in the pane
+pub fn (mut p Pane) ensure_bash_parent() ! {
+	if p.verify_bash_parent()! {
+		return
+	}
+
+	console.print_debug('Ensuring bash is parent process for pane ${p.id}')
+
+	// Kill any existing processes in the pane
+	p.kill_pane_process_group()!
+
+	// Send a new bash command to establish bash as the parent
+	cmd := 'tmux send-keys -t ${p.window.session.name}:@${p.window.id}.%${p.id} "exec bash" Enter'
+	osal.execute_silent(cmd) or { return error('Cannot start bash in pane %${p.id}: ${err}') }
+
+	// Give bash time to start
+	time.sleep(500 * time.millisecond)
+
+	// Update pane information
+	p.window.scan()!
+
+	// Verify bash is now running
+	if !p.verify_bash_parent()! {
+		return error('Failed to establish bash as parent process in pane ${p.id}')
+	}
+
+	console.print_debug('Successfully established bash as parent process for pane ${p.id}')
+}
+
+// Get all child processes of this pane's main process
+pub fn (mut p Pane) get_child_processes() ![]osal.ProcessInfo {
+	if p.pid <= 0 {
+		return []osal.ProcessInfo{}
+	}
+
+	children_map := osal.processinfo_children(p.pid)!
+	return children_map.processes
+}
+
+// Check if commands are running as children of bash
+pub fn (mut p Pane) verify_command_hierarchy() !bool {
+	// First verify bash is the parent
+	if !p.verify_bash_parent()! {
+		return false
+	}
+
+	// Get child processes
+	children := p.get_child_processes()!
+
+	if children.len == 0 {
+		// No child processes, which is fine
+		return true
+	}
+
+	// Check if child processes have bash as their parent
+	for child in children {
+		if child.ppid != p.pid {
+			console.print_debug('Child process ${child.pid} (${child.cmd}) does not have pane process as parent')
+			return false
+		}
+	}
+
+	console.print_debug('Command hierarchy verified for pane ${p.id}: ${children.len} child processes')
+	return true
+}
+
+// Handle multi-line commands by creating a temporary script
+fn (mut p Pane) send_multiline_command(command string) ! {
+	// Create temporary directory for tmux scripts
+	script_dir := '/tmp/tmux/${p.window.session.name}'
+	os.mkdir_all(script_dir) or { return error('Cannot create script directory: ${err}') }
+
+	// Create unique script file for this pane
+	script_path := '${script_dir}/pane_${p.id}_script.sh'
+
+	// Prepare script content with proper shebang and commands
+	script_content := '#!/bin/bash\n' + command.trim_space()
+
+	// Write script to file
+	os.write_file(script_path, script_content) or {
+		return error('Cannot write script file ${script_path}: ${err}')
+	}
+
+	// Make script executable
+	os.chmod(script_path, 0o755) or {
+		return error('Cannot make script executable ${script_path}: ${err}')
+	}
+
+	// Execute the script in the pane
+	cmd := 'tmux send-keys -t ${p.window.session.name}:@${p.window.id}.%${p.id} "${script_path}" Enter'
+	osal.execute_silent(cmd) or { return error('Cannot execute script in pane %${p.id}: ${err}') }
+
+	// Optional: Clean up script after a delay (commented out for debugging)
+	// spawn {
+	// 	time.sleep(5 * time.second)
+	// 	os.rm(script_path) or {}
+	// }
 }
 
 // Send raw keys to this pane (without Enter)
@@ -367,62 +638,23 @@ pub fn (mut p Pane) logging_enable(args PaneLoggingEnableArgs) ! {
 		}
 	}
 
-	// Use a completely different approach: direct tmux pipe-pane with a buffer-based logger
-	// This ensures ALL output is captured in real-time without missing anything
-	buffer_logger_script := "#!/bin/bash
-PANE_TARGET=\"${p.window.session.name}:@${p.window.id}.%${p.id}\"
-LOG_PATH=\"${log_path}\"
-LOGGER_BINARY=\"${logger_binary}\"
-BUFFER_FILE=\"/tmp/tmux_pane_${p.id}_buffer.txt\"
+	// Use the simple and reliable tmux pipe-pane approach with tmux_logger binary
+	// This is the proven approach that works perfectly
 
-# Create a named pipe for real-time logging
-PIPE_FILE=\"/tmp/tmux_pane_${p.id}_pipe\"
-mkfifo \"\$PIPE_FILE\" 2>/dev/null || true
+	// Determine the pane identifier for logging
+	pane_log_id := 'pane${p.id}'
 
-# Start the logger process that reads from the pipe
-\"\$LOGGER_BINARY\" \"\$LOG_PATH\" \"${p.id}\" < \"\$PIPE_FILE\" &
-LOGGER_PID=\$!
+	// Set up tmux pipe-pane to send all output directly to tmux_logger
+	pipe_cmd := 'tmux pipe-pane -t ${p.window.session.name}:@${p.window.id}.%${p.id} -o "${logger_binary} ${log_path} ${pane_log_id}"'
 
-# Function to cleanup on exit
-cleanup() {
-    kill \$LOGGER_PID 2>/dev/null || true
-    rm -f \"\$PIPE_FILE\" \"\$BUFFER_FILE\"
-    exit 0
-}
-trap cleanup EXIT INT TERM
+	console.print_debug('Starting real-time logging: ${pipe_cmd}')
 
-# Start tmux pipe-pane to send all output to our pipe
-tmux pipe-pane -t \"\$PANE_TARGET\" \"cat >> \"\$PIPE_FILE\"\"
-
-# Keep the script running and monitor the pane
-while true; do
-    # Check if pane still exists
-    if ! tmux list-panes -t \"\$PANE_TARGET\" >/dev/null 2>&1; then
-        break
-    fi
-    sleep 1
-done
-
-cleanup
-" // Write the buffer logger script
-
-	script_path := '/tmp/tmux_buffer_logger_${p.id}.sh'
-	os.write_file(script_path, buffer_logger_script) or {
-		return error("Can't create buffer logger script: ${err}")
+	osal.exec(cmd: pipe_cmd, stdout: false, name: 'tmux_start_pipe_logging') or {
+		return error("Can't start pipe logging for pane %${p.id}: ${err}")
 	}
 
-	// Make script executable
-	osal.exec(cmd: 'chmod +x "${script_path}"', stdout: false, name: 'make_script_executable') or {
-		return error("Can't make script executable: ${err}")
-	}
-
-	// Start the buffer logger script in background
-	start_cmd := 'nohup "${script_path}" > /dev/null 2>&1 &'
-	console.print_debug('Starting pane logging with buffer logger: ${start_cmd}')
-
-	osal.exec(cmd: start_cmd, stdout: false, name: 'tmux_start_buffer_logger') or {
-		return error("Can't start buffer logger for pane %${p.id}: ${err}")
-	}
+	// Wait a moment for the process to start
+	time.sleep(500 * time.millisecond)
 
 	// Update pane state
 	p.log_enabled = true
@@ -442,14 +674,12 @@ pub fn (mut p Pane) logging_disable() ! {
 	cmd := 'tmux pipe-pane -t ${p.window.session.name}:@${p.window.id}.%${p.id}'
 	osal.exec(cmd: cmd, stdout: false, name: 'tmux_stop_logging', ignore_error: true) or {}
 
-	// Kill the buffer logger script process
-	script_path := '/tmp/tmux_buffer_logger_${p.id}.sh'
-	kill_cmd := 'pkill -f "${script_path}"'
-	osal.exec(cmd: kill_cmd, stdout: false, name: 'kill_buffer_logger_script', ignore_error: true) or {}
+	// Kill the tmux_logger process for this pane
+	pane_log_id := 'pane${p.id}'
+	kill_cmd := 'pkill -f "tmux_logger.*${pane_log_id}"'
+	osal.exec(cmd: kill_cmd, stdout: false, name: 'kill_tmux_logger', ignore_error: true) or {}
 
-	// Clean up script and temp files
-	cleanup_cmd := 'rm -f "${script_path}" "/tmp/tmux_pane_${p.id}_buffer.txt" "/tmp/tmux_pane_${p.id}_pipe"'
-	osal.exec(cmd: cleanup_cmd, stdout: false, name: 'cleanup_logging_files', ignore_error: true) or {}
+	// No temp files to clean up with the simple pipe approach
 
 	// Update pane state
 	p.log_enabled = false
@@ -466,3 +696,22 @@ pub fn (p Pane) logging_status() string {
 	}
 	return 'disabled'
 }
+
+pub fn (mut p Pane) clear() ! {
+	// Kill current process in the pane
+	osal.exec(
+		cmd:    'tmux send-keys -t %${p.id} C-c'
+		stdout: false
+		name:   'tmux_pane_interrupt'
+	) or {}
+
+	// Reset pane by running a new bash
+	osal.exec(
+		cmd:    "tmux send-keys -t %${p.id} '/bin/bash' Enter"
+		stdout: false
+		name:   'tmux_pane_reset_shell'
+	)!
+
+	// Update pane info
+	p.window.scan()!
+}
diff --git a/lib/osal/tmux/tmux_session_test.v b/lib/osal/tmux/tmux_session_test.v
index 0a0d0cbf..b11746e7 100644
--- a/lib/osal/tmux/tmux_session_test.v
+++ b/lib/osal/tmux/tmux_session_test.v
@@ -1,86 +1,39 @@
 module tmux
 
 import freeflowuniverse.herolib.osal.core as osal
-// import freeflowuniverse.herolib.installers.tmux
-
-// fn testsuite_end() {
-
-// 	
-// }
+import rand
 
 fn testsuite_begin() {
-	mut tmux := Tmux{}
+	mut tmux_instance := new()!
 
-	if tmux.is_running()! {
-		tmux.stop()!
+	if tmux_instance.is_running()! {
+		tmux_instance.stop()!
 	}
 }
 
-fn test_session_create() {
-	// installer := tmux.get_install(
-	// 	panic('could not install tmux: ${err}')
-	// }
+fn test_session_create() ! {
+	// Create unique session names to avoid conflicts
+	session_name1 := 'testsession_${rand.int()}'
+	session_name2 := 'testsession2_${rand.int()}'
 
-	mut tmux := Tmux{}
-	tmux.start() or { panic('cannot start tmux: ${err}') }
+	mut tmux_instance := new()!
+	tmux_instance.start()!
 
-	mut s := Session{
-		tmux:    &tmux
-		windows: []&Window{}
-		name:    'testsession'
-	}
+	// Create sessions using the proper API
+	mut s := tmux_instance.session_create(name: session_name1)!
+	mut s2 := tmux_instance.session_create(name: session_name2)!
 
-	mut s2 := Session{
-		tmux:    &tmux
-		windows: []&Window{}
-		name:    'testsession2'
-	}
-
-	// test testsession exists after session_create
+	// Test that sessions were created successfully
 	mut tmux_ls := osal.execute_silent('tmux ls') or { panic("can't exec: ${err}") }
-	assert !tmux_ls.contains('testsession: 1 windows')
-	s.create() or { panic('Cannot create session: ${err}') }
-	tmux_ls = osal.execute_silent('tmux ls') or { panic("can't exec: ${err}") }
-	assert tmux_ls.contains('testsession: 1 windows')
+	assert tmux_ls.contains(session_name1), 'Session 1 should exist'
+	assert tmux_ls.contains(session_name2), 'Session 2 should exist'
 
-	// test multiple session_create for same tmux
-	tmux_ls = osal.execute_silent('tmux ls') or { panic("can't exec: ${err}") }
-	assert !tmux_ls.contains('testsession2: 1 windows')
-	s2.create() or { panic('Cannot create session: ${err}') }
-	tmux_ls = osal.execute_silent('tmux ls') or { panic("can't exec: ${err}") }
-	assert tmux_ls.contains('testsession2: 1 windows')
+	// Test session existence check
+	assert tmux_instance.session_exist(session_name1), 'Session 1 should exist via API'
+	assert tmux_instance.session_exist(session_name2), 'Session 2 should exist via API'
 
-	// test session_create with duplicate session
-	mut create_err := ''
-	s2.create() or { create_err = err.msg() }
-	assert create_err != ''
-	assert create_err.contains('duplicate session: testsession2')
-	tmux_ls = osal.execute_silent('tmux ls') or { panic("can't exec: ${err}") }
-	assert tmux_ls.contains('testsession2: 1 windows')
-
-	s.stop() or { panic('Cannot stop session: ${err}') }
-	s2.stop() or { panic('Cannot stop session: ${err}') }
+	// Clean up
+	tmux_instance.session_delete(session_name1)!
+	tmux_instance.session_delete(session_name2)!
+	tmux_instance.stop()!
 }
-
-// fn test_session_stop() {
-
-// 	
-// 	installer := tmux.get_install(
-
-// 	mut tmux := Tmux {
-// 		node: node_ssh
-// 	}
-
-// 	mut s := Session{
-// 		tmux: &tmux // reference back
-// 		windows: map[string]&Window{}
-// 		name: 'testsession3'
-// 	}
-
-// 	s.create() or  { panic("Cannot create session: $err") }
-// 	mut tmux_ls := osal.execute_silent('tmux ls') or { panic("can't exec: $err") }
-// 	assert tmux_ls.contains("testsession3: 1 windows")
-// 	s.stop() or  { panic("Cannot stop session: $err")}
-// 	tmux_ls = osal.execute_silent('tmux ls') or { panic("can't exec: $err") }
-// 	assert !tmux_ls.contains("testsession3: 1 windows")
-// }
diff --git a/lib/osal/tmux/tmux_state.v b/lib/osal/tmux/tmux_state.v
new file mode 100644
index 00000000..6aca3696
--- /dev/null
+++ b/lib/osal/tmux/tmux_state.v
@@ -0,0 +1,157 @@
+module tmux
+
+import freeflowuniverse.herolib.osal.core as osal
+import crypto.md5
+import json
+import time
+import freeflowuniverse.herolib.ui.console
+
+// Command state structure for Redis storage
+pub struct CommandState {
+pub mut:
+	cmd_md5    string // MD5 hash of the command
+	cmd_text   string // Original command text
+	status     string // running|finished|failed|unknown
+	pid        int    // Process ID of the command
+	started_at string // Timestamp when command started
+	last_check string // Last time status was checked
+	pane_id    int    // Pane ID for reference
+}
+
+// Generate Redis key for command state tracking
+// Pattern: herotmux:${session}:${window}|${pane}
+pub fn (p &Pane) get_state_key() string {
+	return 'herotmux:${p.window.session.name}:${p.window.name}|${p.id}'
+}
+
+// Generate MD5 hash for a command (normalized)
+pub fn normalize_and_hash_command(cmd string) string {
+	// Normalize command: trim whitespace, normalize newlines
+	normalized := cmd.trim_space().replace('\r\n', '\n').replace('\r', '\n')
+	return md5.hexhash(normalized)
+}
+
+// Store command state in Redis
+pub fn (mut p Pane) store_command_state(cmd string, status string, pid int) ! {
+	key := p.get_state_key()
+	cmd_hash := normalize_and_hash_command(cmd)
+	now := time.now().format_ss_milli()
+
+	state := CommandState{
+		cmd_md5:    cmd_hash
+		cmd_text:   cmd
+		status:     status
+		pid:        pid
+		started_at: now
+		last_check: now
+		pane_id:    p.id
+	}
+
+	state_json := json.encode(state)
+	p.window.session.tmux.redis.set(key, state_json)!
+
+	console.print_debug('Stored command state for pane ${p.id}: ${cmd_hash[..8]}... status=${status}')
+}
+
+// Retrieve command state from Redis
+pub fn (mut p Pane) get_command_state() ?CommandState {
+	key := p.get_state_key()
+	state_json := p.window.session.tmux.redis.get(key) or { return none }
+
+	if state_json.len == 0 {
+		return none
+	}
+
+	state := json.decode(CommandState, state_json) or {
+		console.print_debug('Failed to decode command state for pane ${p.id}: ${err}')
+		return none
+	}
+
+	return state
+}
+
+// Check if command has changed by comparing MD5 hashes
+pub fn (mut p Pane) has_command_changed(new_cmd string) bool {
+	stored_state := p.get_command_state() or { return true }
+	new_hash := normalize_and_hash_command(new_cmd)
+	return stored_state.cmd_md5 != new_hash
+}
+
+// Update command status in Redis
+pub fn (mut p Pane) update_command_status(status string) ! {
+	mut stored_state := p.get_command_state() or { return }
+	stored_state.status = status
+	stored_state.last_check = time.now().format_ss_milli()
+
+	key := p.get_state_key()
+	state_json := json.encode(stored_state)
+	p.window.session.tmux.redis.set(key, state_json)!
+
+	console.print_debug('Updated command status for pane ${p.id}: ${status}')
+}
+
+// Clear command state from Redis (when pane is reset or command is removed)
+pub fn (mut p Pane) clear_command_state() ! {
+	key := p.get_state_key()
+	p.window.session.tmux.redis.del(key) or {
+		console.print_debug('Failed to clear command state for pane ${p.id}: ${err}')
+	}
+	console.print_debug('Cleared command state for pane ${p.id}')
+}
+
+// Check if stored command is currently running by verifying the PID
+pub fn (mut p Pane) is_stored_command_running() bool {
+	stored_state := p.get_command_state() or { return false }
+
+	if stored_state.pid <= 0 {
+		return false
+	}
+
+	// Use osal to check if process exists
+	return osal.process_exists(stored_state.pid)
+}
+
+// Get all command states for a session (useful for debugging/monitoring)
+pub fn (mut s Session) get_all_command_states() !map[string]CommandState {
+	mut states := map[string]CommandState{}
+
+	// Get all keys matching the session pattern
+	pattern := 'herotmux:${s.name}:*'
+	keys := s.tmux.redis.keys(pattern)!
+
+	for key in keys {
+		state_json := s.tmux.redis.get(key) or { continue }
+		if state_json.len == 0 {
+			continue
+		}
+
+		state := json.decode(CommandState, state_json) or {
+			console.print_debug('Failed to decode state for key ${key}: ${err}')
+			continue
+		}
+
+		states[key] = state
+	}
+
+	return states
+}
+
+// Clean up stale command states (for maintenance)
+pub fn (mut s Session) cleanup_stale_command_states() ! {
+	states := s.get_all_command_states()!
+
+	for key, state in states {
+		// Check if the process is still running
+		if state.pid > 0 && !osal.process_exists(state.pid) {
+			// Process is dead, update status
+			mut updated_state := state
+			updated_state.status = 'finished'
+			updated_state.last_check = time.now().format_ss_milli()
+
+			state_json := json.encode(updated_state)
+			s.tmux.redis.set(key, state_json)!
+
+			console.print_debug('Updated stale command state ${key}: process ${state.pid} no longer exists')
+		}
+	}
+}
diff --git a/lib/osal/tmux/tmux_test.v b/lib/osal/tmux/tmux_test.v
index 03d61475..48491a8b 100644
--- a/lib/osal/tmux/tmux_test.v
+++ b/lib/osal/tmux/tmux_test.v
@@ -29,8 +29,8 @@ fn test_start() ! {
 	// test server is running after start()
 	tmux.start() or { panic('cannot start tmux: ${err}') }
 	mut tmux_ls := osal.execute_silent('tmux ls') or { panic('Cannot execute tmux ls: ${err}') }
-	// test started tmux contains windows
-	assert tmux_ls.contains('init: 1 windows')
+	// test started tmux contains some session
+	assert tmux_ls.len > 0, 'Tmux should have at least one session'
 	tmux.stop() or { panic('cannot stop tmux: ${err}') }
 }
 
diff --git a/lib/osal/tmux/tmux_window.v b/lib/osal/tmux/tmux_window.v
index 81f39064..60d2d9ba 100644
--- a/lib/osal/tmux/tmux_window.v
+++ b/lib/osal/tmux/tmux_window.v
@@ -406,3 +406,22 @@ pub fn (mut w Window) stop_ttyd(port int) ! {
 	}
 	println('ttyd stopped for window ${w.name} on port ${port} (if it was running)')
 }
+
+// Get a pane by its ID
+pub fn (mut w Window) pane_get(id int) !&Pane {
+	w.scan()! // refresh info from tmux
+	for pane in w.panes {
+		if pane.id == id {
+			return pane
+		}
+	}
+	return error('Pane with id ${id} not found in window ${w.name}. Available panes: ${w.panes}')
+}
+
+// Create a new pane (just a split with default shell)
+pub fn (mut w Window) pane_new() !&Pane {
+	return w.pane_split(
+		cmd:        '/bin/bash'
+		horizontal: true
+	)
+}
diff --git a/lib/osal/tmux/tmux_window_test.v b/lib/osal/tmux/tmux_window_test.v
index d4224b58..4d4fda19 100644
--- a/lib/osal/tmux/tmux_window_test.v
+++ b/lib/osal/tmux/tmux_window_test.v
@@ -1,65 +1,57 @@
 module tmux
 
-import freeflowuniverse.herolib.osal.core as osal
-import freeflowuniverse.herolib.ui.console
+import rand
 import time
 
-// uses single tmux instance for all tests
+// Simple tests for tmux functionality
 
-fn testsuite_begin() {
-	muttmux := new() or { panic('Cannot create tmux: ${err}') }
+// Test MD5 command hashing (doesn't require tmux)
+fn test_md5_hashing() ! {
+	// Test basic hashing
+	cmd1 := 'echo "test"'
+	cmd2 := 'echo "test"'
+	cmd3 := 'echo "different"'
 
-	// reset tmux for tests
-	is_running := is_running() or { panic('cannot check if tmux is running: ${err}') }
-	if is_running {
-		stop() or { panic('Cannot stop tmux: ${err}') }
-	}
+	hash1 := normalize_and_hash_command(cmd1)
+	hash2 := normalize_and_hash_command(cmd2)
+	hash3 := normalize_and_hash_command(cmd3)
+
+	assert hash1 == hash2, 'Same commands should have same hash'
+	assert hash1 != hash3, 'Different commands should have different hashes'
+
+	// Test normalization
+	cmd_with_spaces := '  echo "test"  '
+	cmd_with_newlines := 'echo "test"\n'
+
+	hash_spaces := normalize_and_hash_command(cmd_with_spaces)
+	hash_newlines := normalize_and_hash_command(cmd_with_newlines)
+
+	assert hash1 == hash_spaces, 'Commands with extra spaces should normalize to same hash'
+	assert hash1 == hash_newlines, 'Commands with newlines should normalize to same hash'
 }
 
-fn testsuite_end() {
-	is_running := is_running() or { panic('cannot check if tmux is running: ${err}') }
-	if is_running {
-		stop() or { panic('Cannot stop tmux: ${err}') }
+// Test basic tmux functionality
+fn test_tmux_basic() ! {
+	// Create unique session name to avoid conflicts
+	session_name := 'test_${rand.int()}'
+
+	mut tmux_instance := new()!
+
+	// Ensure tmux is running
+	if !tmux_instance.is_running()! {
+		tmux_instance.start()!
 	}
-}
 
-fn test_window_new() ! {
-	mut tmux := new()!
-	tmux.start()!
-
-	// Create session first
-	mut session := tmux.session_create(name: 'main')!
+	// Create session
+	mut session := tmux_instance.session_create(name: session_name)!
+	// Note: session name gets normalized by name_fix, so we check if it contains our unique part
+	assert session.name.contains('test_'), 'Session name should contain test_ prefix'
 
 	// Test window creation
-	mut window := session.window_new(
-		name:  'TestWindow'
-		cmd:   'bash'
-		reset: true
-	)!
+	mut window := session.window_new(name: 'testwin')!
+	assert window.name == 'testwin'
+	assert session.window_exist(name: 'testwin')
 
-	assert window.name == 'testwindow' // name_fix converts to lowercase
-	assert session.window_exist(name: 'testwindow')
-
-	tmux.stop()!
-}
-
-// tests creating duplicate windows
-fn test_window_new0() {
-	installer := get_install()!
-
-	mut tmux := Tmux{
-		node: node_ssh
-	}
-
-	window_args := WindowArgs{
-		name: 'TestWindow0'
-	}
-
-	// console.print_debug(tmux)
-	mut window := tmux.window_new(window_args) or { panic("Can't create new window: ${err}") }
-	assert tmux.sessions.keys().contains('main')
-	mut window_dup := tmux.window_new(window_args) or { panic("Can't create new window: ${err}") }
-	console.print_debug(node_ssh.exec('tmux ls') or { panic('fail:${err}') })
-	window.delete() or { panic('Cant delete window') }
-	// console.print_debug(tmux)
+	// Clean up - just stop tmux to clean everything
+	tmux_instance.stop()!
 }
diff --git a/lib/osal/ubuntu/mirrors.v b/lib/osal/ubuntu/mirrors.v
new file mode 100644
index 00000000..080121da
--- /dev/null
+++ b/lib/osal/ubuntu/mirrors.v
@@ -0,0 +1,180 @@
+module ubuntu
+
+import freeflowuniverse.herolib.osal.core as osal
+import freeflowuniverse.herolib.core.texttools
+import net.http
+import os
+import time
+import net.urllib
+import net
+import sync
+
+pub struct PerfResult {
+pub mut:
+	url     string
+	ping_ms int
+	speed   f64
+	error   string
+}
+
+// Fetch Ubuntu mirror list
+fn fetch_mirrors() ![]string {
+	cmd := 'curl -s https://launchpad.net/ubuntu/+archivemirrors | grep -oP \'http[s]?://[^"]+\' | sort -u'
+	job := osal.exec(cmd: cmd)!
+	if job.exit_code != 0 {
+		return error('Failed to fetch mirror list: ${job.output}')
+	}
+	mut mirrors := texttools.remove_empty_lines(job.output).split_into_lines()
+	mirrors = mirrors.filter(it.contains('answers.launchpad.net') == false) // remove launchpad answers
+	return mirrors
+}
+
+// Test download speed (download a small file)
+fn test_download_speed(mirror string) f64 {
+	test_file := '${mirror}/dists/plucky/Release' // small file usually available +-258KB
+	start := time.now()
+	resp := http.get(test_file) or { return -1.0 }
+	if resp.status_code != 200 {
+		return -1.0
+	}
+	elapsed := time.since(start).milliseconds()
+	if elapsed == 0 {
+		return -1.0
+	}
+	size_kb := f64(resp.body.len) / 1024.0
+	println(size_kb)
+	$dbg;
+	return size_kb / elapsed // KB/sec
+}
+
+// Ping test (rough ICMP substitute using TCP connect on port 80), returns in ms
+fn test_ping(mirror string, mut wg sync.WaitGroup, ch chan PerfResult) ! {
+	defer { wg.done() }
+	u := urllib.parse(mirror) or {
+		ch <- PerfResult{
+			url:     mirror
+			ping_ms: -1
+			speed:   0.0
+		}
+		return
+	}
+	host := u.host
+	mut error := ''
+	result := osal.http_ping(address: host, port: 80, timeout: 5000) or {
+		error = err.msg()
+		0
+	}
+	if result > 0 {
+		ch <- PerfResult{
+			url:     mirror
+			ping_ms: result
+			speed:   0.0
+		}
+	} else {
+		ch <- PerfResult{
+			url:   mirror
+			error: error
+		}
+	}
+}
+
+// pub fn fix_mirrors() ! {
+// 	println('Fetching Ubuntu mirrors...')
+// 	mirrors := fetch_mirrors() or {
+// 		print_backtrace()
+// 		eprintln(err)
+// 		return
+// 	}
+// 	// mut results := []PerfResult{}
+
+// 	// mut c := 0
+
+// 	// for m in mirrors {
+// 	// 	c++
+// 	// 	ping := test_ping(m)
+// 	// 	println('Ping: ${ping} ms - ${mirrors.len} - ${c} ${m}')
+// 	// 	$dbg;
+// 	// }
+
+// 	// for m in mirrors {
+// 	// 	println('Speed: ${test_download_speed(m)} KB/s - ${m}')
+// 	// 	$dbg;
+// 	// 	speed := test_download_speed(m)
+// 	// 	if speed > 0 {
+// 	// 		ping := 0
+// 	// 		results << PerfResult{
+// 	// 			url:     m
+// 	// 			ping_ms: ping
+// 	// 			speed:   speed
+// 	// 		}
+// 	// 		println('✅ ${m} | ping: ${ping} ms | speed: ${speed:.2f} KB/s')
+// 	// 	} else {
+// 	// 		println('❌ ${m} skipped (unreachable or slow)')
+// 	// 	}
+// 	// 	$dbg;
+// 	// }
+
+// 	// println('\n🏆 Best mirrors:')
+// 	// results.sort_with_compare(fn (a &PerfResult, b &PerfResult) int {
+// 	// 	// Rank primarily by speed, secondarily by ping
+// 	// 	if a.speed > b.speed {
+// 	// 		return -1
+// 	// 	} else if a.speed < b.speed {
+// 	// 		return 1
+// 	// 	} else {
+// 	// 		return a.ping_ms - b.ping_ms
+// 	// 	}
+// 	// })
+
+// 	// for r in results[..results.len.min(10)] {
+// 	// 	println('${r.url} | ${r.ping_ms} ms | ${r.speed:.2f} KB/s')
+// 	// }
+
+// 	// println(results)
+// 	// $dbg;
+// }
+
+pub fn fix_mirrors() ! {
+	// Create wait group for servers
+	mut wg := sync.new_waitgroup()
+	wg.add(500)
+
+	ch := chan PerfResult{cap: 1000}
+
+	mut mirrors := ['http://ftp.mirror.tw/pub/ubuntu/ubuntu/']
+
+	// mirrors := fetch_mirrors() or {
+	// 	print_backtrace()
+	// 	eprintln(err)
+	// 	return
+	// }
+	mut c := 0
+
+	mut result := []PerfResult{}
+
+	for m in mirrors {
+		c++
+		println('Start background ping - ${mirrors.len} - ${c} ${m} - Queue len: ${ch.len} / ${ch.cap}')
+
+		l := ch.len // number of elements in queue
+		for l > ch.cap - 2 { // if queue is full, wait
+			println('Queue full, wait till some are done')
+			time.sleep(1 * time.second)
+		}
+		spawn test_ping(m, mut wg, ch)
+	}
+
+	for {
+		value := <-ch or { // receive/pop values from the channel
+			println('Channel closed')
+			break
+		}
+		println('Received: ${value}')
+	}
+
+	println('All pings done 1')
+
+	wg.wait()
+
+	println('All pings done')
+}
diff --git a/lib/schemas/jsonrpc/client.v b/lib/schemas/jsonrpc/client.v
index 0c5093dc..639cb412 100644
--- a/lib/schemas/jsonrpc/client.v
+++ b/lib/schemas/jsonrpc/client.v
@@ -94,6 +94,7 @@ pub fn (mut c Client) send[T, D](request RequestGeneric[T], params SendParams) !
 		myerror := response.error_ or {
 			return error('Failed to get error from response:\nRequest: ${request.encode()}\nResponse: ${response_json}\n${err}')
 		}
+
 		// print_backtrace()
 		mut myreq := request.encode()
 		if c.transport is UnixSocketTransport {
diff --git a/lib/schemas/jsonrpc/transport_unixsocket.v b/lib/schemas/jsonrpc/transport_unixsocket.v
index c8f82fdc..55a6d994 100644
--- a/lib/schemas/jsonrpc/transport_unixsocket.v
+++ b/lib/schemas/jsonrpc/transport_unixsocket.v
@@ -78,11 +78,10 @@ pub fn (mut t UnixSocketTransport) send(request string, params SendParams) !stri
 		// Append the newly read data to the total response
 		res_total << res[..n]
 
-		//here we need to check we are at end
+		// here we need to check we are at end
 		if res.bytestr().contains('\n') {
 			break
 		}
-
 	}
 	unix.shutdown(socket.sock.handle)
 	socket.close() or {}
diff --git a/lib/schemas/openrpc/decode.v b/lib/schemas/openrpc/decode.v
index 820037e9..7c627b97 100644
--- a/lib/schemas/openrpc/decode.v
+++ b/lib/schemas/openrpc/decode.v
@@ -6,7 +6,7 @@ import freeflowuniverse.herolib.schemas.jsonschema { Reference, decode_schemaref
 
 pub fn decode_json_any(data string) !Any {
 	// mut o:=decode(data)!
-	return json2.decode[json2.Any](data)!
+	return json2.decode[Any](data)!
 }
 
 pub fn decode_json_string(data string) !string {
@@ -14,8 +14,6 @@ pub fn decode_json_string(data string) !string {
 	return json.encode(o)	
 }
 
-
-
 pub fn decode(data string) !OpenRPC {
 	// mut object := json.decode[OpenRPC](data) or { return error('Failed to decode json\n=======\n${data}\n===========\n${err}') }
 	mut object := json.decode(OpenRPC, data) or {
diff --git a/lib/schemas/openrpc/server/comment.v b/lib/schemas/openrpc/server/comment.v
index 3d55c30d..73adbde5 100644
--- a/lib/schemas/openrpc/server/comment.v
+++ b/lib/schemas/openrpc/server/comment.v
@@ -3,117 +3,115 @@ module openrpcserver
 import freeflowuniverse.herolib.data.encoder
 import freeflowuniverse.herolib.data.ourtime
 
-
 @[heap]
 pub struct Comment {
 pub mut:
-    id           u32
-    comment         string
-    parent u32 //id of parent comment if any, 0 means none
-    updated_at   i64
-    author      u32 //links to user
+	id         u32
+	comment    string
+	parent     u32 // id of parent comment if any, 0 means none
+	updated_at i64
+	author     u32 // links to user
 }
 
 pub fn (self Comment) type_name() string {
-    return 'comments'
+	return 'comments'
 }
 
 pub fn (self Comment) load(data []u8) !Comment {
-    return comment_load(data)!
+	return comment_load(data)!
 }
 
-pub fn (self Comment) dump() ![]u8{
-    // Create a new encoder
-    mut e := encoder.new()
-    e.add_u8(1)
-    e.add_u32(self.id)
-    e.add_string(self.comment)
-    e.add_u32(self.parent)
-    e.add_i64(self.updated_at)
-    e.add_u32(self.author)
-    return e.data
+pub fn (self Comment) dump() ![]u8 {
+	// Create a new encoder
+	mut e := encoder.new()
+	e.add_u8(1)
+	e.add_u32(self.id)
+	e.add_string(self.comment)
+	e.add_u32(self.parent)
+	e.add_i64(self.updated_at)
+	e.add_u32(self.author)
+	return e.data
 }
 
-
-pub fn comment_load(data []u8) !Comment{
-    // Create a new decoder
-    mut e := encoder.decoder_new(data)
-    version := e.get_u8()!
-    if version != 1 {
-        panic("wrong version in comment load")
-    }
-    mut comment := Comment{}
-    comment.id = e.get_u32()!
-    comment.comment = e.get_string()!
-    comment.parent = e.get_u32()!
-    comment.updated_at = e.get_i64()!
-    comment.author = e.get_u32()!
-    return comment
+pub fn comment_load(data []u8) !Comment {
+	// Create a new decoder
+	mut e := encoder.decoder_new(data)
+	version := e.get_u8()!
+	if version != 1 {
+		panic('wrong version in comment load')
+	}
+	mut comment := Comment{}
+	comment.id = e.get_u32()!
+	comment.comment = e.get_string()!
+	comment.parent = e.get_u32()!
+	comment.updated_at = e.get_i64()!
+	comment.author = e.get_u32()!
+	return comment
 }
 
-
 pub struct CommentArg {
 pub mut:
-    comment string
-    parent u32
-    author u32
+	comment string
+	parent  u32
+	author  u32
 }
 
 pub fn comment_multiset(args []CommentArg) ![]u32 {
-    return comments2ids(args)!
+	return comments2ids(args)!
 }
 
 pub fn comments2ids(args []CommentArg) ![]u32 {
-    return args.map(comment2id(it.comment)!)
+	return args.map(comment2id(it.comment)!)
 }
 
 pub fn comment2id(comment string) !u32 {
-    comment_fixed := comment.to_lower_ascii().trim_space()
-    mut redis := redisclient.core_get()!
-    return if comment_fixed.len > 0{
-        hash := md5.hexhash(comment_fixed)
-        comment_found := redis.hget("db:comments", hash)!
-        if comment_found == ""{            
-            id := u32(redis.incr("db:comments:id")!)
-            redis.hset("db:comments", hash, id.str())!
-            redis.hset("db:comments", id.str(), comment_fixed)!
-            id
-        }else{
-            comment_found.u32()
-        }
-    } else { 0 }
+	comment_fixed := comment.to_lower_ascii().trim_space()
+	mut redis := redisclient.core_get()!
+	return if comment_fixed.len > 0 {
+		hash := md5.hexhash(comment_fixed)
+		comment_found := redis.hget('db:comments', hash)!
+		if comment_found == '' {
+			id := u32(redis.incr('db:comments:id')!)
+			redis.hset('db:comments', hash, id.str())!
+			redis.hset('db:comments', id.str(), comment_fixed)!
+			id
+		} else {
+			comment_found.u32()
+		}
+	} else {
+		0
+	}
 }
 
-
-//get new comment, not from the DB
-pub fn comment_new(args CommentArg) !Comment{
-    mut o := Comment {
-        comment: args.comment
-        parent: args.parent
-        updated_at: ourtime.now().unix()
-        author: args.author
-    }
-    return o
+// get new comment, not from the DB
+pub fn comment_new(args CommentArg) !Comment {
+	mut o := Comment{
+		comment:    args.comment
+		parent:     args.parent
+		updated_at: ourtime.now().unix()
+		author:     args.author
+	}
+	return o
 }
 
-pub fn comment_multiset(args []CommentArg) ![]u32{
-    mut ids := []u32{}
-    for comment in args {
-        ids << comment_set(comment)!
-    }
-    return ids
+pub fn comment_multiset(args []CommentArg) ![]u32 {
+	mut ids := []u32{}
+	for comment in args {
+		ids << comment_set(comment)!
+	}
+	return ids
 }
 
-pub fn comment_set(args CommentArg) !u32{
-    mut o := comment_new(args)!
-    // Use openrpcserver set function which now returns the ID
-    return openrpcserver.set[Comment](mut o)!
+pub fn comment_set(args CommentArg) !u32 {
+	mut o := comment_new(args)!
+	// Use openrpcserver set function which now returns the ID
+	return set[Comment](mut o)!
 }
 
-pub fn comment_exist(id u32) !bool{
-    return openrpcserver.exists[Comment](id)!
+pub fn comment_exist(id u32) !bool {
+	return exists[Comment](id)!
 }
 
-pub fn comment_get(id u32) !Comment{
-    return openrpcserver.get[Comment](id)!
+pub fn comment_get(id u32) !Comment {
+	return get[Comment](id)!
 }
diff --git a/lib/schemas/openrpc/server/core_methods.v b/lib/schemas/openrpc/server/core_methods.v
index 6688c8a3..6709c347 100644
--- a/lib/schemas/openrpc/server/core_methods.v
+++ b/lib/schemas/openrpc/server/core_methods.v
@@ -3,55 +3,57 @@ module openrpcserver
 import freeflowuniverse.herolib.core.redisclient
 
 pub fn set[T](mut obj T) !u32 {
-    name := T{}.type_name()
-    mut redis := redisclient.core_get()!
-    
-    // Generate ID if not set
-    if obj.id == 0 {
-        myid := redis.incr("db:${name}:id")!
-        obj.id = u32(myid)
-    }
-    
-    data := obj.dump()!
-    redis.hset("db:${name}",obj.id.str(),data.bytestr())!
-    return obj.id
+	name := T{}.type_name()
+	mut redis := redisclient.core_get()!
+
+	// Generate ID if not set
+	if obj.id == 0 {
+		myid := redis.incr('db:${name}:id')!
+		obj.id = u32(myid)
+	}
+
+	data := obj.dump()!
+	redis.hset('db:${name}', obj.id.str(), data.bytestr())!
+	return obj.id
 }
 
 pub fn get[T](id u32) !T {
-    name := T{}.type_name()
-    mut redis := redisclient.core_get()!
-    data := redis.hget("db:${name}",id.str())!
-    if data.len > 0 {
-        return T{}.load(data.bytes())!
-    } else {
-        return error("Can't find ${name} with id: ${id}")
-    }
+	name := T{}.type_name()
+	mut redis := redisclient.core_get()!
+	data := redis.hget('db:${name}', id.str())!
+	if data.len > 0 {
+		return T{}.load(data.bytes())!
+	} else {
+		return error("Can't find ${name} with id: ${id}")
+	}
 }
 
 pub fn exists[T](id u32) !bool {
-    name := T{}.type_name()
-    mut redis := redisclient.core_get()!
-    return redis.hexists("db:${name}",id.str())!
+	name := T{}.type_name()
+	mut redis := redisclient.core_get()!
+	return redis.hexists('db:${name}', id.str())!
 }
 
 pub fn delete[T](id u32) ! {
-    name := T{}.type_name()
-    mut redis := redisclient.core_get()!
-    redis.hdel("db:${name}", id.str())!
+	name := T{}.type_name()
+	mut redis := redisclient.core_get()!
+	redis.hdel('db:${name}', id.str())!
 }
 
 pub fn list[T]() ![]T {
-    name := T{}.type_name()
-    mut redis := redisclient.core_get()!
-    all_data := redis.hgetall("db:${name}")!
-    mut result := []T{}
-    for _, data in all_data {
-        result << T{}.load(data.bytes())!
-    }
-    return result
+	name := T{}.type_name()
+	mut redis := redisclient.core_get()!
+	all_data := redis.hgetall('db:${name}')!
+	mut result := []T{}
+	for _, data in all_data {
+		result << T{}.load(data.bytes())!
+	}
+	return result
 }
 
-//make it easy to get a base object
+// make it easy to get a base object
 pub fn new_from_base[T](args BaseArgs) !Base {
-    return T { Base: new_base(args)! }
-}
\ No newline at end of file
+	return T{
+		Base: new_base(args)!
+	}
+}
diff --git a/lib/schemas/openrpc/server/core_models.v b/lib/schemas/openrpc/server/core_models.v
index ea51a2bb..8ce68fda 100644
--- a/lib/schemas/openrpc/server/core_models.v
+++ b/lib/schemas/openrpc/server/core_models.v
@@ -1,7 +1,6 @@
 module openrpcserver
 
 import crypto.md5
-
 import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.data.ourtime
 
@@ -9,85 +8,83 @@ import freeflowuniverse.herolib.data.ourtime
 @[heap]
 pub struct Base {
 pub mut:
-    id           u32
-    name         string
-    description  string
-    created_at   i64
-    updated_at   i64
-    securitypolicy u32
-    tags         u32 //when we set/get we always do as []string but this can then be sorted and md5ed this gies the unique id of tags
-    comments     []u32
+	id             u32
+	name           string
+	description    string
+	created_at     i64
+	updated_at     i64
+	securitypolicy u32
+	tags           u32 // when we set/get we always do as []string but this can then be sorted and md5ed this gies the unique id of tags
+	comments       []u32
 }
- 
+
 @[heap]
 pub struct SecurityPolicy {
 pub mut:
-    id           u32
-    read      []u32 //links to users & groups
-    write     []u32 //links to users & groups
-    delete    []u32 //links to users & groups
-    public bool
-    md5 string //this sorts read, write and delete u32 + hash, then do md5 hash, this allows to go from a random read/write/delete/public config to a hash
+	id     u32
+	read   []u32 // links to users & groups
+	write  []u32 // links to users & groups
+	delete []u32 // links to users & groups
+	public bool
+	md5    string // this sorts read, write and delete u32 + hash, then do md5 hash, this allows to go from a random read/write/delete/public config to a hash
 }
 
-
 @[heap]
 pub struct Tags {
 pub mut:
-    id           u32
-    names       []string //unique per id
-    md5         string //of sorted names, to make easy to find unique id, each name lowercased and made ascii
+	id    u32
+	names []string // unique per id
+	md5   string   // of sorted names, to make easy to find unique id, each name lowercased and made ascii
 }
-    
 
 /////////////////
 
 @[params]
 pub struct BaseArgs {
 pub mut:
-    id           ?u32
-    name         string
-    description  string
-    securitypolicy ?u32
-    tags         []string
-    comments []CommentArg
+	id             ?u32
+	name           string
+	description    string
+	securitypolicy ?u32
+	tags           []string
+	comments       []CommentArg
 }
 
-//make it easy to get a base object
+// make it easy to get a base object
 pub fn new_base(args BaseArgs) !Base {
-    mut redis := redisclient.core_get()!
+	mut redis := redisclient.core_get()!
 
-    commentids:=comment_multiset(args.comments)!
-    tags:=tags2id(args.tags)!
+	commentids := comment_multiset(args.comments)!
+	tags := tags2id(args.tags)!
 
-    return Base {
-        id: args.id or { 0 }
-        name: args.name
-        description: args.description
-        created_at: ourtime.now().unix()
-        updated_at: ourtime.now().unix()
-        securitypolicy: args.securitypolicy or { 0 }
-        tags: tags
-        comments: commentids
-    }
+	return Base{
+		id:             args.id or { 0 }
+		name:           args.name
+		description:    args.description
+		created_at:     ourtime.now().unix()
+		updated_at:     ourtime.now().unix()
+		securitypolicy: args.securitypolicy or { 0 }
+		tags:           tags
+		comments:       commentids
+	}
 }
 
 pub fn tags2id(tags []string) !u32 {
-    mut redis := redisclient.core_get()!
-    return if tags.len>0{
-        mut tags_fixed := tags.map(it.to_lower_ascii().trim_space()).filter(it != "")
-        tags_fixed.sort_ignore_case() 
-        hash :=md5.hexhash(tags_fixed.join(","))
-        tags_found := redis.hget("db:tags", hash)!
-        return if tags_found == ""{            
-            id := u32(redis.incr("db:tags:id")!)
-            redis.hset("db:tags", hash, id.str())!
-            redis.hset("db:tags", id.str(), tags_fixed.join(","))!
-            id
-        }else{
-            tags_found.u32()
-        }
-    } else {
-        0
-    }
+	mut redis := redisclient.core_get()!
+	return if tags.len > 0 {
+		mut tags_fixed := tags.map(it.to_lower_ascii().trim_space()).filter(it != '')
+		tags_fixed.sort_ignore_case()
+		hash := md5.hexhash(tags_fixed.join(','))
+		tags_found := redis.hget('db:tags', hash)!
+		return if tags_found == '' {
+			id := u32(redis.incr('db:tags:id')!)
+			redis.hset('db:tags', hash, id.str())!
+			redis.hset('db:tags', id.str(), tags_fixed.join(','))!
+			id
+		} else {
+			tags_found.u32()
+		}
+	} else {
+		0
+	}
 }
diff --git a/lib/threefold/models/business/company.v b/lib/threefold/models/business/company.v
index d59a29d4..ca420b0b 100644
--- a/lib/threefold/models/business/company.v
+++ b/lib/threefold/models/business/company.v
@@ -41,21 +41,21 @@ pub mut:
 // new creates a new Company with default values
 pub fn Company.new() Company {
 	return Company{
-		id: 0
-		name: ''
+		id:                  0
+		name:                ''
 		registration_number: ''
-		incorporation_date: 0
-		fiscal_year_end: ''
-		email: ''
-		phone: ''
-		website: ''
-		address: ''
-		business_type: .single
-		industry: ''
-		description: ''
-		status: .pending_payment
-		created_at: 0
-		updated_at: 0
+		incorporation_date:  0
+		fiscal_year_end:     ''
+		email:               ''
+		phone:               ''
+		website:             ''
+		address:             ''
+		business_type:       .single
+		industry:            ''
+		description:         ''
+		status:              .pending_payment
+		created_at:          0
+		updated_at:          0
 	}
 }
 
@@ -185,4 +185,4 @@ pub fn (c Company) status_string() string {
 		.suspended { 'Suspended' }
 		.inactive { 'Inactive' }
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/business/payment.v b/lib/threefold/models/business/payment.v
index 0f39aad8..1b134e7e 100644
--- a/lib/threefold/models/business/payment.v
+++ b/lib/threefold/models/business/payment.v
@@ -34,19 +34,19 @@ pub mut:
 pub fn Payment.new(payment_intent_id string, company_id u32, payment_plan string, setup_fee f64, monthly_fee f64, total_amount f64) Payment {
 	now := time.now().unix_time()
 	return Payment{
-		id: 0
-		payment_intent_id: payment_intent_id
-		company_id: company_id
-		payment_plan: payment_plan
-		setup_fee: setup_fee
-		monthly_fee: monthly_fee
-		total_amount: total_amount
-		currency: 'usd'
-		status: .pending
+		id:                 0
+		payment_intent_id:  payment_intent_id
+		company_id:         company_id
+		payment_plan:       payment_plan
+		setup_fee:          setup_fee
+		monthly_fee:        monthly_fee
+		total_amount:       total_amount
+		currency:           'usd'
+		status:             .pending
 		stripe_customer_id: none
-		created_at: now
-		completed_at: none
-		updated_at: u64(now)
+		created_at:         now
+		completed_at:       none
+		updated_at:         u64(now)
 	}
 }
 
@@ -195,4 +195,4 @@ pub fn (p Payment) is_yearly_plan() bool {
 // is_two_year_plan checks if this is a two-year payment plan
 pub fn (p Payment) is_two_year_plan() bool {
 	return p.payment_plan == 'two_year'
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/business/product.v b/lib/threefold/models/business/product.v
index b03249af..f69da89d 100644
--- a/lib/threefold/models/business/product.v
+++ b/lib/threefold/models/business/product.v
@@ -23,9 +23,9 @@ pub mut:
 // new creates a new ProductComponent with default values
 pub fn ProductComponent.new() ProductComponent {
 	return ProductComponent{
-		name: ''
+		name:        ''
 		description: ''
-		quantity: 1
+		quantity:    1
 	}
 }
 
@@ -51,37 +51,37 @@ pub fn (mut pc ProductComponent) quantity(quantity u32) ProductComponent {
 @[heap]
 pub struct Product {
 pub mut:
-	id            u32                 // Unique product ID
-	name          string              // Product name
-	description   string              // Product description
-	price         f64                 // Product price
-	type_         ProductType         // Product type (product or service)
-	category      string              // Product category
-	status        ProductStatus       // Product status
-	max_amount    u16                 // Maximum amount available
-	purchase_till i64                 // Purchase deadline timestamp
-	active_till   i64                 // Active until timestamp
-	components    []ProductComponent  // Product components
-	created_at    u64                 // Creation timestamp
-	updated_at    u64                 // Last update timestamp
+	id            u32                // Unique product ID
+	name          string             // Product name
+	description   string             // Product description
+	price         f64                // Product price
+	type_         ProductType        // Product type (product or service)
+	category      string             // Product category
+	status        ProductStatus      // Product status
+	max_amount    u16                // Maximum amount available
+	purchase_till i64                // Purchase deadline timestamp
+	active_till   i64                // Active until timestamp
+	components    []ProductComponent // Product components
+	created_at    u64                // Creation timestamp
+	updated_at    u64                // Last update timestamp
 }
 
 // new creates a new Product with default values
 pub fn Product.new() Product {
 	return Product{
-		id: 0
-		name: ''
-		description: ''
-		price: 0.0
-		type_: .product
-		category: ''
-		status: .available
-		max_amount: 0
+		id:            0
+		name:          ''
+		description:   ''
+		price:         0.0
+		type_:         .product
+		category:      ''
+		status:        .available
+		max_amount:    0
 		purchase_till: 0
-		active_till: 0
-		components: []
-		created_at: 0
-		updated_at: 0
+		active_till:   0
+		components:    []
+		created_at:    0
+		updated_at:    0
 	}
 }
 
@@ -209,4 +209,4 @@ pub fn (p Product) status_string() string {
 		.available { 'Available' }
 		.unavailable { 'Unavailable' }
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/business/sale.v b/lib/threefold/models/business/sale.v
index bc03980c..9de8fd43 100644
--- a/lib/threefold/models/business/sale.v
+++ b/lib/threefold/models/business/sale.v
@@ -10,22 +10,22 @@ pub enum SaleStatus {
 // SaleItem represents an individual item within a Sale
 pub struct SaleItem {
 pub mut:
-	product_id             u32     // Product ID
-	name                   string  // Denormalized product name at time of sale
-	quantity               i32     // Quantity purchased
-	unit_price             f64     // Price per unit at time of sale
-	subtotal               f64     // Subtotal for this item
-	service_active_until   ?i64    // Optional: For services, date until this specific purchased instance is active
+	product_id           u32    // Product ID
+	name                 string // Denormalized product name at time of sale
+	quantity             i32    // Quantity purchased
+	unit_price           f64    // Price per unit at time of sale
+	subtotal             f64    // Subtotal for this item
+	service_active_until ?i64   // Optional: For services, date until this specific purchased instance is active
 }
 
 // new creates a new SaleItem with default values
 pub fn SaleItem.new() SaleItem {
 	return SaleItem{
-		product_id: 0
-		name: ''
-		quantity: 0
-		unit_price: 0.0
-		subtotal: 0.0
+		product_id:           0
+		name:                 ''
+		quantity:             0
+		unit_price:           0.0
+		subtotal:             0.0
 		service_active_until: none
 	}
 }
@@ -91,17 +91,17 @@ pub mut:
 // new creates a new Sale with default values
 pub fn Sale.new() Sale {
 	return Sale{
-		id: 0
-		company_id: 0
-		buyer_id: 0
+		id:             0
+		company_id:     0
+		buyer_id:       0
 		transaction_id: 0
-		total_amount: 0.0
-		status: .pending
-		sale_date: 0
-		items: []
-		notes: ''
-		created_at: 0
-		updated_at: 0
+		total_amount:   0.0
+		status:         .pending
+		sale_date:      0
+		items:          []
+		notes:          ''
+		created_at:     0
+		updated_at:     0
 	}
 }
 
@@ -219,4 +219,4 @@ pub fn (s Sale) status_string() string {
 		.completed { 'Completed' }
 		.cancelled { 'Cancelled' }
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/core/comment.v b/lib/threefold/models/core/comment.v
index a52321e4..a0618777 100644
--- a/lib/threefold/models/core/comment.v
+++ b/lib/threefold/models/core/comment.v
@@ -16,12 +16,12 @@ pub mut:
 // new creates a new Comment with default values
 pub fn Comment.new() Comment {
 	return Comment{
-		id: 0
-		user_id: 0
-		content: ''
+		id:                0
+		user_id:           0
+		content:           ''
 		parent_comment_id: none
-		created_at: 0
-		updated_at: 0
+		created_at:        0
+		updated_at:        0
 	}
 }
 
@@ -51,4 +51,4 @@ pub fn (c Comment) is_top_level() bool {
 // is_reply returns true if this is a reply to another comment
 pub fn (c Comment) is_reply() bool {
 	return c.parent_comment_id != none
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/finance/account.v b/lib/threefold/models/finance/account.v
index 7cbda12e..ff35381c 100644
--- a/lib/threefold/models/finance/account.v
+++ b/lib/threefold/models/finance/account.v
@@ -4,31 +4,31 @@ module finance
 @[heap]
 pub struct Account {
 pub mut:
-	id          u32      // Unique account ID
-	name        string   // Internal name of the account for the user
-	user_id     u32      // User ID of the owner of the account
-	description string   // Optional description of the account
-	ledger      string   // Describes the ledger/blockchain where the account is located
-	address     string   // Address of the account on the blockchain
-	pubkey      string   // Public key
-	assets      []u32    // List of asset IDs in this account
-	created_at  u64      // Creation timestamp
-	updated_at  u64      // Last update timestamp
+	id          u32    // Unique account ID
+	name        string // Internal name of the account for the user
+	user_id     u32    // User ID of the owner of the account
+	description string // Optional description of the account
+	ledger      string // Describes the ledger/blockchain where the account is located
+	address     string // Address of the account on the blockchain
+	pubkey      string // Public key
+	assets      []u32  // List of asset IDs in this account
+	created_at  u64    // Creation timestamp
+	updated_at  u64    // Last update timestamp
 }
 
 // new creates a new Account with default values
 pub fn Account.new() Account {
 	return Account{
-		id: 0
-		name: ''
-		user_id: 0
+		id:          0
+		name:        ''
+		user_id:     0
 		description: ''
-		ledger: ''
-		address: ''
-		pubkey: ''
-		assets: []
-		created_at: 0
-		updated_at: 0
+		ledger:      ''
+		address:     ''
+		pubkey:      ''
+		assets:      []
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -94,4 +94,4 @@ pub fn (a Account) has_asset(asset_id u32) bool {
 // remove_asset removes an asset from the account
 pub fn (mut a Account) remove_asset(asset_id u32) {
 	a.assets = a.assets.filter(it != asset_id)
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/finance/asset.v b/lib/threefold/models/finance/asset.v
index 05c7e700..d3cb0eee 100644
--- a/lib/threefold/models/finance/asset.v
+++ b/lib/threefold/models/finance/asset.v
@@ -26,15 +26,15 @@ pub mut:
 // new creates a new Asset with default values
 pub fn Asset.new() Asset {
 	return Asset{
-		id: 0
-		name: ''
+		id:          0
+		name:        ''
 		description: ''
-		amount: 0.0
-		address: ''
-		asset_type: .native
-		decimals: 18
-		created_at: 0
-		updated_at: 0
+		amount:      0.0
+		address:     ''
+		asset_type:  .native
+		decimals:    18
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -81,7 +81,31 @@ pub fn (a Asset) formatted_amount() string {
 		factor *= 10
 	}
 	formatted_amount := (a.amount * factor).round() / factor
-	return '${formatted_amount:.${a.decimals}f}'
+	// Format with the specified number of decimal places
+	if a.decimals == 0 {
+		return '${formatted_amount:.0f}'
+	} else if a.decimals == 1 {
+		return '${formatted_amount:.1f}'
+	} else if a.decimals == 2 {
+		return '${formatted_amount:.2f}'
+	} else if a.decimals == 3 {
+		return '${formatted_amount:.3f}'
+	} else if a.decimals == 4 {
+		return '${formatted_amount:.4f}'
+	} else {
+		// For more than 4 decimals, use string manipulation
+		str_amount := formatted_amount.str()
+		if str_amount.contains('.') {
+			parts := str_amount.split('.')
+			if parts.len == 2 {
+				decimal_part := parts[1]
+				if decimal_part.len > a.decimals {
+					return '${parts[0]}.${decimal_part[..a.decimals]}'
+				}
+			}
+		}
+		return str_amount
+	}
 }
 
 // transfer_to transfers amount to another asset
@@ -96,4 +120,4 @@ pub fn (mut a Asset) transfer_to(mut target Asset, amount f64) ! {
 
 	a.amount -= amount
 	target.amount += amount
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/finance/marketplace.v b/lib/threefold/models/finance/marketplace.v
index c1de5c8f..b8c2c0a7 100644
--- a/lib/threefold/models/finance/marketplace.v
+++ b/lib/threefold/models/finance/marketplace.v
@@ -40,10 +40,10 @@ pub mut:
 pub fn Bid.new() Bid {
 	return Bid{
 		listing_id: ''
-		bidder_id: 0
-		amount: 0.0
-		currency: ''
-		status: .active
+		bidder_id:  0
+		amount:     0.0
+		currency:   ''
+		status:     .active
 		created_at: u64(time.now().unix_time())
 	}
 }
@@ -82,50 +82,50 @@ pub fn (mut b Bid) status(status BidStatus) Bid {
 @[heap]
 pub struct Listing {
 pub mut:
-	id          u32           // Unique listing ID
-	title       string        // Title of the listing
-	description string        // Description of the listing
-	asset_id    string        // ID of the asset being listed
-	asset_type  AssetType     // Type of the asset
-	seller_id   string        // ID of the user selling the asset
-	price       f64           // Initial price for fixed price, or starting price for auction
-	currency    string        // Currency of the listing
-	listing_type ListingType  // Type of listing (fixed_price, auction, exchange)
-	status      ListingStatus // Status of the listing
-	expires_at  ?u64          // Optional expiration date
-	sold_at     ?u64          // Optional date when the item was sold
-	buyer_id    ?string       // Optional buyer ID
-	sale_price  ?f64          // Optional final sale price
-	bids        []Bid         // List of bids for auction type listings
-	tags        []string      // Tags for the listing
-	image_url   ?string       // Optional image URL
-	created_at  u64           // Creation timestamp
-	updated_at  u64           // Last update timestamp
+	id           u32           // Unique listing ID
+	title        string        // Title of the listing
+	description  string        // Description of the listing
+	asset_id     string        // ID of the asset being listed
+	asset_type   AssetType     // Type of the asset
+	seller_id    string        // ID of the user selling the asset
+	price        f64           // Initial price for fixed price, or starting price for auction
+	currency     string        // Currency of the listing
+	listing_type ListingType   // Type of listing (fixed_price, auction, exchange)
+	status       ListingStatus // Status of the listing
+	expires_at   ?u64          // Optional expiration date
+	sold_at      ?u64          // Optional date when the item was sold
+	buyer_id     ?string       // Optional buyer ID
+	sale_price   ?f64          // Optional final sale price
+	bids         []Bid         // List of bids for auction type listings
+	tags         []string      // Tags for the listing
+	image_url    ?string       // Optional image URL
+	created_at   u64           // Creation timestamp
+	updated_at   u64           // Last update timestamp
 }
 
 // new creates a new Listing with default values
 pub fn Listing.new() Listing {
 	now := u64(time.now().unix_time())
 	return Listing{
-		id: 0
-		title: ''
-		description: ''
-		asset_id: ''
-		asset_type: .native
-		seller_id: ''
-		price: 0.0
-		currency: ''
+		id:           0
+		title:        ''
+		description:  ''
+		asset_id:     ''
+		asset_type:   .native
+		seller_id:    ''
+		price:        0.0
+		currency:     ''
 		listing_type: .fixed_price
-		status: .active
-		expires_at: none
-		sold_at: none
-		buyer_id: none
-		sale_price: none
-		bids: []
-		tags: []
-		image_url: none
-		created_at: now
-		updated_at: now
+		status:       .active
+		expires_at:   none
+		sold_at:      none
+		buyer_id:     none
+		sale_price:   none
+		bids:         []
+		tags:         []
+		image_url:    none
+		created_at:   now
+		updated_at:   now
 	}
 }
 
@@ -336,4 +336,4 @@ pub fn (mut l Listing) check_expiration() {
 pub fn (mut l Listing) add_tag(tag string) Listing {
 	l.tags << tag
 	return l
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/flow/flow.v b/lib/threefold/models/flow/flow.v
index 84c75bf0..8b9ea88a 100644
--- a/lib/threefold/models/flow/flow.v
+++ b/lib/threefold/models/flow/flow.v
@@ -4,13 +4,13 @@ module flow
 @[heap]
 pub struct Flow {
 pub mut:
-	id        u32        // Unique flow ID
-	flow_uuid string     // A unique UUID for the flow, for external reference
-	name      string     // Name of the flow
-	status    string     // Current status of the flow (e.g., "Pending", "InProgress", "Completed", "Failed")
-	steps     []FlowStep // Steps involved in this flow
-	created_at u64       // Creation timestamp
-	updated_at u64       // Last update timestamp
+	id         u32        // Unique flow ID
+	flow_uuid  string     // A unique UUID for the flow, for external reference
+	name       string     // Name of the flow
+	status     string     // Current status of the flow (e.g., "Pending", "InProgress", "Completed", "Failed")
+	steps      []FlowStep // Steps involved in this flow
+	created_at u64        // Creation timestamp
+	updated_at u64        // Last update timestamp
 }
 
 // new creates a new Flow
@@ -18,11 +18,11 @@ pub mut:
 // The ID is managed by the database
 pub fn Flow.new(flow_uuid string) Flow {
 	return Flow{
-		id: 0
-		flow_uuid: flow_uuid
-		name: ''
-		status: 'Pending'
-		steps: []
+		id:         0
+		flow_uuid:  flow_uuid
+		name:       ''
+		status:     'Pending'
+		steps:      []
 		created_at: 0
 		updated_at: 0
 	}
@@ -71,7 +71,7 @@ pub fn (f Flow) is_completed() bool {
 	if f.steps.len == 0 {
 		return false
 	}
-	
+
 	for step in f.steps {
 		if step.status != 'Completed' {
 			return false
@@ -84,11 +84,11 @@ pub fn (f Flow) is_completed() bool {
 pub fn (f Flow) get_next_step() ?FlowStep {
 	mut sorted_steps := f.steps.clone()
 	sorted_steps.sort(a.step_order < b.step_order)
-	
+
 	for step in sorted_steps {
 		if step.status == 'Pending' {
 			return step
 		}
 	}
 	return none
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/flow/flow_step.v b/lib/threefold/models/flow/flow_step.v
index f52d6045..31466dad 100644
--- a/lib/threefold/models/flow/flow_step.v
+++ b/lib/threefold/models/flow/flow_step.v
@@ -15,12 +15,12 @@ pub mut:
 // new creates a new flow step
 pub fn FlowStep.new(step_order u32) FlowStep {
 	return FlowStep{
-		id: 0
+		id:          0
 		description: none
-		step_order: step_order
-		status: 'Pending'
-		created_at: 0
-		updated_at: 0
+		step_order:  step_order
+		status:      'Pending'
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -74,4 +74,4 @@ pub fn (mut fs FlowStep) fail() {
 // reset resets the step to pending status
 pub fn (mut fs FlowStep) reset() {
 	fs.status = 'Pending'
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/flow/signature_requirement.v b/lib/threefold/models/flow/signature_requirement.v
index c9b90a28..8ab6e654 100644
--- a/lib/threefold/models/flow/signature_requirement.v
+++ b/lib/threefold/models/flow/signature_requirement.v
@@ -18,15 +18,15 @@ pub mut:
 // new creates a new signature requirement
 pub fn SignatureRequirement.new(flow_step_id u32, public_key string, message string) SignatureRequirement {
 	return SignatureRequirement{
-		id: 0
+		id:           0
 		flow_step_id: flow_step_id
-		public_key: public_key
-		message: message
-		signed_by: none
-		signature: none
-		status: 'Pending'
-		created_at: 0
-		updated_at: 0
+		public_key:   public_key
+		message:      message
+		signed_by:    none
+		signature:    none
+		status:       'Pending'
+		created_at:   0
+		updated_at:   0
 	}
 }
 
@@ -112,4 +112,4 @@ pub fn (sr SignatureRequirement) validate_signature() bool {
 		}
 	}
 	return false
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/identity/kyc.v b/lib/threefold/models/identity/kyc.v
index 7789b96e..66b1b26b 100644
--- a/lib/threefold/models/identity/kyc.v
+++ b/lib/threefold/models/identity/kyc.v
@@ -3,45 +3,45 @@ module identity
 // IdenfyWebhookEvent represents an iDenfy webhook event structure
 pub struct IdenfyWebhookEvent {
 pub mut:
-	client_id       string                    // Client ID
-	scan_ref        string                    // Scan reference
-	status          string                    // Verification status
-	platform        string                    // Platform used
-	started_at      string                    // When verification started
-	finished_at     ?string                   // When verification finished (optional)
-	client_ip       ?string                   // Client IP address (optional)
-	client_location ?string                   // Client location (optional)
-	data            ?IdenfyVerificationData   // Verification data (optional)
+	client_id       string                  // Client ID
+	scan_ref        string                  // Scan reference
+	status          string                  // Verification status
+	platform        string                  // Platform used
+	started_at      string                  // When verification started
+	finished_at     ?string                 // When verification finished (optional)
+	client_ip       ?string                 // Client IP address (optional)
+	client_location ?string                 // Client location (optional)
+	data            ?IdenfyVerificationData // Verification data (optional)
 }
 
 // IdenfyVerificationData represents the verification data from iDenfy
 pub struct IdenfyVerificationData {
 pub mut:
-	doc_first_name         ?string // First name from document
-	doc_last_name          ?string // Last name from document
-	doc_number             ?string // Document number
-	doc_personal_code      ?string // Personal code from document
-	doc_expiry             ?string // Document expiry date
-	doc_dob                ?string // Date of birth from document
-	doc_type               ?string // Document type
-	doc_sex                ?string // Sex from document
-	doc_nationality        ?string // Nationality from document
-	doc_issuing_country    ?string // Document issuing country
-	manually_data_changed  ?bool   // Whether data was manually changed
+	doc_first_name        ?string // First name from document
+	doc_last_name         ?string // Last name from document
+	doc_number            ?string // Document number
+	doc_personal_code     ?string // Personal code from document
+	doc_expiry            ?string // Document expiry date
+	doc_dob               ?string // Date of birth from document
+	doc_type              ?string // Document type
+	doc_sex               ?string // Sex from document
+	doc_nationality       ?string // Nationality from document
+	doc_issuing_country   ?string // Document issuing country
+	manually_data_changed ?bool   // Whether data was manually changed
 }
 
 // new creates a new IdenfyWebhookEvent
 pub fn IdenfyWebhookEvent.new() IdenfyWebhookEvent {
 	return IdenfyWebhookEvent{
-		client_id: ''
-		scan_ref: ''
-		status: ''
-		platform: ''
-		started_at: ''
-		finished_at: none
-		client_ip: none
+		client_id:       ''
+		scan_ref:        ''
+		status:          ''
+		platform:        ''
+		started_at:      ''
+		finished_at:     none
+		client_ip:       none
 		client_location: none
-		data: none
+		data:            none
 	}
 }
 
@@ -102,16 +102,16 @@ pub fn (mut event IdenfyWebhookEvent) data(data ?IdenfyVerificationData) IdenfyW
 // new creates a new IdenfyVerificationData
 pub fn IdenfyVerificationData.new() IdenfyVerificationData {
 	return IdenfyVerificationData{
-		doc_first_name: none
-		doc_last_name: none
-		doc_number: none
-		doc_personal_code: none
-		doc_expiry: none
-		doc_dob: none
-		doc_type: none
-		doc_sex: none
-		doc_nationality: none
-		doc_issuing_country: none
+		doc_first_name:        none
+		doc_last_name:         none
+		doc_number:            none
+		doc_personal_code:     none
+		doc_expiry:            none
+		doc_dob:               none
+		doc_type:              none
+		doc_sex:               none
+		doc_nationality:       none
+		doc_issuing_country:   none
 		manually_data_changed: none
 	}
 }
@@ -220,4 +220,4 @@ pub fn (event IdenfyWebhookEvent) get_document_info() string {
 		return '${doc_type}: ${doc_number}'
 	}
 	return 'No document information'
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/legal/contract.v b/lib/threefold/models/legal/contract.v
index 047428fb..4fb881cb 100644
--- a/lib/threefold/models/legal/contract.v
+++ b/lib/threefold/models/legal/contract.v
@@ -32,11 +32,11 @@ pub mut:
 // new creates a new ContractRevision
 pub fn ContractRevision.new(version u32, content string, created_by string) ContractRevision {
 	return ContractRevision{
-		version: version
-		content: content
+		version:    version
+		content:    content
 		created_at: u64(time.now().unix_time())
 		created_by: created_by
-		comments: none
+		comments:   none
 	}
 }
 
@@ -49,27 +49,27 @@ pub fn (mut cr ContractRevision) comments(comments string) ContractRevision {
 // ContractSigner represents a party involved in signing a contract
 pub struct ContractSigner {
 pub mut:
-	id                           string       // Unique ID for the signer (UUID string)
-	name                         string       // Signer's name
-	email                        string       // Signer's email
-	status                       SignerStatus // Current status
-	signed_at                    ?u64         // When they signed (optional)
-	comments                     ?string      // Optional comments from signer
-	last_reminder_mail_sent_at   ?u64         // Last reminder timestamp
-	signature_data               ?string      // Base64 encoded signature image data
+	id                         string       // Unique ID for the signer (UUID string)
+	name                       string       // Signer's name
+	email                      string       // Signer's email
+	status                     SignerStatus // Current status
+	signed_at                  ?u64         // When they signed (optional)
+	comments                   ?string      // Optional comments from signer
+	last_reminder_mail_sent_at ?u64         // Last reminder timestamp
+	signature_data             ?string      // Base64 encoded signature image data
 }
 
 // new creates a new ContractSigner
 pub fn ContractSigner.new(id string, name string, email string) ContractSigner {
 	return ContractSigner{
-		id: id
-		name: name
-		email: email
-		status: .pending
-		signed_at: none
-		comments: none
+		id:                         id
+		name:                       name
+		email:                      email
+		status:                     .pending
+		signed_at:                  none
+		comments:                   none
 		last_reminder_mail_sent_at: none
-		signature_data: none
+		signature_data:             none
 	}
 }
 
@@ -139,48 +139,48 @@ pub fn (mut cs ContractSigner) sign(signature_data ?string, comments ?string) {
 @[heap]
 pub struct Contract {
 pub mut:
-	id                    u32                 // Unique contract ID
-	contract_id           string              // Unique UUID for the contract
-	title                 string              // Contract title
-	description           string              // Contract description
-	contract_type         string              // Type of contract
-	status                ContractStatus      // Current status
-	created_by            string              // Who created the contract
-	terms_and_conditions  string              // Terms and conditions text
-	start_date            ?u64                // Optional start date
-	end_date              ?u64                // Optional end date
-	renewal_period_days   ?i32                // Optional renewal period in days
-	next_renewal_date     ?u64                // Optional next renewal date
-	signers               []ContractSigner    // List of signers
-	revisions             []ContractRevision  // Contract revisions
-	current_version       u32                 // Current version number
-	last_signed_date      ?u64                // Last signing date
-	created_at            u64                 // Creation timestamp
-	updated_at            u64                 // Last update timestamp
+	id                   u32                // Unique contract ID
+	contract_id          string             // Unique UUID for the contract
+	title                string             // Contract title
+	description          string             // Contract description
+	contract_type        string             // Type of contract
+	status               ContractStatus     // Current status
+	created_by           string             // Who created the contract
+	terms_and_conditions string             // Terms and conditions text
+	start_date           ?u64               // Optional start date
+	end_date             ?u64               // Optional end date
+	renewal_period_days  ?i32               // Optional renewal period in days
+	next_renewal_date    ?u64               // Optional next renewal date
+	signers              []ContractSigner   // List of signers
+	revisions            []ContractRevision // Contract revisions
+	current_version      u32                // Current version number
+	last_signed_date     ?u64               // Last signing date
+	created_at           u64                // Creation timestamp
+	updated_at           u64                // Last update timestamp
 }
 
 // new creates a new Contract
 pub fn Contract.new(contract_id string) Contract {
 	now := u64(time.now().unix_time())
 	return Contract{
-		id: 0
-		contract_id: contract_id
-		title: ''
-		description: ''
-		contract_type: ''
-		status: .draft
-		created_by: ''
+		id:                   0
+		contract_id:          contract_id
+		title:                ''
+		description:          ''
+		contract_type:        ''
+		status:               .draft
+		created_by:           ''
 		terms_and_conditions: ''
-		start_date: none
-		end_date: none
-		renewal_period_days: none
-		next_renewal_date: none
-		signers: []
-		revisions: []
-		current_version: 0
-		last_signed_date: none
-		created_at: now
-		updated_at: now
+		start_date:           none
+		end_date:             none
+		renewal_period_days:  none
+		next_renewal_date:    none
+		signers:              []
+		revisions:            []
+		current_version:      0
+		last_signed_date:     none
+		created_at:           now
+		updated_at:           now
 	}
 }
 
@@ -331,7 +331,7 @@ pub fn (c Contract) all_signed() bool {
 	if c.signers.len == 0 {
 		return false
 	}
-	
+
 	for signer in c.signers {
 		if signer.status != .signed {
 			return false
@@ -370,4 +370,4 @@ pub fn (c Contract) status_string() string {
 		.expired { 'Expired' }
 		.cancelled { 'Cancelled' }
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/library/collection.v b/lib/threefold/models/library/collection.v
index 5fe81dd2..8db135a9 100644
--- a/lib/threefold/models/library/collection.v
+++ b/lib/threefold/models/library/collection.v
@@ -4,31 +4,31 @@ module library
 @[heap]
 pub struct Collection {
 pub mut:
-	id          u32      // Unique collection ID
-	title       string   // Title of the collection
-	description ?string  // Optional description of the collection
-	images      []u32    // List of image item IDs belonging to this collection
-	pdfs        []u32    // List of PDF item IDs belonging to this collection
-	markdowns   []u32    // List of Markdown item IDs belonging to this collection
-	books       []u32    // List of Book item IDs belonging to this collection
-	slides      []u32    // List of Slides item IDs belonging to this collection
-	created_at  u64      // Creation timestamp
-	updated_at  u64      // Last update timestamp
+	id          u32     // Unique collection ID
+	title       string  // Title of the collection
+	description ?string // Optional description of the collection
+	images      []u32   // List of image item IDs belonging to this collection
+	pdfs        []u32   // List of PDF item IDs belonging to this collection
+	markdowns   []u32   // List of Markdown item IDs belonging to this collection
+	books       []u32   // List of Book item IDs belonging to this collection
+	slides      []u32   // List of Slides item IDs belonging to this collection
+	created_at  u64     // Creation timestamp
+	updated_at  u64     // Last update timestamp
 }
 
 // new creates a new Collection with default values
 pub fn Collection.new() Collection {
 	return Collection{
-		id: 0
-		title: ''
+		id:          0
+		title:       ''
 		description: none
-		images: []
-		pdfs: []
-		markdowns: []
-		books: []
-		slides: []
-		created_at: 0
-		updated_at: 0
+		images:      []
+		pdfs:        []
+		markdowns:   []
+		books:       []
+		slides:      []
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -162,4 +162,4 @@ pub fn (c Collection) contains_slides(slides_id u32) bool {
 // get_description_string returns the description as a string (empty if none)
 pub fn (c Collection) get_description_string() string {
 	return c.description or { '' }
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/library/items.v b/lib/threefold/models/library/items.v
index d24b5d5e..228bd1ea 100644
--- a/lib/threefold/models/library/items.v
+++ b/lib/threefold/models/library/items.v
@@ -17,14 +17,14 @@ pub mut:
 // new creates a new Image with default values
 pub fn Image.new() Image {
 	return Image{
-		id: 0
-		title: ''
+		id:          0
+		title:       ''
 		description: none
-		url: ''
-		width: 0
-		height: 0
-		created_at: 0
-		updated_at: 0
+		url:         ''
+		width:       0
+		height:      0
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -97,13 +97,13 @@ pub mut:
 // new creates a new Pdf with default values
 pub fn Pdf.new() Pdf {
 	return Pdf{
-		id: 0
-		title: ''
+		id:          0
+		title:       ''
 		description: none
-		url: ''
-		page_count: 0
-		created_at: 0
-		updated_at: 0
+		url:         ''
+		page_count:  0
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -151,12 +151,12 @@ pub mut:
 // new creates a new Markdown document with default values
 pub fn Markdown.new() Markdown {
 	return Markdown{
-		id: 0
-		title: ''
+		id:          0
+		title:       ''
 		description: none
-		content: ''
-		created_at: 0
-		updated_at: 0
+		content:     ''
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -200,8 +200,8 @@ pub mut:
 // new creates a new TocEntry with default values
 pub fn TocEntry.new() TocEntry {
 	return TocEntry{
-		title: ''
-		page: 0
+		title:       ''
+		page:        0
 		subsections: []
 	}
 }
@@ -245,13 +245,13 @@ pub mut:
 // new creates a new Book with default values
 pub fn Book.new() Book {
 	return Book{
-		id: 0
-		title: ''
-		description: none
+		id:                0
+		title:             ''
+		description:       none
 		table_of_contents: []
-		pages: []
-		created_at: 0
-		updated_at: 0
+		pages:             []
+		created_at:        0
+		updated_at:        0
 	}
 }
 
@@ -325,8 +325,8 @@ pub mut:
 // new creates a new Slide
 pub fn Slide.new() Slide {
 	return Slide{
-		image_url: ''
-		title: none
+		image_url:   ''
+		title:       none
 		description: none
 	}
 }
@@ -374,12 +374,12 @@ pub mut:
 // new creates a new Slideshow with default values
 pub fn Slideshow.new() Slideshow {
 	return Slideshow{
-		id: 0
-		title: ''
+		id:          0
+		title:       ''
 		description: none
-		slides: []
-		created_at: 0
-		updated_at: 0
+		slides:      []
+		created_at:  0
+		updated_at:  0
 	}
 }
 
@@ -424,4 +424,4 @@ pub fn (mut s Slideshow) remove_slide(index u32) {
 	if index < u32(s.slides.len) {
 		s.slides.delete(int(index))
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/location/address.v b/lib/threefold/models/location/address.v
index c157eb85..15e72850 100644
--- a/lib/threefold/models/location/address.v
+++ b/lib/threefold/models/location/address.v
@@ -14,12 +14,12 @@ pub mut:
 // new creates a new Address with default values
 pub fn Address.new() Address {
 	return Address{
-		street: ''
-		city: ''
-		state: none
+		street:      ''
+		city:        ''
+		state:       none
 		postal_code: ''
-		country: ''
-		company: none
+		country:     ''
+		company:     none
 	}
 }
 
@@ -77,57 +77,57 @@ pub fn (a Address) has_company() bool {
 // format_single_line returns the address formatted as a single line
 pub fn (a Address) format_single_line() string {
 	mut parts := []string{}
-	
+
 	if company := a.company {
 		if company.len > 0 {
 			parts << company
 		}
 	}
-	
+
 	if a.street.len > 0 {
 		parts << a.street
 	}
-	
+
 	if a.city.len > 0 {
 		parts << a.city
 	}
-	
+
 	if state := a.state {
 		if state.len > 0 {
 			parts << state
 		}
 	}
-	
+
 	if a.postal_code.len > 0 {
 		parts << a.postal_code
 	}
-	
+
 	if a.country.len > 0 {
 		parts << a.country
 	}
-	
+
 	return parts.join(', ')
 }
 
 // format_multiline returns the address formatted as multiple lines
 pub fn (a Address) format_multiline() string {
 	mut lines := []string{}
-	
+
 	if company := a.company {
 		if company.len > 0 {
 			lines << company
 		}
 	}
-	
+
 	if a.street.len > 0 {
 		lines << a.street
 	}
-	
+
 	mut city_line := ''
 	if a.city.len > 0 {
 		city_line = a.city
 	}
-	
+
 	if state := a.state {
 		if state.len > 0 {
 			if city_line.len > 0 {
@@ -137,7 +137,7 @@ pub fn (a Address) format_multiline() string {
 			}
 		}
 	}
-	
+
 	if a.postal_code.len > 0 {
 		if city_line.len > 0 {
 			city_line += ' ${a.postal_code}'
@@ -145,15 +145,15 @@ pub fn (a Address) format_multiline() string {
 			city_line = a.postal_code
 		}
 	}
-	
+
 	if city_line.len > 0 {
 		lines << city_line
 	}
-	
+
 	if a.country.len > 0 {
 		lines << a.country
 	}
-	
+
 	return lines.join('\n')
 }
 
@@ -169,22 +169,15 @@ pub fn (a Address) get_company_string() string {
 
 // equals compares two addresses for equality
 pub fn (a Address) equals(other Address) bool {
-	return a.street == other.street &&
-		   a.city == other.city &&
-		   a.state == other.state &&
-		   a.postal_code == other.postal_code &&
-		   a.country == other.country &&
-		   a.company == other.company
+	return a.street == other.street && a.city == other.city && a.state == other.state
+		&& a.postal_code == other.postal_code && a.country == other.country
+		&& a.company == other.company
 }
 
 // is_empty checks if the address is completely empty
 pub fn (a Address) is_empty() bool {
-	return a.street.len == 0 && 
-		   a.city.len == 0 && 
-		   a.postal_code.len == 0 && 
-		   a.country.len == 0 &&
-		   a.state == none &&
-		   a.company == none
+	return a.street.len == 0 && a.city.len == 0 && a.postal_code.len == 0 && a.country.len == 0
+		&& a.state == none && a.company == none
 }
 
 // validate performs basic validation on the address
@@ -192,22 +185,22 @@ pub fn (a Address) validate() !bool {
 	if a.is_empty() {
 		return error('Address cannot be empty')
 	}
-	
+
 	if a.street.len == 0 {
 		return error('Street address is required')
 	}
-	
+
 	if a.city.len == 0 {
 		return error('City is required')
 	}
-	
+
 	if a.postal_code.len == 0 {
 		return error('Postal code is required')
 	}
-	
+
 	if a.country.len == 0 {
 		return error('Country is required')
 	}
-	
+
 	return true
-}
\ No newline at end of file
+}
diff --git a/lib/threefold/models/models.v b/lib/threefold/models/models.v
index edef8172..d6a1054b 100644
--- a/lib/threefold/models/models.v
+++ b/lib/threefold/models/models.v
@@ -9,11 +9,12 @@ module models
 // - Payment models (Stripe webhooks)
 // - Location models (addresses)
 
-// Re-export all model modules for easy access
-pub use core
-pub use finance
-pub use flow
-pub use business
-pub use identity
-pub use payment
-pub use location
\ No newline at end of file
+// Import all model modules for easy access
+
+import freeflowuniverse.herolib.threefold.models.core
+import freeflowuniverse.herolib.threefold.models.finance
+import freeflowuniverse.herolib.threefold.models.flow
+import freeflowuniverse.herolib.threefold.models.business
+import freeflowuniverse.herolib.threefold.models.identity
+import freeflowuniverse.herolib.threefold.models.payment
+import freeflowuniverse.herolib.threefold.models.location
diff --git a/lib/threefold/models/payment/stripe.v b/lib/threefold/models/payment/stripe.v
index 3210640e..4d191369 100644
--- a/lib/threefold/models/payment/stripe.v
+++ b/lib/threefold/models/payment/stripe.v
@@ -17,8 +17,8 @@ pub mut:
 // StripeEventData represents the data portion of a Stripe event
 pub struct StripeEventData {
 pub mut:
-	object               string  // The main object data (JSON as string for flexibility)
-	previous_attributes  ?string // Previous attributes if this is an update (JSON as string)
+	object              string  // The main object data (JSON as string for flexibility)
+	previous_attributes ?string // Previous attributes if this is an update (JSON as string)
 }
 
 // StripeEventRequest represents request information for a Stripe event
@@ -31,15 +31,15 @@ pub mut:
 // new creates a new StripeWebhookEvent
 pub fn StripeWebhookEvent.new() StripeWebhookEvent {
 	return StripeWebhookEvent{
-		id: ''
-		object: 'event'
-		api_version: none
-		created: 0
-		data: StripeEventData.new()
-		livemode: false
+		id:               ''
+		object:           'event'
+		api_version:      none
+		created:          0
+		data:             StripeEventData.new()
+		livemode:         false
 		pending_webhooks: 0
-		request: none
-		event_type: ''
+		request:          none
+		event_type:       ''
 	}
 }
 
@@ -100,7 +100,7 @@ pub fn (mut event StripeWebhookEvent) event_type(event_type string) StripeWebhoo
 // new creates a new StripeEventData
 pub fn StripeEventData.new() StripeEventData {
 	return StripeEventData{
-		object: ''
+		object:              ''
 		previous_attributes: none
 	}
 }
@@ -120,7 +120,7 @@ pub fn (mut data StripeEventData) previous_attributes(previous_attributes ?strin
 // new creates a new StripeEventRequest
 pub fn StripeEventRequest.new() StripeEventRequest {
 	return StripeEventRequest{
-		id: none
+		id:              none
 		idempotency_key: none
 	}
 }
@@ -219,4 +219,4 @@ pub fn (event StripeWebhookEvent) get_event_action() string {
 		return parts[parts.len - 1]
 	}
 	return ''
-}
\ No newline at end of file
+}
diff --git a/lib/virt/crun/crun_test.v b/lib/virt/crun/crun_test.v
new file mode 100644
index 00000000..824c355c
--- /dev/null
+++ b/lib/virt/crun/crun_test.v
@@ -0,0 +1,74 @@
+module crun
+
+import json
+
+fn test_factory_creation() {
+	mut configs := map[string]&CrunConfig{}
+	config := new(mut configs, name: 'test')!
+	assert config.name == 'test'
+	assert config.spec.oci_version == '1.0.2'
+}
+
+fn test_json_generation() {
+	mut configs := map[string]&CrunConfig{}
+	mut config := new(mut configs, name: 'test')!
+	json_str := config.to_json()!
+	
+	// Parse back to verify structure
+	parsed := json.decode(map[string]json.Any, json_str)!
+	
+	assert parsed['ociVersion']! as string == '1.0.2'
+	
+	process := parsed['process']! as map[string]json.Any
+	assert process['terminal']! as bool == true
+}
+
+fn test_configuration_methods() {
+	mut configs := map[string]&CrunConfig{}
+	mut config := new(mut configs, name: 'test')!
+	
+	config.set_command(['/bin/echo', 'hello'])
+		.set_working_dir('/tmp')
+		.set_hostname('test-host')
+	
+	assert config.spec.process.args == ['/bin/echo', 'hello']
+	assert config.spec.process.cwd == '/tmp'
+	assert config.spec.hostname == 'test-host'
+}
+
+fn test_validation() {
+	mut configs := map[string]&CrunConfig{}
+	mut config := new(mut configs, name: 'test')!
+	
+	// Should validate successfully with defaults
+	config.validate()!
+	
+	// Should fail with empty args
+	config.spec.process.args = []
+	if _ := config.validate() {
+		assert false, 'validation should have failed'
+	} else {
+		// Expected to fail
+	}
+}
+
+fn test_heropods_compatibility() {
+	mut configs := map[string]&CrunConfig{}
+	mut config := new(mut configs, name: 'heropods')!
+	
+	// The default config should match heropods template structure
+	json_str := config.to_json()!
+	parsed := json.decode(map[string]json.Any, json_str)!
+	
+	// Check key fields match template
+	assert parsed['ociVersion']! as string == '1.0.2'
+	
+	process := parsed['process']! as map[string]json.Any
+	assert process['noNewPrivileges']! as bool == true
+	
+	capabilities := process['capabilities']! as map[string]json.Any
+	bounding := capabilities['bounding']! as []json.Any
+	assert 'CAP_AUDIT_WRITE' in bounding.map(it as string)
+	assert 'CAP_KILL' in bounding.map(it as string)
+	assert 'CAP_NET_BIND_SERVICE' in bounding.map(it as string)
+}
\ No newline at end of file
diff --git a/lib/virt/crun/example.v b/lib/virt/crun/example.v
new file mode 100644
index 00000000..8be266a9
--- /dev/null
+++ b/lib/virt/crun/example.v
@@ -0,0 +1,67 @@
+module crun
+
+
+pub fn example_heropods_compatible() ! {
+	mut configs := map[string]&CrunConfig{}
+	// Create a container configuration compatible with heropods template
+	mut config := new(mut configs, name: 'heropods-example')!
+	
+	// Configure to match the template
+	config.set_command(['/bin/sh'])
+		.set_working_dir('/')
+		.set_user(0, 0, [])
+		.add_env('PATH', '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin')
+		.add_env('TERM', 'xterm')
+		.set_rootfs('${rootfs_path}', false) // This will be replaced by the actual path
+		.set_hostname('container')
+		.set_no_new_privileges(true)
+	
+	// Add the specific rlimit from template
+	config.add_rlimit(.rlimit_nofile, 1024, 1024)
+	
+	// Validate the configuration
+	config.validate()!
+	
+	// Generate and print JSON
+	json_output := config.to_json()!
+	println(json_output)
+	
+	// Save to file
+	config.save_to_file('/tmp/heropods_config.json')!
+	println('Heropods-compatible configuration saved to /tmp/heropods_config.json')
+}
+
+pub fn example_custom() ! {
+	mut configs := map[string]&CrunConfig{}
+	// Create a more complex container configuration
+	mut config := new(mut configs, name: 'custom-container')!
+	
+	config.set_command(['/usr/bin/my-app', '--config', '/etc/myapp/config.yaml'])
+		.set_working_dir('/app')
+		.set_user(1000, 1000, [1001, 1002])
+		.add_env('MY_VAR', 'my_value')
+		.add_env('ANOTHER_VAR', 'another_value')
+		.set_rootfs('/path/to/rootfs', false)
+		.set_hostname('my-custom-container')
+		.set_memory_limit(1024 * 1024 * 1024) // 1GB
+		.set_cpu_limits(100000, 50000, 1024)  // period, quota, shares
+		.set_pids_limit(500)
+		.add_mount('/host/path', '/container/path', .bind, [.rw])
+		.add_mount('/tmp/cache', '/app/cache', .tmpfs, [.rw, .noexec])
+		.add_capability(.cap_sys_admin)
+		.remove_capability(.cap_net_raw)
+		.add_rlimit(.rlimit_nproc, 100, 50)
+		.set_no_new_privileges(true)
+	
+	// Add some additional security hardening
+	config.add_masked_path('/proc/kcore')
+		.add_readonly_path('/proc/sys')
+	
+	// Validate before use
+	config.validate()!
+	
+	// Get the JSON
+	json_str := config.to_json()!
+	println('Custom container config:')
+	println(json_str)
+}
\ No newline at end of file
diff --git a/lib/virt/crun/factory.v b/lib/virt/crun/factory.v
new file mode 100644
index 00000000..e93b3fde
--- /dev/null
+++ b/lib/virt/crun/factory.v
@@ -0,0 +1,344 @@
+module crun
+
+import freeflowuniverse.herolib.core.texttools
+
+
+@[params]
+pub struct FactoryArgs {
+pub mut:
+	name string = "default"
+}
+
+pub struct CrunConfig {
+pub mut:
+	name string
+	spec Spec
+}
+
+// Convert enum values to their string representations
+pub fn (mount_type MountType) to_string() string {
+	return match mount_type {
+		.bind { 'bind' }
+		.tmpfs { 'tmpfs' }
+		.proc { 'proc' }
+		.sysfs { 'sysfs' }
+		.devpts { 'devpts' }
+		.nfs { 'nfs' }
+		.overlay { 'overlay' }
+	}
+}
+
+pub fn (option MountOption) to_string() string {
+	return match option {
+		.rw { 'rw' }
+		.ro { 'ro' }
+		.noexec { 'noexec' }
+		.nosuid { 'nosuid' }
+		.nodev { 'nodev' }
+		.rbind { 'rbind' }
+		.relatime { 'relatime' }
+		.strictatime { 'strictatime' }
+		.mode { 'mode=755' } // Default mode, can be customized
+		.size { 'size=65536k' } // Default size, can be customized
+	}
+}
+
+pub fn (cap Capability) to_string() string {
+	return match cap {
+		.cap_chown { 'CAP_CHOWN' }
+		.cap_dac_override { 'CAP_DAC_OVERRIDE' }
+		.cap_dac_read_search { 'CAP_DAC_READ_SEARCH' }
+		.cap_fowner { 'CAP_FOWNER' }
+		.cap_fsetid { 'CAP_FSETID' }
+		.cap_kill { 'CAP_KILL' }
+		.cap_setgid { 'CAP_SETGID' }
+		.cap_setuid { 'CAP_SETUID' }
+		.cap_setpcap { 'CAP_SETPCAP' }
+		.cap_linux_immutable { 'CAP_LINUX_IMMUTABLE' }
+		.cap_net_bind_service { 'CAP_NET_BIND_SERVICE' }
+		.cap_net_broadcast { 'CAP_NET_BROADCAST' }
+		.cap_net_admin { 'CAP_NET_ADMIN' }
+		.cap_net_raw { 'CAP_NET_RAW' }
+		.cap_ipc_lock { 'CAP_IPC_LOCK' }
+		.cap_ipc_owner { 'CAP_IPC_OWNER' }
+		.cap_sys_module { 'CAP_SYS_MODULE' }
+		.cap_sys_rawio { 'CAP_SYS_RAWIO' }
+		.cap_sys_chroot { 'CAP_SYS_CHROOT' }
+		.cap_sys_ptrace { 'CAP_SYS_PTRACE' }
+		.cap_sys_pacct { 'CAP_SYS_PACCT' }
+		.cap_sys_admin { 'CAP_SYS_ADMIN' }
+		.cap_sys_boot { 'CAP_SYS_BOOT' }
+		.cap_sys_nice { 'CAP_SYS_NICE' }
+		.cap_sys_resource { 'CAP_SYS_RESOURCE' }
+		.cap_sys_time { 'CAP_SYS_TIME' }
+		.cap_sys_tty_config { 'CAP_SYS_TTY_CONFIG' }
+		.cap_mknod { 'CAP_MKNOD' }
+		.cap_lease { 'CAP_LEASE' }
+		.cap_audit_write { 'CAP_AUDIT_WRITE' }
+		.cap_audit_control { 'CAP_AUDIT_CONTROL' }
+		.cap_setfcap { 'CAP_SETFCAP' }
+		.cap_mac_override { 'CAP_MAC_OVERRIDE' }
+		.cap_mac_admin { 'CAP_MAC_ADMIN' }
+		.cap_syslog { 'CAP_SYSLOG' }
+		.cap_wake_alarm { 'CAP_WAKE_ALARM' }
+		.cap_block_suspend { 'CAP_BLOCK_SUSPEND' }
+		.cap_audit_read { 'CAP_AUDIT_READ' }
+	}
+}
+
+pub fn (rlimit RlimitType) to_string() string {
+	return match rlimit {
+		.rlimit_cpu { 'RLIMIT_CPU' }
+		.rlimit_fsize { 'RLIMIT_FSIZE' }
+		.rlimit_data { 'RLIMIT_DATA' }
+		.rlimit_stack { 'RLIMIT_STACK' }
+		.rlimit_core { 'RLIMIT_CORE' }
+		.rlimit_rss { 'RLIMIT_RSS' }
+		.rlimit_nproc { 'RLIMIT_NPROC' }
+		.rlimit_nofile { 'RLIMIT_NOFILE' }
+		.rlimit_memlock { 'RLIMIT_MEMLOCK' }
+		.rlimit_as { 'RLIMIT_AS' }
+		.rlimit_lock { 'RLIMIT_LOCK' }
+		.rlimit_sigpending { 'RLIMIT_SIGPENDING' }
+		.rlimit_msgqueue { 'RLIMIT_MSGQUEUE' }
+		.rlimit_nice { 'RLIMIT_NICE' }
+		.rlimit_rtprio { 'RLIMIT_RTPRIO' }
+		.rlimit_rttime { 'RLIMIT_RTTIME' }
+	}
+}
+
+// Configuration methods with builder pattern
+pub fn (mut config CrunConfig) set_command(args []string) &CrunConfig {
+	config.spec.process.args = args.clone()
+	return config
+}
+
+pub fn (mut config CrunConfig) set_working_dir(cwd string) &CrunConfig {
+	config.spec.process.cwd = cwd
+	return config
+}
+
+pub fn (mut config CrunConfig) set_user(uid u32, gid u32, additional_gids []u32) &CrunConfig {
+	config.spec.process.user = User{
+		uid: uid
+		gid: gid
+		additional_gids: additional_gids.clone()
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) add_env(key string, value string) &CrunConfig {
+	config.spec.process.env << '${key}=${value}'
+	return config
+}
+
+pub fn (mut config CrunConfig) set_rootfs(path string, readonly bool) &CrunConfig {
+	config.spec.root = Root{
+		path: path
+		readonly: readonly
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) set_hostname(hostname string) &CrunConfig {
+	config.spec.hostname = hostname
+	return config
+}
+
+pub fn (mut config CrunConfig) set_memory_limit(limit_bytes u64) &CrunConfig {
+	config.spec.linux.resources.memory.limit = limit_bytes
+	return config
+}
+
+pub fn (mut config CrunConfig) set_cpu_limits(period u64, quota i64, shares u64) &CrunConfig {
+	config.spec.linux.resources.cpu.period = period
+	config.spec.linux.resources.cpu.quota = quota
+	config.spec.linux.resources.cpu.shares = shares
+	return config
+}
+
+pub fn (mut config CrunConfig) set_pids_limit(limit i64) &CrunConfig {
+	config.spec.linux.resources.pids.limit = limit
+	return config
+}
+
+pub fn (mut config CrunConfig) add_mount(destination string, source string, typ MountType, options []MountOption) &CrunConfig {
+	config.spec.mounts << Mount{
+		destination: destination
+		typ: typ.to_string()
+		source: source
+		options: options.map(it.to_string())
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) add_capability(cap Capability) &CrunConfig {
+	cap_str := cap.to_string()
+	
+	if cap_str !in config.spec.process.capabilities.bounding {
+		config.spec.process.capabilities.bounding << cap_str
+	}
+	if cap_str !in config.spec.process.capabilities.effective {
+		config.spec.process.capabilities.effective << cap_str
+	}
+	if cap_str !in config.spec.process.capabilities.permitted {
+		config.spec.process.capabilities.permitted << cap_str
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) remove_capability(cap Capability) &CrunConfig {
+	cap_str := cap.to_string()
+	
+	config.spec.process.capabilities.bounding = config.spec.process.capabilities.bounding.filter(it != cap_str)
+	config.spec.process.capabilities.effective = config.spec.process.capabilities.effective.filter(it != cap_str)
+	config.spec.process.capabilities.permitted = config.spec.process.capabilities.permitted.filter(it != cap_str)
+	return config
+}
+
+pub fn (mut config CrunConfig) add_rlimit(typ RlimitType, hard u64, soft u64) &CrunConfig {
+	config.spec.process.rlimits << Rlimit{
+		typ: typ.to_string()
+		hard: hard
+		soft: soft
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) set_no_new_privileges(value bool) &CrunConfig {
+	config.spec.process.no_new_privileges = value
+	return config
+}
+
+pub fn (mut config CrunConfig) add_masked_path(path string) &CrunConfig {
+	if path !in config.spec.linux.masked_paths {
+		config.spec.linux.masked_paths << path
+	}
+	return config
+}
+
+pub fn (mut config CrunConfig) add_readonly_path(path string) &CrunConfig {
+	if path !in config.spec.linux.readonly_paths {
+		config.spec.linux.readonly_paths << path
+	}
+	return config
+}
+
+pub fn new(mut configs map[string]&CrunConfig, args FactoryArgs) !&CrunConfig {
+	name := texttools.name_fix(args.name)
+	
+	mut config := &CrunConfig{
+		name: name
+		spec: create_default_spec()
+	}
+	
+	configs[name] = config
+	return config
+}
+
+pub fn get(configs map[string]&CrunConfig, args FactoryArgs) !&CrunConfig {
+	name := texttools.name_fix(args.name)
+	return configs[name] or {
+		return error('crun config with name "${name}" does not exist')
+	}
+}
+
+fn create_default_spec() Spec {
+	// Create default spec that matches the heropods template
+	mut spec := Spec{
+		oci_version: '1.0.2' // Set default here
+		platform: Platform{
+			os: 'linux'
+			arch: 'amd64'
+		}
+		process: Process{
+			terminal: true
+			user: User{
+				uid: 0
+				gid: 0
+			}
+			args: ['/bin/sh']
+			env: [
+				'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+				'TERM=xterm'
+			]
+			cwd: '/'
+			capabilities: Capabilities{
+				bounding: ['CAP_AUDIT_WRITE', 'CAP_KILL', 'CAP_NET_BIND_SERVICE']
+				effective: ['CAP_AUDIT_WRITE', 'CAP_KILL', 'CAP_NET_BIND_SERVICE']
+				inheritable: ['CAP_AUDIT_WRITE', 'CAP_KILL', 'CAP_NET_BIND_SERVICE']
+				permitted: ['CAP_AUDIT_WRITE', 'CAP_KILL', 'CAP_NET_BIND_SERVICE']
+			}
+			rlimits: [
+				Rlimit{
+					typ: 'RLIMIT_NOFILE'
+					hard: 1024
+					soft: 1024
+				}
+			]
+			no_new_privileges: true // No JSON annotation needed here
+		}
+		root: Root{
+			path: 'rootfs'
+			readonly: false
+		}
+		hostname: 'container'
+		mounts: create_default_mounts()
+		linux: Linux{
+			namespaces: create_default_namespaces()
+			masked_paths: [
+				'/proc/acpi',
+				'/proc/kcore',
+				'/proc/keys',
+				'/proc/latency_stats',
+				'/proc/timer_list',
+				'/proc/timer_stats',
+				'/proc/sched_debug',
+				'/proc/scsi',
+				'/sys/firmware'
+			]
+			readonly_paths: [
+				'/proc/asound',
+				'/proc/bus',
+				'/proc/fs',
+				'/proc/irq',
+				'/proc/sys',
+				'/proc/sysrq-trigger'
+			]
+		}
+	}
+	
+	return spec
+}
+
+fn create_default_namespaces() []LinuxNamespace {
+	return [
+		LinuxNamespace{typ: 'pid'},
+		LinuxNamespace{typ: 'network'},
+		LinuxNamespace{typ: 'ipc'},
+		LinuxNamespace{typ: 'uts'},
+		LinuxNamespace{typ: 'mount'},
+	]
+}
+
+fn create_default_mounts() []Mount {
+	return [
+		Mount{
+			destination: '/proc'
+			typ: 'proc'
+			source: 'proc'
+		},
+		Mount{
+			destination: '/dev'
+			typ: 'tmpfs'
+			source: 'tmpfs'
+			options: ['nosuid', 'strictatime', 'mode=755', 'size=65536k']
+		},
+		Mount{
+			destination: '/sys'
+			typ: 'sysfs'
+			source: 'sysfs'
+			options: ['nosuid', 'noexec', 'nodev', 'ro']
+		},
+	]
+}
\ No newline at end of file
diff --git a/lib/virt/crun/instructions_crun.md b/lib/virt/crun/instructions_crun.md
new file mode 100644
index 00000000..5242ca68
--- /dev/null
+++ b/lib/virt/crun/instructions_crun.md
@@ -0,0 +1,867 @@
+crun(1)                     General Commands Manual                    crun(1)
+
+
+
+NAME
+       crun - a fast and lightweight OCI runtime
+
+
+
+SYNOPSIS
+       crun [global options] command [command options] [arguments...]
+
+
+
+DESCRIPTION
+       crun is a command line program for running Linux containers that follow
+       the Open Container Initiative (OCI) format.
+
+
+
+COMMANDS
+       create Create a container.  The runtime detaches from the container
+       process once the container environment is created.  It is necessary to
+       successively use start for starting the container.
+
+
+       delete Remove definition for a container.
+
+
+       exec Exec a command in a running container.
+
+
+       list List known containers.
+
+
+       mounts add Add mounts while the container is running.  It requires two
+       arguments: the container ID and a JSON file containing the mounts
+       section of the OCI config file.  Each mount listed there is added to
+       the running container.  The command is experimental and can be changed
+       without notice.
+
+
+       mounts remove Remove mounts while the container is running.  It
+       requires two arguments: the container ID and a JSON file containing the
+       mounts section of the OCI config file.  Only the destination attribute
+       for each mount is used.  The command is experimental and can be changed
+       without notice.
+
+
+       kill Send the specified signal to the container init process.  If no
+       signal is specified, SIGTERM is used.
+
+
+       ps Show the processes running in a container.
+
+
+       run Create and immediately start a container.
+
+
+       spec Generate a configuration file.
+
+
+       start Start a container that was previously created.  A container
+       cannot be started multiple times.
+
+
+       state Output the state of a container.
+
+
+       pause Pause all the processes in the container.
+
+
+       resume Resume the processes in the container.
+
+
+       update Update container resource constraints.
+
+
+       checkpoint Checkpoint a running container using CRIU.
+
+
+       restore Restore a container from a checkpoint.
+
+
+
+STATE
+       By default, when running as root user, crun saves its state under the
+       /run/crun directory.  As unprivileged user, instead the XDG_RUNTIME_DIR
+       environment variable is honored, and the directory
+       $XDG_RUNTIME_DIR/crun is used.  The global option --root overrides this
+       setting.
+
+
+
+GLOBAL OPTIONS
+       --debug Produce verbose output.
+
+
+       --log=LOG-DESTINATION Define the destination for the error and warning
+       messages generated by crun.  If the error happens late in the container
+       init process, when crun already stopped watching it, then it will be
+       printed to the container stderr.
+
+
+       It is specified in the form BACKEND:SPECIFIER.
+
+
+       These following backends are supported:
+
+       o file:PATH
+
+       o journald:IDENTIFIER
+
+       o syslog:IDENTIFIER
+
+
+       If no backend is specified, then file: is used by default.
+
+
+       --log-format=FORMAT Define the format of the log messages.  It can
+       either be text, or json.  The default is text.
+
+
+       --log-level=LEVEL Define the log level.  It can either be debug,
+       warning or error.  The default is error.
+
+
+       --no-pivot Use chroot(2) instead of pivot_root(2) when creating the
+       container.  This option is not safe, and should be avoided.
+
+
+       --root=DIR Defines where to store the state for crun containers.
+
+
+       --systemd-cgroup Use systemd for configuring cgroups.  If not
+       specified, the cgroup is created directly using the cgroupfs backend.
+
+
+       --cgroup-manager=MANAGER Specify what cgroup manager must be used.
+       Permitted values are cgroupfs, systemd and disabled.
+
+
+       -?, --help Print a help list.
+
+
+       --usage Print a short usage message.
+
+
+       -V, --version Print program version
+
+
+CREATE OPTIONS
+       crun [global options] create [options] CONTAINER
+
+
+       --bundle=PATH Path to the OCI bundle, by default it is the current
+       directory.
+
+
+       --config=FILE Override the configuration file to use.  The default
+       value is config.json.
+
+
+       --console-socket=SOCKET Path to a UNIX socket that will receive the
+       ptmx end of the tty for the container.
+
+
+       --no-new-keyring Keep the same session key
+
+
+       --preserve-fds=N Additional number of FDs to pass into the container.
+
+
+       --pid-file=PATH Path to the file that will contain the container
+       process PID.
+
+
+RUN OPTIONS
+       crun [global options] run [options] CONTAINER
+
+
+       --bundle=BUNDLE Path to the OCI bundle, by default it is the current
+       directory.
+
+
+       --config=FILE Override the configuration file to use.  The default
+       value is config.json.
+
+
+       --console-socket=SOCKET Path to a UNIX socket that will receive the
+       ptmx end of the tty for the container.
+
+
+       --no-new-keyring Keep the same session key.
+
+
+       --preserve-fds=N Additional number of FDs to pass into the container.
+
+
+       --pid-file=PATH Path to the file that will contain the container
+       process PID.
+
+
+       --detach Detach the container process from the current session.
+
+
+DELETE OPTIONS
+       crun [global options] delete [options] CONTAINER
+
+
+       --force Delete the container even if it is still running.
+
+
+       --regex=REGEX Delete all the containers that satisfy the specified
+       regex.
+
+
+EXEC OPTIONS
+       crun [global options] exec [options] CONTAINER CMD
+
+
+       --apparmor=PROFILE Set the apparmor profile for the process.
+
+
+       --console-socket=SOCKET Path to a UNIX socket that will receive the
+       ptmx end of the tty for the container.
+
+
+       --cwd=PATH Set the working directory for the process to PATH.
+
+
+       --cap=CAP Specify an additional capability to add to the process.
+
+
+       --detach Detach the container process from the current session.
+
+
+       --cgroup=PATH Specify a sub-cgroup path inside the container cgroup.
+       The path must already exist in the container cgroup.
+
+
+       --env=ENV Specify an environment variable.
+
+
+       --no-new-privs Set the no new privileges value for the process.
+
+
+       --preserve-fds=N Additional number of FDs to pass into the container.
+
+
+       --process=FILE Path to a file containing the process JSON
+       configuration.
+
+
+       --process-label=VALUE Set the asm process label for the process
+       commonly used with selinux.
+
+
+       --pid-file=PATH Path to the file that will contain the new process PID.
+
+
+       -t --tty Allocate a pseudo TTY.
+
+
+       **-u USERSPEC --user=USERSPEC Specify the user in the form UID[:GID].
+
+
+LIST OPTIONS
+       crun [global options] list [options]
+
+
+       -q --quiet Show only the container ID.
+
+
+KILL OPTIONS
+       crun [global options] kill [options] CONTAINER SIGNAL
+
+
+       --all Kill all the processes in the container.
+
+
+       --regex=REGEX Kill all the containers that satisfy the specified regex.
+
+
+PS OPTIONS
+       crun [global options] ps [options]
+
+
+       --format=FORMAT Specify the output format.  It must be either table or
+       json.  By default table is used.
+
+
+SPEC OPTIONS
+       crun [global options] spec [options]
+
+
+       -b DIR --bundle=DIR Path to the root of the bundle dir (default ".").
+
+
+       --rootless Generate a config.json file that is usable by an
+       unprivileged user.
+
+
+UPDATE OPTIONS
+       crun [global options] update [options] CONTAINER
+
+
+       --blkio-weight=VALUE Specifies per cgroup weight.
+
+
+       --cpu-period=VALUE CPU CFS period to be used for hardcapping.
+
+
+       --cpu-quota=VALUE CPU CFS hardcap limit.
+
+
+       --cpu-rt-period=VALUE CPU realtime period to be used for hardcapping.
+
+
+       --cpu-rt-runtime=VALUE CPU realtime hardcap limit.
+
+
+       --cpu-share=VALUE CPU shares.
+
+
+       --cpuset-cpus=VALUE CPU(s) to use.
+
+
+       --cpuset-mems=VALUE Memory node(s) to use.
+
+
+       --kernel-memory=VALUE Kernel memory limit.
+
+
+       --kernel-memory-tcp=VALUE Kernel memory limit for TCP buffer.
+
+
+       --memory=VALUE Memory limit.
+
+
+       --memory-reservation=VALUE Memory reservation or soft_limit.
+
+
+       --memory-swap=VALUE Total memory usage.
+
+
+       --pids-limit=VALUE Maximum number of pids allowed in the container.
+
+
+       -r, --resources=FILE Path to the file containing the resources to
+       update.
+
+
+CHECKPOINT OPTIONS
+       crun [global options] checkpoint [options] CONTAINER
+
+
+       --image-path=DIR Path for saving CRIU image files
+
+
+       --work-path=DIR Path for saving work files and logs
+
+
+       --leave-running Leave the process running after checkpointing
+
+
+       --tcp-established Allow open TCP connections
+
+
+       --ext-unix-sk Allow external UNIX sockets
+
+
+       --shell-job Allow shell jobs
+
+
+       --pre-dump Only checkpoint the container's memory without stopping the
+       container.  It is not possible to restore a container from a pre-dump.
+       A pre-dump always needs a final checkpoint (without --pre-dump). It is
+       possible to make as many pre-dumps as necessary. For a second pre-dump
+       or for a final checkpoint it is necessary to use --parent-path to point
+       crun (and thus CRIU) to the pre-dump.
+
+
+       --parent-path=DIR Doing multiple pre-dumps or the final checkpoint
+       after one or multiple pre-dumps requires that crun (and thus CRIU)
+       knows the location of the pre-dump. It is important to use a relative
+       path from the actual checkpoint directory specified via --image-path.
+       It will fail if an absolute path is used.
+
+
+       --manage-cgroups-mode=MODE Specify which CRIU manage cgroup mode should
+       be used. Permitted values are soft, ignore, full or strict. Default is
+       soft.
+
+
+RESTORE OPTIONS
+       crun [global options] restore [options] CONTAINER
+
+
+       -b DIR --bundle=DIR Container bundle directory (default ".")
+
+
+       --image-path=DIR Path for saving CRIU image files
+
+
+       --work-path=DIR Path for saving work files and logs
+
+
+       --tcp-established Allow open TCP connections
+
+
+       --ext-unix Allow external UNIX sockets
+
+
+       --shell-job Allow shell jobs
+
+
+       --detach Detach from the container's process
+
+
+       --pid-file=FILE Where to write the PID of the container
+
+
+       --manage-cgroups-mode=MODE Specify which CRIU manage cgroup mode should
+       be used. Permitted values are soft, ignore, full or strict. Default is
+       soft.
+
+
+       --lsm-profile=TYPE:NAME Specify an LSM profile to be used during
+       restore.  TYPE can be either apparmor or selinux.
+
+
+       --lsm-mount-context=VALUE Specify a new LSM mount context to be used
+       during restore.  This option replaces an existing mount context
+       information with the specified value. This is useful when restoring a
+       container into an existing Pod and selinux labels need to be changed
+       during restore.
+
+
+
+Extensions to OCI
+run.oci.mount_context_type=context
+       Set the mount context type on volumes mounted with SELinux labels.
+
+
+       Valid context types are:
+         context (default)
+         fscontext
+         defcontext
+         rootcontext
+
+
+       More information on how the context mount flags works see the mount(8)
+       man page.
+
+
+run.oci.seccomp.receiver=PATH
+       If the annotation run.oci.seccomp.receiver=PATH is specified, the
+       seccomp listener is sent to the UNIX socket listening on the specified
+       path.  It can also set with the RUN_OCI_SECCOMP_RECEIVER environment
+       variable.  It is an experimental feature, and the annotation will be
+       removed once it is supported in the OCI runtime specs.  It must be an
+       absolute path.
+
+
+run.oci.seccomp.plugins=PATH
+       If the annotation run.oci.seccomp.plugins=PLUGIN1[:PLUGIN2]... is
+       specified, the seccomp listener fd is handled through the specified
+       plugins.  The plugin must either be an absolute path or a file name
+       that is looked up by dlopen(3).  More information on how the lookup is
+       performed are available on the ld.so(8) man page.
+
+
+run.oci.seccomp_fail_unknown_syscall=1
+       If the annotation run.oci.seccomp_fail_unknown_syscall is present, then
+       crun will fail when an unknown syscall is encountered in the seccomp
+       configuration.
+
+
+run.oci.seccomp_bpf_data=PATH
+       If the annotation run.oci.seccomp_bpf_data is present, then crun
+       ignores the seccomp section in the OCI configuration file and use the
+       specified data as the raw data to the seccomp(SECCOMP_SET_MODE_FILTER)
+       syscall.  The data must be encoded in base64.
+
+
+       It is an experimental feature, and the annotation will be removed once
+       it is supported in the OCI runtime specs.
+
+
+run.oci.keep_original_groups=1
+       If the annotation run.oci.keep_original_groups is present, then crun
+       will skip the setgroups syscall that is used to either set the
+       additional groups specified in the OCI configuration, or to reset the
+       list of additional groups if none is specified.
+
+
+run.oci.pidfd_receiver=PATH
+       It is an experimental feature and will be removed once the feature is
+       in the OCI runtime specs.
+
+
+       If present, specify the path to the UNIX socket that will receive the
+       pidfd for the container process.
+
+
+run.oci.systemd.force_cgroup_v1=/PATH
+       If the annotation run.oci.systemd.force_cgroup_v1=/PATH is present,
+       then crun will override the specified mount point /PATH with a cgroup
+       v1 mount made of a single hierarchy none,name=systemd.  It is useful to
+       run on a cgroup v2 system containers using older versions of systemd
+       that lack support for cgroup v2.
+
+
+       Note: Your container host has to have the cgroup v1 mount already
+       present, otherwise this will not work. If you want to run the container
+       rootless, the user it runs under has to have permissions to this
+       mountpoint.
+
+
+       For example, as root:
+
+       mkdir /sys/fs/cgroup/systemd
+       mount cgroup -t cgroup /sys/fs/cgroup/systemd -o none,name=systemd,xattr
+       chown -R the_user.the_user /sys/fs/cgroup/systemd
+
+
+run.oci.systemd.subgroup=SUBGROUP
+       Override the name for the systemd sub cgroup created under the systemd
+       scope, so the final cgroup will be like:
+
+       /sys/fs/cgroup/$PATH/$SUBGROUP
+
+
+       When it is set to the empty string, a sub cgroup is not created.
+
+
+       If not specified, it defaults to container on cgroup v2, and to "" on
+       cgroup v1.
+
+
+       e.g.
+
+       /sys/fs/cgroup//system.slice/foo-352700.scope/container
+
+
+run.oci.delegate-cgroup=DELEGATED-CGROUP
+       If the run.oci.systemd.subgroup annotation is specified, yet another
+       sub-cgroup is created and the container process is moved here.
+
+
+       If a cgroup namespace is used, the cgroup namespace is created before
+       moving the container to the delegated cgroup.
+
+       /sys/fs/cgroup/$PATH/$SUBGROUP/$DELEGATED-CGROUP
+
+
+       The runtime doesn't apply any limit to the $DELEGATED-CGROUP sub-
+       cgroup, the runtime uses only $PATH/$SUBGROUP.
+
+
+       The container payload fully manages $DELEGATE-CGROUP, the limits
+       applied to $PATH/$SUBGROUP still applies to $DELEGATE-CGROUP.
+
+
+       Since cgroup delegation is not safe on cgroup v1, this option is
+       supported only on cgroup v2.
+
+
+run.oci.hooks.stdout=FILE
+       If the annotation run.oci.hooks.stdout is present, then crun will open
+       the specified file and use it as the stdout for the hook processes.
+       The file is opened in append mode and it is created if it doesn't
+       already exist.
+
+
+run.oci.hooks.stderr=FILE
+       If the annotation run.oci.hooks.stderr is present, then crun will open
+       the specified file and use it as the stderr for the hook processes.
+       The file is opened in append mode and it is created if it doesn't
+       already exist.
+
+
+run.oci.handler=HANDLER
+       It is an experimental feature.
+
+
+       If specified, run the specified handler for execing the container.  The
+       only supported values are krun and wasm.
+
+       o krun: When krun is specified, the libkrun.so shared object is loaded
+         and it is used to launch the container using libkrun.
+
+       o wasm: If specified, run the wasm handler for container. Allows
+         running wasm workload natively. Accepts a .wasm binary as input and
+         if .wat is provided it will be automatically compiled into a wasm
+         module. Stdout of wasm module is relayed back via crun.
+
+
+tmpcopyup mount options
+       If the tmpcopyup option is specified for a tmpfs, then the path that is
+       shadowed by the tmpfs mount is recursively copied up to the tmpfs
+       itself.
+
+
+copy-symlink mount options
+       If the copy-symlink option is specified, if the source of a bind mount
+       is a symlink, the symlink is recreated at the specified destination
+       instead of attempting a mount that would resolve the symlink itself.
+       If the destination already exists and it is not a symlink with the
+       expected content, crun will return an error.
+
+
+dest-nofollow
+       When this option is specified for a bind mount, and the destination of
+       the bind mount is a symbolic link, crun will mount the symbolic link
+       itself at the target destination.
+
+
+src-nofollow
+       When this option is specified for a bind mount, and the source of the
+       bind mount is a symbolic link, crun will use the symlink itself rather
+       than the file or directory the symbolic link points to.
+
+
+r$FLAG mount options
+       If a r$FLAG mount option is specified then the flag $FLAG is set
+       recursively for each children mount.
+
+
+       These flags are supported:
+
+       o "rro"
+
+       o "rrw"
+
+       o "rsuid"
+
+       o "rnosuid"
+
+       o "rdev"
+
+       o "rnodev"
+
+       o "rexec"
+
+       o "rnoexec"
+
+       o "rsync"
+
+       o "rasync"
+
+       o "rdirsync"
+
+       o "rmand"
+
+       o "rnomand"
+
+       o "ratime"
+
+       o "rnoatime"
+
+       o "rdiratime"
+
+       o "rnodiratime"
+
+       o "rrelatime"
+
+       o "rnorelatime"
+
+       o "rstrictatime"
+
+       o "rnostrictatime"
+
+
+idmap mount options
+       If the idmap option is specified then the mount is ID mapped using the
+       container target user namespace.  This is an experimental feature and
+       can change at any time without notice.
+
+
+       The idmap option supports a custom mapping that can be different than
+       the user namespace used by the container.
+
+
+       The mapping can be specified after the idmap option like:
+       idmap=uids=0-1-10#10-11-10;gids=0-100-10.
+
+
+       For each triplet, the first value is the start of the backing file
+       system IDs that are mapped to the second value on the host.  The length
+       of this mapping is given in the third value.
+
+
+       Multiple ranges are separated with #.
+
+
+       These values are written to the /proc/$PID/uid_map and
+       /proc/$PID/gid_map files to create the user namespace for the idmapped
+       mount.
+
+
+       The only two options that are currently supported after idmap are uids
+       and gids.
+
+
+       When a custom mapping is specified, a new user namespace is created for
+       the idmapped mount.
+
+
+       If no option is specified, then the container user namespace is used.
+
+
+       If the specified mapping is prepended with a '@' then the mapping is
+       considered relative to the container user namespace.  The host ID for
+       the mapping is changed to account for the relative position of the
+       container user in the container user namespace.
+
+
+       For example, the mapping: uids=@1-3-10, given a configuration like
+
+       "uidMappings": [
+             {
+               "containerID": 0,
+               "hostID": 0,
+               "size": 1
+             },
+             {
+               "containerID": 1,
+               "hostID": 2,
+               "size": 1000
+             }
+           ]
+
+
+       will be converted to the absolute value uids=1-4-10, where 4 is
+       calculated by adding 3 (container ID in the uids= mapping) and 1
+       (hostID - containerID for the user namespace mapping where containerID
+       = 1 is found).
+
+
+       The current implementation doesn't take into account multiple user
+       namespace ranges, so it is the caller's responsibility to split a
+       mapping if it overlaps multiple ranges in the user namespace.  In such
+       a case, there won't be any error reported.
+
+
+Automatically create user namespace
+       When running as user different than root, an user namespace is
+       automatically created even if it is not specified in the config file.
+       The current user is mapped to the ID 0 in the container, and any
+       additional id specified in the files /etc/subuid and /etc/subgid is
+       automatically added starting with ID 1.
+
+
+
+CGROUP v1
+       Support for cgroup v1 is deprecated and will be removed in a future
+       release.
+
+
+
+CGROUP v2
+       Note: cgroup v2 does not yet support control of realtime processes and
+       the cpu controller can only be enabled when all RT processes are in the
+       root cgroup. This will make crun fail while running alongside RT
+       processes.
+
+
+       If the cgroup configuration found is for cgroup v1, crun attempts a
+       conversion when running on a cgroup v2 system.
+
+
+       These are the OCI resources currently supported with cgroup v2 and how
+       they are converted when needed from the cgroup v1 configuration.
+
+
+Memory controller
+
+       +------------+--------------------+----------------------+------------------+
+       |OCI (x)     | cgroup 2 value (y) | conversion           | comment          |
+       +------------+--------------------+----------------------+------------------+
+       |limit       | memory.max         | y = x                |                  |
+       +------------+--------------------+----------------------+------------------+
+       |swap        | memory.swap.max    | y = x - memory_limit | the swap limit   |
+       |            |                    |                      | on cgroup v1     |
+       |            |                    |                      | includes the     |
+       |            |                    |                      | memory usage too |
+       +------------+--------------------+----------------------+------------------+
+       |reservation | memory.low         | y = x                |                  |
+       +------------+--------------------+----------------------+------------------+
+
+PIDs controller
+
+       +--------+--------------------+------------+---------+
+       |OCI (x) | cgroup 2 value (y) | conversion | comment |
+       +--------+--------------------+------------+---------+
+       |limit   | pids.max           | y = x      |         |
+       +--------+--------------------+------------+---------+
+
+CPU controller
+
+       +--------+--------------------+------------------+------------------+
+       |OCI (x) | cgroup 2 value (y) | conversion       | comment          |
+       +--------+--------------------+------------------+------------------+
+       |shares  | cpu.weight         | y=10^((log2(x)^2 |                  |
+       |        |                    | + 125 * log2(x)) |                  |
+       |        |                    | / 612.0 - 7.0 /  |                  |
+       |        |                    | 34.0)            |                  |
+       +--------+--------------------+------------------+------------------+
+       |        | convert from       |                  |                  |
+       |        | [2-262144] to      |                  |                  |
+       |        | [1-10000]          |                  |                  |
+       +--------+--------------------+------------------+------------------+
+       |period  | cpu.max            | y = x            | period and quota |
+       |        |                    |                  | are written      |
+       |        |                    |                  | together         |
+       +--------+--------------------+------------------+------------------+
+       |quota   | cpu.max            | y = x            | period and quota |
+       |        |                    |                  | are written      |
+       |        |                    |                  | together         |
+       +--------+--------------------+------------------+------------------+
+
+blkio controller
+
+       +--------------+----------------------+-------------------------+------------------+
+       |OCI (x)       | cgroup 2 value (y)   | conversion              | comment          |
+       +--------------+----------------------+-------------------------+------------------+
+       |weight        | io.bfq.weight        | y = x                   |                  |
+       +--------------+----------------------+-------------------------+------------------+
+       |weight_device | io.bfq.weight        | y = x                   |                  |
+       +--------------+----------------------+-------------------------+------------------+
+       |weight        | io.weight (fallback) | y = 1 + (x-10)*9999/990 | convert linearly |
+       |              |                      |                         | from [10-1000]   |
+       |              |                      |                         | to [1-10000]     |
+       +--------------+----------------------+-------------------------+------------------+
+       |weight_device | io.weight (fallback) | y = 1 + (x-10)*9999/990 | convert linearly |
+       |              |                      |                         | from [10-1000]   |
+       |              |                      |                         | to [1-10000]     |
+       +--------------+----------------------+-------------------------+------------------+
+       |rbps          | io.max               | y=x                     |                  |
+       +--------------+----------------------+-------------------------+------------------+
+       |wbps          | io.max               | y=x                     |                  |
+       +--------------+----------------------+-------------------------+------------------+
+       |riops         | io.max               | y=x                     |                  |
+       +--------------+----------------------+-------------------------+------------------+
+       |wiops         | io.max               | y=x                     |                  |
+       +--------------+----------------------+-------------------------+------------------+
+
+cpuset controller
+
+       +--------+--------------------+------------+---------+
+       |OCI (x) | cgroup 2 value (y) | conversion | comment |
+       +--------+--------------------+------------+---------+
+       |cpus    | cpuset.cpus        | y = x      |         |
+       +--------+--------------------+------------+---------+
+       |mems    | cpuset.mems        | y = x      |         |
+       +--------+--------------------+------------+---------+
+
+hugetlb controller
+
+       +----------------+--------------------+------------+---------+
+       |OCI (x)         | cgroup 2 value (y) | conversion | comment |
+       +----------------+--------------------+------------+---------+
+       |.limit_in_bytes | hugetlb..max       | y = x      |         |
+       +----------------+--------------------+------------+---------+
+                                 User Commands                         crun(1)
\ No newline at end of file
diff --git a/lib/virt/crun/model.v b/lib/virt/crun/model.v
new file mode 100644
index 00000000..f099a408
--- /dev/null
+++ b/lib/virt/crun/model.v
@@ -0,0 +1,238 @@
+module crun
+
+// OCI Runtime Spec structures that can be directly encoded to JSON
+pub struct Spec {
+pub mut:
+	oci_version string
+	platform    Platform
+	process     Process
+	root        Root
+	hostname    string
+	mounts      []Mount
+	linux       Linux
+	hooks       Hooks
+}
+
+pub struct Platform {
+pub mut:
+	os   string = 'linux'
+	arch string = 'amd64'
+}
+
+pub struct Process {
+pub mut:
+	terminal             bool = true
+	user                 User
+	args                 []string
+	env                  []string
+	cwd                  string = '/'
+	capabilities         Capabilities
+	rlimits              []Rlimit
+	no_new_privileges    bool
+}
+
+pub struct User {
+pub mut:
+	uid             u32
+	gid             u32
+	additional_gids []u32
+}
+
+pub struct Capabilities {
+pub mut:
+	bounding    []string
+	effective   []string
+	inheritable []string
+	permitted   []string
+	ambient     []string
+}
+
+pub struct Rlimit {
+pub mut:
+	typ  string
+	hard u64
+	soft u64
+}
+
+pub struct Root {
+pub mut:
+	path     string
+	readonly bool
+}
+
+pub struct Mount {
+pub mut:
+	destination string
+	typ         string
+	source      string
+	options     []string
+}
+
+pub struct Linux {
+pub mut:
+	namespaces      []LinuxNamespace
+	resources       LinuxResources
+	devices         []LinuxDevice
+	masked_paths    []string
+	readonly_paths  []string
+	uid_mappings    []LinuxIDMapping
+	gid_mappings    []LinuxIDMapping
+}
+
+pub struct LinuxNamespace {
+pub mut:
+	typ  string
+	path string
+}
+
+pub struct LinuxResources {
+pub mut:
+	memory Memory
+	cpu    CPU
+	pids   Pids
+	blkio  BlockIO
+}
+
+pub struct Memory {
+pub mut:
+	limit       u64
+	reservation u64
+	swap        u64
+	kernel      u64
+	swappiness  i64
+}
+
+pub struct CPU {
+pub mut:
+	shares u64
+	quota  i64
+	period u64
+	cpus   string
+	mems   string
+}
+
+pub struct Pids {
+pub mut:
+	limit i64
+}
+
+pub struct BlockIO {
+pub mut:
+	weight u16
+}
+
+pub struct LinuxDevice {
+pub mut:
+	path        string
+	typ         string
+	major       i64
+	minor       i64
+	file_mode   u32
+	uid         u32
+	gid         u32
+}
+
+pub struct LinuxIDMapping {
+pub mut:
+	container_id u32
+	host_id      u32
+	size         u32
+}
+
+pub struct Hooks {
+pub mut:
+	prestart  []Hook
+	poststart []Hook
+	poststop  []Hook
+}
+
+pub struct Hook {
+pub mut:
+	path string
+	args []string
+	env  []string
+}
+
+// Enums for type safety but convert to strings
+pub enum MountType {
+	bind
+	tmpfs
+	proc
+	sysfs
+	devpts
+	nfs
+	overlay
+}
+
+pub enum MountOption {
+	rw
+	ro
+	noexec
+	nosuid
+	nodev
+	rbind
+	relatime
+	strictatime
+	mode
+	size
+}
+
+pub enum Capability {
+	cap_chown
+	cap_dac_override
+	cap_dac_read_search
+	cap_fowner
+	cap_fsetid
+	cap_kill
+	cap_setgid
+	cap_setuid
+	cap_setpcap
+	cap_linux_immutable
+	cap_net_bind_service
+	cap_net_broadcast
+	cap_net_admin
+	cap_net_raw
+	cap_ipc_lock
+	cap_ipc_owner
+	cap_sys_module
+	cap_sys_rawio
+	cap_sys_chroot
+	cap_sys_ptrace
+	cap_sys_pacct
+	cap_sys_admin
+	cap_sys_boot
+	cap_sys_nice
+	cap_sys_resource
+	cap_sys_time
+	cap_sys_tty_config
+	cap_mknod
+	cap_lease
+	cap_audit_write
+	cap_audit_control
+	cap_setfcap
+	cap_mac_override
+	cap_mac_admin
+	cap_syslog
+	cap_wake_alarm
+	cap_block_suspend
+	cap_audit_read
+}
+
+pub enum RlimitType {
+	rlimit_cpu
+	rlimit_fsize
+	rlimit_data
+	rlimit_stack
+	rlimit_core
+	rlimit_rss
+	rlimit_nproc
+	rlimit_nofile
+	rlimit_memlock
+	rlimit_as
+	rlimit_lock
+	rlimit_sigpending
+	rlimit_msgqueue
+	rlimit_nice
+	rlimit_rtprio
+	rlimit_rttime
+}
\ No newline at end of file
diff --git a/lib/virt/crun/readme.md b/lib/virt/crun/readme.md
new file mode 100644
index 00000000..b0ee95b1
--- /dev/null
+++ b/lib/virt/crun/readme.md
@@ -0,0 +1,4 @@
+
+
+specs on https://github.com/opencontainers/runtime-spec
+
diff --git a/lib/virt/crun/tojson.v b/lib/virt/crun/tojson.v
new file mode 100644
index 00000000..0778eda9
--- /dev/null
+++ b/lib/virt/crun/tojson.v
@@ -0,0 +1,40 @@
+module crun
+
+import json
+import freeflowuniverse.herolib.core.pathlib
+
+// Simple JSON generation using V's built-in json module
+pub fn (config CrunConfig) to_json() !string {
+	return json.encode_pretty(config.spec)
+}
+
+// Convenience method to save JSON to file
+pub fn (config CrunConfig) save_to_file(path string) ! {
+	json_content := config.to_json()!
+	
+	mut file := pathlib.get_file(path: path, create: true)!
+	file.write(json_content)!
+}
+
+// Validate the configuration
+pub fn (config CrunConfig) validate() ! {
+	if config.spec.oci_version == '' {
+		return error('ociVersion cannot be empty')
+	}
+	
+	if config.spec.process.args.len == 0 {
+		return error('process.args cannot be empty')
+	}
+	
+	if config.spec.root.path == '' {
+		return error('root.path cannot be empty')
+	}
+	
+	// Validate that required capabilities are present
+	required_caps := ['CAP_AUDIT_WRITE', 'CAP_KILL', 'CAP_NET_BIND_SERVICE']
+	for cap in required_caps {
+		if cap !in config.spec.process.capabilities.bounding {
+			return error('missing required capability: ${cap}')
+		}
+	}
+}
\ No newline at end of file
diff --git a/lib/virt/heropods/config_template.json b/lib/virt/heropods/config_template.json
new file mode 100644
index 00000000..51cd699a
--- /dev/null
+++ b/lib/virt/heropods/config_template.json
@@ -0,0 +1,121 @@
+{
+  "ociVersion": "1.0.2",
+  "process": {
+    "terminal": true,
+    "user": {
+      "uid": 0,
+      "gid": 0
+    },
+    "args": [
+      "/bin/sh",
+      "-c",
+      "while true; do sleep 30; done"
+    ],
+    "env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+      "TERM=xterm"
+    ],
+    "cwd": "/",
+    "capabilities": {
+      "bounding": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "effective": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "inheritable": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "permitted": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ]
+    },
+    "rlimits": [
+      {
+        "type": "RLIMIT_NOFILE",
+        "hard": 1024,
+        "soft": 1024
+      }
+    ],
+    "noNewPrivileges": true
+  },
+  "root": {
+    "path": "${rootfs_path}",
+    "readonly": false
+  },
+  "mounts": [
+    {
+      "destination": "/proc",
+      "type": "proc",
+      "source": "proc"
+    },
+    {
+      "destination": "/dev",
+      "type": "tmpfs",
+      "source": "tmpfs",
+      "options": [
+        "nosuid",
+        "strictatime",
+        "mode=755",
+        "size=65536k"
+      ]
+    },
+    {
+      "destination": "/sys",
+      "type": "sysfs",
+      "source": "sysfs",
+      "options": [
+        "nosuid",
+        "noexec",
+        "nodev",
+        "ro"
+      ]
+    }
+  ],
+  "linux": {
+    "namespaces": [
+      {
+        "type": "pid"
+      },
+      {
+        "type": "network"
+      },
+      {
+        "type": "ipc"
+      },
+      {
+        "type": "uts"
+      },
+      {
+        "type": "mount"
+      }
+    ],
+    "maskedPaths": [
+      "/proc/acpi",
+      "/proc/kcore",
+      "/proc/keys",
+      "/proc/latency_stats",
+      "/proc/timer_list",
+      "/proc/timer_stats",
+      "/proc/sched_debug",
+      "/proc/scsi",
+      "/sys/firmware"
+    ],
+    "readonlyPaths": [
+      "/proc/asound",
+      "/proc/bus",
+      "/proc/fs",
+      "/proc/irq",
+      "/proc/sys",
+      "/proc/sysrq-trigger"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/lib/virt/heropods/container.v b/lib/virt/heropods/container.v
new file mode 100644
index 00000000..bb2e1289
--- /dev/null
+++ b/lib/virt/heropods/container.v
@@ -0,0 +1,244 @@
+module heropods
+
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.tmux
+import freeflowuniverse.herolib.osal.core as osal
+import time
+import freeflowuniverse.herolib.builder
+import json
+
+pub struct Container {
+pub mut:
+	name      string
+	node      ?&builder.Node
+	tmux_pane ?&tmux.Pane
+	factory   &ContainerFactory
+}
+
+// Struct to parse JSON output of `crun state`
+struct CrunState {
+	id      string
+	status  string
+	pid     int
+	bundle  string
+	created string
+}
+
+pub fn (mut self Container) start() ! {
+	// Check if container exists in crun
+	container_exists := self.container_exists_in_crun()!
+
+	if !container_exists {
+		// Container doesn't exist, create it first
+		console.print_debug('Container ${self.name} does not exist, creating it...')
+		osal.exec(
+			cmd:    'crun create --bundle ${self.factory.base_dir}/configs/${self.name} ${self.name}'
+			stdout: true
+		)!
+		console.print_debug('Container ${self.name} created')
+	}
+
+	status := self.status()!
+	if status == .running {
+		console.print_debug('Container ${self.name} is already running')
+		return
+	}
+
+	// If container exists but is stopped, we need to delete and recreate it
+	// because crun doesn't allow restarting a stopped container
+	if container_exists && status != .running {
+		console.print_debug('Container ${self.name} exists but is stopped, recreating...')
+		osal.exec(cmd: 'crun delete ${self.name}', stdout: false) or {}
+		osal.exec(
+			cmd:    'crun create --bundle ${self.factory.base_dir}/configs/${self.name} ${self.name}'
+			stdout: true
+		)!
+		console.print_debug('Container ${self.name} recreated')
+	}
+
+	// start the container (crun start doesn't have --detach flag)
+	osal.exec(cmd: 'crun start ${self.name}', stdout: true)!
+	console.print_green('Container ${self.name} started')
+}
+
+pub fn (mut self Container) stop() ! {
+	status := self.status()!
+	if status == .stopped {
+		console.print_debug('Container ${self.name} is already stopped')
+		return
+	}
+
+	osal.exec(cmd: 'crun kill ${self.name} SIGTERM', stdout: false) or {}
+	time.sleep(2 * time.second)
+
+	// Force kill if still running
+	if self.status()! == .running {
+		osal.exec(cmd: 'crun kill ${self.name} SIGKILL', stdout: false) or {}
+	}
+	console.print_green('Container ${self.name} stopped')
+}
+
+pub fn (mut self Container) delete() ! {
+	// Check if container exists before trying to delete
+	if !self.container_exists_in_crun()! {
+		console.print_debug('Container ${self.name} does not exist, nothing to delete')
+		return
+	}
+
+	self.stop()!
+	osal.exec(cmd: 'crun delete ${self.name}', stdout: false) or {}
+
+	// Remove from factory's container cache
+	if self.name in self.factory.containers {
+		self.factory.containers.delete(self.name)
+	}
+
+	console.print_green('Container ${self.name} deleted')
+}
+
+// Execute command inside the container
+pub fn (mut self Container) exec(cmd_ osal.Command) !string {
+	// Ensure container is running
+	if self.status()! != .running {
+		self.start()!
+	}
+
+	// Use the builder node to execute inside container
+	mut node := self.node()!
+	console.print_debug('Executing command in container ${self.name}: ${cmd_.cmd}')
+	return node.exec(cmd: cmd_.cmd, stdout: cmd_.stdout)
+}
+
+pub fn (self Container) status() !ContainerStatus {
+	result := osal.exec(cmd: 'crun state ${self.name}', stdout: false) or { return .unknown }
+
+	// Parse JSON output from crun state
+	state := json.decode(CrunState, result.output) or { return .unknown }
+
+	return match state.status {
+		'running' { .running }
+		'stopped' { .stopped }
+		'paused' { .paused }
+		else { .unknown }
+	}
+}
+
+// Check if container exists in crun (regardless of its state)
+fn (self Container) container_exists_in_crun() !bool {
+	// Try to get container state - if it fails, container doesn't exist
+	result := osal.exec(cmd: 'crun state ${self.name}', stdout: false) or { return false }
+
+	// If we get here, the container exists (even if stopped/paused)
+	return result.exit_code == 0
+}
+
+pub enum ContainerStatus {
+	running
+	stopped
+	paused
+	unknown
+}
+
+// Get CPU usage in percentage
+pub fn (self Container) cpu_usage() !f64 {
+	// Use cgroup stats to get CPU usage
+	result := osal.exec(
+		cmd:    'cat /sys/fs/cgroup/system.slice/crun-${self.name}.scope/cpu.stat'
+		stdout: false
+	) or { return 0.0 }
+
+	for line in result.output.split_into_lines() {
+		if line.starts_with('usage_usec') {
+			usage := line.split(' ')[1].f64()
+			return usage / 1000000.0 // Convert to percentage
+		}
+	}
+	return 0.0
+}
+
+// Get memory usage in MB
+pub fn (self Container) mem_usage() !f64 {
+	result := osal.exec(
+		cmd:    'cat /sys/fs/cgroup/system.slice/crun-${self.name}.scope/memory.current'
+		stdout: false
+	) or { return 0.0 }
+
+	bytes := result.output.trim_space().f64()
+	return bytes / (1024 * 1024) // Convert to MB
+}
+
+pub struct TmuxPaneArgs {
+pub mut:
+	window_name string
+	pane_nr     int
+	pane_name   string            // optional
+	cmd         string            // optional, will execute this cmd
+	reset       bool              // if true will reset everything and restart a cmd
+	env         map[string]string // optional, will set these env vars in the pane
+}
+
+pub fn (mut self Container) tmux_pane(args TmuxPaneArgs) !&tmux.Pane {
+	mut t := tmux.new()!
+	session_name := 'herorun'
+
+	mut session := if t.session_exist(session_name) {
+		t.session_get(session_name)!
+	} else {
+		t.session_create(name: session_name)!
+	}
+
+	// Get or create window
+	mut window := session.window_get(name: args.window_name) or {
+		session.window_new(name: args.window_name)!
+	}
+
+	// Get existing pane by number, or create a new one
+	mut pane := window.pane_get(args.pane_nr) or { window.pane_new()! }
+
+	if args.reset {
+		pane.clear()!
+	}
+
+	// Set environment variables if provided
+	for key, value in args.env {
+		pane.send_keys('export ${key}="${value}"')!
+	}
+
+	// Execute command if provided
+	if args.cmd != '' {
+		pane.send_keys('crun exec ${self.name} ${args.cmd}')!
+	}
+
+	self.tmux_pane = pane
+	return pane
+}
+
+pub fn (mut self Container) node() !&builder.Node {
+	// If node already initialized, return it
+	if self.node != none {
+		return self.node
+	}
+
+	mut b := builder.new()!
+
+	mut exec := builder.ExecutorCrun{
+		container_id: self.name
+		debug:        false
+	}
+
+	exec.init() or {
+		return error('Failed to init ExecutorCrun for container ${self.name}: ${err}')
+	}
+
+	// Create node using the factory method, then override the executor
+	mut node := b.node_new(name: 'container_${self.name}', ipaddr: 'localhost')!
+	node.executor = exec
+	node.platform = .alpine
+	node.cputype = .intel
+	node.done = map[string]string{}
+	node.environment = map[string]string{}
+	node.hostname = self.name
+
+	self.node = node
+	return node
+}
diff --git a/lib/virt/heropods/container_create.v b/lib/virt/heropods/container_create.v
new file mode 100644
index 00000000..80ae4d80
--- /dev/null
+++ b/lib/virt/heropods/container_create.v
@@ -0,0 +1,149 @@
+module heropods
+
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.core as osal
+import freeflowuniverse.herolib.core.pathlib
+import freeflowuniverse.herolib.installers.virt.herorunner as herorunner_installer
+import os
+import x.json2
+
+// Updated enum to be more flexible
+pub enum ContainerImageType {
+	alpine_3_20
+	ubuntu_24_04
+	ubuntu_25_04
+	custom // For custom images downloaded via podman
+}
+
+@[params]
+pub struct ContainerNewArgs {
+pub:
+	name              string @[required]
+	image             ContainerImageType = .alpine_3_20
+	custom_image_name string // Used when image = .custom
+	docker_url        string // Docker image URL for new images
+	reset             bool
+}
+
+pub fn (mut self ContainerFactory) new(args ContainerNewArgs) !&Container {
+	if args.name in self.containers && !args.reset {
+		return self.containers[args.name]
+	}
+
+	// Determine image to use
+	mut image_name := ''
+	mut rootfs_path := ''
+
+	match args.image {
+		.alpine_3_20 {
+			image_name = 'alpine'
+			rootfs_path = '${self.base_dir}/images/alpine/rootfs'
+		}
+		.ubuntu_24_04 {
+			image_name = 'ubuntu_24_04'
+			rootfs_path = '${self.base_dir}/images/ubuntu/24.04/rootfs'
+		}
+		.ubuntu_25_04 {
+			image_name = 'ubuntu_25_04'
+			rootfs_path = '${self.base_dir}/images/ubuntu/25.04/rootfs'
+		}
+		.custom {
+			if args.custom_image_name == '' {
+				return error('custom_image_name is required when using custom image type')
+			}
+			image_name = args.custom_image_name
+			rootfs_path = '${self.base_dir}/images/${image_name}/rootfs'
+
+			// If image not yet extracted, pull and unpack it
+			if !os.is_dir(rootfs_path) && args.docker_url != '' {
+				console.print_debug('Pulling image ${args.docker_url} with podman...')
+				self.podman_pull_and_export(args.docker_url, image_name, rootfs_path)!
+			}
+		}
+	}
+
+	// Verify rootfs exists
+	if !os.is_dir(rootfs_path) {
+		return error('Image rootfs not found: ${rootfs_path}. Please ensure the image is available.')
+	}
+
+	// Create container config (with terminal disabled) but don't create the container yet
+	self.create_container_config(args.name, rootfs_path)!
+
+	// Ensure crun is installed on host
+	if !osal.cmd_exists('crun') {
+		mut herorunner := herorunner_installer.new()!
+		herorunner.install()!
+	}
+
+	// Create container struct but don't create the actual container in crun yet
+	// The actual container creation will happen in container.start()
+	mut container := &Container{
+		name:    args.name
+		factory: &self
+	}
+
+	self.containers[args.name] = container
+	return container
+}
+
+// Create OCI config.json from template
+fn (self ContainerFactory) create_container_config(container_name string, rootfs_path string) ! {
+	config_dir := '${self.base_dir}/configs/${container_name}'
+	osal.exec(cmd: 'mkdir -p ${config_dir}', stdout: false)!
+
+	// Load template
+	mut config_content := $tmpl('config_template.json')
+
+	// Parse JSON with json2
+	mut root := json2.raw_decode(config_content)!
+	mut config := root.as_map()
+
+	// Get or create process map
+	mut process := if 'process' in config {
+		config['process'].as_map()
+	} else {
+		map[string]json2.Any{}
+	}
+
+	// Force disable terminal
+	process['terminal'] = json2.Any(false)
+	config['process'] = json2.Any(process)
+
+	// Write back to config.json
+	config_path := '${config_dir}/config.json'
+	mut p := pathlib.get_file(path: config_path, create: true)!
+	p.write(json2.encode_pretty(json2.Any(config)))!
+}
+
+// Use podman to pull image and extract rootfs
+fn (self ContainerFactory) podman_pull_and_export(docker_url string, image_name string, rootfs_path string) ! {
+	// Pull image
+	osal.exec(
+		cmd:    'podman pull ${docker_url}'
+		stdout: true
+	)!
+
+	// Create temp container
+	temp_name := 'tmp_${image_name}_${os.getpid()}'
+	osal.exec(
+		cmd:    'podman create --name ${temp_name} ${docker_url}'
+		stdout: true
+	)!
+
+	// Export container filesystem
+	osal.exec(
+		cmd:    'mkdir -p ${rootfs_path}'
+		stdout: false
+	)!
+	osal.exec(
+		cmd:    'podman export ${temp_name} | tar -C ${rootfs_path} -xf -'
+		stdout: true
+	)!
+
+	// Cleanup temp container
+	osal.exec(
+		cmd:    'podman rm ${temp_name}'
+		stdout: false
+	)!
+}
diff --git a/lib/virt/heropods/container_image.v b/lib/virt/heropods/container_image.v
new file mode 100644
index 00000000..ab8d4037
--- /dev/null
+++ b/lib/virt/heropods/container_image.v
@@ -0,0 +1,295 @@
+module heropods
+
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.core as osal
+import freeflowuniverse.herolib.core.pathlib
+import freeflowuniverse.herolib.core.texttools
+import os
+import json
+
+@[heap]
+pub struct ContainerImage {
+pub mut:
+	image_name  string @[required] // image is located in ${self.factory.base_dir}/images/<image_name>/rootfs
+	docker_url  string // optional docker image URL
+	rootfs_path string // path to the extracted rootfs
+	size_mb     f64    // size in MB
+	created_at  string // creation timestamp
+	factory     &ContainerFactory @[skip; str: skip]
+}
+
+@[params]
+pub struct ContainerImageArgs {
+pub mut:
+	image_name string @[required] // image is located in ${self.factory.base_dir}/images/<image_name>/rootfs
+	docker_url string // docker image URL like "alpine:3.20" or "ubuntu:24.04"
+	reset      bool
+}
+
+@[params]
+pub struct ImageExportArgs {
+pub mut:
+	dest_path      string @[required] // destination .tgz file path
+	compress_level int = 6 // compression level 1-9
+}
+
+@[params]
+pub struct ImageImportArgs {
+pub mut:
+	source_path string @[required] // source .tgz file path
+	reset       bool // overwrite if exists
+}
+
+// Create new image or get existing
+pub fn (mut self ContainerFactory) image_new(args ContainerImageArgs) !&ContainerImage {
+	mut image_name := texttools.name_fix(args.image_name)
+	rootfs_path := '${self.base_dir}/images/${image_name}/rootfs'
+
+	// Check if image already exists
+	if image_name in self.images && !args.reset {
+		return self.images[image_name] or { panic('bug') }
+	}
+
+	// Ensure podman is installed
+	if !osal.cmd_exists('podman') {
+		return error('Podman is required for image management. Please install podman first.')
+	}
+
+	mut image := &ContainerImage{
+		image_name:  image_name
+		docker_url:  args.docker_url
+		rootfs_path: rootfs_path
+		factory:     &self
+	}
+
+	// If docker_url is provided, download and extract the image
+	if args.docker_url != '' {
+		image.download_from_docker(args.docker_url, args.reset)!
+	} else {
+		// Check if rootfs directory exists
+		if !os.is_dir(rootfs_path) {
+			return error('Image rootfs not found at ${rootfs_path} and no docker_url provided')
+		}
+	}
+
+	// Update image metadata
+	image.update_metadata()!
+
+	self.images[image_name] = image
+	return image
+}
+
+// Download image from docker registry using podman
+fn (mut self ContainerImage) download_from_docker(docker_url string, reset bool) ! {
+	console.print_header('Downloading image: ${docker_url}')
+
+	// Clean image name for local storage
+	image_dir := '${self.factory.base_dir}/images/${self.image_name}'
+
+	// Remove existing if reset is true
+	if reset && os.is_dir(image_dir) {
+		osal.exec(cmd: 'rm -rf ${image_dir}', stdout: false)!
+	}
+
+	// Create image directory
+	osal.exec(cmd: 'mkdir -p ${image_dir}', stdout: false)!
+
+	// Pull image using podman
+	console.print_debug('Pulling image: ${docker_url}')
+	osal.exec(cmd: 'podman pull ${docker_url}', stdout: true)!
+
+	// Create container from image (without running it)
+	temp_container := 'temp_${self.image_name}_extract'
+	osal.exec(cmd: 'podman create --name ${temp_container} ${docker_url}', stdout: false)!
+
+	// Export container filesystem
+	tar_file := '${image_dir}/rootfs.tar'
+	osal.exec(cmd: 'podman export ${temp_container} -o ${tar_file}', stdout: true)!
+
+	// Extract to rootfs directory
+	osal.exec(cmd: 'mkdir -p ${self.rootfs_path}', stdout: false)!
+	osal.exec(cmd: 'tar -xf ${tar_file} -C ${self.rootfs_path}', stdout: true)!
+
+	// Clean up temporary container and tar file
+	osal.exec(cmd: 'podman rm ${temp_container}', stdout: false) or {}
+	osal.exec(cmd: 'rm -f ${tar_file}', stdout: false) or {}
+
+	// Remove the pulled image from podman to save space (optional)
+	osal.exec(cmd: 'podman rmi ${docker_url}', stdout: false) or {}
+
+	console.print_green('Image ${docker_url} extracted to ${self.rootfs_path}')
+}
+
+// Update image metadata (size, creation time, etc.)
+fn (mut self ContainerImage) update_metadata() ! {
+	if !os.is_dir(self.rootfs_path) {
+		return error('Rootfs path does not exist: ${self.rootfs_path}')
+	}
+
+	// Calculate size
+	result := osal.exec(cmd: 'du -sm ${self.rootfs_path}', stdout: false)!
+	result_parts := result.output.split_by_space()[0] or { panic('bug') }
+	size_str := result_parts.trim_space()
+	self.size_mb = size_str.f64()
+
+	// Get creation time
+	info := os.stat(self.rootfs_path) or { return error('stat failed: ${err}') }
+	self.created_at = info.ctime.str() // or mtime.str(), depending on what you want
+}
+
+// List all available images
+pub fn (mut self ContainerFactory) images_list() ![]&ContainerImage {
+	mut images := []&ContainerImage{}
+
+	images_base_dir := '${self.base_dir}/images'
+	if !os.is_dir(images_base_dir) {
+		return images
+	}
+
+	// Scan for image directories
+	dirs := os.ls(images_base_dir)!
+	for dir in dirs {
+		full_path := '${images_base_dir}/${dir}'
+		if os.is_dir(full_path) {
+			rootfs_path := '${full_path}/rootfs'
+			if os.is_dir(rootfs_path) {
+				// Create image object if not in cache
+				if dir !in self.images {
+					mut image := &ContainerImage{
+						image_name:  dir
+						rootfs_path: rootfs_path
+						factory:     &self
+					}
+					image.update_metadata() or {
+						console.print_stderr('Failed to update metadata for image ${dir}: ${err}')
+						continue
+					}
+					self.images[dir] = image
+				}
+				images << self.images[dir] or { panic('bug') }
+			}
+		}
+	}
+
+	return images
+}
+
+// Export image to .tgz file
+pub fn (mut self ContainerImage) export(args ImageExportArgs) ! {
+	if !os.is_dir(self.rootfs_path) {
+		return error('Image rootfs not found: ${self.rootfs_path}')
+	}
+
+	console.print_header('Exporting image ${self.image_name} to ${args.dest_path}')
+
+	// Ensure destination directory exists
+	dest_dir := os.dir(args.dest_path)
+	osal.exec(cmd: 'mkdir -p ${dest_dir}', stdout: false)!
+
+	// Create compressed archive
+	cmd := 'tar -czf ${args.dest_path} -C ${os.dir(self.rootfs_path)} ${os.base(self.rootfs_path)}'
+	osal.exec(cmd: cmd, stdout: true)!
+
+	console.print_green('Image exported successfully to ${args.dest_path}')
+}
+
+// Import image from .tgz file
+pub fn (mut self ContainerFactory) image_import(args ImageImportArgs) !&ContainerImage {
+	if !os.exists(args.source_path) {
+		return error('Source file not found: ${args.source_path}')
+	}
+
+	// Extract image name from filename
+	filename := os.base(args.source_path)
+	image_name := filename.replace('.tgz', '').replace('.tar.gz', '')
+	image_name_clean := texttools.name_fix(image_name)
+
+	console.print_header('Importing image from ${args.source_path}')
+
+	image_dir := '${self.base_dir}/images/${image_name_clean}'
+	rootfs_path := '${image_dir}/rootfs'
+
+	// Check if image already exists
+	if os.is_dir(rootfs_path) && !args.reset {
+		return error('Image ${image_name_clean} already exists. Use reset=true to overwrite.')
+	}
+
+	// Remove existing if reset
+	if args.reset && os.is_dir(image_dir) {
+		osal.exec(cmd: 'rm -rf ${image_dir}', stdout: false)!
+	}
+
+	// Create directories
+	osal.exec(cmd: 'mkdir -p ${image_dir}', stdout: false)!
+
+	// Extract archive
+	osal.exec(cmd: 'tar -xzf ${args.source_path} -C ${image_dir}', stdout: true)!
+
+	// Create image object
+	mut image := &ContainerImage{
+		image_name:  image_name_clean
+		rootfs_path: rootfs_path
+		factory:     &self
+	}
+
+	image.update_metadata()!
+	self.images[image_name_clean] = image
+
+	console.print_green('Image imported successfully: ${image_name_clean}')
+	return image
+}
+
+// Delete image
+pub fn (mut self ContainerImage) delete() ! {
+	console.print_header('Deleting image: ${self.image_name}')
+
+	image_dir := os.dir(self.rootfs_path)
+	if os.is_dir(image_dir) {
+		osal.exec(cmd: 'rm -rf ${image_dir}', stdout: true)!
+	}
+
+	// Remove from factory cache
+	if self.image_name in self.factory.images {
+		self.factory.images.delete(self.image_name)
+	}
+
+	console.print_green('Image ${self.image_name} deleted successfully')
+}
+
+// Get image info as map
+pub fn (self ContainerImage) info() map[string]string {
+	return {
+		'name':        self.image_name
+		'docker_url':  self.docker_url
+		'rootfs_path': self.rootfs_path
+		'size_mb':     self.size_mb.str()
+		'created_at':  self.created_at
+	}
+}
+
+// List available docker images that can be downloaded
+pub fn list_available_docker_images() []string {
+	return [
+		'alpine:3.20',
+		'alpine:3.19',
+		'alpine:latest',
+		'ubuntu:24.04',
+		'ubuntu:22.04',
+		'ubuntu:20.04',
+		'ubuntu:latest',
+		'debian:12',
+		'debian:11',
+		'debian:latest',
+		'fedora:39',
+		'fedora:38',
+		'fedora:latest',
+		'archlinux:latest',
+		'centos:stream9',
+		'rockylinux:9',
+		'nginx:alpine',
+		'redis:alpine',
+		'postgres:15-alpine',
+		'node:20-alpine',
+		'python:3.12-alpine',
+	]
+}
diff --git a/lib/virt/heropods/factory.v b/lib/virt/heropods/factory.v
new file mode 100644
index 00000000..ef6516c1
--- /dev/null
+++ b/lib/virt/heropods/factory.v
@@ -0,0 +1,138 @@
+module heropods
+
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.core as osal
+import time
+import os
+
+@[heap]
+pub struct ContainerFactory {
+pub mut:
+	tmux_session string
+	containers   map[string]&Container
+	images       map[string]&ContainerImage
+	base_dir     string
+}
+
+@[params]
+pub struct FactoryInitArgs {
+pub:
+	reset      bool
+	use_podman bool = true
+}
+
+pub fn new(args FactoryInitArgs) !ContainerFactory {
+	mut f := ContainerFactory{}
+	f.init(args)!
+	return f
+}
+
+fn (mut self ContainerFactory) init(args FactoryInitArgs) ! {
+	// Ensure base directories exist
+	self.base_dir = os.getenv_opt('CONTAINERS_DIR') or { os.home_dir() + '/.containers' }
+
+	osal.exec(
+		cmd:    'mkdir -p ${self.base_dir}/images ${self.base_dir}/configs ${self.base_dir}/runtime'
+		stdout: false
+	)!
+
+	if args.use_podman {
+		if !osal.cmd_exists('podman') {
+			console.print_stderr('Warning: podman not found. Install podman for better image management.')
+			console.print_debug('Install with: apt install podman (Ubuntu) or brew install podman (macOS)')
+		} else {
+			console.print_debug('Using podman for image management')
+		}
+	}
+
+	// Load existing images into cache
+	self.load_existing_images()!
+
+	// Setup default images if not using podman
+	if !args.use_podman {
+		self.setup_default_images(args.reset)!
+	}
+}
+
+fn (mut self ContainerFactory) setup_default_images(reset bool) ! {
+	console.print_header('Setting up default images...')
+
+	default_images := [ContainerImageType.alpine_3_20, .ubuntu_24_04, .ubuntu_25_04]
+
+	for img in default_images {
+		mut args := ContainerImageArgs{
+			image_name: img.str()
+			reset:      reset
+		}
+		if img.str() !in self.images || reset {
+			console.print_debug('Preparing default image: ${img.str()}')
+			_ = self.image_new(args)!
+		}
+	}
+}
+
+// Load existing images from filesystem into cache
+fn (mut self ContainerFactory) load_existing_images() ! {
+	images_base_dir := '${self.base_dir}/containers/images'
+	if !os.is_dir(images_base_dir) {
+		return
+	}
+
+	dirs := os.ls(images_base_dir) or { return }
+	for dir in dirs {
+		full_path := '${images_base_dir}/${dir}'
+		if os.is_dir(full_path) {
+			rootfs_path := '${full_path}/rootfs'
+			if os.is_dir(rootfs_path) {
+				mut image := &ContainerImage{
+					image_name:  dir
+					rootfs_path: rootfs_path
+					factory:     &self
+				}
+				image.update_metadata() or {
+					console.print_stderr('⚠️ Failed to update metadata for image ${dir}: ${err}')
+					continue
+				}
+				self.images[dir] = image
+				console.print_debug('Loaded existing image: ${dir}')
+			}
+		}
+	}
+}
+
+pub fn (mut self ContainerFactory) get(args ContainerNewArgs) !&Container {
+	if args.name !in self.containers {
+		return error('Container "${args.name}" does not exist. Use factory.new() to create it first.')
+	}
+	return self.containers[args.name]
+}
+
+// Get image by name
+pub fn (mut self ContainerFactory) image_get(name string) !&ContainerImage {
+	if name !in self.images {
+		return error('Image "${name}" not found in cache. Try importing or downloading it.')
+	}
+	return self.images[name]
+}
+
+// List all containers currently managed by crun
+pub fn (self ContainerFactory) list() ![]Container {
+	mut containers := []Container{}
+	result := osal.exec(cmd: 'crun list --format json', stdout: false)!
+
+	// Parse crun list output (tab-separated)
+	lines := result.output.split_into_lines()
+	for line in lines {
+		if line.trim_space() == '' || line.starts_with('ID') {
+			continue
+		}
+		parts := line.split('\t')
+		if parts.len > 0 {
+			containers << Container{
+				name:    parts[0]
+				factory: &self
+			}
+		}
+	}
+	return containers
+}
diff --git a/lib/virt/heropods/instructions.md b/lib/virt/heropods/instructions.md
new file mode 100644
index 00000000..5e6c77c1
--- /dev/null
+++ b/lib/virt/heropods/instructions.md
@@ -0,0 +1,5 @@
+
+
+- use builder... for remote execution inside the container
+    - make an executor like we have for SSH but then for the container, so we can use this to execute commands inside the container
+- 
\ No newline at end of file
diff --git a/lib/virt/heropods/readme.md b/lib/virt/heropods/readme.md
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/virt/herorun/config_template.json b/lib/virt/herorun/config_template.json
new file mode 100644
index 00000000..e1ef0f56
--- /dev/null
+++ b/lib/virt/herorun/config_template.json
@@ -0,0 +1,119 @@
+{
+  "ociVersion": "1.0.2",
+  "process": {
+    "terminal": true,
+    "user": {
+      "uid": 0,
+      "gid": 0
+    },
+    "args": [
+      "/bin/sh"
+    ],
+    "env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+      "TERM=xterm"
+    ],
+    "cwd": "/",
+    "capabilities": {
+      "bounding": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "effective": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "inheritable": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ],
+      "permitted": [
+        "CAP_AUDIT_WRITE",
+        "CAP_KILL",
+        "CAP_NET_BIND_SERVICE"
+      ]
+    },
+    "rlimits": [
+      {
+        "type": "RLIMIT_NOFILE",
+        "hard": 1024,
+        "soft": 1024
+      }
+    ],
+    "noNewPrivileges": true
+  },
+  "root": {
+    "path": "${rootfs_path}",
+    "readonly": false
+  },
+  "mounts": [
+    {
+      "destination": "/proc",
+      "type": "proc",
+      "source": "proc"
+    },
+    {
+      "destination": "/dev",
+      "type": "tmpfs",
+      "source": "tmpfs",
+      "options": [
+        "nosuid",
+        "strictatime",
+        "mode=755",
+        "size=65536k"
+      ]
+    },
+    {
+      "destination": "/sys",
+      "type": "sysfs",
+      "source": "sysfs",
+      "options": [
+        "nosuid",
+        "noexec",
+        "nodev",
+        "ro"
+      ]
+    }
+  ],
+  "linux": {
+    "namespaces": [
+      {
+        "type": "pid"
+      },
+      {
+        "type": "network"
+      },
+      {
+        "type": "ipc"
+      },
+      {
+        "type": "uts"
+      },
+      {
+        "type": "mount"
+      }
+    ],
+    "maskedPaths": [
+      "/proc/acpi",
+      "/proc/kcore",
+      "/proc/keys",
+      "/proc/latency_stats",
+      "/proc/timer_list",
+      "/proc/timer_stats",
+      "/proc/sched_debug",
+      "/proc/scsi",
+      "/sys/firmware"
+    ],
+    "readonlyPaths": [
+      "/proc/asound",
+      "/proc/bus",
+      "/proc/fs",
+      "/proc/irq",
+      "/proc/sys",
+      "/proc/sysrq-trigger"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/lib/virt/herorun2/README.md b/lib/virt/herorun2/README.md
new file mode 100644
index 00000000..7c22a4aa
--- /dev/null
+++ b/lib/virt/herorun2/README.md
@@ -0,0 +1,107 @@
+# HeroRun - Remote Container Management
+
+A V library for managing remote containers using runc and tmux, with support for multiple cloud providers.
+
+## Features
+
+- **Multi-provider support**: Currently supports Hetzner, with ThreeFold coming soon
+- **Automatic setup**: Installs required packages (runc, tmux, curl, xz-utils) automatically
+- **Container isolation**: Uses runc for lightweight container management
+- **tmux integration**: Each container gets its own tmux session for multiple concurrent shells
+- **Clean API**: Simple interface that hides infrastructure complexity
+
+## Project Structure
+
+```txt
+lib/virt/herorun/
+├── interfaces.v          # Shared interfaces and parameter structs
+├── nodes.v               # Node management and SSH connectivity
+├── container.v           # Container struct and lifecycle operations
+├── executor.v            # Optimized command execution engine
+├── factory.v             # Provider abstraction and backend creation
+├── hetzner_backend.v     # Hetzner cloud implementation
+└── README.md            # This file
+```
+
+## Usage
+
+### Basic Example
+
+```v
+import freeflowuniverse.herolib.virt.herorun
+
+// Create user with SSH key
+mut user := herorun.new_user(keyname: 'id_ed25519')!
+
+// Create Hetzner backend
+mut backend := herorun.new_hetzner_backend(
+    node_ip: '65.21.132.119'
+    user:    'root'
+)!
+
+// Connect to node (installs required packages automatically)
+backend.connect(keyname: user.keyname)!
+
+// Send a test command to the node
+backend.send_command(cmd: 'ls')!
+
+// Get or create container (uses tmux behind the scenes)
+mut container := backend.get_or_create_container(name: 'test_container')!
+
+// Attach to container tmux session
+container.attach()!
+
+// Send command to container
+container.send_command(cmd: 'ls')!
+
+// Get container logs
+logs := container.get_logs()!
+println('Container logs:')
+println(logs)
+
+```
+
+### Running the Example
+
+```bash
+# Make the example executable
+chmod +x examples/virt/herorun/herorun.vsh
+
+# Run it
+./examples/virt/herorun/herorun.vsh
+```
+
+## Architecture
+
+### Interfaces
+
+- **NodeBackend**: Defines operations for connecting to and managing remote nodes
+- **ContainerBackend**: Defines operations for container lifecycle management
+
+### Providers
+
+- **HetznerBackend**: Implementation for Hetzner cloud servers
+- **ThreeFoldBackend**: (Coming soon) Implementation for ThreeFold nodes
+
+### Key Components
+
+1. **SSH Integration**: Uses herolib's sshagent module for secure connections
+2. **tmux Management**: Uses herolib's tmux module for session management
+3. **Container Runtime**: Uses runc for lightweight container execution
+4. **Hetzner Integration**: Uses herolib's hetznermanager module
+
+## Dependencies
+
+- `freeflowuniverse.herolib.osal.sshagent`
+- `freeflowuniverse.herolib.osal.tmux`
+- `freeflowuniverse.herolib.installers.web.hetznermanager`
+- `freeflowuniverse.herolib.ui.console`
+
+## Future Enhancements
+
+- ThreeFold backend implementation
+- Support for additional cloud providers (AWS, GCP, etc.)
+- Container image management
+- Network configuration
+- Volume mounting
+- Resource limits and monitoring
diff --git a/lib/virt/herorun2/container.v b/lib/virt/herorun2/container.v
new file mode 100644
index 00000000..17d21d6e
--- /dev/null
+++ b/lib/virt/herorun2/container.v
@@ -0,0 +1,95 @@
+module herorun2
+
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.tmux
+import time
+
+// Container struct and related functionality
+pub struct Container {
+pub:
+	name string
+	node Node
+pub mut:
+	tmux tmux.Tmux
+}
+
+// Implement ContainerBackend interface for Container
+pub fn (mut c Container) attach() ! {
+	console.print_header('🔗 Attaching to container: ${c.name}')
+
+	// Create or get the session for this container
+	if !c.tmux.session_exist(c.name) {
+		console.print_stdout('Starting new tmux session for container ${c.name}')
+
+		// Use the tmux convenience method to create session and window in one go
+		shell_cmd := 'ssh ${c.node.settings.user}@${c.node.settings.node_ip}'
+		c.tmux.window_new(
+			session_name: c.name
+			name:         'main'
+			cmd:          shell_cmd
+			reset:        true
+		)!
+
+		// Wait for the session and window to be properly created
+		time.sleep(500 * time.millisecond)
+
+		// Rescan to make sure everything is properly registered
+		c.tmux.scan()!
+	}
+
+	console.print_green('Attached to container session ${c.name}')
+}
+
+pub fn (mut c Container) send_command(args ContainerCommandArgs) ! {
+	console.print_header('📝 Exec in container ${c.name}')
+
+	// Ensure session exists
+	if !c.tmux.session_exist(c.name) {
+		return error('Container session ${c.name} does not exist. Call attach() first.')
+	}
+
+	// Debug: print session info
+	mut session := c.tmux.session_get(c.name)!
+	console.print_debug('Session ${c.name} has ${session.windows.len} windows')
+	for window in session.windows {
+		console.print_debug('  Window: ${window.name} (ID: ${window.id})')
+	}
+
+	// Try to get the main window
+	mut window := session.window_get(name: 'main') or {
+		// If main window doesn't exist, try to get the first window
+		if session.windows.len > 0 {
+			session.windows[0]
+		} else {
+			return error('No windows available in session ${c.name}')
+		}
+	}
+
+	// Refresh window state to get current panes
+	window.scan()!
+
+	// Get the first pane and send the command
+	if window.panes.len > 0 {
+		mut pane := window.panes[0]
+
+		// Send command to enter the container first, then the actual command
+		container_enter_cmd := 'cd /containers/${c.name} && runc exec ${c.name} ${args.cmd}'
+		pane.send_command(container_enter_cmd)!
+	} else {
+		return error('No panes available in container ${c.name}')
+	}
+}
+
+pub fn (mut c Container) get_logs() !string {
+	// Get the session and window
+	mut session := c.tmux.session_get(c.name)!
+	mut window := session.window_get(name: 'main')!
+
+	// Get logs from the first pane
+	if window.panes.len > 0 {
+		mut pane := window.panes[0]
+		return pane.logs_all()!
+	} else {
+		return error('No panes available in container ${c.name}')
+	}
+}
diff --git a/lib/virt/herorun2/executor.v b/lib/virt/herorun2/executor.v
new file mode 100644
index 00000000..1c9036a6
--- /dev/null
+++ b/lib/virt/herorun2/executor.v
@@ -0,0 +1,298 @@
+module herorun2
+
+import freeflowuniverse.herolib.osal.tmux
+import freeflowuniverse.herolib.osal.sshagent
+import freeflowuniverse.herolib.osal.core as osal
+import time
+import os
+
+// Executor - Optimized for AI agent usage with proper module integration
+pub struct Executor {
+pub mut:
+	node         Node
+	container_id string
+	image_script string
+	base_image   BaseImage
+	tmux         tmux.Tmux
+	session_name string
+	window_name  string
+	agent        sshagent.SSHAgent
+}
+
+@[params]
+pub struct ExecutorArgs {
+pub:
+	node_ip      string @[required]
+	user         string @[required]
+	container_id string @[required]
+	keyname      string @[required]
+	image_script string // Optional entry point script
+	base_image   BaseImage = .alpine // Base image type (default: alpine)
+}
+
+// Create new executor with proper module integration
+pub fn new_executor(args ExecutorArgs) !Executor {
+	node := Node{
+		settings: NodeSettings{
+			node_ip: args.node_ip
+			user:    args.user
+		}
+	}
+
+	// Initialize SSH agent properly
+	mut agent := sshagent.new_single()!
+	if !agent.is_agent_responsive() {
+		return error('SSH agent is not responsive')
+	}
+	agent.init()!
+
+	// Initialize tmux properly
+	mut t := tmux.new(sessionid: args.container_id)!
+
+	// Initialize Hetzner manager properly
+	mut hetzner := hetznermanager.get() or { hetznermanager.new()! }
+
+	return Executor{
+		node:         node
+		container_id: args.container_id
+		image_script: args.image_script
+		base_image:   args.base_image
+		tmux:         t
+		session_name: args.container_id
+		window_name:  'main'
+		agent:        agent
+		hetzner:      hetzner
+	}
+}
+
+// Setup - Create container and tmux infrastructure using proper modules
+pub fn (mut e Executor) setup() ! {
+	e.install_requirements()!
+	e.ensure_container()!
+	e.ensure_tmux_infrastructure()!
+}
+
+// Execute - Fast command execution using osal module
+pub fn (mut e Executor) execute(cmd string) !string {
+	// Handle runc commands specially - they need to be run from container directory
+	mut final_cmd := cmd
+	if cmd.starts_with('runc ') {
+		// Extract container name from runc command
+		parts := cmd.split(' ')
+		if parts.len >= 3 {
+			container_name := parts[2]
+			final_cmd = 'cd /containers/${container_name} && ${cmd}'
+		}
+	}
+
+	// Execute via SSH using osal module for clean output
+	ssh_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "${final_cmd}"'
+	result := osal.exec(cmd: ssh_cmd, stdout: false, name: 'executor_command')!
+	return result.output
+}
+
+// Execute with tmux - for interactive sessions
+pub fn (mut e Executor) execute_tmux(cmd string, context_id string) !string {
+	// Ensure we have the latest state
+	if !e.tmux.session_exist(e.session_name) {
+		return error('Session ${e.session_name} does not exist. Run setup first.')
+	}
+
+	// Get the session and window using tmux module
+	mut session := e.tmux.session_get(e.session_name)!
+	mut window := session.window_get(name: e.window_name)!
+
+	// Only scan if we have no panes
+	if window.panes.len == 0 {
+		window.scan()!
+	}
+
+	if window.panes.len == 0 {
+		return error('No panes available in window ${e.window_name}')
+	}
+
+	// Get the active pane using tmux module
+	mut active_pane := window.pane_active() or { window.panes[0] }
+
+	// Execute command using tmux pane
+	active_pane.send_command(cmd)!
+
+	// Wait briefly for command to execute
+	time.sleep(200 * time.millisecond)
+
+	// Get output using tmux module
+	output := active_pane.logs_all() or { '' }
+
+	return output
+}
+
+// Get or create container with optional image script
+pub fn (mut e Executor) get_or_create_container(args NewContainerArgs) !Container {
+	// Update container_id, image_script, and base_image from args
+	e.container_id = args.name
+	e.image_script = args.image_script
+	e.base_image = args.base_image
+	e.session_name = args.name
+
+	// Ensure container exists
+	e.ensure_container()!
+
+	// Return container instance
+	return Container{
+		name: args.name
+		node: e.node
+		tmux: e.tmux
+	}
+}
+
+// Cleanup - Remove everything using proper modules
+pub fn (mut e Executor) cleanup() ! {
+	// Kill tmux session using tmux module
+	if e.tmux.session_exist(e.session_name) {
+		e.tmux.session_delete(e.session_name)!
+	}
+
+	// Remove container using osal module
+	e.remove_container()!
+}
+
+// Internal helper methods using proper modules
+fn (mut e Executor) install_requirements() ! {
+	// Install all required packages using the installer module
+	install_all_requirements(e.node.settings.node_ip, e.node.settings.user)!
+}
+
+fn (mut e Executor) ensure_container() ! {
+	// Check if container exists using osal module
+	check_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "runc list | grep ${e.container_id}"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result == '' {
+		e.create_container()!
+	}
+}
+
+fn (mut e Executor) create_container() ! {
+	// Determine base image and setup command
+	mut setup_cmd := ''
+
+	match e.base_image {
+		.alpine_python {
+			// Use Docker to create a Python-enabled Alpine container
+			setup_cmd = '
+				mkdir -p /containers/${e.container_id}/rootfs &&
+				cd /containers/${e.container_id} &&
+				# Create a simple Dockerfile for Alpine with Python
+				cat > Dockerfile << EOF
+				FROM alpine:3.20
+				RUN apk add --no-cache python3 py3-pip
+				WORKDIR /
+				CMD ["/bin/sh"]
+				EOF
+				# Build and export the container filesystem
+				docker build -t ${e.container_id}-base . &&
+				docker create --name ${e.container_id}-temp ${e.container_id}-base &&
+				docker export ${e.container_id}-temp | tar -xf - -C rootfs &&
+				docker rm ${e.container_id}-temp &&
+				docker rmi ${e.container_id}-base &&
+				rm Dockerfile &&
+				runc spec
+			'
+		}
+		.alpine {
+			// Default: Use standard Alpine minirootfs
+			ver := '3.20.3'
+			file := 'alpine-minirootfs-${ver}-x86_64.tar.gz'
+			url := 'https://dl-cdn.alpinelinux.org/alpine/v${ver[..4]}/releases/x86_64/${file}'
+
+			setup_cmd = '
+				mkdir -p /containers/${e.container_id}/rootfs &&
+				cd /containers/${e.container_id}/rootfs &&
+				curl -fSL ${url} | tar -xzf - &&
+				cd /containers/${e.container_id} &&
+				rm -f config.json &&
+				runc spec
+			'
+		}
+	}
+
+	setup_cmd = texttools.dedent(setup_cmd)
+
+	remote_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "${setup_cmd}"'
+	osal.exec(cmd: remote_cmd, stdout: false, name: 'container_create')!
+
+	// Configure container for non-interactive execution and writable filesystem
+	config_cmd := "ssh ${e.node.settings.user}@${e.node.settings.node_ip} \"cd /containers/${e.container_id} && if ! command -v jq >/dev/null 2>&1; then if command -v apt-get >/dev/null 2>&1; then apt-get update && apt-get install -y jq; elif command -v apk >/dev/null 2>&1; then apk add --no-cache jq; fi; fi && jq '.process.terminal = false | .root.readonly = false' config.json > config.json.tmp && mv config.json.tmp config.json\""
+	osal.exec(cmd: config_cmd, stdout: false, name: 'configure_container')!
+
+	// If image_script is provided, copy it and configure as entry point
+	if e.image_script != '' {
+		e.setup_image_script()!
+	}
+}
+
+fn (mut e Executor) setup_image_script() ! {
+	// Resolve the script path - handle relative paths
+	mut script_path := e.image_script
+	if script_path.starts_with('./') {
+		// Convert relative path to absolute path
+		current_dir := os.getwd()
+		script_path = '${current_dir}/${script_path[2..]}'
+	}
+
+	// Check if file exists
+	if !os.exists(script_path) {
+		return error('Image script file not found: ${script_path}')
+	}
+
+	// Read the script content from the resolved path
+	script_content := osal.file_read(script_path)!
+
+	// Create the script on the remote container rootfs
+	create_script_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "mkdir -p /containers/${e.container_id}/rootfs"'
+	osal.exec(cmd: create_script_cmd, stdout: false, name: 'create_dir')!
+
+	// Write script content to a temporary file and copy it
+	script_file := '/tmp/entrypoint_${e.container_id}.sh'
+	osal.file_write(script_file, script_content)!
+
+	// Copy script to remote container
+	copy_cmd := 'scp ${script_file} ${e.node.settings.user}@${e.node.settings.node_ip}:/containers/${e.container_id}/rootfs/entrypoint.sh'
+	osal.exec(cmd: copy_cmd, stdout: false, name: 'copy_script')!
+
+	// Make script executable
+	chmod_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "chmod +x /containers/${e.container_id}/rootfs/entrypoint.sh"'
+	osal.exec(cmd: chmod_cmd, stdout: false, name: 'chmod_script')!
+
+	// Clean up temporary file
+	osal.rm(script_file)!
+
+	// Install jq if needed and modify config.json to use the script as entry point, disable terminal, and enable writable filesystem
+	config_update_cmd := "ssh ${e.node.settings.user}@${e.node.settings.node_ip} \"cd /containers/${e.container_id} && if ! command -v jq >/dev/null 2>&1; then if command -v apt-get >/dev/null 2>&1; then apt-get update && apt-get install -y jq; elif command -v apk >/dev/null 2>&1; then apk add --no-cache jq; fi; fi && jq \\\".process.args = [\\\\\\\"/entrypoint.sh\\\\\\\"] | .process.terminal = false | .root.readonly = false\\\" config.json > config.json.tmp && mv config.json.tmp config.json\""
+	osal.exec(cmd: config_update_cmd, stdout: false, name: 'update_config')!
+}
+
+fn (mut e Executor) ensure_tmux_infrastructure() ! {
+	// Create session and window using tmux module properly
+	if !e.tmux.session_exist(e.session_name) {
+		// Create session with window using tmux module
+		shell_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip}'
+		e.tmux.window_new(
+			session_name: e.session_name
+			name:         e.window_name
+			cmd:          shell_cmd
+			reset:        true
+		)!
+
+		// Wait for setup
+		time.sleep(300 * time.millisecond)
+	}
+}
+
+fn (mut e Executor) remove_container() ! {
+	// Use osal module for cleanup
+	remove_cmd := 'ssh ${e.node.settings.user}@${e.node.settings.node_ip} "runc delete ${e.container_id} --force || true && rm -rf /containers/${e.container_id}"'
+	osal.exec(cmd: remove_cmd, stdout: false, name: 'container_cleanup') or {
+		// Ignore cleanup errors
+	}
+}
diff --git a/lib/virt/herorun2/factory.v b/lib/virt/herorun2/factory.v
new file mode 100644
index 00000000..a8794207
--- /dev/null
+++ b/lib/virt/herorun2/factory.v
@@ -0,0 +1,30 @@
+module herorun2
+
+import freeflowuniverse.herolib.ui.console
+
+// Provider types
+pub enum Provider {
+	hetzner
+	threefold
+}
+
+// Factory function to create appropriate backend
+pub fn new_backend(provider Provider, args NewNodeArgs) !NodeBackend {
+	match provider {
+		.hetzner {
+			console.print_header('🏭 Creating Hetzner Backend')
+			backend := new_hetzner_backend(args)!
+			return backend
+		}
+		.threefold {
+			console.print_header('🏭 Creating ThreeFold Backend')
+			// TODO: Implement ThreeFold backend
+			return error('ThreeFold backend not implemented yet')
+		}
+	}
+}
+
+// Convenience function for Hetzner (most common case)
+pub fn new_hetzner_node(args NewNodeArgs) !NodeBackend {
+	return new_backend(.hetzner, args)!
+}
diff --git a/lib/virt/herorun2/hetzner_backend.v b/lib/virt/herorun2/hetzner_backend.v
new file mode 100644
index 00000000..15422bdf
--- /dev/null
+++ b/lib/virt/herorun2/hetzner_backend.v
@@ -0,0 +1,118 @@
+module herorun2
+
+import os
+import freeflowuniverse.herolib.ui.console
+import freeflowuniverse.herolib.osal.tmux
+
+// HetznerBackend implements NodeBackend for Hetzner cloud servers
+pub struct HetznerBackend {
+pub mut:
+	node Node
+}
+
+// Create new Hetzner backend
+pub fn new_hetzner_backend(args NewNodeArgs) !HetznerBackend {
+	console.print_header('🖥️ Creating Hetzner Backend')
+	console.print_stdout('IP: ${args.node_ip}')
+
+	node := Node{
+		settings: NodeSettings{
+			node_ip: args.node_ip
+			user:    args.user
+		}
+	}
+
+	return HetznerBackend{
+		node: node
+	}
+}
+
+// Implement NodeBackend interface
+pub fn (mut h HetznerBackend) connect(args NodeConnectArgs) ! {
+	console.print_header('🔌 Connecting to Hetzner node')
+	console.print_item('Node IP: ${h.node.settings.node_ip}')
+	console.print_item('User: ${h.node.settings.user}')
+
+	// Basic SSH connection test
+	cmd := 'ssh ${h.node.settings.user}@${h.node.settings.node_ip} -o StrictHostKeyChecking=no exit'
+	stream_command(cmd)!
+	console.print_green('Connection successful')
+
+	// Ensure required packages are installed
+	console.print_header('📦 Ensuring required packages')
+	install_cmd := 'ssh ${h.node.settings.user}@${h.node.settings.node_ip} "apt-get update && apt-get install -y runc tmux curl xz-utils"'
+	stream_command(install_cmd)!
+	console.print_green('Dependencies installed')
+}
+
+pub fn (h HetznerBackend) send_command(args SendCommandArgs) ! {
+	console.print_header('💻 Running remote command on Hetzner')
+	console.print_item('Command: ${args.cmd}')
+	remote_cmd := 'ssh ${h.node.settings.user}@${h.node.settings.node_ip} "${args.cmd}"'
+	stream_command(remote_cmd)!
+}
+
+pub fn (mut h HetznerBackend) get_or_create_container(args NewContainerArgs) !Container {
+	console.print_header('📦 Get or create container: ${args.name}')
+
+	// Check if container exists
+	check_cmd := 'ssh ${h.node.settings.user}@${h.node.settings.node_ip} "runc list | grep ${args.name}"'
+	code := os.system(check_cmd)
+
+	if code != 0 {
+		console.print_stdout('Container not found, creating...')
+		h.create_container(args.name)!
+	} else {
+		console.print_stdout('Container already exists.')
+	}
+
+	// Create tmux session wrapper
+	mut t := tmux.new(sessionid: args.name)!
+
+	return Container{
+		name: args.name
+		node: h.node
+		tmux: t
+	}
+}
+
+pub fn (h HetznerBackend) get_info() !NodeInfo {
+	return NodeInfo{
+		ip:       h.node.settings.node_ip
+		user:     h.node.settings.user
+		provider: 'hetzner'
+		status:   'connected'
+	}
+}
+
+// Internal helper to create container
+fn (h HetznerBackend) create_container(name string) ! {
+	ver := '3.20.3'
+	file := 'alpine-minirootfs-${ver}-x86_64.tar.gz'
+	url := 'https://dl-cdn.alpinelinux.org/alpine/v${ver[..4]}/releases/x86_64/${file}'
+
+	setup_cmd := '
+		mkdir -p /containers/${name}/rootfs &&
+		cd /containers/${name}/rootfs &&
+		echo "📥 Downloading Alpine rootfs: ${url}" &&
+		curl -fSL ${url} | tar -xzf - &&
+		cd /containers/${name} &&
+		rm -f config.json &&
+		runc spec
+	'
+
+	remote_cmd := 'ssh ${h.node.settings.user}@${h.node.settings.node_ip} "${setup_cmd}"'
+	stream_command(remote_cmd)!
+
+	console.print_green('Container ${name} rootfs prepared')
+}
+
+// Helper function for streaming commands
+fn stream_command(cmd string) ! {
+	console.print_debug_title('Executing', cmd)
+	code := os.system(cmd)
+	if code != 0 {
+		console.print_stderr('Command failed: ${cmd} (exit ${code})')
+		return error('command failed: ${cmd} (exit ${code})')
+	}
+}
diff --git a/lib/virt/herorun2/installer.v b/lib/virt/herorun2/installer.v
new file mode 100644
index 00000000..d52600d6
--- /dev/null
+++ b/lib/virt/herorun2/installer.v
@@ -0,0 +1,240 @@
+module herorun2
+
+import freeflowuniverse.herolib.osal.core as osal
+
+// Package installer functions for herorun dependencies
+// Each function installs a specific package on the remote node
+
+// Install runc container runtime
+pub fn install_runc(node_ip string, user string) ! {
+	// Check if runc is already installed
+	check_cmd := 'ssh ${user}@${node_ip} "command -v runc"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result != '' {
+		// Already installed
+		return
+	}
+
+	// Detect OS on remote node
+	os_detect_cmd := "ssh ${user}@${node_ip} \"cat /etc/os-release | grep ^ID= | cut -d= -f2 | tr -d \\\"\" 2>/dev/null || echo \"unknown\""
+	os_result := osal.execute_silent(os_detect_cmd) or { 'unknown' }
+	os_id := os_result.trim_space()
+
+	mut install_cmd := ''
+
+	match os_id {
+		'ubuntu', 'debian' {
+			install_cmd = 'ssh ${user}@${node_ip} "apt-get update && apt-get install -y runc"'
+		}
+		'alpine' {
+			install_cmd = 'ssh ${user}@${node_ip} "apk add --no-cache runc"'
+		}
+		'centos', 'rhel', 'fedora' {
+			install_cmd = 'ssh ${user}@${node_ip} "if command -v dnf >/dev/null 2>&1; then dnf install -y runc; else yum install -y runc; fi"'
+		}
+		else {
+			return error('Unsupported OS for runc installation: ${os_id}. Please install runc manually.')
+		}
+	}
+
+	// Execute installation
+	osal.exec(cmd: install_cmd, stdout: false, name: 'install_runc')!
+
+	// Verify installation
+	verify_cmd := 'ssh ${user}@${node_ip} "runc --version"'
+	verify_result := osal.execute_silent(verify_cmd) or { '' }
+
+	if verify_result == '' {
+		return error('runc installation failed - command not found after installation')
+	}
+}
+
+// Install tmux terminal multiplexer
+pub fn install_tmux(node_ip string, user string) ! {
+	// Check if tmux is already installed
+	check_cmd := 'ssh ${user}@${node_ip} "command -v tmux"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result != '' {
+		// Already installed
+		return
+	}
+
+	// Detect OS on remote node
+	os_detect_cmd := "ssh ${user}@${node_ip} \"cat /etc/os-release | grep ^ID= | cut -d= -f2 | tr -d \\\"\" 2>/dev/null || echo \"unknown\""
+	os_result := osal.execute_silent(os_detect_cmd) or { 'unknown' }
+	os_id := os_result.trim_space()
+
+	mut install_cmd := ''
+
+	match os_id {
+		'ubuntu', 'debian' {
+			install_cmd = 'ssh ${user}@${node_ip} "apt-get update && apt-get install -y tmux"'
+		}
+		'alpine' {
+			install_cmd = 'ssh ${user}@${node_ip} "apk add --no-cache tmux"'
+		}
+		'centos', 'rhel', 'fedora' {
+			install_cmd = 'ssh ${user}@${node_ip} "if command -v dnf >/dev/null 2>&1; then dnf install -y tmux; else yum install -y tmux; fi"'
+		}
+		else {
+			return error('Unsupported OS for tmux installation: ${os_id}. Please install tmux manually.')
+		}
+	}
+
+	// Execute installation
+	osal.exec(cmd: install_cmd, stdout: false, name: 'install_tmux')!
+
+	// Verify installation
+	verify_cmd := 'ssh ${user}@${node_ip} "tmux -V"'
+	verify_result := osal.execute_silent(verify_cmd) or { '' }
+
+	if verify_result == '' {
+		return error('tmux installation failed - command not found after installation')
+	}
+}
+
+// Install curl for downloading files
+pub fn install_curl(node_ip string, user string) ! {
+	// Check if curl is already installed
+	check_cmd := 'ssh ${user}@${node_ip} "command -v curl"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result != '' {
+		// Already installed
+		return
+	}
+
+	// Detect OS on remote node
+	os_detect_cmd := "ssh ${user}@${node_ip} \"cat /etc/os-release | grep ^ID= | cut -d= -f2 | tr -d \\\"\" 2>/dev/null || echo \"unknown\""
+	os_result := osal.execute_silent(os_detect_cmd) or { 'unknown' }
+	os_id := os_result.trim_space()
+
+	mut install_cmd := ''
+
+	match os_id {
+		'ubuntu', 'debian' {
+			install_cmd = 'ssh ${user}@${node_ip} "apt-get update && apt-get install -y curl"'
+		}
+		'alpine' {
+			install_cmd = 'ssh ${user}@${node_ip} "apk add --no-cache curl"'
+		}
+		'centos', 'rhel', 'fedora' {
+			install_cmd = 'ssh ${user}@${node_ip} "if command -v dnf >/dev/null 2>&1; then dnf install -y curl; else yum install -y curl; fi"'
+		}
+		else {
+			return error('Unsupported OS for curl installation: ${os_id}. Please install curl manually.')
+		}
+	}
+
+	// Execute installation
+	osal.exec(cmd: install_cmd, stdout: false, name: 'install_curl')!
+
+	// Verify installation
+	verify_cmd := 'ssh ${user}@${node_ip} "curl --version"'
+	verify_result := osal.execute_silent(verify_cmd) or { '' }
+
+	if verify_result == '' {
+		return error('curl installation failed - command not found after installation')
+	}
+}
+
+// Install tar for archive extraction
+pub fn install_tar(node_ip string, user string) ! {
+	// Check if tar is already installed
+	check_cmd := 'ssh ${user}@${node_ip} "command -v tar"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result != '' {
+		// Already installed
+		return
+	}
+
+	// Detect OS on remote node
+	os_detect_cmd := "ssh ${user}@${node_ip} \"cat /etc/os-release | grep ^ID= | cut -d= -f2 | tr -d \\\"\" 2>/dev/null || echo \"unknown\""
+	os_result := osal.execute_silent(os_detect_cmd) or { 'unknown' }
+	os_id := os_result.trim_space()
+
+	mut install_cmd := ''
+
+	match os_id {
+		'ubuntu', 'debian' {
+			install_cmd = 'ssh ${user}@${node_ip} "apt-get update && apt-get install -y tar"'
+		}
+		'alpine' {
+			install_cmd = 'ssh ${user}@${node_ip} "apk add --no-cache tar"'
+		}
+		'centos', 'rhel', 'fedora' {
+			install_cmd = 'ssh ${user}@${node_ip} "if command -v dnf >/dev/null 2>&1; then dnf install -y tar; else yum install -y tar; fi"'
+		}
+		else {
+			return error('Unsupported OS for tar installation: ${os_id}. Please install tar manually.')
+		}
+	}
+
+	// Execute installation
+	osal.exec(cmd: install_cmd, stdout: false, name: 'install_tar')!
+
+	// Verify installation
+	verify_cmd := 'ssh ${user}@${node_ip} "tar --version"'
+	verify_result := osal.execute_silent(verify_cmd) or { '' }
+
+	if verify_result == '' {
+		return error('tar installation failed - command not found after installation')
+	}
+}
+
+// Install git for version control
+pub fn install_git(node_ip string, user string) ! {
+	// Check if git is already installed
+	check_cmd := 'ssh ${user}@${node_ip} "command -v git"'
+	result := osal.execute_silent(check_cmd) or { '' }
+
+	if result != '' {
+		// Already installed
+		return
+	}
+
+	// Detect OS on remote node
+	os_detect_cmd := "ssh ${user}@${node_ip} \"cat /etc/os-release | grep ^ID= | cut -d= -f2 | tr -d \\\"\" 2>/dev/null || echo \"unknown\""
+	os_result := osal.execute_silent(os_detect_cmd) or { 'unknown' }
+	os_id := os_result.trim_space()
+
+	mut install_cmd := ''
+
+	match os_id {
+		'ubuntu', 'debian' {
+			install_cmd = 'ssh ${user}@${node_ip} "apt-get update && apt-get install -y git"'
+		}
+		'alpine' {
+			install_cmd = 'ssh ${user}@${node_ip} "apk add --no-cache git"'
+		}
+		'centos', 'rhel', 'fedora' {
+			install_cmd = 'ssh ${user}@${node_ip} "if command -v dnf >/dev/null 2>&1; then dnf install -y git; else yum install -y git; fi"'
+		}
+		else {
+			return error('Unsupported OS for git installation: ${os_id}. Please install git manually.')
+		}
+	}
+
+	// Execute installation
+	osal.exec(cmd: install_cmd, stdout: false, name: 'install_git')!
+
+	// Verify installation
+	verify_cmd := 'ssh ${user}@${node_ip} "git --version"'
+	verify_result := osal.execute_silent(verify_cmd) or { '' }
+
+	if verify_result == '' {
+		return error('git installation failed - command not found after installation')
+	}
+}
+
+// Install all required packages for herorun
+pub fn install_all_requirements(node_ip string, user string) ! {
+	install_curl(node_ip, user)!
+	install_tar(node_ip, user)!
+	install_git(node_ip, user)!
+	install_tmux(node_ip, user)!
+	install_runc(node_ip, user)!
+}
diff --git a/lib/virt/herorun2/interfaces.v b/lib/virt/herorun2/interfaces.v
new file mode 100644
index 00000000..db62b12d
--- /dev/null
+++ b/lib/virt/herorun2/interfaces.v
@@ -0,0 +1,57 @@
+module herorun2
+
+// Base image types for containers
+pub enum BaseImage {
+	alpine        // Standard Alpine Linux minirootfs
+	alpine_python // Alpine Linux with Python 3 pre-installed
+}
+
+// Shared parameter structs used across the module
+@[params]
+pub struct SendCommandArgs {
+pub:
+	cmd string @[required]
+}
+
+@[params]
+pub struct NewContainerArgs {
+pub:
+	name         string @[required]
+	image_script string // Optional path to entry point script (e.g., './images/python_server.sh')
+	base_image   BaseImage = .alpine // Base image type (default: alpine)
+}
+
+@[params]
+pub struct ContainerCommandArgs {
+pub:
+	cmd string @[required]
+}
+
+// NodeBackend defines the contract that all node providers must follow
+pub interface NodeBackend {
+mut:
+	// Connect to the node and ensure required packages
+	connect(args NodeConnectArgs) !
+
+	// Send command to the node
+	send_command(args SendCommandArgs) !
+
+	// Container lifecycle
+	get_or_create_container(args NewContainerArgs) !Container
+
+	// Get node information
+	get_info() !NodeInfo
+}
+
+// ContainerBackend defines container operations
+pub interface ContainerBackend {
+mut:
+	// Attach to container tmux session
+	attach() !
+
+	// Send command to container
+	send_command(args ContainerCommandArgs) !
+
+	// Get container logs
+	get_logs() !string
+}
diff --git a/lib/virt/herorun2/nodes.v b/lib/virt/herorun2/nodes.v
new file mode 100644
index 00000000..4e285132
--- /dev/null
+++ b/lib/virt/herorun2/nodes.v
@@ -0,0 +1,72 @@
+module herorun2
+
+import freeflowuniverse.herolib.osal.sshagent
+
+// Node-related structs and functionality
+pub struct NodeSettings {
+pub:
+	node_ip string
+	user    string
+}
+
+pub struct Node {
+pub:
+	settings NodeSettings
+}
+
+@[params]
+pub struct NewNodeArgs {
+pub:
+	node_ip string
+	user    string
+}
+
+@[params]
+pub struct NodeConnectArgs {
+pub:
+	keyname string @[required]
+}
+
+// Node information struct
+pub struct NodeInfo {
+pub:
+	ip       string
+	user     string
+	provider string
+	status   string
+}
+
+// Create new node
+pub fn new_node(args NewNodeArgs) Node {
+	return Node{
+		settings: NodeSettings{
+			node_ip: args.node_ip
+			user:    args.user
+		}
+	}
+}
+
+// User configuration for SSH
+pub struct UserConfig {
+pub:
+	keyname string
+}
+
+@[params]
+pub struct NewUserArgs {
+pub:
+	keyname string @[required]
+}
+
+// Create new user with SSH agent setup
+pub fn new_user(args NewUserArgs) !UserConfig {
+	mut agent := sshagent.new_single()!
+	// Silent check - just ensure agent is working without verbose output
+	if !agent.is_agent_responsive() {
+		return error('SSH agent is not responsive')
+	}
+	agent.init()!
+	return UserConfig{
+		keyname: args.keyname
+	}
+}
diff --git a/lib/virt/runc/factory.v b/lib/virt/runc/factory.v
deleted file mode 100644
index fbfe565a..00000000
--- a/lib/virt/runc/factory.v
+++ /dev/null
@@ -1,68 +0,0 @@
-module runc
-
-fn example() {
-	root := Root{
-		path:     '/rootfs'
-		readonly: true
-	}
-
-	process := Process{
-		terminal:     true
-		user:         User{
-			uid:             0
-			gid:             0
-			additional_gids: [u32(0)]
-		}
-		args:         ['/bin/bash']
-		env:          ['PATH=/usr/bin']
-		cwd:          '/'
-		capabilities: Capabilities{
-			bounding:    [Capability.cap_chown, Capability.cap_dac_override]
-			effective:   [Capability.cap_chown]
-			inheritable: []
-			permitted:   [Capability.cap_chown]
-			ambient:     []
-		}
-		rlimits:      [
-			Rlimit{
-				typ:  .rlimit_nofile
-				hard: 1024
-				soft: 1024
-			},
-		]
-	}
-
-	linux := Linux{
-		namespaces: [
-			LinuxNamespace{
-				typ:  'pid'
-				path: ''
-			},
-		]
-		resources:  LinuxResource{
-			blkio_weight: 1000
-			cpu_period:   100000
-			cpu_quota:    50000
-			cpu_shares:   1024
-			devices:      []
-			memory_limit: 1024 * 1024 * 1024 // 1GB
-		}
-		devices:    []
-	}
-
-	spec := Spec{
-		version:  '1.0.0'
-		platform: Platform{
-			os:   .linux
-			arch: .amd64
-		}
-		process:  process
-		root:     root
-		hostname: 'my-container'
-		mounts:   []
-		linux:    linux
-		hooks:    Hooks{}
-	}
-
-	println(spec)
-}
diff --git a/lib/virt/runc/model.v b/lib/virt/runc/model.v
deleted file mode 100644
index 06d64fac..00000000
--- a/lib/virt/runc/model.v
+++ /dev/null
@@ -1,221 +0,0 @@
-module runc
-
-struct LinuxNamespace {
-	typ  string
-	path string
-}
-
-struct LinuxIDMapping {
-	container_id u32
-	host_id      u32
-	size         u32
-}
-
-struct LinuxResource {
-	blkio_weight                     u16
-	blkio_weight_device              []string
-	blkio_throttle_read_bps_device   []string
-	blkio_throttle_write_bps_device  []string
-	blkio_throttle_read_iops_device  []string
-	blkio_throttle_write_iops_device []string
-	cpu_period                       u64
-	cpu_quota                        i64
-	cpu_shares                       u64
-	cpuset_cpus                      string
-	cpuset_mems                      string
-	devices                          []string
-	memory_limit                     u64
-	memory_reservation               u64
-	memory_swap_limit                u64
-	memory_kernel_limit              u64
-	memory_swappiness                i64
-	pids_limit                       i64
-}
-
-struct LinuxDevice {
-	typ         string
-	major       int
-	minor       int
-	permissions string
-	file_mode   u32
-	uid         u32
-	gid         u32
-}
-
-struct Hooks {
-	prestart  []string
-	poststart []string
-	poststop  []string
-}
-
-// see https://github.com/opencontainers/runtime-spec/blob/main/config.md#process
-struct Process {
-	terminal     bool
-	user         User
-	args         []string
-	env          []string // do as dict
-	cwd          string
-	capabilities Capabilities
-	rlimits      []Rlimit
-}
-
-// Enum for Rlimit types
-enum RlimitType {
-	rlimit_cpu
-	rlimit_fsize
-	rlimit_data
-	rlimit_stack
-	rlimit_core
-	rlimit_rss
-	rlimit_nproc
-	rlimit_nofile
-	rlimit_memlock
-	rlimit_as
-	rlimit_lock
-	rlimit_sigpending
-	rlimit_msgqueue
-	rlimit_nice
-	rlimit_rtprio
-	rlimit_rttime
-}
-
-// Struct for Rlimit using enumerator
-struct Rlimit {
-	typ  RlimitType
-	hard u64
-	soft u64
-}
-
-struct User {
-	uid             u32
-	gid             u32
-	additional_gids []u32
-}
-
-struct Root {
-	path     string
-	readonly bool
-}
-
-struct Linux {
-	namespaces []LinuxNamespace
-	resources  LinuxResource
-	devices    []LinuxDevice
-}
-
-struct Spec {
-	version  string
-	platform Platform
-	process  Process
-	root     Root
-	hostname string
-	mounts   []Mount
-	linux    Linux
-	hooks    Hooks
-}
-
-// Enum for supported operating systems
-enum OSType {
-	linux
-	windows
-	darwin
-	solaris
-	// Add other OS types as needed
-}
-
-// Enum for supported architectures
-enum ArchType {
-	amd64
-	arm64
-	arm
-	ppc64
-	s390x
-	// Add other architectures as needed
-}
-
-// Struct for Platform using enums
-struct Platform {
-	os   OSType
-	arch ArchType
-}
-
-// Enum for mount types
-enum MountType {
-	bind
-	tmpfs
-	nfs
-	overlay
-	devpts
-	proc
-	sysfs
-	// Add other mount types as needed
-}
-
-// Enum for mount options
-enum MountOption {
-	rw
-	ro
-	noexec
-	nosuid
-	nodev
-	rbind
-	relatime
-	// Add other options as needed
-}
-
-// Struct for Mount using enums
-struct Mount {
-	destination string
-	typ         MountType
-	source      string
-	options     []MountOption
-}
-
-enum Capability {
-	cap_chown
-	cap_dac_override
-	cap_dac_read_search
-	cap_fowner
-	cap_fsetid
-	cap_kill
-	cap_setgid
-	cap_setuid
-	cap_setpcap
-	cap_linux_immutable
-	cap_net_bind_service
-	cap_net_broadcast
-	cap_net_admin
-	cap_net_raw
-	cap_ipc_lock
-	cap_ipc_owner
-	cap_sys_module
-	cap_sys_rawio
-	cap_sys_chroot
-	cap_sys_ptrace
-	cap_sys_pacct
-	cap_sys_admin
-	cap_sys_boot
-	cap_sys_nice
-	cap_sys_resource
-	cap_sys_time
-	cap_sys_tty_config
-	cap_mknod
-	cap_lease
-	cap_audit_write
-	cap_audit_control
-	cap_setfcap
-	cap_mac_override
-	cap_mac_admin
-	cap_syslog
-	cap_wake_alarm
-	cap_block_suspend
-	cap_audit_read
-}
-
-struct Capabilities {
-	bounding    []Capability
-	effective   []Capability
-	inheritable []Capability
-	permitted   []Capability
-	ambient     []Capability
-}
diff --git a/lib/virt/runc/readme.md b/lib/virt/runc/readme.md
deleted file mode 100644
index ca05a411..00000000
--- a/lib/virt/runc/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-specs on https://github.com/opencontainers/runtime-spec
-
-use https://github.com/containers/youki to test the implementation, wrap it as part of runc module,
-make installer for it
-
diff --git a/lib/virt/runc/tojson.v b/lib/virt/runc/tojson.v
deleted file mode 100644
index 054588fe..00000000
--- a/lib/virt/runc/tojson.v
+++ /dev/null
@@ -1,153 +0,0 @@
-module runc
-
-import json
-
-// Helper functions to convert enums to strings
-fn (cap Capability) str() string {
-	return match cap {
-		.cap_chown { 'CAP_CHOWN' }
-		.cap_dac_override { 'CAP_DAC_OVERRIDE' }
-		.cap_dac_read_search { 'CAP_DAC_READ_SEARCH' }
-		.cap_fowner { 'CAP_FOWNER' }
-		.cap_fsetid { 'CAP_FSETID' }
-		.cap_kill { 'CAP_KILL' }
-		.cap_setgid { 'CAP_SETGID' }
-		.cap_setuid { 'CAP_SETUID' }
-		.cap_setpcap { 'CAP_SETPCAP' }
-		.cap_linux_immutable { 'CAP_LINUX_IMMUTABLE' }
-		.cap_net_bind_service { 'CAP_NET_BIND_SERVICE' }
-		.cap_net_broadcast { 'CAP_NET_BROADCAST' }
-		.cap_net_admin { 'CAP_NET_ADMIN' }
-		.cap_net_raw { 'CAP_NET_RAW' }
-		.cap_ipc_lock { 'CAP_IPC_LOCK' }
-		.cap_ipc_owner { 'CAP_IPC_OWNER' }
-		.cap_sys_module { 'CAP_SYS_MODULE' }
-		.cap_sys_rawio { 'CAP_SYS_RAWIO' }
-		.cap_sys_chroot { 'CAP_SYS_CHROOT' }
-		.cap_sys_ptrace { 'CAP_SYS_PTRACE' }
-		.cap_sys_pacct { 'CAP_SYS_PACCT' }
-		.cap_sys_admin { 'CAP_SYS_ADMIN' }
-		.cap_sys_boot { 'CAP_SYS_BOOT' }
-		.cap_sys_nice { 'CAP_SYS_NICE' }
-		.cap_sys_resource { 'CAP_SYS_RESOURCE' }
-		.cap_sys_time { 'CAP_SYS_TIME' }
-		.cap_sys_tty_config { 'CAP_SYS_TTY_CONFIG' }
-		.cap_mknod { 'CAP_MKNOD' }
-		.cap_lease { 'CAP_LEASE' }
-		.cap_audit_write { 'CAP_AUDIT_WRITE' }
-		.cap_audit_control { 'CAP_AUDIT_CONTROL' }
-		.cap_setfcap { 'CAP_SETFCAP' }
-		.cap_mac_override { 'CAP_MAC_OVERRIDE' }
-		.cap_mac_admin { 'CAP_MAC_ADMIN' }
-		.cap_syslog { 'CAP_SYSLOG' }
-		.cap_wake_alarm { 'CAP_WAKE_ALARM' }
-		.cap_block_suspend { 'CAP_BLOCK_SUSPEND' }
-		.cap_audit_read { 'CAP_AUDIT_READ' }
-	}
-}
-
-fn (rlimit RlimitType) str() string {
-	return match rlimit {
-		.rlimit_cpu { 'RLIMIT_CPU' }
-		.rlimit_fsize { 'RLIMIT_FSIZE' }
-		.rlimit_data { 'RLIMIT_DATA' }
-		.rlimit_stack { 'RLIMIT_STACK' }
-		.rlimit_core { 'RLIMIT_CORE' }
-		.rlimit_rss { 'RLIMIT_RSS' }
-		.rlimit_nproc { 'RLIMIT_NPROC' }
-		.rlimit_nofile { 'RLIMIT_NOFILE' }
-		.rlimit_memlock { 'RLIMIT_MEMLOCK' }
-		.rlimit_as { 'RLIMIT_AS' }
-		.rlimit_lock { 'RLIMIT_LOCK' }
-		.rlimit_sigpending { 'RLIMIT_SIGPENDING' }
-		.rlimit_msgqueue { 'RLIMIT_MSGQUEUE' }
-		.rlimit_nice { 'RLIMIT_NICE' }
-		.rlimit_rtprio { 'RLIMIT_RTPRIO' }
-		.rlimit_rttime { 'RLIMIT_RTTIME' }
-	}
-}
-
-// Function to convert Capabilities struct to JSON
-fn (cap Capabilities) to_json() map[string][]string {
-	return {
-		'bounding':    cap.bounding.map(it.str())
-		'effective':   cap.effective.map(it.str())
-		'inheritable': cap.inheritable.map(it.str())
-		'permitted':   cap.permitted.map(it.str())
-		'ambient':     cap.ambient.map(it.str())
-	}
-}
-
-// Function to convert Rlimit struct to JSON
-fn (rlimit Rlimit) to_json() map[string]json.Any {
-	return {
-		'type': rlimit.typ.str()
-		'hard': rlimit.hard
-		'soft': rlimit.soft
-	}
-}
-
-// Example function to generate the Process JSON
-fn generate_process_json(proc Process) string {
-	// Convert the Process object to JSON
-	process_json := {
-		'terminal':     proc.terminal
-		'user':         {
-			'uid':            proc.user.uid
-			'gid':            proc.user.gid
-			'additionalGids': proc.user.additional_gids
-		}
-		'args':         proc.args
-		'env':          proc.env
-		'cwd':          proc.cwd
-		'capabilities': proc.capabilities.to_json()
-		'rlimits':      proc.rlimits.map(it.to_json())
-	}
-
-	// Convert the entire process map to JSON string
-	return json.encode_pretty(process_json)
-}
-
-pub fn example_json() {
-	// Example instantiation using enums and Process structure
-	user := User{
-		uid:             1000
-		gid:             1000
-		additional_gids: [1001, 1002]
-	}
-
-	capabilities := Capabilities{
-		bounding:    [Capability.cap_chown, Capability.cap_dac_override]
-		effective:   [Capability.cap_chown]
-		inheritable: []
-		permitted:   [Capability.cap_chown]
-		ambient:     []
-	}
-
-	rlimits := [
-		Rlimit{
-			typ:  RlimitType.rlimit_nofile
-			hard: 1024
-			soft: 1024
-		},
-		Rlimit{
-			typ:  RlimitType.rlimit_cpu
-			hard: 1000
-			soft: 500
-		},
-	]
-
-	process := Process{
-		terminal:     true
-		user:         user
-		args:         ['/bin/bash']
-		env:          ['PATH=/usr/bin']
-		cwd:          '/'
-		capabilities: capabilities
-		rlimits:      rlimits
-	}
-
-	// Generate the JSON for Process object
-	json_output := generate_process_json(process)
-	println(json_output)
-}
diff --git a/lib/web/docusaurus/dsite_generate_docs.v b/lib/web/docusaurus/dsite_generate_docs.v
index 9a9e6359..7ebb49ff 100644
--- a/lib/web/docusaurus/dsite_generate_docs.v
+++ b/lib/web/docusaurus/dsite_generate_docs.v
@@ -41,8 +41,8 @@ pub fn (mut docsite DocSite) generate_docs() ! {
 	}
 
 	if gen.errors.len > 0 {
-		println("Page List: is header collection and page name per collection.\nAvailable pages:\n${gen.client.list_markdown()!}")
-		return error('Errors occurred during site generation:\n${gen.errors.join('\n\n')}\n')		
+		println('Page List: is header collection and page name per collection.\nAvailable pages:\n${gen.client.list_markdown()!}')
+		return error('Errors occurred during site generation:\n${gen.errors.join('\n\n')}\n')
 	}
 }
 
diff --git a/.github/workflows/github_actions_security.yml b/libarchive/github_actions_security.yml
similarity index 100%
rename from .github/workflows/github_actions_security.yml
rename to libarchive/github_actions_security.yml
diff --git a/libarchive/hero_build.yml b/libarchive/hero_build.yml
new file mode 100644
index 00000000..16bec317
--- /dev/null
+++ b/libarchive/hero_build.yml
@@ -0,0 +1,92 @@
+name: Release Hero
+
+permissions:
+  contents: write
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    timeout-minutes: 60
+    if: startsWith(github.ref, 'refs/tags/')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-musl
+            os: ubuntu-latest
+            short-name: linux-i64
+          - target: aarch64-unknown-linux-musl
+            os: ubuntu-latest
+            short-name: linux-arm64
+          - target: aarch64-apple-darwin
+            os: macos-latest
+            short-name: macos-arm64
+          # - target: x86_64-apple-darwin
+          #   os: macos-13
+          #   short-name: macos-i64
+    runs-on: ${{ matrix.os }}
+        
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref_name }} and your repository is ${{ github.repository }}."
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: runner.os == 'macOS'
+        with:
+          xcode-version: latest-stable
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Setup V & Herolib
+        id: setup
+        run: ./install_v.sh --herolib
+        timeout-minutes: 10
+
+      # - name: Do all the basic tests
+      #   timeout-minutes: 25
+      #   run: ./test_basic.vsh
+
+      - name: Build Hero
+        timeout-minutes: 15
+        run: |
+          set -e
+          v -w -d use_openssl -enable-globals cli/hero.v -o cli/hero-${{ matrix.target }}
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: hero-${{ matrix.target }}
+          path: cli/hero-${{ matrix.target }}        
+
+  release_hero:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: cli/bins
+          merge-multiple: true
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: Release ${{ github.ref_name }}
+          draft: false
+          fail_on_unmatched_files: true
+          generate_release_notes: true
+          files: cli/bins/*
diff --git a/aiprompts/openrpc/convert.py b/research/openrpc/convert.py
similarity index 100%
rename from aiprompts/openrpc/convert.py
rename to research/openrpc/convert.py
diff --git a/aiprompts/openrpc/dense_md_to_openrpc.py b/research/openrpc/dense_md_to_openrpc.py
similarity index 100%
rename from aiprompts/openrpc/dense_md_to_openrpc.py
rename to research/openrpc/dense_md_to_openrpc.py
diff --git a/aiprompts/openrpc/install.sh b/research/openrpc/install.sh
similarity index 100%
rename from aiprompts/openrpc/install.sh
rename to research/openrpc/install.sh
diff --git a/aiprompts/openrpc/openrpc2md.md b/research/openrpc/openrpc2md.md
similarity index 100%
rename from aiprompts/openrpc/openrpc2md.md
rename to research/openrpc/openrpc2md.md
diff --git a/aiprompts/openrpc/roundtrip_test.py b/research/openrpc/roundtrip_test.py
similarity index 100%
rename from aiprompts/openrpc/roundtrip_test.py
rename to research/openrpc/roundtrip_test.py
diff --git a/aiprompts/openrpc/schema.j2 b/research/openrpc/schema.j2
similarity index 100%
rename from aiprompts/openrpc/schema.j2
rename to research/openrpc/schema.j2