pj-nodegit 0.27.0 → 0.28.1

package/src/reference.cc

@@ -12,7 +12,6 @@ extern "C" {
 #include "../include/functions/copy.h"
 #include "../include/reference.h"
 #include "nodegit_wrapper.cc"
-#include "../include/async_libgit2_queue_worker.h"
 
   #include "../include/repository.h"
   #include "../include/oid.h"
@@ -29,54 +28,56 @@ using namespace node;
     // this will cause an error if you have a non-self-freeing object that also needs
     // to save values. Since the object that will eventually free the object has no
     // way of knowing to free these values.
-                                                                                                                                                     }
+                                                                                                                                                         }
 
-  void GitRefs::InitializeComponent(v8::Local<v8::Object> target) {
+  void GitRefs::InitializeComponent(v8::Local<v8::Object> target, nodegit::Context *nodegitContext) {
     Nan::HandleScope scope;
 
-    v8::Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction);
+    v8::Local<v8::External> nodegitExternal = Nan::New<v8::External>(nodegitContext);
+    v8::Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
     tpl->InstanceTemplate()->SetInternalFieldCount(1);
     tpl->SetClassName(Nan::New("Reference").ToLocalChecked());
 
-          Nan::SetPrototypeMethod(tpl, "cmp", Cmp);
-             Nan::SetMethod(tpl, "create", Create);
-             Nan::SetMethod(tpl, "createMatching", CreateMatching);
-            Nan::SetPrototypeMethod(tpl, "delete", Delete);
-            Nan::SetPrototypeMethod(tpl, "dup", Dup);
-             Nan::SetMethod(tpl, "dwim", Dwim);
-             Nan::SetMethod(tpl, "ensureLog", EnsureLog);
-             Nan::SetMethod(tpl, "hasLog", HasLog);
-            Nan::SetPrototypeMethod(tpl, "isBranch", IsBranch);
-            Nan::SetPrototypeMethod(tpl, "isNote", IsNote);
-            Nan::SetPrototypeMethod(tpl, "isRemote", IsRemote);
-            Nan::SetPrototypeMethod(tpl, "isTag", IsTag);
-             Nan::SetMethod(tpl, "isValidName", IsValidName);
-             Nan::SetMethod(tpl, "list", List);
-             Nan::SetMethod(tpl, "lookup", Lookup);
-            Nan::SetPrototypeMethod(tpl, "name", Name);
-             Nan::SetMethod(tpl, "nameToId", NameToId);
-             Nan::SetMethod(tpl, "normalizeName", NormalizeName);
-            Nan::SetPrototypeMethod(tpl, "owner", Owner);
-            Nan::SetPrototypeMethod(tpl, "peel", Peel);
-             Nan::SetMethod(tpl, "remove", Remove);
-            Nan::SetPrototypeMethod(tpl, "rename", Rename);
-            Nan::SetPrototypeMethod(tpl, "resolve", Resolve);
-            Nan::SetPrototypeMethod(tpl, "setTarget", SetTarget);
-            Nan::SetPrototypeMethod(tpl, "shorthand", Shorthand);
-             Nan::SetMethod(tpl, "symbolicCreate", SymbolicCreate);
-             Nan::SetMethod(tpl, "symbolicCreateMatching", SymbolicCreateMatching);
-            Nan::SetPrototypeMethod(tpl, "symbolicSetTarget", SymbolicSetTarget);
-            Nan::SetPrototypeMethod(tpl, "symbolicTarget", SymbolicTarget);
-            Nan::SetPrototypeMethod(tpl, "target", Target);
-            Nan::SetPrototypeMethod(tpl, "targetPeel", TargetPeel);
-            Nan::SetPrototypeMethod(tpl, "type", Type);
+          Nan::SetPrototypeMethod(tpl, "cmp", Cmp, nodegitExternal);
+             Nan::SetMethod(tpl, "create", Create, nodegitExternal);
+             Nan::SetMethod(tpl, "createMatching", CreateMatching, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "delete", Delete, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "dup", Dup, nodegitExternal);
+             Nan::SetMethod(tpl, "dwim", Dwim, nodegitExternal);
+             Nan::SetMethod(tpl, "ensureLog", EnsureLog, nodegitExternal);
+             Nan::SetMethod(tpl, "hasLog", HasLog, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "isBranch", IsBranch, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "isNote", IsNote, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "isRemote", IsRemote, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "isTag", IsTag, nodegitExternal);
+             Nan::SetMethod(tpl, "isValidName", IsValidName, nodegitExternal);
+             Nan::SetMethod(tpl, "list", List, nodegitExternal);
+             Nan::SetMethod(tpl, "lookup", Lookup, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "name", Name, nodegitExternal);
+             Nan::SetMethod(tpl, "nameIsValid", NameIsValid, nodegitExternal);
+             Nan::SetMethod(tpl, "nameToId", NameToId, nodegitExternal);
+             Nan::SetMethod(tpl, "normalizeName", NormalizeName, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "owner", Owner, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "peel", Peel, nodegitExternal);
+             Nan::SetMethod(tpl, "remove", Remove, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "rename", Rename, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "resolve", Resolve, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "setTarget", SetTarget, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "shorthand", Shorthand, nodegitExternal);
+             Nan::SetMethod(tpl, "symbolicCreate", SymbolicCreate, nodegitExternal);
+             Nan::SetMethod(tpl, "symbolicCreateMatching", SymbolicCreateMatching, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "symbolicSetTarget", SymbolicSetTarget, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "symbolicTarget", SymbolicTarget, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "target", Target, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "targetPeel", TargetPeel, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "type", Type, nodegitExternal);
     
     InitializeTemplate(tpl);
 
-    v8::Local<Function> _constructor_template = Nan::GetFunction(tpl).ToLocalChecked();
-    constructor_template.Reset(_constructor_template);
-    Nan::Set(target, Nan::New("Reference").ToLocalChecked(), _constructor_template);
+    v8::Local<Function> constructor_template = Nan::GetFunction(tpl).ToLocalChecked();
+    nodegitContext->SaveToPersistent("GitRefs::Template", constructor_template);
+    Nan::Set(target, Nan::New("Reference").ToLocalChecked(), constructor_template);
   }
 
   
