diff --git a/SabreTools.DatTools/Rebuilder.cs b/SabreTools.DatTools/Rebuilder.cs
index 77501ee9..a3344d7f 100644
--- a/SabreTools.DatTools/Rebuilder.cs
+++ b/SabreTools.DatTools/Rebuilder.cs
@@ -745,6 +745,8 @@ namespace SabreTools.DatTools
                 BaseArchive? archive = BaseArchive.Create(file);
                 if (archive != null)
                 {
+                    // TODO: Write entry to a temporary file to avoid over-large in-memory streams
+                    // TODO: Once entry is written, replace GetEntryStream implementations
                     ItemType itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
                     (stream, _) = archive.GetEntryStream(datItem.GetName() ?? itemType.AsStringValue() ?? string.Empty);
                 }