diff --git a/PROFuseX.xcodeproj/kelvin.pbxuser b/PROFuseX.xcodeproj/kelvin.pbxuser
index 4461775..db35621 100644
--- a/PROFuseX.xcodeproj/kelvin.pbxuser
+++ b/PROFuseX.xcodeproj/kelvin.pbxuser
@@ -5,16 +5,10 @@
 		activeExecutable = B63EFE8211A4886C00C90DCE /* newfs_pascal */;
 		activeTarget = B63EFE8011A4886C00C90DCE /* newfs_pascal */;
 		addToTargets = (
-			B63EFCCD11A36C7300C90DCE /* apfm */,
-			B63EFE8011A4886C00C90DCE /* newfs_pascal */,
-			B656AE0211A84F5800AB578A /* fuse_pascal */,
-			B656AF0211AA105500AB578A /* NibbleTest */,
 		);
 		breakpoints = (
 			B6F3642F11AA1E150045E114 /* NibbleTest.cpp:76 */,
-			B6F3657711AE24C40045E114 /* apfm.cpp:470 */,
-			B6F3659B11AE27760045E114 /* VolumeEntry.cpp:300 */,
-			B6F3659E11AE27790045E114 /* VolumeEntry.cpp:311 */,
+			B6F3657711AE24C40045E114 /* apfm.cpp:589 */,
 			B6F3663D11B1809A0045E114 /* Adaptor.cpp:167 */,
 		);
 		codeSenseManager = B63EFA6811A093C200C90DCE /* Code sense */;
@@ -24,6 +18,7 @@
 			B656AE0411A84F5800AB578A /* fuse_pascal */,
 			B656AF0411AA105500AB578A /* NibbleTest */,
 			B6F3648111AB36260045E114 /* xattr */,
