Added coments to new protocol-facing code