Adding TODO notes for self