diff --git a/lua/plugins.lua b/lua/plugins.lua
index f16b360..6e6066e 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -131,5 +131,12 @@ return require("packer").startup(
         require "plugins/diffview"
       end
     }
+    use {
+      "akinsho/nvim-bufferline.lua",
+      config = function()
+        require "plugins/bufferline"
+      end,
+      requires = "kyazdani42/nvim-web-devicons"
+    }
   end
 )
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
new file mode 100644
index 0000000..9b092c7
--- /dev/null
+++ b/lua/plugins/bufferline.lua
@@ -0,0 +1,31 @@
+diagnostics_indicator = function(count, level, diagnostics_dict, context)
+  local s = " "
+  for e, n in pairs(diagnostics_dict) do
+    local sym = e == "error" and " " or (e == "warning" and " " or "")
+    s = s .. n .. sym
+  end
+  return s
+end
+require "bufferline".setup {
+  options = {
+    always_show_bufferline = true,
+    diagnostics_indicator = diagnostics_indicator,
+    diagnostics = "nvim_lsp",
+    separator_style = "thin"
+  }
+}
+
+vim.api.nvim_set_keymap("", "<A-1>", ":lua require'bufferline'.go_to_buffer(1)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-2>", ":lua require'bufferline'.go_to_buffer(2)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-3>", ":lua require'bufferline'.go_to_buffer(3)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-4>", ":lua require'bufferline'.go_to_buffer(4)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-5>", ":lua require'bufferline'.go_to_buffer(5)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-6>", ":lua require'bufferline'.go_to_buffer(6)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-7>", ":lua require'bufferline'.go_to_buffer(7)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-8>", ":lua require'bufferline'.go_to_buffer(8)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-9>", ":lua require'bufferline'.go_to_buffer(9)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-0>", ":lua require'bufferline'.go_to_buffer(10)<CR>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Left>", "<C-w><Left>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Up>", "<C-w><Up>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Down>", "<C-w><Down>", {silent = true})
+vim.api.nvim_set_keymap("", "<A-Right>", "<C-w><Right>", {silent = true})
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index 3965e8a..db16544 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -106,6 +106,11 @@ _G.packer_plugins = {
     loaded = true,
     path = "/home/gordon/.local/share/nvim/site/pack/packer/start/nvim-autopairs"
   },
+  ["nvim-bufferline.lua"] = {
+    config = { "\27LJ\1\0022\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\23plugins/bufferline\frequire\0" },
+    loaded = true,
+    path = "/home/gordon/.local/share/nvim/site/pack/packer/start/nvim-bufferline.lua"
+  },
   ["nvim-colorizer.lua"] = {
     config = { "\27LJ\1\0027\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\14colorizer\frequire\0" },
     loaded = true,
@@ -199,6 +204,10 @@ time([[Config for numb.nvim]], false)
 time([[Config for nvim-compe]], true)
 try_loadstring("\27LJ\1\2-\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\18plugins/compe\frequire\0", "config", "nvim-compe")
 time([[Config for nvim-compe]], false)
+-- Config for: nvim-bufferline.lua
+time([[Config for nvim-bufferline.lua]], true)
+try_loadstring("\27LJ\1\0022\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\23plugins/bufferline\frequire\0", "config", "nvim-bufferline.lua")
+time([[Config for nvim-bufferline.lua]], false)
 -- Config for: vim-signify
 time([[Config for vim-signify]], true)
 try_loadstring("\27LJ\1\2/\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\20plugins/signify\frequire\0", "config", "vim-signify")