diff --git a/Makefile b/Makefile
index ccb21c5..9ca1d87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 default: install
 
-DOT_FILES = MacOSX gemrc git_template gitconfig gitignore_global tmux.conf zshrc zsh_functions editrc pryrc
+DOT_FILES = MacOSX gemrc git_template gitconfig gitignore_global tmux.conf zshrc zsh_functions editrc pryrc tmuxinator
 BIN_DIR = bin
 
 install: install_dotfiles install_bin_dir install_vim_config
diff --git a/global.gems b/global.gems
index e808237..5004ee5 100644
--- a/global.gems
+++ b/global.gems
@@ -5,3 +5,4 @@ pry
 pry-doc
 puppet
 vagrant
+tmuxinator
diff --git a/tmuxinator/freeagent.yml b/tmuxinator/freeagent.yml
new file mode 100644
index 0000000..2a00009
--- /dev/null
+++ b/tmuxinator/freeagent.yml
@@ -0,0 +1,11 @@
+project_name: FreeAgent
+project_root: ~/Development/fac/freeagent
+tabs:
+  - editor: vim
+  - shell: git smart-pull
+  - server:
+      layout: even-vertical
+      panes:
+        - bin/foreman start
+        - tail -f log/development.log
+  - guard: bin/guard start
diff --git a/zshrc b/zshrc
index 395a643..b29c16c 100644
--- a/zshrc
+++ b/zshrc
@@ -29,6 +29,10 @@ alias dayone="/Applications/Day\ One.app/Contents/MacOS/dayone"
 alias tmux-buffer-to-clipboard='tmux save-buffer -|pbcopy'
 alias tmux-buffer-from-clipboard='tmux set-buffer "$(pbpaste)"'
 
+# tmux helper
+alias mux='rvm default exec tmuxinator'
+compctl -g '~/.tmuxinator/*(:t:r)' tmuxinator
+
 # Helpful git aliases
 alias gs='git status --short --branch'
 alias gd='git diff'
@@ -113,6 +117,10 @@ autoload -Uz compinit
 compinit
 setopt complete_in_word
 
+# tmux helper
+alias mux='tmuxinator'
+compctl -g '~/.tmuxinator/*(:t:r)' tmuxinator
+
 # Report the runtime of commands that take longer than 5 seconds.
 REPORTTIME=5