diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..95bb51b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+# Bitwarden configuration files containing secrets
+bitwarden-config.conf
+*.conf
+
+# Log files
+*.log
+/tmp/*.log
+
+# Session files
+.bw-session
+
+# Backup files
+*.bak
+*.backup
+
+# OS specific files
+.DS_Store
+Thumbs.db
+
+# Editor files
+*.swp
+*.swo
+*~
+.vscode/
+.idea/
\ No newline at end of file
diff --git a/README.md b/README.md
index ee68785..f545cad 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,167 @@
-# TSYSSecretsManager
+# TSYS Secrets Manager
 
-Managing secrets at TSYS using bitwarden/envwarden/our own glue code.
\ No newline at end of file
+A comprehensive bash script solution for managing secrets at TSYS using the Bitwarden CLI. This tool provides automated installation, configuration, and secure secret retrieval from your Bitwarden vault.
+
+## Features
+
+- **Automated Installation**: Automatically detects and installs Bitwarden CLI via multiple methods (snap, npm, direct download)
+- **Configuration Management**: Uses secure configuration files for server and authentication details
+- **Multiple Commands**: Support for installation, secret retrieval, listing, and testing
+- **Robust Error Handling**: Comprehensive error codes and detailed logging
+- **Security-First**: Proper session management, cleanup, and credential handling
+- **Cross-Platform**: Designed for Linux environments with multiple installation fallbacks
+
+## Quick Start
+
+1. **Clone and Setup**:
+   ```bash
+   git clone <repository-url>
+   cd KNELSecretsManager
+   chmod +x secrets-manager.sh
+   ```
+
+2. **Create Configuration**:
+   ```bash
+   cp bitwarden-config.conf.sample bitwarden-config.conf
+   # Edit bitwarden-config.conf with your actual Bitwarden credentials
+   ```
+
+3. **Install Bitwarden CLI** (if not already installed):
+   ```bash
+   ./secrets-manager.sh install
+   ```
+
+4. **Test Your Setup**:
+   ```bash
+   ./secrets-manager.sh test
+   ```
+
+5. **Retrieve Secrets**:
+   ```bash
+   ./secrets-manager.sh get APIKEY-pushover
+   ```
+
+## Configuration
+
+Create a `bitwarden-config.conf` file based on the provided sample:
+
+```bash
+# Bitwarden server URL
+BW_SERVER_URL="https://pwvault.turnsys.com"
+
+# API credentials (from Bitwarden account settings)
+BW_CLIENTID="your_client_id_here"
+BW_CLIENTSECRET="your_client_secret_here"
+
+# Master password
+BW_PASSWORD="your_master_password_here"
+```
+
+**Security Note**: The actual configuration file is automatically ignored by git to prevent credential exposure.
+
+## Usage
+
+### Command Reference
+
+```bash
+./secrets-manager.sh [OPTIONS] COMMAND [ARGS]
+```
+
+#### Commands
+
+- **`install`** - Install Bitwarden CLI
+- **`get <secret_name>`** - Retrieve a specific secret
+- **`list`** - List all available secrets in your vault
+- **`test`** - Test configuration and connectivity
+
+#### Options
+
+- **`-c, --config FILE`** - Use specific config file (default: `./bitwarden-config.conf`)
+- **`-h, --help`** - Show help message
+- **`-v, --version`** - Show version information
+
+### Examples
+
+```bash
+# Install Bitwarden CLI
+./secrets-manager.sh install
+
+# Test your configuration
+./secrets-manager.sh test
+
+# Get a specific secret
+./secrets-manager.sh get APIKEY-pushover
+
+# List all available secrets
+./secrets-manager.sh list
+
+# Use a custom config file
+./secrets-manager.sh --config /path/to/custom.conf get my-secret
+```
+
+### Using in Scripts
+
+```bash
+#!/bin/bash
+# Example: Load API key into environment variable
+export PUSHOVER_API="$(./secrets-manager.sh get APIKEY-pushover)"
+
+# Use the secret in your application
+curl -X POST "https://api.pushover.net/1/messages.json" \
+  -d "token=$PUSHOVER_API" \
+  -d "user=your_user_key" \
+  -d "message=Hello from TSYS!"
+```
+
+## Installation Methods
+
+The script automatically tries multiple installation methods in order:
+
+1. **Snap Package** (if snapd is available)
+2. **NPM Global Package** (if npm is available)
+3. **Direct Binary Download** (fallback method)
+
+## Error Codes
+
+| Code | Description |
+|------|-------------|
+| 10   | Configuration file not found |
+| 20   | Bitwarden CLI not installed |
+| 30   | Bitwarden CLI installation failed |
+| 40   | Server configuration failed |
+| 50   | Session/unlock failed |
+| 60   | Secret not found |
+| 70   | Login failed |
+
+## Logging
+
+All operations are logged to `/tmp/secrets-manager.sh.log` for debugging and audit purposes.
+
+## Security Considerations
+
+- Configuration files containing credentials are automatically gitignored
+- Session tokens are properly cleaned up on script exit
+- Master passwords are handled securely without shell history exposure
+- All sensitive operations include proper error handling
+
+## Legacy Scripts
+
+This repository also contains previous implementations:
+
+- **`poc.sh`** - Original proof of concept
+- **`prod.sh`** - ChatGPT-assisted production attempt
+
+The new `secrets-manager.sh` combines the best features of both while adding robust error handling, installation management, and improved security.
+
+## Contributing
+
+When contributing to this project:
+
+1. Test all changes thoroughly
+2. Update documentation as needed
+3. Follow existing code style and conventions
+4. Ensure security best practices are maintained
+
+## License
+
+See [LICENSE](LICENSE) file for details.
\ No newline at end of file
diff --git a/bitwarden-config.conf.sample b/bitwarden-config.conf.sample
new file mode 100644
index 0000000..7c2d33c
--- /dev/null
+++ b/bitwarden-config.conf.sample
@@ -0,0 +1,16 @@
+# Bitwarden Configuration File
+# Copy this file to bitwarden-config.conf and update with your actual values
+
+# Bitwarden server URL
+BW_SERVER_URL="https://pwvault.turnsys.com"
+
+# API credentials (get these from your Bitwarden account settings)
+BW_CLIENTID="your_client_id_here"
+BW_CLIENTSECRET="your_client_secret_here"
+
+# Master password for your Bitwarden account
+BW_PASSWORD="your_master_password_here"
+
+# Optional: Additional environment variables
+# BW_ORGANIZATION_ID="your_org_id_here"
+# BW_COLLECTION_ID="your_collection_id_here"
\ No newline at end of file
diff --git a/secrets-manager.sh b/secrets-manager.sh
new file mode 100644
index 0000000..4546d50
--- /dev/null
+++ b/secrets-manager.sh
@@ -0,0 +1,291 @@
+#!/usr/bin/env bash
+
+# TSYS Secrets Manager - Complete Bitwarden CLI management script
+# Handles installation, configuration, authentication, and secret retrieval
+
+set -o errexit
+set -o nounset
+set -o pipefail
+IFS=$'\n\t'
+
+readonly SCRIPT_NAME=$(basename "$0")
+readonly SCRIPT_VERSION="2.0"
+readonly SCRIPT_DESC="TSYS Secrets Manager - Complete Bitwarden CLI solution"
+
+readonly DEFAULT_CONFIG_FILE="./bitwarden-config.conf"
+readonly LOG_FILE="/tmp/${SCRIPT_NAME}.log"
+readonly TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')
+
+info() { echo "[INFO] [$TIMESTAMP] $*" | tee -a "$LOG_FILE"; }
+warn() { echo "[WARN] [$TIMESTAMP] $*" | tee -a "$LOG_FILE"; }
+error() { echo "[ERROR] [$TIMESTAMP] $*" >&2 | tee -a "$LOG_FILE"; }
+
+readonly ERR_CONFIG_NOT_FOUND=10
+readonly ERR_BW_NOT_INSTALLED=20
+readonly ERR_BW_INSTALL_FAILED=30
+readonly ERR_BW_SERVER_CONFIG=40
+readonly ERR_SESSION_INVALID=50
+readonly ERR_SECRET_NOT_FOUND=60
+readonly ERR_LOGIN_FAILED=70
+
+cleanup() {
+    info "Cleaning up session data..."
+    unset BW_SESSION 2>/dev/null || true
+}
+
+install_bitwarden_cli() {
+    info "Checking if Bitwarden CLI is installed..."
+    
+    if command -v bw &>/dev/null; then
+        local version=$(bw --version)
+        info "Bitwarden CLI already installed: $version"
+        return 0
+    fi
+    
+    info "Installing Bitwarden CLI..."
+    
+    if command -v snap &>/dev/null; then
+        info "Installing via snap..."
+        if sudo snap install bw; then
+            info "Bitwarden CLI installed successfully via snap"
+            return 0
+        fi
+    fi
+    
+    if command -v npm &>/dev/null; then
+        info "Installing via npm..."
+        if sudo npm install -g @bitwarden/cli; then
+            info "Bitwarden CLI installed successfully via npm"
+            return 0
+        fi
+    fi
+    
+    info "Installing via direct download..."
+    local bw_url="https://github.com/bitwarden/clients/releases/latest/download/bw-linux-1.22.1.zip"
+    local temp_dir=$(mktemp -d)
+    
+    if command -v wget &>/dev/null; then
+        wget -O "$temp_dir/bw.zip" "$bw_url"
+    elif command -v curl &>/dev/null; then
+        curl -L -o "$temp_dir/bw.zip" "$bw_url"
+    else
+        error "Neither wget nor curl available for download"
+        exit $ERR_BW_INSTALL_FAILED
+    fi
+    
+    if command -v unzip &>/dev/null; then
+        unzip "$temp_dir/bw.zip" -d "$temp_dir"
+        sudo mv "$temp_dir/bw" /usr/local/bin/
+        sudo chmod +x /usr/local/bin/bw
+        rm -rf "$temp_dir"
+        info "Bitwarden CLI installed successfully via direct download"
+    else
+        error "unzip not available to extract Bitwarden CLI"
+        exit $ERR_BW_INSTALL_FAILED
+    fi
+}
+
+load_config() {
+    local config_file="${1:-$DEFAULT_CONFIG_FILE}"
+    
+    if [[ ! -f "$config_file" ]]; then
+        error "Configuration file not found: $config_file"
+        error "Please create a configuration file or use --config option"
+        exit $ERR_CONFIG_NOT_FOUND
+    fi
+    
+    info "Loading configuration from: $config_file"
+    source "$config_file"
+    
+    if [[ -z "${BW_SERVER_URL:-}" ]]; then
+        error "BW_SERVER_URL not defined in config file"
+        exit $ERR_CONFIG_NOT_FOUND
+    fi
+    
+    if [[ -z "${BW_CLIENTID:-}" ]] || [[ -z "${BW_CLIENTSECRET:-}" ]]; then
+        error "BW_CLIENTID and BW_CLIENTSECRET must be defined in config file"
+        exit $ERR_CONFIG_NOT_FOUND
+    fi
+    
+    if [[ -z "${BW_PASSWORD:-}" ]]; then
+        error "BW_PASSWORD must be defined in config file"
+        exit $ERR_CONFIG_NOT_FOUND
+    fi
+}
+
+setup_bitwarden_server() {
+    info "Configuring Bitwarden server to $BW_SERVER_URL..."
+    
+    if ! bw config server "$BW_SERVER_URL" >/dev/null 2>&1; then
+        error "Failed to configure Bitwarden server"
+        exit $ERR_BW_SERVER_CONFIG
+    fi
+    
+    info "Bitwarden server configured successfully"
+}
+
+login_and_unlock() {
+    info "Logging out any existing session..."
+    bw logout >/dev/null 2>&1 || true
+    
+    info "Logging in with API key..."
+    if ! bw login --apikey "$BW_CLIENTID" "$BW_CLIENTSECRET" >/dev/null 2>&1; then
+        error "Failed to login with API key"
+        exit $ERR_LOGIN_FAILED
+    fi
+    
+    info "Unlocking vault..."
+    local session_token
+    session_token=$(echo "$BW_PASSWORD" | bw unlock --raw 2>/dev/null)
+    
+    if [[ -z "$session_token" ]]; then
+        error "Failed to unlock vault with provided password"
+        exit $ERR_SESSION_INVALID
+    fi
+    
+    export BW_SESSION="$session_token"
+    info "Vault unlocked successfully"
+}
+
+fetch_secret() {
+    local secret_name="$1"
+    local secret_value
+    
+    info "Fetching secret: $secret_name"
+    
+    if ! secret_value=$(bw get password "$secret_name" --session "$BW_SESSION" 2>/dev/null); then
+        error "Failed to retrieve secret: $secret_name"
+        exit $ERR_SECRET_NOT_FOUND
+    fi
+    
+    if [[ -z "$secret_value" ]]; then
+        error "Secret '$secret_name' is empty or not found"
+        exit $ERR_SECRET_NOT_FOUND
+    fi
+    
+    echo "$secret_value"
+}
+
+list_secrets() {
+    info "Listing all available items..."
+    bw list items --session "$BW_SESSION" | jq -r '.[] | .name' 2>/dev/null || {
+        bw list items --session "$BW_SESSION" | grep '"name"' | cut -d'"' -f4
+    }
+}
+
+usage() {
+    cat <<EOF
+$SCRIPT_DESC
+
+Usage:
+    $SCRIPT_NAME [OPTIONS] COMMAND [ARGS]
+
+Commands:
+    install                 Install Bitwarden CLI
+    get <secret_name>       Retrieve a specific secret
+    list                    List all available secrets
+    test                    Test configuration and connectivity
+
+Options:
+    -c, --config FILE       Use specific config file (default: $DEFAULT_CONFIG_FILE)
+    -h, --help             Show this help message
+    -v, --version          Show version information
+
+Examples:
+    $SCRIPT_NAME install
+    $SCRIPT_NAME get APIKEY-pushover
+    $SCRIPT_NAME list
+    $SCRIPT_NAME --config /path/to/config.conf get my-secret
+
+Environment Variables (can be set in config file):
+    BW_SERVER_URL          Bitwarden server URL
+    BW_CLIENTID           API client ID
+    BW_CLIENTSECRET       API client secret
+    BW_PASSWORD           Master password
+EOF
+}
+
+main() {
+    local config_file="$DEFAULT_CONFIG_FILE"
+    local command=""
+    
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -c|--config)
+                config_file="$2"
+                shift 2
+                ;;
+            -h|--help)
+                usage
+                exit 0
+                ;;
+            -v|--version)
+                echo "$SCRIPT_NAME version $SCRIPT_VERSION"
+                exit 0
+                ;;
+            install)
+                command="install"
+                shift
+                ;;
+            get)
+                command="get"
+                secret_name="$2"
+                shift 2
+                ;;
+            list)
+                command="list"
+                shift
+                ;;
+            test)
+                command="test"
+                shift
+                ;;
+            *)
+                error "Unknown option: $1"
+                usage
+                exit 1
+                ;;
+        esac
+    done
+    
+    case "$command" in
+        install)
+            install_bitwarden_cli
+            ;;
+        get)
+            if [[ -z "${secret_name:-}" ]]; then
+                error "Secret name required for 'get' command"
+                usage
+                exit 1
+            fi
+            load_config "$config_file"
+            install_bitwarden_cli
+            setup_bitwarden_server
+            login_and_unlock
+            fetch_secret "$secret_name"
+            ;;
+        list)
+            load_config "$config_file"
+            install_bitwarden_cli
+            setup_bitwarden_server
+            login_and_unlock
+            list_secrets
+            ;;
+        test)
+            load_config "$config_file"
+            install_bitwarden_cli
+            setup_bitwarden_server
+            login_and_unlock
+            info "Configuration test successful!"
+            ;;
+        *)
+            error "No command specified"
+            usage
+            exit 1
+            ;;
+    esac
+}
+
+trap cleanup EXIT INT TERM
+
+main "$@"
\ No newline at end of file