Initial activateIdentity commit, no testing yet