diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 1810b52..a2f9b59 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -49,6 +49,17 @@ if type -q tmux
     alias tmks "tmux kill-session"
 end
 
+if type -q nvm
+    nvm use >/dev/null
+end
+
+function fish_greeting
+    echo "Welcome Back Juan!"
+    if type -q nvm
+        echo "Current Node:$(nvm current)"
+    end
+end
+
 # allow local config overwrite
 set LOCAL_CONFIG (dirname (status --current-file))/config-local.fish
 if test -f $LOCAL_CONFIG
diff --git a/.config/nvm/nvmrc b/.config/nvm/nvmrc
new file mode 100644
index 0000000..b6a7d89
--- /dev/null
+++ b/.config/nvm/nvmrc
@@ -0,0 +1 @@
+16