diff --git a/aliases.zsh b/aliases.zsh
index 09b6ea6..81f0e96 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -4,6 +4,7 @@
 # alias definitions which can be edited/modified with 'aedit'
 #
 
+EDITOR=vi
 alias aedit=" $EDITOR ~/.zsh/aliases.zsh; source ~/.zsh/aliases.zsh"
 alias fedit=" $EDITOR ~/.zsh/functions.zsh; source ~/.zsh/functions.zsh"
 alias pedit=" $EDITOR ~/.zsh/private.zsh; source ~/.zsh/private.zsh"
diff --git a/functions.zsh b/functions.zsh
index a1a7a1a..3619c5e 100644
--- a/functions.zsh
+++ b/functions.zsh
@@ -83,3 +83,15 @@ function massmove () {
     ls > ls; paste ls ls > ren; vi ren; sed 's/^/mv /' ren|bash; rm ren ls
 }
 
+
+# Put a console clock in top right corner
+# http://www.commandlinefu.com/commands/view/7916/
+function clock () {
+    while sleep 1;
+    do
+        tput sc
+        tput cup 0 $(($(tput cols)-29))
+        date
+        tput rc
+    done &
+}