TODO list included

Signed-off-by: Marco Vereda <paramarco@gmail.com>