More work on the design for Phase 3.