Adding a TODO for self