14 files changed, 10 insertions, 7 deletions
diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 321aebffd..c76736c72 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -22,7 +22,6 @@
   ["[1][0]" documentation]
   ["[1][0]" extension]
   ["[1][0]" ffi]
-  ["[1][0]" locale]
   ["[1][0]" math]
   ["[1][0]" meta]
   ["[1][0]" program]
@@ -891,7 +890,6 @@
                   /documentation.documentation
                   /extension.documentation
                   /ffi.documentation
-                  /locale.documentation
                   /math.documentation
                   /meta.documentation
                   /program.documentation
diff --git a/stdlib/source/documentation/lux/world.lux b/stdlib/source/documentation/lux/world.lux
index 777b02678..795612a5e 100644
--- a/stdlib/source/documentation/lux/world.lux
+++ b/stdlib/source/documentation/lux/world.lux
@@ -20,7 +20,8 @@
     ["[1]/[0]" resolution]]]
   ["[1][0]" environment]
   ["[1][0]" shell]
-  ["[1][0]" time]])
+  ["[1][0]" time]
+  ["[1][0]" locale]])
 
 (.def .public documentation
   (.List $.Module)
@@ -32,4 +33,6 @@
        /output/video/resolution.documentation
        /environment.documentation
        /shell.documentation
-       /time.documentation))
+       /time.documentation
+       /locale.documentation
+       ))
diff --git a/stdlib/source/documentation/lux/locale.lux b/stdlib/source/documentation/lux/world/locale.lux
index b03601d73..b03601d73 100644
--- a/stdlib/source/documentation/lux/locale.lux
+++ b/stdlib/source/documentation/lux/world/locale.lux
diff --git a/stdlib/source/documentation/lux/locale/language.lux b/stdlib/source/documentation/lux/world/locale/language.lux
index cc0f4e7be..cc0f4e7be 100644
--- a/stdlib/source/documentation/lux/locale/language.lux
+++ b/stdlib/source/documentation/lux/world/locale/language.lux
diff --git a/stdlib/source/documentation/lux/locale/territory.lux b/stdlib/source/documentation/lux/world/locale/territory.lux
index 232f18038..232f18038 100644
--- a/stdlib/source/documentation/lux/locale/territory.lux
+++ b/stdlib/source/documentation/lux/world/locale/territory.lux
diff --git a/stdlib/source/library/lux/meta/macro/custom.lux b/stdlib/source/library/lux/meta/macro/class.lux
index 632219851..1c529d7cc 100644
--- a/stdlib/source/library/lux/meta/macro/custom.lux
+++ b/stdlib/source/library/lux/meta/macro/class.lux
@@ -1,3 +1,5 @@
+... [Not everything is an expression](https://codewords.recurse.com/issues/two/not-everything-is-an-expression)
+
 (.require
  [library
   [lux (.except local)
diff --git a/stdlib/source/library/lux/locale.lux b/stdlib/source/library/lux/world/locale.lux
index 6cd384586..6cd384586 100644
--- a/stdlib/source/library/lux/locale.lux
+++ b/stdlib/source/library/lux/world/locale.lux
diff --git a/stdlib/source/library/lux/locale/language.lux b/stdlib/source/library/lux/world/locale/language.lux
index ae11c87b1..ae11c87b1 100644
--- a/stdlib/source/library/lux/locale/language.lux
+++ b/stdlib/source/library/lux/world/locale/language.lux
diff --git a/stdlib/source/library/lux/locale/territory.lux b/stdlib/source/library/lux/world/locale/territory.lux
index 74c30fce6..74c30fce6 100644
--- a/stdlib/source/library/lux/locale/territory.lux
+++ b/stdlib/source/library/lux/world/locale/territory.lux
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 7212f5fb4..23d89ee6e 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -47,7 +47,6 @@
             ["[1][0]" debug]
             
             ["[1][0]" documentation]
-            ["[1][0]" locale]
             ["[1][0]" math]
             
             ["[1][0]" meta]
@@ -1204,7 +1203,6 @@
                      /debug.test
 
                      /documentation.test
-                     /locale.test
                      /math.test
                      
                      /meta.test
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index e0018ab8b..0f8c65711 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -16,7 +16,8 @@
    ["[1]/[0]" http
     ["[1]/[0]" client]
     ["[1]/[0]" status]]]
-  ["[1][0]" time]])
+  ["[1][0]" time]
+  ["[1][0]" locale]])
 
 (def .public test
   Test
@@ -30,4 +31,5 @@
        /net/http/client.test
        /net/http/status.test
        /time.test
+       /locale.test
        ))
diff --git a/stdlib/source/test/lux/locale.lux b/stdlib/source/test/lux/world/locale.lux
index b7c99d34a..b7c99d34a 100644
--- a/stdlib/source/test/lux/locale.lux
+++ b/stdlib/source/test/lux/world/locale.lux
diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/world/locale/language.lux
index edabb90d2..edabb90d2 100644
--- a/stdlib/source/test/lux/locale/language.lux
+++ b/stdlib/source/test/lux/world/locale/language.lux
diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/world/locale/territory.lux
index 969fe32a1..969fe32a1 100644
--- a/stdlib/source/test/lux/locale/territory.lux
+++ b/stdlib/source/test/lux/world/locale/territory.lux