Not sure I understand the TODO, or the issue with it