This is rebased onto the scratch buffer in CS preamble work that Bas has done, makes this all a lot cleaner for emitting the rings. Otherwise there shouldn't be any changes. Dave.