Added few todos