+			B6F3682611B431AC0045E114 /* newfs_prodos */,
 		);
 		perUserDictionary = {
 			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
@@ -69,7 +64,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_ObjectSize_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					660,
+					10,
 					20,
 					48,
 					43,
@@ -108,16 +103,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 296433132;
-			PBXWorkspaceStateSaveDate = 296433132;
+			PBXPerProjectTemplateStateSaveDate = 299215102;
+			PBXWorkspaceStateSaveDate = 299215102;
 		};
 		perUserProjectItems = {
 			B63EFC2611A2D5A400C90DCE = B63EFC2611A2D5A400C90DCE /* PBXTextBookmark */;
-			B63EFC2B11A2D5A400C90DCE = B63EFC2B11A2D5A400C90DCE /* PBXTextBookmark */;
 			B63EFC3211A2D5A400C90DCE = B63EFC3211A2D5A400C90DCE /* PBXTextBookmark */;
-			B63EFCB211A3639400C90DCE = B63EFCB211A3639400C90DCE /* PBXTextBookmark */;
-			B63EFCB611A3639400C90DCE = B63EFCB611A3639400C90DCE /* PBXTextBookmark */;
-			B63EFD7F11A4436B00C90DCE = B63EFD7F11A4436B00C90DCE /* PBXTextBookmark */;
 			B63EFDA011A4488200C90DCE = B63EFDA011A4488200C90DCE /* PBXTextBookmark */;
 			B63EFDA511A4488200C90DCE = B63EFDA511A4488200C90DCE /* PBXTextBookmark */;
 			B63EFDA711A4488200C90DCE = B63EFDA711A4488200C90DCE /* PBXTextBookmark */;
@@ -128,187 +119,52 @@
 			B63EFDB111A4488200C90DCE = B63EFDB111A4488200C90DCE /* PBXTextBookmark */;
 			B63EFDB311A4488200C90DCE = B63EFDB311A4488200C90DCE /* PBXTextBookmark */;
 			B63EFDB711A4488200C90DCE = B63EFDB711A4488200C90DCE /* PBXTextBookmark */;
-			B63EFDC711A4494C00C90DCE = B63EFDC711A4494C00C90DCE /* PBXTextBookmark */;
-			B63EFDE611A44E9300C90DCE = B63EFDE611A44E9300C90DCE /* PBXTextBookmark */;
 			B63EFDF211A4504200C90DCE = B63EFDF211A4504200C90DCE /* PBXTextBookmark */;
 			B63EFEA011A488C200C90DCE = B63EFEA011A488C200C90DCE /* PBXTextBookmark */;
 			B63EFEA111A488C200C90DCE = B63EFEA111A488C200C90DCE /* PBXTextBookmark */;
-			B63EFEA211A488C200C90DCE = B63EFEA211A488C200C90DCE /* PBXTextBookmark */;
-			B63EFEA311A488C200C90DCE = B63EFEA311A488C200C90DCE /* PBXTextBookmark */;
-			B63EFEA711A488C200C90DCE = B63EFEA711A488C200C90DCE /* PBXTextBookmark */;
 			B63EFEA811A488C200C90DCE = B63EFEA811A488C200C90DCE /* PBXTextBookmark */;
-			B63EFEA911A488C200C90DCE = B63EFEA911A488C200C90DCE /* PBXTextBookmark */;
-			B63EFEEC11A4A70400C90DCE = B63EFEEC11A4A70400C90DCE /* PBXTextBookmark */;
-			B656AE2311A84FA400AB578A = B656AE2311A84FA400AB578A /* PBXTextBookmark */;
 			B656AE2411A84FA400AB578A = B656AE2411A84FA400AB578A /* PBXTextBookmark */;
 			B656AE2611A84FA400AB578A = B656AE2611A84FA400AB578A /* PBXTextBookmark */;
-			B656AE2711A84FA400AB578A = B656AE2711A84FA400AB578A /* PBXTextBookmark */;
-			B656AE6511A8591F00AB578A = B656AE6511A8591F00AB578A /* PBXTextBookmark */;
-			B656AEA711A9C91600AB578A = B656AEA711A9C91600AB578A /* PBXTextBookmark */;
-			B656AEA811A9C91600AB578A = B656AEA811A9C91600AB578A /* PBXTextBookmark */;
-			B656AF2711AA10C900AB578A = B656AF2711AA10C900AB578A /* PBXTextBookmark */;
-			B656AF2811AA10C900AB578A = B656AF2811AA10C900AB578A /* PBXTextBookmark */;
-			B656AF2A11AA10C900AB578A = B656AF2A11AA10C900AB578A /* PBXTextBookmark */;
+			B65CFB6911B495790024A2D9 = B65CFB6911B495790024A2D9 /* PBXTextBookmark */;
+			B65CFB6A11B495790024A2D9 = B65CFB6A11B495790024A2D9 /* PBXTextBookmark */;
+			B65CFB6B11B495790024A2D9 = B65CFB6B11B495790024A2D9 /* PBXTextBookmark */;
+			B65CFB8811B5C8310024A2D9 = B65CFB8811B5C8310024A2D9 /* PBXTextBookmark */;
 			B6E5F0DD11A60726000AD141 = B6E5F0DD11A60726000AD141 /* PBXTextBookmark */;
 			B6E5F0F211A73144000AD141 = B6E5F0F211A73144000AD141 /* PBXTextBookmark */;
 			B6E5F11211A73340000AD141 = B6E5F11211A73340000AD141 /* PBXTextBookmark */;
 			B6E5F13A11A74F2B000AD141 = B6E5F13A11A74F2B000AD141 /* PBXTextBookmark */;
-			B6E5F18111A76B74000AD141 = B6E5F18111A76B74000AD141 /* PBXTextBookmark */;
 			B6E5F18211A76B74000AD141 = B6E5F18211A76B74000AD141 /* PBXTextBookmark */;
-			B6F3642811AA1DC80045E114 = B6F3642811AA1DC80045E114 /* PBXTextBookmark */;
-			B6F3642D11AA1E070045E114 = B6F3642D11AA1E070045E114 /* PBXTextBookmark */;
-			B6F3646211AA26810045E114 = B6F3646211AA26810045E114 /* PBXTextBookmark */;
-			B6F3646E11AB35F00045E114 /* PBXTextBookmark */ = B6F3646E11AB35F00045E114 /* PBXTextBookmark */;
-			B6F3646F11AB35F00045E114 /* PBXBookmark */ = B6F3646F11AB35F00045E114 /* PBXBookmark */;
-			B6F3647011AB35F00045E114 /* PBXTextBookmark */ = B6F3647011AB35F00045E114 /* PBXTextBookmark */;
-			B6F3647111AB35FE0045E114 /* PBXTextBookmark */ = B6F3647111AB35FE0045E114 /* PBXTextBookmark */;
-			B6F3647211AB35FE0045E114 /* PBXTextBookmark */ = B6F3647211AB35FE0045E114 /* PBXTextBookmark */;
-			B6F3649411AB58E80045E114 /* PBXTextBookmark */ = B6F3649411AB58E80045E114 /* PBXTextBookmark */;
-			B6F3649511AB58E80045E114 /* PBXTextBookmark */ = B6F3649511AB58E80045E114 /* PBXTextBookmark */;
-			B6F3649611AB58E80045E114 /* PBXTextBookmark */ = B6F3649611AB58E80045E114 /* PBXTextBookmark */;
-			B6F3649711AB58E80045E114 /* XCBuildMessageTextBookmark */ = B6F3649711AB58E80045E114 /* XCBuildMessageTextBookmark */;
-			B6F3649811AB58E80045E114 /* PBXTextBookmark */ = B6F3649811AB58E80045E114 /* PBXTextBookmark */;
-			B6F3649E11AB59190045E114 /* PBXTextBookmark */ = B6F3649E11AB59190045E114 /* PBXTextBookmark */;
-			B6F3649F11AB59190045E114 /* XCBuildMessageTextBookmark */ = B6F3649F11AB59190045E114 /* XCBuildMessageTextBookmark */;
-			B6F364A011AB59190045E114 /* PBXTextBookmark */ = B6F364A011AB59190045E114 /* PBXTextBookmark */;
-			B6F364A511AB593E0045E114 /* PBXTextBookmark */ = B6F364A511AB593E0045E114 /* PBXTextBookmark */;
-			B6F364A911AB5EBD0045E114 /* PBXTextBookmark */ = B6F364A911AB5EBD0045E114 /* PBXTextBookmark */;
-			B6F364B111AB74F40045E114 /* XCBuildMessageTextBookmark */ = B6F364B111AB74F40045E114 /* XCBuildMessageTextBookmark */;
-			B6F364B211AB74F40045E114 /* PBXTextBookmark */ = B6F364B211AB74F40045E114 /* PBXTextBookmark */;
-			B6F364B611AB84840045E114 /* PBXTextBookmark */ = B6F364B611AB84840045E114 /* PBXTextBookmark */;
-			B6F364B711AB84840045E114 /* PBXTextBookmark */ = B6F364B711AB84840045E114 /* PBXTextBookmark */;
-			B6F364B811AB84840045E114 /* PBXTextBookmark */ = B6F364B811AB84840045E114 /* PBXTextBookmark */;
-			B6F364B911AB84840045E114 /* PBXTextBookmark */ = B6F364B911AB84840045E114 /* PBXTextBookmark */;
-			B6F364BE11AC92730045E114 /* PBXTextBookmark */ = B6F364BE11AC92730045E114 /* PBXTextBookmark */;
-			B6F364BF11AC92730045E114 /* XCBuildMessageTextBookmark */ = B6F364BF11AC92730045E114 /* XCBuildMessageTextBookmark */;
-			B6F364C011AC92730045E114 /* PBXTextBookmark */ = B6F364C011AC92730045E114 /* PBXTextBookmark */;
-			B6F364C811ACAB370045E114 /* PBXTextBookmark */ = B6F364C811ACAB370045E114 /* PBXTextBookmark */;
-			B6F364C911ACAB370045E114 /* PBXTextBookmark */ = B6F364C911ACAB370045E114 /* PBXTextBookmark */;
-			B6F364CA11ACAB370045E114 /* PBXTextBookmark */ = B6F364CA11ACAB370045E114 /* PBXTextBookmark */;
-			B6F364E811ACB5790045E114 /* PBXTextBookmark */ = B6F364E811ACB5790045E114 /* PBXTextBookmark */;
-			B6F364E911ACB5790045E114 /* XCBuildMessageTextBookmark */ = B6F364E911ACB5790045E114 /* XCBuildMessageTextBookmark */;
-			B6F364EB11ACB5790045E114 /* PBXTextBookmark */ = B6F364EB11ACB5790045E114 /* PBXTextBookmark */;
-			B6F364EC11ACB5790045E114 /* XCBuildMessageTextBookmark */ = B6F364EC11ACB5790045E114 /* XCBuildMessageTextBookmark */;
-			B6F364ED11ACB5790045E114 /* PBXTextBookmark */ = B6F364ED11ACB5790045E114 /* PBXTextBookmark */;
-			B6F364F511ACB5B60045E114 /* PBXTextBookmark */ = B6F364F511ACB5B60045E114 /* PBXTextBookmark */;
-			B6F364F811ACBA8E0045E114 /* PBXTextBookmark */ = B6F364F811ACBA8E0045E114 /* PBXTextBookmark */;
-			B6F364FD11ACBC470045E114 /* PBXTextBookmark */ = B6F364FD11ACBC470045E114 /* PBXTextBookmark */;
-			B6F3650011ACBC790045E114 /* PBXTextBookmark */ = B6F3650011ACBC790045E114 /* PBXTextBookmark */;
-			B6F3650111ACBC790045E114 /* PBXTextBookmark */ = B6F3650111ACBC790045E114 /* PBXTextBookmark */;
-			B6F3650211ACBC790045E114 /* PBXTextBookmark */ = B6F3650211ACBC790045E114 /* PBXTextBookmark */;
-			B6F3650511ACBCA40045E114 /* PBXTextBookmark */ = B6F3650511ACBCA40045E114 /* PBXTextBookmark */;
-			B6F3650611ACBCA40045E114 /* PBXTextBookmark */ = B6F3650611ACBCA40045E114 /* PBXTextBookmark */;
-			B6F3650911ACBCB30045E114 /* PBXTextBookmark */ = B6F3650911ACBCB30045E114 /* PBXTextBookmark */;
-			B6F3650E11ADC40E0045E114 /* PBXTextBookmark */ = B6F3650E11ADC40E0045E114 /* PBXTextBookmark */;
-			B6F3651111ADCA570045E114 /* PBXTextBookmark */ = B6F3651111ADCA570045E114 /* PBXTextBookmark */;
-			B6F3651211ADCA570045E114 /* PBXTextBookmark */ = B6F3651211ADCA570045E114 /* PBXTextBookmark */;
-			B6F3651311ADCA570045E114 /* PBXTextBookmark */ = B6F3651311ADCA570045E114 /* PBXTextBookmark */;
-			B6F3651511ADCA6C0045E114 /* PBXTextBookmark */ = B6F3651511ADCA6C0045E114 /* PBXTextBookmark */;
-			B6F3651611ADCA6C0045E114 /* PBXTextBookmark */ = B6F3651611ADCA6C0045E114 /* PBXTextBookmark */;
-			B6F3651711ADCA6C0045E114 /* PBXTextBookmark */ = B6F3651711ADCA6C0045E114 /* PBXTextBookmark */;
-			B6F3651811ADCA6C0045E114 /* PBXTextBookmark */ = B6F3651811ADCA6C0045E114 /* PBXTextBookmark */;
-			B6F3652E11ADD5D20045E114 /* PBXTextBookmark */ = B6F3652E11ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3652F11ADD5D20045E114 /* PBXTextBookmark */ = B6F3652F11ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3653011ADD5D20045E114 /* PBXTextBookmark */ = B6F3653011ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3653111ADD5D20045E114 /* PBXTextBookmark */ = B6F3653111ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3653211ADD5D20045E114 /* PBXTextBookmark */ = B6F3653211ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3653311ADD5D20045E114 /* PBXTextBookmark */ = B6F3653311ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3653411ADD5D20045E114 /* PBXTextBookmark */ = B6F3653411ADD5D20045E114 /* PBXTextBookmark */;
-			B6F3654311ADE1C20045E114 /* PBXTextBookmark */ = B6F3654311ADE1C20045E114 /* PBXTextBookmark */;
-			B6F3654411ADE1C20045E114 /* PBXTextBookmark */ = B6F3654411ADE1C20045E114 /* PBXTextBookmark */;
-			B6F3654511ADE1C20045E114 /* PBXTextBookmark */ = B6F3654511ADE1C20045E114 /* PBXTextBookmark */;
-			B6F3654711ADE3680045E114 /* PBXTextBookmark */ = B6F3654711ADE3680045E114 /* PBXTextBookmark */;
-			B6F3654C11AE03E00045E114 /* PBXTextBookmark */ = B6F3654C11AE03E00045E114 /* PBXTextBookmark */;
-			B6F3654F11AE060D0045E114 /* PBXTextBookmark */ = B6F3654F11AE060D0045E114 /* PBXTextBookmark */;
-			B6F3655011AE060D0045E114 /* PBXTextBookmark */ = B6F3655011AE060D0045E114 /* PBXTextBookmark */;
-			B6F3655111AE060D0045E114 /* PBXTextBookmark */ = B6F3655111AE060D0045E114 /* PBXTextBookmark */;
-			B6F3655511AE06710045E114 /* PBXTextBookmark */ = B6F3655511AE06710045E114 /* PBXTextBookmark */;
-			B6F3655B11AE09D60045E114 /* PBXTextBookmark */ = B6F3655B11AE09D60045E114 /* PBXTextBookmark */;
-			B6F3655C11AE09D60045E114 /* PBXTextBookmark */ = B6F3655C11AE09D60045E114 /* PBXTextBookmark */;
-			B6F3655D11AE09D60045E114 /* PBXTextBookmark */ = B6F3655D11AE09D60045E114 /* PBXTextBookmark */;
-			B6F3656611AE142B0045E114 /* PBXTextBookmark */ = B6F3656611AE142B0045E114 /* PBXTextBookmark */;
-			B6F3656711AE142B0045E114 /* PBXTextBookmark */ = B6F3656711AE142B0045E114 /* PBXTextBookmark */;
-			B6F3656811AE142F0045E114 /* PBXTextBookmark */ = B6F3656811AE142F0045E114 /* PBXTextBookmark */;
-			B6F3657511AE24680045E114 /* PBXTextBookmark */ = B6F3657511AE24680045E114 /* PBXTextBookmark */;
-			B6F3657911AE24CC0045E114 /* PBXTextBookmark */ = B6F3657911AE24CC0045E114 /* PBXTextBookmark */;
-			B6F3657D11AE255B0045E114 /* PBXTextBookmark */ = B6F3657D11AE255B0045E114 /* PBXTextBookmark */;
-			B6F3657E11AE255B0045E114 /* PBXTextBookmark */ = B6F3657E11AE255B0045E114 /* PBXTextBookmark */;
-			B6F3657F11AE255B0045E114 /* PBXTextBookmark */ = B6F3657F11AE255B0045E114 /* PBXTextBookmark */;
-			B6F3658011AE255B0045E114 /* PBXTextBookmark */ = B6F3658011AE255B0045E114 /* PBXTextBookmark */;
-			B6F3658111AE256A0045E114 /* PBXTextBookmark */ = B6F3658111AE256A0045E114 /* PBXTextBookmark */;
-			B6F3658211AE256A0045E114 /* PBXTextBookmark */ = B6F3658211AE256A0045E114 /* PBXTextBookmark */;
-			B6F3658311AE25700045E114 /* PBXTextBookmark */ = B6F3658311AE25700045E114 /* PBXTextBookmark */;
-			B6F3658611AE25830045E114 /* PBXTextBookmark */ = B6F3658611AE25830045E114 /* PBXTextBookmark */;
-			B6F365A211AE27A80045E114 /* PBXTextBookmark */ = B6F365A211AE27A80045E114 /* PBXTextBookmark */;
-			B6F365A411AE27BE0045E114 /* PBXTextBookmark */ = B6F365A411AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365A511AE27BE0045E114 /* PBXTextBookmark */ = B6F365A511AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365A611AE27BE0045E114 /* PBXTextBookmark */ = B6F365A611AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365A711AE27BE0045E114 /* PBXTextBookmark */ = B6F365A711AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365A811AE27BE0045E114 /* PBXTextBookmark */ = B6F365A811AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365A911AE27BE0045E114 /* PBXTextBookmark */ = B6F365A911AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365AA11AE27BE0045E114 /* PBXTextBookmark */ = B6F365AA11AE27BE0045E114 /* PBXTextBookmark */;
-			B6F365AD11AE27CC0045E114 /* PBXTextBookmark */ = B6F365AD11AE27CC0045E114 /* PBXTextBookmark */;
-			B6F365AE11AE27CC0045E114 /* PBXTextBookmark */ = B6F365AE11AE27CC0045E114 /* PBXTextBookmark */;
-			B6F365AF11AE27CC0045E114 /* PBXTextBookmark */ = B6F365AF11AE27CC0045E114 /* PBXTextBookmark */;
-			B6F365B111AE28340045E114 /* PBXTextBookmark */ = B6F365B111AE28340045E114 /* PBXTextBookmark */;
-			B6F365B411AF40320045E114 /* PBXTextBookmark */ = B6F365B411AF40320045E114 /* PBXTextBookmark */;
-			B6F365B711AF62E00045E114 /* PBXTextBookmark */ = B6F365B711AF62E00045E114 /* PBXTextBookmark */;
-			B6F365B811AF62E00045E114 /* PBXTextBookmark */ = B6F365B811AF62E00045E114 /* PBXTextBookmark */;
-			B6F365CA11B08AE30045E114 /* PBXTextBookmark */ = B6F365CA11B08AE30045E114 /* PBXTextBookmark */;
-			B6F365CB11B08AE30045E114 /* XCBuildMessageTextBookmark */ = B6F365CB11B08AE30045E114 /* XCBuildMessageTextBookmark */;
-			B6F365CD11B08AE30045E114 /* PBXTextBookmark */ = B6F365CD11B08AE30045E114 /* PBXTextBookmark */;
-			B6F365CE11B08AE30045E114 /* PBXTextBookmark */ = B6F365CE11B08AE30045E114 /* PBXTextBookmark */;
-			B6F365CF11B08AE30045E114 /* PBXTextBookmark */ = B6F365CF11B08AE30045E114 /* PBXTextBookmark */;
-			B6F365E511B09E510045E114 /* PBXTextBookmark */ = B6F365E511B09E510045E114 /* PBXTextBookmark */;
-			B6F365E811B09EFD0045E114 /* PBXTextBookmark */ = B6F365E811B09EFD0045E114 /* PBXTextBookmark */;
-			B6F365EB11B09F2A0045E114 /* PBXTextBookmark */ = B6F365EB11B09F2A0045E114 /* PBXTextBookmark */;
-			B6F365EE11B0A6010045E114 /* PBXTextBookmark */ = B6F365EE11B0A6010045E114 /* PBXTextBookmark */;
-			B6F365F111B0A6BE0045E114 /* PBXTextBookmark */ = B6F365F111B0A6BE0045E114 /* PBXTextBookmark */;
-			B6F365F411B169C00045E114 /* PBXTextBookmark */ = B6F365F411B169C00045E114 /* PBXTextBookmark */;
-			B6F365F611B169D40045E114 /* PBXTextBookmark */ = B6F365F611B169D40045E114 /* PBXTextBookmark */;
-			B6F365F711B169D40045E114 /* PBXTextBookmark */ = B6F365F711B169D40045E114 /* PBXTextBookmark */;
-			B6F365F811B169D40045E114 /* PBXTextBookmark */ = B6F365F811B169D40045E114 /* PBXTextBookmark */;
-			B6F365FA11B16A690045E114 /* PBXTextBookmark */ = B6F365FA11B16A690045E114 /* PBXTextBookmark */;
-			B6F3660311B16D9F0045E114 /* PBXTextBookmark */ = B6F3660311B16D9F0045E114 /* PBXTextBookmark */;
-			B6F3660411B16D9F0045E114 /* XCBuildMessageTextBookmark */ = B6F3660411B16D9F0045E114 /* XCBuildMessageTextBookmark */;
-			B6F3660511B16D9F0045E114 /* PBXTextBookmark */ = B6F3660511B16D9F0045E114 /* PBXTextBookmark */;
-			B6F3660A11B174830045E114 /* PBXTextBookmark */ = B6F3660A11B174830045E114 /* PBXTextBookmark */;
-			B6F3660E11B175EA0045E114 /* PBXTextBookmark */ = B6F3660E11B175EA0045E114 /* PBXTextBookmark */;
-			B6F3661511B1762C0045E114 /* PBXTextBookmark */ = B6F3661511B1762C0045E114 /* PBXTextBookmark */;
-			B6F3661A11B176960045E114 /* PBXTextBookmark */ = B6F3661A11B176960045E114 /* PBXTextBookmark */;
-			B6F3662011B177B60045E114 /* PBXTextBookmark */ = B6F3662011B177B60045E114 /* PBXTextBookmark */;
-			B6F3662111B177B60045E114 /* PBXTextBookmark */ = B6F3662111B177B60045E114 /* PBXTextBookmark */;
-			B6F3662211B177B60045E114 /* PBXTextBookmark */ = B6F3662211B177B60045E114 /* PBXTextBookmark */;
-			B6F3662311B177B60045E114 /* PBXTextBookmark */ = B6F3662311B177B60045E114 /* PBXTextBookmark */;
-			B6F3662D11B178720045E114 /* PBXTextBookmark */ = B6F3662D11B178720045E114 /* PBXTextBookmark */;
-			B6F3662E11B178720045E114 /* PBXTextBookmark */ = B6F3662E11B178720045E114 /* PBXTextBookmark */;
-			B6F3662F11B178720045E114 /* PBXTextBookmark */ = B6F3662F11B178720045E114 /* PBXTextBookmark */;
-			B6F3663411B178EB0045E114 /* PBXTextBookmark */ = B6F3663411B178EB0045E114 /* PBXTextBookmark */;
-			B6F3663811B179290045E114 /* PBXTextBookmark */ = B6F3663811B179290045E114 /* PBXTextBookmark */;
-			B6F3664111B181C10045E114 /* PBXTextBookmark */ = B6F3664111B181C10045E114 /* PBXTextBookmark */;
-			B6F3665011B189490045E114 /* PBXTextBookmark */ = B6F3665011B189490045E114 /* PBXTextBookmark */;
-			B6F3665111B190300045E114 /* PBXTextBookmark */ = B6F3665111B190300045E114 /* PBXTextBookmark */;
-			B6F3665211B190300045E114 /* PBXTextBookmark */ = B6F3665211B190300045E114 /* PBXTextBookmark */;
-			B6F3665311B190300045E114 /* PBXTextBookmark */ = B6F3665311B190300045E114 /* PBXTextBookmark */;
-			B6F3665411B190370045E114 /* PBXTextBookmark */ = B6F3665411B190370045E114 /* PBXTextBookmark */;
-			B6F3665511B190370045E114 /* PBXTextBookmark */ = B6F3665511B190370045E114 /* PBXTextBookmark */;
-			B6F3665911B191C90045E114 /* PBXTextBookmark */ = B6F3665911B191C90045E114 /* PBXTextBookmark */;
-			B6F3665C11B194AC0045E114 /* PBXTextBookmark */ = B6F3665C11B194AC0045E114 /* PBXTextBookmark */;
-			B6F3665D11B194AC0045E114 /* PBXTextBookmark */ = B6F3665D11B194AC0045E114 /* PBXTextBookmark */;
-			B6F3665E11B194AC0045E114 /* PBXTextBookmark */ = B6F3665E11B194AC0045E114 /* PBXTextBookmark */;
-			B6F366C211B1A28C0045E114 /* PBXTextBookmark */ = B6F366C211B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C311B1A28C0045E114 /* PBXTextBookmark */ = B6F366C311B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C411B1A28C0045E114 /* PBXTextBookmark */ = B6F366C411B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C511B1A28C0045E114 /* PBXTextBookmark */ = B6F366C511B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C611B1A28C0045E114 /* PBXTextBookmark */ = B6F366C611B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C711B1A28C0045E114 /* PBXTextBookmark */ = B6F366C711B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C811B1A28C0045E114 /* PBXTextBookmark */ = B6F366C811B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366C911B1A28C0045E114 /* PBXTextBookmark */ = B6F366C911B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366CA11B1A28C0045E114 /* PBXTextBookmark */ = B6F366CA11B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366CB11B1A28C0045E114 /* PBXTextBookmark */ = B6F366CB11B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366CC11B1A28C0045E114 /* PBXTextBookmark */ = B6F366CC11B1A28C0045E114 /* PBXTextBookmark */;
-			B6F366CD11B1A28C0045E114 /* XCBuildMessageTextBookmark */ = B6F366CD11B1A28C0045E114 /* XCBuildMessageTextBookmark */;
-			B6F366CE11B1A28C0045E114 /* PBXTextBookmark */ = B6F366CE11B1A28C0045E114 /* PBXTextBookmark */;
+			B6F3647111AB35FE0045E114 = B6F3647111AB35FE0045E114 /* PBXTextBookmark */;
+			B6F3649E11AB59190045E114 = B6F3649E11AB59190045E114 /* PBXTextBookmark */;
+			B6F364B711AB84840045E114 = B6F364B711AB84840045E114 /* PBXTextBookmark */;
+			B6F3652E11ADD5D20045E114 = B6F3652E11ADD5D20045E114 /* PBXTextBookmark */;
+			B6F3653011ADD5D20045E114 = B6F3653011ADD5D20045E114 /* PBXTextBookmark */;
+			B6F3657E11AE255B0045E114 = B6F3657E11AE255B0045E114 /* PBXTextBookmark */;
+			B6F3665411B190370045E114 = B6F3665411B190370045E114 /* PBXTextBookmark */;
+			B6F3665C11B194AC0045E114 = B6F3665C11B194AC0045E114 /* PBXTextBookmark */;
+			B6F366C211B1A28C0045E114 = B6F366C211B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C411B1A28C0045E114 = B6F366C411B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C511B1A28C0045E114 = B6F366C511B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C611B1A28C0045E114 = B6F366C611B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C711B1A28C0045E114 = B6F366C711B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C811B1A28C0045E114 = B6F366C811B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366C911B1A28C0045E114 = B6F366C911B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366CA11B1A28C0045E114 = B6F366CA11B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366CB11B1A28C0045E114 = B6F366CB11B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366CC11B1A28C0045E114 = B6F366CC11B1A28C0045E114 /* PBXTextBookmark */;
+			B6F366D911B1A7A70045E114 = B6F366D911B1A7A70045E114 /* PBXTextBookmark */;
+			B6F3670611B2B47E0045E114 = B6F3670611B2B47E0045E114 /* PBXTextBookmark */;
+			B6F3675411B316D10045E114 = B6F3675411B316D10045E114 /* PBXTextBookmark */;
+			B6F3677C11B326580045E114 = B6F3677C11B326580045E114 /* PBXTextBookmark */;
+			B6F3677D11B326580045E114 = B6F3677D11B326580045E114 /* PBXTextBookmark */;
+			B6F3677E11B326580045E114 = B6F3677E11B326580045E114 /* PBXTextBookmark */;
+			B6F3677F11B326580045E114 = B6F3677F11B326580045E114 /* PBXTextBookmark */;
+			B6F367A011B330D10045E114 = B6F367A011B330D10045E114 /* PBXTextBookmark */;
+			B6F367AE11B337A70045E114 = B6F367AE11B337A70045E114 /* PBXTextBookmark */;
+			B6F367E911B40F650045E114 = B6F367E911B40F650045E114 /* PBXTextBookmark */;
+			B6F3684911B44D090045E114 = B6F3684911B44D090045E114 /* PBXTextBookmark */;
+			B6F3684A11B44D090045E114 = B6F3684A11B44D090045E114 /* PBXTextBookmark */;
+			B6F3684B11B44D090045E114 = B6F3684B11B44D090045E114 /* PBXTextBookmark */;
 		};
 		sourceControlManager = B63EFA6711A093C200C90DCE /* Source Control */;
 		userBuildSettings = {
@@ -332,7 +188,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {838, 1339}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 907}";
+			sepNavVisRange = "{0, 868}";
 		};
 	};
 	B63EFA7611A0948500C90DCE /* Endian.h */ = {
@@ -358,9 +214,9 @@
 	};
 	B63EFA9611A094E000C90DCE /* BlockDevice.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1015, 944}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 858}}";
 			sepNavSelRange = "{431, 0}";
-			sepNavVisRange = "{0, 1234}";
+			sepNavVisRange = "{0, 917}";
 		};
 	};
 	B63EFA9711A094E000C90DCE /* DavexDiskImage.cpp */ = {
@@ -393,9 +249,9 @@
 	};
 	B63EFA9D11A094E000C90DCE /* DiskImage.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 2769}}";
-			sepNavSelRange = "{423, 0}";
-			sepNavVisRange = "{128, 613}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 2743}}";
+			sepNavSelRange = "{550, 0}";
+			sepNavVisRange = "{0, 1053}";
 		};
 	};
 	B63EFA9E11A094E000C90DCE /* DiskImage.h */ = {
@@ -407,16 +263,16 @@
 	};
 	B63EFAA111A094E000C90DCE /* RawDevice.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1015, 4043}}";
-			sepNavSelRange = "{2481, 0}";
-			sepNavVisRange = "{2076, 1431}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 4186}}";
+			sepNavSelRange = "{2579, 0}";
+			sepNavVisRange = "{2262, 800}";
 		};
 	};
 	B63EFAA211A094E000C90DCE /* RawDevice.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1015, 944}}";
-			sepNavSelRange = "{735, 0}";
-			sepNavVisRange = "{0, 952}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 958}}";
+			sepNavSelRange = "{894, 0}";
+			sepNavVisRange = "{0, 1056}";
 		};
 	};
 	B63EFAA311A094E000C90DCE /* TrackSector.h */ = {
@@ -442,16 +298,16 @@
 	};
 	B63EFAB611A098C400C90DCE /* BlockCache.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1264, 988}}";
-			sepNavSelRange = "{1253, 0}";
-			sepNavVisRange = "{0, 1191}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 962}}";
+			sepNavSelRange = "{334, 0}";
+			sepNavVisRange = "{0, 1217}";
 		};
 	};
 	B63EFAB711A098C400C90DCE /* BlockCache.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1264, 932}}";
-			sepNavSelRange = "{795, 44}";
-			sepNavVisRange = "{0, 1167}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 754}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{148, 940}";
 		};
 	};
 	B63EFAB811A098C400C90DCE /* ConcreteBlockCache.cpp */ = {
@@ -484,16 +340,16 @@
 	};
 	B63EFAC911A09DAA00C90DCE /* File.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 1534}}";
-			sepNavSelRange = "{1503, 0}";
-			sepNavVisRange = "{347, 1384}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 1599}}";
+			sepNavSelRange = "{1429, 0}";
+			sepNavVisRange = "{248, 1374}";
 		};
 	};
 	B63EFACA11A09DAA00C90DCE /* File.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 948}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 754}}";
 			sepNavSelRange = "{244, 0}";
-			sepNavVisRange = "{0, 979}";
+			sepNavVisRange = "{0, 749}";
 		};
 	};
 	B63EFACB11A09DAA00C90DCE /* MappedFile.cpp */ = {
@@ -558,11 +414,6 @@
 		name = DiskImage.h;
 		path = ./Device/DiskImage.h;
 		sourceTree = "<group>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1009, 1144}}";
-			sepNavSelRange = "{596, 0}";
-			sepNavVisRange = "{124, 1430}";
-		};
 	};
 	B63EFBE811A244EE00C90DCE /* Date.cpp */ = {
 		uiCtxt = {
@@ -585,31 +436,18 @@
 			sepNavVisRange = "{0, 1220}";
 		};
 	};
