And an improved TODO.