Added TODO in the code

Must do it later