add todo for run() simplification