diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java
index f2d0b5efd2..9894941680 100644
--- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java
+++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java
@@ -82,7 +82,8 @@ public class NPOIFSMiniStore extends BlockStore
      * Load the block, extending the underlying stream if needed
      */
     protected ByteBuffer createBlockIfNeeded(final int offset) throws IOException {
-       // TODO Extend
+       // TODO Extend the stream if needed
+       // TODO Needs append support on the underlying stream
        return getBlockAt(offset);
     }
     
diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java
index 84e0e4c0ce..458100950d 100644
--- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java
+++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java
@@ -40,7 +40,7 @@ import org.apache.poi.poifs.storage.HeaderBlock;
  *  handle small block ones.
  * This uses the new NIO code
  * 
- * TODO Implement a streaming write method
+ * TODO Implement a streaming write method, and append
  */
 
 public class NPOIFSStream implements Iterable<ByteBuffer>
@@ -156,7 +156,9 @@ public class NPOIFSStream implements Iterable<ByteBuffer>
       blockStore.setNextBlock(lastBlock, POIFSConstants.END_OF_CHAIN);
    }
    
-   // TODO Streaming write support too
+   // TODO Streaming write support
+   // TODO  then convert fixed sized write to use streaming internally
+   // TODO Append write support (probably streaming)
    
    /**
     * Frees all blocks in the stream