diff --git a/Storage/Disk/DiskImage/Formats/IPF.cpp b/Storage/Disk/DiskImage/Formats/IPF.cpp
index 44999490e..f5056073f 100644
--- a/Storage/Disk/DiskImage/Formats/IPF.cpp
+++ b/Storage/Disk/DiskImage/Formats/IPF.cpp
@@ -12,6 +12,28 @@ using namespace Storage::Disk;
 
 
 IPF::IPF(const std::string &file_name) : file_(file_name) {
+	while(true) {
+		const auto start_of_block = file_.tell();
+		const uint32_t type = file_.get32be();
+		uint32_t length = file_.get32be();						// Can't be const because of the dumb encoding of DATA blocks.
+		[[maybe_unused]] const uint32_t crc = file_.get32be();
+		if(file_.eof()) break;
+
+#define BLOCK(a, b, c, d) (a << 24) | (b << 16) | (c << 8) | d
+		switch(type) {
+			default:
+				printf("Ignoring %c%c%c%c, starting at %ld of length %d\n", (type >> 24), (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, start_of_block, length);
+			break;
+
+			case BLOCK('D', 'A', 'T', 'A'): {
+				length += file_.get32be();
+				printf("Handling DATA block at %ld of length %d\n", start_of_block, length);
+			} break;
+		}
+#undef BLOCK
+
+		file_.seek(start_of_block + length, SEEK_SET);
+	}
 }
 
 HeadPosition IPF::get_maximum_head_position() {