diff --git a/layout.txt b/layout.txt
index 8b52c8b..f5e6f53 100644
--- a/layout.txt
+++ b/layout.txt
@@ -2,6 +2,7 @@ modules/${class}/default.nix # imported by easy-hosts.perClass.modules
 
   imports = [
     ../base # common across all systems
+
     ./base # common across all ${class} systems
     ./shell # WM/DE
     ./programs
@@ -12,9 +13,23 @@ modules/${class}/default.nix # imported by easy-hosts.perClass.modules
 
 
 
-modules/home/default.nix
+modules/base/default.nix
 
   imports = [
+    ../options # custom options used for deciding other config
+
+    {...} # modules w/i base
+
+    ./home.nix # home-manager setup; imports modules/home
+  ];
+
+
+
+modules/home/default.nix # HOME MANAGER OPTIONS ONLY
+
+  imports = [
+    ../options
+
     ./shell # WM/DE
     ./programs
         # default.nix - turns on/off depending on profile