Update TODOs to reflect true next steps.