opaque all the things
Merge branch 'stefan'