Add more TODOs to the PLAN.