diff --git a/asl/containers/BUILD.bazel b/asl/containers/BUILD.bazel
index a8d6b4e..ba9c6f1 100644
--- a/asl/containers/BUILD.bazel
+++ b/asl/containers/BUILD.bazel
@@ -13,6 +13,7 @@ cc_library(
     ],
     deps = [
         "//asl/memory",
+        "//asl/memory:allocator",
         "//asl/base",
         "//asl/types:span",
         "//asl/hashing",
@@ -28,6 +29,7 @@ cc_library(
     deps = [
         "//asl/base",
         "//asl/memory",
+        "//asl/memory:allocator",
         "//asl/types:maybe_uninit",
         "//asl/hashing",
     ],
@@ -42,6 +44,7 @@ cc_library(
     deps = [
         "//asl/base",
         "//asl/memory",
+        "//asl/memory:allocator",
         "//asl/hashing",
         ":hash_set",
     ],
diff --git a/asl/memory/BUILD.bazel b/asl/memory/BUILD.bazel
index 7305da0..83dcfd0 100644
--- a/asl/memory/BUILD.bazel
+++ b/asl/memory/BUILD.bazel
@@ -9,16 +9,27 @@ package(
 cc_library(
     name = "memory",
     hdrs = [
-        "allocator.hpp",
         "layout.hpp",
         "memory.hpp",
     ],
-    srcs = [
-        "allocator.cpp",
-    ],
     deps = [
         "//asl/base",
     ],
     visibility = ["//visibility:public"],
 )
 
+cc_library(
+    name = "allocator",
+    hdrs = [
+        "allocator.hpp",
+    ],
+    srcs = [
+        "allocator.cpp",
+    ],
+    deps = [
+        "//asl/base",
+        "//asl/memory",
+    ],
+    visibility = ["//visibility:public"],
+)
+
diff --git a/asl/types/BUILD.bazel b/asl/types/BUILD.bazel
index 53905a3..16a2a7a 100644
--- a/asl/types/BUILD.bazel
+++ b/asl/types/BUILD.bazel
@@ -14,6 +14,7 @@ cc_library(
     deps = [
         "//asl/base",
         "//asl/memory",
+        "//asl/memory:allocator",
         "//asl/hashing",
     ],
     visibility = ["//visibility:public"],
@@ -86,6 +87,7 @@ cc_library(
     deps = [
         "//asl/base",
         "//asl/memory",
+        "//asl/memory:allocator",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/todo.txt b/todo.txt
index 1823626..8a1d00b 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,2 +1 @@
-Separate memory and allocator
-Add invoke_t & co
+Add invoke_r & co