diff --git a/CLAUDE.md b/CLAUDE.md
index c7ce593..6c830c6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,23 +4,24 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Repository Overview
 
-This is a personal dotfiles repository that manages macOS development environment configuration. The setup is built around RCM (RcM) for dotfile management, Homebrew for package management, and Mise for runtime version management.
+This is a personal dotfiles repository that manages macOS development environment configuration. The setup is built around Mise for both runtime version management and task automation, with Homebrew for package management.
 
 ## Key Architecture Components
 
-### RCM-based Dotfile Management
-- Uses RCM with `rcrc` configuration pointing to both this repo and thoughtbot/dotfiles
-- Dotfiles are symlinked from `~/.dotfiles` and `~/.dotfiles-thoughtbot`
-- `EXCLUDES` in rcrc prevents README and LICENSE files from being linked
+### Simple Symlink-based Management
+- Dotfiles are symlinked from `~/.dotfiles` to home directory
+- Setup managed via Mise task: `mise run setup`
+- No external dependencies on other dotfile repositories
+- Automatic backup of existing files before symlinking
 
-### Multi-layered Configuration System
-- Base configuration from thoughtbot/dotfiles
-- Local overrides in this repository (e.g., `zshrc.local`, `gitconfig.local`)
-- Host-specific configurations in `host-*` directories
-- Secret files sourced conditionally (`.zshrc.host`, `.secrets`)
+### Single Repository Design
+- All configurations are self-contained in this repository
+- No base/override pattern - each dotfile is complete and standalone
+- Host-specific configurations can be sourced optionally (`.zshrc.host`, `.secrets`)
 
 ### Development Environment Stack
 - **Runtime Management**: Mise (`config/mise/config.toml`) manages Go, Node, Ruby, Python, Deno versions
+- **Task Automation**: Mise tasks for setup and maintenance operations
 - **Package Management**: Homebrew with `Brewfile` for system dependencies and applications
 - **Shell**: Zsh with custom prompt (`🍔 `) and PATH modifications
 - **Custom Tooling**: Python-based MCP server for Bear notes integration (`bin/ak-mcp.py`)
@@ -29,24 +30,33 @@ This is a personal dotfiles repository that manages macOS development environmen
 
 ### Initial Setup/Bootstrap
 ```bash
-# Bootstrap new machine (requires thoughtbot/laptop)
-cd ~/Setup
-git clone https://github.com/thoughtbot/dotfiles dotfiles-thoughtbot
-git clone [this-repo] dotfiles
-env RCRC=$HOME/Setup/dotfiles-thoughtbot/rcrc rcup
-./laptop.local
+# Clone repository
+git clone https://github.com/therealadam/dotfiles ~/.dotfiles
+cd ~/.dotfiles
+
+# Set up dotfiles (creates symlinks)
+mise run setup
+
+# Install Homebrew packages
+brew bundle install
 ```
 
 ### Daily Operations
 ```bash
+# List available tasks
+mise tasks
+
 # Re-link all dotfiles after changes
-rcup
+mise run setup
 
-# Add new dotfile to RCM management
-mkrc <existing-file>
+# Backup existing dotfiles
+mise run backup
+
+# Find unmanaged dotfiles
+mise run unmanaged
 
 # Install/update Homebrew packages
-brew bundle install --file ~/Setup/dotfiles/Brewfile
+brew bundle install --file ~/.dotfiles/Brewfile
 
 # Update development runtimes
 mise install
@@ -56,17 +66,18 @@ mise use go@latest node@latest ruby@3 python@latest
 ### MCP Server
 ```bash
 # Run Bear notes MCP server
