Added TODOs

Signed-off-by: Julien Bonvarlet <julien.bonvarlet@nrx.eu>