Update for draft12 protocol implementation

As promised, here's a PR to update for using the new version of the module to get us to draft12.