added todo
merge of todo