diff --git a/TODO.md b/TODO.md
index c0ef17e..93646d1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,8 +11,8 @@
 - Implement a FizzBuzz example
 - Also, check the codes for FIXME and TODO
 - Allocation is done using pointers for members, is this desired?
-
-- Merge in type classes
+- Functions don't seem to be a thing on typing level yet?
+- static_array and tuple should probably not be PrimitiveType3, but instead subclass AppliedType3?
 
 - test_bitwise_or_inv_type
 - test_bytes_index_out_of_bounds vs static trap(?)
@@ -27,3 +27,6 @@
 - Casting is not implemented except u32 which is special cased
 - Parser is putting stuff in ModuleDataBlock
   - Compiler should probably do that
+- ourlang.BinaryOp should probably always be a Type3ClassMethod
+  - Remove U32_OPERATOR_MAP / U64_OPERATOR_MAP
+- Make prelude more an actual thing