Updated TODO
Merging