working progress CC
Further design