Todo Task not for GCI

Since my GCI task needs review , i couldn't able to control myself from doing these todo tasks.
So this pr is not meant for GCI task :+1: