@@ -39,10 +39,20 @@ void Worker::Join(void) {
 void Worker::_Run(void* data) {
   TaskQueue* queue = static_cast<TaskQueue*>(data);
   while (std::unique_ptr<Task> task = queue->BlockingPop()) {
+    task->UpdateState(Task::ASSIGNED);
     task->Run();
+    task->UpdateState(Task::COMPLETED);
   }
 }
 
+/**************
+ * Task
+ ***************/
+
+void Task::UpdateState(enum State state) {
+  state_ = state;
+}
+
 /**************
  * LibuvExecutor
  ***************/
@@ -139,8 +149,10 @@ bool TaskQueue::Push(std::unique_ptr<Task> task) {
     return false;
   }
 
+  task->UpdateState(Task::QUEUED);
   queue_.push(std::move(task));
   tasks_available_.Signal(scoped_lock);
+
   return true;
 }
 
 
@@ -73,17 +73,28 @@ class TaskDetails {
 //  - User work from the N-API
 class Task {
  public:
+  enum State {
+      QUEUED
+    , ASSIGNED
+    , COMPLETED
+  };
+
   Task() {}
   // Invoked after Run().
   virtual ~Task() {}
 
   // Invoked on some thread in the Threadpool.
   virtual void Run() = 0;
 
+  // Different Threadpool components should update this as the Task travels around.
+  void UpdateState(enum State state);
+
   // Run() can access details.
   // Should be set in subclass constructor.
   TaskDetails details_;
- private:
+
+ protected:
+  enum State state_;
 };
 
 // Shim that we plug into the libuv "pluggable TP" interface.