--- a/servlib/bundling/BundleDaemon.h	Mon Aug 22 15:28:21 2011 +0100
+++ b/servlib/bundling/BundleDaemon.h	Thu Sep 01 15:53:24 2011 +0100
@@ -34,6 +34,7 @@
 #include "BundleActions.h"
 #include "BundleStatusReport.h"
 #include "BPQBlock.h"
+#include "BPQCache.h"
 
 #include <execinfo.h>
 #include <signal.h>
@@ -175,9 +176,9 @@
     BundleList* custody_bundles() { return custody_bundles_; }
    
     /**
-     * Accessor for the BPQ bundles list.
+     * Accessor for the BPQ Cache.
      */
-    BundleList* bpq_bundles() { return bpq_bundles_; }
+    BPQCache* bpq_cache() { return bpq_cache_; }
  
     /**
      * Format the given StringBuffer with current routing info.
@@ -417,22 +418,24 @@
      */
     void release_custody(Bundle* bundle);
 
-    /**
-     * Add BPQ bundle to the on-path cache
-     */
-    bool accept_bpq_response(Bundle* bundle, BPQBlock* bpq_block,
-                             bool add_to_store);
-
-    /**
-     * Add BPQ bundle to the on-path cache if space allows
-     * if full, remove old bundles to make room
-     */
-    bool add_bundle_to_bpq_cache(Bundle* bundle, bool add_to_store);
-
-    /**
-     * todo
-     */
-    bool answer_bpq_query(Bundle* bundle, BPQBlock* bpq_block);
+//    /**
+//     * TODO
+//     * Add BPQ bundle to the on-path cache
+//     */
+//    bool accept_bpq_response(Bundle* bundle, BPQBlock* bpq_block,
+//                             bool add_to_store);
+//
+//    /**
+//     * Add BPQ bundle to the on-path cache if space allows
+//     * if full, remove old bundles to make room
+//     * TODO
+//     */
+//    bool add_bundle_to_bpq_cache(Bundle* bundle, bool add_to_store);
+//
+//    /**
+//     * TODO
+//     */
+//    bool answer_bpq_query(Bundle* bundle, BPQBlock* bpq_block);
 
     /**
      * Add the bundle to the pending list and (optionally) the
@@ -477,6 +480,7 @@
     /**
      * Check the bundle source and if it contains a QUERY_EXTENSION_BLOCK
      * if if does ...
+     * TODO
      */
     bool handle_bpq_block(Bundle* b, BundleReceivedEvent* event);
 
@@ -526,7 +530,8 @@
     BundleList* custody_bundles_;
    
     /// The list of all bundles with the response QUERY_EXTENSION
-    BundleList* bpq_bundles_;
+    /// TODO
+    BPQCache* bpq_cache_;
  
     /// The event queue
     oasys::MsgQueue<BundleEvent*>* eventq_;