Phase 13 of authentication implementation - partial merged implementation