Part way through edits, kicking over fence to @fblundun to update following fixing of contexts