Added To do

Added To Do and cleaned the source