Did you intend to complete this TODO before submitting the PR? It would be nice to just do this now otherwise it's going to languish forever.