PR for code review.

Is this just generating a new id?