Removed 1 TODO item and replaced it with 2 more.