Update TODO

Added a couple of TODOs