Added TODO
TODO edits