diff --git a/init.lua b/init.lua
index a5c8743d..62fb6601 100644
--- a/init.lua
+++ b/init.lua
@@ -963,5 +963,11 @@ require('lazy').setup({
   },
 })
 
+-- FIX: godot-server: should check if the server is already running first...
+local gdprojectfilepath = vim.fn.getcwd() .. '/project.godot'
+local isInGdDirectory = vim.fn.filereadable(gdprojectfilepath) == 1
+
+if isInGdDirectory then vim.fn.serverstart '127.0.0.1:55432' end
+
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/custom/plugins/guttermarks.lua b/lua/custom/plugins/guttermarks.lua
new file mode 100644
index 00000000..fbc79a63
--- /dev/null
+++ b/lua/custom/plugins/guttermarks.lua
@@ -0,0 +1,4 @@
+return {
+  'dimtion/guttermarks.nvim',
+  event = { 'BufReadPost', 'BufNewFile', 'BufWritePre', 'FileType' },
+}