Checkpoint while improving Identity
Improvements, refactoring, to Identities.