Taking a good TODO note
Fixed TODO note
Adding TODO for self