@@ -98,7 +99,7 @@ from_ref2 = Nan::ObjectWrap::Unwrap<GitRefs>(Nan::To<v8::Object>(info[0]).ToLoca
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -112,11 +113,11 @@ from_ref2 = Nan::ObjectWrap::Unwrap<GitRefs>(Nan::To<v8::Object>(info[0]).ToLoca
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -150,15 +151,19 @@ NAN_METHOD(GitRefs::Create) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 5 || !info[5]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  CreateBaton* baton = new CreateBaton;
+  CreateBaton* baton = new CreateBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -223,36 +228,34 @@ from_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[2]).ToLocalCh
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[5]));
-  CreateWorker *worker = new CreateWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-        if (!info[2]->IsUndefined() && !info[2]->IsNull())
-          worker->SaveToPersistent("id", Nan::To<v8::Object>(info[2]).ToLocalChecked());
-        if (!info[3]->IsUndefined() && !info[3]->IsNull())
-          worker->SaveToPersistent("force", Nan::To<v8::Object>(info[3]).ToLocalChecked());
-        if (!info[4]->IsUndefined() && !info[4]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[4]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  CreateWorker *worker = new CreateWorker(baton, callback, cleanupHandles);
+
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+              worker->Reference<GitOid>("id", info[2]);
+             worker->Reference("force", info[3]);
+            worker->Reference("log_message", info[4]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::CreateWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->name
+          ,baton->id
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::CreateWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->name
-            ,baton->id
-            ,baton->log_message
-    );
-
     int result = git_reference_create(
 &baton->out,baton->repo,baton->name,baton->id,baton->force,baton->log_message  );
 
@@ -262,12 +265,38 @@ void GitRefs::CreateWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::CreateWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.create").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      free(baton->out);
+      if (baton->idNeedsFree) {
+        baton->idNeedsFree = false;
+        free((void *)baton->id);
+      }
+
+  delete baton;
 }
 
 void GitRefs::CreateWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -279,18 +308,18 @@ void GitRefs::CreateWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+             
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -314,49 +343,15 @@ void GitRefs::CreateWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
-              workerArguments.push(GetFromPersistent("id"));
-              workerArguments.push(GetFromPersistent("force"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -373,6 +368,7 @@ void GitRefs::CreateWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        free(baton->out);
   }
 
       if (baton->idNeedsFree) {
@@ -419,15 +415,19 @@ NAN_METHOD(GitRefs::CreateMatching) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 6 || !info[6]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  CreateMatchingBaton* baton = new CreateMatchingBaton;
+  CreateMatchingBaton* baton = new CreateMatchingBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -517,39 +517,36 @@ from_current_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[4]).T
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[6]));
-  CreateMatchingWorker *worker = new CreateMatchingWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-        if (!info[2]->IsUndefined() && !info[2]->IsNull())
-          worker->SaveToPersistent("id", Nan::To<v8::Object>(info[2]).ToLocalChecked());
-        if (!info[3]->IsUndefined() && !info[3]->IsNull())
-          worker->SaveToPersistent("force", Nan::To<v8::Object>(info[3]).ToLocalChecked());
-        if (!info[4]->IsUndefined() && !info[4]->IsNull())
-          worker->SaveToPersistent("current_id", Nan::To<v8::Object>(info[4]).ToLocalChecked());
-        if (!info[5]->IsUndefined() && !info[5]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[5]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  CreateMatchingWorker *worker = new CreateMatchingWorker(baton, callback, cleanupHandles);
+
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+              worker->Reference<GitOid>("id", info[2]);
+             worker->Reference("force", info[3]);
+              worker->Reference<GitOid>("current_id", info[4]);
+             worker->Reference("log_message", info[5]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::CreateMatchingWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->name
+          ,baton->id
+          ,baton->current_id
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::CreateMatchingWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->name
-            ,baton->id
-            ,baton->current_id
-            ,baton->log_message
-    );
-
     int result = git_reference_create_matching(
 &baton->out,baton->repo,baton->name,baton->id,baton->force,baton->current_id,baton->log_message  );
 
@@ -559,12 +556,42 @@ void GitRefs::CreateMatchingWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::CreateMatchingWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.createMatching").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      free(baton->out);
+      if (baton->idNeedsFree) {
+        baton->idNeedsFree = false;
+        free((void *)baton->id);
+      }
+      if (baton->current_idNeedsFree) {
+        baton->current_idNeedsFree = false;
+        free((void *)baton->current_id);
+      }
+
+  delete baton;
 }
 
 void GitRefs::CreateMatchingWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -576,18 +603,18 @@ void GitRefs::CreateMatchingWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+               
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -611,50 +638,15 @@ void GitRefs::CreateMatchingWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
-              workerArguments.push(GetFromPersistent("id"));
-              workerArguments.push(GetFromPersistent("force"));
-              workerArguments.push(GetFromPersistent("current_id"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -671,6 +663,7 @@ void GitRefs::CreateMatchingWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        free(baton->out);
   }
 
       if (baton->idNeedsFree) {
@@ -695,7 +688,7 @@ NAN_METHOD(GitRefs::Delete) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -706,11 +699,11 @@ NAN_METHOD(GitRefs::Delete) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -719,35 +712,42 @@ NAN_METHOD(GitRefs::Delete) {
    */
 NAN_METHOD(GitRefs::Dup) {
 
-  if (info.Length() == 0 || !info[0]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  DupBaton* baton = new DupBaton;
+  DupBaton* baton = new DupBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->source = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[0]));
-  DupWorker *worker = new DupWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  DupWorker *worker = new DupWorker(baton, callback, cleanupHandles);
 
-        worker->SaveToPersistent("source", info.This());
+        worker->Reference<GitRefs>("source", info.This());
 
-  AsyncLibgit2QueueWorker(worker);
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::DupWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->source
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::DupWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->source
-    );
-
     int result = git_reference_dup(
 &baton->dest,baton->source  );
 
@@ -757,12 +757,34 @@ void GitRefs::DupWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::DupWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.dup").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      free(baton->dest);
+
+  delete baton;
 }
 
 void GitRefs::DupWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->dest != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -774,18 +796,18 @@ void GitRefs::DupWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->dest,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+     
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -809,44 +831,15 @@ void GitRefs::DupWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -863,6 +856,7 @@ void GitRefs::DupWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        free(baton->dest);
   }
 
 
