diff --git a/src/fetcher.cc b/src/fetcher.cc
index d0a6788..1cb07d9 100644
--- a/src/fetcher.cc
+++ b/src/fetcher.cc
@@ -27,11 +27,10 @@
 using namespace boost;
 using namespace std;
 
-Fetcher::Fetcher (Ccnx::CcnxWrapperPtr ccnx, SchedulerPtr scheduler,
+Fetcher::Fetcher (FetchManager &fetchManger,
                   const Ccnx::Name &name, int32_t minSeqNo, int32_t maxSeqNo,
                   const Ccnx::Name &forwardingHint/* = Ccnx::Name ()*/)
-  : m_ccnx (ccnx)
-  , m_scheduler (scheduler)
+  : m_fetchManager (fetchManger)
   , m_name (name)
   , m_forwardingHint (forwardingHint)
   , m_minSendSeqNo (-1)
diff --git a/src/fetcher.h b/src/fetcher.h
index fba4f29..46faf2e 100644
--- a/src/fetcher.h
+++ b/src/fetcher.h
@@ -25,17 +25,25 @@
 #include "ccnx-wrapper.h"
 #include "scheduler.h"
 
+class FetchManager;
+
 class Fetcher 
 {
 public:
-  Fetcher (Ccnx::CcnxWrapperPtr ccnx, SchedulerPtr scheduler,
+  Fetcher (FetchManager &fetchManger,
            const Ccnx::Name &name, int32_t minSeqNo, int32_t maxSeqNo,
            const Ccnx::Name &forwardingHint = Ccnx::Name ());
   virtual ~Fetcher ();
+
+private:
+  void
+  OnData ();
+
+  void
+  OnTimeout ();
   
 private:
-  Ccnx::CcnxWrapperPtr m_ccnx;
-  SchedulerPtr m_scheduler;
+  FetchManager &m_fetchManager;
   
   Ccnx::Name m_name;
   Ccnx::Name m_forwardingHint;