Phase 2 of implementing authentication