diff --git a/init.lua b/init.lua
index b4ab18a..f566feb 100644
--- a/init.lua
+++ b/init.lua
@@ -1,13 +1,14 @@
+require("colorscheme")
 require("options")
 require("plugins")
-require("config.telescope")
-require("keymaps")
 require("lsp")
-require("colorscheme")
+require("config.telescope")
+require("config.comment")
 require("config.mason")
 require("config.nvim-tree")
-require("config.comment")
 require("config.themery")
 require("config.theme")
 require("config.lualine")
 require("config.fterm")
+require("config.harpoon")
+require("keymaps")
diff --git a/lazy-lock.json b/lazy-lock.json
index ed552f0..0d840c3 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,6 +6,8 @@
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "copilot.vim": { "branch": "release", "commit": "49e0348bfb913fae63ca5ddb987a8bccd193da86" },
+  "harpoon": { "branch": "harpoon2", "commit": "da326d0438ac68dee9b6b62a734be940a8bd8405" },
   "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
diff --git a/lua/config/fterm.lua b/lua/config/fterm.lua
index b9ab0dd..373dfb9 100644
--- a/lua/config/fterm.lua
+++ b/lua/config/fterm.lua
@@ -1,3 +1,11 @@
-require("FTerm").setup({
+local api = vim.api
+local fterm = require("FTerm")
+
+fterm.setup({
     blend = 25
 })
+
+-- Commands
+api.nvim_create_user_command('FTermToggle', fterm.toggle, { bang = true })
+api.nvim_create_user_command('FTermClose', fterm.close, { bang = true })
+
diff --git a/lua/config/harpoon.lua b/lua/config/harpoon.lua
new file mode 100644
index 0000000..f4e1069
--- /dev/null
+++ b/lua/config/harpoon.lua
@@ -0,0 +1,8 @@
+local api = vim.api
+local harpoon = require("harpoon")
+harpoon.setup({})
+
+api.nvim_create_user_command('HarpoonAdd', function() harpoon:list():add() end, { bang = true })
+api.nvim_create_user_command('HarpoonUI', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, { bang = true })
+api.nvim_create_user_command('HarpoonTogglePrev', function() harpoon:list():prev() end, { bang = true })
+api.nvim_create_user_command('HarpoonToggleNext', function() harpoon:list():next() end, { bang = true })
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 06cdb37..205cce0 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -10,31 +10,34 @@ api.nvim_create_user_command('FTermClose', fterm.close, { bang = true })
 local mappings = {
     n = {
         -- highlighting
-        ["<leader>nh"] = ":nohl<CR>",
+        ["<leader>nh"]    = ":nohl<CR>",
         -- move between buffers
-        ["<c-h>"]      = "<C-w>h",
-        ["<c-j>"]      = "<C-w>j",
-        ["<c-k>"]      = "<C-w>k",
-        ["<c-l>"]      = "<C-w>l",
+        ["<c-h>"]         = "<C-w>h",
+        ["<c-j>"]         = "<C-w>j",
+        ["<c-k>"]         = "<C-w>k",
+        ["<c-l>"]         = "<C-w>l",
         -- open and close buggers
-        ["<leader>sv"] = "<C-w>s",
-        ["<leader>sh"] = "<C-w>v",
-        ["<leader>se"] = "<C-w>=",
-        ["<leader>sx"] = ":close<CR>",
+        ["<leader>sv"]    = "<C-w>s",
+        ["<leader>sh"]    = "<C-w>v",
+        ["<leader>se"]    = "<C-w>=",
+        ["<leader>sx"]    = ":close<CR>",
         -- nvim-tree
-        ["<leader>e"]  = ":NvimTreeToggle<CR>",
-        ["<leader>cf"] = ":NvimTreeCollapse<CR>",
+        ["<leader>e"]     = ":NvimTreeToggle<CR>",
+        ["<leader>cf"]    = ":NvimTreeCollapse<CR>",
         -- LSP
-        ["<leader>ls"] = ":lspstop<CR>",
-        ["<leader>lo"] = ":lspstart<CR>",
+        ["<leader>ls"]    = ":lspstop<CR>",
+        ["<leader>lo"]    = ":lspstart<CR>",
         -- Telescope
-        ["<leader>ff"] = "<cmd>Telescope find_files<CR>",
-        ["<leader>fw"] = "<cmd>Telescope live_grep<CR>",
-        ["<leader>fc"] = "<cmd>Telescope grep_string<CR>",
-        ["<leader>th"] = "<cmd>Themery<CR>",
-        ["<leader>sm"] = ":MaximizerToggle<CR>",
+        ["<leader>ff"]    = "<cmd>Telescope find_files<CR>",
+        ["<leader>fw"]    = "<cmd>Telescope live_grep<CR>",
+        ["<leader>fc"]    = "<cmd>Telescope grep_string<CR>",
+        ["<leader>th"]    = "<cmd>Themery<CR>",
+        ["<leader>sm"]    = ":MaximizerToggle<CR>",
         -- FTerm
-        ["<leader>h"]  = "<cmd>FTermToggle<CR>"
+        ["<leader>h"]     = "<cmd>FTermToggle<CR>",
+        -- Harpoon
+        ["<leader>a"]     = "<cmd>HarpoonAdd<CR>",
+        ["<C-e>"] = "<cmd>HarpoonUI<CR>"
     },
     x = {
         ["<A-j>"] = ":move '>+1<CR>gv-gv",
diff --git a/lua/plugins.lua b/lua/plugins.lua
index b35d3f9..d8e354a 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -58,5 +58,11 @@ require("lazy").setup({
         dependencies = { 'nvim-tree/nvim-web-devicons' }
     },
     'numToStr/FTerm.nvim',
-    'github/copilot.vim'
+    'github/copilot.vim',
+    "nvim-lua/plenary.nvim",
+    {
+        "ThePrimeagen/harpoon",
+        branch = "harpoon2",
+        requires = { { "nvim-lua/plenary.nvim" } }
+    }
 })
diff --git a/requirements.md b/requirements.md
index 7af35ea..8e297b7 100644
--- a/requirements.md
+++ b/requirements.md
@@ -4,6 +4,9 @@
 - telescope x
 - theming x
 - tabfluline x
-- terminal
+    - rice
+- terminal x
 - harpoon
-- extended history
+- extended history x
+- auto-pairs
+- lua vim linting