@@ -885,15 +879,19 @@ NAN_METHOD(GitRefs::Dwim) {
     return Nan::ThrowError("String shorthand is required.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  DwimBaton* baton = new DwimBaton;
+  DwimBaton* baton = new DwimBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -914,28 +912,29 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->shorthand = from_shorthand;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[2]));
-  DwimWorker *worker = new DwimWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("shorthand", Nan::To<v8::Object>(info[1]).ToLocalChecked());
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  DwimWorker *worker = new DwimWorker(baton, callback, cleanupHandles);
 
-  AsyncLibgit2QueueWorker(worker);
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("shorthand", info[1]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::DwimWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->shorthand
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::DwimWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->shorthand
-    );
-
     int result = git_reference_dwim(
 &baton->out,baton->repo,baton->shorthand  );
 
@@ -945,12 +944,34 @@ void GitRefs::DwimWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::DwimWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.dwim").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::DwimWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -962,18 +983,18 @@ void GitRefs::DwimWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+       
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -997,46 +1018,15 @@ void GitRefs::DwimWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("shorthand"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -1053,6 +1043,7 @@ void GitRefs::DwimWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        free(baton->out);
   }
 
 
@@ -1096,7 +1087,7 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_repo
@@ -1110,11 +1101,11 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1154,7 +1145,7 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_repo
@@ -1168,11 +1159,11 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1185,7 +1176,7 @@ NAN_METHOD(GitRefs::IsBranch) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -1196,11 +1187,11 @@ NAN_METHOD(GitRefs::IsBranch) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1213,7 +1204,7 @@ NAN_METHOD(GitRefs::IsNote) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -1224,11 +1215,11 @@ NAN_METHOD(GitRefs::IsNote) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1241,7 +1232,7 @@ NAN_METHOD(GitRefs::IsRemote) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -1252,11 +1243,11 @@ NAN_METHOD(GitRefs::IsRemote) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1269,7 +1260,7 @@ NAN_METHOD(GitRefs::IsTag) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -1280,11 +1271,11 @@ NAN_METHOD(GitRefs::IsTag) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1315,7 +1306,7 @@ NAN_METHOD(GitRefs::IsValidName) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_refname
@@ -1326,11 +1317,11 @@ NAN_METHOD(GitRefs::IsValidName) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -1344,15 +1335,19 @@ NAN_METHOD(GitRefs::List) {
     return Nan::ThrowError("Repository repo is required.");
   }
 
