Removed a done TODO
Updated TODO for new plan
Removed addressed TODO