diff --git a/TODO b/TODO
index e1e000d1..066b9f23 100644
--- a/TODO
+++ b/TODO
@@ -44,6 +44,11 @@ Legend:
    - pisi-remove
    - pisi-upgrade
    ? svn-like CLI
+ - configuration file
+   - define the format of the configuration file
+   - extend Config module (config.py) accordingly
+ - implement file uri
+   - extend the modules dealing with files accordingly
  - multi-package dependency analysis
    - design a package operation planner
    - install operation
@@ -60,7 +65,6 @@ Legend:
    - list of installed packages
    - comar OM information (Provides)
  - easy package preparation
-   ? PISIMAT
    ? convert ebuild to pisi
  - COMAR interface
    ? what do we need to specify in a package? (Provides only?)
@@ -70,8 +74,6 @@ Legend:
    - support URI's whereever a filename is supported
    - http server
    - pisi updatedb over internet
- - multiple package repository
-   - decide how to implement
  - component/category
    - requirements
    - xml format
@@ -79,6 +81,12 @@ Legend:
 
 3. Beta
 
+ - multiple package repository
+   - decide how to implement
+
+ - Packager's tool
+   ? PISIMAT
+
  - GUI
    - installation
    - remove