Adding a large TODO for self