WIP second part of the protocol spec