diff --git a/TODO.rst b/TODO.rst
new file mode 100644
index 0000000..135bcd6
--- /dev/null
+++ b/TODO.rst
@@ -0,0 +1,17 @@
+Work Items for os-testr
+=======================
+
+Short Term
+----------
+ * Expose all subunit-trace options through ostestr
+ * Add --html option to ostestr to run testr with subunit2html output
+ * Add unit tests
+   * For ostestr test selection api
+   * Response code validation on more argument permutations
+Long Term
+---------
+ * Lock down test selection CLI
+   * When this is done it will become release 1.0.0
+ * Add subunit-trace functional tests
+   ** Sample subunit streams and test output from subunit-trace
+ * Add testing for subunit2html
diff --git a/doc/source/index.rst b/doc/source/index.rst
index feb274b..448d655 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -15,6 +15,7 @@ Contents:
    installation
    usage
    contributing
+   todo
 
 Indices and tables
 ==================
diff --git a/doc/source/todo.rst b/doc/source/todo.rst
new file mode 100644
index 0000000..0a7409f
--- /dev/null
+++ b/doc/source/todo.rst
@@ -0,0 +1 @@
+.. include:: ../../TODO.rst