Adding todo for #39