Some stuff factored out of !1048 (merged), basically just excuse to play with coverage, see if the MR viz works...