Most of the protobuf side done