-	B63EFBEB11A244EE00C90DCE /* File.h */ = {
-		isa = PBXFileReference;
-		fileEncoding = 4;
-		lastKnownFileType = sourcecode.c.h;
-		name = File.h;
-		path = /Users/kelvin/Projects/PROFuseX/Pascal/File.h;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 3029}}";
-			sepNavSelRange = "{2795, 35}";
-			sepNavVisRange = "{2292, 855}";
-		};
-	};
 	B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 7813}}";
-			sepNavSelRange = "{1130, 0}";
-			sepNavVisRange = "{1, 1360}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 8775}}";
+			sepNavSelRange = "{5793, 0}";
+			sepNavVisRange = "{4945, 1395}";
 		};
 	};
 	B63EFBF111A244EE00C90DCE /* VolumeEntry.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 3094}}";
-			sepNavSelRange = "{275, 24}";
-			sepNavVisRange = "{0, 832}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 12779}}";
+			sepNavSelRange = "{13761, 6}";
+			sepNavVisRange = "{13015, 1389}";
 		};
 	};
 	B63EFC2611A2D5A400C90DCE /* PBXTextBookmark */ = {
@@ -622,16 +460,6 @@
 		vrLen = 97;
 		vrLoc = 0;
 	};
-	B63EFC2B11A2D5A400C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA9511A094E000C90DCE /* BlockDevice.cpp */;
-		name = "BlockDevice.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 186;
-		vrLoc = 0;
-	};
 	B63EFC3211A2D5A400C90DCE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFAB911A098C400C90DCE /* ConcreteBlockCache.h */;
