[ADD] Some tasks into TODO list