diff --git a/BRANCH_TODO b/BRANCH_TODO
deleted file mode 100644
index 5b5cf506f..000000000
--- a/BRANCH_TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Finish these thigns before merging teh branch
-
- * zig targets
-   - use non-reflection based cpu detection?
-
diff --git a/src-self-hosted/print_targets.zig b/src-self-hosted/print_targets.zig
index 0e0844d7c..a7013e8cd 100644
--- a/src-self-hosted/print_targets.zig
+++ b/src-self-hosted/print_targets.zig
@@ -177,6 +177,41 @@ pub fn cmdTargets(
     }
     try jws.endArray();
 
+    try jws.objectField("cpus");
+    try jws.beginObject();
+    inline for (@typeInfo(Target.Arch).Union.fields) |field| {
+        try jws.objectField(field.name);
+        try jws.beginObject();
+        const arch = @unionInit(Target.Arch, field.name, undefined);
+        for (arch.allCpus()) |cpu| {
+            try jws.objectField(cpu.name);
+            try jws.beginArray();
+            for (arch.allFeaturesList()) |feature, i| {
+                if (cpu.features.isEnabled(@intCast(u8, i))) {
+                    try jws.arrayElem();
+                    try jws.emitString(feature.name);
+                }
+            }
+            try jws.endArray();
+        }
+        try jws.endObject();
+    }
+    try jws.endObject();
+
+    try jws.objectField("cpuFeatures");
+    try jws.beginObject();
+    inline for (@typeInfo(Target.Arch).Union.fields) |field| {
+        try jws.objectField(field.name);
+        try jws.beginArray();
+        const arch = @unionInit(Target.Arch, field.name, undefined);
+        for (arch.allFeaturesList()) |feature| {
+            try jws.arrayElem();
+            try jws.emitString(feature.name);
+        }
+        try jws.endArray();
+    }
+    try jws.endObject();
+
     try jws.objectField("native");
     try jws.beginObject();
     {