 +	protoMessage.NumFileinfos = proto.Int(len(m.resourceArray))
 +	out, err := proto.Marshal(protoMessage)
 +	return out, err
+#*
+#* author: Tom Roeder
+#* email: tmroeder@google.com
+#* date: 2014-10-24T11:47:49-0700
+#*
+#- These two lines should be one:
+#-
+#- return proto.Marshal(protoMessage)
+#-
+#- And, in fact, this method should probably be something like
+#-
+#- fpr := &FPResourceMaster{
+#-   PrinName: proto.String(m.program),
+#-   BaseDirectoryName: proto.String(m.baseDirectory),
+#-   NumFileinfos: proto.Int(len(m.resourceArray)), // not needed?
+#- }
+#- return proto.Marshal(fpr)
+#-
+#- And this should be inlined into the code unless it's used more than once. I
+#- don't currently see it being used at all.
+#-
+#- This same comment applies to all the Encode/Decode method pairs here.
 +}
 +
 +func (m *ResourceMaster) DecodeMaster(in []byte) (*int, error) {
 +	fmt.Printf("filehandler: DecodeMaster\n")
 +	rMessage := new(FPResourceMaster)
 +	_ = proto.Unmarshal(in, rMessage)
+#*
+#* author: Tom Roeder
+#* email: tmroeder@google.com
+#* date: 2014-10-24T11:47:39-0700
+#*
+#- Don't ignore errors
+#-
 +	m.program = *rMessage.PrinName
 +	m.baseDirectory = *rMessage.BaseDirectoryName
 +	size := *rMessage.NumFileinfos
 +	isize := int(size) //TODO: Fix
+#*
+#* author: Tom Roeder
+#* email: tmroeder@google.com
+#* date: 2014-10-24T11:50:47-0700
+#*
+#- No size field needed.
+#-
 +	return &isize, nil
 +}
 +

+	Guard          tao.Guard
+	baseDirectory  string
+	NumResources   int
+	resourceArray  [100]ResourceInfo
+	NumPrincipals  int
+	principalArray [100]Principal
+	// Rules
+}
+
+// Policy for managing files in the fileserver.

+		SigningKey = *signingkey
+		fmt.Printf("fileclient: Initilized signingKey: % x\n", SigningKey)
+	}
#*
#* author: Tom Roeder
#* email: tmroeder@google.com
#* date: 2014-10-23T11:25:27-0700
#*
#- I think these methods duplicate methods that already exist in keys.go. If
#- not, then these should be ported into keys.go rather than being in fileproxy.
#-
+
+	var creds []byte
+	creds = []byte("I am a fake cred")
