TODO list change

I changed the TODO list with the on-going work