Phase 11 of authentication implementation - partial merged implementation