Added TODO, prepared for new run.