diff --git a/TODO.md b/TODO.md
index dc8225afc..254d3e580 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1 +1,11 @@
-* Communicator should have Close() method
+* .: signal handling
+* builder/amazonebs: Copy AMI to multiple regions
+* builder/amazonebs: Add unique ID to AMI name so multiple can be made
+* communicator/ssh: Ability to re-establish connection
+* communicator/ssh: Download()
+* communicator/ssh: Upload()
+* packer: Communicator should have Close() method
+* packer: Ui input
+* packer/plugin: Better error messages/detection if plugin crashes
+* provisioner/shell: Upload file
+* provisioner/shell: Arguments