Add Phase 2 skeleton