diff --git a/lazy-lock.json b/lazy-lock.json
index 323c0b0..f64f0b6 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -42,5 +42,6 @@
   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
+  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 9c9bf6b..8b5ab92 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -8,3 +8,9 @@ vim.keymap.set("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
 vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
 vim.keymap.set({ "n", "x" }, "<leader>y", '"+y"')
 vim.keymap.set({ "n", "x" }, "<leader>p", '"+p"')
+vim.keymap.set("n", "<leader>a", function()
+  vim.lsp.buf.format({ async = true })
+end, { desc = "Format File" })
+vim.keymap.set("v", "<leader>a", function()
+  vim.lsp.buf.format({ async = true })
+end, { desc = "Format Selection" })
diff --git a/lua/plugins/undotree.lua b/lua/plugins/undotree.lua
new file mode 100644
index 0000000..5cd7b57
--- /dev/null
+++ b/lua/plugins/undotree.lua
@@ -0,0 +1,7 @@
+return {
+  "mbbill/undotree",
+  cmd = "UndotreeToggle", -- Lazy load when the command is used
+  keys = {
+    { "<leader>h", "<cmd>UndotreeToggle<cr>", desc = "Toggle Undotree" },
+  },
+}