review from Marcel with TODOs