Can you add another TODO comment? "We should start the suffix at 2 for user-readability"