Added TODOs for self