Adding a TODO
Cleaning up some TODOs