finish through phase 6c, all specs passing (but not done)