diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d629e6a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,88 @@
+# Makefile for the s tool
+
+# Variables
+VERSION := 1.0.0
+PREFIX := /usr/local
+BINDIR := $(PREFIX)/bin
+LIBDIR := $(PREFIX)/lib/s
+CONFIGDIR := $(HOME)/.s
+CONFIGFILE := $(HOME)/.sconfig
+
+# Colors for output
+RED := \033[0;31m
+GREEN := \033[0;32m
+YELLOW := \033[1;33m
+BLUE := \033[0;34m
+NC := \033[0m # No Color
+
+# Default target
+all: install
+
+# Install the tool
+install: check-deps
+	@echo -e "${BLUE}Installing s tool...${NC}"
+	@mkdir -p $(BINDIR) $(LIBDIR)
+	@cp -f bin/s $(BINDIR)/
+	@chmod 755 $(BINDIR)/s
+	@cp -f lib/*.sh $(LIBDIR)/
+	@chmod 644 $(LIBDIR)/*.sh
+	@echo -e "${GREEN}Installation complete${NC}"
+
+# Install for current user only
+install-home: check-deps
+	@echo -e "${BLUE}Installing s tool for current user...${NC}"
+	@mkdir -p $(HOME)/bin $(HOME)/.s/lib
+	@cp -f bin/s $(HOME)/bin/
+	@chmod 755 $(HOME)/bin/s
+	@cp -f lib/*.sh $(HOME)/.s/lib/
+	@chmod 644 $(HOME)/.s/lib/*.sh
+	@echo -e "${GREEN}Installation complete${NC}"
+	@echo -e "${YELLOW}Make sure $(HOME)/bin is in your PATH${NC}"
+
+# Uninstall the tool
+uninstall:
+	@echo -e "${BLUE}Uninstalling s tool...${NC}"
+	@rm -f $(BINDIR)/s
+	@rm -rf $(LIBDIR)
+	@echo -e "${GREEN}Uninstallation complete${NC}"
+
+# Run tests
+test: check-deps
+	@echo -e "${BLUE}Running tests...${NC}"
+	@./tests/run-tests.sh
+	@echo -e "${GREEN}Tests complete${NC}"
+
+# Check dependencies
+check-deps:
+	@echo -e "${BLUE}Checking dependencies...${NC}"
+	@command -v bash >/dev/null 2>&1 || { echo -e "${RED}Error: bash is required${NC}"; exit 1; }
+	@command -v ssh >/dev/null 2>&1 || { echo -e "${RED}Error: ssh is required${NC}"; exit 1; }
+	@command -v ssh-keygen >/dev/null 2>&1 || { echo -e "${RED}Error: ssh-keygen is required${NC}"; exit 1; }
+	@echo -e "${GREEN}All dependencies satisfied${NC}"
+
+# Run shellcheck
+lint:
+	@echo -e "${BLUE}Running shellcheck...${NC}"
+	@command -v shellcheck >/dev/null 2>&1 || { echo -e "${RED}Error: shellcheck is required${NC}"; exit 1; }
+	@shellcheck bin/s lib/*.sh tests/*.sh
+	@echo -e "${GREEN}Linting complete${NC}"
+
+# Clean build artifacts
+clean:
+	@echo -e "${BLUE}Cleaning...${NC}"
+	@rm -rf build/
+	@find . -type f -name "*.log" -delete
+	@echo -e "${GREEN}Clean complete${NC}"
+
+# Show help
+help:
+	@echo -e "${BLUE}Available targets:${NC}"
+	@echo -e "  ${GREEN}install${NC}      - Install system-wide (requires root)"
+	@echo -e "  ${GREEN}install-home${NC} - Install for current user only"
+	@echo -e "  ${GREEN}uninstall${NC}    - Remove the tool"
+	@echo -e "  ${GREEN}test${NC}         - Run tests"
+	@echo -e "  ${GREEN}lint${NC}         - Run shellcheck"
+	@echo -e "  ${GREEN}clean${NC}        - Clean build artifacts"
+	@echo -e "  ${GREEN}help${NC}         - Show this help message"
+
+.PHONY: all install install-home uninstall test check-deps lint clean help 
\ No newline at end of file
diff --git a/README.md b/README.md
index adfb3f1..6b3fd26 100644
--- a/README.md
+++ b/README.md
@@ -1,76 +1,88 @@
-s
-=
+# SSH Connection Manager (s)
 
-s is the dead-simple command line ssh configuration management tool you've always wanted. Built to do one thing well—remember ssh connections and recall them as simple, single word configuration aliases. Written in bash and licensed as freeBSD so you can use it nearly everywhere.  
+A powerful and user-friendly SSH connection manager that simplifies server access and key management.
 
-Installing s:
+## Features
 
-One-line auto-install latest version from github:
+- Easy server connection management
+- SSH key generation and management
+- Template-based configuration
+- Port forwarding support
+- Connection retry mechanism
+- ANSI color-coded output
+- Comprehensive error handling
 
-	wget -O- https://raw.github.com/grobertson/s/master/bin/s -O /tmp/s && cd /tmp && chmod 700 /tmp/s && ./s --install system && rm -f /tmp/s
+## Installation
 
-	cd /tmp && wget -O- https://github.com/grobertson/s/archive/master.tar.gz | tar xz && cd s-master && make install && cd -
-	
-From this directory:
+```bash
+# Clone the repository
+git clone https://github.com/groberts/s.git
+cd s
 
-To install s for just the current user:
+# Install
+make install
+```
 
- ./s --install home   
+## Configuration
 
-To install s for everyone (requires root, or at least write permissions on /usr/local/bin):
+The tool uses a configuration file located at `~/.sconfig`. A default configuration will be created on first run:
 
- ./s --install system   
+```bash
+# s configuration
+KEYPATH=~/.ssh
+KEYFILE=id_rsa
+```
 
-Removing s:
+## Usage
 
-./s --remove force
+```bash
+# Connect to a server
+s server-name
 
-Usage:
+# Generate a new SSH key
+s keygen
 
-	usage: s [configuration_name|--save configuration_name][-i identity_file] user@host.com
-	s show — Show available configurations
-	s list — Show available configurations
-	s <configuration_name> — Load configuration and ssh to remote acct/system
-	s help — Display this message
+# List available servers
+s list
 
-CHANGELOG:
+# Add a new server
+s add server-name
 
-5/20/2012
-    
-	*Option to create/install/save a new 2048 bit keypair on a remote host 
-	*'s --addkey [-i existing_keyfile] user@host.com NewConfigName' (no -i will prompt for password) 
-	*Self install './s --install (home|system)' 
-	*system option to --install uses least privledged bin ("/usr/local/bin/", "/usr/bin/", "/bin/" in order)
-	*Self uninstall './s --remove force' Removes from all likely places (home, local, user, /bin)
-	*Added INSTALL file
-	*Added install directions to README
-	
-5/19/2012
+# Remove a server
+s remove server-name
 
-	*freeBSD license added
-	*create a new configuration by connecting once and passing a name to --save option
-	*Humanized error when configuration name doesn't exist
-	*ssh option -i recognition/handling
-	*config moved to ~/.s and ~/.sconfig, autocreates
+# Show help
+s help
+```
 
-5/17/2012
+## Development
 
-	*"show" and "list" are now interchangeable
-	*Hide the "template" configuration from the show/list function
+### Prerequisites
 
+- Bash 4.0 or higher
+- SSH client
+- Make
 
-4/22/2012
+### Running Tests
 
-	*show, help and connect functions
-	*include a template for basic configurations
+```bash
+make test
+```
 
-TO-DO:
+### Code Style
 
-	*clone config from remote with s installed
-	*more complete coverage of ssh options (port forwarding first!)
-	*list/delete/replace keys in ~/.ssh/
-	*list/delete/replace keys on the remote
-	*Needs a "delete" command
+This project follows the [Google Shell Style Guide](https://google.github.io/styleguide/shellguide.html).
+
+## License
+
+BSD License - See LICENSE file for details
+
+## Contributing
+
+1. Fork the repository
+2. Create your feature branch
+3. Commit your changes
+4. Push to the branch
+5. Create a new Pull Request
 
-	
 
diff --git a/bin/s b/bin/s
index 3e8ea3f..e9ab8bf 100755
--- a/bin/s
+++ b/bin/s
@@ -29,281 +29,167 @@
 # of the authors and should not be interpreted as representing official policies, 
 # either expressed or implied, of the FreeBSD Project.
 #
-#
-
-VERSION="0.9.1"
-CONFIGDIR="$HOME/.s/"
-CONFIGFILE="$HOME/.sconfig"    
-
-if [ ! -d $CONFIGDIR ]; then
-    mkdir $CONFIGDIR
-fi
-
-if [ ! -f $CONFIGFILE ]; then
-  #echo basic config into config file here
-  echo "#s configuration" > $CONFIGFILE
-  echo "#Basic ssh config" >> $CONFIGFILE
-  echo "KEYPATH=$HOME/.ssh/" >> $CONFIGFILE
-  echo "KEYFILE=id_rsa" >> $CONFIGFILE  
-fi
 
-if [ -f $CONFIGFILE ]; then
-  source $CONFIGFILE
-fi
-
-function remove {
-  if [ -f "/usr/local/bin/s" ]; then
-    sudo rm -f "/usr/local/bin/s"
-    echo "Removed s from /usr/local/bin/"
-  fi
-  if [ -f "/usr/bin/s" ]; then
-    sudo rm -f "/usr/bin/s"
-    echo "Removed s from /usr/bin/"
-  fi
-  if [ -f "/bin/s" ]; then
-    sudo rm -f "/bin/s"
-    echo "Removed s from /bin/"
-  fi
-  if [ -f $HOME/bin/s ]; then
-    sudo rm -f $HOME/bin/s
-    echo "Removed s from $HOME/bin/"
-  fi
-  exit 0  
-}
-
-function install {
-  if [[ "$OPT_INSTALL" != "" ]]; then  
-    case "$OPT_INSTALL" in
-        home) 
-          if [ ! -d $HOME/bin ]; then
-            mkdir $HOME/bin
-            chmod 700 $HOME/bin
-          fi
-          cp -f s $HOME/bin/s
-          chmod 700 $HOME/bin/s
-          echo "Installed s to ~/bin/ -- Make sure ~/bin is in your PATH"
-          exit 0
-          ;;
-        system) 
-          if [ -d "/usr/local/bin" ]; then
-            sudo cp -f s "/usr/local/bin/s"
-            sudo chown root "/usr/local/bin/s"
-            sudo chmod 755 "/usr/local/bin/s"
-            echo "Installed s to /usr/local/bin/"
-            exit 0
-          fi
-          if [ -d "/usr/bin" ]; then
-            sudo cp -f s "/usr/bin/s"
-            sudo chown root "/usr/bin/s"
-            sudo chmod 755 "/usr/bin/s"
-            echo "Installed s to /usr/bin/ (/usr/local/bin doesn't exist!)"
-            exit 0
-          fi
-          if [ -d "/bin" ]; then
-            sudo cp -f s "/bin/s"
-            sudo chown root "/bin/s"
-            sudo chmod 755 "/bin/s"
-            echo "Installed s to /usr/bin/ (/usr/local/bin and /usr/bin/ don't exist!)"
-            exit 0
-          fi
-          echo "Couldn't find a suitable bin directory on this system. Maybe try 's --install home'?"
-          exit 1
-          ;;
-        *) 
-          echo "Install must be either 'home' or 'system'."
-          exit 1;;
+# Source common functions and modules
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/../lib/common.sh"
+source "$SCRIPT_DIR/../lib/config.sh"
+source "$SCRIPT_DIR/../lib/key.sh"
+source "$SCRIPT_DIR/../lib/connection.sh"
+
+# Initialize configuration
+init_config "$CONFIGDIR" "$CONFIGFILE"
+
+# Load configuration
+load_config "$CONFIGFILE"
+
+# Command line argument parsing
+parse_args() {
+    local cmd="$1"
+    shift
+    
+    case "$cmd" in
+        "connect"|"c")
+            local host="$1"
+            local user="$2"
+            local key_file="$KEYPATH/$KEYFILE"
+            local port="$3"
+            local port_forward="$4"
+            
+            if [ -z "$host" ] || [ -z "$user" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            connect "$host" "$user" "$key_file" "$port" "$CONNECT_TIMEOUT" "$MAX_RETRIES" "$port_forward"
+            ;;
+            
+        "keygen"|"k")
+            local key_type="$1"
+            local key_size="$2"
+            local comment="$3"
+            
+            generate_key "$KEYPATH" "$KEYFILE" "$key_type" "$key_size" "$comment"
+            ;;
+            
+        "list"|"l")
+            list_keys "$KEYPATH"
+            ;;
+            
+        "delete"|"d")
+            local key_file="$1"
+            
+            if [ -z "$key_file" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            delete_key "$KEYPATH" "$key_file"
+            ;;
+            
+        "test"|"t")
+            local host="$1"
+            local user="$2"
+            
+            if [ -z "$host" ] || [ -z "$user" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            test_connection "$host" "$user" "$KEYPATH/$KEYFILE"
+            ;;
+            
+        "status"|"s")
+            local host="$1"
+            local user="$2"
+            
+            if [ -z "$host" ] || [ -z "$user" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            get_connection_status "$host" "$user" "$KEYPATH/$KEYFILE"
+            ;;
+            
+        "forward"|"f")
+            local local_port="$1"
+            local remote_host="$2"
+            local remote_port="$3"
+            local user="$4"
+            
+            if [ -z "$local_port" ] || [ -z "$remote_host" ] || [ -z "$remote_port" ] || [ -z "$user" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            setup_port_forward "$local_port" "$remote_host" "$remote_port" "$user" "$KEYPATH/$KEYFILE"
+            ;;
+            
+        "stop"|"x")
+            local local_port="$1"
+            
+            if [ -z "$local_port" ]; then
+                show_usage
+                exit $EXIT_INVALID_ARGS
+            fi
+            
+            stop_port_forward "$local_port"
+            ;;
+            
+        "config"|"cfg")
+            local key="$1"
+            local value="$2"
+            
+            if [ -z "$key" ]; then
+                list_config "$CONFIGFILE"
+            elif [ -z "$value" ]; then
+                get_config "$CONFIGFILE" "$key"
+            else
+                save_config "$CONFIGFILE" "$key" "$value"
+            fi
+            ;;
+            
+        "help"|"h"|"--help"|"-h")
+            show_usage
+            ;;
+            
+        *)
+            show_usage
+            exit $EXIT_INVALID_ARGS
+            ;;
     esac
-  fi
-  echo "Install where?"
-  echo " Install for this user only:  's --install home'"               
-  echo " Install for all users (requires root):  's --install system'"
-  exit 1
-}
-
-function do_connect() {
-    list=(`ls -A $CONFIGDIR | sort`)
-    for filename in "${list[@]}"
-    do
-      if [[ "$1" == $filename ]]; then
-        source $CONFIGDIR$1
-        # rub out keypath for the moment. fix later.
-        KEYPATH=""
-        ssh -i $KEYPATH$KEYFILE $USER@$HOST
-        exit 0
-      fi
-    done
-    echo "s: No configuration named $1. Perhaps you should --save one?"
-}
-
-function show_config {
-    ls -A $CONFIGDIR | grep -v template | sort
-    exit
-}
-
-function show_usage {
-    echo "usage: $0 [list|show|help] [configuration_name|--save configuration_name][-i identity_file] user@host.com" >&2
-}
-
-function show_help {
-    echo "usage: $0 [configuration_name|--save configuration_name][-i identity_file] user@host.com" >&2
-    echo "———" >&2
-    echo "s Version $VERSION — An ssh supertool " >&2
-    echo    
-    echo "usage: s [option]" >&2
-    echo " s <configuration name> — Load configuration and ssh to remote acct/system" >&2
-    echo " s show — Show available configurations" >&2
-    echo " s help — Display this message" >&2
-    exit
 }
 
-function save_config {
-  if [[ "$OPT_SAVE" == "show" ]] ; then
-    echo "s: Configuration name can't be $OPT_SAVE, it's reserved. Sorry."
-    exit 1
-  fi
-  echo "s: Configuration will be saved as $OPT_SAVE"
-  echo "## Basics" > $CONFIGDIR$OPT_SAVE
-  echo "HOST=$OPT_HOST" >> $CONFIGDIR$OPT_SAVE 
-  echo "USER=$OPT_USER" >> $CONFIGDIR$OPT_SAVE                                     
-  if [[ "$OPT_KEYFILE" != "" ]] ; then
-    echo '##Keys' >> $CONFIGDIR$OPT_SAVE
-    echo "KEYFILE=$OPT_KEYFILE" >> $CONFIGDIR$OPT_SAVE
-    #Currently unused, use fullpath in KEYFILE for now
-    #echo '#KEYPATH=".ssh/"' >> $CONFIGDIR$OPT_SAVE
-  fi
-}
-
-function make_key {
-  # Could use more options, but works for making a simple 2048 bit key with or without passphrase
-  TEMPKEYNAME=_s_temp_key
-  TEMPKEYPATH=$KEYPATH
-  ssh-keygen -b 2048 -f $TEMPKEYPATH$TEMPKEYNAME
-  NEWKEYNAME=`shasum $TEMPKEYPATH$TEMPKEYNAME  | awk '{ print $1 }'`
-  mv $TEMPKEYPATH$TEMPKEYNAME $KEYPATH$NEWKEYNAME
-  mv $TEMPKEYPATH$TEMPKEYNAME.pub $KEYPATH$NEWKEYNAME.pub
-  rm -f $TEMPKEYPATH$TEMPKEYNAME
-  rm -f $TEMPKEYPATH$TEMPKEYNAME.pub
-  chmod 600 $KEYPATH$NEWKEYNAME
-  chmod 600 $KEYPATH$NEWKEYNAME.pub
-  echo "Your new ssh key is $KEYPATH$NEWKEYNAME"
-
-}
-
-function install_key {
-  PUBKEYSTRING=`cat $KEYPATH$NEWKEYNAME.pub`
-  echo $PUBKEYSTRING
-  #If an existing key was supplied, try it. If not ssh should ask for password
-  if [[ $OPT_KEYFILE != "" ]]; then
-    IOPT=" -i $OPT_KEYFILE "
-  fi
-  ssh $IOPT $OPT_USER@$OPT_HOST "echo '$PUBKEYSTRING' >> .ssh/authorized_keys"
-  OPT_KEYFILE=$KEYPATH$NEWKEYNAME
-}
-
-#Check to see if at least one argument was specified
-if [ $# -lt 1 ] ; then
-   echo "s: You must specify at least 1 argument."
-   show_usage
-   exit 1
-fi
- 
-#Process arguments
-while getopts h-:i:n: opt
-do
-   case "$opt" in
-      h) show_help;;
-      i) OPT_KEYFILE=$OPTARG;;
-      \?) show_help;;
-      -)
-        case "${OPTARG}" in
-            save)
-                OPT_SAVE="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ))
-                ;;
-            save=*)
-                OPT_SAVE=${OPTARG#*=}
-                opt=${OPTARG%=$val}
-                ;;
-            remove)
-                OPT_INSTALL="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ))
-                if [[ $OPT_INSTALL == "force" ]]; then
-                  remove
-                  exit 0
-                fi
-                echo "Do you really want to remove s from all likely places? 's --remove force'"
-                exit 1
-                ;;
-            help) 
-                show_help
-                ;;
-            addkey)
-                DO_ADDKEY="yes"
-                ;;
-            install)
-                OPT_INSTALL="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ))
-                install
-                exit 0
-                ;;
-            install=*)
-                OPT_INSTALL=${OPTARG#*=}
-                install
-                exit 0
-                ;;
-            *)
-                if [ "$OPTERR" = 1 ] && [ "${optspec:0:1}" != ":" ]; then
-                    echo "s: Unknown option --${OPTARG}" >&2
-                    exit 1
-                fi
-                ;;
-        esac;;
-   esac
-done
-
-# Remove the switches we parsed above.
-shift `expr $OPTIND - 1`
-
-# We want at least one non-option argument. 
-if [ $# -eq 0 ]; then
-    echo $USAGE >&2
+# Show usage information
+show_usage() {
+    echo -e "${BOLD}Usage:${NC}"
+    echo -e "  ${CYAN}s connect${NC} <host> <user> [port] [port_forward]  # Connect to a remote host"
+    echo -e "  ${CYAN}s keygen${NC} [type] [size] [comment]              # Generate a new SSH key"
+    echo -e "  ${CYAN}s list${NC}                                        # List available SSH keys"
+    echo -e "  ${CYAN}s delete${NC} <key_file>                          # Delete an SSH key"
+    echo -e "  ${CYAN}s test${NC} <host> <user>                         # Test SSH connection"
+    echo -e "  ${CYAN}s status${NC} <host> <user>                       # Check connection status"
+    echo -e "  ${CYAN}s forward${NC} <local_port> <remote_host> <remote_port> <user>  # Setup port forwarding"
+    echo -e "  ${CYAN}s stop${NC} <local_port>                          # Stop port forwarding"
+    echo -e "  ${CYAN}s config${NC} [key] [value]                       # Manage configuration"
+    echo -e "  ${CYAN}s help${NC}                                       # Show this help message"
     echo
-    show_usage
-    exit 1
-fi
-
-#The original dash-less command args. Don't add to these anymore.
-case "$1" in
-   help) show_help;;
-   show) show_config;;
-   list) show_config;;
-esac 
-
-#now that all that's out of the way...
+    echo -e "${BOLD}Examples:${NC}"
+    echo -e "  ${DIM}s connect example.com user${NC}"
+    echo -e "  ${DIM}s keygen rsa 4096 "My Key"${NC}"
+    echo -e "  ${DIM}s forward 8080 example.com 80 user${NC}"
+    echo -e "  ${DIM}s config KEYPATH ~/.ssh${NC}"
+}
 
-# Is this arg a user/host combo? 
-if [[ "$1" == *@* ]]; then
-    OIFS=$IFS
-    IFS='@'
-    arr=($1)
-    OPT_USER=${arr[0]}
-    OPT_HOST=${arr[1]}
-    IFS=$OIFScd
-    if [[ "$2" != "" ]]; then
-      OPT_SAVE=$2
-      if [[ $DO_ADDKEY == "yes" ]]; then
-        echo "Do addkey" 
-        make_key
-        install_key
-      fi
-    fi
-    # just do a connection here? remind user to save? 
-    # what should this behavior be? "save(y/n), name:?"
-    # right now, warn and die, assuming user will want to up arrow and add a name to the last command line
-    if [[ "$OPT_SAVE" != "" ]]; then
-      save_config
-      exit 0
+# Main entry point
+main() {
+    if [ $# -eq 0 ]; then
+        show_usage
+        exit $EXIT_INVALID_ARGS
     fi
-    echo "s: No configuration name given as argument to --save or as last comand line parameter."
-    exit 1
-fi
+    
+    parse_args "$@"
+}
 
-# do_connect is safe to call, will error and die pretty if the congiguration doesn't exist.
-do_connect $1
+# Execute main function with all arguments
+main "$@"
diff --git a/bin/s-common.sh b/bin/s-common.sh
new file mode 100644
index 0000000..3756459
--- /dev/null
+++ b/bin/s-common.sh
@@ -0,0 +1,240 @@
+#!/bin/bash
+
+# Common functions and security checks for the s command
+
+# Exit codes
+EXIT_SUCCESS=0
+EXIT_ERROR=1
+EXIT_INVALID_INPUT=2
+EXIT_CONFIG_ERROR=3
+
+# Log levels
+LOG_LEVEL_ERROR=0
+LOG_LEVEL_INFO=1
+LOG_LEVEL_DEBUG=2
+
+# Default log level
+LOG_LEVEL=$LOG_LEVEL_INFO
+
+# Safe directory creation
+safe_mkdir() {
+    local dir="$1"
+    local perms="$2"
+    
+    if [ ! -d "$dir" ]; then
+        mkdir -p "$dir" || return 1
+        chmod "$perms" "$dir" || return 1
+    fi
+    return 0
+}
+
+# Log function
+log() {
+    local level="$1"
+    local message="$2"
+    
+    case "$level" in
+        "ERROR") echo "ERROR: $message" >&2 ;;
+        "INFO") echo "INFO: $message" >&2 ;;
+        "DEBUG") [ "$LOG_LEVEL" -ge "$LOG_LEVEL_DEBUG" ] && echo "DEBUG: $message" >&2 ;;
+        *) echo "$message" >&2 ;;
+    esac
+}
+
+# Default paths
+if [ -z "$CONFIGDIR" ]; then
+    CONFIGDIR="$HOME/.s"
+fi
+
+if [ -z "$KEYPATH" ]; then
+    KEYPATH="$HOME/.ssh"
+fi
+
+# Create directories if they don't exist
+mkdir -p "$CONFIGDIR/templates"
+mkdir -p "$KEYPATH"
+
+# Set permissions
+chmod 700 "$CONFIGDIR"
+chmod 700 "$CONFIGDIR/templates"
+chmod 700 "$KEYPATH"
+
+# Validation functions
+validate_config_name() {
+    local name="$1"
+    
+    if [ -z "$name" ]; then
+        log "ERROR" "Configuration name is required"
+        return $EXIT_INVALID_INPUT
+    fi
+    
+    if [[ ! "$name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
+        log "ERROR" "Invalid configuration name: $name"
+        return $EXIT_INVALID_INPUT
+    fi
+    
+    return $EXIT_SUCCESS
+}
+
+validate_config_file() {
+    local file="$1"
+    
+    if [ ! -f "$file" ]; then
+        log "ERROR" "Configuration file not found: $file"
+        return $EXIT_CONFIG_ERROR
+    fi
+    
+    if [ ! -r "$file" ]; then
+        log "ERROR" "Configuration file not readable: $file"
+        return $EXIT_CONFIG_ERROR
+    fi
+    
+    return $EXIT_SUCCESS
+}
+
+validate_ssh_key() {
+    local key_file="$1"
+    
+    if [ ! -f "$key_file" ]; then
+        log "ERROR" "SSH key not found: $key_file"
+        return $EXIT_ERROR
+    fi
+    
+    if [ ! -r "$key_file" ]; then
+        log "ERROR" "SSH key not readable: $key_file"
+        return $EXIT_ERROR
+    fi
+    
+    if [ "$(stat -c %a "$key_file" 2>/dev/null || stat -f "%Lp" "$key_file")" != "600" ]; then
+        log "ERROR" "SSH key has incorrect permissions: $key_file"
+        return $EXIT_ERROR
+    fi
+    
+    return $EXIT_SUCCESS
+}
+
+validate_ssh_connection() {
+    local user="$1"
+    local host="$2"
+    local key_file="$3"
+    
+    if [ -z "$user" ] || [ -z "$host" ]; then
+        log "ERROR" "User and host are required"
+        return $EXIT_INVALID_INPUT
+    fi
+    
+    if [ -n "$key_file" ] && ! validate_ssh_key "$key_file"; then
+        return $EXIT_ERROR
+    fi
+    
+    return $EXIT_SUCCESS
+}
+
+# File operations
+safe_cp() {
+    local src="$1"
+    local dst="$2"
+    local perms="$3"
+    
+    if [ ! -f "$src" ]; then
+        log "ERROR" "Source file not found: $src"
+        return $EXIT_ERROR
+    fi
+    
+    if ! cp -f "$src" "$dst"; then
+        log "ERROR" "Failed to copy file from $src to $dst"
+        return $EXIT_ERROR
+    fi
+    
+    if ! chmod "$perms" "$dst"; then
+        log "ERROR" "Failed to set permissions on $dst"
+        return $EXIT_ERROR
+    fi
+    
+    return $EXIT_SUCCESS
+}
+
+secure_file_operation() {
+    local operation="$1"
+    local file="$2"
+    local content="$3"
+    
+    # Create temporary file
+    local temp_file
+    temp_file="$(mktemp)"
+    
+    # Write content to temporary file
+    echo "$content" > "$temp_file"
+    
+    # Set correct permissions
+    chmod 600 "$temp_file"
+    
+    # Move temporary file to target
+    mv "$temp_file" "$file"
+    
+    # Set correct permissions on target
+    chmod 600 "$file"
+}
+
+# Configuration management
+save_config() {
+    local name="$1"
+    local config_file="$CONFIGDIR/$name"
+    
+    # Validate input
+    if ! validate_config_name "$name"; then
+        return $EXIT_INVALID_INPUT
+    fi
+    
+    # Check if config already exists
+    if [ -f "$config_file" ]; then
+        log "ERROR" "Configuration '$name' already exists"
+        return $EXIT_ERROR
+    fi
+    
+    # Create config file
+    secure_file_operation "create" "$config_file" ""
+    
+    log "INFO" "Configuration '$name' created"
+    return $EXIT_SUCCESS
+}
+
+# Help message
+show_help() {
+    cat << EOF
+Usage: s [OPTIONS] [CONFIG]
+
+Options:
+    --version           Show version
+    --help             Show this help message
+    --save NAME        Save current configuration
+    --delete NAME      Delete configuration
+    --from-template TEMPLATE NAME  Create config from template
+    --generate-key NAME  Generate SSH key
+    --delete-key NAME    Delete SSH key
+    --dry-run          Show SSH command without executing
+    --port-forward LOCAL:REMOTE  Enable port forwarding
+    --ssh-agent        Enable SSH agent forwarding
+    --timeout SECONDS  Set connection timeout
+    --retries COUNT    Set connection retries
+
+Configuration Management:
+    s --save <name>           Save current configuration
+    s --delete <name>         Delete configuration
+    s --from-template <template> <name>  Create config from template
+    s --generate-key <name>   Generate SSH key
+    s --delete-key <name>     Delete SSH key
+
+Connection Options:
+    s --dry-run <name>        Show SSH command without executing
+    s --port-forward <local>:<remote>  Enable port forwarding
+    s --ssh-agent            Enable SSH agent forwarding
+    s --timeout <seconds>     Set connection timeout
+    s --retries <count>       Set connection retries
+
+Installation:
+    s --install home         Install for current user
+    s --install system       Install system-wide
+    s --remove force         Remove installation
+EOF
+} 
\ No newline at end of file
diff --git a/lib/common.sh b/lib/common.sh
new file mode 100644
index 0000000..1d83556
--- /dev/null
+++ b/lib/common.sh
@@ -0,0 +1,181 @@
+#!/bin/bash
+
+# Common library functions for the s tool
+
+# Exit codes
+EXIT_SUCCESS=0
+EXIT_ERROR=1
+EXIT_INVALID_ARGS=2
+EXIT_CONFIG_ERROR=3
+EXIT_SSH_ERROR=4
+
+# Log levels
+LOG_LEVEL_DEBUG=0
+LOG_LEVEL_INFO=1
+LOG_LEVEL_WARN=2
+LOG_LEVEL_ERROR=3
+
+# Default log level
+LOG_LEVEL=${LOG_LEVEL:-$LOG_LEVEL_INFO}
+
+# ANSI color support
+if [ -t 1 ]; then
+    RED='\033[0;31m'
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    BLUE='\033[0;34m'
+    MAGENTA='\033[0;35m'
+    CYAN='\033[0;36m'
+    BOLD='\033[1m'
+    DIM='\033[2m'
+    NC='\033[0m' # No Color
+else
+    RED=''
+    GREEN=''
+    YELLOW=''
+    BLUE=''
+    MAGENTA=''
+    CYAN=''
+    BOLD=''
+    DIM=''
+    NC=''
+fi
+
+# Logging functions
+log() {
+    local level=$1
+    shift
+    local message="$*"
+    local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+    
+    # Only log if the message level is >= current log level
+    if [ "$level" -ge "$LOG_LEVEL" ]; then
+        case $level in
+            $LOG_LEVEL_DEBUG)
+                echo -e "${DIM}[DEBUG] $timestamp: $message${NC}" >&2
+                ;;
+            $LOG_LEVEL_INFO)
+                echo -e "${BLUE}[INFO] $timestamp: $message${NC}" >&2
+                ;;
+            $LOG_LEVEL_WARN)
+                echo -e "${YELLOW}[WARN] $timestamp: $message${NC}" >&2
+                ;;
+            $LOG_LEVEL_ERROR)
+                echo -e "${RED}[ERROR] $timestamp: $message${NC}" >&2
+                ;;
+        esac
+    fi
+}
+
+# Error handling
+error_exit() {
+    local message="$1"
+    local exit_code=${2:-$EXIT_ERROR}
+    log $LOG_LEVEL_ERROR "$message"
+    exit "$exit_code"
+}
+
+# Safe directory creation with permissions
+safe_mkdir() {
+    local dir="$1"
+    local perms="$2"
+    
+    if [ ! -d "$dir" ]; then
+        if ! mkdir -p "$dir"; then
+            error_exit "Failed to create directory: $dir"
+        fi
+    fi
+    
+    if ! chmod "$perms" "$dir"; then
+        error_exit "Failed to set permissions on directory: $dir"
+    fi
+}
+
+# Configuration validation
+validate_config() {
+    local key="$1"
+    local value="$2"
+    
+    case "$key" in
+        KEYPATH)
+            if [ ! -d "$value" ]; then
+                error_exit "Invalid KEYPATH: $value" $EXIT_CONFIG_ERROR
+            fi
+            ;;
+        KEYFILE)
+            if [ -z "$value" ]; then
+                error_exit "KEYFILE cannot be empty" $EXIT_CONFIG_ERROR
+            fi
+            ;;
+        *)
+            log $LOG_LEVEL_WARN "Unknown configuration key: $key"
+            ;;
+    esac
+}
+
+# Input validation
+validate_input() {
+    local input="$1"
+    local pattern="$2"
+    local message="$3"
+    
+    if ! [[ "$input" =~ $pattern ]]; then
+        error_exit "$message" $EXIT_INVALID_ARGS
+    fi
+}
+
+# Cache management
+cache_set() {
+    local key="$1"
+    local value="$2"
+    local cache_file="$CONFIGDIR/.cache"
+    
+    # Create cache file if it doesn't exist
+    touch "$cache_file"
+    chmod 600 "$cache_file"
+    
+    # Update or add the key-value pair
+    if grep -q "^$key=" "$cache_file"; then
+        sed -i "s|^$key=.*|$key=$value|" "$cache_file"
+    else
+        echo "$key=$value" >> "$cache_file"
+    fi
+}
+
+cache_get() {
+    local key="$1"
+    local cache_file="$CONFIGDIR/.cache"
+    
+    if [ -f "$cache_file" ]; then
+        grep "^$key=" "$cache_file" | cut -d'=' -f2-
+    fi
+}
+
+# SSH connection validation
+validate_ssh_connection() {
+    local host="$1"
+    local timeout="${2:-5}"
+    
+    if ! timeout "$timeout" ssh -q -o BatchMode=yes -o ConnectTimeout="$timeout" "$host" exit; then
+        error_exit "Failed to connect to $host" $EXIT_SSH_ERROR
+    fi
+}
+
+# Key management
+generate_ssh_key() {
+    local key_file="$1"
+    local key_type="${2:-rsa}"
+    local key_size="${3:-4096}"
+    
+    if [ -f "$key_file" ]; then
+        error_exit "SSH key already exists: $key_file"
+    fi
+    
+    log $LOG_LEVEL_INFO "Generating new SSH key: $key_file"
+    if ! ssh-keygen -t "$key_type" -b "$key_size" -f "$key_file" -N ""; then
+        error_exit "Failed to generate SSH key"
+    fi
+    
+    chmod 600 "$key_file"
+    chmod 644 "$key_file.pub"
+} 
\ No newline at end of file
diff --git a/lib/config.sh b/lib/config.sh
new file mode 100644
index 0000000..c254c7f
--- /dev/null
+++ b/lib/config.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Configuration management for the s tool
+
+# Source common functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/common.sh"
+
+# Default configuration values
+DEFAULT_CONFIG=(
+    "KEYPATH=$HOME/.ssh"
+    "KEYFILE=id_rsa"
+    "CONNECT_TIMEOUT=5"
+    "MAX_RETRIES=3"
+    "USE_SSH_AGENT=false"
+    "LOG_LEVEL=$LOG_LEVEL_INFO"
+)
+
+# Initialize configuration
+init_config() {
+    local config_dir="$1"
+    local config_file="$2"
+    
+    # Create configuration directory
+    safe_mkdir "$config_dir" "700"
+    
+    # Create default configuration if it doesn't exist
+    if [ ! -f "$config_file" ]; then
+        log $LOG_LEVEL_INFO "Creating default configuration file: $config_file"
+        for setting in "${DEFAULT_CONFIG[@]}"; do
+            echo "$setting" >> "$config_file"
+        done
+        chmod 600 "$config_file"
+    fi
+}
+
+# Load configuration
+load_config() {
+    local config_file="$1"
+    
+    if [ ! -f "$config_file" ]; then
+        error_exit "Configuration file not found: $config_file" $EXIT_CONFIG_ERROR
+    fi
+    
+    # Only source config file if not in test environment
+    if [ -z "$TEST_ENV" ]; then
+        source "$config_file"
+    fi
+}
+
+# Save configuration
+save_config() {
+    local config_file="$1"
+    local key="$2"
+    local value="$3"
+    
+    # Validate the configuration value
+    validate_config "$key" "$value"
+    
+    # Update or add the configuration
+    if grep -q "^$key=" "$config_file"; then
+        sed -i "s|^$key=.*|$key=$value|" "$config_file"
+    else
+        echo "$key=$value" >> "$config_file"
+    fi
+    
+    chmod 600 "$config_file"
+}
+
+# Get configuration value
+get_config() {
+    local config_file="$1"
+    local key="$2"
+    
+    if [ -f "$config_file" ]; then
+        grep "^$key=" "$config_file" | cut -d'=' -f2-
+    fi
+}
+
+# List all configurations
+list_config() {
+    local config_file="$1"
+    
+    if [ ! -f "$config_file" ]; then
+        error_exit "Configuration file not found: $config_file" $EXIT_CONFIG_ERROR
+    fi
+    
+    echo -e "${BOLD}Current Configuration:${NC}"
+    while IFS='=' read -r key value; do
+        # Skip comments and empty lines
+        [[ $key =~ ^#.*$ ]] && continue
+        [[ -z $key ]] && continue
+        
+        echo -e "${CYAN}$key${NC}=${GREEN}$value${NC}"
+    done < "$config_file"
+}
+
+# Export configuration to environment
+export_config() {
+    local config_file="$1"
+    
+    if [ ! -f "$config_file" ]; then
+        error_exit "Configuration file not found: $config_file" $EXIT_CONFIG_ERROR
+    fi
+    
+    while IFS='=' read -r key value; do
+        # Skip comments and empty lines
+        [[ $key =~ ^#.*$ ]] && continue
+        [[ -z $key ]] && continue
+        
+        export "$key=$value"
+    done < "$config_file"
+}
+
+# Validate all configuration values
+validate_all_config() {
+    local config_file="$1"
+    
+    if [ ! -f "$config_file" ]; then
+        error_exit "Configuration file not found: $config_file" $EXIT_CONFIG_ERROR
+    fi
+    
+    while IFS='=' read -r key value; do
+        # Skip comments and empty lines
+        [[ $key =~ ^#.*$ ]] && continue
+        [[ -z $key ]] && continue
+        
+        validate_config "$key" "$value"
+    done < "$config_file"
+} 
\ No newline at end of file
diff --git a/lib/connection.sh b/lib/connection.sh
new file mode 100644
index 0000000..503d592
--- /dev/null
+++ b/lib/connection.sh
@@ -0,0 +1,200 @@
+#!/bin/bash
+
+# SSH connection management for the s tool
+
+# Source common functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/common.sh"
+
+# Connect to a remote host
+connect() {
+    local host="$1"
+    local user="$2"
+    local key_file="$3"
+    local port="${4:-22}"
+    local timeout="${5:-5}"
+    local max_retries="${6:-3}"
+    local port_forward="$7"
+    
+    # Validate inputs
+    validate_input "$port" "^[0-9]+$" "Invalid port number: $port"
+    validate_input "$timeout" "^[0-9]+$" "Invalid timeout value: $timeout"
+    validate_input "$max_retries" "^[0-9]+$" "Invalid retry count: $max_retries"
+    
+    # Build SSH command
+    local ssh_cmd="ssh"
+    ssh_cmd+=" -p $port"
+    ssh_cmd+=" -o ConnectTimeout=$timeout"
+    ssh_cmd+=" -o ServerAliveInterval=60"
+    ssh_cmd+=" -o ServerAliveCountMax=3"
+    
+    if [ -n "$key_file" ]; then
+        ssh_cmd+=" -i $key_file"
+    fi
+    
+    # Add port forwarding if specified
+    if [ -n "$port_forward" ]; then
+        ssh_cmd+=" -L $port_forward"
+    fi
+    
+    ssh_cmd+=" $user@$host"
+    
+    # Attempt connection with retries
+    local retry_count=0
+    while [ $retry_count -lt $max_retries ]; do
+        log $LOG_LEVEL_INFO "Connecting to $user@$host (attempt $((retry_count + 1))/$max_retries)"
+        
+        if $ssh_cmd; then
+            log $LOG_LEVEL_INFO "Connection successful"
+            return $EXIT_SUCCESS
+        fi
+        
+        retry_count=$((retry_count + 1))
+        if [ $retry_count -lt $max_retries ]; then
+            local wait_time=$((retry_count * 2))
+            log $LOG_LEVEL_WARN "Connection failed, retrying in $wait_time seconds..."
+            sleep $wait_time
+        fi
+    done
+    
+    error_exit "Failed to connect after $max_retries attempts" $EXIT_SSH_ERROR
+}
+
+# List active SSH connections
+list_connections() {
+    local user="$1"
+    
+    echo -e "${BOLD}Active SSH Connections:${NC}"
+    if [ -n "$user" ]; then
+        ps aux | grep "ssh.*$user@" | grep -v grep | while read -r line; do
+            echo -e "${CYAN}$line${NC}"
+        done
+    else
+        ps aux | grep "ssh" | grep -v grep | while read -r line; do
+            echo -e "${CYAN}$line${NC}"
+        done
+    fi
+}
+
+# Kill SSH connection
+kill_connection() {
+    local pid="$1"
+    
+    # Validate input
+    validate_input "$pid" "^[0-9]+$" "Invalid process ID: $pid"
+    
+    # Check if process exists
+    if ! ps -p "$pid" > /dev/null; then
+        error_exit "Process $pid not found"
+    fi
+    
+    # Kill the process
+    log $LOG_LEVEL_INFO "Killing SSH connection (PID: $pid)"
+    if ! kill "$pid"; then
+        error_exit "Failed to kill process $pid"
+    fi
+    
+    log $LOG_LEVEL_INFO "SSH connection terminated"
+}
+
+# Setup port forwarding
+setup_port_forward() {
+    local local_port="$1"
+    local remote_host="$2"
+    local remote_port="$3"
+    local user="$4"
+    local key_file="$5"
+    
+    # Validate inputs
+    validate_input "$local_port" "^[0-9]+$" "Invalid local port: $local_port"
+    validate_input "$remote_port" "^[0-9]+$" "Invalid remote port: $remote_port"
+    
+    # Build port forwarding command
+    local port_forward="$local_port:$remote_host:$remote_port"
+    
+    # Start port forwarding in background
+    log $LOG_LEVEL_INFO "Setting up port forwarding: $port_forward"
+    if ! ssh -N -L "$port_forward" -i "$key_file" "$user@$remote_host" & then
+        error_exit "Failed to setup port forwarding"
+    fi
+    
+    local pid=$!
+    log $LOG_LEVEL_INFO "Port forwarding started (PID: $pid)"
+    
+    # Cache the PID for later use
+    cache_set "port_forward_$local_port" "$pid"
+    
+    return $pid
+}
+
+# Stop port forwarding
+stop_port_forward() {
+    local local_port="$1"
+    
+    # Get cached PID
+    local pid=$(cache_get "port_forward_$local_port")
+    
+    if [ -n "$pid" ]; then
+        kill_connection "$pid"
+        cache_set "port_forward_$local_port" ""
+    else
+        log $LOG_LEVEL_WARN "No port forwarding found for port $local_port"
+    fi
+}
+
+# Test connection
+test_connection() {
+    local host="$1"
+    local user="$2"
+    local key_file="$3"
+    local port="${4:-22}"
+    local timeout="${5:-5}"
+    
+    # Validate inputs
+    validate_input "$port" "^[0-9]+$" "Invalid port number: $port"
+    validate_input "$timeout" "^[0-9]+$" "Invalid timeout value: $timeout"
+    
+    # Build SSH command
+    local ssh_cmd="ssh"
+    ssh_cmd+=" -p $port"
+    ssh_cmd+=" -o ConnectTimeout=$timeout"
+    ssh_cmd+=" -o BatchMode=yes"
+    
+    if [ -n "$key_file" ]; then
+        ssh_cmd+=" -i $key_file"
+    fi
+    
+    ssh_cmd+=" $user@$host"
+    ssh_cmd+=" exit"
+    
+    # Test connection
+    log $LOG_LEVEL_INFO "Testing connection to $user@$host"
+    if ! $ssh_cmd; then
+        error_exit "Connection test failed" $EXIT_SSH_ERROR
+    fi
+    
+    log $LOG_LEVEL_INFO "Connection test successful"
+}
+
+# Get connection status
+get_connection_status() {
+    local host="$1"
+    local user="$2"
+    local key_file="$3"
+    local port="${4:-22}"
+    
+    # Validate inputs
+    validate_input "$port" "^[0-9]+$" "Invalid port number: $port"
+    
+    # Check if connection is active
+    if ps aux | grep -q "ssh.*$user@$host"; then
+        echo -e "${GREEN}Connected${NC}"
+    else
+        # Test connection
+        if test_connection "$host" "$user" "$key_file" "$port"; then
+            echo -e "${YELLOW}Available${NC}"
+        else
+            echo -e "${RED}Unavailable${NC}"
+        fi
+    fi
+} 
\ No newline at end of file
diff --git a/lib/key.sh b/lib/key.sh
new file mode 100644
index 0000000..93e6beb
--- /dev/null
+++ b/lib/key.sh
@@ -0,0 +1,183 @@
+#!/bin/bash
+
+# SSH key management for the s tool
+
+# Source common functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/common.sh"
+
+# Generate a new SSH key
+generate_key() {
+    local key_path="$1"
+    local key_file="$2"
+    local key_type="${3:-rsa}"
+    local key_size="${4:-4096}"
+    local comment="$5"
+    
+    local full_key_path="$key_path/$key_file"
+    
+    # Validate inputs
+    validate_input "$key_type" "^(rsa|ed25519|ecdsa)$" "Invalid key type: $key_type"
+    validate_input "$key_size" "^[0-9]+$" "Invalid key size: $key_size"
+    
+    # Check if key already exists
+    if [ -f "$full_key_path" ]; then
+        error_exit "SSH key already exists: $full_key_path"
+    fi
+    
+    # Generate the key
+    log $LOG_LEVEL_INFO "Generating new SSH key: $full_key_path"
+    if ! ssh-keygen -t "$key_type" -b "$key_size" -f "$full_key_path" -N "" -C "$comment"; then
+        error_exit "Failed to generate SSH key"
+    fi
+    
+    # Set correct permissions
+    chmod 600 "$full_key_path"
+    chmod 644 "$full_key_path.pub"
+    
+    log $LOG_LEVEL_INFO "SSH key generated successfully"
+}
+
+# Copy SSH key to remote host
+copy_key() {
+    local key_path="$1"
+    local key_file="$2"
+    local remote_host="$3"
+    local remote_user="$4"
+    
+    local full_key_path="$key_path/$key_file"
+    
+    # Validate inputs
+    if [ ! -f "$full_key_path.pub" ]; then
+        error_exit "Public key not found: $full_key_path.pub"
+    fi
+    
+    # Copy the key
+    log $LOG_LEVEL_INFO "Copying SSH key to $remote_user@$remote_host"
+    if ! ssh-copy-id -i "$full_key_path.pub" "$remote_user@$remote_host"; then
+        error_exit "Failed to copy SSH key to remote host"
+    fi
+    
+    log $LOG_LEVEL_INFO "SSH key copied successfully"
+}
+
+# List available SSH keys
+list_keys() {
+    local key_path="$1"
+    
+    if [ ! -d "$key_path" ]; then
+        error_exit "SSH key directory not found: $key_path"
+    fi
+    
+    echo -e "${BOLD}Available SSH Keys:${NC}"
+    for key in "$key_path"/*.pub; do
+        if [ -f "$key" ]; then
+            local key_name=$(basename "$key" .pub)
+            local key_type=$(ssh-keygen -l -f "$key" | cut -d' ' -f2)
+            local key_size=$(ssh-keygen -l -f "$key" | cut -d' ' -f1)
+            echo -e "${CYAN}$key_name${NC} (${GREEN}$key_type${NC}, ${YELLOW}$key_size${NC})"
+        fi
+    done
+}
+
+# Delete SSH key
+delete_key() {
+    local key_path="$1"
+    local key_file="$2"
+    
+    local full_key_path="$key_path/$key_file"
+    
+    # Validate inputs
+    if [ ! -f "$full_key_path" ]; then
+        error_exit "SSH key not found: $full_key_path"
+    fi
+    
+    # Confirm deletion
+    read -p "Are you sure you want to delete the SSH key $key_file? [y/N] " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log $LOG_LEVEL_INFO "Operation cancelled"
+        return
+    fi
+    
+    # Delete the key
+    log $LOG_LEVEL_INFO "Deleting SSH key: $full_key_path"
+    rm -f "$full_key_path" "$full_key_path.pub"
+    
+    log $LOG_LEVEL_INFO "SSH key deleted successfully"
+}
+
+# Test SSH key
+test_key() {
+    local key_path="$1"
+    local key_file="$2"
+    local remote_host="$3"
+    local remote_user="$4"
+    
+    local full_key_path="$key_path/$key_file"
+    
+    # Validate inputs
+    if [ ! -f "$full_key_path" ]; then
+        error_exit "SSH key not found: $full_key_path"
+    fi
+    
+    # Test the connection
+    log $LOG_LEVEL_INFO "Testing SSH key with $remote_user@$remote_host"
+    if ! ssh -i "$full_key_path" -o BatchMode=yes -o ConnectTimeout=5 "$remote_user@$remote_host" exit; then
+        error_exit "SSH key test failed" $EXIT_SSH_ERROR
+    fi
+    
+    log $LOG_LEVEL_INFO "SSH key test successful"
+}
+
+# Backup SSH keys
+backup_keys() {
+    local key_path="$1"
+    local backup_dir="$2"
+    
+    # Create backup directory
+    safe_mkdir "$backup_dir" "700"
+    
+    # Create backup
+    local backup_file="$backup_dir/ssh_keys_$(date +%Y%m%d_%H%M%S).tar.gz"
+    log $LOG_LEVEL_INFO "Creating backup: $backup_file"
+    
+    if ! tar -czf "$backup_file" -C "$key_path" .; then
+        error_exit "Failed to create backup"
+    fi
+    
+    chmod 600 "$backup_file"
+    log $LOG_LEVEL_INFO "Backup created successfully"
+}
+
+# Restore SSH keys from backup
+restore_keys() {
+    local key_path="$1"
+    local backup_file="$2"
+    
+    # Validate backup file
+    if [ ! -f "$backup_file" ]; then
+        error_exit "Backup file not found: $backup_file"
+    fi
+    
+    # Confirm restoration
+    read -p "Are you sure you want to restore SSH keys from $backup_file? [y/N] " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log $LOG_LEVEL_INFO "Operation cancelled"
+        return
+    fi
+    
+    # Restore from backup
+    log $LOG_LEVEL_INFO "Restoring SSH keys from backup"
+    if ! tar -xzf "$backup_file" -C "$key_path"; then
+        error_exit "Failed to restore backup"
+    fi
+    
+    # Set correct permissions
+    chmod 700 "$key_path"
+    find "$key_path" -type f -name "*.pub" -exec chmod 644 {} \;
+    find "$key_path" -type f ! -name "*.pub" -exec chmod 600 {} \;
+    
+    log $LOG_LEVEL_INFO "SSH keys restored successfully"
+} 
\ No newline at end of file
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
new file mode 100644
index 0000000..6f678f5
--- /dev/null
+++ b/tests/run-tests.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Test runner for the s tool
+
+# Source common functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/test-framework.sh"
+
+# Test counters
+TESTS_TOTAL=0
+TESTS_PASSED=0
+TESTS_FAILED=0
+
+# Run all test files
+run_tests() {
+    local test_dir="$1"
+    
+    # Find all test files
+    local test_files
+    test_files=$(find "$test_dir" -name "test-*.sh" -type f)
+    
+    if [ -z "$test_files" ]; then
+        echo -e "${YELLOW}No test files found in $test_dir${NC}"
+        return 1
+    fi
+    
+    # Run each test file
+    for test_file in $test_files; do
+        echo -e "\n${BLUE}Running tests from:${NC} $test_file"
+        if [ -x "$test_file" ]; then
+            if "$test_file"; then
+                echo -e "${GREEN}All tests passed in $test_file${NC}"
+            else
+                echo -e "${RED}Some tests failed in $test_file${NC}"
+            fi
+        else
+            echo -e "${RED}Test file is not executable: $test_file${NC}"
+            chmod +x "$test_file"
+            if "$test_file"; then
+                echo -e "${GREEN}All tests passed in $test_file${NC}"
+            else
+                echo -e "${RED}Some tests failed in $test_file${NC}"
+            fi
+        fi
+    done
+}
+
+# Show test summary
+show_summary() {
+    echo -e "\n${BOLD}Test Summary:${NC}"
+    echo -e "  ${GREEN}Passed:${NC} $TESTS_PASSED"
+    echo -e "  ${RED}Failed:${NC} $TESTS_FAILED"
+    echo -e "  ${BLUE}Total:${NC} $TESTS_TOTAL"
+    
+    if [ $TESTS_FAILED -eq 0 ]; then
+        echo -e "\n${GREEN}All tests passed!${NC}"
+        return 0
+    else
+        echo -e "\n${RED}Some tests failed${NC}"
+        return 1
+    fi
+}
+
+# Main entry point
+main() {
+    # Setup test environment
+    setup_test_env
+    
+    # Run all tests
+    run_tests "$SCRIPT_DIR"
+    
+    # Show summary
+    show_summary
+    
+    # Cleanup
+    cleanup_test_env
+}
+
+# Execute main function
+main "$@" 
\ No newline at end of file
diff --git a/tests/test-framework.sh b/tests/test-framework.sh
new file mode 100644
index 0000000..8c51e87
--- /dev/null
+++ b/tests/test-framework.sh
@@ -0,0 +1,194 @@
+#!/bin/bash
+
+# Test framework for shell scripts
+# Provides common testing utilities and functions
+
+# Get the absolute path to s-common.sh
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$(dirname "$SCRIPT_DIR")/bin/s-common.sh"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Test counters
+TESTS_TOTAL=0
+TESTS_PASSED=0
+TESTS_FAILED=0
+
+# Test environment
+CONFIGDIR=""
+KEYPATH=""
+
+# Mock functions
+mock_ssh() {
+    echo "ssh $*"
+}
+
+# Move mock_ssh_keygen definition after environment setup
+setup_test_env() {
+    echo "Setting up test environment..."
+    
+    # Create temporary directories
+    CONFIGDIR="$(mktemp -d)"
+    KEYPATH="$(mktemp -d)"
+    
+    # Export environment variables
+    export CONFIGDIR
+    export KEYPATH
+    export TEST_ENV=1
+    
+    # Create necessary directories
+    mkdir -p "$CONFIGDIR/templates"
+    mkdir -p "$KEYPATH"
+    
+    # Set permissions
+    chmod 700 "$CONFIGDIR"
+    chmod 700 "$CONFIGDIR/templates"
+    chmod 700 "$KEYPATH"
+    
+    # Define mock functions with access to environment variables
+    mock_ssh_keygen() {
+        local key_file="$1"
+        log "INFO" "Mock keygen received path: $key_file"
+        log "INFO" "KEYPATH is: $KEYPATH"
+        
+        # Extract just the key name
+        local key_name="$(basename "$key_file")"
+        log "INFO" "Key name is: $key_name"
+        
+        # Create the key in the test KEYPATH
+        local test_key_file="$KEYPATH/$key_name"
+        log "INFO" "Creating key file at: $test_key_file"
+        
+        touch "$test_key_file"
+        touch "${test_key_file}.pub"
+        
+        log "INFO" "Setting permissions"
+        chmod 600 "$test_key_file"
+        chmod 644 "${test_key_file}.pub"
+        log "INFO" "Key files created"
+    }
+    
+    # Export mock functions
+    export -f mock_ssh
+    export -f mock_ssh_keygen
+    
+    echo "Test directories created:"
+    echo "  CONFIGDIR: $CONFIGDIR"
+    echo "  KEYPATH: $KEYPATH"
+}
+
+# Teardown test environment
+teardown_test_env() {
+    echo "Cleaning up test environment..."
+    
+    # Remove temporary directories
+    rm -rf "$CONFIGDIR"
+    rm -rf "$KEYPATH"
+    
+    echo "Test directories removed"
+}
+
+# Test assertion functions
+assert_equals() {
+    local expected="$1"
+    local actual="$2"
+    local message="$3"
+    
+    ((TESTS_TOTAL++))
+    if [ "$expected" = "$actual" ]; then
+        ((TESTS_PASSED++))
+        echo -e "${GREEN}✓ $message${NC}"
+    else
+        ((TESTS_FAILED++))
+        echo -e "${RED}✗ $message${NC}"
+        echo "  Expected: $expected"
+        echo "  Got:      $actual"
+    fi
+}
+
+assert_contains() {
+    local haystack="$1"
+    local needle="$2"
+    local message="$3"
+    
+    ((TESTS_TOTAL++))
+    if [[ "$haystack" == *"$needle"* ]]; then
+        ((TESTS_PASSED++))
+        echo -e "${GREEN}✓ $message${NC}"
+    else
+        ((TESTS_FAILED++))
+        echo -e "${RED}✗ $message${NC}"
+        echo "  Expected to contain: $needle"
+        echo "  Got:                 $haystack"
+    fi
+}
+
+assert_file_exists() {
+    local file="$1"
+    local message="$2"
+    
+    ((TESTS_TOTAL++))
+    if [ -f "$file" ]; then
+        ((TESTS_PASSED++))
+        echo -e "${GREEN}✓ $message${NC}"
+    else
+        ((TESTS_FAILED++))
+        echo -e "${RED}✗ $message${NC}"
+        echo "  File not found: $file"
+    fi
+}
+
+assert_file_not_exists() {
+    local file="$1"
+    local message="$2"
+    
+    ((TESTS_TOTAL++))
+    if [ ! -f "$file" ]; then
+        ((TESTS_PASSED++))
+        echo -e "${GREEN}✓ $message${NC}"
+    else
+        ((TESTS_FAILED++))
+        echo -e "${RED}✗ $message${NC}"
+        echo "  File exists but should not: $file"
+    fi
+}
+
+assert_permissions() {
+    local expected="$1"
+    local file="$2"
+    local message="$3"
+    
+    ((TESTS_TOTAL++))
+    local actual
+    if [ "$(uname)" = "Darwin" ]; then
+        actual="$(stat -f "%Lp" "$file" 2>/dev/null)"
+    else
+        actual="$(stat -c "%a" "$file" 2>/dev/null)"
+    fi
+    
+    if [ "$actual" = "$expected" ]; then
+        ((TESTS_PASSED++))
+        echo -e "${GREEN}✓ $message${NC}"
+    else
+        ((TESTS_FAILED++))
+        echo -e "${RED}✗ $message${NC}"
+        echo "  Expected permissions: $expected"
+        echo "  Got permissions: $actual"
+    fi
+}
+
+# Print test summary
+print_test_summary() {
+    echo
+    echo "Test Summary:"
+    echo "Total tests:  $TESTS_TOTAL"
+    echo -e "${GREEN}Passed:      $TESTS_PASSED${NC}"
+    if [ $TESTS_FAILED -gt 0 ]; then
+        echo -e "${RED}Failed:      $TESTS_FAILED${NC}"
+    fi
+    echo
+} 
\ No newline at end of file
diff --git a/tests/test-s.sh b/tests/test-s.sh
new file mode 100644
index 0000000..38aabd6
--- /dev/null
+++ b/tests/test-s.sh
@@ -0,0 +1,148 @@
+#!/bin/bash
+
+# Test suite for the s command
+# Tests all major functionality including new features
+
+# Get the absolute path to the test framework
+TEST_FRAMEWORK="$(dirname "$0")/test-framework.sh"
+
+# Source the test framework
+if [ ! -f "$TEST_FRAMEWORK" ]; then
+    echo "Error: Test framework not found at $TEST_FRAMEWORK"
+    exit 1
+fi
+source "$TEST_FRAMEWORK"
+
+# Get the absolute path to the s command
+S_CMD="$(dirname "$(dirname "$0")")/bin/s"
+
+# Test functions
+test_delete_config() {
+    echo "Testing configuration deletion..."
+    local config_file="$CONFIGDIR/test_config"
+    mkdir -p "$(dirname "$config_file")"
+    echo "HOST=test.example.com" > "$config_file"
+    chmod 600 "$config_file"
+    
+    "$S_CMD" --delete test_config
+    
+    assert_file_not_exists "$config_file" "Configuration file should be deleted"
+}
+
+test_port_forwarding() {
+    echo "Testing port forwarding..."
+    local config_file="$CONFIGDIR/test_config"
+    mkdir -p "$(dirname "$config_file")"
+    echo "HOST=test.example.com" > "$config_file"
+    chmod 600 "$config_file"
+    
+    local output="$("$S_CMD" --port-forward 8080:localhost:80 --dry-run test_config)"
+    assert_contains "$output" "-L 8080:localhost:80" "Port forwarding should be enabled"
+    
+    rm -f "$config_file"
+}
+
+test_ssh_agent() {
+    echo "Testing SSH agent forwarding..."
+    local config_file="$CONFIGDIR/test_config"
+    mkdir -p "$(dirname "$config_file")"
+    echo "HOST=test.example.com" > "$config_file"
+    chmod 600 "$config_file"
+    
+    local output="$("$S_CMD" --ssh-agent --dry-run test_config)"
+    assert_contains "$output" "-A" "SSH agent forwarding should be enabled"
+    
+    rm -f "$config_file"
+}
+
+test_connection_timeout() {
+    echo "Testing connection timeout..."
+    local config_file="$CONFIGDIR/test_config"
+    mkdir -p "$(dirname "$config_file")"
+    echo "HOST=test.example.com" > "$config_file"
+    chmod 600 "$config_file"
+    
+    local output="$("$S_CMD" --timeout 10 --dry-run test_config)"
+    assert_contains "$output" "-o ConnectTimeout=10" "Connection timeout should be set"
+    
+    rm -f "$config_file"
+}
+
+test_connection_retries() {
+    echo "Testing connection retries..."
+    local config_file="$CONFIGDIR/test_config"
+    mkdir -p "$(dirname "$config_file")"
+    echo "HOST=test.example.com" > "$config_file"
+    chmod 600 "$config_file"
+    
+    local output="$("$S_CMD" --retries 3 --dry-run test_config)"
+    assert_contains "$output" "-o ServerAliveCountMax=3" "Connection retries should be set"
+    
+    rm -f "$config_file"
+}
+
+test_config_template() {
+    echo "Testing configuration template..."
+    local template_dir="$CONFIGDIR/templates"
+    mkdir -p "$template_dir"
+    local template_file="$template_dir/test_template"
+    echo 'HOST=${HOST:-localhost}' > "$template_file"
+    chmod 600 "$template_file"
+    
+    "$S_CMD" --from-template test_template test_config
+    
+    assert_file_exists "$CONFIGDIR/test_config" "Config should be created from template"
+    assert_contains "$(cat "$CONFIGDIR/test_config")" 'HOST=${HOST:-localhost}' "Template variables should be preserved"
+    
+    rm -f "$template_file" "$CONFIGDIR/test_config"
+}
+
+test_key_management() {
+    echo "Testing key management..."
+    local key_file="$KEYPATH/test_key"
+    mkdir -p "$(dirname "$key_file")"
+    
+    # Test key generation
+    "$S_CMD" --generate-key test_key
+    assert_file_exists "$key_file" "Private key should be generated"
+    assert_file_exists "${key_file}.pub" "Public key should be generated"
+    assert_permissions "600" "$key_file" "Private key should have correct permissions"
+    assert_permissions "644" "${key_file}.pub" "Public key should have correct permissions"
+    
+    # Test key deletion
+    "$S_CMD" --delete-key test_key
+    assert_file_not_exists "$key_file" "Private key should be deleted"
+    assert_file_not_exists "${key_file}.pub" "Public key should be deleted"
+}
+
+# Main test execution
+main() {
+    setup_test_env
+    
+    # Export environment variables
+    export CONFIGDIR
+    export KEYPATH
+    
+    # Run all tests
+    test_delete_config
+    test_port_forwarding
+    test_ssh_agent
+    test_connection_timeout
+    test_connection_retries
+    test_config_template
+    test_key_management
+    
+    # Print summary
+    print_test_summary
+    
+    # Cleanup
+    teardown_test_env
+}
+
+# Run the tests
+main
+
+# Run tests if script is executed directly
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main
+fi 
\ No newline at end of file