Add TODO notes for next steps