Adding TODO for self