-  if (info.Length() == 1 || !info[1]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  ListBaton* baton = new ListBaton;
+  ListBaton* baton = new ListBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
       baton->array = (git_strarray *)malloc(sizeof(git_strarray ));
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
@@ -1360,26 +1355,28 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->repo = from_repo;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[1]));
-  ListWorker *worker = new ListWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  ListWorker *worker = new ListWorker(baton, callback, cleanupHandles);
 
-  AsyncLibgit2QueueWorker(worker);
+             worker->Reference<GitRepository>("repo", info[0]);
+  
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::ListWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->array
+          ,baton->repo
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::ListWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->array
-            ,baton->repo
-    );
-
     int result = git_reference_list(
 baton->array,baton->repo  );
 
@@ -1389,22 +1386,44 @@ baton->array,baton->repo  );
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::ListWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.list").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+        free((void*)baton->array);
+
+  delete baton;
 }
 
 void GitRefs::ListWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     v8::Local<Array> tmpArray = Nan::New<Array>(baton->array->count);
     for (unsigned int i = 0; i < baton->array->count; i++) {
       Nan::Set(tmpArray, Nan::New<Number>(i), Nan::New<v8::String>(baton->array->strings[i]).ToLocalChecked());
     }
  
-  to = tmpArray;
+  v8ConversionSlot = tmpArray;
  // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+     
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -1428,45 +1447,15 @@ void GitRefs::ListWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -1486,7 +1475,6 @@ void GitRefs::ListWorker::HandleOKCallback() {
           free((void*)baton->array);
   }
 
-        free((void *)baton->array);
 
   delete baton;
 }
@@ -1507,15 +1495,19 @@ NAN_METHOD(GitRefs::Lookup) {
     return Nan::ThrowError("String name is required.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  LookupBaton* baton = new LookupBaton;
+  LookupBaton* baton = new LookupBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -1536,28 +1528,29 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->name = from_name;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[2]));
-  LookupWorker *worker = new LookupWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  LookupWorker *worker = new LookupWorker(baton, callback, cleanupHandles);
 
-  AsyncLibgit2QueueWorker(worker);
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::LookupWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->name
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::LookupWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->name
-    );
-
     int result = git_reference_lookup(
 &baton->out,baton->repo,baton->name  );
 
@@ -1567,12 +1560,34 @@ void GitRefs::LookupWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::LookupWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.lookup").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      git_reference_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::LookupWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -1584,18 +1599,18 @@ void GitRefs::LookupWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+       
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -1619,46 +1634,15 @@ void GitRefs::LookupWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -1675,6 +1659,7 @@ void GitRefs::LookupWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
 
