@@ -7,10 +7,13 @@ git.repo( '../.git', function( err, repo ) {
     if( err ) { throw err; }
 
     branch.tree().each( function( i, entry ) {
-
       console.log( entry.name );
-      console.log( entry.content );
 
+      console.log( entry.contents );
+
+      var blob = git.blob( repo.repo );
+      entry.entry.toObject( blob.blob );
+      console.log( blob.blob.rawContent() );
     });
   });
 });
@@ -7,7 +7,7 @@ var _Blob = function( obj ) {
     self.repo = obj;
     self.blob = new git.raw.Blob( obj );
   }
-  else if ( obj instanceof git.raw.Blob ) {
+  else if( obj instanceof git.raw.Blob ) {
     self.blob = obj;
   }
 
@@ -18,7 +18,6 @@ var _Blob = function( obj ) {
     enumerable: true
   });
 
-
   self.lookup = function( oid ) {
     self.blob.lookup( self.repo, oid, function() {
       var args = Array.prototype.slice.call( arguments );
 
@@ -1,7 +1,7 @@
 var git = require( '../' );
 
 var _Commit = function( obj ) {
-  var self = {};
+  var self = { _cache: {} };
 
   if( obj instanceof git.raw.Repo ) {
     self.repo = obj;
@@ -36,7 +36,6 @@ var _Commit = function( obj ) {
     enumerable: true
   });
 
-
   Object.defineProperty( self, 'msg', {
     get: function() {
       return self.commit.messageShort();
 
@@ -4,7 +4,7 @@ var util = require( './util.js' ).util,
     error = require( './error.js' ).error,
     sig = require( './sig.js' ).sig,
     oid = require( './oid.js' ).oid,
-    oid = require( './obj.js' ).obj,
+    obj = require( './obj.js' ).obj,
     ref = require( './ref.js' ).ref,
     revwalk = require( './revwalk.js' ).revwalk,
     commit = require( './commit.js' ).commit,
 
@@ -3,6 +3,13 @@ var git = require( '../' );
 var _TreeEntry = function( obj ) {
   var self = {};
 
+  if( obj instanceof git.raw.TreeEntry ) {
+    self.entry = obj;
+  }
+  else {
+    self.entry = new git.raw.TreeEntry();
+  }
+
   Object.defineProperty( self, 'name', {
     get: function() {
       return self.entry.name();
@@ -12,27 +19,15 @@ var _TreeEntry = function( obj ) {
 
   Object.defineProperty( self, 'content', {
     get: function() {
-      var obj = git.obj(),
-          blob;
-
-      self.entry.toObject( obj.obj );
+      var blob = git.blob( self.repo );
 
-      blob = git.blob( obj.owner() );
-      blob.lookup( oid.oid );
+      self.entry.toObject( blob.blob );
 
-      return blob.content();
+      return blob.raw;
     },
     enumerable: true
   });
 
-  // Internal references to Git references
-  if ( obj instanceof git.raw.TreeEntry ) {
-    self.entry = obj;
-  }
-  else {
-    self.entry = new git.raw.TreeEntry();
-  }
-
   return self;
 };
 
 
@@ -74,7 +74,7 @@ Handle<Value> Blob::New(const Arguments& args) {
 Handle<Value> Blob::RawContent(const Arguments& args) {
   HandleScope scope;
 
-  Blob *blob = new Blob();
+  Blob *blob = ObjectWrap::Unwrap<Blob>(args.This());
 
   return String::New(blob->RawContent());
 }
 
@@ -9,8 +9,10 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 #include "../vendor/libgit2/src/git2.h"
 
 #include "repo.h"
+#include "blob.h"
 #include "tree.h"
 #include "object.h"
+#include "oid.h"
 #include "tree_entry.h"
 
 using namespace v8;
@@ -37,8 +39,12 @@ const char* GitTreeEntry::Name() {
   return git_tree_entry_name(this->entry);
 }
 
+const git_oid* GitTreeEntry::Id() {
+  return git_tree_entry_id(this->entry);
+}
+
 int GitTreeEntry::ToObject(git_object** obj) {
-  return git_tree_entry_2object(obj, entry);
+  return git_tree_entry_2object(obj, this->entry);
 }
 
 Handle<Value> GitTreeEntry::New(const Arguments& args) {
@@ -59,20 +65,36 @@ Handle<Value> GitTreeEntry::Name(const Arguments& args) {
   return String::New(entry->Name());
 }
 
+Handle<Value> GitTreeEntry::Id(const Arguments& args) {
+  HandleScope scope;
+
+  GitTreeEntry *entry = ObjectWrap::Unwrap<GitTreeEntry>(args.This());
+
+  if(args.Length() == 0 || !args[0]->IsObject()) {
+    return ThrowException(Exception::Error(String::New("Oid is required and must be an Object.")));
+  }
+
+  Oid* oid = ObjectWrap::Unwrap<Oid>(args[0]->ToObject());
+
+  oid->SetValue(const_cast<git_oid *>(entry->Id()));
+  
+  return Undefined();
+}
+
 Handle<Value> GitTreeEntry::ToObject(const Arguments& args) {
   HandleScope scope;
 
   GitTreeEntry *entry = ObjectWrap::Unwrap<GitTreeEntry>(args.This());
 
   if(args.Length() == 0 || !args[0]->IsObject()) {
-    return ThrowException(Exception::Error(String::New("Object is required and must be an Object.")));
+    return ThrowException(Exception::Error(String::New("Blob is required and must be an Object.")));
   }
 
-  GitObject*obj = ObjectWrap::Unwrap<GitObject>(args[0]->ToObject());
+  Blob* blob = ObjectWrap::Unwrap<Blob>(args[0]->ToObject());
 
   git_object* out;
   entry->ToObject(&out);
-  obj->SetValue(out);
+  blob->SetValue((git_blob *)out);
 
   return Undefined();
 }
 
@@ -13,6 +13,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include "repo.h"
 #include "tree.h"
+#include "oid.h"
 #include "object.h"
 
 using namespace v8;
@@ -49,11 +50,13 @@ class GitTreeEntry : EventEmitter {
      */
     void SetValue(git_tree_entry* tree);
     const char* Name();
+    const git_oid* Id();
     int ToObject(git_object** obj);
 
   protected:
     static Handle<Value> New(const Arguments& args);
     static Handle<Value> Name(const Arguments& args);
+    static Handle<Value> Id(const Arguments& args);
     static Handle<Value> ToObject(const Arguments& args);
 
   private:
Original file line number	Diff line number	Diff line change
@@ -7,7 +7,7 @@ var _Blob = function( obj ) {
7	7	self.repo = obj;
8	8	self.blob = new git.raw.Blob( obj );
9	9	}
10		- else if ( obj instanceof git.raw.Blob ) {
	10	+ else if( obj instanceof git.raw.Blob ) {
11	11	self.blob = obj;
12	12	}
13	13
@@ -18,7 +18,6 @@ var _Blob = function( obj ) {
18	18	enumerable: true
19	19	});
20	20
21		-
22	21	self.lookup = function( oid ) {
23	22	self.blob.lookup( self.repo, oid, function() {
24	23	var args = Array.prototype.slice.call( arguments );
Original file line number	Diff line number	Diff line change
@@ -74,7 +74,7 @@ Handle<Value> Blob::New(const Arguments& args) {
74	74	Handle<Value> Blob::RawContent(const Arguments& args) {
75	75	HandleScope scope;
76	76
77		- Blob *blob = new Blob();
	77	+ Blob *blob = ObjectWrap::Unwrap<Blob>(args.This());
78	78
79	79	return String::New(blob->RawContent());
80	80	}