For #29, almost finished protobufs from last saturday