diff --git a/.bash_aliases b/.bash_aliases
index e7b7680..4d2fbf4 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -2,6 +2,7 @@ alias weather="curl wttr.in/~Isle+of+Wight"
 alias pubip="curl -4 icanhazip.com"
 alias less="less -r"
 [[ -f ~/.LESS_TERMCAP ]] && . ~/.LESS_TERMCAP
+alias be="bundle exec"
 alias checkport="sudo netstat -tnlp | grep"
 alias de="devenv"
 alias dockerpurge="docker system prune --all --force --volumes"
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 2d72b2e..cf72795 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,16 +6,16 @@
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gruvbox.nvim": { "branch": "main", "commit": "517b012757fbe7a4d6e507baf5cc75837e62734f" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
-  "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" },
+  "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" },
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-lspconfig": { "branch": "master", "commit": "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439" },
-  "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" },
-  "nvim-treesitter": { "branch": "master", "commit": "73287b794d428843f20f9ae004bef2ce67ab3dbc" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7fedba8b1f8d0080c775851c429b88fd2ed4c6f5" },
+  "nvim-tree.lua": { "branch": "master", "commit": "fb892973477e131042d737c9fc822c7c2ace5076" },
+  "nvim-treesitter": { "branch": "master", "commit": "3da5cfb4a2505bc10d6fe3c193c69adac13423a8" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" },
+  "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index e87f455..b09b67a 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -12,12 +12,16 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
+  -- Gruvbox theme
   { "ellisonleao/gruvbox.nvim", priority = 1000 , config = true },
+  -- Telescope: fuzzy finder
   {
     'nvim-telescope/telescope.nvim', tag = '0.1.4',
     dependencies = { 'nvim-lua/plenary.nvim' }
   },
+  -- File tree
   "nvim-tree/nvim-tree.lua",
+  -- Treesitter
   "nvim-treesitter/nvim-treesitter",
   {
     "Exafunction/codeium.vim",
@@ -29,23 +33,36 @@ require("lazy").setup({
       vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true })
     end
   },
+  -- Completion framework
   "hrsh7th/nvim-cmp",
+  -- LSP setup
   "neovim/nvim-lspconfig",
-  "williamboman/mason.nvim",
-  "williamboman/mason-lspconfig.nvim",
+  -- Icons for Treesitter/nvim-tree
   "nvim-tree/nvim-web-devicons",
+  -- LSP completion
   "sar/cmp-lsp.nvim",
+  -- Treesitter completion
   "ray-x/cmp-treesitter",
+  -- Git blame popup
   "rhysd/git-messenger.vim",
+  -- Debugger
   "mfussenegger/nvim-dap",
   "rcarriga/nvim-dap-ui",
+  -- Vi motion within camelcase, underscore, etc
   "chaoren/vim-wordmotion",
+  -- Git
   "tpope/vim-fugitive",
+  -- Edit parens etc.
   "tpope/vim-surround",
+  -- Rails utilities
   "tpope/vim-rails",
+  -- Auto input 'end's
   "rrethy/nvim-treesitter-endwise",
+  -- Blow shit up
   "Eandrju/cellular-automaton.nvim",
+  -- Auto disable search highlight
   "romainl/vim-cool",
+  -- Focus on current buffer
   {
     "folke/zen-mode.nvim",
     opts = {
diff --git a/.config/nvim/lua/remap.lua b/.config/nvim/lua/remap.lua
index d38a5fa..cf671f9 100644
--- a/.config/nvim/lua/remap.lua
+++ b/.config/nvim/lua/remap.lua
@@ -82,6 +82,9 @@ vim.keymap.set('n', '<leader>ds', ':Gvdiffsplit!<CR>');
 vim.keymap.set('n', '<leader>gl', ':diffget //2<CR>'); -- 'Get left' window
 vim.keymap.set('n', '<leader>gr', ':diffget //3<CR>'); -- 'Get right' window
 
+-- Git messenger
+vim.keymap.set('n', '<leader>gm', ':GitMessenger<CR>');
+
 -- Nvim-tree
 vim.keymap.set("n", "<leader>nt", vim.cmd.NvimTreeToggle, {})
 
diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua
index e1f6d9d..02073eb 100644
--- a/.config/nvim/lua/treesitter.lua
+++ b/.config/nvim/lua/treesitter.lua
@@ -6,4 +6,7 @@ require'nvim-treesitter.configs'.setup {
     enable = true,
     additional_vim_regex_highlighting = false,
   },
+  endwise = {
+    enable = true,
+  },
 }