diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 62d578b..337400b 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }
+  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }
 }
diff --git a/google/.blazerc b/google/.blazerc
index 2bca65c..ac172c6 100644
--- a/google/.blazerc
+++ b/google/.blazerc
@@ -43,7 +43,7 @@ test --test_output=all --test_summary=detailed --build_tests_only
 
 import %workspace%/java/com/google/android/gmscore/blaze/blazerc
 build --config=gmscore_tap
-test --config=gmscore_test
-#
+test --config=gmscore_test_debug
+
 # https://g3doc.corp.google.com/devtools/blaze/g3doc/faq.md?cl=head#BlazeOom
 startup --host_jvm_args=-Xmx18G --host_jvm_args=-Xms18G
diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua
index 53540e1..377a782 100644
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@@ -2,6 +2,25 @@ local use_google = require("utils").use_google
 local buf_too_large = require("utils").buf_too_large
 
 return {
+	"sindrets/diffview.nvim",
+	{
+		"folke/todo-comments.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+	},
+	{
+		"folke/flash.nvim",
+		event = "VeryLazy",
+		---@type Flash.Config
+		opts = {},
+  -- stylua: ignore
+  keys = {
+    { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+    { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+    { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+    { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+    { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+  },
+	},
 	{
 		"MagicDuck/grug-far.nvim",
 		config = function()
@@ -96,6 +115,7 @@ return {
 		"folke/persistence.nvim",
 		event = "BufReadPre", -- this will only start session saving when an actual file was opened
 		opts = {},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>ss", [[<cmd>lua require("persistence").save()<cr>]] },
 			{ "<leader>sl", [[<cmd>lua require("persistence").load()<cr>]] },
@@ -123,6 +143,7 @@ return {
 		cmd = {
 			"Subs",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
 		},
@@ -157,12 +178,14 @@ return {
 		config = function()
 			vim.g.undotree_SetFocusWhenToggle = 1
 		end,
+  -- stylua: ignore
 		keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
 	},
 	{
 		"stevearc/aerial.nvim",
 		opts = {},
 		cmd = { "AerialToggle", "AerialOn" },
+  -- stylua: ignore
 		keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
 	},
 	{
@@ -175,15 +198,12 @@ return {
 		-- Remove the following line to use development versions,
 		-- not just the formal releases
 		version = "*",
+  -- stylua: ignore
 		keys = {
 			{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
 			{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
 			{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
-			{
-				"<leader>dQ",
-				":lua require('debugprint').debugprint({variable = true, above = true})<cr>",
-				desc = "Debug print",
-			},
+			{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
 		},
 	},
 }
diff --git a/vim/.vim/lua/plugins/dap.lua b/vim/.vim/lua/plugins/dap.lua
index 3e98bf7..07aa072 100644
--- a/vim/.vim/lua/plugins/dap.lua
+++ b/vim/.vim/lua/plugins/dap.lua
@@ -16,6 +16,7 @@ return {
 			"rcarriga/nvim-dap-ui",
 			"nvim-telescope/telescope-dap.nvim",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>do", ":lua require'dapui'.open()<CR>" },
 			-- { "<F5>", ":lua require'dap'.continue()<CR>" },
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index 8f6721a..1e248b1 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -94,6 +94,7 @@ return {
 		},
 	}),
 	glug("relatedfiles", {
+  -- stylua: ignore
 		keys = {
 			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
 			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
diff --git a/vim/.vim/lua/plugins/harpoon.lua b/vim/.vim/lua/plugins/harpoon.lua
index aaed97f..8139949 100644
--- a/vim/.vim/lua/plugins/harpoon.lua
+++ b/vim/.vim/lua/plugins/harpoon.lua
@@ -64,6 +64,7 @@ return {
 			toggle_telescope(harpoon:list())
 		end, { desc = "Open harpoon window" })
 	end,
+	-- stylua: ignore
 	-- keys = {
 	-- 	-- Mark current file
 	-- 	{ "<leader>m", ":lua require('harpoon').mark_file()<CR>" },
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index 708bddc..103c67e 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -97,6 +97,7 @@ return {
 			"nvim-lua/lsp-status.nvim",
 			"VonHeikemen/lsp-zero.nvim",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },
diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua
index 2d40c55..2c14551 100644
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@@ -38,6 +38,7 @@ return {
 				},
 			})
 		end,
+  -- stylua: ignore
 		keys = {
 			(function()
 				if use_google() then
diff --git a/vim/.vim/lua/plugins/refactoring.lua b/vim/.vim/lua/plugins/refactoring.lua
index 4a684b1..f99b708 100644
--- a/vim/.vim/lua/plugins/refactoring.lua
+++ b/vim/.vim/lua/plugins/refactoring.lua
@@ -8,34 +8,16 @@ return {
 		config = function()
 			require("config.refactoring")
 		end,
+  -- stylua: ignore
 		keys = {
 			-- remap to open the Telescope refactoring menu in visual mode
-			{
-				"<leader>R",
-				"<cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
-			},
+			{ "<leader>R", "<cmd>lua require('telescope').extensions.refactoring.refactors()<CR>", },
 
 			-- Remaps for the refactoring operations currently offered by the plugin
-			{
-				"<leader>rx",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Function')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>rxf",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>rxv",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>ri",
-				[[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
-				mode = "v",
-			},
+			{ "<leader>rx", [[ <Cmd>lua require('refactoring').refactor('Extract Function')<CR>]], mode = "v", },
+			{ "<leader>rxf", [[ <Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]], mode = "v", },
+			{ "<leader>rxv", [[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], mode = "v", },
+			{ "<leader>ri", [[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], mode = "v", },
 		},
 	},
 }
diff --git a/vim/.vim/lua/plugins/signify.lua b/vim/.vim/lua/plugins/signify.lua
index 2029039..d18d179 100644
--- a/vim/.vim/lua/plugins/signify.lua
+++ b/vim/.vim/lua/plugins/signify.lua
@@ -53,6 +53,7 @@ end
 return {
 	"mhinz/vim-signify",
 	event = "VimEnter",
+  -- stylua: ignore
 	keys = {
 		{ "]d", "<plug>(signify-next-hunk)" },
 		{ "[d", "<plug>(signify-prev-hunk)" },
diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua
index 0c93e6e..e7777aa 100644
--- a/vim/.vim/lua/plugins/telescope.lua
+++ b/vim/.vim/lua/plugins/telescope.lua
@@ -47,6 +47,7 @@ function fig_all_modified()
 	return exe("hg status -ma -n --rev p4base --no-status --template= | sort")
 end
 
+  -- stylua: ignore
 local keys = {
 	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
 	{ "<leader>ts.", ":lua live_grep({vim.fn.getcwd()})<CR>", desc = "Search in CWD" },
@@ -67,6 +68,7 @@ local keys = {
 }
 
 if use_google() then
+  -- stylua: ignore
 	TableConcat(keys, {
 		{ "<leader>tm", ":lua find_files(fig_modified())<CR>" },
 		{ "<leader>tM", ":lua find_files(fig_all_modified())<CR>" },
@@ -75,10 +77,7 @@ if use_google() then
 		{ "<C-P>", require("telescope").extensions.codesearch.find_files },
 		{ "<leader>cs", require("telescope").extensions.codesearch.find_query },
 		{ "<leader>cs", require("telescope").extensions.codesearch.find_query, mode = "v" },
-		{
-			"<leader>CS",
-			[[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-		},
+		{ "<leader>CS", [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]], },
 	})
 end
 
diff --git a/vim/.vimrc b/vim/.vimrc
index 9d0a6c4..5ad09f3 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -124,5 +124,7 @@ let g:loaded_netrwPlugin       = 0
 let g:loaded_tutor_mode_plugin = 0
 let g:loaded_remote_plugins    = 1
 
+au BufRead,BufNewFile,BufReadPost *.cc.inc set filetype=cpp
+
 filetype plugin indent on
 syntax on