Do you intend to implement this TODO in this branch, or are you leaving that as future work?