M4 is about adding transport encryption. At the end of this, we'll also want a relatively stable public API.