Removed one TODO and added another.