-./bin/ak-mcp.py
+~/.dotfiles/bin/ak-mcp.py
 
 # The server requires uv and provides Bear database querying functionality
 ```
 
 ## File Structure Patterns
 
-- **Local overrides**: Files ending in `.local` extend base thoughtbot configurations
-- **Host-specific**: `host-*` directories contain machine-specific configurations
+- **Dotfiles**: Files in root directory without leading dot (e.g., `zshrc`, `gitconfig`) are symlinked to `~/.*`
+- **Host-specific**: Optional files `~/.zshrc.host` and `~/.secrets` are sourced if they exist
 - **Binary scripts**: `bin/` contains executable utilities with various languages
 - **Configuration**: `config/` holds application-specific configurations (mise, etc.)
+- **Claude Code**: `claude/` contains agents, commands, and settings for Claude Code
 
 ## Important Environment Variables
 
@@ -77,7 +88,26 @@ mise use go@latest node@latest ruby@3 python@latest
 
 ## Development Workflow Notes
 
-- Changes to dotfiles require `rcup` to re-symlink
+- Changes to dotfiles require `mise run setup` to re-symlink (though most already symlinked)
 - Brewfile changes need `brew bundle install` to apply
 - Mise configuration changes auto-apply via shell activation
-- The setup expects `~/Setup` as the working directory for cloned repositories
+- The setup expects `~/.dotfiles` as the working directory for the cloned repository
+
+## Mise Tasks
+
+Tasks are defined in `config/mise/config.toml`:
+
+- `setup` - Create symlinks for all dotfiles (with automatic backup)
+- `backup` - Backup existing dotfiles to timestamped directory
+- `unmanaged` - Find dotfiles in home directory not managed by this repository
+
+All tasks support the `TARGET_DIR` environment variable to specify a custom target directory:
+```bash
+# Test setup in isolated directory
+TARGET_DIR=/tmp/dotfiles-test mise run setup
+
+# Backup from custom location
+TARGET_DIR=/custom/path mise run backup
+```
+
+Run `mise tasks` to see all available tasks.
diff --git a/Justfile b/Justfile
deleted file mode 100644
index d246732..0000000
--- a/Justfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Dotfiles management commands
-
-# Update thoughtbot dotfiles and refresh RCM links
-pull-upstream:
-    @echo "🔄 Updating thoughtbot dotfiles..."
-    cd ~/Setup/dotfiles-thoughtbot && git pull
-    @echo "🔗 Running rcup to refresh dotfile links..."
-    rcup
-    @echo "✅ thoughtbot dotfiles updated and RCM refreshed!"
-
-# Add a file or directory to dotfiles management via RCM
-add FILE:
-    @echo "📁 Adding {{FILE}} to RCM management..."
-    mkrc {{FILE}}
-    @echo "🔗 Running rcup to create symlink..."
-    rcup
-    @echo "✅ {{FILE}} added to dotfiles!"
-
-# Find dotfiles in ~ that aren't managed by RCM
-unmanaged:
-    #!/usr/bin/env bash
-    set -euo pipefail
-    find ~ -maxdepth 1 -name '.*' -type f | while read file; do
-      if [ -L "$file" ]; then
-        # Check if symlink points to dotfiles directories
-        target=$(readlink "$file")
-        if [[ "$target" != *"/.dotfiles"* ]] && [[ "$target" != *"/.dotfiles-thoughtbot"* ]]; then
-          echo "$(basename "$file") (symlink to: $target)"
-        fi
-      else
-        # Regular file, not managed
-        echo "$(basename "$file")"
-      fi
-    done | sort
diff --git a/README.md b/README.md
index 771a2ef..22f96c7 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,140 @@
-# Dotfiles mk2: an exosuit
+# Dotfiles
 
-With a fresh, or even a janky, laptop:
+Personal macOS development environment configuration.
 
-## Quickstart
+## Features
 
+- **Simple setup**: Single command to symlink all dotfiles
+- **Homebrew integration**: Brewfile for package management
+- **Mise**: Runtime version management (Go, Node, Ruby, Python, Deno) and task automation
+- **Custom tools**: MCP server for Bear notes integration
+- **Shell customization**: Zsh with 🍔 prompt
+
+## Quick Start
+
+### Fresh Machine Setup
+
+1. **Clone this repository**:
+   ```bash
+   git clone https://github.com/therealadam/dotfiles ~/.dotfiles
+   ```
+
+2. **Run setup**:
+   ```bash
+   cd ~/.dotfiles
+   mise run setup
+   ```
+
+That's it! Your dotfiles are now symlinked to your home directory.
+
+### What Gets Installed
+
+The `mise run setup` command creates symlinks for:
+- Shell configuration (`.zshrc`)
+- Git configuration (`.gitconfig`, `.gitignore`)
+- Vim configuration (`.vimrc.bundles`, `.ideavimrc`)
+- Tmux configuration (`.tmux.conf`)
+- Ruby/Rails tools (`.pryrc`, `.railsrc`, `.rspec`)
+- Mise configuration (`~/.config/mise/`)
+- Utility scripts (`~/.local/bin/`)
+- Claude Code configuration (`~/.claude/`)
+
+Existing files are automatically backed up to `~/.dotfiles-backup-TIMESTAMP/`.
+
+## Bootstrap Script
+
+For a complete fresh machine setup using [thoughtbot/laptop](https://github.com/thoughtbot/laptop):
+
+```bash
+# Install laptop script first
+# Then run the laptop customization
+./laptop
 ```
-cd; mkdir setup
-curl .../mac > mac
-git clone thoughtbot/dotfiles and therealadam/dotfiles
-env RCRC=$HOME/Setup/dotfiles-thoughtbot/rcrc rcup
-# rcup
+
+The `laptop` script will:
+- Install Homebrew packages from `Brewfile`
+- Set up dotfiles via `mise run setup`
+- Clean up after installation
+
+## Common Tasks
+
+All tasks are managed by Mise.
+
+### List available tasks
+```bash
+mise tasks
 ```
 
-1. Clone [dotfiles](https://github.com/thoughtbot/dotfiles) and this repo
-1a. Into ~/Setup ...may require an initial tweak of dotfiles-thoughtbot/rcrc to use ~/Setup or a one-off rcup invocation...
-1b. e.g. `env RCRC=$HOME/Setup/dotfiles-thoughtbot/rcrc rcup`
-2. Bootstrap via [laptop](https://github.com/thoughtbot/laptop)
-3. Run `mac` again to pick up local customizations that are now symlinked
-   `script/setup`
+### Set up/update dotfiles
+```bash
+mise run setup
+```
 
-## Imploding an existing setup
+### Backup existing dotfiles
+```bash
+mise run backup
+```
 
+### Find unmanaged dotfiles
+```bash
+mise run unmanaged
 ```
-# Uninstall Homebrew; download the script and run with --help if you like
-ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)"
 
-# ..extensively manually prune /usr/local
+### Test setup in a different directory
+```bash
+# Create test directory
+mkdir -p /tmp/dotfiles-test
+
+# Run setup to that directory
+TARGET_DIR=/tmp/dotfiles-test mise run setup
 
