Can you solve this TODO before the merge?