@@ -644,9 +472,9 @@
 	};
 	B63EFC4311A31B7200C90DCE /* IOBuffer.cpp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 1339}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 1339}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{1363, 1056}";
+			sepNavVisRange = "{687, 1732}";
 		};
 	};
 	B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */ = {
@@ -658,9 +486,9 @@
 	};
 	B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {768, 4004}}";
-			sepNavSelRange = "{6507, 0}";
-			sepNavVisRange = "{4525, 2059}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 4381}}";
+			sepNavSelRange = "{4492, 0}";
+			sepNavVisRange = "{2844, 1735}";
 		};
 	};
 	B63EFC9D11A35F8200C90DCE /* fuse_pascal_ops.cpp */ = {
@@ -672,42 +500,17 @@
 	};
 	B63EFC9F11A35F8F00C90DCE /* apfm.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 10855}}";
-			sepNavSelRange = "{16564, 0}";
-			sepNavVisRange = "{15404, 884}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 14040}}";
+			sepNavSelRange = "{13109, 0}";
+			sepNavVisRange = "{11908, 1651}";
 		};
 	};
-	B63EFCB211A3639400C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA9711A094E000C90DCE /* DavexDiskImage.cpp */;
-		name = "DavexDiskImage.cpp: 160";
-		rLen = 0;
-		rLoc = 3285;
-		rType = 0;
-		vrLen = 270;
-		vrLoc = 3136;
-	};
-	B63EFCB611A3639400C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEA11A244EE00C90DCE /* Entry.cpp */;
-		name = "Entry.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 233;
-		vrLoc = 0;
-	};
 	B63EFCC811A366C800C90DCE /* MappedFile.h */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
 		name = MappedFile.h;
 		path = ./File/MappedFile.h;
 		sourceTree = "<group>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 663}}";
-			sepNavSelRange = "{263, 0}";
-			sepNavVisRange = "{0, 874}";
-		};
 	};
 	B63EFCCD11A36C7300C90DCE /* apfm */ = {
 		activeExec = 0;
@@ -755,16 +558,6 @@
 			"size-size_t-MappedFile::init" = 1;
 		};
 	};
-	B63EFD7F11A4436B00C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAC911A09DAA00C90DCE /* File.cpp */;
-		name = "File.cpp: 34";
-		rLen = 0;
-		rLoc = 504;
-		rType = 0;
-		vrLen = 225;
-		vrLoc = 284;
-	};
 	B63EFDA011A4488200C90DCE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFDA111A4488200C90DCE /* memory */;
@@ -923,31 +716,11 @@
 		fRef = B63EFAB611A098C400C90DCE /* BlockCache.cpp */;
 		name = "BlockCache.cpp: 60";
 		rLen = 0;
-		rLoc = 1001;
+		rLoc = 962;
 		rType = 0;
 		vrLen = 490;
 		vrLoc = 514;
 	};
-	B63EFDC711A4494C00C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAB711A098C400C90DCE /* BlockCache.h */;
-		name = "BlockCache.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 954;
-		vrLoc = 0;
-	};
-	B63EFDE611A44E9300C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFACB11A09DAA00C90DCE /* MappedFile.cpp */;
-		name = "MappedFile.cpp: 42";
-		rLen = 0;
-		rLoc = 747;
-		rType = 0;
-		vrLen = 791;
-		vrLoc = 576;
-	};
 	B63EFDF211A4504200C90DCE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFAD011A09DB500C90DCE /* auto.h */;
@@ -1011,48 +784,6 @@
 		vrLen = 763;
 		vrLoc = 0;
 	};
-	B63EFEA211A488C200C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAA411A094E000C90DCE /* UniversalDiskImage.cpp */;
-		name = "UniversalDiskImage.cpp: 162";
-		rLen = 0;
-		rLoc = 3117;
-		rType = 0;
-		vrLen = 1007;
-		vrLoc = 2311;
-	};
-	B63EFEA311A488C200C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAA511A094E000C90DCE /* UniversalDiskImage.h */;
-		name = "UniversalDiskImage.h: 22";
-		rLen = 0;
-		rLoc = 403;
-		rType = 0;
-		vrLen = 723;
-		vrLoc = 0;
-	};
-	B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.cpp.cpp;
-		name = VolumeEntry.cpp;
-		path = ./Pascal/VolumeEntry.cpp;
-		sourceTree = "<group>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 9542}}";
-			sepNavSelRange = "{8503, 0}";
-			sepNavVisRange = "{8131, 736}";
-		};
-	};
-	B63EFEA711A488C200C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEB11A244EE00C90DCE /* File.h */;
-		name = "File.h: 2";
-		rLen = 0;
-		rLoc = 43;
-		rType = 0;
-		vrLen = 901;
-		vrLoc = 2858;
-	};
 	B63EFEA811A488C200C90DCE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFBE811A244EE00C90DCE /* Date.cpp */;
@@ -1063,26 +794,6 @@
 		vrLen = 834;
 		vrLoc = 0;
 	};
-	B63EFEA911A488C200C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBE911A244EE00C90DCE /* Date.h */;
-		name = "Date.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 706;
-		vrLoc = 0;
-	};
-	B63EFEEC11A4A70400C90DCE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAA111A094E000C90DCE /* RawDevice.cpp */;
-		name = "RawDevice.cpp: 147";
-		rLen = 0;
-		rLoc = 2655;
-		rType = 0;
-		vrLen = 865;
-		vrLoc = 2190;
-	};
 	B656AE0211A84F5800AB578A /* fuse_pascal */ = {
 		activeExec = 0;
 		executables = (
@@ -1116,16 +827,6 @@
 		sourceDirectories = (
 		);
 	};
-	B656AE2311A84FA400AB578A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAD211A09DB500C90DCE /* Exception.h */;
-		name = "Exception.h: 37";
-		rLen = 12;
-		rLoc = 734;
-		rType = 0;
-		vrLen = 1049;
-		vrLoc = 434;
-	};
 	B656AE2411A84FA400AB578A /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFC9D11A35F8200C90DCE /* fuse_pascal_ops.cpp */;
@@ -1146,46 +847,6 @@
 		vrLen = 781;
 		vrLoc = 126;
 	};
-	B656AE2711A84FA400AB578A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1307;
-		vrLoc = 4987;
-	};
-	B656AE6511A8591F00AB578A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */;
-		name = "fuse_pascal.cpp: 187";
-		rLen = 0;
-		rLoc = 4201;
-		rType = 0;
-		vrLen = 1001;
-		vrLoc = 3697;
-	};
-	B656AEA711A9C91600AB578A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA9D11A094E000C90DCE /* DiskImage.cpp */;
-		name = "DiskImage.cpp: 148";
-		rLen = 0;
-		rLoc = 2568;
-		rType = 0;
-		vrLen = 894;
-		vrLoc = 2264;
-	};
-	B656AEA811A9C91600AB578A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB8811A1FB2500C90DCE /* DiskImage.h */;
-		name = "DiskImage.h: 65";
-		rLen = 0;
-		rLoc = 1204;
-		rType = 0;
-		vrLen = 898;
-		vrLoc = 788;
-	};
 	B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1178, 1248}}";
@@ -1239,35 +900,45 @@
 			"y-uint8_t-Device::NibbleAdaptor::readTrackSector" = 1;
 		};
 	};
-	B656AF2711AA10C900AB578A /* PBXTextBookmark */ = {
+	B65CFB6911B495790024A2D9 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */;
-		name = "FileEntry.cpp: 372";
+		fRef = B63EFAA111A094E000C90DCE /* RawDevice.cpp */;
+		name = "RawDevice.cpp: 136";
 		rLen = 0;
-		rLoc = 11565;
+		rLoc = 2579;
 		rType = 0;
-		vrLen = 938;
-		vrLoc = 6413;
+		vrLen = 800;
+		vrLoc = 2262;
 	};
-	B656AF2811AA10C900AB578A /* PBXTextBookmark */ = {
+	B65CFB6A11B495790024A2D9 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 107";
-		rLen = 0;
-		rLoc = 6577;
+		fRef = B6F3647B11AB361D0045E114 /* xattr.cpp */;
+		name = "xattr.cpp: 330";
+		rLen = 6;
+		rLoc = 6657;
 		rType = 0;
-		vrLen = 875;
-		vrLoc = 2880;
+		vrLen = 829;
+		vrLoc = 5931;
 	};
-	B656AF2A11AA10C900AB578A /* PBXTextBookmark */ = {
+	B65CFB6B11B495790024A2D9 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B63EFCC811A366C800C90DCE /* MappedFile.h */;
-		name = "MappedFile.h: 15";
-		rLen = 64;
-		rLoc = 196;
+		fRef = B63EFBF111A244EE00C90DCE /* VolumeEntry.cpp */;
+		name = "VolumeEntry.cpp: 595";
+		rLen = 6;
+		rLoc = 13761;
 		rType = 0;
-		vrLen = 863;
-		vrLoc = 0;
+		vrLen = 1344;
+		vrLoc = 12874;
+	};
+	B65CFB8811B5C8310024A2D9 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFBF111A244EE00C90DCE /* VolumeEntry.cpp */;
+		name = "VolumeEntry.cpp: 618";
+		rLen = 6;
+		rLoc = 13761;
+		rType = 0;
+		vrLen = 1389;
+		vrLoc = 13015;
 	};
 	B6E5F0DD11A60726000AD141 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -1309,16 +980,6 @@
 		vrLen = 1056;
 		vrLoc = 1363;
 	};
-	B6E5F18111A76B74000AD141 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 460";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 797;
-		vrLoc = 8547;
-	};
 	B6E5F18211A76B74000AD141 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFAD111A09DB500C90DCE /* Exception.cpp */;
@@ -1329,26 +990,6 @@
 		vrLen = 157;
 		vrLoc = 0;
 	};
-	B6F3642811AA1DC80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0611A0AC4800C90DCE /* Adaptor.h */;
-		name = "Adaptor.h: 82";
-		rLen = 0;
-		rLoc = 1806;
-		rType = 0;
-		vrLen = 606;
-		vrLoc = 688;
-	};
-	B6F3642D11AA1E070045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA7511A0948500C90DCE /* Endian.cpp */;
-		name = "Endian.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 907;
-		vrLoc = 0;
-	};
 	B6F3642F11AA1E150045E114 /* NibbleTest.cpp:76 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -1363,44 +1004,10 @@
 		ignoreCount = 0;
 		lineNumber = 76;
 		location = NibbleTest;
-		modificationTime = 296847682.098918;
+		modificationTime = 296847682.0989181;
 		originalNumberOfMultipleMatches = 1;
 		state = 1;
 	};
-	B6F3646211AA26810045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0611A0AC4800C90DCE /* Adaptor.h */;
-		name = "Adaptor.h: 82";
-		rLen = 0;
-		rLoc = 1806;
-		rType = 0;
-		vrLen = 1168;
-		vrLoc = 442;
-	};
-	B6F3646E11AB35F00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0611A0AC4800C90DCE /* Adaptor.h */;
-		name = "Adaptor.h: 82";
-		rLen = 0;
-		rLoc = 1806;
-		rType = 0;
-		vrLen = 660;
-		vrLoc = 950;
-	};
-	B6F3646F11AB35F00045E114 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-	};
-	B6F3647011AB35F00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 470;
-		vrLoc = 1269;
-	};
 	B6F3647111AB35FE0045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFB0611A0AC4800C90DCE /* Adaptor.h */;
@@ -1411,21 +1018,11 @@
 		vrLen = 1126;
 		vrLoc = 442;
 	};
-	B6F3647211AB35FE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 940;
-		vrLoc = 917;
-	};
 	B6F3647B11AB361D0045E114 /* xattr.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 5434}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 985}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 5512}}";
+			sepNavSelRange = "{6657, 6}";
+			sepNavVisRange = "{5931, 829}";
 		};
 	};
 	B6F3647F11AB36260045E114 /* xattr */ = {
@@ -1461,55 +1058,6 @@
 		sourceDirectories = (
 		);
 	};
