diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index e8dbb5d..b168585 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -78,6 +78,33 @@
   (ivy-mode 1)
   (ivy-count-format "(%d/%d) "))
 
+(use-package org
+  :straight (:type built-in)
+  :bind (("C-c l" . org-store-link)
+         ("C-c c" . org-capture)
+         ("C-c a" . org-agenda)
+         ("C-c b" . org-switchb)
+         :map org-mode-map
+         ("M-." . org-open-at-point)
+         ("M-," . org-mark-ring-goto))
+  :custom
+  (org-agenda-start-on-weekday 0)
+  (org-agenda-weekend-days '(5 6))
+  (org-default-notes-file "~/Documents/notes.org")
+  (org-agenda-files (list org-default-notes-file))
+  (org-capture-templates
+   '(
+     ("i" "Thoughts on Debugging and Research" entry
+      (file+headline org-default-notes-file "Inquiries")
+      "** %?\n   %U\n*** Failures and possible solutions")
+     ("t" "Task" entry
+      (file+headline org-default-notes-file "Tasks")
+      "** TODO %?\n   %U")
+     )))
+(use-package org-contrib)
+(use-package org-contacts
+  :after org-contrib)
+
 (use-package company
   :init (global-company-mode))