diff --git a/init.lua b/init.lua
index 5805f7c7..27b3a124 100644
--- a/init.lua
+++ b/init.lua
@@ -253,6 +253,7 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 vim.keymap.set('n', '<leader>sr', ':%s/<C-r><C-w>/<C-r><C-w>/g<Left><Left>', { desc = "Find and replace all words under the cursor" })
 vim.keymap.set('n', '<leader>cv', '<cmd>Ex<CR>', { desc = "Back to file tree one step" })
 vim.keymap.set('n', '<leader>pv', '<cmd>Ex .<CR>', { desc = "Back to file tree root" })
+vim.keymap.set('n', '<leader>ee', 'oif err != nil {<CR>log.Fatalf("%+v\\n", err)<CR>}<CR><esc>kkI<esc>f%i', { desc = "Error check for Go" })
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
new file mode 100644
index 00000000..1d24df8d
--- /dev/null
+++ b/lua/custom/plugins/harpoon.lua
@@ -0,0 +1,23 @@
+return {
+	-- Jumping between windows
+	'ThePrimeagen/harpoon',
+	dependencies = {
+		'nvim-lua/plenary.nvim'
+	},
+
+	config = function ()
+		require("harpoon").setup()
+		-- Harpoon keymaps
+		vim.keymap.set('n', '<C-a>', require('harpoon.mark').add_file, { desc = "Add file to harpoon list" })
+		vim.keymap.set('n', '<C-e>', require('harpoon.ui').toggle_quick_menu, { desc = "Toggle harpoon quick menu" })
+		vim.keymap.set('n', '<leader>1', function() require('harpoon.ui').nav_file(1) end, { desc = "Navigate to file at posistion 1" })
+		vim.keymap.set('n', '<leader>2', function() require('harpoon.ui').nav_file(2) end, { desc = "Navigate to file at posistion 2" })
+		vim.keymap.set('n', '<leader>3', function() require('harpoon.ui').nav_file(3) end, { desc = "Navigate to file at posistion 3" })
+		vim.keymap.set('n', '<leader>4', function() require('harpoon.ui').nav_file(4) end, { desc = "Navigate to file at posistion 4" })
+		vim.keymap.set('n', '<leader>5', function() require('harpoon.ui').nav_file(5) end, { desc = "Navigate to file at posistion 5" })
+		vim.keymap.set('n', '<leader>6', function() require('harpoon.ui').nav_file(6) end, { desc = "Navigate to file at posistion 6" })
+		vim.keymap.set('n', '<leader>7', function() require('harpoon.ui').nav_file(7) end, { desc = "Navigate to file at posistion 7" })
+		vim.keymap.set('n', '<leader>8', function() require('harpoon.ui').nav_file(8) end, { desc = "Navigate to file at posistion 8" })
+		vim.keymap.set('n', '<leader>9', function() require('harpoon.ui').nav_file(9) end, { desc = "Navigate to file at posistion 9" })
+	end,
+}
diff --git a/lua/custom/plugins/keybindings.lua b/lua/custom/plugins/keybindings.lua
new file mode 100644
index 00000000..50292372
--- /dev/null
+++ b/lua/custom/plugins/keybindings.lua
@@ -0,0 +1,17 @@
+return {
+ 	vim.keymap.set({'n','i', 'v'}, '<Left>', ':echo "NO LEFT FOR YOU!"<Cr>'),
+ 	vim.keymap.set({'n','i', 'v'}, '<Right>', ':echo "NO RIGHT FOR YOU!"<Cr>'),
+ 	vim.keymap.set({'n','i', 'v'}, '<Up>', ':echo "NO UP FOR YOU!"<Cr>'),
+ 	vim.keymap.set({'n','i', 'v'}, '<Down>', ':echo "NO DOWN FOR YOU!"<Cr>'),
+-- 
+-- 	function arrow_toggle()
+-- 		if vim.opt["arrow"]:get() == "off" then
+-- 			vim.opt["arrow"] = "on"
+-- 			vim.keymap.set({'n','i', 'v'}, '<Left>', '<Left>')
+-- 			vim.keymap.set({'n','i', 'v'}, '<Right>', '<Right>')
+-- 			vim.keymap.set({'n','i', 'v'}, '<Up>', '<Up>')
+-- 			vim.keymap.set({'n','i', 'v'}, '<Down>', '<Down>')
+-- 		end
+-- 
+-- 	end
+}