-	B6F3649411AB58E80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 940;
-		vrLoc = 917;
-	};
-	B6F3649511AB58E80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B6F3647B11AB361D0045E114 /* xattr.cpp */;
-		name = "xattr.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 985;
-		vrLoc = 0;
-	};
-	B6F3649611AB58E80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */;
-		name = "fuse_pascal.cpp: 187";
-		rLen = 0;
-		rLoc = 4201;
-		rType = 0;
-		vrLen = 970;
-		vrLoc = 3759;
-	};
-	B6F3649711AB58E80045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Prototype for 'File::File(const char*, int, mode_t, const std::nothrow_t&)' does not match any in class 'File'";
-		fRef = B63EFAC911A09DAA00C90DCE /* File.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 34;
-		rType = 1;
-	};
-	B6F3649811AB58E80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFAC911A09DAA00C90DCE /* File.cpp */;
-		name = "File.cpp: 35";
-		rLen = 0;
-		rLoc = 384;
-		rType = 0;
-		vrLen = 571;
-		vrLoc = 0;
-	};
 	B6F3649E11AB59190045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFAC911A09DAA00C90DCE /* File.cpp */;
@@ -1520,74 +1068,6 @@
 		vrLen = 571;
 		vrLoc = 0;
 	};
-	B6F3649F11AB59190045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'File' has not been declared";
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 567;
-		rType = 1;
-	};
-	B6F364A011AB59190045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 281";
-		rLen = 66;
-		rLoc = 12497;
-		rType = 0;
-		vrLen = 849;
-		vrLoc = 5157;
-	};
-	B6F364A511AB593E0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 281";
-		rLen = 66;
-		rLoc = 12497;
-		rType = 0;
-		vrLen = 855;
-		vrLoc = 5157;
-	};
-	B6F364A911AB5EBD0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 281";
-		rLen = 66;
-		rLoc = 12497;
-		rType = 0;
-		vrLen = 855;
-		vrLoc = 5157;
-	};
-	B6F364B111AB74F40045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'kTextFile' was not declared in this scope";
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 670;
-		rType = 1;
-	};
-	B6F364B211AB74F40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 385";
-		rLen = 0;
-		rLoc = 15158;
-		rType = 0;
-		vrLen = 715;
-		vrLoc = 8003;
-	};
-	B6F364B611AB84840045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 385";
-		rLen = 0;
-		rLoc = 15158;
-		rType = 0;
-		vrLen = 715;
-		vrLoc = 8003;
-	};
 	B6F364B711AB84840045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFAD211A09DB500C90DCE /* Exception.h */;
@@ -1598,309 +1078,6 @@
 		vrLen = 1003;
 		vrLoc = 434;
 	};
-	B6F364B811AB84840045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 464";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 563;
-		vrLoc = 8511;
-	};
-	B6F364B911AB84840045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 473";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 546;
-		vrLoc = 8717;
-	};
-	B6F364BE11AC92730045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 473";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 546;
-		vrLoc = 8717;
-	};
-	B6F364BF11AC92730045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'volume' is not a class or namespace";
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 666;
-		rType = 1;
-	};
-	B6F364C011AC92730045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 381";
-		rLen = 0;
-		rLoc = 15070;
-		rType = 0;
-		vrLen = 667;
-		vrLoc = 7907;
-	};
-	B6F364C811ACAB370045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 381";
-		rLen = 0;
-		rLoc = 15070;
-		rType = 0;
-		vrLen = 667;
-		vrLoc = 7907;
-	};
-	B6F364C911ACAB370045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 473";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 546;
-		vrLoc = 8717;
-	};
-	B6F364CA11ACAB370045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 475";
-		rLen = 0;
-		rLoc = 10173;
-		rType = 0;
-		vrLen = 490;
-		vrLoc = 8968;
-	};
-	B6F364E811ACB5790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */;
-		name = "FileEntry.cpp: 86";
-		rLen = 0;
-		rLoc = 1778;
-		rType = 0;
-		vrLen = 851;
-		vrLoc = 1039;
-	};
-	B6F364E911ACB5790045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'void Pascal::VolumeEntry::writeEntry(Pascal::FileEntry*)' is private";
-		fRef = B6F364EA11ACB5790045E114 /* File.h */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 0;
-		rLoc = 6;
-		rType = 1;
-	};
-	B6F364EA11ACB5790045E114 /* File.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = File.h;
-		path = ./Pascal/File.h;
-		sourceTree = "<group>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 948}}";
-			sepNavSelRange = "{165, 0}";
-			sepNavVisRange = "{0, 173}";
-		};
-	};
-	B6F364EB11ACB5790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEB11A244EE00C90DCE /* File.h */;
-		name = "File.h: 141";
-		rLen = 0;
-		rLoc = 165;
-		rType = 0;
-		vrLen = 855;
-		vrLoc = 2292;
-	};
-	B6F364EC11ACB5790045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'_file' was not declared in this scope";
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 154;
-		rType = 1;
-	};
-	B6F364ED11ACB5790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 154";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 1019;
-		vrLoc = 2603;
-	};
-	B6F364F511ACB5B60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 155";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 1113;
-		vrLoc = 2568;
-	};
-	B6F364F811ACBA8E0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 155";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 1113;
-		vrLoc = 2568;
-	};
-	B6F364FD11ACBC470045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 155";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 1113;
-		vrLoc = 2568;
-	};
-	B6F3650011ACBC790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 155";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 1108;
-		vrLoc = 2568;
-	};
-	B6F3650111ACBC790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		rLen = 0;
-		rLoc = 744;
-		rType = 1;
-	};
-	B6F3650211ACBC790045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 869;
-		vrLoc = 8980;
-	};
-	B6F3650511ACBCA40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 470;
-		vrLoc = 1269;
-	};
-	B6F3650611ACBCA40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 334;
-		vrLoc = 10364;
-	};
-	B6F3650911ACBCB30045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 659;
-		vrLoc = 10264;
-	};
-	B6F3650E11ADC40E0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 752;
-		vrLoc = 10264;
-	};
-	B6F3651111ADCA570045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 334;
-		vrLoc = 10364;
-	};
-	B6F3651211ADCA570045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		rLen = 0;
-		rLoc = 107;
-		rType = 1;
-	};
-	B6F3651311ADCA570045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 108";
-		rLen = 0;
-		rLoc = 2072;
-		rType = 0;
-		vrLen = 792;
-		vrLoc = 2635;
-	};
-	B6F3651511ADCA6C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 752;
-		vrLoc = 10264;
-	};
-	B6F3651611ADCA6C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 108";
-		rLen = 0;
-		rLoc = 2072;
-		rType = 0;
-		vrLen = 1135;
-		vrLoc = 2455;
-	};
-	B6F3651711ADCA6C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEA11A244EE00C90DCE /* Entry.cpp */;
-		name = "Entry.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 711;
-		vrLoc = 0;
-	};
-	B6F3651811ADCA6C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEA11A244EE00C90DCE /* Entry.cpp */;
-		name = "Entry.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 711;
-		vrLoc = 0;
-	};
 	B6F3651A11ADD0280045E114 /* VolumeEntry.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {838, 1365}}";
@@ -1910,16 +1087,16 @@
 	};
 	B6F3651B11ADD0280045E114 /* FileEntry.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 1248}}";
-			sepNavSelRange = "{990, 0}";
-			sepNavVisRange = "{0, 1602}";
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 1326}}";
+			sepNavSelRange = "{1407, 0}";
+			sepNavVisRange = "{0, 1668}";
 		};
 	};
 	B6F3651C11ADD0280045E114 /* Entry.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 1079}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 1079}}";
 			sepNavSelRange = "{1399, 0}";
-			sepNavVisRange = "{146, 1332}";
+			sepNavVisRange = "{0, 605}";
 		};
 	};
 	B6F3652711ADD52B0045E114 /* Pascal.h */ = {
@@ -1939,16 +1116,6 @@
 		vrLen = 173;
 		vrLoc = 0;
 	};
-	B6F3652F11ADD5D20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBE911A244EE00C90DCE /* Date.h */;
-		name = "Date.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 672;
-		vrLoc = 0;
-	};
 	B6F3653011ADD5D20045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFBEA11A244EE00C90DCE /* Entry.cpp */;
@@ -1959,201 +1126,7 @@
 		vrLen = 712;
 		vrLoc = 0;
 	};
-	B6F3653111ADD5D20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B6F3651C11ADD0280045E114 /* Entry.h */;
-		name = "Entry.h: 72";
-		rLen = 0;
-		rLoc = 1399;
-		rType = 0;
-		vrLen = 873;
-		vrLoc = 605;
-	};
-	B6F3653211ADD5D20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */;
-		name = "FileEntry.cpp: 283";
-		rLen = 0;
-		rLoc = 6452;
-		rType = 0;
-		vrLen = 1018;
-		vrLoc = 5738;
-	};
-	B6F3653311ADD5D20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 752;
-		vrLoc = 10266;
-	};
-	B6F3653411ADD5D20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 935;
-		vrLoc = 10277;
-	};
-	B6F3654311ADE1C20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 935;
-		vrLoc = 10277;
-	};
-	B6F3654411ADE1C20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 108";
-		rLen = 0;
-		rLoc = 2074;
-		rType = 0;
-		vrLen = 1135;
-		vrLoc = 2457;
-	};
-	B6F3654511ADE1C20045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 108";
-		rLen = 0;
-		rLoc = 2074;
-		rType = 0;
-		vrLen = 1135;
-		vrLoc = 2457;
-	};
-	B6F3654711ADE3680045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 108";
-		rLen = 0;
-		rLoc = 2074;
-		rType = 0;
-		vrLen = 1135;
-		vrLoc = 2457;
-	};
-	B6F3654C11AE03E00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 159";
-		rLen = 0;
-		rLoc = 3423;
-		rType = 0;
-		vrLen = 941;
-		vrLoc = 1990;
-	};
-	B6F3654F11AE060D0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 159";
-		rLen = 0;
-		rLoc = 3423;
-		rType = 0;
-		vrLen = 858;
-		vrLoc = 1990;
-	};
-	B6F3655011AE060D0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		rLen = 0;
-		rLoc = 744;
-		rType = 1;
-	};
-	B6F3655111AE060D0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 741;
-		vrLoc = 10277;
-	};
-	B6F3655511AE06710045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 648;
-		vrLoc = 10277;
-	};
-	B6F3655B11AE09D60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 286;
-		vrLoc = 10318;
-	};
-	B6F3655C11AE09D60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		rLen = 0;
-		rLoc = 153;
-		rType = 1;
-	};
-	B6F3655D11AE09D60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 154";
-		rLen = 0;
-		rLoc = 3160;
-		rType = 0;
-		vrLen = 788;
-		vrLoc = 2637;
-	};
-	B6F3656611AE142B0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 488";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 935;
-		vrLoc = 10277;
-	};
-	B6F3656711AE142B0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 188";
-		rLen = 0;
-		rLoc = 4064;
-		rType = 0;
-		vrLen = 1097;
-		vrLoc = 2544;
-	};
-	B6F3656811AE142F0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 188";
-		rLen = 0;
-		rLoc = 4064;
-		rType = 0;
-		vrLen = 1097;
-		vrLoc = 2544;
-	};
-	B6F3657511AE24680045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 197";
-		rLen = 0;
-		rLoc = 4315;
-		rType = 0;
-		vrLen = 503;
-		vrLoc = 2616;
-	};
-	B6F3657711AE24C40045E114 /* apfm.cpp:470 */ = {
+	B6F3657711AE24C40045E114 /* apfm.cpp:589 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -2165,31 +1138,11 @@
 		functionName = "action_rm(int argc, char **argv, Pascal::VolumeEntry *volume)";
 		hitCount = 0;
 		ignoreCount = 0;
-		lineNumber = 470;
+		lineNumber = 589;
 		modificationTime = 296847686.349254;
 		originalNumberOfMultipleMatches = 1;
 		state = 1;
 	};
-	B6F3657911AE24CC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 197";
-		rLen = 0;
-		rLoc = 4315;
-		rType = 0;
-		vrLen = 952;
-		vrLoc = 2475;
-	};
-	B6F3657D11AE255B0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 197";
-		rLen = 0;
-		rLoc = 4315;
-		rType = 0;
-		vrLen = 952;
-		vrLoc = 2475;
-	};
 	B6F3657E11AE255B0045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFBE911A244EE00C90DCE /* Date.h */;
@@ -2200,568 +1153,12 @@
 		vrLen = 654;
 		vrLoc = 0;
 	};