-# Uninstall asdf
-rm -rf ~/.asdf
+# Verify the symlinks
+ls -la /tmp/dotfiles-test
+```
+
+### Update Homebrew packages
+```bash
+cd ~/.dotfiles
+brew bundle install
+```
 
-# Uninstall mise...
+### Update development runtimes
+```bash
+mise install
+mise use go@latest node@latest ruby@3 python@latest
 ```
 
-## RCM cheatsheet
+## Structure
 
-- Re-link all dotfiles: `rcup`
-- Add a new dotfile: `mkrc <existing file>`
+- `bin/` - Utility scripts
+- `claude/` - Claude Code configuration (agents, commands, settings)
+- `config/mise/config.toml` - Mise configuration (tools, tasks)
+- `Brewfile` - Homebrew package list
+- Individual dotfiles (`zshrc`, `gitconfig`, `tmux.conf`, etc.)
 
-## Mise cheatsheet
+## Notes
+
+- The setup expects `~/.dotfiles` as the repository location
+- Host-specific secrets can be placed in `~/.secrets` (sourced by zshrc)
+- Host-specific zsh config can be placed in `~/.zshrc.host` (sourced by zshrc)
+- FZF integration available if `~/.fzf.zsh` exists
+
+## Mise Tasks
+
+This dotfiles setup uses Mise for both runtime version management and task automation. Tasks are defined in `config/mise/config.toml`.
+
+Available tasks:
+- `setup` - Create symlinks for all dotfiles (with automatic backup)
+- `backup` - Backup existing dotfiles without creating symlinks
+- `unmanaged` - Find dotfiles in home directory not managed by this repository
+
+All tasks support the `TARGET_DIR` environment variable to specify a custom directory:
+```bash
+# Backup from a custom location
+TARGET_DIR=/tmp/test mise run backup
+
+# Setup to a custom location (useful for testing)
+TARGET_DIR=/tmp/test mise run setup
+```
 
-https://mise.jdx.dev/tasks/toml-tasks.html
+See the [Mise documentation](https://mise.jdx.dev/tasks/toml-tasks.html) for more information.
diff --git a/config/mise/config.toml b/config/mise/config.toml
index 4a27a7e..f936574 100644
--- a/config/mise/config.toml
+++ b/config/mise/config.toml
@@ -1,8 +1,7 @@
-# mise u tool@version
 [tools]
 go = "latest"
 node = "latest"
-ruby = "3"
+ruby = "latest"
 python = "latest"
 deno = "latest"
 "gem:rails" = "latest"
@@ -11,38 +10,157 @@ deno = "latest"
 [settings]
 experimental = true
 
-# mise t
-# mise r task:name
-[tasks."justfile:init"]
-description = 'Write Justfile boilerplate'
+[tasks.backup]
+description = 'Backup existing dotfiles to timestamped directory'
 run = """
-#!/bin/sh
+#!/usr/bin/env bash
+set -euo pipefail
 
-cat > ./Justfile <<EOF
-# List available commands
-default:
-    @just --list
+TARGET_DIR="${TARGET_DIR:-$HOME}"
+BACKUP_DIR="$TARGET_DIR/.dotfiles-backup-$(date +%Y%m%d-%H%M%S)"
 
-# Install dependencies
-install:
-    echo "Installing dependencies..."
+echo "📦 Backing up dotfiles from $TARGET_DIR"
 
-# Run tests
-test:
-    echo "Running tests..."
+# List of dotfiles to backup
+DOTFILES=(
+    ".zshrc"
+    ".gitconfig"
+    ".gitignore"
+    ".tmux.conf"
+    ".vimrc.bundles"
+    ".ideavimrc"
+    ".pryrc"
+    ".railsrc"
+    ".rspec"
+)
 
-# Build the project
-build:
-    echo "Building project..."
+BACKED_UP=0
 
-# Clean build artifacts
-clean:
-    echo "Cleaning up..."
+for dotfile in "${DOTFILES[@]}"; do
+    if [ -e "$TARGET_DIR/$dotfile" ] || [ -L "$TARGET_DIR/$dotfile" ]; then
+        mkdir -p "$BACKUP_DIR"
+        echo "  ↪ Backing up $dotfile"
+        cp -P "$TARGET_DIR/$dotfile" "$BACKUP_DIR/"
+        BACKED_UP=$((BACKED_UP + 1))
+    fi
+done
 
-# Run the application
-run:
-    echo "Running application..."
-EOF
+# Backup directories
+if [ -d "$TARGET_DIR/.config/mise" ]; then
+    mkdir -p "$BACKUP_DIR/.config"
+    echo "  ↪ Backing up .config/mise"
+    cp -R "$TARGET_DIR/.config/mise" "$BACKUP_DIR/.config/"
+    BACKED_UP=$((BACKED_UP + 1))
+fi
 
-just
+if [ -d "$TARGET_DIR/.claude" ]; then
+    mkdir -p "$BACKUP_DIR"
+    echo "  ↪ Backing up .claude"
+    cp -R "$TARGET_DIR/.claude" "$BACKUP_DIR/"
+    BACKED_UP=$((BACKED_UP + 1))
+fi
+
+if [ $BACKED_UP -gt 0 ]; then
+    echo ""
+    echo "✅ Backed up $BACKED_UP item(s) to: $BACKUP_DIR"
+else
+    echo ""
+    echo "ℹ️  No dotfiles found to backup"
+fi
+"""
+
+[tasks.setup]
+description = 'Set up dotfiles by creating symlinks (use TARGET_DIR=/path to specify destination)'
+run = """
+#!/usr/bin/env bash
+set -euo pipefail
+
+DOTFILES="${DOTFILES_DIR:-$HOME/.dotfiles}"
+TARGET_DIR="${TARGET_DIR:-$HOME}"
+
+echo "🔗 Setting up dotfiles from $DOTFILES to $TARGET_DIR"
+
+# Create backup directory if needed
+BACKUP_DIR="$TARGET_DIR/.dotfiles-backup-$(date +%Y%m%d-%H%M%S)"
+
+# Function to link a file
+link_file() {
+    local src="$1"
+    local dest="$2"
+
+    # Create parent directory if needed
+    mkdir -p "$(dirname "$dest")"
+
+    # Backup existing file/symlink if it exists and isn't already pointing to our dotfiles
+    if [ -e "$dest" ] || [ -L "$dest" ]; then
+        if [ -L "$dest" ]; then
+            current_target=$(readlink "$dest")
+            if [[ "$current_target" == "$DOTFILES"* ]]; then
+                echo "  ✓ $dest already linked"
+                return
+            fi
+        fi
+        mkdir -p "$BACKUP_DIR"
+        echo "  ↪ Backing up existing $dest"
+        mv "$dest" "$BACKUP_DIR/"
+    fi
+
+    ln -s "$src" "$dest"
+    echo "  ✓ Linked $dest"
+}
+
+# Link dotfiles in root
+link_file "$DOTFILES/zshrc" "$TARGET_DIR/.zshrc"
+link_file "$DOTFILES/gitconfig" "$TARGET_DIR/.gitconfig"
+link_file "$DOTFILES/gitignore" "$TARGET_DIR/.gitignore"
+link_file "$DOTFILES/tmux.conf" "$TARGET_DIR/.tmux.conf"
+link_file "$DOTFILES/vimrc.bundles" "$TARGET_DIR/.vimrc.bundles"
+link_file "$DOTFILES/ideavimrc" "$TARGET_DIR/.ideavimrc"
+link_file "$DOTFILES/pryrc" "$TARGET_DIR/.pryrc"
+link_file "$DOTFILES/railsrc" "$TARGET_DIR/.railsrc"
+link_file "$DOTFILES/rspec" "$TARGET_DIR/.rspec"
+
+# Link config directory
+link_file "$DOTFILES/config/mise" "$TARGET_DIR/.config/mise"
+
+# Link bin directory
+if [ -d "$DOTFILES/bin" ]; then
+    for script in "$DOTFILES/bin/"*; do
+        if [ -f "$script" ]; then
+            link_file "$script" "$TARGET_DIR/.local/bin/$(basename "$script")"
+        fi
+    done
+fi
+
+# Link claude directory
+if [ -d "$DOTFILES/claude" ]; then
+    link_file "$DOTFILES/claude" "$TARGET_DIR/.claude"
+fi
+
+echo ""
+echo "✅ Dotfiles setup complete!"
+if [ -d "$BACKUP_DIR" ]; then
+    echo "📦 Existing files backed up to: $BACKUP_DIR"
+fi
+"""
+
+[tasks.unmanaged]
+description = 'Find dotfiles that are not managed by this repository (use TARGET_DIR=/path to specify directory)'
+run = """
+#!/usr/bin/env bash
+set -euo pipefail
+
+DOTFILES="${DOTFILES_DIR:-$HOME/.dotfiles}"
+TARGET_DIR="${TARGET_DIR:-$HOME}"
+
+find "$TARGET_DIR" -maxdepth 1 -name '.*' -type f | while read file; do
+  if [ -L "$file" ]; then
+    target=$(readlink "$file")
+    if [[ "$target" != "$DOTFILES"* ]]; then
+      echo "$(basename "$file") (symlink to: $target)"
+    fi
+  else
+    echo "$(basename "$file")"
+  fi
+done | sort
 """
diff --git a/gitconfig.local b/gitconfig
similarity index 95%
rename from gitconfig.local
rename to gitconfig
index 4fe698d..82ee22f 100644
--- a/gitconfig.local
+++ b/gitconfig
@@ -50,5 +50,6 @@
 [rerere]
   enabled = 1
 
-[include]
-  path = ~/.gitconfig.host
+[user]
+  name = Adam Keys
+  email = adam@therealadam.com
diff --git a/host-Otis/dotfiles/gitconfig.host b/host-Otis/dotfiles/gitconfig.host
deleted file mode 100644
index 2a16f68..0000000
--- a/host-Otis/dotfiles/gitconfig.host
+++ /dev/null
@@ -1,4 +0,0 @@
-[user]
-  name = Adam Keys
-  email = adam@therealadam.com
-
diff --git a/laptop b/laptop
new file mode 100644
index 0000000..2d0d8da
--- /dev/null
+++ b/laptop
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+fancy_echo "Installing apps, etc."
+
+brew bundle install --file ~/.dotfiles/Brewfile
+
+# Set up dotfiles
+fancy_echo "Setting up dotfiles..."
+cd ~/.dotfiles && mise run setup
+
+fancy_echo "Cleanup"
+brew cleanup
+
+# TODO color schemes
+# TODO keyboard?
+# keyboard/mouse rate/button mappings
diff --git a/laptop.local b/laptop.local
deleted file mode 100644
index e8ffdff..0000000
--- a/laptop.local
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-fancy_echo "Installing apps, etc."
-
-# TODO relative file path, how it do?
-brew bundle install --file ~/Setup/dotfiles/Brewfile
-
-# TODO copy MacOS app configs
-
-if [ -r "$HOME/.rcrc" ]; then
-  fancy_echo "Updating dotfiles ..."
-  rcup
-fi
-
-fancy_echo "Cleanup"
-brew cleanup
-
-# TODO color schemes
-# TODO keyboard?
-# keyboard/mouse rate/button mappings
diff --git a/rcrc b/rcrc
deleted file mode 100644
index 3e31996..0000000
--- a/rcrc
+++ /dev/null
@@ -1,2 +0,0 @@
-EXCLUDES="README*.md LICENSE Justfile"
-DOTFILES_DIRS="$HOME/.dotfiles $HOME/.dotfiles-thoughtbot"
diff --git a/tmux.conf.local b/tmux.conf
similarity index 100%
rename from tmux.conf.local
rename to tmux.conf
diff --git a/vimrc.bundles.local b/vimrc.bundles
similarity index 100%
rename from vimrc.bundles.local
rename to vimrc.bundles
diff --git a/zshrc.local b/zshrc
similarity index 100%
rename from zshrc.local
rename to zshrc