Add TODOs. (M)

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>