diff --git a/TODO b/TODO
index 07754f7..6e1f4f7 100644
--- a/TODO
+++ b/TODO
@@ -1,26 +1,32 @@
 
-build a testing framework
+Goals for next minor release (0.2.1):
+-------------------------------------
 
-test exclusive locking works with another test process
+* Complain/refuse to create tempfiles in world-writeable directories
+* Test exclusive locking works with another test process
+* Perserve atime of original mailbox properly
+* Finish man page
 
-finish man page
+Goals for next major release (0.3.0):
+-------------------------------------
 
-add option to archive depending on mailbox size threshold 
-    + is this a good idea?
-add option to archive depending on number of messages
-    + is this a good idea?
+* Build a testing framework using python module 'unittest'
+* Lock any original .gz files 
+  - is this necessary?
+* Check for symlink attacks for tempfiles (although we don't use /var/tmp)
+* Test for write permission before doing anything
 
-perserve atime of original mailbox properly
+Longer Term goals:
+------------------
 
-lock any original .gz files (?)
-
-check for symlink attacks for tempfiles (although we don't use /var/tmp)
-
-test for write permission before doing anything
-
-test for missing compression programs 
-    + is this a waste of time?
-
-add option - do not compress (?)
-
-Add Makefile with "make install" target ?
+* Add MMDF mailbox support
+* Add Babyl mailbox support
+* Add option to archive depending on mailbox size threshold 
+  - is this a good idea?
+* Add option to archive depending on number of messages
+  - is this a good idea?
+* Test for missing compression programs 
+  - is this a waste of time?
+* Add option - do not compress 
+  - is this useless?
+* Use a Makefile/python installation process