todo task completed

hey i completed some of to do task mentioned in your code please review it and merge it.