[TASK] Turn todos into @todo to find them easier, Part 2