diff --git a/aliases.zsh b/aliases.zsh
index e27cd036..eef321de 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -25,15 +25,10 @@ alias rfind='find . -name *.rb | xargs grep -n'
 
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 
-bindkey '\ew' kill-region
-
-bindkey -s '\el' "ls\n"
-bindkey -s '\e.' "..\n"
-
 alias et='mate . &'
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
 
-bindkey "^[[A" history-beginning-search-backward
-bindkey "^[[B" history-beginning-search-forward
+
+
diff --git a/key-bindings.zsh b/key-bindings.zsh
new file mode 100644
index 00000000..20caad11
--- /dev/null
+++ b/key-bindings.zsh
@@ -0,0 +1,14 @@
+# TODO: Explain what some of this does..
+autoload -U compinit
+compinit
+bindkey '\ew' kill-region
+bindkey -s '\el' "ls\n"
+bindkey -s '\e.' "..\n"
+bindkey '^r' history-incremental-search-backward
+bindkey "^[[5~" up-line-or-history
+bindkey "^[[6~" down-line-or-history
+bindkey "^[[H" beginning-of-line
+bindkey "^[[1~" beginning-of-line
+bindkey "^[[F"  end-of-line
+bindkey "^[[4~" end-of-line
+bindkey ' ' magic-space    # also do history expansion on space
\ No newline at end of file