-	B6F3657F11AE255B0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		rLen = 0;
-		rLoc = 744;
-		rType = 1;
-	};
-	B6F3658011AE255B0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 495";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 569;
-		vrLoc = 10265;
-	};
-	B6F3658111AE256A0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 197";
-		rLen = 0;
-		rLoc = 4315;
-		rType = 0;
-		vrLen = 503;
-		vrLoc = 2616;
-	};
-	B6F3658211AE256A0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 495";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 450;
-		vrLoc = 10578;
-	};
-	B6F3658311AE25700045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 495";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 1242;
-		vrLoc = 10459;
-	};
-	B6F3658611AE25830045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 495";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 1233;
-		vrLoc = 10459;
-	};
-	B6F3659B11AE27760045E114 /* VolumeEntry.cpp:300 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = B6F3659C11AE27760045E114 /* VolumeEntry.cpp */;
-		functionName = "VolumeEntry::unlink(const char *name)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 300;
-		location = NibbleTest;
-		modificationTime = 296847681.826089;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	B6F3659C11AE27760045E114 /* VolumeEntry.cpp */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.cpp.cpp;
-		name = VolumeEntry.cpp;
-		path = /Users/kelvin/Projects/PROFuseX/./Pascal/VolumeEntry.cpp;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1178, 7501}}";
-			sepNavSelRange = "{6306, 0}";
-			sepNavVisRange = "{6660, 576}";
-		};
-	};
-	B6F3659E11AE27790045E114 /* VolumeEntry.cpp:311 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = B6F3659C11AE27760045E114 /* VolumeEntry.cpp */;
-		functionName = "VolumeEntry::unlink(const char *name)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 311;
-		location = NibbleTest;
-		modificationTime = 296847681.868784;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	B6F365A211AE27A80045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 495";
-		rLen = 0;
-		rLoc = 16395;
-		rType = 0;
-		vrLen = 1317;
-		vrLoc = 10657;
-	};
-	B6F365A411AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 286";
-		rLen = 0;
-		rLoc = 6306;
-		rType = 0;
-		vrLen = 600;
-		vrLoc = 7515;
-	};
-	B6F365A511AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFACB11A09DAA00C90DCE /* MappedFile.cpp */;
-		name = "MappedFile.cpp: 42";
-		rLen = 0;
-		rLoc = 725;
-		rType = 0;
-		vrLen = 315;
-		vrLoc = 639;
-	};
-	B6F365A611AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA9511A094E000C90DCE /* BlockDevice.cpp */;
-		name = "BlockDevice.cpp: 111";
-		rLen = 0;
-		rLoc = 2416;
-		rType = 0;
-		vrLen = 511;
-		vrLoc = 2414;
-	};
-	B6F365A711AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFA9D11A094E000C90DCE /* DiskImage.cpp */;
-		name = "DiskImage.cpp: 41";
-		rLen = 0;
-		rLoc = 593;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 372;
-	};
-	B6F365A811AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 246";
-		rLen = 0;
-		rLoc = 10518;
-		rType = 0;
-		vrLen = 475;
-		vrLoc = 4825;
-	};
-	B6F365A911AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B6F3659C11AE27760045E114 /* VolumeEntry.cpp */;
-		rLen = 0;
-		rLoc = 285;
-		rType = 1;
-	};
-	B6F365AA11AE27BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B6F3659C11AE27760045E114 /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 286";
-		rLen = 0;
-		rLoc = 6306;
-		rType = 0;
-		vrLen = 576;
-		vrLoc = 6660;
-	};
-	B6F365AD11AE27CC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 286";
-		rLen = 0;
-		rLoc = 6306;
-		rType = 0;
-		vrLen = 1053;
-		vrLoc = 6356;
-	};
-	B6F365AE11AE27CC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		rLen = 0;
-		rLoc = 469;
-		rType = 1;
-	};
-	B6F365AF11AE27CC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 246";
-		rLen = 0;
-		rLoc = 10518;
-		rType = 0;
-		vrLen = 794;
-		vrLoc = 4641;
-	};
-	B6F365B111AE28340045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
-		name = "apfm.cpp: 246";
-		rLen = 0;
-		rLoc = 10518;
-		rType = 0;
-		vrLen = 794;
-		vrLoc = 4641;
-	};
-	B6F365B411AF40320045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 286";
-		rLen = 0;
-		rLoc = 6306;
-		rType = 0;
-		vrLen = 1082;
-		vrLoc = 6356;
-	};
-	B6F365B711AF62E00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		rLen = 0;
-		rLoc = 285;
-		rType = 1;
-	};
-	B6F365B811AF62E00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 277";
-		rLen = 0;
-		rLoc = 5977;
-		rType = 0;
-		vrLen = 446;
-		vrLoc = 7467;
-	};
-	B6F365CA11B08AE30045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 282";
-		rLen = 0;
-		rLoc = 6025;
-		rType = 0;
-		vrLen = 1001;
-		vrLoc = 7234;
-	};
-	B6F365CB11B08AE30045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Invalid use of incomplete type 'struct Device::BlockDevice'";
-		fRef = B6F365CC11B08AE30045E114 /* VolumeEntry.h */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 47;
-		rType = 1;
-	};
 	B6F365CC11B08AE30045E114 /* VolumeEntry.h */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
 		name = VolumeEntry.h;
 		path = ./Pascal/VolumeEntry.h;
 		sourceTree = "<group>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {701, 1326}}";
-			sepNavSelRange = "{1475, 0}";
-			sepNavVisRange = "{0, 1803}";
-		};
-	};
-	B6F365CD11B08AE30045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B6F3651A11ADD0280045E114 /* VolumeEntry.h */;
-		name = "VolumeEntry.h: 9";
-		rLen = 0;
-		rLoc = 145;
-		rType = 0;
-		vrLen = 974;
-		vrLoc = 0;
-	};
-	B6F365CE11B08AE30045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365CF11B08AE30045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365E511B09E510045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365E811B09EFD0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365EB11B09F2A0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365EE11B0A6010045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365F111B0A6BE0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365F411B169C00045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365F611B169D40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1240;
-		vrLoc = 4971;
-	};
-	B6F365F711B169D40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 983;
-		vrLoc = 874;
-	};
-	B6F365F811B169D40045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 982;
-		vrLoc = 874;
-	};
-	B6F365FA11B16A690045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 997;
-		vrLoc = 874;
-	};
-	B6F3660311B16D9F0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 70";
-		rLen = 0;
-		rLoc = 1607;
-		rType = 0;
-		vrLen = 997;
-		vrLoc = 874;
-	};
-	B6F3660411B16D9F0045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Redefinition of 'unsigned int Pascal::VolumeEntry::rename(const char*, const char*)'";
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 383;
-		rType = 1;
-	};
-	B6F3660511B16D9F0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 702;
-		vrLoc = 8131;
-	};
-	B6F3660A11B174830045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 702;
-		vrLoc = 8131;
-	};
-	B6F3660E11B175EA0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 8131;
-	};
-	B6F3661511B1762C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 8131;
-	};
-	B6F3661A11B176960045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 8131;
-	};
-	B6F3662011B177B60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 362;
-		vrLoc = 8206;
-	};
-	B6F3662111B177B60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 74";
-		rLen = 0;
-		rLoc = 1680;
-		rType = 0;
-		vrLen = 469;
-		vrLoc = 1396;
-	};
-	B6F3662211B177B60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		rLen = 0;
-		rLoc = 166;
-		rType = 1;
-	};
-	B6F3662311B177B60045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 533;
-		vrLoc = 8484;
-	};
-	B6F3662D11B178720045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFEA511A488C200C90DCE /* VolumeEntry.cpp */;
-		name = "VolumeEntry.cpp: 384";
-		rLen = 0;
-		rLoc = 8503;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 8131;
-	};
-	B6F3662E11B178720045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 1182;
-		vrLoc = 8279;
-	};
-	B6F3662F11B178720045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 1084;
-		vrLoc = 8365;
-	};
-	B6F3663411B178EB0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 1125;
-		vrLoc = 8365;
-	};
-	B6F3663811B179290045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 1125;
-		vrLoc = 8365;
 	};
 	B6F3663D11B1809A0045E114 /* Adaptor.cpp:167 */ = {
 		isa = PBXFileBreakpoint;
@@ -2781,53 +1178,6 @@
 		originalNumberOfMultipleMatches = 1;
 		state = 1;
 	};
-	B6F3664111B181C10045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 984;
-		vrLoc = 8112;
-	};
-	B6F3665011B189490045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 167";
-		rLen = 0;
-		rLoc = 3653;
-		rType = 0;
-		vrLen = 933;
-		vrLoc = 7817;
-	};
-	B6F3665111B190300045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
-		name = "Adaptor.cpp: 262";
-		rLen = 0;
-		rLoc = 6174;
-		rType = 0;
-		vrLen = 746;
-		vrLoc = 5474;
-	};
-	B6F3665211B190300045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		rLen = 0;
-		rLoc = 75;
-		rType = 1;
-	};
-	B6F3665311B190300045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 76";
-		rLen = 0;
-		rLoc = 1680;
-		rType = 0;
-		vrLen = 607;
-		vrLoc = 1479;
-	};
 	B6F3665411B190370045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */;
@@ -2838,26 +1188,6 @@
 		vrLen = 933;
 		vrLoc = 7817;
 	};
-	B6F3665511B190370045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 76";
-		rLen = 0;
-		rLoc = 1680;
-		rType = 0;
-		vrLen = 961;
-		vrLoc = 1203;
-	};
-	B6F3665911B191C90045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
-		name = "NibbleTest.cpp: 76";
-		rLen = 0;
-		rLoc = 1680;
-		rType = 0;
-		vrLen = 951;
-		vrLoc = 1203;
-	};
 	B6F3665C11B194AC0045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B656AEFE11AA0F8C00AB578A /* NibbleTest.cpp */;
@@ -2868,46 +1198,16 @@
 		vrLen = 951;
 		vrLoc = 1203;
 	};
-	B6F3665D11B194AC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 221";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1277;
-		vrLoc = 4934;
-	};
-	B6F3665E11B194AC0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
-		name = "newfs_pascal.cpp: 224";
-		rLen = 0;
-		rLoc = 5494;
-		rType = 0;
-		vrLen = 1267;
-		vrLoc = 5050;
-	};
 	B6F366C211B1A28C0045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */;
 		name = "newfs_pascal.cpp: 227";
 		rLen = 0;
-		rLoc = 5494;
+		rLoc = 5474;
 		rType = 0;
 		vrLen = 1282;
 		vrLoc = 4530;
 	};
-	B6F366C311B1A28C0045E114 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B63EFCC811A366C800C90DCE /* MappedFile.h */;
-		name = "MappedFile.h: 17";
-		rLen = 0;
-		rLoc = 263;
-		rType = 0;
-		vrLen = 874;
-		vrLoc = 0;
-	};
 	B6F366C411B1A28C0045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFACB11A09DAA00C90DCE /* MappedFile.cpp */;
@@ -2993,21 +1293,12 @@
 		fRef = B63EFC9F11A35F8F00C90DCE /* apfm.cpp */;
 		name = "apfm.cpp: 755";
 		rLen = 0;
-		rLoc = 16564;
+		rLoc = 22959;
 		rType = 0;
 		vrLen = 884;
 		vrLoc = 15404;
 	};
-	B6F366CD11B1A28C0045E114 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Unused variable 'readOnly'";
-		fRef = B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 0;
-		rLoc = 194;
-		rType = 1;
-	};
-	B6F366CE11B1A28C0045E114 /* PBXTextBookmark */ = {
+	B6F366D911B1A7A70045E114 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */;
 		name = "fuse_pascal.cpp: 195";
@@ -3017,4 +1308,178 @@
 		vrLen = 1077;
 		vrLoc = 3977;
 	};
