diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c45cbe4..b2232aa 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -4,9 +4,6 @@ vim.cmd("set tabstop=2")
 vim.cmd("set softtabstop=2")
 vim.cmd("set shiftwidth=2")
 
--- Configure Navigation Keys
--- This is all handled by the vim-tmux-navigator plugin now
-
 -- Configure Editor Settings
 vim.cmd("set number")
 vim.cmd("set scrolloff=8")
@@ -33,6 +30,14 @@ vim.g.mapleader = " "
 -- Init Lazy Plugin Manager
 require("config.lazy")
 
+-- Set CWD to opened directory
+vim.api.nvim_create_autocmd("VimEnter", {
+  desc = "cd to passed $PWD when vim starts",
+  callback = function()
+    vim.api.nvim_set_current_dir(vim.fn.getcwd())
+  end,
+})
+
 -- Configure nvim Keymaps
 vim.keymap.set("n", "<leader>r", ":source %<CR>", { desc = "Reload Config" })
 vim.keymap.set("n", "<leader>bs", ":vsplit<CR>", { desc = "Vertical Split" })
diff --git a/.config/nvim/lua/plugins/md_preview.lua b/.config/nvim/lua/plugins/md_preview.lua
new file mode 100644
index 0000000..5dff389
--- /dev/null
+++ b/.config/nvim/lua/plugins/md_preview.lua
@@ -0,0 +1,16 @@
+return {
+  {
+    "selimacerbas/markdown-preview.nvim",
+    dependencies = { "selimacerbas/live-server.nvim" },
+    config = function()
+      require("markdown_preview").setup({
+        -- all optional; sane defaults shown
+        port = 8421,
+        open_browser = true,
+        debounce_ms = 300,
+      })
+    end,
+    vim.keymap.set("n", "<leader>vp", "<cmd>MarkdownPreview<cr>", { desc = "View Markdown Preview" }),
+    vim.keymap.set("n", "<leader>vP", "<cmd>MarkdownPreview<cr>", { desc = "Hide Markdown Preview" })
+  },
+}