Adding TODO notes for later