diff --git a/TODO.rst b/TODO.rst
new file mode 100644
index 0000000..5f652d2
--- /dev/null
+++ b/TODO.rst
@@ -0,0 +1,16 @@
+Work Items for Subunit2SQL
+==========================
+
+Short Term
+----------
+ * Store counts to everything in the DB from the shell script
+ * Add a new metadata table for each existing table (run_metadata,
+   test_metadata, test_run_metadata) to store extra info from stream like
+   tags, or attrs and other information about runs like job name.
+ * Add artifacts option to CLI on subunit2sql to store log links in runs table
+ * Add unit tests
+
+Longer Term
+-----------
+ * Add tooling to pull the data and visualize it in fun ways
+ * Add some statistics functions on top of the DB api to perform analysis