yeah, best do that in a separate PR after we merge this one, to not keep
this lagging. we might then also validate some of those todo if they are
still relevant at all.