diff --git a/init.el b/init.el
index 8f50a8e..62b4fe1 100644
--- a/init.el
+++ b/init.el
@@ -3,6 +3,24 @@
 ;; This file loads Org and then loads the rest of our Emacs initialization from Emacs lisp
 ;; embedded in literate Org files.
 
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name
+        "straight/repos/straight.el/bootstrap.el"
+        (or (bound-and-true-p straight-base-dir)
+            user-emacs-directory)))
+      (bootstrap-version 7))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+(straight-use-package 'org)
+
 ;; Load up Org Mode and (now included) Org Babel for elisp embedded in Org Mode files
 (setq dotfiles-dir (file-name-directory (or (buffer-file-name) load-file-name)))
 
diff --git a/main.org b/main.org
index 7ab9a6e..0b58a5e 100644
--- a/main.org
+++ b/main.org
@@ -14,7 +14,7 @@
 Package management to be a little more fien/precise and work outside
 of Nix (as much as it would be nice to work inside of Nix too)
 
-#+begin_src elisp :tangle yes :exports code
+#+begin_src elisp :tangle no :exports code
 (defvar bootstrap-version)
 (let ((bootstrap-file
        (expand-file-name
@@ -32,6 +32,9 @@ of Nix (as much as it would be nice to work inside of Nix too)
   (load bootstrap-file nil 'nomessage))
 #+end_src
 
+This code block actually resides in init.el (so that we can perform
+some necessary pre-configuration)
+
 ** Leaf.el
 
 We must initialize =leaf.el=, which we use as a use-package
@@ -400,8 +403,11 @@ For using clojure, we use both [[https://github.com/clojure-emacs/clojure-mode][
 
 We ensure that org is available (though it is builtin)
 
+For Version compatibility we actually install org in init.el (to not
+conflict with the builtin version of Org)
+
 #+begin_src elisp :tangle yes :exports code
-(leaf org :ensure t
+(leaf org
   :require t org-tempo
   :hook
   (org-mode-hook . auto-fill-mode)