diff --git a/src/ast.cpp b/src/ast.cpp
index eb4b37f..3b34002 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -79,6 +79,7 @@ Function::Function(Lambda lambda)
 
 void Formatter<blaze::ASTNode*>::format(Builder& builder, blaze::ASTNode* value) const
 {
+	// TODO: Call into Printer::dumpImp(), instead of doing it manually
 	if (is<blaze::String>(value)) {
 		return Formatter<std::string>::format(builder, static_cast<blaze::String*>(value)->data());
 	}
diff --git a/src/environment.h b/src/environment.h
index 8131626..7674d6b 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -42,6 +42,8 @@ class GlobalEnvironment final : public Environment {
 public:
 	GlobalEnvironment()
 	{
+		// TODO: Add more native functions
+		// TODO: Move the functions to their own file
 		auto add = [](std::span<ASTNode*> nodes) -> ASTNode* {
 			int64_t result = 0;
 
diff --git a/src/printer.cpp b/src/printer.cpp
index efd672c..6f2f12f 100644
--- a/src/printer.cpp
+++ b/src/printer.cpp
@@ -92,6 +92,7 @@ void Printer::dumpImpl(ASTNode* node)
 		print("}}");
 	}
 	else if (is<String>(node)) {
+		// TODO: Implement string readably printing
 		printSpacing();
 		print("{}", static_cast<String*>(node)->data());
 	}
diff --git a/src/reader.cpp b/src/reader.cpp
index 97751c8..15b7868 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -38,6 +38,7 @@ void Reader::read()
 
 	m_node = readImpl();
 
+	// TODO: Move these to the appropriate functions
 	// Error checking
 
 	if (m_invalid_syntax) {