Recombined consensus

Working from #386...