Would you mind completing this TODO before we merge? Even just one sentence is OK.