Added draft 2 of proto types for meeting today.