Do you plan on implementing those todos before the merge ?