its working now
Merge branch 'master2'
added todo