Revised TODO

Removed Merge conflicts and added some methods