diff --git a/TODO b/TODO
index 67f5254..e0dce9b 100644
--- a/TODO
+++ b/TODO
@@ -1,21 +1,16 @@
-Master
-boot up workers
-listen for worker messages
-add worker messages to message queue
-process message queue
-"reply" to a message allows sending a message back down to worker
+IO selection configuration for master
+- allow pipe setup
+- allow ssh setup
 
-When worker asks for file but no files left, send shutdown message to worker
-when worker connection breaks, end thread
-wait on all threads
-when all threads are done, all workers must be done
+YML configuration
 
+v0.6.0
 
+multitest backwards compatible
 
-when a runner asks for file but master responds with shutdown, mark self
-  as terminated, shut down runners. Any runner that asks for a file is
-  auto-terminated
-wait for runner threads to finish
-then exit, breaking master connection
+v0.7.0
+
+???
+
+v1.0.0
 
-Test individual messages? Ensure they handle the right method? May not be worth it.
diff --git a/lib/hydra/worker.rb b/lib/hydra/worker.rb
index aabfe7b..da3e4c2 100644
--- a/lib/hydra/worker.rb
+++ b/lib/hydra/worker.rb
@@ -82,8 +82,6 @@ module Hydra #:nodoc:
       $stdout.write "WORKER| Processing Messages\n" if @verbose
       @running = true
 
-      # TODO: catch this exception, return a dying message to the master
-      # then shutdown
       Thread.abort_on_exception = true
 
       process_messages_from_master