WIP: TODOs

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>