Updated TODO

By Jason