Phase 2 is feature complete.  Going to hold off on Phase 3 until first
round of testing on Phase 2.