diff --git a/nvim/init.vim b/nvim/init.vim
index 10b5b4c..c9b0737 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -69,7 +69,24 @@ if empty(glob('~/.config/nvim/autoload/plug.vim'))
 endif
 
 call plug#begin('~/.config/nvim/autoload/plugged')
+	" LSP Support
 	Plug 'neovim/nvim-lspconfig'
+	Plug 'williamboman/nvim-lsp-installer'
+
+	" Autocompletion
+	Plug 'hrsh7th/nvim-cmp'
+	Plug 'hrsh7th/cmp-buffer'
+	Plug 'hrsh7th/cmp-path'
+	Plug 'saadparwaiz1/cmp_luasnip'
+	Plug 'hrsh7th/cmp-nvim-lsp'
+	Plug 'hrsh7th/cmp-nvim-lua'
+
+	"  Snippets
+	Plug 'L3MON4D3/LuaSnip'
+	Plug 'rafamadriz/friendly-snippets'
+
+	Plug 'VonHeikemen/lsp-zero.nvim'
+
 	Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }
 	Plug 'nvim-lua/plenary.nvim'
 
@@ -92,6 +109,12 @@ call plug#begin('~/.config/nvim/autoload/plugged')
 
 	Plug 'voldikss/vim-floaterm'
 	Plug 'skywind3000/asyncrun.vim'
+
+	Plug 'vim-test/vim-test'
+
+	Plug 'folke/which-key.nvim'
+
+	Plug 'mhinz/vim-startify'
 call plug#end()
 
 " Use aura theme installed above
@@ -144,10 +167,6 @@ let g:nvim_tree_icons = {
 nnoremap <Leader><Tab> :NvimTreeToggle<CR>
 "" Lint
 let b:ale_fixers = ['prettier', 'eslint']
-"" LSP
-lua <<EOF
-	require'lspconfig'.pyright.setup{}
-EOF
 "" Telescope
 nnoremap <leader>ff <cmd>Telescope find_files<cr>
 nnoremap <leader>fb <cmd>Telescope buffers<cr>
@@ -174,3 +193,40 @@ nnoremap <leader>ga <cmd>:AsyncRun -mode=term -pos=floaterm git add -p<cr>
 nnoremap <leader>gc :AsyncRun -mode=term -pos=floaterm git commit -m ""
 " Comment italics
 highlight Comment cterm=italic gui=italic
+" LSP Zero
+lua << EOF
+	require'lspconfig'.pyright.setup{}
+	local lsp = require('lsp-zero')
+
+	lsp.preset('recommended')
+	lsp.setup()
+EOF
+" vim-test
+let test#strategy = "floaterm"
+nmap <silent> <leader>t :TestNearest<CR>
+nmap <silent> <leader>T :TestFile<CR>
+nmap <silent> <leader>ts :TestSuite<CR>
+nmap <silent> <leader>tl :TestLast<CR>
+nmap <silent> <leader>tv :TestVisit<CR>
+" which-key
+nmap <silent> <leader>? :WhichKey<CR>
+lua << EOF
+  require("which-key").setup {}
+EOF
+"" vim-startify
+let g:startify_custom_header = [
+  \ 'Gaiety | 2022',
+  \ '▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄',
+	\ '██░▄▄▀█░▄▄█░▄▀▄░█▀▄▄▀█░▄▄▄█▀▄▄▀█░▄▄▀█░▄▄▄█▀▄▄▀█░▄▄▀██',
+	\ '██░██░█░▄▄█░█▄█░█░██░█░█▄▀█░██░█░▀▀▄█░█▄▀█░██░█░██░██',
+	\ '██░▀▀░█▄▄▄█▄███▄██▄▄██▄▄▄▄██▄▄██▄█▄▄█▄▄▄▄██▄▄██▄██▄██',
+	\ '▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀',
+  \ '',
+  \ 'MAPPING            ACTION',
+  \ '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━',
+  \ '<Space>            Leader',
+  \ '<Leader>?          List Bindings',
+  \ '',
+\ ]
+let g:startify_change_to_dir = 0
+