Re-order and add TODOs

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