Phase 2 - Design