Revert "Revert "pre  coverhaul""

This reverts commit 17c33f24d56f631406c716d3323fddcc7a75087f.