diff --git a/.bashrc b/.bashrc
index 18930ed..e913892 100755
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,19 @@
+# Start GPG and SSH agents
 export GPG_TTY=$(tty)
 gpg-agent --daemon --enable-ssh-support \
           --write-env-file "${HOME}/.gpg-agent-info"
-eval $(ssh-agent -s)
-ssh-add $HOME/.ssh/github-personal
+if [ -f "${HOME}/.gpg-agent-info" ]; then
+  . "${HOME}/.gpg-agent-info"
+  export GPG_AGENT_INFO
+  export SSH_AUTH_SOCK
+  export SSH_AGENT_PID
+else
+  eval $(ssh-agent -s)
+fi
+
+# Run this with add-ssh-keys instead
+#ssh-add $HOME/.ssh/github-personal
+
+# Then add my scripts
+export DOTFILES_STUFF_BIN="$HOME/.dotfiles/bin"
+export PATH=$PATH:$DOTFILES_STUFF_BIN