             (eval-when-compile
               (require 'helm-mode)
               (require 'helm-buffers)
-              (require 'helm-ring)
-              (require 'helm-org))
+              (require 'helm-ring))
 
             (bind-key "<tab>" #'helm-execute-persistent-action helm-map)
             (bind-key "C-i" #'helm-execute-persistent-action helm-map)
-            (bind-key "C-z" #'helm-select-action helm-map)
-
+            (bind-key "C-z" #'helm-select-action helm-map)))
+
+(use-package helm-org
+  :commands (helm-org-agenda-files-headings)
+  :bind (:map helm-org-headings-map
+              ("C-c c" . helm-org-clock-in-at-heading))
+  :config (progn
             ;; Add action to clock in at current heading to
             ;; `helm-org-agenda-files-headings’
 

  :init (setq helm-command-prefix-key "C-c h"))

(use-package helm
  :commands (helm-show-kill-ring
             helm-org-agenda-files-headings)
  :diminish helm-mode
  :bind (:map helm-command-map
              ("#" . helm-emms)

            (add-to-list 'helm-org-headings-actions
                         '("Clock in to this heading"
                           . helm-org--clock-in-at-heading)
                         t)))

(use-package ivy
  :commands (ivy-mode
