[71] Split the next goal into a few parts - update TODO.