S3 done

I put a little more than discussed in the soundness section, but I think
it would be nice if this could stay. Let's see in a few hours (sigh).