diff --git a/fish_right_prompt.fish b/fish_right_prompt.fish
index aba702d..beddceb 100644
--- a/fish_right_prompt.fish
+++ b/fish_right_prompt.fish
@@ -1,9 +1,36 @@
-# You can override some default title options in your config.fish:
+# You can override some default right prompt options in your config.fish:
 #     set -g theme_date_format "+%a %H:%M"
 
-function fish_right_prompt -d 'bobthefish is all about the right prompt'
+function __bobthefish_cmd_duration -S -d 'Show command duration'
+  [ "$CMD_DURATION" -lt 100 ]; and return
+
+  if [ "$CMD_DURATION" -lt 5000 ]
+    echo -ns $CMD_DURATION 'ms '
+  else if [ "$CMD_DURATION" -lt 60000 ]
+    echo -ns (echo "scale=1;$CMD_DURATION/1000" | bc | sed 's/.0//') 's '
+  else if [ "$CMD_DURATION" -lt 3600000 ]
+    set_color $fish_color_error
+    echo -ns (echo "scale=1;$CMD_DURATION/60000" | bc | sed 's/.0//') 'm '
+  else
+    set_color $fish_color_error
+    echo -ns (echo "scale=1;$CMD_DURATION/3600000" | bc | sed 's/.0//') 'h '
+  end
+
   set_color $fish_color_autosuggestion[1]
+  echo -n $__bobthefish_left_arrow_glyph
+end
+
+function __bobthefish_timestamp -S -d 'Show the current timestamp'
   set -q theme_date_format; or set -l theme_date_format "+%c"
+  echo -n ' '
   date $theme_date_format
-  set_color normal
+end
+
+function fish_right_prompt -d 'bobthefish is all about the right prompt'
+  set -l __bobthefish_left_arrow_glyph \uE0B3
+
+  set_color $fish_color_autosuggestion[1]
+
+  __bobthefish_cmd_duration
+  __bobthefish_timestamp
 end