more stuff moved to protocol.py