diff --git a/TODO b/TODO
new file mode 100644
index 0000000000000000000000000000000000000000..97cbb34e3f81993334ec8dab9ddef3c9a111b5ce
--- /dev/null
+++ b/TODO
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (C) 2009   this file is part of the NPTool Project              *
+ *                                                                           *
+ * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
+ * For the list of contributors see $NPTOOL/Licence/Contributors             *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Original Author:                  contact address:                        *
+ *                                                                           *
+ * Creation Date  : 11/09/09                                                 *
+ * Last update    :                                                          *
+ *---------------------------------------------------------------------------*
+ * Decription:                                                               *
+ *     This file describes the features we would like to form part of a next *
+ *     release                                                               *
+ *---------------------------------------------------------------------------*
+ * Comment:                                                                  *
+ *                                                                           *
+ *                                                                           *
+ *****************************************************************************/
+
+TODO for NPTool:
+----------------
+   + Change TransferToResonance event generator to include Transfer and PhaseSpace
+     generators.
+   + Target work (Nicolas)
+      + Take correctly into account the emittance when the target is tilted. 
+      + IsInsideTarget method for debugging purposes
+   + Add a dedicated class to deal with materials (see example from G4 tutorial)
+     (still under debate)
+   + Split physic list and give the possibility to choose which package to use
+   + Add support for messengers
+   + Scorers: CopyNumber v.s. DetectorNumber? (to be checked)
+   + Build NPTool with the Autotool/Automake
+   + Add documentation (Adrien + Nicolas)
+
+TODO for Gaspard:
+-----------------
+   + Deal with multiplicity events > 1
+   + Check bug when light and heavy particles are detected in the same event