More work on the binary protocol
More work on the binary protocol