Further Refactoring + More.
I have started reworking Identities with the idea of having identity parts - See Code.