@@ -1691,7 +1676,7 @@ NAN_METHOD(GitRefs::Name) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -1706,17 +1691,75 @@ NAN_METHOD(GitRefs::Name) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
   if (result){
-       to = Nan::New<v8::String>(result).ToLocalChecked();
+       v8ConversionSlot = Nan::New<v8::String>(result).ToLocalChecked();
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
 
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
+  }
+}
+   
+/*
+ * @param Number valid
+   * @param String refname
+     * @return Number  result    */
+NAN_METHOD(GitRefs::NameIsValid) {
+  Nan::EscapableHandleScope scope;
+
+  if (info.Length() == 0 || !info[0]->IsNumber()) {
+    return Nan::ThrowError("Number valid is required.");
+  }
+
+  if (info.Length() == 1 || !info[1]->IsString()) {
+    return Nan::ThrowError("String refname is required.");
+  }
+
+// start convert_from_v8 block
+  int * from_valid = NULL;
+      *from_valid = (int)   info[0].As<v8::Number>()->Value();
+// end convert_from_v8 block
+// start convert_from_v8 block
+  const char * from_refname = NULL;
+
+  Nan::Utf8String refname(Nan::To<v8::String>(info[1]).ToLocalChecked());
+  // malloc with one extra byte so we can add the terminating null character C-strings expect:
+  from_refname = (const char *) malloc(refname.length() + 1);
+  // copy the characters from the nodejs string into our C-string (used instead of strdup or strcpy because nulls in
+  // the middle of strings are valid coming from nodejs):
+  memcpy((void *)from_refname, *refname, refname.length());
+  // ensure the final byte of our new string is null, extra casts added to ensure compatibility with various C types
+  // used in the nodejs binding generation:
+  memset((void *)(((char *)from_refname) + refname.length()), 0, 1);
+// end convert_from_v8 block
+
+  git_error_clear();
+
+  { // lock master scope start
+    nodegit::LockMaster lockMaster(
+      /*asyncAction: */false
+            ,
+              from_valid
+            ,
+              from_refname
+    );
+
+ int result =     git_reference_name_is_valid(
+          from_valid
+,          from_refname
+    );
+
+
+      v8::Local<v8::Value> v8ConversionSlot;
+// start convert_to_v8 block
+     v8ConversionSlot = Nan::New<Number>( result);
+  // end convert_to_v8 block
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -1735,15 +1778,19 @@ NAN_METHOD(GitRefs::NameToId) {
     return Nan::ThrowError("String name is required.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  NameToIdBaton* baton = new NameToIdBaton;
+  NameToIdBaton* baton = new NameToIdBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
       baton->out = (git_oid *)malloc(sizeof(git_oid ));
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
@@ -1765,29 +1812,30 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->name = from_name;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[2]));
-  NameToIdWorker *worker = new NameToIdWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  NameToIdWorker *worker = new NameToIdWorker(baton, callback, cleanupHandles);
 
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::NameToIdWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->out
+          ,baton->repo
+          ,baton->name
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::NameToIdWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->out
-            ,baton->repo
-            ,baton->name
-    );
-
     int result = git_reference_name_to_id(
 baton->out,baton->repo,baton->name  );
 
@@ -1797,25 +1845,46 @@ baton->out,baton->repo,baton->name  );
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::NameToIdWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.nameToId").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+
+  delete baton;
 }
 
 void GitRefs::NameToIdWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
