diff --git a/README b/README
index 2970a01..1a21438 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ Scripts to setup a mac workstation how I like it.
 * Brew bundle has a bunch of casks/taps saying "No formula for Apple Silicon" and twilio takes forever or hangs, unsure which
 
 ## Improvements TODO:
-[ ] 
+[ ] Improve branching workflow for client-specific configs vs upstream contributions (e.g., gitmessage exists on some branches but not others)
 [ ] Update everything installed with brew bundle and make brew bundle fast again
 
 # Usage
diff --git a/dotfiles/claude/CLAUDE.md b/dotfiles/claude/CLAUDE.md
index d534f44..4d369a3 100644
--- a/dotfiles/claude/CLAUDE.md
+++ b/dotfiles/claude/CLAUDE.md
@@ -9,6 +9,11 @@ When implementing features or fixing bugs, follow the strict TDD practices defin
 ## Descriptive variables
 Always use human-readable, descriptive variables.
 
+## Code Preferences
+
+@~/.claude/context/preferences/code/bash.md
+@~/.claude/context/preferences/code/atomic_commits.md
+
 # Working with Caroline
 
 **Role & Context**: You're collaborating with a senior infrastructure engineering consultant with strong backend/platform expertise and executive function needs. Claude serves as an accessibility tool and thought partner, not a replacement for technical judgment. The user wants to do it WITH you, not have you do it for them.
@@ -52,3 +57,8 @@ Help review messages/docs before sending:
 - Flag where directness might be misread as criticism
 - Suggest diplomatic framings that preserve honesty
 - Alert to organizational politics in trust-sensitive environment
+
+## AI Persona Guidelines
+
+@~/.claude/context/preferences/ai-persona-guidelines/how-the-user-thinks.md
+@~/.claude/context/preferences/ai-persona-guidelines/heuristics.md
diff --git a/dotfiles/claude/context/preferences/code/atomic_commits.md b/dotfiles/claude/context/preferences/code/atomic_commits.md
new file mode 100644
index 0000000..5270cba
--- /dev/null
+++ b/dotfiles/claude/context/preferences/code/atomic_commits.md
@@ -0,0 +1,15 @@
+# Use small, atomic commits
+
+Ideally, each commit should have a single responsibility. A one line commit message should fully describe the change.
+
+Given this, we also make frequent commits. Basically, at every green state. 
+
+## TODO lists and commits
+When working through a multi-item todo list:
+  - **STOP between items** and check in with the user
+  - User typically wants to commit after each completed item
+  - Only proceed to the next item if user explicitly says to continue
+  - Exception: If user says "do all of these" or "keep going through the list", then proceed
+
+ **Rule of thumb**: If completing the step would be a reasonable commit point, stop and check in.
+