diff --git a/js/ContentObject.js b/js/ContentObject.js
index d05f7ba..e120a98 100644
--- a/js/ContentObject.js
+++ b/js/ContentObject.js
@@ -6,7 +6,7 @@
 	
 	
 	if (typeof _Name === 'string'){
-		var n = new Name(_Name);
+		this.Name = new ContentName(_Name);
 	}
 	else{
 		//TODO Check the class of _Name
@@ -16,26 +16,115 @@
 	this.Content=_Content;
 	this.Signature = _Signature;
 
+	
+	this.StartSIG = null;
+	this.EndSIG = null;
+	
+	this.StartSignedInfo = null;
+	this.EndContent = null;
+	
+	this.rawSignatureData = null;
 };
 
+ContentObject.prototype.sign = function(){
+	var n1 = this.encodeObject(this.Name);
+	var n2 = this.encodeObject(this.SignedInfo);
+	var n3 = this.encodeContent();
+	
+	var n = n1.concat(n2,n3);
+	if(LOG>2)console.log('Signature Data is (binary) '+n);
+	
+	if(LOG>2)console.log('Signature Data is (RawString) '+ toString(n) );
+	if(LOG>2)console.log(toString(n) );
+	
+	
+	var rsa = new RSAKey();
+			
+	rsa.readPrivateKeyFromPEMString(globalKeyManager.privateKey);
+			
+	var hSig = rsa.signString(toString(n), "sha256");
+
+	if(LOG>2)console.log('SIGNATURE SAVED IS');
+	
+	if(LOG>2)console.log(hSig);
+	
+	if(LOG>2)console.log(toNumbers(hSig.trim()));
+
+	this.Signature.Signature = toNumbers(hSig.trim());
+};
+
+ContentObject.prototype.encodeObject = function encodeObject(obj){
+	var enc = new BinaryXMLEncoder();
+ 
+	obj.encode(enc);
+	
+	var num = enc.getReducedOstream();
+
+	return num;
+
+	
+};
+
+ContentObject.prototype.encodeContent = function encodeContent(obj){
+	var enc = new BinaryXMLEncoder();
+	 
+	enc.writeElement(CCNProtocolDTags.Content, this.Content);
+
+	var num = enc.getReducedOstream();
+
+	return num;
+
+	
+};
+
+ContentObject.prototype.saveRawData = function(bytes){
+	
+	var sigBits = bytes.slice(this.StartSIG, this.EndSIG );
+	
+	//var sigIngoPlusContentBits = bytes.slice(this.StartSignedInfo, this.EndContent );
+	
+	//var concat = sigBits.concat(sigIngoPlusContentBits);
+	
+	//this.rawSignatureData = concat;
+
+	this.rawSignatureData = sigBits;
+};
 
 ContentObject.prototype.decode = function(/*XMLDecoder*/ decoder) {
 
 		decoder.readStartElement(this.getElementLabel());
 
-		this.Signature = new Signature();
-		this.Signature.decode(decoder);
+		
+		if( decoder.peekStartElement(CCNProtocolDTags.Signature) ){
+			this.Signature = new Signature();
+			this.Signature.decode(decoder);
+		}
+		
+		//this.EndSIG = decoder.offset;
+
+		this.StartSIG = decoder.offset;
 
 		this.Name = new ContentName();
 		this.Name.decode(decoder);
-
-		this.SignedInfo = new SignedInfo();
-		this.SignedInfo.decode(decoder);
-
+		
+		//this.StartSignedInfo = decoder.offset;
+	
+		
+		if( decoder.peekStartElement(CCNProtocolDTags.SignedInfo) ){
+			this.SignedInfo = new SignedInfo();
+			this.SignedInfo.decode(decoder);
+		}
+		
 		this.Content = decoder.readBinaryElement(CCNProtocolDTags.Content);
 
-		decoder.readEndElement();
+		
+		//this.EndContent = decoder.offset;
+		this.EndSIG = decoder.offset;
 
+		
+		decoder.readEndElement();
+		
+		this.saveRawData(decoder.istream);
 };
 
 ContentObject.prototype.encode = function(/*XMLEncoder*/ encoder)  {
@@ -45,14 +134,35 @@
 
 	encoder.writeStartElement(this.getElementLabel());
 
+	
+
+
 	if(null!=this.Signature) this.Signature.encode(encoder);
+	
+	
+	this.StartSIG = encoder.offset;
+	
+
 	if(null!=this.Name) this.Name.encode(encoder);
+	
+	//this.EndSIG = encoder.offset;
+	//this.StartSignedInfo = encoder.offset;
+	
+	
 	if(null!=this.SignedInfo) this.SignedInfo.encode(encoder);
 
 	encoder.writeElement(CCNProtocolDTags.Content, this.Content);
 
-	encoder.writeEndElement();
+	
+	this.EndSIG = encoder.offset;
+	
+	//this.EndContent = encoder.offset;
+	
 
+	encoder.writeEndElement();
+	
+	this.saveRawData(encoder.ostream);
+	
 };
 
 ContentObject.prototype.getElementLabel= function(){return CCNProtocolDTags.ContentObject;};