-        to = GitOid::New(
+        v8ConversionSlot = GitOid::New(
         baton->out,
         true
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+       
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -1839,46 +1908,15 @@ void GitRefs::NameToIdWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -1965,7 +2003,7 @@ NAN_METHOD(GitRefs::NormalizeName) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_buffer_out
@@ -1981,11 +2019,11 @@ NAN_METHOD(GitRefs::NormalizeName) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -1998,7 +2036,7 @@ NAN_METHOD(GitRefs::Owner) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -2013,19 +2051,19 @@ NAN_METHOD(GitRefs::Owner) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (result != NULL) {
-        to = GitRepository::New(
+        v8ConversionSlot = GitRepository::New(
         result,
         true
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -2039,15 +2077,19 @@ NAN_METHOD(GitRefs::Peel) {
     return Nan::ThrowError("Number type is required.");
   }
 
-  if (info.Length() == 1 || !info[1]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  PeelBaton* baton = new PeelBaton;
+  PeelBaton* baton = new PeelBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->ref = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 // start convert_from_v8 block
   git_object_t from_type;
@@ -2055,26 +2097,28 @@ NAN_METHOD(GitRefs::Peel) {
 // end convert_from_v8 block
           baton->type = from_type;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[1]));
-  PeelWorker *worker = new PeelWorker(baton, callback);
-
-        worker->SaveToPersistent("ref", info.This());
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("type", Nan::To<v8::Object>(info[0]).ToLocalChecked());
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  PeelWorker *worker = new PeelWorker(baton, callback, cleanupHandles);
 
-  AsyncLibgit2QueueWorker(worker);
+        worker->Reference<GitRefs>("ref", info.This());
+           worker->Reference("type", info[0]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::PeelWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->ref
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::PeelWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->ref
-    );
-
     int result = git_reference_peel(
 &baton->out,baton->ref,baton->type  );
 
@@ -2084,12 +2128,34 @@ void GitRefs::PeelWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::PeelWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.peel").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      git_object_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::PeelWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -2101,18 +2167,18 @@ void GitRefs::PeelWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitObject::New(
+         v8ConversionSlot = GitObject::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+       
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -2136,45 +2202,15 @@ void GitRefs::PeelWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("type"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -2191,6 +2227,7 @@ void GitRefs::PeelWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_object_free(baton->out);
   }
 
 
@@ -2234,7 +2271,7 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_repo
@@ -2248,11 +2285,11 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -2276,15 +2313,19 @@ NAN_METHOD(GitRefs::Rename) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 3 || !info[3]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  RenameBaton* baton = new RenameBaton;
+  RenameBaton* baton = new RenameBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->ref = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 // start convert_from_v8 block
   const char * from_new_name = NULL;
@@ -2320,32 +2361,32 @@ NAN_METHOD(GitRefs::Rename) {
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[3]));
-  RenameWorker *worker = new RenameWorker(baton, callback);
-
-        worker->SaveToPersistent("ref", info.This());
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("new_name", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("force", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-        if (!info[2]->IsUndefined() && !info[2]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[2]).ToLocalChecked());
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  RenameWorker *worker = new RenameWorker(baton, callback, cleanupHandles);
 
-  AsyncLibgit2QueueWorker(worker);
+        worker->Reference<GitRefs>("ref", info.This());
+           worker->Reference("new_name", info[0]);
+            worker->Reference("force", info[1]);
+            worker->Reference("log_message", info[2]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::RenameWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->ref
+          ,baton->new_name
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::RenameWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->ref
-            ,baton->new_name
-            ,baton->log_message
-    );
-
     int result = git_reference_rename(
 &baton->new_ref,baton->ref,baton->new_name,baton->force,baton->log_message  );
 
@@ -2355,12 +2396,34 @@ void GitRefs::RenameWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::RenameWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.rename").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      git_reference_free(baton->new_ref);
+
+  delete baton;
 }
 
 void GitRefs::RenameWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->new_ref != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -2372,18 +2435,18 @@ void GitRefs::RenameWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->new_ref,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+           
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -2407,47 +2470,15 @@ void GitRefs::RenameWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("new_name"));
-              workerArguments.push(GetFromPersistent("force"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -2464,6 +2495,7 @@ void GitRefs::RenameWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->new_ref);
   }
 
 
@@ -2476,35 +2508,42 @@ void GitRefs::RenameWorker::HandleOKCallback() {
    */
 NAN_METHOD(GitRefs::Resolve) {
 
-  if (info.Length() == 0 || !info[0]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  ResolveBaton* baton = new ResolveBaton;
+  ResolveBaton* baton = new ResolveBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->ref = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[0]));
-  ResolveWorker *worker = new ResolveWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  ResolveWorker *worker = new ResolveWorker(baton, callback, cleanupHandles);
 
-        worker->SaveToPersistent("ref", info.This());
+        worker->Reference<GitRefs>("ref", info.This());
 
-  AsyncLibgit2QueueWorker(worker);
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::ResolveWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->ref
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::ResolveWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->ref
-    );
-
     int result = git_reference_resolve(
 &baton->out,baton->ref  );
 
@@ -2514,12 +2553,34 @@ void GitRefs::ResolveWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::ResolveWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.resolve").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      git_reference_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::ResolveWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -2531,18 +2592,18 @@ void GitRefs::ResolveWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+     
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -2566,44 +2627,15 @@ void GitRefs::ResolveWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -2620,6 +2652,7 @@ void GitRefs::ResolveWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
 
@@ -2642,15 +2675,19 @@ NAN_METHOD(GitRefs::SetTarget) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  SetTargetBaton* baton = new SetTargetBaton;
+  SetTargetBaton* baton = new SetTargetBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->ref = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 // start convert_from_v8 block
   const git_oid * from_id = NULL;
@@ -2692,30 +2729,31 @@ from_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[0]).ToLocalCh
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[2]));
-  SetTargetWorker *worker = new SetTargetWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  SetTargetWorker *worker = new SetTargetWorker(baton, callback, cleanupHandles);
 