+	B6F3670611B2B47E0045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFA9611A094E000C90DCE /* BlockDevice.h */;
+		name = "BlockDevice.h: 24";
+		rLen = 0;
+		rLoc = 431;
+		rType = 0;
+		vrLen = 917;
+		vrLoc = 0;
+	};
+	B6F3675411B316D10045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */;
+		name = "FileEntry.cpp: 113";
+		rLen = 0;
+		rLoc = 2383;
+		rType = 0;
+		vrLen = 767;
+		vrLoc = 1707;
+	};
+	B6F3676311B323680045E114 /* TextWriter.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 958}}";
+			sepNavSelRange = "{420, 0}";
+			sepNavVisRange = "{0, 587}";
+		};
+	};
+	B6F3676411B323680045E114 /* TextWriter.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {838, 1352}}";
+			sepNavSelRange = "{315, 0}";
+			sepNavVisRange = "{0, 803}";
+		};
+	};
+	B6F3677C11B326580045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F365CC11B08AE30045E114 /* VolumeEntry.h */;
+		name = "VolumeEntry.h: 51";
+		rLen = 56;
+		rLoc = 1259;
+		rType = 0;
+		vrLen = 1094;
+		vrLoc = 758;
+	};
+	B6F3677D11B326580045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F3651C11ADD0280045E114 /* Entry.h */;
+		name = "Entry.h: 72";
+		rLen = 0;
+		rLoc = 1399;
+		rType = 0;
+		vrLen = 605;
+		vrLoc = 0;
+	};
+	B6F3677E11B326580045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F3676311B323680045E114 /* TextWriter.h */;
+		name = "TextWriter.h: 36";
+		rLen = 0;
+		rLoc = 587;
+		rType = 0;
+		vrLen = 532;
+		vrLoc = 0;
+	};
+	B6F3677F11B326580045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F3651B11ADD0280045E114 /* FileEntry.h */;
+		name = "FileEntry.h: 41";
+		rLen = 0;
+		rLoc = 1069;
+		rType = 0;
+		vrLen = 933;
+		vrLoc = 1184;
+	};
+	B6F367A011B330D10045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFACA11A09DAA00C90DCE /* File.h */;
+		name = "File.h: 21";
+		rLen = 0;
+		rLoc = 244;
+		rType = 0;
+		vrLen = 749;
+		vrLoc = 0;
+	};
+	B6F367AE11B337A70045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFCC811A366C800C90DCE /* MappedFile.h */;
+		name = "MappedFile.h: 17";
+		rLen = 0;
+		rLoc = 263;
+		rType = 0;
+		vrLen = 874;
+		vrLoc = 0;
+	};
+	B6F367E911B40F650045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFAB711A098C400C90DCE /* BlockCache.h */;
+		name = "BlockCache.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 940;
+		vrLoc = 148;
+	};
+	B6F3682111B430870045E114 /* newfs_prodos.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1009, 3185}}";
+			sepNavSelRange = "{266, 0}";
+			sepNavVisRange = "{0, 1849}";
+		};
+	};
+	B6F3682411B431AC0045E114 /* newfs_prodos */ = {
+		activeExec = 0;
+		executables = (
+			B6F3682611B431AC0045E114 /* newfs_prodos */,
+		);
+	};
+	B6F3682611B431AC0045E114 /* newfs_prodos */ = {
+		isa = PBXExecutable;
+		activeArgIndices = (
+		);
+		argumentStrings = (
+		);
+		autoAttachOnCrash = 1;
+		breakpointsEnabled = 0;
+		configStateDict = {
+		};
+		customDataFormattersEnabled = 1;
+		dataTipCustomDataFormattersEnabled = 1;
+		dataTipShowTypeColumn = 1;
+		dataTipSortType = 0;
+		debuggerPlugin = GDBDebugging;
+		disassemblyDisplayState = 0;
+		enableDebugStr = 1;
+		environmentEntries = (
+		);
+		executableSystemSymbolLevel = 0;
+		executableUserSymbolLevel = 0;
+		libgmallocEnabled = 0;
+		name = newfs_prodos;
+		showTypeColumn = 0;
+		sourceDirectories = (
+		);
+	};
+	B6F3684911B44D090045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B63EFA7511A0948500C90DCE /* Endian.cpp */;
+		name = "Endian.cpp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 868;
+		vrLoc = 0;
+	};
+	B6F3684A11B44D090045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F3676411B323680045E114 /* TextWriter.cpp */;
+		name = "TextWriter.cpp: 17";
+		rLen = 0;
+		rLoc = 315;
+		rType = 0;
+		vrLen = 803;
+		vrLoc = 0;
+	};
+	B6F3684B11B44D090045E114 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6F3682111B430870045E114 /* newfs_prodos.cpp */;
+		name = "newfs_prodos.cpp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1184;
+		vrLoc = 0;
+	};
 }
diff --git a/PROFuseX.xcodeproj/kelvin.perspectivev3 b/PROFuseX.xcodeproj/kelvin.perspectivev3
index 58876dd..ff5f128 100644
--- a/PROFuseX.xcodeproj/kelvin.perspectivev3
+++ b/PROFuseX.xcodeproj/kelvin.perspectivev3
@@ -231,6 +231,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -270,7 +272,9 @@
 								<string>B63EFBE711A244EE00C90DCE</string>
 								<string>B63EFACF11A09DB500C90DCE</string>
 								<string>B63EFAC811A09DAA00C90DCE</string>
+								<string>B63EFAB511A098C400C90DCE</string>
 								<string>B63EFA9411A094E000C90DCE</string>
+								<string>B63EFA7411A0948500C90DCE</string>
 								<string>1AB674ADFE9D54B511CA2CBB</string>
 								<string>B656ADED11A84D3200AB578A</string>
 								<string>1C37FBAC04509CD000000102</string>
@@ -279,8 +283,8 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>42</integer>
-									<integer>29</integer>
+									<integer>14</integer>
+									<integer>8</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -302,7 +306,7 @@
 							<real>318</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>547 105 1239 1000 0 0 1920 1178 </string>
+						<string>303 109 1239 1000 0 0 1920 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -313,14 +317,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>B63EFA6111A093C200C90DCE</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>fuse_pascal.cpp</string>
+								<string>VolumeEntry.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -328,11 +330,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>B63EFA6211A093C200C90DCE</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>fuse_pascal.cpp</string>
+										<string>VolumeEntry.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>B6F366CE11B1A28C0045E114</string>
+										<string>B65CFB8811B5C8310024A2D9</string>
 										<key>history</key>
 										<array>
 											<string>B63EFC2611A2D5A400C90DCE</string>
@@ -347,12 +349,10 @@
 											<string>B63EFDB111A4488200C90DCE</string>
 											<string>B63EFDB311A4488200C90DCE</string>
 											<string>B63EFDB711A4488200C90DCE</string>
-											<string>B63EFDC711A4494C00C90DCE</string>
 											<string>B63EFDF211A4504200C90DCE</string>
 											<string>B63EFEA011A488C200C90DCE</string>
 											<string>B63EFEA111A488C200C90DCE</string>
 											<string>B63EFEA811A488C200C90DCE</string>
-											<string>B63EFEEC11A4A70400C90DCE</string>
 											<string>B6E5F0DD11A60726000AD141</string>
 											<string>B6E5F0F211A73144000AD141</string>
 											<string>B6E5F11211A73340000AD141</string>
@@ -360,22 +360,15 @@
 											<string>B6E5F18211A76B74000AD141</string>
 											<string>B656AE2411A84FA400AB578A</string>
 											<string>B656AE2611A84FA400AB578A</string>
-											<string>B6F3642D11AA1E070045E114</string>
 											<string>B6F3647111AB35FE0045E114</string>
-											<string>B6F3649511AB58E80045E114</string>
 											<string>B6F3649E11AB59190045E114</string>
 											<string>B6F364B711AB84840045E114</string>
 											<string>B6F3652E11ADD5D20045E114</string>
 											<string>B6F3653011ADD5D20045E114</string>
-											<string>B6F3653111ADD5D20045E114</string>
 											<string>B6F3657E11AE255B0045E114</string>
-											<string>B6F365CB11B08AE30045E114</string>
-											<string>B6F365CD11B08AE30045E114</string>
-											<string>B6F3662D11B178720045E114</string>
 											<string>B6F3665411B190370045E114</string>
 											<string>B6F3665C11B194AC0045E114</string>
 											<string>B6F366C211B1A28C0045E114</string>
-											<string>B6F366C311B1A28C0045E114</string>
 											<string>B6F366C411B1A28C0045E114</string>
 											<string>B6F366C511B1A28C0045E114</string>
 											<string>B6F366C611B1A28C0045E114</string>
@@ -385,7 +378,22 @@
 											<string>B6F366CA11B1A28C0045E114</string>
 											<string>B6F366CB11B1A28C0045E114</string>
 											<string>B6F366CC11B1A28C0045E114</string>
-											<string>B6F366CD11B1A28C0045E114</string>
+											<string>B6F366D911B1A7A70045E114</string>
+											<string>B6F3670611B2B47E0045E114</string>
+											<string>B6F3675411B316D10045E114</string>
+											<string>B6F3677C11B326580045E114</string>
+											<string>B6F3677D11B326580045E114</string>
+											<string>B6F3677E11B326580045E114</string>
+											<string>B6F3677F11B326580045E114</string>
+											<string>B6F367A011B330D10045E114</string>
+											<string>B6F367AE11B337A70045E114</string>
+											<string>B6F367E911B40F650045E114</string>
+											<string>B6F3684911B44D090045E114</string>
+											<string>B6F3684A11B44D090045E114</string>
+											<string>B6F3684B11B44D090045E114</string>
+											<string>B65CFB6911B495790024A2D9</string>
+											<string>B65CFB6A11B495790024A2D9</string>
+											<string>B65CFB6B11B495790024A2D9</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -399,18 +407,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {899, 562}}</string>
+								<string>{{0, 0}, {899, 544}}</string>
 								<key>RubberWindowFrame</key>
-								<string>547 105 1239 1000 0 0 1920 1178 </string>
+								<string>303 109 1239 1000 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>562pt</string>
+							<string>544pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>392pt</string>
+							<string>410pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -424,7 +432,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {899, 365}}</string>
+										<string>{{10, 27}, {0, -27}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -440,7 +448,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {899, 365}}</string>
+										<string>{{10, 27}, {899, 383}}</string>
+										<key>RubberWindowFrame</key>
+										<string>303 109 1239 1000 0 0 1920 1178 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXProjectFindModule</string>
@@ -479,8 +489,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {899, 365}}</string>
-										<key>RubberWindowFrame</key>
-										<string>547 105 1239 1000 0 0 1920 1178 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -508,11 +516,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>B6F3647311AB35FE0045E114</string>
+				<string>B65CFB8911B5C8310024A2D9</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>B6F3647411AB35FE0045E114</string>
+				<string>B65CFB8A11B5C8310024A2D9</string>
 				<string>B63EFA6111A093C200C90DCE</string>
-				<string>B6F3647511AB35FE0045E114</string>
+				<string>B65CFB8B11B5C8310024A2D9</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -702,17 +710,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>B6F3650F11ADC40E0045E114</string>
-		<string>B6F3651011ADC40E0045E114</string>
-		<string>B6F366CF11B1A28C0045E114</string>
-		<string>B6F3665F11B194AC0045E114</string>
-		<string>B6F366D011B1A28C0045E114</string>
-		<string>B6F366D111B1A28C0045E114</string>
-		<string>B6F366D211B1A28C0045E114</string>
+		<string>B65CFB8C11B5C8310024A2D9</string>
 		<string>/Users/kelvin/Projects/PROFuseX/PROFuseX.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>547 105 1239 1000 0 0 1920 1178 </string>
+	<string>303 109 1239 1000 0 0 1920 1178 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/PROFuseX.xcodeproj/project.pbxproj b/PROFuseX.xcodeproj/project.pbxproj
index 0177646..be72592 100644
--- a/PROFuseX.xcodeproj/project.pbxproj
+++ b/PROFuseX.xcodeproj/project.pbxproj
@@ -90,6 +90,26 @@
 		B656AF1A11AA106C00AB578A /* FileEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFBEC11A244EE00C90DCE /* FileEntry.cpp */; };
 		B656AF1B11AA106C00AB578A /* VolumeEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFBF111A244EE00C90DCE /* VolumeEntry.cpp */; };
 		B6F3648511AB363B0045E114 /* xattr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3647B11AB361D0045E114 /* xattr.cpp */; };
