Shawn/protobuf

@spencerkimball