diff --git a/emacs-init-el b/emacs-init-el
index fed4c21..872b0af 100644
--- a/emacs-init-el
+++ b/emacs-init-el
@@ -38,10 +38,65 @@
   :ensure t)
 (use-package helm-tramp
   :ensure t)
+
+(use-package company
+  :ensure t
+  :defer t
+  :init (global-company-mode)
+  :config
+  (progn
+    ;; use company for completion
+    (bind-key [remap completion-at-point] #'company-complete company-mode-map)
+
+    (setq company-tooltip-align-annotations t
+          ;; Easy navigation to candidates with M-<n>
+          company-show-numbers t)
+    )
+  :diminish company-mode
+  )
+
+(use-package company-quickhelp          ; Documentation popups for Company
+  :ensure t
+  :defer t
+  :init (add-hook 'global-company-mode-hook #'company-quickhelp-mode))
+
+(use-package company-go
+  :ensure t
+  :defer t
+  :init
+  (with-eval-after-load 'company
+    (add-to-list 'company-backends 'company-go)))
+
+(use-package flycheck
+  :ensure t
+  :defer t
+  :init (add-hook 'sh-mode-hook 'flycheck-mode)
+  )
+
+(use-package yasnippet
+  :ensure t
+  :defer t
+  :init (yas-global-mode 1)
+  )
+
+(use-package go-mode
+  :ensure t
+  :init
+  (progn
+    (setq gofmt-command "goimports")
+    (add-hook 'before-save-hook 'gofmt-before-save)
+    (bind-key [remap find-tag] #'godef-jump))
+  :config
+  (add-hook 'go-mode-hook 'electric-pair-mode)
+  (setq company-tooltip-limit 20)
+  (setq company-idle-delay .3)
+  (setq company-echo-delay 0)
+  (setq company-begin-commands '(self-insert-command))
+  )
+
 (use-package markdown-mode
   :ensure t)
 
-
 (use-package magit
   :ensure t
   :bind (("C-x g" . magit-status)
@@ -51,6 +106,7 @@
 (use-package paradox
   :ensure t
   :defer t)
+
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -63,7 +119,7 @@
     ("#336c6c" "#205070" "#0f2050" "#806080" "#401440" "#6c1f1c" "#6b400c" "#23733c")))
  '(package-selected-packages
    (quote
-    (cyberpunk-theme dad-joke darkane-theme darkmine-theme helm-themes markdown-mode anti-zenburn-theme helm-tramp magit use-package powerline paradox helm)))
+    (go-snippets company-go cyberpunk-theme dad-joke darkane-theme darkmine-theme helm-themes markdown-mode anti-zenburn-theme helm-tramp magit use-package powerline paradox helm)))
  '(paradox-github-token t)
  '(pdf-view-midnight-colors (quote ("#232333" . "#c7c7c7")))
  '(tool-bar-mode nil)