Finish 6.2 - validate and ensure uniqueness.