diff --git a/TODO b/TODO
index 486b4b9..438fdd3 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,42 @@
-Filesystem
-----------
+Badger::Class
+-------------
+
+* finish cleanup and documentation
+
+* pkg() alias for name()
+
+* AUTOLOAD method to delegate to real class if possible?
+
+
+Badger::Codec
+--------------
+
+* encoded()/decoded() methods (e.g. for utf8)
+
+
+Badger::Config
+--------------
+
+* Just a basic implementation at moment.  Merge in TT3 config, AppConfig
+  and other stuff.
+
+
+Badger::Debug
+-------------
+
+* move in debug() from Badger::Base and make it a mixin.
+
+
+Badger::Exception
+-----------------
+
+* needs good cleanup
+
+
+Badger::Filesystem
+------------------
+
+* documentation
 
 * exists() should check the type for file/dir
 
@@ -7,6 +44,7 @@ Filesystem
 
 * virtual filesystems composed across several real filesystems
 
+
 Badger::Storage
 ---------------
 
@@ -19,37 +57,17 @@ Badger::Storage
 
 * create/destroy   connect/disconnect  open/close
 
-Misc
-----
-
-* Move Badger::Exception to Badger::Error and clean out
-
 
+Badger::Test
+------------
 
-=head3 Configuration Options
+* Could do with some proper testing.  Although all the other test scripts
+  do tend to thrash it quite well...
 
-The following configuration options are provided by default for 
-all objects derived from the Badger::Base module that inherit
-its C<new()> method and C<init()> methods.
 
-=head4 throws
-
-This option can be set to cause the object to throw as exceptions any
-and all errors raised by calls to the C<error($msg)> method.  A
-L<Badger::Exception> object is created (or an object of whatever class
-is defined in the C<$EXCEPTION> package variable) with its C<type>
-set to the value of the C<throws> parameter and C<info> field containing
-the error message passed to the C<error($msg)> method.
-
-    my $object = My::Badger::Forager->new( throws => 'hungry' );
-
-    $object->error('No nuts or berries found!');
-
-In the preceding example, the call to the C<error()> method 
-results in an exception object being throw via die with a C<type>
-of C<fruit> and C<info> set to C<No berries found>.
-
-    fruit error - No berries found!
+Misc
+----
 
-See the C<error()> and C<throw()> methods for further details.
+* Move Badger::Exception to Badger::Error and clean out.  Hmm... nah, 
+  maybe not.