+		B6F3676511B323680045E114 /* TextWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3676411B323680045E114 /* TextWriter.cpp */; };
+		B6F3676611B323680045E114 /* TextWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3676411B323680045E114 /* TextWriter.cpp */; };
+		B6F3676711B323680045E114 /* TextWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3676411B323680045E114 /* TextWriter.cpp */; };
+		B6F3676811B323680045E114 /* TextWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3676411B323680045E114 /* TextWriter.cpp */; };
+		B6F3682A11B431CC0045E114 /* Endian.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFA7511A0948500C90DCE /* Endian.cpp */; };
+		B6F3682B11B431CC0045E114 /* BlockDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFA9511A094E000C90DCE /* BlockDevice.cpp */; };
+		B6F3682C11B431CC0045E114 /* DavexDiskImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFA9711A094E000C90DCE /* DavexDiskImage.cpp */; };
+		B6F3682D11B431CC0045E114 /* DiskCopy42Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFA9B11A094E000C90DCE /* DiskCopy42Image.cpp */; };
+		B6F3682E11B431CC0045E114 /* DiskImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFA9D11A094E000C90DCE /* DiskImage.cpp */; };
+		B6F3682F11B431CC0045E114 /* RawDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAA111A094E000C90DCE /* RawDevice.cpp */; };
+		B6F3683011B431CC0045E114 /* UniversalDiskImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAA411A094E000C90DCE /* UniversalDiskImage.cpp */; };
+		B6F3683111B431CC0045E114 /* BlockCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAB611A098C400C90DCE /* BlockCache.cpp */; };
+		B6F3683211B431CC0045E114 /* ConcreteBlockCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAB811A098C400C90DCE /* ConcreteBlockCache.cpp */; };
+		B6F3683311B431CC0045E114 /* MappedBlockCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFABA11A098C400C90DCE /* MappedBlockCache.cpp */; };
+		B6F3683411B431CC0045E114 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAC911A09DAA00C90DCE /* File.cpp */; };
+		B6F3683511B431CC0045E114 /* MappedFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFACB11A09DAA00C90DCE /* MappedFile.cpp */; };
+		B6F3683611B431CC0045E114 /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAD111A09DB500C90DCE /* Exception.cpp */; };
+		B6F3683711B431CC0045E114 /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFAD311A09DB500C90DCE /* Lock.cpp */; };
+		B6F3683811B431CC0045E114 /* Adaptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EFB0711A0AC4800C90DCE /* Adaptor.cpp */; };
+		B6F3683F11B431E20045E114 /* newfs_prodos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6F3682111B430870045E114 /* newfs_prodos.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -148,6 +168,10 @@
 		B6F3651B11ADD0280045E114 /* FileEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileEntry.h; sourceTree = "<group>"; };
 		B6F3651C11ADD0280045E114 /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Entry.h; sourceTree = "<group>"; };
 		B6F3652711ADD52B0045E114 /* Pascal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pascal.h; sourceTree = "<group>"; };
+		B6F3676311B323680045E114 /* TextWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextWriter.h; sourceTree = "<group>"; };
+		B6F3676411B323680045E114 /* TextWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextWriter.cpp; sourceTree = "<group>"; };
+		B6F3682111B430870045E114 /* newfs_prodos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newfs_prodos.cpp; sourceTree = "<group>"; };
+		B6F3682511B431AC0045E114 /* newfs_prodos */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = newfs_prodos; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -187,6 +211,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B6F3682311B431AC0045E114 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -199,6 +230,7 @@
 				B63EFC9B11A35F7B00C90DCE /* newfs_pascal.cpp */,
 				B63EFC9911A35F7200C90DCE /* fuse_pascal.cpp */,
 				B63EFC9D11A35F8200C90DCE /* fuse_pascal_ops.cpp */,
+				B6F3682111B430870045E114 /* newfs_prodos.cpp */,
 				B63EFBE711A244EE00C90DCE /* Pascal */,
 				B63EFACF11A09DB500C90DCE /* ProFUSE */,
 				B63EFAC811A09DAA00C90DCE /* File */,
@@ -219,6 +251,7 @@
 				B656AE0311A84F5800AB578A /* fuse_pascal */,
 				B656AF0311AA105500AB578A /* NibbleTest */,
 				B6F3648011AB36260045E114 /* xattr */,
+				B6F3682511B431AC0045E114 /* newfs_prodos */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -304,6 +337,8 @@
 				B6F3651A11ADD0280045E114 /* VolumeEntry.h */,
 				B6F3651B11ADD0280045E114 /* FileEntry.h */,
 				B6F3651C11ADD0280045E114 /* Entry.h */,
+				B6F3676311B323680045E114 /* TextWriter.h */,
+				B6F3676411B323680045E114 /* TextWriter.cpp */,
 			);
 			path = Pascal;
 			sourceTree = "<group>";
@@ -399,6 +434,22 @@
 			productReference = B6F3648011AB36260045E114 /* xattr */;
 			productType = "com.apple.product-type.tool";
 		};
+		B6F3682411B431AC0045E114 /* newfs_prodos */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B6F3684111B432000045E114 /* Build configuration list for PBXNativeTarget "newfs_prodos" */;
+			buildPhases = (
+				B6F3682211B431AC0045E114 /* Sources */,
+				B6F3682311B431AC0045E114 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = newfs_prodos;
+			productName = newfs_prodos;
+			productReference = B6F3682511B431AC0045E114 /* newfs_prodos */;
+			productType = "com.apple.product-type.tool";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -416,6 +467,7 @@
 				B656AE0211A84F5800AB578A /* fuse_pascal */,
 				B656AF0211AA105500AB578A /* NibbleTest */,
 				B6F3647F11AB36260045E114 /* xattr */,
+				B6F3682411B431AC0045E114 /* newfs_prodos */,
 			);
 		};
 /* End PBXProject section */
@@ -445,6 +497,7 @@
 				B63EFCE311A36C8B00C90DCE /* FileEntry.cpp in Sources */,
 				B63EFCE511A36C8B00C90DCE /* VolumeEntry.cpp in Sources */,
 				B63EFCE911A36C8B00C90DCE /* apfm.cpp in Sources */,
+				B6F3676711B323680045E114 /* TextWriter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -472,6 +525,7 @@
 				B63EFE9611A4888500C90DCE /* FileEntry.cpp in Sources */,
 				B63EFE9711A4888500C90DCE /* VolumeEntry.cpp in Sources */,
 				B63EFE9911A4888500C90DCE /* newfs_pascal.cpp in Sources */,
+				B6F3676811B323680045E114 /* TextWriter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -500,6 +554,7 @@
 				B656AE1911A84F7700AB578A /* Entry.cpp in Sources */,
 				B656AE1A11A84F7700AB578A /* FileEntry.cpp in Sources */,
 				B656AE1B11A84F7700AB578A /* VolumeEntry.cpp in Sources */,
+				B6F3676511B323680045E114 /* TextWriter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -527,6 +582,7 @@
 				B656AF1A11AA106C00AB578A /* FileEntry.cpp in Sources */,
 				B656AF1B11AA106C00AB578A /* VolumeEntry.cpp in Sources */,
 				B656AF0811AA106400AB578A /* NibbleTest.cpp in Sources */,
+				B6F3676611B323680045E114 /* TextWriter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -538,6 +594,29 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B6F3682211B431AC0045E114 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B6F3682A11B431CC0045E114 /* Endian.cpp in Sources */,
+				B6F3682B11B431CC0045E114 /* BlockDevice.cpp in Sources */,
+				B6F3682C11B431CC0045E114 /* DavexDiskImage.cpp in Sources */,
+				B6F3682D11B431CC0045E114 /* DiskCopy42Image.cpp in Sources */,
+				B6F3682E11B431CC0045E114 /* DiskImage.cpp in Sources */,
+				B6F3682F11B431CC0045E114 /* RawDevice.cpp in Sources */,
+				B6F3683011B431CC0045E114 /* UniversalDiskImage.cpp in Sources */,
+				B6F3683111B431CC0045E114 /* BlockCache.cpp in Sources */,
+				B6F3683211B431CC0045E114 /* ConcreteBlockCache.cpp in Sources */,
+				B6F3683311B431CC0045E114 /* MappedBlockCache.cpp in Sources */,
+				B6F3683411B431CC0045E114 /* File.cpp in Sources */,
+				B6F3683511B431CC0045E114 /* MappedFile.cpp in Sources */,
+				B6F3683611B431CC0045E114 /* Exception.cpp in Sources */,
+				B6F3683711B431CC0045E114 /* Lock.cpp in Sources */,
+				B6F3683811B431CC0045E114 /* Adaptor.cpp in Sources */,
+				B6F3683F11B431E20045E114 /* newfs_prodos.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
@@ -805,6 +884,48 @@
 			};
 			name = Release;
 		};
+		B6F3682711B431AC0045E114 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				INSTALL_PATH = /usr/local/bin;
+				PREBINDING = NO;
+				PRODUCT_NAME = newfs_prodos;
+			};
+			name = Debug;
+		};
+		B6F3682811B431AC0045E114 /* Debug fuse */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/bin;
+				PREBINDING = NO;
+				PRODUCT_NAME = newfs_prodos;
+			};
+			name = "Debug fuse";
+		};
+		B6F3682911B431AC0045E114 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/bin;
+				PREBINDING = NO;
+				PRODUCT_NAME = newfs_prodos;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -868,6 +989,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		B6F3684111B432000045E114 /* Build configuration list for PBXNativeTarget "newfs_prodos" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B6F3682711B431AC0045E114 /* Debug */,
+				B6F3682811B431AC0045E114 /* Debug fuse */,
+				B6F3682911B431AC0045E114 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
diff --git a/Pascal/VolumeEntry.cpp b/Pascal/VolumeEntry.cpp
index af04348..ec9f1aa 100644
--- a/Pascal/VolumeEntry.cpp
+++ b/Pascal/VolumeEntry.cpp
@@ -29,6 +29,29 @@ enum {
     kMaxFiles = 77
 };
 
+
+
+// djb hash, case insensitive.
+static unsigned NameHash(const char *cp)
+{
+    unsigned hash = 5381;
+    unsigned c;
+    while ((c = *cp++))
+    {
+        c = std::toupper(c);
+        hash = ((hash << 5) + hash) + c;
+    }
+
+    return hash & 0x7FFFFFFF;
+}
+
+static bool NameEqual(const char *a, const char *b)
+{
+    return ::strcasecmp(a, b) == 0;
+}
+
+
+
 unsigned VolumeEntry::ValidName(const char *cp)
 {
     // 7 chars max.  Legal values: ascii, printable, 
@@ -585,14 +608,16 @@ FileEntry *VolumeEntry::create(const char *name, unsigned blocks)
             prev->_maxFileSize = prev->blocks() * 512;
         }
         
-        // insert() inserts an item *before* the current item.
+        // insert() inserts an item *before* the current item and returns an iterator to the 
+        // element inserted.
         // afterwards, iter will point to curr+1
         
         // keep track of the index *before* the insert.
         unsigned index = distance(_files.begin(), iter); // current index.
         
-        _files.insert(iter, entry.get());
-        _fileCount++;
+        iter = _files.insert(iter, entry.get());
+        ++_fileCount;
+        
         curr = entry.release();
         
         curr->_parent = this;
diff --git a/apfm.cpp b/bin/apfm.cpp
similarity index 100%
rename from apfm.cpp
rename to bin/apfm.cpp
diff --git a/fuse_pascal.cpp b/bin/fuse_pascal.cpp
similarity index 100%
rename from fuse_pascal.cpp
rename to bin/fuse_pascal.cpp
diff --git a/fuse_pascal_ops.cpp b/bin/fuse_pascal_ops.cpp
similarity index 100%
rename from fuse_pascal_ops.cpp
rename to bin/fuse_pascal_ops.cpp
diff --git a/newfs_pascal.cpp b/bin/newfs_pascal.cpp
similarity index 100%
rename from newfs_pascal.cpp
rename to bin/newfs_pascal.cpp
diff --git a/xattr.cpp b/bin/xattr.cpp
similarity index 100%
rename from xattr.cpp
rename to bin/xattr.cpp
diff --git a/newfs_prodos.cpp b/newfs_prodos.cpp
index a7aaab0..7982c35 100644
--- a/newfs_prodos.cpp
+++ b/newfs_prodos.cpp
@@ -7,13 +7,8 @@
 
 #include <unistd.h>
 
-#include "BlockDevice.h"
-#include "DavexDiskImage.h"
-#include "DiskCopy42Image.h"
-#include "Entry.h"
-#include "Exception.h"
-#include "RawDevice.h"
-#include "UniversalDiskImage.h"
+#include <Device/BlockDevice.h>
+#include <ProFUSE/Exception.h>
 
 
 #define NEWFS_VERSION "0.1"
@@ -173,7 +168,7 @@ int main(int argc, char **argv)
         
         case 'f':
             {
-                format = DiskImage::ImageType(optarg);
+                format = BlockDevice::ImageType(optarg);
                 if (format == 0)
                 {
                     std::fprintf(stderr, "Error: `%s' is not a supported disk image format.\n", optarg);
@@ -204,7 +199,7 @@ int main(int argc, char **argv)
             volumeName = "Untitled";
     }
     
-    if (format == 0) format = DiskImage::ImageType(fname, '2IMG');
+    if (format == 0) format = BlockDevice::ImageType(fname, '2IMG');
     
     
     try