diff --git a/custom/setup-org.el b/custom/setup-org.el
index d40ed36..2569ef6 100644
--- a/custom/setup-org.el
+++ b/custom/setup-org.el
@@ -1,3 +1,14 @@
-;; TODO
+(require 'org)
+(define-key global-map "\C-cl" 'org-store-link)
+(define-key global-map "\C-ca" 'org-agenda)
+
+;; when ending TODO (C-C C-t) end with a note + timestamp
+(setq org-log-done 'note)
+;; Specify root dir to search for agenda files, TODOs, ...
+(setq org-agenda-files '("~/org"))
+;; Add extra states for keywords
+(setq org-todo-keywords
+      '((sequence "TODO" "IN-PROGRESS" "WAITING" "DONE")))
+
 
 (provide 'setup-org)