Updated missing Bonus TODO near end