diff --git a/TODO.rst b/TODO.rst
index 5607852..c4066d2 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -4,6 +4,26 @@
  Things to be done
 ###################
 
+
+Core
+####
+
+Cleanup
+=======
+
+- A proper public interface to the various artifact classes
+
+Testing
+=======
+
+- Reader
+  - Test the reader system in general
+  - Test the Lisp reader implementation
+- Artifacts
+  - Come up with a proper artifacts interface
+  - Test the individual artifact implementations (function `WRITE-ARTIFACT`)
+
+
 Blog
 ####