 conventions of DOOM emacs. Note that packages are deferred by default.")
 
 (defmacro @load (filesym &optional path noerror)
-  "TODO"
-  (let ((path (or (and path (eval path)) __DIR__))
-        file)
+  "Loads a file relative to the current module (or PATH). FILESYM is a file path
+as a symbol. PATH is a directory to prefix it with. If NOERROR is non-nil, don't
+throw an error if the file doesn't exist.
+
+Sets `__FILE__' and `__DIR__' on the loaded file."
+  (let ((path (or (and path (eval path)) __DIR__)))
     (unless path
       (error "Could not find %s" filesym))
-    (setq file (f-expand (concat (symbol-name filesym) ".el") path))
-    (if (f-exists-p file)
-        `(let ((__FILE__ ,file)
-               (__DIR__  ,path))
-           (load ,(f-no-ext file) ,noerror (not doom-debug-mode)))
-      (unless noerror
-        (error "Could not @load file %s" file)))))
+    (let ((file (f-expand (concat (symbol-name filesym) ".el") path)))
+      (if (f-exists-p file)
+          `(let ((__FILE__ ,file)
+                 (__DIR__  ,path))
+             (load ,(f-no-ext file) ,noerror (not doom-debug-mode)))
+        (unless noerror
+          (error "Could not @load file %s" file))))))
 
 (defmacro @require (module submodule &optional reload-p)
-  "Like `require', but for doom modules."
+  "Like `require', but for doom modules. Will load a module's config.el file if
+it hasn't already, and if it exists."
   (unless noninteractive
     (let ((loaded-p (doom-module-loaded-p module submodule)))
       (when (or reload-p (not loaded-p))
         (unless loaded-p
-          (doom-enable-module module submodule t))
+          (doom--enable-module module submodule t))
         `(@load config ,(doom-module-path module submodule) t)))))
 
 

    (setq doom-init-p t)))

(defun doom-initialize-autoloads (&optional force-p)
  "Ensures that an autoloads file exists and is loaded."
  (unless (ignore-errors (require 'autoloads doom-autoload-file t))
    (unless noninteractive
      (doom/reload-autoloads)

        (error "Autoloads file couldn't be generated")))))

(defun doom-initialize-packages (&optional force-p)
  "Executes the packages.el files across DOOM Emacs to refresh `doom-modules'
and `doom-packages'."
  (doom-initialize force-p)
  (when (or force-p (not doom-modules) (not doom-packages))
    (setq doom-modules nil
          doom-packages nil)
    (let ((noninteractive t))
      (mapc (lambda (file) (load file nil :nomessage))
            (list (f-expand "packages.el" doom-core-dir)
                  (f-expand "init.el" doom-emacs-dir)))
      (mapc (lambda (file) (load file :noerror :nomessage))
            (--map (doom-module-path (car it) (cdr it) "packages.el")
                   (doom--module-pairs))))))

(defun doom-module-path (module submodule &optional file)
  "Get the full path to a module: e.g. :lang emacs-lisp maps to
