diff --git a/TODO.goals b/TODO.goals
new file mode 100644
index 0000000..7ae3dbd
--- /dev/null
+++ b/TODO.goals
@@ -0,0 +1,9 @@
+= Resolve pull requests
+    = Resolve pull request #6
+Resolve issues
+    Investigate issue #8
+Examine forks
+    Integrate Zac's fork #6
+    Integrate Sajal's fork #7
+    Integrate Francis's fork #10
+    Integrate Paul's fork
diff --git a/TODO.rst b/TODO.rst
deleted file mode 100644
index 4da9fa4..0000000
--- a/TODO.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-+ Identify what needs to be done
-    + check __init__.py
-    + check tests.py
-    + check serve_tests.py
-+ Fix unittests
-+ Fix exceptions when websocket server disappears
-+ Fix thread exceptions
-    + Finish creating low-level _SocketIO to eliminate cyclic references
-    + Move namespace and callback handling to _ListenerThread
-= Resolve pull requests
-Resolve issues
-Integrate Zac's fork #6
-Integrate Sajal's fork #7
-Integrate Francis's fork #10
-Investigate issue #8
-Integrate Paul's fork