-        worker->SaveToPersistent("ref", info.This());
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("id", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+        worker->Reference<GitRefs>("ref", info.This());
+             worker->Reference<GitOid>("id", info[0]);
+             worker->Reference("log_message", info[1]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::SetTargetWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->ref
+          ,baton->id
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::SetTargetWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->ref
-            ,baton->id
-            ,baton->log_message
-    );
-
     int result = git_reference_set_target(
 &baton->out,baton->ref,baton->id,baton->log_message  );
 
@@ -2725,12 +2763,38 @@ void GitRefs::SetTargetWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::SetTargetWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.setTarget").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+      git_reference_free(baton->out);
+      if (baton->idNeedsFree) {
+        baton->idNeedsFree = false;
+        free((void *)baton->id);
+      }
+
+  delete baton;
 }
 
 void GitRefs::SetTargetWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -2742,18 +2806,18 @@ void GitRefs::SetTargetWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+         
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -2777,46 +2841,15 @@ void GitRefs::SetTargetWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("id"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -2833,6 +2866,7 @@ void GitRefs::SetTargetWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
       if (baton->idNeedsFree) {
@@ -2853,7 +2887,7 @@ NAN_METHOD(GitRefs::Shorthand) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -2868,17 +2902,17 @@ NAN_METHOD(GitRefs::Shorthand) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
   if (result){
-       to = Nan::New<v8::String>(result).ToLocalChecked();
+       v8ConversionSlot = Nan::New<v8::String>(result).ToLocalChecked();
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
 
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -2912,15 +2946,19 @@ NAN_METHOD(GitRefs::SymbolicCreate) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 5 || !info[5]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  SymbolicCreateBaton* baton = new SymbolicCreateBaton;
+  SymbolicCreateBaton* baton = new SymbolicCreateBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -2974,36 +3012,34 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[5]));
-  SymbolicCreateWorker *worker = new SymbolicCreateWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-        if (!info[2]->IsUndefined() && !info[2]->IsNull())
-          worker->SaveToPersistent("target", Nan::To<v8::Object>(info[2]).ToLocalChecked());
-        if (!info[3]->IsUndefined() && !info[3]->IsNull())
-          worker->SaveToPersistent("force", Nan::To<v8::Object>(info[3]).ToLocalChecked());
-        if (!info[4]->IsUndefined() && !info[4]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[4]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  SymbolicCreateWorker *worker = new SymbolicCreateWorker(baton, callback, cleanupHandles);
+
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+            worker->Reference("target", info[2]);
+            worker->Reference("force", info[3]);
+            worker->Reference("log_message", info[4]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::SymbolicCreateWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->name
+          ,baton->target
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::SymbolicCreateWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->name
-            ,baton->target
-            ,baton->log_message
-    );
-
     int result = git_reference_symbolic_create(
 &baton->out,baton->repo,baton->name,baton->target,baton->force,baton->log_message  );
 
@@ -3013,12 +3049,34 @@ void GitRefs::SymbolicCreateWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::SymbolicCreateWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.symbolicCreate").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      git_reference_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::SymbolicCreateWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -3030,18 +3088,18 @@ void GitRefs::SymbolicCreateWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+             
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -3065,49 +3123,15 @@ void GitRefs::SymbolicCreateWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
-              workerArguments.push(GetFromPersistent("target"));
-              workerArguments.push(GetFromPersistent("force"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -3124,6 +3148,7 @@ void GitRefs::SymbolicCreateWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
 
@@ -3166,15 +3191,19 @@ NAN_METHOD(GitRefs::SymbolicCreateMatching) {
     return Nan::ThrowError("String log_message is required.");
   }
 
-  if (info.Length() == 6 || !info[6]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  SymbolicCreateMatchingBaton* baton = new SymbolicCreateMatchingBaton;
+  SymbolicCreateMatchingBaton* baton = new SymbolicCreateMatchingBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
 // start convert_from_v8 block
   git_repository * from_repo = NULL;
 from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
@@ -3242,39 +3271,36 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[6]));
-  SymbolicCreateMatchingWorker *worker = new SymbolicCreateMatchingWorker(baton, callback);
-
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("name", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-        if (!info[2]->IsUndefined() && !info[2]->IsNull())
-          worker->SaveToPersistent("target", Nan::To<v8::Object>(info[2]).ToLocalChecked());
-        if (!info[3]->IsUndefined() && !info[3]->IsNull())
-          worker->SaveToPersistent("force", Nan::To<v8::Object>(info[3]).ToLocalChecked());
-        if (!info[4]->IsUndefined() && !info[4]->IsNull())
-          worker->SaveToPersistent("current_value", Nan::To<v8::Object>(info[4]).ToLocalChecked());
-        if (!info[5]->IsUndefined() && !info[5]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[5]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  SymbolicCreateMatchingWorker *worker = new SymbolicCreateMatchingWorker(baton, callback, cleanupHandles);
+
+             worker->Reference<GitRepository>("repo", info[0]);
+             worker->Reference("name", info[1]);
+            worker->Reference("target", info[2]);
+            worker->Reference("force", info[3]);
+            worker->Reference("current_value", info[4]);
+            worker->Reference("log_message", info[5]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::SymbolicCreateMatchingWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->repo
+          ,baton->name
+          ,baton->target
+          ,baton->current_value
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::SymbolicCreateMatchingWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->repo
-            ,baton->name
-            ,baton->target
-            ,baton->current_value
-            ,baton->log_message
-    );
-
     int result = git_reference_symbolic_create_matching(
 &baton->out,baton->repo,baton->name,baton->target,baton->force,baton->current_value,baton->log_message  );
 
@@ -3284,12 +3310,34 @@ void GitRefs::SymbolicCreateMatchingWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::SymbolicCreateMatchingWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.symbolicCreateMatching").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      git_reference_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::SymbolicCreateMatchingWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -3301,18 +3349,18 @@ void GitRefs::SymbolicCreateMatchingWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+               
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -3336,50 +3384,15 @@ void GitRefs::SymbolicCreateMatchingWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("repo"));
-              workerArguments.push(GetFromPersistent("name"));
-              workerArguments.push(GetFromPersistent("target"));
-              workerArguments.push(GetFromPersistent("force"));
-              workerArguments.push(GetFromPersistent("current_value"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -3396,6 +3409,7 @@ void GitRefs::SymbolicCreateMatchingWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
 
@@ -3414,15 +3428,19 @@ NAN_METHOD(GitRefs::SymbolicSetTarget) {
     return Nan::ThrowError("String target is required.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  SymbolicSetTargetBaton* baton = new SymbolicSetTargetBaton;
+  SymbolicSetTargetBaton* baton = new SymbolicSetTargetBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
         baton->ref = Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue();
 // start convert_from_v8 block
   const char * from_target = NULL;
@@ -3440,7 +3458,7 @@ NAN_METHOD(GitRefs::SymbolicSetTarget) {
           baton->target = from_target;
 // start convert_from_v8 block
   const char * from_log_message = NULL;
-    if (info[1]->IsString()) {
+    if ((info.Length() - 1) > 1 && info[1]->IsString()) {
 
   Nan::Utf8String log_message(Nan::To<v8::String>(info[1]).ToLocalChecked());
   // malloc with one extra byte so we can add the terminating null character C-strings expect:
@@ -3458,30 +3476,31 @@ NAN_METHOD(GitRefs::SymbolicSetTarget) {
 // end convert_from_v8 block
           baton->log_message = from_log_message;
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[2]));
-  SymbolicSetTargetWorker *worker = new SymbolicSetTargetWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  SymbolicSetTargetWorker *worker = new SymbolicSetTargetWorker(baton, callback, cleanupHandles);
 
-        worker->SaveToPersistent("ref", info.This());
-        if (!info[0]->IsUndefined() && !info[0]->IsNull())
-          worker->SaveToPersistent("target", Nan::To<v8::Object>(info[0]).ToLocalChecked());
-        if (!info[1]->IsUndefined() && !info[1]->IsNull())
-          worker->SaveToPersistent("log_message", Nan::To<v8::Object>(info[1]).ToLocalChecked());
-
-  AsyncLibgit2QueueWorker(worker);
+        worker->Reference<GitRefs>("ref", info.This());
+           worker->Reference("target", info[0]);
+            worker->Reference("log_message", info[1]);
+ 
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRefs::SymbolicSetTargetWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->ref
+          ,baton->target
+          ,baton->log_message
+  );
+
+  return lockMaster;
+}
+
 void GitRefs::SymbolicSetTargetWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->ref
-            ,baton->target
-            ,baton->log_message
-    );
-
     int result = git_reference_symbolic_set_target(
 &baton->out,baton->ref,baton->target,baton->log_message  );
 
@@ -3491,12 +3510,34 @@ void GitRefs::SymbolicSetTargetWorker::Execute() {
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRefs::SymbolicSetTargetWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Reference.symbolicSetTarget").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
   }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+      git_reference_free(baton->out);
+
+  delete baton;
 }
 
 void GitRefs::SymbolicSetTargetWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -3508,18 +3549,18 @@ void GitRefs::SymbolicSetTargetWorker::HandleOKCallback() {
             true
           )).ToLocalChecked()
         );
-         to = GitRefs::New(
+         v8ConversionSlot = GitRefs::New(
         baton->out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+         
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -3543,46 +3584,15 @@ void GitRefs::SymbolicSetTargetWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
-              workerArguments.push(GetFromPersistent("target"));
-              workerArguments.push(GetFromPersistent("log_message"));
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -3599,6 +3609,7 @@ void GitRefs::SymbolicSetTargetWorker::HandleOKCallback() {
       callback->Call(0, NULL, async_resource);
     }
 
+        git_reference_free(baton->out);
   }
 
 
@@ -3615,7 +3626,7 @@ NAN_METHOD(GitRefs::SymbolicTarget) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -3630,17 +3641,17 @@ NAN_METHOD(GitRefs::SymbolicTarget) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
   if (result){
-       to = Nan::New<v8::String>(result).ToLocalChecked();
+       v8ConversionSlot = Nan::New<v8::String>(result).ToLocalChecked();
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
 
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -3653,7 +3664,7 @@ NAN_METHOD(GitRefs::Target) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -3668,22 +3679,22 @@ NAN_METHOD(GitRefs::Target) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (result != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
             Nan::Set(owners, owners->Length(), info.This());
-          to = GitOid::New(
+          v8ConversionSlot = GitOid::New(
         result,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -3696,7 +3707,7 @@ NAN_METHOD(GitRefs::TargetPeel) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -3711,22 +3722,22 @@ NAN_METHOD(GitRefs::TargetPeel) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (result != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
             Nan::Set(owners, owners->Length(), info.This());
-          to = GitOid::New(
+          v8ConversionSlot = GitOid::New(
         result,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -3739,7 +3750,7 @@ NAN_METHOD(GitRefs::Type) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRefs>(info.This())->GetValue()
@@ -3750,11 +3761,11 @@ NAN_METHOD(GitRefs::Type) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
     // force base class template instantiation, to make sure we get all the