Adding TODO notes for further polish