diff --git a/TODO.md b/TODO.md
index 6ed7f5e..13fddac 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,27 +2,36 @@ Tasks
 ==
 
 - REST Server
-    - [ ] Add in authorization scheme (maybe PAM auth endpoint with JWT?)
+  - [ ] Add in authorization scheme (maybe PAM auth endpoint with JWT?)
 - Core Functionality
-    - rename TaskList to TaskSet
-    - Add support for Task.runSpec
-        - Executors can validate runspecs
-        - Executors can expand runspecs
-    - Allow `{{,!DATES}}` style interpolation, where values from `{{DATES}}` are preserved as a single, comma separated
-      list
-    - Loggers
-        - [ ] FileSystemLogger
-            - [ ] Add unit tests
-            - [ ] Add more error checking
-        - [ ] General logger
-        - [ ] Redis DAGRunLogger
-    - Server
-        - [ ] Multiple execution pools
-        - [ ] per-Executor parameters
+  - Allow `{{,!DATES}}` style interpolation, where values from `{{DATES}}` are preserved as a single, comma separated
+    list
+  - Improve DAG implementation
+    - Need to support millions of vertices
+    - Much faster cycle detection
+  - Executors
+    - Forking
+      - Add support for environment variables with `execvpe`
+    - Slurm
+      - Add support for environment variables
+  - Loggers
+    - Add in ability for loggers to be asynchronous
+    - Additional Methods
+      - Get DAG State
+      - Get Task Details
+      - Stream updates?
+    - Implementations
+      - [ ] General logger
+      - [ ] SQL logger (sqlite, postgres)
+      - [ ] Redis DAGRunLogger
+  - Server
+    - [ ] Multiple executors
+    - [ ] Log to general logger
+    - [ ] Recover on startup
 - Utilities
-    - daggyd
-        - [ ] Add config file support
-        - [ ] Support for all the different executors / state loggers
-    - daggyc
-        - [ ] Submission
-        - [ ] Querying
+  - daggyd
+    - [ ] Add config file support
+    - [ ] Support for all the different executors / state loggers
+  - daggyc
+    - [ ] Submission
+    - [ ] Querying