diff --git a/.gitignore b/.gitignore
index 5fd25f9..ced3cac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+Core Data Editor/Core Data Editor.xcodeproj/xcuserdata
+CDE-Workspace.xcworkspace/xcuserdata/*
 # OS X
 .DS_Store
 
diff --git a/.travis.yml b/.travis.yml
index 131abc6..e936b53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,3 @@
+osx_image: xcode8.2
 language: objective-c
-osx_image: xcode8
-before_install:
-    - brew update
-    - if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
-script: xcodebuild -workspace CDE-Workspace.xcworkspace -scheme CDETests test
+script: xcodebuild  -verbose -scheme "Core Data Editor" -workspace CDE-Workspace.xcworkspace build
diff --git a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/CDETests.xcscheme b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/CDETests.xcscheme
index 21d0396..240f562 100644
--- a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/CDETests.xcscheme
+++ b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/CDETests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0810"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -32,22 +32,13 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AB7EF6AD1DB4028C0062DD0C"
-               BuildableName = "CDETests.xctest"
-               BlueprintName = "CDETests"
+               BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
+               BuildableName = "Core Data Editor Tests.xctest"
+               BlueprintName = "Core Data Editor Tests"
                ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"
-            BuildableName = "Core Data Editor.app"
-            BlueprintName = "Core Data Editor"
-            ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -62,16 +53,15 @@
       debugXPCServices = "NO"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"
-            BuildableName = "Core Data Editor.app"
-            BlueprintName = "Core Data Editor"
+            BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
+            BuildableName = "Core Data Editor Tests.xctest"
+            BlueprintName = "Core Data Editor Tests"
             ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -81,15 +71,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
-            BuildableName = "Core Data Editor Tests.xctest"
-            BlueprintName = "Core Data Editor Tests"
-            ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/Core Data Editor.xcscheme b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/Core Data Editor.xcscheme
index 04909af..7081d23 100644
--- a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/Core Data Editor.xcscheme	
+++ b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/Core Data Editor.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AB7EF6AD1DB4028C0062DD0C"
-               BuildableName = "CDETests.xctest"
-               BlueprintName = "CDETests"
-               ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
diff --git a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/iOS Example.xcscheme b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/iOS Example.xcscheme
index 0213922..403dcdb 100644
--- a/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/iOS Example.xcscheme	
+++ b/CDE-Workspace.xcworkspace/xcshareddata/xcschemes/iOS Example.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.h b/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.h
index ec03576..121e861 100644
--- a/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.h
+++ b/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.h
@@ -3,24 +3,15 @@
 @interface NSEntityDescription (CDEAdditions)
 
 #pragma mark - Convenience
-- (NSArray *)supportedAttributes_cde;
-- (NSArray *)toManyRelationships_cde;
-- (NSDictionary *)toManyRelationshipsByName_cde;
-- (NSArray *)sortedToManyRelationshipNames_cde;
-- (NSArray *)sortedToManyRelationships_cde;
-- (NSArray *)sortedToOneRelationships_cde;
-- (NSArray *)sortedRelationships_cde;
-//@property (nonatomic, readonly) NSString *nameForDisplay_cde;
+- (NSArray<NSAttributeDescription*> *)supportedAttributes_cde;
+- (NSArray<NSRelationshipDescription*> *)toManyRelationships_cde;
+- (NSDictionary<NSString*, NSRelationshopDescription*>*)toManyRelationshipsByName_cde;
+- (NSArray<NSString*> *)sortedToManyRelationshipNames_cde;
+- (NSArray<NSRelationshipDescription*> *)sortedToManyRelationships_cde;
+- (NSArray<NSRelationshipDescription*> *)sortedToOneRelationships_cde;
+- (NSArray<NSRelationshipDescription*> *)sortedRelationships_cde;
 - (NSAttributeDescription *)attributeDescriptionForName_cde:(NSString *)attributeName;
 
-#pragma mark - CSV
-//// returns an array of arrays
-//- (NSArray *)CSVValuesForEachManagedObjectInArray_cde:(NSArray *)objects;
-//
-//// This method filters out any non supported property names and also respects the sorting of propertyNames
-//- (NSArray *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues;
-//- (NSArray *)supportedCSVAttributes_cde;
-
 #pragma mark - UI
 - (UIImage *)icon_cde;
 
diff --git a/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.m b/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.m
index 7493666..724fe94 100644
--- a/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.m
+++ b/CDEKit/CDEKit/NSEntityDescription+CDEAdditions.m
@@ -4,151 +4,91 @@
 @implementation NSEntityDescription (CDEAdditions)
 
 #pragma mark - Convenience
-- (NSArray *)supportedAttributes_cde {
-    NSMutableArray *result = [NSMutableArray new];
-    for(NSAttributeDescription *attribute in [[self attributesByName] allValues]) {
-        // Ignore transient properties
-        if(attribute.isTransient) {
-            continue;
-        }
-        if(!attribute.isSupportedAttribute_cde) {
-            continue;
-        }
-        
-        [result addObject:attribute];
+- (NSArray<NSAttributeDescription*> *)supportedAttributes_cde {
+  NSMutableArray *result = [NSMutableArray new];
+  for(NSAttributeDescription *attribute in [[self attributesByName] allValues]) {
+    // Ignore transient properties
+    if(attribute.isTransient) {
+      continue;
     }
-    return result;
+    if(!attribute.isSupportedAttribute_cde) {
+      continue;
+    }
+    
+    [result addObject:attribute];
+  }
+  return result;
 }
 
-- (NSArray *)toManyRelationships_cde {
-    NSMutableArray *result = [NSMutableArray new];
-    [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
-        if(relation.isToMany == NO) {
-            return;
-        }
-        [result addObject:relation];
-    }];
-    return result;
+- (NSArray<NSRelationshipDescription*> *)toManyRelationships_cde {
+  NSMutableArray *result = [NSMutableArray new];
+  [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
+    if(relation.isToMany == NO) {
+      return;
+    }
+    [result addObject:relation];
+  }];
+  return result;
 }
 
-- (NSDictionary *)toManyRelationshipsByName_cde {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-    [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSRelationshipDescription *relation, BOOL *stop) {
-        if(relation.isToMany == NO) {
-            return;
-        }
-        result[name] = relation;
-    }];
-    return result;
+- (NSDictionary<NSString*, NSRelationshopDescription*> *)toManyRelationshipsByName_cde {
+  NSMutableDictionary *result = [NSMutableDictionary new];
+  [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSRelationshipDescription *relation, BOOL *stop) {
+    if(relation.isToMany == NO) {
+      return;
+    }
+    result[name] = relation;
+  }];
+  return result;
 }
 
-- (NSArray *)sortedToManyRelationshipNames_cde {
-    NSArray *unsorted = [[self toManyRelationshipsByName_cde] allKeys];
-    return [unsorted sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSString *relationA, NSString *relationB) {
-        return [relationA localizedStandardCompare:relationB];
-    }];
+- (NSArray<NSString*> *)sortedToManyRelationshipNames_cde {
+  NSArray *unsorted = [[self toManyRelationshipsByName_cde] allKeys];
+  return [unsorted sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSString *relationA, NSString *relationB) {
+    return [relationA localizedStandardCompare:relationB];
+  }];
 }
 
-- (NSArray *)sortedToManyRelationships_cde {
-    NSMutableArray *result = [NSMutableArray new];
-    [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
-        if(relation.isToMany == NO) {
-            return;
-        }
-        [result addObject:relation];
-    }];
-    return [result sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
-        return [relationA.name localizedStandardCompare:relationB.name];
-    }];
+- (NSArray<NSRelationshipDescription*> *)sortedToManyRelationships_cde {
+  NSMutableArray *result = [NSMutableArray new];
+  [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
+    if(relation.isToMany == NO) {
+      return;
+    }
+    [result addObject:relation];
+  }];
+  return [result sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
+    return [relationA.name localizedStandardCompare:relationB.name];
+  }];
 }
 
-- (NSArray *)sortedToOneRelationships_cde {
-    NSMutableArray *result = [NSMutableArray new];
-    [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
-        if(relation.isToMany) {
-            return;
-        }
-        [result addObject:relation];
-    }];
-    return [result sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
-        return [relationA.name localizedStandardCompare:relationB.name];
-    }];
+- (NSArray<NSRelationshipDescription*> *)sortedToOneRelationships_cde {
+  NSMutableArray *result = [NSMutableArray new];
+  [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
+    if(relation.isToMany) {
+      return;
+    }
+    [result addObject:relation];
+  }];
+  return [result sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
+    return [relationA.name localizedStandardCompare:relationB.name];
+  }];
 }
 
-- (NSArray *)sortedRelationships_cde {
-    return [self.relationshipsByName.allValues sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
-        return [relationA.name localizedStandardCompare:relationB.name];
-    }];
+- (NSArray<NSRelationshipDescription*> *)sortedRelationships_cde {
+  return [self.relationshipsByName.allValues sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
+    return [relationA.name localizedStandardCompare:relationB.name];
+  }];
 }
 
-//- (NSString *)nameForDisplay_cde {
-//    return [self.name humanReadableStringAccordingToUserDefaults_cde];
-//}
-
 - (NSAttributeDescription *)attributeDescriptionForName_cde:(NSString *)attributeName {
-    NSParameterAssert(attributeName);
-    return self.attributesByName[attributeName];
+  NSParameterAssert(attributeName);
+  return self.attributesByName[attributeName];
 }
 
-//#pragma mark - CSV
-//// returns an array of arrays
-//- (NSArray *)CSVValuesForEachManagedObjectInArray_cde:(NSArray *)objects {
-//    NSParameterAssert(objects);
-//    NSArray *supportedAttributes = self.supportedCSVAttributes_cde;
-//    NSArray *supportedAttributeNames = [supportedAttributes valueForKey:@"name"];
-//    return [self CSVValuesForEachManagedObjectInArray:objects forPropertyNames:supportedAttributeNames includeHeaderValues_cde:NO];
-//}
-//
-//// This method filters out any non supported property names and also respects the sorting of propertyNames
-//- (NSArray *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues {
-//    NSParameterAssert(objects);
-//    NSParameterAssert(propertyNames);
-//    
-//    NSMutableArray *supportedAttributeNames = [NSMutableArray new];
-//    for(NSString *propertyName in propertyNames) {
-//        if([propertyName isEqualToString:@"objectID"]) {
-//            [supportedAttributeNames addObject:propertyName];
-//            continue;
-//        }
-//        NSAttributeDescription *attribute = self.attributesByName[propertyName];
-//        if(attribute == nil) {
-//            continue;
-//        }
-//        if(!attribute.isSupportedAttribute_cde || !attribute.isSupportedCSVAttribute_cde) {
-//            continue;
-//        }
-//        [supportedAttributeNames addObject:attribute.name];
-//    }
-//    
-//    NSMutableArray *result = [NSMutableArray arrayWithCapacity:objects.count + 1];
-//
-//    if(includeHeaderValues) {
-//        [result addObject:supportedAttributeNames];
-//    }
-//    
-//    for(NSManagedObject *object in objects) {
-//        NSAssert([object.entity isKindOfEntity:self], @"Entity mismatch");
-//        NSArray *values = [object CSVValuesForAttributeNames_cde:supportedAttributeNames];
-//        [result addObject:values];
-//    }
-//    
-//    return result;
-//}
-//
-//- (NSArray *)supportedCSVAttributes_cde {
-//    NSMutableArray *result = [NSMutableArray new];
-//    for(NSAttributeDescription *attribute in self.supportedAttributes_cde) {
-//        if(attribute.isSupportedCSVAttribute_cde) {
-//            [result addObject:attribute];
-//        }
-//    }
-//    return result;
-//}
-
 #pragma mark - UI
 - (UIImage *)icon_cde {
   return nil;
-//  return [UIImage imageNamed:@"entity-icon-small"];
 }
 
 @end
diff --git a/Core Data Editor/CDETests/CDETests.swift b/Core Data Editor/CDETests/CDETests.swift
deleted file mode 100644
index 410c1d6..0000000
--- a/Core Data Editor/CDETests/CDETests.swift	
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  CDETests.swift
-//  CDETests
-//
-//  Created by cmk on 16/10/2016.
-//  Copyright © 2016 Christian Kienle. All rights reserved.
-//
-
-import XCTest
-
-class CDETests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}
diff --git a/Core Data Editor/CDETests/Info.plist b/Core Data Editor/CDETests/Info.plist
deleted file mode 100644
index 6c6c23c..0000000
--- a/Core Data Editor/CDETests/Info.plist	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/Core Data Editor/Core Data Editor.xcodeproj/project.pbxproj b/Core Data Editor/Core Data Editor.xcodeproj/project.pbxproj
index ad5ec64..68e3262 100644
--- a/Core Data Editor/Core Data Editor.xcodeproj/project.pbxproj	
+++ b/Core Data Editor/Core Data Editor.xcodeproj/project.pbxproj	
@@ -54,12 +54,9 @@
 		AB2D343017A04CA600A1B0CA /* CDETextEditorController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB2D342F17A04CA600A1B0CA /* CDETextEditorController.m */; };
 		AB2D343517A04CCD00A1B0CA /* CDETextEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB2D343317A04CCD00A1B0CA /* CDETextEditorViewController.m */; };
 		AB2D343617A04CCD00A1B0CA /* CDETextEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB2D343417A04CCD00A1B0CA /* CDETextEditorViewController.xib */; };
-		AB30FF66179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF64179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.m */; };
-		AB30FF67179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB30FF65179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.xib */; };
-		AB30FF6B179C6AB400E49E0B /* CDEPreferencesFormattingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF69179C6AB400E49E0B /* CDEPreferencesFormattingViewController.m */; };
-		AB30FF6C179C6AB400E49E0B /* CDEPreferencesFormattingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB30FF6A179C6AB400E49E0B /* CDEPreferencesFormattingViewController.xib */; };
-		AB30FF70179C6B1700E49E0B /* CDEPreferencesMiscViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF6E179C6B1700E49E0B /* CDEPreferencesMiscViewController.m */; };
-		AB30FF71179C6B1700E49E0B /* CDEPreferencesMiscViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB30FF6F179C6B1700E49E0B /* CDEPreferencesMiscViewController.xib */; };
+		AB30FF66179C696D00E49E0B /* PreferencesIntegrationVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF64179C696D00E49E0B /* PreferencesIntegrationVC.m */; };
+		AB30FF6B179C6AB400E49E0B /* PreferencesFormattingVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF69179C6AB400E49E0B /* PreferencesFormattingVC.m */; };
+		AB30FF70179C6B1700E49E0B /* PreferencesGeneralVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AB30FF6E179C6B1700E49E0B /* PreferencesGeneralVC.m */; };
 		AB36447E17BA47D4004ADAAC /* CDESetupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB36447C17BA47D4004ADAAC /* CDESetupWindowController.m */; };
 		AB36447F17BA47D4004ADAAC /* CDESetupWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB36447D17BA47D4004ADAAC /* CDESetupWindowController.xib */; };
 		AB3B078E1775D39A000855B0 /* CDEStringValueTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = AB3B078D1775D39A000855B0 /* CDEStringValueTableCellView.m */; };
@@ -69,14 +66,18 @@
 		AB3B07CE17760E23000855B0 /* NSTableCellView+JKNibLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = AB3B07CD17760E23000855B0 /* NSTableCellView+JKNibLoading.m */; };
 		AB531222179953B300529EF7 /* NSTableColumn+CDERequestDataCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = AB531221179953B300529EF7 /* NSTableColumn+CDERequestDataCoordinator.m */; };
 		AB5583A5176751AE005C002C /* icon.iconset in Resources */ = {isa = PBXBuildFile; fileRef = AB5583A4176751AE005C002C /* icon.iconset */; };
-		AB7EF6B11DB4028D0062DD0C /* CDETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB7EF6B01DB4028D0062DD0C /* CDETests.swift */; };
-		AB7F20CE19DD7B4D00EBBF52 /* VibrantView.m in Sources */ = {isa = PBXBuildFile; fileRef = AB7F20CD19DD7B4D00EBBF52 /* VibrantView.m */; };
+		AB59DA401DDF42AA00A19963 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB59DA3F1DDF42AA00A19963 /* Main.storyboard */; };
+		AB59DA601DDF43FE00A19963 /* PreferencesWC.m in Sources */ = {isa = PBXBuildFile; fileRef = AB59DA5F1DDF43FE00A19963 /* PreferencesWC.m */; };
 		AB86F7CB1791922600FB0AEB /* CDEAttributeEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB86F7C91791922600FB0AEB /* CDEAttributeEditorWindowController.m */; };
 		AB86F7CC1791922600FB0AEB /* CDEAttributeEditorWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB86F7CA1791922600FB0AEB /* CDEAttributeEditorWindowController.xib */; };
 		AB8F8342177C524B000B4467 /* CDEUnorderedRelationshipRequestDataCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = AB8F8341177C524B000B4467 /* CDEUnorderedRelationshipRequestDataCoordinator.m */; };
 		AB8F8347177C7C4B000B4467 /* CDETwoColumnSplitViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AB8F8346177C7C4A000B4467 /* CDETwoColumnSplitViewDelegate.m */; };
 		AB8F834B177C82D4000B4467 /* CDEOrderIndexTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = AB8F834A177C82D4000B4467 /* CDEOrderIndexTableCellView.m */; };
 		AB8F834D177C82E6000B4467 /* CDEOrderIndexTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8F834C177C82E6000B4467 /* CDEOrderIndexTableCellView.xib */; };
+		AB98E86B1DDF3F5900925C8A /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB98E86A1DDF3F5900925C8A /* Preferences.storyboard */; };
+		AB98E86D1DDF405500925C8A /* PreferencesGeneral.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB98E86C1DDF405500925C8A /* PreferencesGeneral.storyboard */; };
+		AB98E8711DDF413E00925C8A /* PreferencesIntegration.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB98E8701DDF413E00925C8A /* PreferencesIntegration.storyboard */; };
+		AB98E8731DDF41A300925C8A /* PreferencesFormatting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB98E8721DDF41A300925C8A /* PreferencesFormatting.storyboard */; };
 		AB99B2EF1998DD0400101647 /* SQLiteDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = AB99B2EE1998DD0400101647 /* SQLiteDatabase.m */; };
 		AB99B2F21998E1EE00101647 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB99B2F11998E1EE00101647 /* libsqlite3.dylib */; };
 		ABB08F8917BD2DB000BE97C0 /* Project-Browser-Menu-Item.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB08F8717BD2DB000BE97C0 /* Project-Browser-Menu-Item.png */; };
@@ -158,12 +159,6 @@
 		ABC1E6B117775DAC0069D252 /* NSSortDescriptor+CDEAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC1E6B017775DAC0069D252 /* NSSortDescriptor+CDEAdditions.m */; };
 		ABC1E6B8177765CE0069D252 /* CDEEntityTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC1E6B7177765CE0069D252 /* CDEEntityTableCellView.m */; };
 		ABC1E6BD177777940069D252 /* entity-icon-small.png in Resources */ = {isa = PBXBuildFile; fileRef = ABC1E6BC177777940069D252 /* entity-icon-small.png */; };
-		ABC83B0F17B1166300078580 /* mogenerator in Resources */ = {isa = PBXBuildFile; fileRef = ABC83B0E17B1166300078580 /* mogenerator */; };
-		ABC83B1117B116A000078580 /* mogeneratorReadme.rtf in Resources */ = {isa = PBXBuildFile; fileRef = ABC83B1017B116A000078580 /* mogeneratorReadme.rtf */; };
-		ABC83B1917B1170900078580 /* CDECodeGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC83B1317B1170900078580 /* CDECodeGenerator.m */; };
-		ABC83B1A17B1170900078580 /* CDEManagedObjectSubclassesGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC83B1517B1170900078580 /* CDEManagedObjectSubclassesGenerator.m */; };
-		ABC83B1B17B1170900078580 /* CDECodeGeneratorAccessoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC83B1717B1170900078580 /* CDECodeGeneratorAccessoryViewController.m */; };
-		ABC83B1C17B1170900078580 /* CDECodeGeneratorAccessoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABC83B1817B1170900078580 /* CDECodeGeneratorAccessoryViewController.xib */; };
 		ABC83B4E17B1215200078580 /* CDEAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC83B4C17B1215200078580 /* CDEAboutWindowController.m */; };
 		ABC83B4F17B1215200078580 /* CDEAboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABC83B4D17B1215200078580 /* CDEAboutWindowController.xib */; };
 		ABC83BDE17B24D9600078580 /* Document_Icon.iconset in Resources */ = {isa = PBXBuildFile; fileRef = ABC83BDD17B24D9600078580 /* Document_Icon.iconset */; };
@@ -207,8 +202,6 @@
 		ABEB75641776E70900141062 /* CDEObjectIDValueTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEB75631776E70900141062 /* CDEObjectIDValueTableCellView.m */; };
 		ABEB75661776E71600141062 /* CDEObjectIDValueTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABEB75651776E71600141062 /* CDEObjectIDValueTableCellView.xib */; };
 		ABEB75691776E75800141062 /* CDEManagedObjectIDToStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEB75681776E75800141062 /* CDEManagedObjectIDToStringValueTransformer.m */; };
-		ABEB756F1776F37100141062 /* CDEPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEB756D1776F37100141062 /* CDEPreferencesWindowController.m */; };
-		ABEB75701776F37100141062 /* CDEPreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABEB756E1776F37100141062 /* CDEPreferencesWindowController.xib */; };
 		ABEB75731776F61300141062 /* NSUserDefaults+CDEAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEB75721776F61300141062 /* NSUserDefaults+CDEAdditions.m */; };
 		ABEB75A3177705E100141062 /* CDEFloatingPointValueTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEB75A2177705E100141062 /* CDEFloatingPointValueTableCellView.m */; };
 		ABEB75A5177705EE00141062 /* CDEFloatingPointValueTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABEB75A4177705EE00141062 /* CDEFloatingPointValueTableCellView.xib */; };
@@ -222,18 +215,9 @@
 		ABEEA6271785C6450096DE4C /* CDEManagedObjectsPickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABEEA6251785C6450096DE4C /* CDEManagedObjectsPickerViewController.xib */; };
 		ABEEA6291785D7800096DE4C /* CDEIsSelectedTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABEEA6281785D77F0096DE4C /* CDEIsSelectedTableCellView.xib */; };
 		ABFBB3B1179C36E2003B5346 /* CDETwoColumnSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABFBB3B0179C36E2003B5346 /* CDETwoColumnSplitViewController.m */; };
+		ABFFA4891DDF4784009BF96F /* PreferencesVC.m in Sources */ = {isa = PBXBuildFile; fileRef = ABFFA4881DDF4784009BF96F /* PreferencesVC.m */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		AB7EF6B31DB4028D0062DD0C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = ABBEA7CE1765CB730024A9D2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = ABBEA7D51765CB730024A9D2;
-			remoteInfo = "Core Data Editor";
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		2E25BCB4198D645100BBA0C0 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		AB0181151997C805000FE094 /* NSDirectoryEnumerator+ProjectBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDirectoryEnumerator+ProjectBrowser.h"; sourceTree = "<group>"; };
@@ -317,15 +301,12 @@
 		AB2D343217A04CCD00A1B0CA /* CDETextEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDETextEditorViewController.h; sourceTree = "<group>"; };
 		AB2D343317A04CCD00A1B0CA /* CDETextEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDETextEditorViewController.m; sourceTree = "<group>"; };
 		AB2D343417A04CCD00A1B0CA /* CDETextEditorViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDETextEditorViewController.xib; sourceTree = "<group>"; };
-		AB30FF63179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEPreferencesAutomaticProjectCreationViewController.h; sourceTree = "<group>"; };
-		AB30FF64179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEPreferencesAutomaticProjectCreationViewController.m; sourceTree = "<group>"; };
-		AB30FF65179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEPreferencesAutomaticProjectCreationViewController.xib; sourceTree = "<group>"; };
-		AB30FF68179C6AB400E49E0B /* CDEPreferencesFormattingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEPreferencesFormattingViewController.h; sourceTree = "<group>"; };
-		AB30FF69179C6AB400E49E0B /* CDEPreferencesFormattingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEPreferencesFormattingViewController.m; sourceTree = "<group>"; };
-		AB30FF6A179C6AB400E49E0B /* CDEPreferencesFormattingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEPreferencesFormattingViewController.xib; sourceTree = "<group>"; };
-		AB30FF6D179C6B1700E49E0B /* CDEPreferencesMiscViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEPreferencesMiscViewController.h; sourceTree = "<group>"; };
-		AB30FF6E179C6B1700E49E0B /* CDEPreferencesMiscViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEPreferencesMiscViewController.m; sourceTree = "<group>"; };
-		AB30FF6F179C6B1700E49E0B /* CDEPreferencesMiscViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEPreferencesMiscViewController.xib; sourceTree = "<group>"; };
+		AB30FF63179C696D00E49E0B /* PreferencesIntegrationVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesIntegrationVC.h; sourceTree = "<group>"; };
+		AB30FF64179C696D00E49E0B /* PreferencesIntegrationVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesIntegrationVC.m; sourceTree = "<group>"; };
+		AB30FF68179C6AB400E49E0B /* PreferencesFormattingVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesFormattingVC.h; sourceTree = "<group>"; };
+		AB30FF69179C6AB400E49E0B /* PreferencesFormattingVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesFormattingVC.m; sourceTree = "<group>"; };
+		AB30FF6D179C6B1700E49E0B /* PreferencesGeneralVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesGeneralVC.h; sourceTree = "<group>"; };
+		AB30FF6E179C6B1700E49E0B /* PreferencesGeneralVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesGeneralVC.m; sourceTree = "<group>"; };
 		AB36447B17BA47D4004ADAAC /* CDESetupWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDESetupWindowController.h; sourceTree = "<group>"; };
 		AB36447C17BA47D4004ADAAC /* CDESetupWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDESetupWindowController.m; sourceTree = "<group>"; };
 		AB36447D17BA47D4004ADAAC /* CDESetupWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDESetupWindowController.xib; sourceTree = "<group>"; };
@@ -340,11 +321,9 @@
 		AB531220179953B300529EF7 /* NSTableColumn+CDERequestDataCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTableColumn+CDERequestDataCoordinator.h"; sourceTree = "<group>"; };
 		AB531221179953B300529EF7 /* NSTableColumn+CDERequestDataCoordinator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTableColumn+CDERequestDataCoordinator.m"; sourceTree = "<group>"; };
 		AB5583A4176751AE005C002C /* icon.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = icon.iconset; sourceTree = "<group>"; };
-		AB7EF6AE1DB4028C0062DD0C /* CDETests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CDETests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		AB7EF6B01DB4028D0062DD0C /* CDETests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CDETests.swift; sourceTree = "<group>"; };
-		AB7EF6B21DB4028D0062DD0C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		AB7F20CC19DD7B4D00EBBF52 /* VibrantView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VibrantView.h; sourceTree = "<group>"; };
-		AB7F20CD19DD7B4D00EBBF52 /* VibrantView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VibrantView.m; sourceTree = "<group>"; };
+		AB59DA3F1DDF42AA00A19963 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
+		AB59DA5E1DDF43FE00A19963 /* PreferencesWC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWC.h; sourceTree = "<group>"; };
+		AB59DA5F1DDF43FE00A19963 /* PreferencesWC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesWC.m; sourceTree = "<group>"; };
 		AB86F7C81791922600FB0AEB /* CDEAttributeEditorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEAttributeEditorWindowController.h; sourceTree = "<group>"; };
 		AB86F7C91791922600FB0AEB /* CDEAttributeEditorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEAttributeEditorWindowController.m; sourceTree = "<group>"; };
 		AB86F7CA1791922600FB0AEB /* CDEAttributeEditorWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEAttributeEditorWindowController.xib; sourceTree = "<group>"; };
@@ -355,6 +334,10 @@
 		AB8F8349177C82D4000B4467 /* CDEOrderIndexTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEOrderIndexTableCellView.h; sourceTree = "<group>"; };
 		AB8F834A177C82D4000B4467 /* CDEOrderIndexTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEOrderIndexTableCellView.m; sourceTree = "<group>"; };
 		AB8F834C177C82E6000B4467 /* CDEOrderIndexTableCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEOrderIndexTableCellView.xib; sourceTree = "<group>"; };
+		AB98E86A1DDF3F5900925C8A /* Preferences.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = "<group>"; };
+		AB98E86C1DDF405500925C8A /* PreferencesGeneral.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PreferencesGeneral.storyboard; sourceTree = "<group>"; };
+		AB98E8701DDF413E00925C8A /* PreferencesIntegration.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PreferencesIntegration.storyboard; sourceTree = "<group>"; };
+		AB98E8721DDF41A300925C8A /* PreferencesFormatting.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PreferencesFormatting.storyboard; sourceTree = "<group>"; };
 		AB99B2EE1998DD0400101647 /* SQLiteDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQLiteDatabase.m; sourceTree = "<group>"; };
 		AB99B2F01998DD1500101647 /* SQLiteDatabase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabase.h; sourceTree = "<group>"; };
 		AB99B2F11998E1EE00101647 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
@@ -507,15 +490,6 @@
 		ABC1E6B6177765CE0069D252 /* CDEEntityTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEEntityTableCellView.h; sourceTree = "<group>"; };
 		ABC1E6B7177765CE0069D252 /* CDEEntityTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEEntityTableCellView.m; sourceTree = "<group>"; };
 		ABC1E6BC177777940069D252 /* entity-icon-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "entity-icon-small.png"; sourceTree = "<group>"; };
-		ABC83B0E17B1166300078580 /* mogenerator */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mogenerator; sourceTree = "<group>"; };
-		ABC83B1017B116A000078580 /* mogeneratorReadme.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = mogeneratorReadme.rtf; sourceTree = "<group>"; };
-		ABC83B1217B1170900078580 /* CDECodeGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDECodeGenerator.h; sourceTree = "<group>"; };
-		ABC83B1317B1170900078580 /* CDECodeGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDECodeGenerator.m; sourceTree = "<group>"; };
-		ABC83B1417B1170900078580 /* CDEManagedObjectSubclassesGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEManagedObjectSubclassesGenerator.h; sourceTree = "<group>"; };
-		ABC83B1517B1170900078580 /* CDEManagedObjectSubclassesGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEManagedObjectSubclassesGenerator.m; sourceTree = "<group>"; };
-		ABC83B1617B1170900078580 /* CDECodeGeneratorAccessoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDECodeGeneratorAccessoryViewController.h; sourceTree = "<group>"; };
-		ABC83B1717B1170900078580 /* CDECodeGeneratorAccessoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDECodeGeneratorAccessoryViewController.m; sourceTree = "<group>"; };
-		ABC83B1817B1170900078580 /* CDECodeGeneratorAccessoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDECodeGeneratorAccessoryViewController.xib; sourceTree = "<group>"; };
 		ABC83B4B17B1215200078580 /* CDEAboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEAboutWindowController.h; sourceTree = "<group>"; };
 		ABC83B4C17B1215200078580 /* CDEAboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEAboutWindowController.m; sourceTree = "<group>"; };
 		ABC83B4D17B1215200078580 /* CDEAboutWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEAboutWindowController.xib; sourceTree = "<group>"; };
@@ -588,9 +562,6 @@
 		ABEB75651776E71600141062 /* CDEObjectIDValueTableCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEObjectIDValueTableCellView.xib; sourceTree = "<group>"; };
 		ABEB75671776E75800141062 /* CDEManagedObjectIDToStringValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEManagedObjectIDToStringValueTransformer.h; sourceTree = "<group>"; };
 		ABEB75681776E75800141062 /* CDEManagedObjectIDToStringValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEManagedObjectIDToStringValueTransformer.m; sourceTree = "<group>"; };
-		ABEB756C1776F37100141062 /* CDEPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEPreferencesWindowController.h; sourceTree = "<group>"; };
-		ABEB756D1776F37100141062 /* CDEPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDEPreferencesWindowController.m; sourceTree = "<group>"; };
-		ABEB756E1776F37100141062 /* CDEPreferencesWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEPreferencesWindowController.xib; sourceTree = "<group>"; };
 		ABEB75711776F61300141062 /* NSUserDefaults+CDEAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSUserDefaults+CDEAdditions.h"; sourceTree = "<group>"; };
 		ABEB75721776F61300141062 /* NSUserDefaults+CDEAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUserDefaults+CDEAdditions.m"; sourceTree = "<group>"; };
 		ABEB75A1177705E100141062 /* CDEFloatingPointValueTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEFloatingPointValueTableCellView.h; sourceTree = "<group>"; };
@@ -613,16 +584,11 @@
 		ABEEA6281785D77F0096DE4C /* CDEIsSelectedTableCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CDEIsSelectedTableCellView.xib; sourceTree = "<group>"; };
 		ABFBB3AF179C36E2003B5346 /* CDETwoColumnSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDETwoColumnSplitViewController.h; sourceTree = "<group>"; };
 		ABFBB3B0179C36E2003B5346 /* CDETwoColumnSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDETwoColumnSplitViewController.m; sourceTree = "<group>"; };
+		ABFFA4871DDF4784009BF96F /* PreferencesVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesVC.h; sourceTree = "<group>"; };
+		ABFFA4881DDF4784009BF96F /* PreferencesVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesVC.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		AB7EF6AB1DB4028C0062DD0C /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		ABBEA7D31765CB730024A9D2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -650,7 +616,6 @@
 				AB36447A17BA47BF004ADAAC /* Setup Window */,
 				ABB225CF17B91C510024FE4F /* Project Browser */,
 				ABC83B4A17B1213C00078580 /* About */,
-				ABC83B1D17B1170C00078580 /* Code Generator */,
 				ABDF8AE417A41F9A00727346 /* CSV Import */,
 				ABEB756B1776F35E00141062 /* Preferences Window Controller */,
 				AB0927531768C80E00FC59FB /* Editor View Controller */,
@@ -752,9 +717,7 @@
 				AB1466C5178727F600E3EEA3 /* CDEValidationErrorsViewController.h */,
 				AB1466C6178727F600E3EEA3 /* CDEValidationErrorsViewController.m */,
 				AB1466C7178727F600E3EEA3 /* CDEValidationErrorsViewController.xib */,
-				AB1467061789A1BF00E3EEA3 /* Row View (not used) */,
-				AB7F20CC19DD7B4D00EBBF52 /* VibrantView.h */,
-				AB7F20CD19DD7B4D00EBBF52 /* VibrantView.m */,
+				AB1467061789A1BF00E3EEA3 /* Row View  */,
 			);
 			name = "Validation Errors View Controller";
 			sourceTree = "<group>";
@@ -768,13 +731,13 @@
 			name = NSManagedObjectID;
 			sourceTree = "<group>";
 		};
-		AB1467061789A1BF00E3EEA3 /* Row View (not used) */ = {
+		AB1467061789A1BF00E3EEA3 /* Row View  */ = {
 			isa = PBXGroup;
 			children = (
 				AB1466CD1787492400E3EEA3 /* CDETableRowView.h */,
 				AB1466CE1787492400E3EEA3 /* CDETableRowView.m */,
 			);
-			name = "Row View (not used)";
+			name = "Row View ";
 			sourceTree = "<group>";
 		};
 		AB1467071789B16F00E3EEA3 /* Attribute Editor */ = {
@@ -960,16 +923,12 @@
 		AB30FF73179C702900E49E0B /* View Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				AB98E8741DDF41C600925C8A /* Formatting */,
+				AB98E86F1DDF40F900925C8A /* Integration */,
+				AB98E86E1DDF40EB00925C8A /* General */,
 				ABB225D017B922D30024FE4F /* PopUpButton */,
-				AB30FF63179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.h */,
-				AB30FF64179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.m */,
-				AB30FF65179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.xib */,
-				AB30FF68179C6AB400E49E0B /* CDEPreferencesFormattingViewController.h */,
-				AB30FF69179C6AB400E49E0B /* CDEPreferencesFormattingViewController.m */,
-				AB30FF6A179C6AB400E49E0B /* CDEPreferencesFormattingViewController.xib */,
-				AB30FF6D179C6B1700E49E0B /* CDEPreferencesMiscViewController.h */,
-				AB30FF6E179C6B1700E49E0B /* CDEPreferencesMiscViewController.m */,
-				AB30FF6F179C6B1700E49E0B /* CDEPreferencesMiscViewController.xib */,
+				ABFFA4871DDF4784009BF96F /* PreferencesVC.h */,
+				ABFFA4881DDF4784009BF96F /* PreferencesVC.m */,
 			);
 			name = "View Controllers";
 			sourceTree = "<group>";
@@ -1029,15 +988,6 @@
 			name = "NSTableColumn Additions";
 			sourceTree = "<group>";
 		};
-		AB7EF6AF1DB4028D0062DD0C /* CDETests */ = {
-			isa = PBXGroup;
-			children = (
-				AB7EF6B01DB4028D0062DD0C /* CDETests.swift */,
-				AB7EF6B21DB4028D0062DD0C /* Info.plist */,
-			);
-			path = CDETests;
-			sourceTree = "<group>";
-		};
 		AB86F7C71791920A00FB0AEB /* Window Controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -1077,6 +1027,36 @@
 			name = "Order Index Cell View";
 			sourceTree = "<group>";
 		};
+		AB98E86E1DDF40EB00925C8A /* General */ = {
+			isa = PBXGroup;
+			children = (
+				AB30FF6D179C6B1700E49E0B /* PreferencesGeneralVC.h */,
+				AB30FF6E179C6B1700E49E0B /* PreferencesGeneralVC.m */,
+				AB98E86C1DDF405500925C8A /* PreferencesGeneral.storyboard */,
+			);
+			name = General;
+			sourceTree = "<group>";
+		};
+		AB98E86F1DDF40F900925C8A /* Integration */ = {
+			isa = PBXGroup;
+			children = (
+				AB30FF63179C696D00E49E0B /* PreferencesIntegrationVC.h */,
+				AB30FF64179C696D00E49E0B /* PreferencesIntegrationVC.m */,
+				AB98E8701DDF413E00925C8A /* PreferencesIntegration.storyboard */,
+			);
+			name = Integration;
+			sourceTree = "<group>";
+		};
+		AB98E8741DDF41C600925C8A /* Formatting */ = {
+			isa = PBXGroup;
+			children = (
+				AB98E8721DDF41A300925C8A /* PreferencesFormatting.storyboard */,
+				AB30FF68179C6AB400E49E0B /* PreferencesFormattingVC.h */,
+				AB30FF69179C6AB400E49E0B /* PreferencesFormattingVC.m */,
+			);
+			name = Formatting;
+			sourceTree = "<group>";
+		};
 		AB99B2ED1998DCDC00101647 /* TinySQLite */ = {
 			isa = PBXGroup;
 			children = (
@@ -1195,7 +1175,6 @@
 			isa = PBXGroup;
 			children = (
 				ABBEA7DF1765CB730024A9D2 /* Core Data Editor */,
-				AB7EF6AF1DB4028D0062DD0C /* CDETests */,
 				ABBEA7D81765CB730024A9D2 /* Frameworks */,
 				ABBEA7D71765CB730024A9D2 /* Products */,
 			);
@@ -1205,7 +1184,6 @@
 			isa = PBXGroup;
 			children = (
 				ABBEA7D61765CB730024A9D2 /* Core Data Editor.app */,
-				AB7EF6AE1DB4028C0062DD0C /* CDETests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1244,6 +1222,7 @@
 				ABBEA7EC1765CB730024A9D2 /* CDEDocument.m */,
 				ABBEA7EE1765CB730024A9D2 /* CDEDocument.xib */,
 				ABBEA7F11765CB730024A9D2 /* MainMenu.xib */,
+				AB59DA3F1DDF42AA00A19963 /* Main.storyboard */,
 				ABBEA7F41765CB730024A9D2 /* CDEDocument.xcdatamodeld */,
 				ABBEA7E01765CB730024A9D2 /* Supporting Files */,
 			);
@@ -1253,7 +1232,6 @@
 		ABBEA7E01765CB730024A9D2 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				ABC83B0D17B1166300078580 /* mogenerator */,
 				ABC1E6BB1777776B0069D252 /* Assets */,
 				AB5583A4176751AE005C002C /* icon.iconset */,
 				ABBEA8B91766153A0024A9D2 /* Localizable.strings */,
@@ -1581,53 +1559,6 @@
 			path = Assets;
 			sourceTree = "<group>";
 		};
-		ABC83B0D17B1166300078580 /* mogenerator */ = {
-			isa = PBXGroup;
-			children = (
-				ABC83B1017B116A000078580 /* mogeneratorReadme.rtf */,
-				ABC83B0E17B1166300078580 /* mogenerator */,
-			);
-			path = mogenerator;
-			sourceTree = "<group>";
-		};
-		ABC83B1D17B1170C00078580 /* Code Generator */ = {
-			isa = PBXGroup;
-			children = (
-				ABC83B1E17B11AE900078580 /* New Group */,
-				ABC83B1F17B11AEE00078580 /* Private */,
-			);
-			name = "Code Generator";
-			sourceTree = "<group>";
-		};
-		ABC83B1E17B11AE900078580 /* New Group */ = {
-			isa = PBXGroup;
-			children = (
-				ABC83B1217B1170900078580 /* CDECodeGenerator.h */,
-				ABC83B1317B1170900078580 /* CDECodeGenerator.m */,
-			);
-			name = "New Group";
-			sourceTree = "<group>";
-		};
-		ABC83B1F17B11AEE00078580 /* Private */ = {
-			isa = PBXGroup;
-			children = (
-				ABC83B2017B11AF200078580 /* View Controller */,
-				ABC83B1417B1170900078580 /* CDEManagedObjectSubclassesGenerator.h */,
-				ABC83B1517B1170900078580 /* CDEManagedObjectSubclassesGenerator.m */,
-			);
-			name = Private;
-			sourceTree = "<group>";
-		};
-		ABC83B2017B11AF200078580 /* View Controller */ = {
-			isa = PBXGroup;
-			children = (
-				ABC83B1617B1170900078580 /* CDECodeGeneratorAccessoryViewController.h */,
-				ABC83B1717B1170900078580 /* CDECodeGeneratorAccessoryViewController.m */,
-				ABC83B1817B1170900078580 /* CDECodeGeneratorAccessoryViewController.xib */,
-			);
-			name = "View Controller";
-			sourceTree = "<group>";
-		};
 		ABC83B4A17B1213C00078580 /* About */ = {
 			isa = PBXGroup;
 			children = (
@@ -1837,10 +1768,10 @@
 		ABEB756B1776F35E00141062 /* Preferences Window Controller */ = {
 			isa = PBXGroup;
 			children = (
-				ABEB756C1776F37100141062 /* CDEPreferencesWindowController.h */,
-				ABEB756D1776F37100141062 /* CDEPreferencesWindowController.m */,
-				ABEB756E1776F37100141062 /* CDEPreferencesWindowController.xib */,
 				AB30FF73179C702900E49E0B /* View Controllers */,
+				AB98E86A1DDF3F5900925C8A /* Preferences.storyboard */,
+				AB59DA5E1DDF43FE00A19963 /* PreferencesWC.h */,
+				AB59DA5F1DDF43FE00A19963 /* PreferencesWC.m */,
 			);
 			name = "Preferences Window Controller";
 			sourceTree = "<group>";
@@ -2094,24 +2025,6 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		AB7EF6AD1DB4028C0062DD0C /* CDETests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = AB7EF6B51DB4028D0062DD0C /* Build configuration list for PBXNativeTarget "CDETests" */;
-			buildPhases = (
-				AB7EF6AA1DB4028C0062DD0C /* Sources */,
-				AB7EF6AB1DB4028C0062DD0C /* Frameworks */,
-				AB7EF6AC1DB4028C0062DD0C /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				AB7EF6B41DB4028D0062DD0C /* PBXTargetDependency */,
-			);
-			name = CDETests;
-			productName = CDETests;
-			productReference = AB7EF6AE1DB4028C0062DD0C /* CDETests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 		ABBEA7D51765CB730024A9D2 /* Core Data Editor */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = ABBEA7F91765CB730024A9D2 /* Build configuration list for PBXNativeTarget "Core Data Editor" */;
@@ -2136,16 +2049,10 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = CDE;
-				LastSwiftUpdateCheck = 0800;
 				LastTestingUpgradeCheck = 0510;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = "Christian Kienle";
 				TargetAttributes = {
-					AB7EF6AD1DB4028C0062DD0C = {
-						CreatedOnToolsVersion = 8.0;
-						ProvisioningStyle = Automatic;
-						TestTargetID = ABBEA7D51765CB730024A9D2;
-					};
 					ABBEA7D51765CB730024A9D2 = {
 						DevelopmentTeam = 6YJV6LM6Q4;
 						SystemCapabilities = {
@@ -2169,19 +2076,11 @@
 			projectRoot = "";
 			targets = (
 				ABBEA7D51765CB730024A9D2 /* Core Data Editor */,
-				AB7EF6AD1DB4028C0062DD0C /* CDETests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		AB7EF6AC1DB4028C0062DD0C /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		ABBEA7D41765CB730024A9D2 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2193,6 +2092,7 @@
 				ABBEA8261765D5AC0024A9D2 /* CDENewConfigurationSummaryViewController.xib in Resources */,
 				ABBEA82B1765D5AC0024A9D2 /* CDEDropStoreViewController.xib in Resources */,
 				ABBEA8301765D5AC0024A9D2 /* CDEModelChooserSheetController.xib in Resources */,
+				AB98E86B1DDF3F5900925C8A /* Preferences.storyboard in Resources */,
 				ABBEA8361765D5AC0024A9D2 /* CDEDropApplicationViewController.xib in Resources */,
 				ABBEA8381765D5AC0024A9D2 /* CDEConfigurationWizzard.xib in Resources */,
 				ABBEA8BB1766153A0024A9D2 /* Localizable.strings in Resources */,
@@ -2203,7 +2103,6 @@
 				AB3B07911775DCF6000855B0 /* CDEStringValueTableCellView.xib in Resources */,
 				AB3B07CB1775FCF2000855B0 /* CDEBoolValueTableCellView.xib in Resources */,
 				ABEB75661776E71600141062 /* CDEObjectIDValueTableCellView.xib in Resources */,
-				ABEB75701776F37100141062 /* CDEPreferencesWindowController.xib in Resources */,
 				ABEB75A5177705EE00141062 /* CDEFloatingPointValueTableCellView.xib in Resources */,
 				ABEB75AF17771ABE00141062 /* CDEBinaryValueTableCellView.xib in Resources */,
 				ABC1E69B177731C20069D252 /* CDEDateValueTableCellView.xib in Resources */,
@@ -2229,26 +2128,24 @@
 				ABDA4284181C068F0054A226 /* CDEManagedObjectsTableViewController.xib in Resources */,
 				AB14671B1789D8FA00E3EEA3 /* CDEIntegerValueTableCellView.xib in Resources */,
 				AB86F7CC1791922600FB0AEB /* CDEAttributeEditorWindowController.xib in Resources */,
-				AB30FF67179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.xib in Resources */,
-				AB30FF6C179C6AB400E49E0B /* CDEPreferencesFormattingViewController.xib in Resources */,
-				AB30FF71179C6B1700E49E0B /* CDEPreferencesMiscViewController.xib in Resources */,
 				AB2D343617A04CCD00A1B0CA /* CDETextEditorViewController.xib in Resources */,
 				ABDF8AF317A41FA600727346 /* CDECSVAccessoryViewController.xib in Resources */,
 				ABDF8AF417A41FA600727346 /* CDECSVImportWindow.xib in Resources */,
 				ABDF4F0317A4622F0030755B /* EditTemplate.png in Resources */,
+				AB59DA401DDF42AA00A19963 /* Main.storyboard in Resources */,
+				AB98E86D1DDF405500925C8A /* PreferencesGeneral.storyboard in Resources */,
 				ABDF4F0417A4622F0030755B /* EditTemplate@2x.png in Resources */,
+				AB98E8731DDF41A300925C8A /* PreferencesFormatting.storyboard in Resources */,
 				AB23E43017A6AE08001C19A7 /* code-icon.png in Resources */,
 				AB23E43117A6AE08001C19A7 /* code-icon@2x.png in Resources */,
 				AB23E43217A6AE08001C19A7 /* csv-icon.png in Resources */,
 				AB23E43317A6AE08001C19A7 /* csv-icon@2x.png in Resources */,
 				AB23E43617A6B0FB001C19A7 /* formatting-icon.png in Resources */,
+				AB98E8711DDF413E00925C8A /* PreferencesIntegration.storyboard in Resources */,
 				AB23E43717A6B0FB001C19A7 /* formatting-icon@2x.png in Resources */,
 				AB23E43A17A6B9CA001C19A7 /* integration-icon.png in Resources */,
 				AB23E43B17A6B9CA001C19A7 /* integration-icon@2x.png in Resources */,
-				ABC83B0F17B1166300078580 /* mogenerator in Resources */,
 				ABDA422F181BFF2C0054A226 /* CDEMenuViewController.xib in Resources */,
-				ABC83B1117B116A000078580 /* mogeneratorReadme.rtf in Resources */,
-				ABC83B1C17B1170900078580 /* CDECodeGeneratorAccessoryViewController.xib in Resources */,
 				ABC83B4F17B1215200078580 /* CDEAboutWindowController.xib in Resources */,
 				ABC83BDE17B24D9600078580 /* Document_Icon.iconset in Resources */,
 				ABB225D817B92B230024FE4F /* CDEProjectBrowserWindowController.xib in Resources */,
@@ -2262,14 +2159,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		AB7EF6AA1DB4028C0062DD0C /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				AB7EF6B11DB4028D0062DD0C /* CDETests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		ABBEA7D21765CB730024A9D2 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2287,12 +2176,14 @@
 				ABBEA82F1765D5AC0024A9D2 /* CDEModelChooserSheetController.m in Sources */,
 				ABBEA8351765D5AC0024A9D2 /* CDEDropApplicationViewController.m in Sources */,
 				ABBEA8371765D5AC0024A9D2 /* CDEConfigurationWizzard.m in Sources */,
+				ABFFA4891DDF4784009BF96F /* PreferencesVC.m in Sources */,
 				ABBEA83D1765D6260024A9D2 /* CDEDropZoneView.m in Sources */,
 				ABBEA8401765D6D70024A9D2 /* NSError-CDEAdditions.m in Sources */,
 				ABBEA8461765D7250024A9D2 /* NSManagedObjectModel-CDEAdditions.m in Sources */,
 				ABBEA88D1765EA680024A9D2 /* NSDictionary+CDEInfoDictionaryAdditions.m in Sources */,
 				ABCFAF031815826D0011D6FB /* NSPersistentStoreCoordinator+CDEAdditions.m in Sources */,
 				ABBEA8911765EFE40024A9D2 /* NSPersistentStore+CDEStoreAnalyzer.m in Sources */,
+				AB59DA601DDF43FE00A19963 /* PreferencesWC.m in Sources */,
 				ABBEA8951765F3320024A9D2 /* NSBundle+CDEApplicationAnalyzer.m in Sources */,
 				ABBEA8A01765FC230024A9D2 /* NSURL+CDEApplicationAnalyzer.m in Sources */,
 				ABBEA8A4176602B60024A9D2 /* NSString+CDEPersistentStore.m in Sources */,
@@ -2311,7 +2202,6 @@
 				ABEB75641776E70900141062 /* CDEObjectIDValueTableCellView.m in Sources */,
 				ABEB75691776E75800141062 /* CDEManagedObjectIDToStringValueTransformer.m in Sources */,
 				AB99B2EF1998DD0400101647 /* SQLiteDatabase.m in Sources */,
-				ABEB756F1776F37100141062 /* CDEPreferencesWindowController.m in Sources */,
 				ABEB75731776F61300141062 /* NSUserDefaults+CDEAdditions.m in Sources */,
 				ABEB75A3177705E100141062 /* CDEFloatingPointValueTableCellView.m in Sources */,
 				ABEB75A917770B8900141062 /* NSAttributeDescription+CDEAdditions.m in Sources */,
@@ -2379,15 +2269,14 @@
 				AB86F7CB1791922600FB0AEB /* CDEAttributeEditorWindowController.m in Sources */,
 				ABBB31E217984AC100FE964E /* CDENameToNameForDisplayValueTransformer.m in Sources */,
 				ABBB322A1798538100FE964E /* NSError+CDEValidation.m in Sources */,
-				AB7F20CE19DD7B4D00EBBF52 /* VibrantView.m in Sources */,
 				ABBB322E179855D500FE964E /* NSManagedObject+CDEAdditions.m in Sources */,
 				ABBB32321798564100FE964E /* NSManagedObjectContext+CDEAdditions.m in Sources */,
 				AB531222179953B300529EF7 /* NSTableColumn+CDERequestDataCoordinator.m in Sources */,
 				ABFBB3B1179C36E2003B5346 /* CDETwoColumnSplitViewController.m in Sources */,
 				AB0181171997C805000FE094 /* NSDirectoryEnumerator+ProjectBrowser.m in Sources */,
-				AB30FF66179C696D00E49E0B /* CDEPreferencesAutomaticProjectCreationViewController.m in Sources */,
-				AB30FF6B179C6AB400E49E0B /* CDEPreferencesFormattingViewController.m in Sources */,
-				AB30FF70179C6B1700E49E0B /* CDEPreferencesMiscViewController.m in Sources */,
+				AB30FF66179C696D00E49E0B /* PreferencesIntegrationVC.m in Sources */,
+				AB30FF6B179C6AB400E49E0B /* PreferencesFormattingVC.m in Sources */,
+				AB30FF70179C6B1700E49E0B /* PreferencesGeneralVC.m in Sources */,
 				ABDA428D181C0D870054A226 /* BFNavigationController.m in Sources */,
 				ABDA422D181BFF2C0054A226 /* CDEMenuViewController.m in Sources */,
 				ABBAF36D179FFBD200179732 /* CHCSVParser.m in Sources */,
@@ -2406,9 +2295,6 @@
 				AB23E43F17A6C231001C19A7 /* CDEAutosaveInformation.m in Sources */,
 				AB23E44417A6CBA8001C19A7 /* CDEEntityAutosaveInformationItem.m in Sources */,
 				AB23E44717A6CBB3001C19A7 /* CDEEntityAutosaveInformation.m in Sources */,
-				ABC83B1917B1170900078580 /* CDECodeGenerator.m in Sources */,
-				ABC83B1A17B1170900078580 /* CDEManagedObjectSubclassesGenerator.m in Sources */,
-				ABC83B1B17B1170900078580 /* CDECodeGeneratorAccessoryViewController.m in Sources */,
 				ABC83B4E17B1215200078580 /* CDEAboutWindowController.m in Sources */,
 				ABDA4231181BFF2C0054A226 /* CDEMenuView.m in Sources */,
 				ABB225D317B922FA0024FE4F /* CDEPathPickerPopUpButton.m in Sources */,
@@ -2421,14 +2307,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		AB7EF6B41DB4028D0062DD0C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = ABBEA7D51765CB730024A9D2 /* Core Data Editor */;
-			targetProxy = AB7EF6B31DB4028D0062DD0C /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		ABBEA7E21765CB730024A9D2 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
@@ -2473,78 +2351,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		AB7EF6B61DB4028D0062DD0C /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				INFOPLIST_FILE = CDETests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.christian-kienle.CDETests";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Core Data Editor.app/Contents/MacOS/Core Data Editor";
-			};
-			name = Debug;
-		};
-		AB7EF6B71DB4028D0062DD0C /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COMBINE_HIDPI_IMAGES = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				INFOPLIST_FILE = CDETests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.christian-kienle.CDETests";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Core Data Editor.app/Contents/MacOS/Core Data Editor";
-			};
-			name = Release;
-		};
 		ABBEA7F71765CB730024A9D2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -2578,7 +2384,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -2614,9 +2420,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SDKROOT = macosx;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -2628,11 +2433,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Core Data Editor/Core Data Editor-Prefix.pch";
 				INFOPLIST_FILE = "Core Data Editor/Core Data Editor-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.christian-kienle.coredataeditor5";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -2646,11 +2450,10 @@
 				GCC_PREFIX_HEADER = "Core Data Editor/Core Data Editor-Prefix.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = "Core Data Editor/Core Data Editor-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.christian-kienle.coredataeditor5";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -2658,15 +2461,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		AB7EF6B51DB4028D0062DD0C /* Build configuration list for PBXNativeTarget "CDETests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				AB7EF6B61DB4028D0062DD0C /* Debug */,
-				AB7EF6B71DB4028D0062DD0C /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		ABBEA7D11765CB730024A9D2 /* Build configuration list for PBXProject "Core Data Editor" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/Core Data Editor/Core Data Editor/CDEAboutWindowController.h b/Core Data Editor/Core Data Editor/CDEAboutWindowController.h
index 5353c05..fa4556b 100644
--- a/Core Data Editor/Core Data Editor/CDEAboutWindowController.h	
+++ b/Core Data Editor/Core Data Editor/CDEAboutWindowController.h	
@@ -1,11 +1,3 @@
-//
-//  CDEAboutWindowController.h
-//  Core Data Editor
-//
-//  Created by cmk on 8/6/13.
-//  Copyright (c) 2013 Christian Kienle. All rights reserved.
-//
-
 #import <Cocoa/Cocoa.h>
 
 @interface CDEAboutWindowController : NSWindowController
diff --git a/Core Data Editor/Core Data Editor/CDEAboutWindowController.m b/Core Data Editor/Core Data Editor/CDEAboutWindowController.m
index d9513eb..6c4c5ff 100644
--- a/Core Data Editor/Core Data Editor/CDEAboutWindowController.m	
+++ b/Core Data Editor/Core Data Editor/CDEAboutWindowController.m	
@@ -1,19 +1,18 @@
 #import "CDEAboutWindowController.h"
 
 @interface CDEAboutWindowController ()
+
 @property (unsafe_unretained) IBOutlet NSTextView *textView;
 
 @end
 
 @implementation CDEAboutWindowController
 
-- (void)windowDidLoad
-{
-    [super windowDidLoad];
-    NSURL *aboutURL = [[NSBundle mainBundle] URLForResource:@"Credits" withExtension:@"rtf"];
-  NSDictionary *options = @{ NSDocumentTypeDocumentOption : NSRTFTextDocumentType};
-  NSAttributedString *aboutText = [[NSAttributedString alloc] initWithURL:aboutURL options:options documentAttributes:nil error:NULL];
-    [[self.textView textStorage] appendAttributedString:aboutText];
+- (void)windowDidLoad {
+  [super windowDidLoad];
+  NSURL *aboutURL = [[NSBundle mainBundle] URLForResource:@"Credits" withExtension:@"rtf"];
+  NSAttributedString *aboutText = [[NSAttributedString alloc] initWithURL:aboutURL options:@{} documentAttributes:NULL error:NULL];
+  [[self.textView textStorage] appendAttributedString:aboutText];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEAboutWindowController.xib b/Core Data Editor/Core Data Editor/CDEAboutWindowController.xib
index c8b65df..c88d117 100644
--- a/Core Data Editor/Core Data Editor/CDEAboutWindowController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEAboutWindowController.xib	
@@ -1,507 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSImageCell</string>
-			<string>NSImageView</string>
-			<string>NSScrollView</string>
-			<string>NSScroller</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-			<string>NSTextView</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">CDEAboutWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">3</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {380, 328}}</string>
-				<int key="NSWTFlags">1618477056</int>
-				<string key="NSWindowTitle"/>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSScrollView" id="744164240">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSClipView" id="78255304">
-									<reference key="NSNextResponder" ref="744164240"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSTextView" id="504358160">
-											<reference key="NSNextResponder" ref="78255304"/>
-											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{380, 165}</string>
-											<reference key="NSSuperview" ref="78255304"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="700287304"/>
-											<string key="NSReuseIdentifierKey">_NS:13</string>
-											<object class="NSTextContainer" key="NSTextContainer" id="382644457">
-												<object class="NSLayoutManager" key="NSLayoutManager">
-													<object class="NSTextStorage" key="NSTextStorage">
-														<object class="NSMutableString" key="NSString">
-															<characters key="NS.bytes"/>
-														</object>
-														<nil key="NSDelegate"/>
-													</object>
-													<array class="NSMutableArray" key="NSTextContainers">
-														<reference ref="382644457"/>
-													</array>
-													<int key="NSLMFlags">166</int>
-													<nil key="NSDelegate"/>
-												</object>
-												<reference key="NSTextView" ref="504358160"/>
-												<double key="NSWidth">380</double>
-												<int key="NSTCFlags">1</int>
-											</object>
-											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">12261</int>
-												<int key="NSTextCheckingTypes">0</int>
-												<nil key="NSMarkedAttributes"/>
-												<object class="NSColor" key="NSBackgroundColor" id="752036727">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MQA</bytes>
-												</object>
-												<dictionary key="NSSelectedAttributes">
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">selectedTextBackgroundColor</string>
-														<object class="NSColor" key="NSColor" id="369463548">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">selectedTextColor</string>
-														<object class="NSColor" key="NSColor" id="400201745">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MAA</bytes>
-														</object>
-													</object>
-												</dictionary>
-												<reference key="NSInsertionColor" ref="400201745"/>
-												<dictionary key="NSLinkAttributes">
-													<object class="NSColor" key="NSColor">
-														<int key="NSColorSpace">1</int>
-														<bytes key="NSRGB">MCAwIDEAA</bytes>
-													</object>
-													<object class="NSCursor" key="NSCursor">
-														<string key="NSHotSpot">{8, -8}</string>
-														<int key="NSCursorType">13</int>
-													</object>
-													<integer value="1" key="NSUnderline"/>
-												</dictionary>
-												<nil key="NSDefaultParagraphStyle"/>
-												<nil key="NSTextFinder"/>
-												<int key="NSPreferredTextFinderStyle">1</int>
-											</object>
-											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{463, 10000000}</string>
-											<nil key="NSDelegate"/>
-										</object>
-									</array>
-									<string key="NSFrame">{{1, 1}, {380, 165}}</string>
-									<reference key="NSSuperview" ref="744164240"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="504358160"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-									<reference key="NSDocView" ref="504358160"/>
-									<reference key="NSBGColor" ref="752036727"/>
-									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{4, 5}</string>
-										<object class="NSImage" key="NSImage">
-											<int key="NSImageFlags">79691776</int>
-											<array key="NSReps">
-												<array>
-													<integer value="5"/>
-													<object class="NSURL">
-														<nil key="NS.base"/>
-														<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string>
-													</object>
-												</array>
-											</array>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MCAwAA</bytes>
-											</object>
-										</object>
-									</object>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="700287304">
-									<reference key="NSNextResponder" ref="744164240"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{365, 1}, {16, 165}}</string>
-									<reference key="NSSuperview" ref="744164240"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="604779640"/>
-									<string key="NSReuseIdentifierKey">_NS:83</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<reference key="NSTarget" ref="744164240"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.99259259259259258</double>
-								</object>
-								<object class="NSScroller" id="53833180">
-									<reference key="NSNextResponder" ref="744164240"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
-									<reference key="NSSuperview" ref="744164240"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="78255304"/>
-									<string key="NSReuseIdentifierKey">_NS:33</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="744164240"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1</double>
-									<double key="NSPercent">0.94565218687057495</double>
-								</object>
-							</array>
-							<string key="NSFrame">{{-1, 45}, {382, 167}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="53833180"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<int key="NSsFlags">133138</int>
-							<reference key="NSVScroller" ref="700287304"/>
-							<reference key="NSHScroller" ref="53833180"/>
-							<reference key="NSContentView" ref="78255304"/>
-							<double key="NSMinMagnification">0.25</double>
-							<double key="NSMaxMagnification">4</double>
-							<double key="NSMagnification">1</double>
-						</object>
-						<object class="NSImageView" id="198204709">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">256</int>
-							<set class="NSMutableSet" key="NSDragTypes">
-								<string>Apple PDF pasteboard type</string>
-								<string>Apple PICT pasteboard type</string>
-								<string>Apple PNG pasteboard type</string>
-								<string>NSFilenamesPboardType</string>
-								<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-								<string>NeXT TIFF v4.0 pasteboard type</string>
-							</set>
-							<string key="NSFrame">{{157, 241}, {67, 67}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="26835099"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSImageCell" key="NSCell" id="241289935">
-								<int key="NSCellFlags">0</int>
-								<int key="NSCellFlags2">33554432</int>
-								<object class="NSCustomResource" key="NSContents">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSApplicationIcon</string>
-								</object>
-								<int key="NSAlign">0</int>
-								<int key="NSScale">0</int>
-								<int key="NSStyle">0</int>
-								<bool key="NSAnimates">YES</bool>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-							<bool key="NSEditable">YES</bool>
-						</object>
-						<object class="NSTextField" id="604779640">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 20}, {346, 17}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:1535</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="762389043">
-								<int key="NSCellFlags">68157504</int>
-								<int key="NSCellFlags2">138413056</int>
-								<string key="NSContents">© Thermal Core, 2013</string>
-								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<string key="NSCellIdentifier">_NS:1535</string>
-								<reference key="NSControlView" ref="604779640"/>
-								<object class="NSColor" key="NSBackgroundColor" id="283224278">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<reference key="NSColor" ref="369463548"/>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="268450784">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<reference key="NSColor" ref="400201745"/>
-								</object>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="26835099">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 220}, {346, 17}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="744164240"/>
-							<string key="NSReuseIdentifierKey">_NS:1535</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="667132306">
-								<int key="NSCellFlags">68157504</int>
-								<int key="NSCellFlags2">138413056</int>
-								<string key="NSContents">Core Data Editor</string>
-								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande-Bold</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">2072</int>
-								</object>
-								<string key="NSCellIdentifier">_NS:1535</string>
-								<reference key="NSControlView" ref="26835099"/>
-								<reference key="NSBackgroundColor" ref="283224278"/>
-								<reference key="NSTextColor" ref="268450784"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</array>
-					<string key="NSFrameSize">{380, 328}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="198204709"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">NO</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="504358160"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">4</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="198204709"/>
-							<reference ref="26835099"/>
-							<reference ref="744164240"/>
-							<reference ref="604779640"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="744164240"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="504358160"/>
-							<reference ref="53833180"/>
-							<reference ref="700287304"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="504358160"/>
-						<reference key="parent" ref="744164240"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="53833180"/>
-						<reference key="parent" ref="744164240"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="700287304"/>
-						<reference key="parent" ref="744164240"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="198204709"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="241289935"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="241289935"/>
-						<reference key="parent" ref="198204709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">25</int>
-						<reference key="object" ref="604779640"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="762389043"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="762389043"/>
-						<reference key="parent" ref="604779640"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="26835099"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="667132306"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">36</int>
-						<reference key="object" ref="667132306"/>
-						<reference key="parent" ref="26835099"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">37</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">CDEAboutWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">textView</string>
-						<string key="NS.object.0">NSTextView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">textView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">textView</string>
-							<string key="candidateClassName">NSTextView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CDEAboutWindowController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">NSApplicationIcon</string>
-			<string key="NS.object.0">{128, 128}</string>
-		</object>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="CDEAboutWindowController">
+            <connections>
+                <outlet property="textView" destination="6" id="37"/>
+                <outlet property="window" destination="1" id="3"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <rect key="contentRect" x="196" y="240" width="380" height="328"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="380" height="328"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="5">
+                        <rect key="frame" x="-1" y="45" width="382" height="167"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="XIh-tq-m8Q">
+                            <rect key="frame" x="1" y="1" width="380" height="165"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <textView editable="NO" importsGraphics="NO" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" smartInsertDelete="YES" id="6">
+                                    <rect key="frame" x="0.0" y="0.0" width="380" height="165"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <size key="minSize" width="380" height="165"/>
+                                    <size key="maxSize" width="463" height="10000000"/>
+                                    <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                </textView>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="7">
+                            <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="8">
+                            <rect key="frame" x="365" y="1" width="16" height="165"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                    </scrollView>
+                    <imageView id="13">
+                        <rect key="frame" x="157" y="241" width="67" height="67"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="NSApplicationIcon" id="14"/>
+                    </imageView>
+                    <textField verticalHuggingPriority="750" id="25">
+                        <rect key="frame" x="17" y="20" width="346" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="© Thermal Core, 2013" id="26">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="35">
+                        <rect key="frame" x="17" y="220" width="346" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Core Data Editor" id="36">
+                            <font key="font" metaFont="systemBold"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="4"/>
+            </connections>
+        </window>
+    </objects>
+    <resources>
+        <image name="NSApplicationIcon" width="128" height="128"/>
+    </resources>
+</document>
diff --git a/Core Data Editor/Core Data Editor/CDEApplicationDelegate.m b/Core Data Editor/Core Data Editor/CDEApplicationDelegate.m
index a3ac826..5f1b052 100644
--- a/Core Data Editor/Core Data Editor/CDEApplicationDelegate.m	
+++ b/Core Data Editor/Core Data Editor/CDEApplicationDelegate.m	
@@ -1,5 +1,4 @@
 #import "CDEApplicationDelegate.h"
-#import "CDEPreferencesWindowController.h"
 #import "CDENSNullToNilTransformer.h"
 #import "CDENameToNameForDisplayValueTransformer.h"
 #import "NSPersistentStore+CDEStoreAnalyzer.h"
@@ -9,7 +8,7 @@
 #import "NSWorkspace+CDEAdditions.h"
 #import "CDEProjectBrowserWindowController.h"
 #import "CDESetupWindowController.h"
-
+#import "PreferencesWC.h"
 @interface CDEApplicationDelegate () <NSApplicationDelegate>
 
 #pragma mark - Helper / Security Scoped Resources
@@ -17,7 +16,6 @@ @interface CDEApplicationDelegate () <NSApplicationDelegate>
 @property (nonatomic, copy) NSURL *derivedDataDirectory;
 
 #pragma mark - Properties
-@property (nonatomic, strong) CDEPreferencesWindowController *preferencesWindowController;
 @property (nonatomic, strong) CDEAboutWindowController *aboutWindowController;
 @property (nonatomic, strong) CDEProjectBrowserWindowController *projectBrowserWindowController;
 @property (nonatomic, strong) CDESetupWindowController *setupWindowController;
@@ -27,204 +25,208 @@ @interface CDEApplicationDelegate () <NSApplicationDelegate>
 @implementation CDEApplicationDelegate
 
 + (void)initialize {
-    if(self == [CDEApplicationDelegate class]) {
-        [NSUserDefaults registerCoreDataEditorDefaults_cde];
-        [NSValueTransformer setValueTransformer:[CDENSNullToNilTransformer new] forName:@"CDENSNullToNilTransformer"];
-        [CDENameToNameForDisplayValueTransformer registerDefaultCoreDataEditorNameToNameForDisplayValueTransformer];
-    }
+  if(self == [CDEApplicationDelegate class]) {
+    [NSUserDefaults registerCoreDataEditorDefaults_cde];
+    [NSValueTransformer setValueTransformer:[CDENSNullToNilTransformer new] forName:@"CDENSNullToNilTransformer"];
+    [CDENameToNameForDisplayValueTransformer registerDefaultCoreDataEditorNameToNameForDisplayValueTransformer];
+  }
 }
 
 #pragma mark - Actions
 - (IBAction)showPreferences:(id)sender {
-    [self.preferencesWindowController showWithCompletionHandler:^{
-    }];
+  PreferencesWC *vc = [[NSStoryboard storyboardWithName:@"Preferences" bundle:nil] instantiateInitialController];
+  [vc showWindow:nil];
+  //cde.showPreferences
 }
 
 - (IBAction)showAbout:(id)sender {
-    [self.aboutWindowController showWindow:self];
+  [self.aboutWindowController showWindow:self];
 }
 
 - (IBAction)showHelp:(id)sender {
-    [[NSWorkspace sharedWorkspace] openSupportWebsite_cde];
+  [[NSWorkspace sharedWorkspace] openSupportWebsite_cde];
 }
 
 - (IBAction)showProjectBrowser:(id)sender {
-    if(self.projectBrowserWindowController == nil) {
-        self.projectBrowserWindowController = [CDEProjectBrowserWindowController new];
-    }
-    [self.projectBrowserWindowController showWithProjectDirectoryURL:self.iPhoneSimulatorDirectory];
+  if(self.projectBrowserWindowController == nil) {
+    self.projectBrowserWindowController = [CDEProjectBrowserWindowController new];
+  }
+  [self.projectBrowserWindowController showWithProjectDirectoryURL:self.iPhoneSimulatorDirectory];
 }
 
 #pragma mark - Helper
 #pragma mark - Helper / Security Scoped Resources
 - (BOOL)startAccessingCoreDataEditorSecurityScopedResources {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
-    BOOL iPhoneSimulatorSuccess = YES;
-
-    if(defaults.simulatorDirectory_cde != nil) {
-        self.iPhoneSimulatorDirectory = defaults.simulatorDirectory_cde;
-        iPhoneSimulatorSuccess = [self.iPhoneSimulatorDirectory startAccessingSecurityScopedResource];
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  
+  BOOL iPhoneSimulatorSuccess = YES;
+  
+  if(defaults.simulatorDirectory_cde != nil) {
+    self.iPhoneSimulatorDirectory = defaults.simulatorDirectory_cde;
+    iPhoneSimulatorSuccess = [self.iPhoneSimulatorDirectory startAccessingSecurityScopedResource];
+  }
+  
+  BOOL buildProductsDirectorySuccess = YES;
+  
+  if(defaults.buildProductsDirectory_cde != nil) {
+    self.derivedDataDirectory = defaults.buildProductsDirectory_cde;
+    buildProductsDirectorySuccess = [self.derivedDataDirectory startAccessingSecurityScopedResource];
+    if(buildProductsDirectorySuccess == NO) {
+      // we have bookmark data but we cannot start accessing it!
+      NSAlert *alert = [NSAlert new];
+      alert.messageText = @"Failed to access Derived Data Directory";
+      [alert addButtonWithTitle:@"Set Directory…"];
+      [alert addButtonWithTitle:@"Cancel"];
+      alert.informativeText = @"You have set a Xcode derived data directory in the preferences but Core Data Editor failed to access the contents of the directory. If you want to continue to use this feature you should set a new directory now.";
+      NSUInteger returnCode = [alert runModal];
+      if(returnCode == NSAlertFirstButtonReturn) {
+        assert(false);
+//        [self.preferencesWindowController showAutomaticProjectCreationPreferencesWithCompletionHandler:nil];
+      }
     }
-
-    BOOL buildProductsDirectorySuccess = YES;
-
-    if(defaults.buildProductsDirectory_cde != nil) {
-        self.derivedDataDirectory = defaults.buildProductsDirectory_cde;
-        buildProductsDirectorySuccess = [self.derivedDataDirectory startAccessingSecurityScopedResource];
-        if(buildProductsDirectorySuccess == NO) {
-            // we have bookmark data but we cannot start accessing it!
-          NSAlert *alert = [NSAlert new];
-          alert.messageText = @"Failed to access Derived Data Directory";
-          [alert addButtonWithTitle:@"Set Directory…"];
-          [alert addButtonWithTitle:@"Cancel"];
-          alert.informativeText = @"You have set a Xcode derived data directory in the preferences but Core Data Editor failed to access the contents of the directory. If you want to continue to use this feature you should set a new directory now.";
-            NSUInteger returnCode = [alert runModal];
-            if(returnCode == NSAlertFirstButtonReturn) {
-                [self.preferencesWindowController showAutomaticProjectCreationPreferencesWithCompletionHandler:nil];
-            }
-        }
-    }
-
-    return (iPhoneSimulatorSuccess && buildProductsDirectorySuccess);
+  }
+  
+  return (iPhoneSimulatorSuccess && buildProductsDirectorySuccess);
 }
 
 #pragma mark NSApplicationDelegate
 - (void)applicationWillFinishLaunching:(NSNotification *)notification {
-
-    // Start accessing security scoped resources here because this delegate method is called
-    // before applicationDidFinishLaunching: and before application:openFile:
-    // Since we need access to the resources in both cases...
-    [self startAccessingCoreDataEditorSecurityScopedResources];
-
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  
+  // Start accessing security scoped resources here because this delegate method is called
+  // before applicationDidFinishLaunching: and before application:openFile:
+  // Since we need access to the resources in both cases...
+  [self startAccessingCoreDataEditorSecurityScopedResources];
+  
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   [defaults setObject:@"HELLO" forKey:@"AAAAAAAAAAAAAA"];
-    [[NSNotificationCenter defaultCenter] addObserverForName:CDEUserDefaultsNotifications.didChangeSimulatorDirectory object:defaults queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self.iPhoneSimulatorDirectory stopAccessingSecurityScopedResource];
-        self.iPhoneSimulatorDirectory = defaults.simulatorDirectory_cde;
-        [self.iPhoneSimulatorDirectory startAccessingSecurityScopedResource];
-        [self.projectBrowserWindowController updateProjectDirectoryURL:self.iPhoneSimulatorDirectory];
-    }];
-
-    [[NSNotificationCenter defaultCenter] addObserverForName:CDEUserDefaultsNotifications.didChangeBuildProductsDirectory object:defaults queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [self.derivedDataDirectory stopAccessingSecurityScopedResource];
-        self.derivedDataDirectory = defaults.buildProductsDirectory_cde;
-        [self.derivedDataDirectory startAccessingSecurityScopedResource];
-    }];
+  [[NSNotificationCenter defaultCenter] addObserverForName:CDEUserDefaultsNotifications.didChangeSimulatorDirectory object:defaults queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+    [self.iPhoneSimulatorDirectory stopAccessingSecurityScopedResource];
+    self.iPhoneSimulatorDirectory = defaults.simulatorDirectory_cde;
+    [self.iPhoneSimulatorDirectory startAccessingSecurityScopedResource];
+    [self.projectBrowserWindowController updateProjectDirectoryURL:self.iPhoneSimulatorDirectory];
+  }];
+  
+  [[NSNotificationCenter defaultCenter] addObserverForName:CDEUserDefaultsNotifications.didChangeBuildProductsDirectory object:defaults queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+    [self.derivedDataDirectory stopAccessingSecurityScopedResource];
+    self.derivedDataDirectory = defaults.buildProductsDirectory_cde;
+    [self.derivedDataDirectory startAccessingSecurityScopedResource];
+  }];
 }
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
-
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    if(defaults.applicationNeedsSetup_cde) {
-        self.setupWindowController = [CDESetupWindowController new];
-        [self.setupWindowController showWindow:self];
-    }
-    else if (defaults.opensProjectBrowserOnLaunch_cde) {
-        [self showProjectBrowser:nil];
-
-    }
+  
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  if(defaults.applicationNeedsSetup_cde) {
+    self.setupWindowController = [CDESetupWindowController new];
+    [self.setupWindowController showWindow:self];
+  }
+  else if (defaults.opensProjectBrowserOnLaunch_cde) {
+    [self showProjectBrowser:nil];
     
-    self.aboutWindowController = [[CDEAboutWindowController alloc] initWithWindowNibName:@"CDEAboutWindowController"];
-    // Create prefs if needed
-    if(self.preferencesWindowController == nil) {
-        self.preferencesWindowController = [CDEPreferencesWindowController new];
-    }
+  }
+  
+  self.aboutWindowController = [[CDEAboutWindowController alloc] initWithWindowNibName:@"CDEAboutWindowController"];
+  // Create prefs if needed
+//  if(self.preferencesWindowController == nil) {
+//    self.preferencesWindowController = [CDEPreferencesWindowController new];
+//  }
 }
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    if(!flag && defaults.opensProjectBrowserOnLaunch_cde) {
-        [self showProjectBrowser:nil];
-        return NO;
-    }
-    return YES;
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  if(!flag && defaults.opensProjectBrowserOnLaunch_cde) {
+    [self showProjectBrowser:nil];
+    return NO;
+  }
+  return YES;
 }
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender {
-    return NO;
+  return NO;
 }
 
 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename {
-    // Need to create prefs?
-    if(self.preferencesWindowController == nil) {
-        self.preferencesWindowController = [CDEPreferencesWindowController new];
+  // Need to create prefs?
+//  if(self.preferencesWindowController == nil) {
+//    self.preferencesWindowController = [CDEPreferencesWindowController new];
+//  }
+  if([filename.pathExtension isEqualToString:@"coredataeditor5"]) {
+    [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:[NSURL fileURLWithPath:filename] display:YES completionHandler:^(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError * _Nullable error) {
+      
+    }];
+    return YES;
+  }
+  // Is this a store file?
+  NSURL *storeURL = [NSURL fileURLWithPath:filename];
+  
+  NSString *storeType = [NSPersistentStore typeOfPersistentStoreAtURL_cde:storeURL];
+  if(storeType == nil) {
+    NSLog(@"'%@' not a valid store", filename);
+    return NO;
+  }
+  // If we have no build products URL we can return NO
+  NSURL *buildProductsDirectory = [[NSUserDefaults standardUserDefaults] buildProductsDirectory_cde];
+  if(buildProductsDirectory == nil) {
+    NSLog(@"no build products directory.");
+    assert(false);
+#pragma mark warn bla
+//    [self.preferencesWindowController showAutomaticProjectCreationPreferencesAndDisplayInfoSheetWithCompletionHandler:nil];
+    return YES;
+  }
+  
+  // Try to find a matching model
+  NSFileManager *fileManager = [NSFileManager new];
+  NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtURL:buildProductsDirectory includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles errorHandler:^BOOL(NSURL *url, NSError *error) {
+    NSLog(@"error while enumerating contents of build products directory: %@", error);
+    return YES;
+  }];
+  
+  NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+  
+  for(NSURL *potentialModelURL in enumerator) {
+    NSError *error = nil;
+    NSString *UTI = [workspace typeOfFile:potentialModelURL.path error:&error];
+    if(UTI == nil) {
+      NSLog(@"Failed to determine UTI: %@", error);
+      continue;
     }
-    if([filename.pathExtension isEqualToString:@"coredataeditor5"]) {
-      [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:[NSURL fileURLWithPath:filename] display:YES completionHandler:^(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError * _Nullable error) {
-        
-      }];
-      return YES;
+    BOOL conformsTo = [workspace type:UTI conformsToType:@"com.apple.xcode.mom"];
+    if(!conformsTo) {
+      continue;
     }
-    // Is this a store file?
-    NSURL *storeURL = [NSURL fileURLWithPath:filename];
-
-    NSString *storeType = [NSPersistentStore typeOfPersistentStoreAtURL_cde:storeURL];
-    if(storeType == nil) {
-        NSLog(@"'%@' not a valid store", filename);
-        return NO;
+    
+    // We have found a model!
+    NSURL *modelURL = potentialModelURL;
+    NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    NSManagedObjectModel *transformedModel = model.transformedManagedObjectModel_cde;
+    
+    // Test compatibility
+    error = nil;
+    BOOL isCompatible = [transformedModel isCompatibleWithStoreAtURL:storeURL error_cde:&error];
+    if(!isCompatible) {
+      continue;
     }
-    // If we have no build products URL we can return NO
-    NSURL *buildProductsDirectory = [[NSUserDefaults standardUserDefaults] buildProductsDirectory_cde];
-    if(buildProductsDirectory == nil) {
-        NSLog(@"no build products directory.");
-        [self.preferencesWindowController showAutomaticProjectCreationPreferencesAndDisplayInfoSheetWithCompletionHandler:nil];
-        return YES;
+    error = nil;
+    
+    // We have found something!
+    NSLog(@"%@ is compatible with %@", storeURL.lastPathComponent, modelURL);
+    CDEDocument *document = [[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:NO error:NULL];
+    CDEConfiguration *c = [document createConfiguration];
+    error = nil;
+    BOOL set = [c setBookmarkDataWithApplicationBundleURL:nil storeURL:storeURL modelURL:modelURL error:&error];
+    if(!set) {
+      NSLog(@"error: %@", error);
     }
-
-    // Try to find a matching model
-    NSFileManager *fileManager = [NSFileManager new];
-    NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtURL:buildProductsDirectory includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles errorHandler:^BOOL(NSURL *url, NSError *error) {
-        NSLog(@"error while enumerating contents of build products directory: %@", error);
-        return YES;
-    }];
-
-    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-
-    for(NSURL *potentialModelURL in enumerator) {
-        NSError *error = nil;
-        NSString *UTI = [workspace typeOfFile:potentialModelURL.path error:&error];
-        if(UTI == nil) {
-            NSLog(@"Failed to determine UTI: %@", error);
-            continue;
-        }
-        BOOL conformsTo = [workspace type:UTI conformsToType:@"com.apple.xcode.mom"];
-        if(!conformsTo) {
-            continue;
-        }
-
-        // We have found a model!
-        NSURL *modelURL = potentialModelURL;
-        NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
-        NSManagedObjectModel *transformedModel = model.transformedManagedObjectModel_cde;
-
-        // Test compatibility
-        error = nil;
-        BOOL isCompatible = [transformedModel isCompatibleWithStoreAtURL:storeURL error_cde:&error];
-        if(!isCompatible) {
-            continue;
-        }
-        error = nil;
-
-        // We have found something!
-        NSLog(@"%@ is compatible with %@", storeURL.lastPathComponent, modelURL);
-        CDEDocument *document = [[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:NO error:NULL];
-        CDEConfiguration *c = [document createConfiguration];
-        error = nil;
-        BOOL set = [c setBookmarkDataWithApplicationBundleURL:nil storeURL:storeURL modelURL:modelURL error:&error];
-        if(!set) {
-            NSLog(@"error: %@", error);
-        }
-        error = nil;
-        BOOL setup = [document setupAndStartAccessingConfigurationRelatedURLsAndGetError:&error];
-        if(!setup) {
-            NSLog(@"error: %@", error);
-        }
-        [document makeWindowControllers];
-        [document showWindows];
-        return YES;
+    error = nil;
+    BOOL setup = [document setupAndStartAccessingConfigurationRelatedURLsAndGetError:&error];
+    if(!setup) {
+      NSLog(@"error: %@", error);
     }
-    return NO;
+    [document makeWindowControllers];
+    [document showWindows];
+    return YES;
+  }
+  return NO;
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEAttributeEditor.m b/Core Data Editor/Core Data Editor/CDEAttributeEditor.m
index 95ffb3c..a2d276e 100644
--- a/Core Data Editor/Core Data Editor/CDEAttributeEditor.m	
+++ b/Core Data Editor/Core Data Editor/CDEAttributeEditor.m	
@@ -37,13 +37,14 @@ - (void)showEditorForManagedObject:(NSManagedObject *)managedObject
     self.completionHandler = nil;
   }];
 }
+
 #pragma mark - Closing the Editor
 - (BOOL)isShown {
     return (self.windowController != nil);
 }
 
 - (void)close {
-    [NSApp endSheet:self.windowController.window];
+  [self.windowController.window.sheetParent endSheet:self.windowController.window returnCode:NSModalResponseOK];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEAttributeEditorViewController.xib b/Core Data Editor/Core Data Editor/CDEAttributeEditorViewController.xib
index 639d96f..1f07882 100644
--- a/Core Data Editor/Core Data Editor/CDEAttributeEditorViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEAttributeEditorViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDEAttributeEditorWindowController.m b/Core Data Editor/Core Data Editor/CDEAttributeEditorWindowController.m
index 1f571f6..0616520 100644
--- a/Core Data Editor/Core Data Editor/CDEAttributeEditorWindowController.m	
+++ b/Core Data Editor/Core Data Editor/CDEAttributeEditorWindowController.m	
@@ -45,7 +45,7 @@ - (void)windowDidLoad {
 }
 
 - (IBAction)performClose:(id)sender {
-    [NSApp endSheet:self.window];
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEBinaryAttributeView.xib b/Core Data Editor/Core Data Editor/CDEBinaryAttributeView.xib
index 8af996f..6a17e64 100644
--- a/Core Data Editor/Core Data Editor/CDEBinaryAttributeView.xib	
+++ b/Core Data Editor/Core Data Editor/CDEBinaryAttributeView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -39,7 +38,7 @@
                         </binding>
                     </connections>
                 </textField>
-                <popUpButton verticalHuggingPriority="750" misplaced="YES" id="55">
+                <popUpButton verticalHuggingPriority="750" id="55">
                     <rect key="frame" x="53" y="10" width="45" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="left" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" arrowPosition="arrowAtCenter" selectedItem="58" id="56" userLabel="Pop Up Button Cell">
@@ -105,7 +104,7 @@
                 <box autoresizesSubviews="NO" boxType="custom" borderType="line" title="Box" titlePosition="noTitle" id="86">
                     <rect key="frame" x="1" y="5" width="48" height="48"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                    <view key="contentView" id="PdQ-SS-rbs">
+                    <view key="contentView" id="aSw-lF-Qum">
                         <rect key="frame" x="1" y="1" width="46" height="46"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDEBinaryValuePreviewView.m b/Core Data Editor/Core Data Editor/CDEBinaryValuePreviewView.m
index c26a1f7..dc5671b 100644
--- a/Core Data Editor/Core Data Editor/CDEBinaryValuePreviewView.m	
+++ b/Core Data Editor/Core Data Editor/CDEBinaryValuePreviewView.m	
@@ -76,11 +76,6 @@ - (void)drawRect:(NSRect)dirtyRect {
         actionImageOrigin.x = NSMidX(boxRect) - (0.5 * actionSize.width);
         actionImageOrigin.y = NSMidY(boxRect) - (0.5 * actionSize.height);
         [NSGraphicsContext saveGraphicsState];
-//        NSShadow *shadow = [NSShadow new];
-//        [shadow setShadowBlurRadius:0.0];
-//        [shadow setShadowColor:[NSColor whiteColor]];
-//        [shadow setShadowOffset:NSMakeSize(0.0, -1.5)];
-//        [shadow set];
         [actionImage drawAtPoint:actionImageOrigin fromRect:NSZeroRect operation:NSCompositingOperationSourceAtop fraction:1.0];
                 
         [NSGraphicsContext restoreGraphicsState];
diff --git a/Core Data Editor/Core Data Editor/CDEBooleanAttributeView.xib b/Core Data Editor/Core Data Editor/CDEBooleanAttributeView.xib
index 2d88219..0de40a4 100644
--- a/Core Data Editor/Core Data Editor/CDEBooleanAttributeView.xib	
+++ b/Core Data Editor/Core Data Editor/CDEBooleanAttributeView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.m b/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.m
index 3aed091..ffce9f5 100644
--- a/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.m	
+++ b/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.m	
@@ -20,9 +20,7 @@ - (instancetype)init {
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if(self) {
-        
-    }
+    if(self) { }
     return self;
 }
 
diff --git a/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.xib b/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.xib
index fb7e6a5..0c3067d 100644
--- a/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDECSVAccessoryViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDECSVDelimiter.m b/Core Data Editor/Core Data Editor/CDECSVDelimiter.m
index 6ec6a06..a6be68d 100644
--- a/Core Data Editor/Core Data Editor/CDECSVDelimiter.m	
+++ b/Core Data Editor/Core Data Editor/CDECSVDelimiter.m	
@@ -9,7 +9,7 @@
 @interface CDECSVDelimiter ()
 
 #pragma mark Getting Delimiter Instances
-+ (NSDictionary *)delimiterStringValueForMenuItemTagMapping;
++ (NSDictionary<NSNumber*, NSString*> *)delimiterStringValueForMenuItemTagMapping;
 
 #pragma mark Creating
 - (id)initWithStringRepresentation:(NSString *)stringRepresentation_ menuItemTag:(NSInteger)menuItemTag_;
@@ -23,7 +23,7 @@ - (id)initWithStringRepresentation:(NSString *)stringRepresentation_ menuItemTag
 @implementation CDECSVDelimiter
 
 #pragma mark Getting Delimiter Instances
-+ (NSDictionary *)delimiterStringValueForMenuItemTagMapping {
++ (NSDictionary<NSNumber*, NSString*> *)delimiterStringValueForMenuItemTagMapping {
     NSMutableDictionary *result = [NSMutableDictionary dictionary];
     result[@(CDECSVDelimiterMenuItemTagComma)] = @",";
     result[@(CDECSVDelimiterMenuItemTagSemicolon)] = @";";
diff --git a/Core Data Editor/Core Data Editor/CDECSVImportWindow.xib b/Core Data Editor/Core Data Editor/CDECSVImportWindow.xib
index 91d5708..772fc32 100644
--- a/Core Data Editor/Core Data Editor/CDECSVImportWindow.xib	
+++ b/Core Data Editor/Core Data Editor/CDECSVImportWindow.xib	
@@ -1,1431 +1,271 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSArrayController</string>
-			<string>NSBox</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSImageCell</string>
-			<string>NSImageView</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSObjectController</string>
-			<string>NSPopUpButton</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSScrollView</string>
-			<string>NSScroller</string>
-			<string>NSTableCellView</string>
-			<string>NSTableColumn</string>
-			<string>NSTableHeaderView</string>
-			<string>NSTableView</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">CDECSVImportWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSArrayController" id="937516784">
-				<string key="NSObjectClassName">NSEntityDescription</string>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-			<object class="NSArrayController" id="534923443">
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-			<object class="NSObjectController" id="967865759">
-				<string key="NSObjectClassName">CDECSVImportWindowController</string>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {564, 469}}</string>
-				<int key="NSWTFlags">1618477056</int>
-				<string key="NSWindowTitle">CSV Import</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{564, 469}</string>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSButton" id="117432864">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{20, 18}, {61, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="527440376"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="752332378">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<object class="NSFont" key="NSSupport" id="425085614">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="117432864"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">163</int>
-								<reference key="NSAlternateImage" ref="425085614"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="527440376">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{475, 20}, {70, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="817005554">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Import…</string>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="527440376"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="1044610225">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{139, 338}, {232, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="335143732"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="507655509">
-								<int key="NSCellFlags">-2080374720</int>
-								<int key="NSCellFlags2">2048</int>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="1044610225"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<nil key="NSMenuItem"/>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="1070601615">
-									<string key="NSTitle">OtherViews</string>
-									<array class="NSMutableArray" key="NSMenuItems"/>
-									<reference key="NSMenuFont" ref="425085614"/>
-								</object>
-								<int key="NSSelectedIndex">-1</int>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSScrollView" id="335143732">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSClipView" id="122424805">
-									<reference key="NSNextResponder" ref="335143732"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSTableView" id="609972187">
-											<reference key="NSNextResponder" ref="122424805"/>
-											<int key="NSvFlags">256</int>
-											<array class="NSMutableArray" key="NSSubviews"/>
-											<string key="NSFrameSize">{522, 252}</string>
-											<reference key="NSSuperview" ref="122424805"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="304112837"/>
-											<string key="NSReuseIdentifierKey">_NS:13</string>
-											<bool key="NSEnabled">YES</bool>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-											<object class="NSTableHeaderView" key="NSHeaderView" id="715829091">
-												<reference key="NSNextResponder" ref="551388664"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{522, 17}</string>
-												<reference key="NSSuperview" ref="551388664"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="122424805"/>
-												<string key="NSReuseIdentifierKey">_NS:16</string>
-												<reference key="NSTableView" ref="609972187"/>
-											</object>
-											<object class="_NSCornerView" key="NSCornerView">
-												<nil key="NSNextResponder"/>
-												<int key="NSvFlags">-2147483392</int>
-												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-												<reference key="NSNextKeyView" ref="122424805"/>
-												<string key="NSReuseIdentifierKey">_NS:19</string>
-											</object>
-											<array class="NSMutableArray" key="NSTableColumns">
-												<object class="NSTableColumn" id="607339951">
-													<string key="NSIdentifier">AttributeName</string>
-													<double key="NSWidth">266.328125</double>
-													<double key="NSMinWidth">40</double>
-													<double key="NSMaxWidth">1000</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75497536</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Attribute Name</string>
-														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">3100</int>
-														</object>
-														<object class="NSColor" key="NSBackgroundColor">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-														</object>
-														<object class="NSColor" key="NSTextColor" id="1006639502">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerTextColor</string>
-															<object class="NSColor" key="NSColor" id="667364223">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MAA</bytes>
-															</object>
-														</object>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="436329306">
-														<int key="NSCellFlags">337641536</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="425085614"/>
-														<reference key="NSControlView" ref="609972187"/>
-														<object class="NSColor" key="NSBackgroundColor" id="585835706">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlBackgroundColor</string>
-															<object class="NSColor" key="NSColor" id="630684777">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-															</object>
-														</object>
-														<object class="NSColor" key="NSTextColor" id="603730789">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlTextColor</string>
-															<reference key="NSColor" ref="667364223"/>
-														</object>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="609972187"/>
-												</object>
-												<object class="NSTableColumn" id="514785862">
-													<double key="NSWidth">250</double>
-													<double key="NSMinWidth">10</double>
-													<double key="NSMaxWidth">3.4028234663852886e+38</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75497536</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">CSV Column</string>
-														<reference key="NSSupport" ref="26"/>
-														<object class="NSColor" key="NSBackgroundColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerColor</string>
-															<object class="NSColor" key="NSColor" id="374771144">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MQA</bytes>
-															</object>
-														</object>
-														<reference key="NSTextColor" ref="1006639502"/>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="643341045">
-														<int key="NSCellFlags">337641536</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="425085614"/>
-														<reference key="NSControlView" ref="609972187"/>
-														<reference key="NSBackgroundColor" ref="585835706"/>
-														<reference key="NSTextColor" ref="603730789"/>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="609972187"/>
-												</object>
-											</array>
-											<double key="NSIntercellSpacingWidth">3</double>
-											<double key="NSIntercellSpacingHeight">2</double>
-											<reference key="NSBackgroundColor" ref="374771144"/>
-											<object class="NSColor" key="NSGridColor">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">gridColor</string>
-												<object class="NSColor" key="NSColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MC41AA</bytes>
-												</object>
-											</object>
-											<double key="NSRowHeight">20</double>
-											<int key="NSTvFlags">-163577856</int>
-											<reference key="NSDelegate"/>
-											<reference key="NSDataSource"/>
-											<int key="NSGridStyleMask">8</int>
-											<int key="NSColumnAutoresizingStyle">4</int>
-											<int key="NSDraggingSourceMaskForLocal">15</int>
-											<int key="NSDraggingSourceMaskForNonLocal">0</int>
-											<bool key="NSAllowsTypeSelect">YES</bool>
-											<int key="NSTableViewDraggingDestinationStyle">0</int>
-											<int key="NSTableViewGroupRowStyle">1</int>
-										</object>
-									</array>
-									<string key="NSFrame">{{1, 17}, {522, 252}}</string>
-									<reference key="NSSuperview" ref="335143732"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="609972187"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-									<reference key="NSDocView" ref="609972187"/>
-									<reference key="NSBGColor" ref="585835706"/>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="248564022">
-									<reference key="NSNextResponder" ref="335143732"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-									<reference key="NSSuperview" ref="335143732"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="348785687"/>
-									<string key="NSReuseIdentifierKey">_NS:58</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<reference key="NSTarget" ref="335143732"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">37</double>
-									<double key="NSPercent">0.1947367936372757</double>
-								</object>
-								<object class="NSScroller" id="348785687">
-									<reference key="NSNextResponder" ref="335143732"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 154}, {510, 15}}</string>
-									<reference key="NSSuperview" ref="335143732"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="117432864"/>
-									<string key="NSReuseIdentifierKey">_NS:60</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="335143732"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.99804305283757333</double>
-								</object>
-								<object class="NSClipView" id="551388664">
-									<reference key="NSNextResponder" ref="335143732"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<reference ref="715829091"/>
-									</array>
-									<string key="NSFrame">{{1, 0}, {522, 17}}</string>
-									<reference key="NSSuperview" ref="335143732"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="715829091"/>
-									<string key="NSReuseIdentifierKey">_NS:15</string>
-									<reference key="NSDocView" ref="715829091"/>
-									<reference key="NSBGColor" ref="585835706"/>
-									<int key="NScvFlags">4</int>
-								</object>
-							</array>
-							<string key="NSFrame">{{20, 52}, {524, 270}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="551388664"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<int key="NSsFlags">133682</int>
-							<reference key="NSVScroller" ref="248564022"/>
-							<reference key="NSHScroller" ref="348785687"/>
-							<reference key="NSContentView" ref="122424805"/>
-							<reference key="NSHeaderClipView" ref="551388664"/>
-							<bytes key="NSScrollAmts">QSAAAEEgAABBsAAAQbAAAA</bytes>
-							<double key="NSMinMagnification">0.25</double>
-							<double key="NSMaxMagnification">4</double>
-							<double key="NSMagnification">1</double>
-						</object>
-						<object class="NSTextField" id="729317775">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 343}, {119, 17}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1044610225"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="924237423">
-								<int key="NSCellFlags">68157504</int>
-								<int key="NSCellFlags2">71304192</int>
-								<string key="NSContents">Import into entity:</string>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="729317775"/>
-								<object class="NSColor" key="NSBackgroundColor" id="889151126">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<reference key="NSColor" ref="630684777"/>
-								</object>
-								<reference key="NSTextColor" ref="603730789"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="770463137">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 372}, {119, 17}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="908500265"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="798046275">
-								<int key="NSCellFlags">68157504</int>
-								<int key="NSCellFlags2">71304192</int>
-								<string key="NSContents">File:</string>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="770463137"/>
-								<reference key="NSBackgroundColor" ref="889151126"/>
-								<reference key="NSTextColor" ref="603730789"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="960583807">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">10</int>
-							<string key="NSFrame">{{0, 399}, {564, 5}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="770463137"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="425085614"/>
-								<object class="NSColor" key="NSBackgroundColor" id="70856081">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<reference key="NSColor" ref="374771144"/>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSTextField" id="908500265">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{138, 367}, {307, 22}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="403346360"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="346929616">
-								<int key="NSCellFlags">-2080374720</int>
-								<int key="NSCellFlags2">272632320</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSPlaceholderString">No File Selected</string>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="908500265"/>
-								<reference key="NSBackgroundColor" ref="70856081"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<reference key="NSColor" ref="667364223"/>
-								</object>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="403346360">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{450, 365}, {94, 25}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="729317775"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="758949373">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Choose…</string>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="403346360"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="840391034">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">10</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSView" id="998528650">
-									<reference key="NSNextResponder" ref="840391034"/>
-									<int key="NSvFlags">274</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSImageView" id="189766173">
-											<reference key="NSNextResponder" ref="998528650"/>
-											<int key="NSvFlags">268</int>
-											<set class="NSMutableSet" key="NSDragTypes">
-												<string>Apple PDF pasteboard type</string>
-												<string>Apple PICT pasteboard type</string>
-												<string>Apple PNG pasteboard type</string>
-												<string>NSFilenamesPboardType</string>
-												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-												<string>NeXT TIFF v4.0 pasteboard type</string>
-											</set>
-											<string key="NSFrame">{{16, 19}, {32, 32}}</string>
-											<reference key="NSSuperview" ref="998528650"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="144609101"/>
-											<string key="NSReuseIdentifierKey">_NS:9</string>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSImageCell" key="NSCell" id="665537531">
-												<int key="NSCellFlags">134217728</int>
-												<int key="NSCellFlags2">33554432</int>
-												<object class="NSCustomResource" key="NSContents">
-													<string key="NSClassName">NSImage</string>
-													<string key="NSResourceName">csv-icon</string>
-												</object>
-												<string key="NSCellIdentifier">_NS:9</string>
-												<int key="NSAlign">0</int>
-												<int key="NSScale">2</int>
-												<int key="NSStyle">0</int>
-												<bool key="NSAnimates">NO</bool>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											<bool key="NSEditable">YES</bool>
-										</object>
-										<object class="NSTextField" id="144609101">
-											<reference key="NSNextResponder" ref="998528650"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{53, 27}, {490, 17}}</string>
-											<reference key="NSSuperview" ref="998528650"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="960583807"/>
-											<string key="NSReuseIdentifierKey">_NS:1505</string>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="460149306">
-												<int key="NSCellFlags">68157504</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents">CSV Import</string>
-												<object class="NSFont" key="NSSupport">
-													<string key="NSName">LucidaGrande-Bold</string>
-													<double key="NSSize">13</double>
-													<int key="NSfFlags">2072</int>
-												</object>
-												<string key="NSCellIdentifier">_NS:1505</string>
-												<reference key="NSControlView" ref="144609101"/>
-												<reference key="NSBackgroundColor" ref="889151126"/>
-												<reference key="NSTextColor" ref="603730789"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-									</array>
-									<string key="NSFrameSize">{564, 67}</string>
-									<reference key="NSSuperview" ref="840391034"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="189766173"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-								</object>
-							</array>
-							<string key="NSFrame">{{0, 402}, {564, 67}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="998528650"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSBackgroundColor" ref="70856081"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="998528650"/>
-							<int key="NSBorderType">0</int>
-							<int key="NSBoxType">4</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-							<reference key="NSFillColor2" ref="374771144"/>
-						</object>
-					</array>
-					<string key="NSFrameSize">{564, 469}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="840391034"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
-				<string key="NSMinSize">{564, 491}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">entityDescriptionsArrayController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="937516784"/>
-					</object>
-					<int key="connectionID">159</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsArrayController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="534923443"/>
-					</object>
-					<int key="connectionID">178</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancelImport:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="117432864"/>
-					</object>
-					<int key="connectionID">222</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">pathToCSVFileTextField</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="908500265"/>
-					</object>
-					<int key="connectionID">248</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">confirmImport:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="527440376"/>
-					</object>
-					<int key="connectionID">249</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">250</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showOpenCSVFilePanel:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="403346360"/>
-					</object>
-					<int key="connectionID">253</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">entitiesPopupButton</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1044610225"/>
-					</object>
-					<int key="connectionID">260</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">takeSelectedEntityFromSender:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1044610225"/>
-					</object>
-					<int key="connectionID">261</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.validCSVFileChosen</string>
-						<reference key="source" ref="1044610225"/>
-						<reference key="destination" ref="967865759"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1044610225"/>
-							<reference key="NSDestination" ref="967865759"/>
-							<string key="NSLabel">enabled: selection.validCSVFileChosen</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.validCSVFileChosen</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">212</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1070601615"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">258</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="609972187"/>
-						<reference key="destination" ref="534923443"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="609972187"/>
-							<reference key="NSDestination" ref="534923443"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">179</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.validCSVFileChosen</string>
-						<reference key="source" ref="609972187"/>
-						<reference key="destination" ref="967865759"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="609972187"/>
-							<reference key="NSDestination" ref="967865759"/>
-							<string key="NSLabel">enabled: selection.validCSVFileChosen</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.validCSVFileChosen</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">213</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<object class="NSTableCellView" key="source" id="304112837">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSTextField" id="956321009">
-									<reference key="NSNextResponder" ref="304112837"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{0, 3}, {266, 17}}</string>
-									<reference key="NSSuperview" ref="304112837"/>
-									<reference key="NSNextKeyView" ref="507867764"/>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="1001253779">
-										<int key="NSCellFlags">67108928</int>
-										<int key="NSCellFlags2">272631808</int>
-										<string key="NSContents">Table View Cell</string>
-										<reference key="NSSupport" ref="425085614"/>
-										<reference key="NSControlView" ref="956321009"/>
-										<reference key="NSBackgroundColor" ref="889151126"/>
-										<reference key="NSTextColor" ref="603730789"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
-							</array>
-							<string key="NSFrame">{{1, 1}, {266, 20}}</string>
-							<reference key="NSNextKeyView" ref="956321009"/>
-						</object>
-						<reference key="destination" ref="956321009"/>
-					</object>
-					<int key="connectionID">94</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: objectValue.attributeNameForDisplay</string>
-						<reference key="source" ref="956321009"/>
-						<reference key="destination" ref="304112837"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="956321009"/>
-							<reference key="NSDestination" ref="304112837"/>
-							<string key="NSLabel">value: objectValue.attributeNameForDisplay</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">objectValue.attributeNameForDisplay</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">267</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: entityDescriptions</string>
-						<reference key="source" ref="937516784"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="937516784"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: entityDescriptions</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">entityDescriptions</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">107</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: objectValue.columnNames</string>
-						<object class="NSPopUpButton" key="source" id="250520239">
-							<reference key="NSNextResponder" ref="507867764"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{0, -1}, {250, 26}}</string>
-							<reference key="NSSuperview" ref="507867764"/>
-							<reference key="NSNextKeyView" ref="248564022"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="585662971">
-								<int key="NSCellFlags">-2080374720</int>
-								<int key="NSCellFlags2">2048</int>
-								<reference key="NSSupport" ref="425085614"/>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="250520239"/>
-								<int key="NSButtonFlags">100810752</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="100833617">
-									<reference key="NSMenu" ref="176501437"/>
-									<string key="NSTitle">Item 2</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<object class="NSCustomResource" key="NSOnImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSMenuCheckmark</string>
-									</object>
-									<object class="NSCustomResource" key="NSMixedImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSMenuMixedState</string>
-									</object>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="585662971"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="176501437">
-									<string key="NSTitle">OtherViews</string>
-									<array class="NSMutableArray" key="NSMenuItems">
-										<reference ref="100833617"/>
-									</array>
-									<reference key="NSMenuFont" ref="425085614"/>
-								</object>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTableCellView" key="destination" id="507867764">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="250520239"/>
-							</array>
-							<string key="NSFrame">{{270, 1}, {250, 20}}</string>
-							<reference key="NSNextKeyView" ref="250520239"/>
-						</object>
-						<object class="NSNibBindingConnector" key="connector" id="983506939">
-							<reference key="NSSource" ref="250520239"/>
-							<reference key="NSDestination" ref="507867764"/>
-							<string key="NSLabel">contentValues: objectValue.columnNames</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">objectValue.columnNames</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">256</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedIndex: objectValue.indexOfSelectedColumn</string>
-						<reference key="source" ref="250520239"/>
-						<reference key="destination" ref="507867764"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="250520239"/>
-							<reference key="NSDestination" ref="507867764"/>
-							<string key="NSLabel">selectedIndex: objectValue.indexOfSelectedColumn</string>
-							<string key="NSBinding">selectedIndex</string>
-							<string key="NSKeyPath">objectValue.indexOfSelectedColumn</string>
-							<reference key="NSPreviousConnector" ref="983506939"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">257</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">content</string>
-						<reference key="source" ref="967865759"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">188</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.validCSVFileChosen</string>
-						<reference key="source" ref="527440376"/>
-						<reference key="destination" ref="967865759"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="527440376"/>
-							<reference key="NSDestination" ref="967865759"/>
-							<string key="NSLabel">enabled: selection.validCSVFileChosen</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.validCSVFileChosen</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">229</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="960583807"/>
-							<reference ref="770463137"/>
-							<reference ref="335143732"/>
-							<reference ref="1044610225"/>
-							<reference ref="908500265"/>
-							<reference ref="840391034"/>
-							<reference ref="527440376"/>
-							<reference ref="117432864"/>
-							<reference ref="403346360"/>
-							<reference ref="729317775"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">106</int>
-						<reference key="object" ref="937516784"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Entity Descriptions</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">176</int>
-						<reference key="object" ref="534923443"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Mappings</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">186</int>
-						<reference key="object" ref="967865759"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Importer Controller</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="117432864"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="752332378"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="752332378"/>
-						<reference key="parent" ref="117432864"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="527440376"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="817005554"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">227</int>
-						<reference key="object" ref="817005554"/>
-						<reference key="parent" ref="527440376"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="1044610225"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="507655509"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">76</int>
-						<reference key="object" ref="507655509"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1070601615"/>
-						</array>
-						<reference key="parent" ref="1044610225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="1070601615"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="507655509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="335143732"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="609972187"/>
-							<reference ref="348785687"/>
-							<reference ref="715829091"/>
-							<reference ref="248564022"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="609972187"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="607339951"/>
-							<reference ref="514785862"/>
-						</array>
-						<reference key="parent" ref="335143732"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">84</int>
-						<reference key="object" ref="348785687"/>
-						<reference key="parent" ref="335143732"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="715829091"/>
-						<reference key="parent" ref="335143732"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">86</int>
-						<reference key="object" ref="248564022"/>
-						<reference key="parent" ref="335143732"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">87</int>
-						<reference key="object" ref="607339951"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="436329306"/>
-							<reference ref="304112837"/>
-						</array>
-						<reference key="parent" ref="609972187"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">142</int>
-						<reference key="object" ref="514785862"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="643341045"/>
-							<reference ref="507867764"/>
-						</array>
-						<reference key="parent" ref="609972187"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="643341045"/>
-						<reference key="parent" ref="514785862"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="507867764"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="250520239"/>
-						</array>
-						<reference key="parent" ref="514785862"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="250520239"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="585662971"/>
-						</array>
-						<reference key="parent" ref="507867764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="585662971"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="176501437"/>
-						</array>
-						<reference key="parent" ref="250520239"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="176501437"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="100833617"/>
-						</array>
-						<reference key="parent" ref="585662971"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">152</int>
-						<reference key="object" ref="100833617"/>
-						<reference key="parent" ref="176501437"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">90</int>
-						<reference key="object" ref="436329306"/>
-						<reference key="parent" ref="607339951"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">91</int>
-						<reference key="object" ref="304112837"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="956321009"/>
-						</array>
-						<reference key="parent" ref="607339951"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="956321009"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1001253779"/>
-						</array>
-						<reference key="parent" ref="304112837"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">93</int>
-						<reference key="object" ref="1001253779"/>
-						<reference key="parent" ref="956321009"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="729317775"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="924237423"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">81</int>
-						<reference key="object" ref="924237423"/>
-						<reference key="parent" ref="729317775"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">241</int>
-						<reference key="object" ref="960583807"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">242</int>
-						<reference key="object" ref="770463137"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="798046275"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">243</int>
-						<reference key="object" ref="798046275"/>
-						<reference key="parent" ref="770463137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">246</int>
-						<reference key="object" ref="908500265"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="346929616"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">247</int>
-						<reference key="object" ref="346929616"/>
-						<reference key="parent" ref="908500265"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">251</int>
-						<reference key="object" ref="403346360"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="758949373"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="758949373"/>
-						<reference key="parent" ref="403346360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">262</int>
-						<reference key="object" ref="840391034"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="189766173"/>
-							<reference ref="144609101"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">263</int>
-						<reference key="object" ref="189766173"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="665537531"/>
-						</array>
-						<reference key="parent" ref="840391034"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">264</int>
-						<reference key="object" ref="144609101"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="460149306"/>
-						</array>
-						<reference key="parent" ref="840391034"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">265</int>
-						<reference key="object" ref="460149306"/>
-						<reference key="parent" ref="144609101"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">266</int>
-						<reference key="object" ref="665537531"/>
-						<reference key="parent" ref="189766173"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="142.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="142.isInViewBasedMode"/>
-				<array key="142.prototypeCellViews">
-					<reference ref="507867764"/>
-				</array>
-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="264.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="265.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="266.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="83.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
-				<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="87.isInViewBasedMode"/>
-				<array key="87.prototypeCellViews">
-					<reference ref="304112837"/>
-				</array>
-				<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="93.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">267</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">CDECSVImportWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="cancelImport:">id</string>
-						<string key="confirmImport:">id</string>
-						<string key="selectedDestinationEntityChanged:">id</string>
-						<string key="showOpenCSVFilePanel:">id</string>
-						<string key="takeSelectedEntityFromSender:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="cancelImport:">
-							<string key="name">cancelImport:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="confirmImport:">
-							<string key="name">confirmImport:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="selectedDestinationEntityChanged:">
-							<string key="name">selectedDestinationEntityChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showOpenCSVFilePanel:">
-							<string key="name">showOpenCSVFilePanel:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="takeSelectedEntityFromSender:">
-							<string key="name">takeSelectedEntityFromSender:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="entitiesPopupButton">NSPopUpButton</string>
-						<string key="entityDescriptionsArrayController">NSArrayController</string>
-						<string key="mappingsArrayController">NSArrayController</string>
-						<string key="pathToCSVFileTextField">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="entitiesPopupButton">
-							<string key="name">entitiesPopupButton</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="entityDescriptionsArrayController">
-							<string key="name">entityDescriptionsArrayController</string>
-							<string key="candidateClassName">NSArrayController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mappingsArrayController">
-							<string key="name">mappingsArrayController</string>
-							<string key="candidateClassName">NSArrayController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="pathToCSVFileTextField">
-							<string key="name">pathToCSVFileTextField</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CDECSVImportWindowController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{11, 11}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
-			<string key="csv-icon">{32, 32}</string>
-		</dictionary>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="CDECSVImportWindowController">
+            <connections>
+                <outlet property="entitiesPopupButton" destination="75" id="260"/>
+                <outlet property="entityDescriptionsArrayController" destination="106" id="159"/>
+                <outlet property="mappingsArrayController" destination="176" id="178"/>
+                <outlet property="pathToCSVFileTextField" destination="246" id="248"/>
+                <outlet property="window" destination="1" id="250"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <arrayController objectClassName="NSEntityDescription" id="106" userLabel="Entity Descriptions">
+            <connections>
+                <binding destination="-2" name="contentArray" keyPath="entityDescriptions" id="107"/>
+            </connections>
+        </arrayController>
+        <arrayController id="176" userLabel="Mappings"/>
+        <objectController objectClassName="CDECSVImportWindowController" id="186" userLabel="Importer Controller">
+            <connections>
+                <outlet property="content" destination="-2" id="188"/>
+            </connections>
+        </objectController>
+        <window title="CSV Import" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="196" y="240" width="564" height="469"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+            <value key="minSize" type="size" width="564" height="469"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="564" height="469"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button verticalHuggingPriority="750" id="220">
+                        <rect key="frame" x="20" y="18" width="61" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" title="Cancel" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="221">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="cancelImport:" target="-2" id="222"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="226">
+                        <rect key="frame" x="475" y="20" width="70" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" title="Import…" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="227">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="confirmImport:" target="-2" id="249"/>
+                            <binding destination="186" name="enabled" keyPath="selection.validCSVFileChosen" id="229"/>
+                        </connections>
+                    </button>
+                    <popUpButton verticalHuggingPriority="750" id="75">
+                        <rect key="frame" x="139" y="338" width="232" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="76">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <menu key="menu" title="OtherViews" id="77">
+                                <connections>
+                                    <outlet property="delegate" destination="-2" id="258"/>
+                                </connections>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="takeSelectedEntityFromSender:" target="-2" id="261"/>
+                            <binding destination="186" name="enabled" keyPath="selection.validCSVFileChosen" id="212"/>
+                        </connections>
+                    </popUpButton>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="82">
+                        <rect key="frame" x="20" y="52" width="524" height="270"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="cPL-vS-1gX">
+                            <rect key="frame" x="1" y="0.0" width="522" height="269"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" rowSizeStyle="automatic" headerView="85" viewBased="YES" id="83">
+                                    <rect key="frame" x="0.0" y="0.0" width="522" height="246"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <size key="intercellSpacing" width="3" height="2"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <tableViewGridLines key="gridStyleMask" dashed="YES"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn identifier="AttributeName" width="266.328125" minWidth="40" maxWidth="1000" id="87">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Attribute Name">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="90">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="91">
+                                                    <rect key="frame" x="1" y="1" width="266" height="20"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="92">
+                                                            <rect key="frame" x="0.0" y="3" width="266" height="17"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="93">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                            <connections>
+                                                                <binding destination="91" name="value" keyPath="objectValue.attributeNameForDisplay" id="267"/>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                    <connections>
+                                                        <outlet property="textField" destination="92" id="94"/>
+                                                    </connections>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                        <tableColumn width="250" minWidth="10" maxWidth="3.4028234663852886e+38" id="142">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="CSV Column">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="143">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <prototypeCellViews>
+                                                <tableCellView id="144">
+                                                    <rect key="frame" x="270" y="1" width="250" height="20"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <popUpButton id="148">
+                                                            <rect key="frame" x="0.0" y="-1" width="250" height="26"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                            <popUpButtonCell key="cell" type="bevel" title="Item 2" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" selectedItem="152" id="149">
+                                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                                <font key="font" metaFont="system"/>
+                                                                <menu key="menu" title="OtherViews" id="150">
+                                                                    <items>
+                                                                        <menuItem title="Item 2" state="on" id="152"/>
+                                                                    </items>
+                                                                </menu>
+                                                            </popUpButtonCell>
+                                                            <connections>
+                                                                <binding destination="144" name="contentValues" keyPath="objectValue.columnNames" id="256"/>
+                                                                <binding destination="144" name="selectedIndex" keyPath="objectValue.indexOfSelectedColumn" previousBinding="256" id="257"/>
+                                                            </connections>
+                                                        </popUpButton>
+                                                    </subviews>
+                                                </tableCellView>
+                                            </prototypeCellViews>
+                                        </tableColumn>
+                                    </tableColumns>
+                                    <connections>
+                                        <binding destination="176" name="content" keyPath="arrangedObjects" id="179"/>
+                                        <binding destination="186" name="enabled" keyPath="selection.validCSVFileChosen" id="213"/>
+                                    </connections>
+                                </tableView>
+                            </subviews>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="84">
+                            <rect key="frame" x="1" y="154" width="510" height="15"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="37" horizontal="NO" id="86">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" id="85">
+                            <rect key="frame" x="0.0" y="0.0" width="522" height="23"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                    <textField verticalHuggingPriority="750" id="74">
+                        <rect key="frame" x="17" y="343" width="119" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Import into entity:" id="81">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="242">
+                        <rect key="frame" x="17" y="372" width="119" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="File:" id="243">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <box verticalHuggingPriority="750" boxType="separator" id="241">
+                        <rect key="frame" x="0.0" y="399" width="564" height="5"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    </box>
+                    <textField verticalHuggingPriority="750" id="246">
+                        <rect key="frame" x="138" y="367" width="307" height="22"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" state="on" placeholderString="No File Selected" id="247">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" id="251">
+                        <rect key="frame" x="450" y="365" width="94" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="roundTextured" title="Choose…" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="252">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="showOpenCSVFilePanel:" target="-2" id="253"/>
+                        </connections>
+                    </button>
+                    <box autoresizesSubviews="NO" boxType="custom" borderType="none" title="Box" titlePosition="noTitle" id="262">
+                        <rect key="frame" x="0.0" y="402" width="564" height="67"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <view key="contentView" id="r1p-p8-DoJ">
+                            <rect key="frame" x="0.0" y="0.0" width="564" height="67"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <imageView id="263">
+                                    <rect key="frame" x="16" y="19" width="32" height="32"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" image="csv-icon" id="266"/>
+                                </imageView>
+                                <textField verticalHuggingPriority="750" id="264">
+                                    <rect key="frame" x="53" y="27" width="490" height="17"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="CSV Import" id="265">
+                                        <font key="font" metaFont="systemBold"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                        </view>
+                        <color key="fillColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </box>
+                </subviews>
+            </view>
+        </window>
+    </objects>
+    <resources>
+        <image name="csv-icon" width="39" height="39"/>
+    </resources>
+</document>
diff --git a/Core Data Editor/Core Data Editor/CDECSVImportWindowController.h b/Core Data Editor/Core Data Editor/CDECSVImportWindowController.h
index 2daf0d9..63174b0 100644
--- a/Core Data Editor/Core Data Editor/CDECSVImportWindowController.h	
+++ b/Core Data Editor/Core Data Editor/CDECSVImportWindowController.h	
@@ -10,6 +10,6 @@ typedef void(^CDECSVImportWindowControllerCompletionHandler)(CDECSVImportWindowC
 @property (nonatomic, copy, readonly) NSArray *entityDescriptions;
 
 #pragma mark Presenting the Window Controller
-- (void)beginSheetModalForWindow:(NSWindow *)window entityDescriptions:(NSArray *)entityDescriptions selectedEntityDescription:(NSEntityDescription *)selectedEntityDescription completionHandler:(CDECSVImportWindowControllerCompletionHandler)completionHandler;
+- (void)beginSheetModalForWindow:(NSWindow *)window entityDescriptions:(NSArray<NSEntityDescription*> *)entityDescriptions selectedEntityDescription:(NSEntityDescription *)selectedEntityDescription completionHandler:(CDECSVImportWindowControllerCompletionHandler)completionHandler;
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDECSVImportWindowController.m b/Core Data Editor/Core Data Editor/CDECSVImportWindowController.m
index 546ffa9..0c0187f 100644
--- a/Core Data Editor/Core Data Editor/CDECSVImportWindowController.m	
+++ b/Core Data Editor/Core Data Editor/CDECSVImportWindowController.m	
@@ -217,7 +217,7 @@ - (IBAction)selectedDestinationEntityChanged:(id)sender {
 }
 
 #pragma mark Presenting the Window Controller
-- (void)beginSheetModalForWindow:(NSWindow *)parentWindow entityDescriptions:(NSArray *)entityDescriptions selectedEntityDescription:(NSEntityDescription *)selectedEntityDescription completionHandler:(CDECSVImportWindowControllerCompletionHandler)completionHandler {
+- (void)beginSheetModalForWindow:(NSWindow *)parentWindow entityDescriptions:(NSArray<NSEntityDescription*> *)entityDescriptions selectedEntityDescription:(NSEntityDescription *)selectedEntityDescription completionHandler:(CDECSVImportWindowControllerCompletionHandler)completionHandler {
     NSParameterAssert(entityDescriptions);
     NSParameterAssert(parentWindow);
     self.entityDescriptions = entityDescriptions;
@@ -229,7 +229,6 @@ - (void)beginSheetModalForWindow:(NSWindow *)parentWindow entityDescriptions:(NS
     self.completionHandler = completionHandler;
     [self window];
     // Entities Popup Button: Begin
-    
     [self.entitiesPopupButton removeAllItems];
     
     NSMenuItem *selectedItem = nil;
@@ -251,21 +250,27 @@ - (void)beginSheetModalForWindow:(NSWindow *)parentWindow entityDescriptions:(NS
     
     // Entities Popup Button: End
     [self updateMappingsArrayController];
-  
-  [parentWindow beginSheet:self.window completionHandler:^(NSModalResponse returnCode) {
+    [parentWindow beginSheet:self.window completionHandler:^(NSModalResponse returnCode) {
+      self.completionHandler ? self.completionHandler([self resultForCurrentConfiguration]) : nil;
+      self.completionHandler = nil;
+
+    }];
+    [self showOpenCSVFilePanel:self];
+}
+     
+- (void)importWindowDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+    [sheet orderOut:self];
     self.completionHandler ? self.completionHandler([self resultForCurrentConfiguration]) : nil;
     self.completionHandler = nil;
-  }];
-    [self showOpenCSVFilePanel:self];
 }
 
 - (IBAction)cancelImport:(id)sender {
     self.completionHandler = nil;
-    [NSApp endSheet:self.window];
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
 }
 
 - (IBAction)confirmImport:(id)sender {
-    [NSApp endSheet:self.window];
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
 }
 
 - (IBAction)takeSelectedEntityFromSender:(id)sender {
diff --git a/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.h b/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.h
index cff0b62..457dcd0 100644
--- a/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.h	
+++ b/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.h	
@@ -1,12 +1,13 @@
 #import <Foundation/Foundation.h>
 
+@class CDECSVImportWindowControllerResultItem;
 @interface CDECSVImportWindowControllerResult : NSObject
 
 #pragma mark Creating
-- (instancetype)initWithItems:(NSArray *)items destinationEntityDescription:(NSEntityDescription *)destinationEntityDescription;
+- (instancetype)initWithItems:(NSArray<CDECSVImportWindowControllerResultItem*> *)items destinationEntityDescription:(NSEntityDescription *)destinationEntityDescription;
 
 #pragma mark Properties
-@property (nonatomic, copy, readonly) NSArray *items;
+@property (nonatomic, copy, readonly) NSArray<CDECSVImportWindowControllerResultItem*> *items;
 @property (nonatomic, strong, readonly) NSEntityDescription *destinationEntityDescription;
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.m b/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.m
index 590162a..31d28ad 100644
--- a/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.m	
+++ b/Core Data Editor/Core Data Editor/CDECSVImportWindowControllerResult.m	
@@ -3,7 +3,7 @@
 @interface CDECSVImportWindowControllerResult ()
 
 #pragma mark Properties
-@property (nonatomic, copy, readwrite) NSArray *items;
+@property (nonatomic, copy, readwrite) NSArray<CDECSVImportWindowControllerResultItem*> *items;
 @property (nonatomic, strong, readwrite) NSEntityDescription *destinationEntityDescription;
 
 @end
@@ -11,7 +11,7 @@ @interface CDECSVImportWindowControllerResult ()
 @implementation CDECSVImportWindowControllerResult
 
 #pragma mark Creating
-- (id)initWithItems:(NSArray *)items destinationEntityDescription:(NSEntityDescription *)destinationEntityDescription {
+- (id)initWithItems:(NSArray<CDECSVImportWindowControllerResultItem*> *)items destinationEntityDescription:(NSEntityDescription *)destinationEntityDescription {
     self = [super init];
     if(self) {
         self.items = items;
diff --git a/Core Data Editor/Core Data Editor/CDECodeGenerator.h b/Core Data Editor/Core Data Editor/CDECodeGenerator.h
deleted file mode 100644
index daa8195..0000000
--- a/Core Data Editor/Core Data Editor/CDECodeGenerator.h	
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-
-typedef void(^CDECodeGeneratorCompletionHandler)(void);
-
-@interface CDECodeGenerator : NSObject
-
-#pragma mark Creating
-- (instancetype)initWithManagedObjectModelURL:(NSURL *)managedObjectModelURL_;
-
-#pragma mark Properties
-@property (nonatomic, strong, readonly) NSURL *managedObjectModelURL;
-
-#pragma mark Presenting the Code Generator UI
-- (void)presentCodeGeneratorUIModalForWindow:(NSWindow *)parentWindow_ completionHandler:(CDECodeGeneratorCompletionHandler)completionHandler_;
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDECodeGenerator.m b/Core Data Editor/Core Data Editor/CDECodeGenerator.m
deleted file mode 100644
index 68733ec..0000000
--- a/Core Data Editor/Core Data Editor/CDECodeGenerator.m	
+++ /dev/null
@@ -1,65 +0,0 @@
-#import "CDECodeGenerator.h"
-#import "CDEManagedObjectSubclassesGenerator.h"
-#import "CDECodeGeneratorAccessoryViewController.h"
-
-@interface CDECodeGenerator ()
-
-#pragma mark Properties
-@property (nonatomic, strong, readwrite) NSURL *managedObjectModelURL;
-@property (nonatomic, copy) CDECodeGeneratorCompletionHandler completionHandler;
-@property (nonatomic, strong) CDECodeGeneratorAccessoryViewController *accessoryViewController;
-
-@end
-
-@implementation CDECodeGenerator
-
-#pragma mark Creating
-- (instancetype)initWithManagedObjectModelURL:(NSURL *)managedObjectModelURL {
-    self = [super init];
-    if(self) {
-        self.completionHandler = nil;
-        self.managedObjectModelURL = managedObjectModelURL;
-        self.accessoryViewController = [CDECodeGeneratorAccessoryViewController new];
-    }
-    return self;
-}
-
-- (instancetype)init {
-    return [self initWithManagedObjectModelURL:nil];
-}
-
-#pragma mark Presenting the Code Generator UI
-- (void)presentCodeGeneratorUIModalForWindow:(NSWindow *)parentWindow completionHandler:(CDECodeGeneratorCompletionHandler)completionHandler {
-    if(parentWindow == nil) {
-        self.completionHandler = nil;
-        return;
-    }
-    self.completionHandler = completionHandler;
-    NSOpenPanel *savePanel = [NSOpenPanel openPanel];
-    [savePanel setCanChooseDirectories:YES];
-    [savePanel setCanCreateDirectories:YES];
-    [savePanel setCanChooseFiles:NO];
-    [savePanel setPrompt:@"Generate"];
-    savePanel.accessoryView = self.accessoryViewController.view;
-    [savePanel beginSheetModalForWindow:parentWindow completionHandler:^(NSInteger result) {
-        if(result != NSFileHandlingPanelOKButton) {
-            return;
-        }
-        NSFileManager *fileManager = [NSFileManager new];
-        NSURL *libraryURL = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-        NSURL *applicationFilesDirectory = [libraryURL URLByAppendingPathComponent:@"Core Data Editor"];
-        if([fileManager fileExistsAtPath:applicationFilesDirectory.path] == NO) {
-            [fileManager createDirectoryAtPath:applicationFilesDirectory.path withIntermediateDirectories:YES attributes:nil error:nil];
-        }
-        NSURL *modelURL = self.managedObjectModelURL;
-        CDEManagedObjectSubclassesGenerator *generator = [[CDEManagedObjectSubclassesGenerator alloc] initWithOutputDirectory:[savePanel directoryURL] modelPath:modelURL applicationFilesDirectory:applicationFilesDirectory];
-        generator.generateARCCompatibleCode = self.accessoryViewController.generateARCCompatibleCode.boolValue;
-        generator.generateFetchResultsControllerCode = self.accessoryViewController.generateFetchResultsControllerCode.boolValue;
-        [generator generate];
-        [[NSWorkspace sharedWorkspace] selectFile:[generator.readmeURL path] inFileViewerRootedAtPath:@""];
-        self.completionHandler ? self.completionHandler() : nil;
-    }];
-    
-}
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.h b/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.h
deleted file mode 100644
index 8c7c584..0000000
--- a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.h	
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@interface CDECodeGeneratorAccessoryViewController : NSViewController
-
-#pragma mark Creating an Instance
-- (instancetype)init;
-
-#pragma mark Properties
-@property (nonatomic, copy) NSNumber *generateARCCompatibleCode;
-@property (nonatomic, copy) NSNumber *generateFetchResultsControllerCode;
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.m b/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.m
deleted file mode 100644
index fa93911..0000000
--- a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.m	
+++ /dev/null
@@ -1,24 +0,0 @@
-#import "CDECodeGeneratorAccessoryViewController.h"
-
-@interface CDECodeGeneratorAccessoryViewController ()
-
-@end
-
-@implementation CDECodeGeneratorAccessoryViewController
-
-
-#pragma mark Creating an Instance
-- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-   self = [super initWithNibName:@"CDECodeGeneratorAccessoryViewController" bundle:nil];
-   if(self) {
-       self.generateARCCompatibleCode = @YES;
-       self.generateFetchResultsControllerCode = @YES;
-   }
-   return self;
-}
-
-- (instancetype)init {
-   return [self initWithNibName:nil bundle:nil];
-}
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.xib b/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.xib
deleted file mode 100644
index dc749bf..0000000
--- a/Core Data Editor/Core Data Editor/CDECodeGeneratorAccessoryViewController.xib	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CDECodeGeneratorAccessoryViewController">
-            <connections>
-                <outlet property="view" destination="1" id="13"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <objectController objectClassName="CDECodeGeneratorAccessoryViewController" id="9" userLabel="File's Owner Object Controller">
-            <connections>
-                <outlet property="content" destination="-2" id="10"/>
-            </connections>
-        </objectController>
-        <customView id="1" userLabel="View">
-            <rect key="frame" x="0.0" y="0.0" width="501" height="115"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <customView id="4">
-                    <rect key="frame" x="0.0" y="0.0" width="501" height="115"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <button id="5">
-                            <rect key="frame" x="18" y="79" width="220" height="18"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="check" title="Generate ARC compatible Code" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="6">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <binding destination="9" name="value" keyPath="selection.generateARCCompatibleCode" id="11"/>
-                            </connections>
-                        </button>
-                        <button id="7">
-                            <rect key="frame" x="18" y="54" width="465" height="18"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="check" title="Generate Code for convenient handling of NSFetchedResultsController" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="8">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <binding destination="9" name="value" keyPath="selection.generateFetchResultsControllerCode" id="12"/>
-                            </connections>
-                        </button>
-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="16">
-                            <rect key="frame" x="53" y="20" width="431" height="28"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="17">
-                                <font key="font" metaFont="smallSystem"/>
-                                <string key="title">You have to set the class name of your entities to something other than NSManagedObject. Otherwise no code will be generated for these entities.</string>
-                                <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <imageView id="18">
-                            <rect key="frame" x="20" y="20" width="28" height="28"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="NSCaution" id="19"/>
-                        </imageView>
-                    </subviews>
-                </customView>
-            </subviews>
-        </customView>
-    </objects>
-    <resources>
-        <image name="NSCaution" width="32" height="32"/>
-    </resources>
-</document>
diff --git a/Core Data Editor/Core Data Editor/CDEConfigurationWizzard.m b/Core Data Editor/Core Data Editor/CDEConfigurationWizzard.m
index 7020aee..cc911be 100644
--- a/Core Data Editor/Core Data Editor/CDEConfigurationWizzard.m	
+++ b/Core Data Editor/Core Data Editor/CDEConfigurationWizzard.m	
@@ -187,7 +187,6 @@ - (void)beginSheetModalForWindow:(NSWindow *)parentWindow completionHandler:(CDE
   [self.summaryViewController view];
   [self showDropApplicationView];
   self.editing = NO;
-  
   [parentWindow beginSheet:self.window completionHandler:^(NSModalResponse returnCode) {
     
   }];
@@ -211,8 +210,7 @@ - (void)beginSheetModalForWindow:(NSWindow *)parentWindow applicationBundleURL:(
 
 #pragma mark Actions
 - (IBAction)dismiss:(id)sender {
-  [NSApp endSheet:self.window];
-  [self.window orderOut:sender];
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
   (self.beginSheetCompletionHandler)(NO, nil, nil, nil);
   self.beginSheetCompletionHandler = nil;
 }
@@ -245,8 +243,7 @@ - (IBAction)nextShowSummaryCreate:(id)sender {
   
   if([self displaysSummaryView]) {
     // Create
-    [NSApp endSheet:self.window];
-    [self.window orderOut:sender];
+    [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
     NSURL *modelURL = self.dropApplicationViewController.modelURL;
     NSURL *applicationBundleURL = self.dropApplicationViewController.bundleURL;
     if(modelURL == nil && applicationBundleURL != nil) {
diff --git a/Core Data Editor/Core Data Editor/CDEDateAttributeView.xib b/Core Data Editor/Core Data Editor/CDEDateAttributeView.xib
index f101403..aae75a4 100644
--- a/Core Data Editor/Core Data Editor/CDEDateAttributeView.xib	
+++ b/Core Data Editor/Core Data Editor/CDEDateAttributeView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDEDatePickerViewController.xib b/Core Data Editor/Core Data Editor/CDEDatePickerViewController.xib
index cfbf883..c94ca66 100644
--- a/Core Data Editor/Core Data Editor/CDEDatePickerViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEDatePickerViewController.xib	
@@ -1,80 +1,435 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment version="101100" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CDEDatePickerViewController">
-            <connections>
-                <outlet property="datePicker" destination="4" id="8"/>
-                <outlet property="dateTimePicker" destination="16" id="20"/>
-                <outlet property="view" destination="1" id="3"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="139" height="205"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <datePicker verticalHuggingPriority="750" id="4">
-                    <rect key="frame" x="0.0" y="57" width="139" height="148"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                    <datePickerCell key="cell" alignment="left" datePickerStyle="clockAndCalendar" id="5">
-                        <font key="font" metaFont="system"/>
-                        <calendarDate key="date" timeIntervalSinceReferenceDate="-595929600" calendarFormat="%Y-%m-%d %H:%M:%S %z">
-                            <!--1982-02-12 08:00:00 -0800-->
-                            <timeZone key="timeZone" name="US/Pacific"/>
-                        </calendarDate>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                    </datePickerCell>
-                    <connections>
-                        <action selector="changeDate:" target="-2" id="19"/>
-                    </connections>
-                </datePicker>
-                <button verticalHuggingPriority="750" id="6">
-                    <rect key="frame" x="94" y="4" width="39" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                    <buttonCell key="cell" type="roundRect" title="OK" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="cellTitle"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="ok:" target="-2" id="14"/>
-                    </connections>
-                </button>
-                <button verticalHuggingPriority="750" id="9">
-                    <rect key="frame" x="28" y="4" width="58" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                    <buttonCell key="cell" type="roundRect" title="Cancel" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="10">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="cellTitle"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="cancel:" target="-2" id="15"/>
-                    </connections>
-                </button>
-                <datePicker verticalHuggingPriority="750" id="16">
-                    <rect key="frame" x="3" y="31" width="133" height="46"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                    <datePickerCell key="cell" borderStyle="bezel" alignment="left" id="17">
-                        <font key="font" metaFont="system"/>
-                        <calendarDate key="date" timeIntervalSinceReferenceDate="-595929600" calendarFormat="%Y-%m-%d %H:%M:%S %z">
-                            <!--1982-02-12 08:00:00 -0800-->
-                            <timeZone key="timeZone" name="US/Pacific"/>
-                        </calendarDate>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <datePickerElements key="datePickerElements" hour="YES" minute="YES" second="YES"/>
-                    </datePickerCell>
-                    <connections>
-                        <action selector="changeDateTime:" target="-2" id="18"/>
-                    </connections>
-                </datePicker>
-            </subviews>
-        </customView>
-    </objects>
-</document>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1080</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSDatePicker</string>
+			<string>NSDatePickerCell</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">CDEDatePickerViewController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomView" id="1005">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSDatePicker" id="490141760">
+						<reference key="NSNextResponder" ref="1005"/>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{3, 31}, {133, 46}}</string>
+						<reference key="NSSuperview" ref="1005"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="800934086"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSDatePickerCell" key="NSCell" id="235156919">
+							<int key="NSCellFlags">71303168</int>
+							<int key="NSCellFlags2">0</int>
+							<object class="NSCalendarDate" key="NSContents">
+								<double key="NS.time">-595929600</double>
+								<object class="NSTimeZone" key="NS.timezone">
+									<string key="NS.name">US/Pacific</string>
+									<object class="NSMutableData" key="NS.data">
+										<bytes key="NS.bytes">VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
+y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
+5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
+8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ
+AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg
+DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ
+HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g
+KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ
+OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg
+Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ
+VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg
+Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ
+cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg
+f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</bytes>
+									</object>
+								</object>
+								<string key="NS.format">%Y-%m-%d %H:%M:%S %z</string>
+							</object>
+							<object class="NSFont" key="NSSupport" id="548626611">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">13</double>
+								<int key="NSfFlags">1044</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="490141760"/>
+							<double key="NSTimeInterval">0.0</double>
+							<int key="NSDatePickerElements">14</int>
+							<object class="NSColor" key="NSBackgroundColor" id="853700420">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">controlBackgroundColor</string>
+								<object class="NSColor" key="NSColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+								</object>
+							</object>
+							<object class="NSColor" key="NSTextColor" id="252661473">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">controlTextColor</string>
+								<object class="NSColor" key="NSColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MAA</bytes>
+								</object>
+							</object>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSButton" id="800934086">
+						<reference key="NSNextResponder" ref="1005"/>
+						<int key="NSvFlags">289</int>
+						<string key="NSFrame">{{28, 4}, {58, 19}}</string>
+						<reference key="NSSuperview" ref="1005"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="702092726"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="702294563">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">Cancel</string>
+							<object class="NSFont" key="NSSupport" id="859536479">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">12</double>
+								<int key="NSfFlags">16</int>
+							</object>
+							<reference key="NSControlView" ref="800934086"/>
+							<int key="NSButtonFlags">-2038153216</int>
+							<int key="NSButtonFlags2">164</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSButton" id="702092726">
+						<reference key="NSNextResponder" ref="1005"/>
+						<int key="NSvFlags">289</int>
+						<string key="NSFrame">{{94, 4}, {39, 19}}</string>
+						<reference key="NSSuperview" ref="1005"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="864846424">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">OK</string>
+							<reference key="NSSupport" ref="859536479"/>
+							<reference key="NSControlView" ref="702092726"/>
+							<int key="NSButtonFlags">-2038153216</int>
+							<int key="NSButtonFlags2">164</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSDatePicker" id="130333429">
+						<reference key="NSNextResponder" ref="1005"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{0, 57}, {139, 148}}</string>
+						<reference key="NSSuperview" ref="1005"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="490141760"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSDatePickerCell" key="NSCell" id="893790035">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">0</int>
+							<object class="NSCalendarDate" key="NSContents">
+								<double key="NS.time">-595929600</double>
+								<object class="NSTimeZone" key="NS.timezone">
+									<string key="NS.name">US/Pacific</string>
+									<object class="NSMutableData" key="NS.data">
+										<bytes key="NS.bytes">VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
+y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
+5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
+8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ
+AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg
+DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ
+HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g
+KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ
+OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg
+Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ
+VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg
+Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ
+cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg
+f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</bytes>
+									</object>
+								</object>
+								<string key="NS.format">%Y-%m-%d %H:%M:%S %z</string>
+							</object>
+							<reference key="NSSupport" ref="548626611"/>
+							<reference key="NSControlView" ref="130333429"/>
+							<double key="NSTimeInterval">0.0</double>
+							<int key="NSDatePickerElements">224</int>
+							<int key="NSDatePickerType">1</int>
+							<reference key="NSBackgroundColor" ref="853700420"/>
+							<reference key="NSTextColor" ref="252661473"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+				</array>
+				<string key="NSFrameSize">{139, 205}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="130333429"/>
+				<string key="NSClassName">NSView</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">datePicker</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="130333429"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="702092726"/>
+					</object>
+					<int key="connectionID">14</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="800934086"/>
+					</object>
+					<int key="connectionID">15</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeDateTime:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="490141760"/>
+					</object>
+					<int key="connectionID">18</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeDate:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="130333429"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dateTimePicker</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="490141760"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="130333429"/>
+							<reference ref="490141760"/>
+							<reference ref="702092726"/>
+							<reference ref="800934086"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="130333429"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="893790035"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="893790035"/>
+						<reference key="parent" ref="130333429"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="702092726"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="864846424"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="864846424"/>
+						<reference key="parent" ref="702092726"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="800934086"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="702294563"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="702294563"/>
+						<reference key="parent" ref="800934086"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="490141760"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="235156919"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="235156919"/>
+						<reference key="parent" ref="490141760"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">20</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">CDEDatePickerViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="changeDate:">id</string>
+						<string key="ok:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="changeDate:">
+							<string key="name">changeDate:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="datePicker">NSDatePicker</string>
+						<string key="dateTimePicker">NSDatePicker</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="datePicker">
+							<string key="name">datePicker</string>
+							<string key="candidateClassName">NSDatePicker</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dateTimePicker">
+							<string key="name">dateTimePicker</string>
+							<string key="candidateClassName">NSDatePicker</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/CDEDatePickerViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/Core Data Editor/Core Data Editor/CDEDocument.m b/Core Data Editor/Core Data Editor/CDEDocument.m
index 658f1a2..ede890e 100644
--- a/Core Data Editor/Core Data Editor/CDEDocument.m	
+++ b/Core Data Editor/Core Data Editor/CDEDocument.m	
@@ -10,7 +10,6 @@
 
 #import "CDEManagedObjectIDToStringValueTransformer.h"
 #import "CDEAutosaveInformation.h"
-#import "CDECodeGenerator.h"
 
 @interface CDEDocument ()
 
@@ -27,9 +26,6 @@ @interface CDEDocument ()
 #pragma mark - Actions
 - (IBAction)showConfiguration:(id)sender;
 
-#pragma mark - Code Generation
-@property (nonatomic, strong) CDECodeGenerator *codeGenerator;
-
 @end
 
 @implementation CDEDocument
@@ -234,6 +230,7 @@ - (BOOL)setupAndStartAccessingConfigurationRelatedURLsAndGetError:(NSError **)er
 - (void)windowControllerDidLoadNib:(NSWindowController *)windowController {
     [super windowControllerDidLoadNib:windowController];
   
+  [self _documentWindow].titleVisibility = NSWindowTitleHidden;
     self.editorViewController.view.frame = self.containerView.bounds;
     [self.containerView addSubview:self.editorViewController.view];
     
@@ -287,9 +284,6 @@ - (void)windowControllerDidLoadNib:(NSWindowController *)windowController {
                 [errorMessages addObject:@"• Store could not be accessed."];
                 NSLog(@"failed to access store");
             }
-			else {
-				self.fileURL = self.storeURL;
-			}
         }
         // If there aren't any error messages we can check for compatibility
         NSManagedObjectModel *model = nil;
@@ -379,17 +373,4 @@ - (IBAction)showImportCSVFileWindow:(id)sender {
     [self.editorViewController showImportCSVFileWindow:sender];
 }
 
-- (IBAction)generateCode:(id)sender {
-    if(self.codeGenerator != nil) {
-        self.codeGenerator = nil;
-    }
-    
-    self.codeGenerator = [[CDECodeGenerator alloc] initWithManagedObjectModelURL:self.modelURL];
-    __typeof__(self) __weak weakSelf = self;
-    [self.codeGenerator presentCodeGeneratorUIModalForWindow:[self _documentWindow] completionHandler:^{
-        [weakSelf setCodeGenerator:nil];
-    }];
-}
-
-
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEDropStoreViewController.m b/Core Data Editor/Core Data Editor/CDEDropStoreViewController.m
index fe4e9e3..610ee39 100644
--- a/Core Data Editor/Core Data Editor/CDEDropStoreViewController.m	
+++ b/Core Data Editor/Core Data Editor/CDEDropStoreViewController.m	
@@ -11,23 +11,23 @@
 @implementation CDEDropStoreViewController (Private)
 
 - (BOOL)isValidStoreAtURL:(NSURL *)URL error:(NSError **)error {
-  NSAssert(self.managedObjectModel != nil, @"We need a managed object model.");
-  
-  if(URL == nil) {
-    NSLog(@"Drop has no URL.");
-    return NO;
-  }
-  BOOL result = [self.managedObjectModel isCompatibleWithStoreAtURL:URL error_cde:error];
-  
-  return result;
+    NSAssert(self.managedObjectModel != nil, @"We need a managed object model.");
+    
+    if(URL == nil) {
+        NSLog(@"Drop has no URL.");
+        return NO;
+    }
+    BOOL result = [self.managedObjectModel isCompatibleWithStoreAtURL:URL error_cde:error];
+
+    return result;
 }
 
 - (BOOL)dropIsValidStore:(id<NSDraggingInfo>)drop error:(NSError **)error {
-  NSAssert(self.managedObjectModel != nil, @"We need a managed object model.");
-  
-  NSPasteboard *pasteboard = [drop draggingPasteboard];
-  NSURL *URL = [NSURL URLFromPasteboard:pasteboard];
-  return [self isValidStoreAtURL:URL error:error];
+    NSAssert(self.managedObjectModel != nil, @"We need a managed object model.");
+    
+    NSPasteboard *pasteboard = [drop draggingPasteboard];
+    NSURL *URL = [NSURL URLFromPasteboard:pasteboard];
+    return [self isValidStoreAtURL:URL error:error];
 }
 
 @end
@@ -35,115 +35,116 @@ - (BOOL)dropIsValidStore:(id<NSDraggingInfo>)drop error:(NSError **)error {
 @implementation CDEDropStoreViewController
 
 - (void)setValidStoreURL:(NSURL *)newValue {
-  if(newValue != _validStoreURL) {
-    _validStoreURL = [newValue copy];
-    [self view];
-    [self.pathActionLabelController setPath:self.validStoreURL.path];
-    [self.dropZoneView setURL:self.validStoreURL];
-  }
+   if(newValue != _validStoreURL) {
+      _validStoreURL = [newValue copy];
+      [self view];
+      [self.pathActionLabelController setPath:self.validStoreURL.path];
+      [self.dropZoneView setURL:self.validStoreURL];
+   }
 }
 
 - (void)setEditing:(BOOL)newValue {
-  _editing = newValue;
-  [self view];
-  NSString *localizedInfoKey = @"DropStoreInfoTextWhenCreatingNewProject";
-  if(self.isEditing) {
-    localizedInfoKey = @"DropStoreInfoTextWhenEditingProject";
-  }
-  self.infoTextField.stringValue = NSLocalizedString(localizedInfoKey, nil);
+   _editing = newValue;
+   [self view];
+   NSString *localizedInfoKey = @"DropStoreInfoTextWhenCreatingNewProject";
+   if(self.isEditing) {
+      localizedInfoKey = @"DropStoreInfoTextWhenEditingProject";
+   }
+   self.infoTextField.stringValue = NSLocalizedString(localizedInfoKey, nil);
 }
 
 #pragma mark Creating
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-  self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-  
-  if(self) {
-    self.validStoreURL = nil;
-    self.delegate = nil;
-    self.managedObjectModel = nil;
-    self.editing = NO;
-  }
-  return self;
+   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+
+   if(self) {
+      self.validStoreURL = nil;
+      self.delegate = nil;
+      self.managedObjectModel = nil;
+      self.editing = NO;
+   }
+   return self;
 }
 
 - (id)init {
-  return [self initWithNibName:NSStringFromClass([self class]) bundle:nil];
+   return [self initWithNibName:NSStringFromClass([self class]) bundle:nil];
 }
 
 #pragma mark Actions
 - (IBAction)createNewStore:(id)sender {
-  NSSavePanel *panel = [NSSavePanel savePanel];
-  NSInteger result = [panel runModal];
-  if(result != NSFileHandlingPanelOKButton) {
-    return;
-  }
-  NSURL *URL = [panel URL];
-  
-  NSURL *temp = [[NSURL fileURLWithPath:NSTemporaryDirectory()] URLByAppendingPathComponent:[[NSUUID UUID] UUIDString] isDirectory:YES];
-  NSFileManager *fileManager = [NSFileManager new];
-  NSError *error = nil;
-  if([fileManager createDirectoryAtURL:temp withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
-    NSLog(@"Failed to create new store: %@", error);
-    [[NSDocumentController sharedDocumentController] presentError:error];
-    return;
-  }
-  temp = [temp URLByAppendingPathComponent:[URL lastPathComponent] isDirectory:NO];
-  
-  NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:self.managedObjectModel];
-  error = nil;
-  NSPersistentStore *store = [coordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:temp options:nil error:&error];
-  if(store == nil) {
-    [[NSDocumentController sharedDocumentController] presentError:error];
-    return;
-  }
-  error = nil;
-  NSData *storeData = [NSData dataWithContentsOfURL:temp options:0 error:&error];
-  if(storeData == nil) {
-    NSLog(@"Failed to create new store (read failed): %@", error);
-    [[NSDocumentController sharedDocumentController] presentError:error];
-    return;
-  }
-  [storeData writeToURL:URL atomically:YES];
-  [self setValidStoreURL:URL];
-  [self.delegate dropStoreViewController:self didChangeStoreURL:self.validStoreURL];
+    NSSavePanel *panel = [NSSavePanel savePanel];
+    [panel beginSheetModalForWindow:self.view.window completionHandler:^(NSInteger result) {
+        if(result != NSFileHandlingPanelOKButton) {
+            return;
+        }
+        NSURL *URL = [panel URL];
+
+        NSURL *temp = [[NSURL fileURLWithPath:NSTemporaryDirectory()] URLByAppendingPathComponent:[[NSUUID UUID] UUIDString] isDirectory:YES];
+        NSFileManager *fileManager = [NSFileManager new];
+        NSError *error = nil;
+        if([fileManager createDirectoryAtURL:temp withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
+            NSLog(@"Failed to create new store: %@", error);
+            [[NSDocumentController sharedDocumentController] presentError:error];
+            return;
+        }
+        temp = [temp URLByAppendingPathComponent:[URL lastPathComponent] isDirectory:NO];
+        
+        NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:self.managedObjectModel];
+        error = nil;
+        NSPersistentStore *store = [coordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:temp options:nil error:&error];
+        if(store == nil) {
+            [[NSDocumentController sharedDocumentController] presentError:error];
+            return;
+        }
+        error = nil;
+        NSData *storeData = [NSData dataWithContentsOfURL:temp options:0 error:&error];
+        if(storeData == nil) {
+            NSLog(@"Failed to create new store (read failed): %@", error);
+            [[NSDocumentController sharedDocumentController] presentError:error];
+            return;
+        }
+        [storeData writeToURL:URL atomically:YES];
+        [self setValidStoreURL:URL];
+        [self.delegate dropStoreViewController:self didChangeStoreURL:self.validStoreURL];
+    }];
 }
 
 #pragma mark CDEDropZoneViewDelegate
 - (NSString *)titleForDropZoneView:(CDEDropZoneView *)view {
-  return @"Drop your Persistent Store here.\n\nIf you don't have one click on \"Create Store File\".";
+   return @"Drop your Persistent Store here.\n\nIf you don't have one click on \"Create Store File\".";
 }
 
 - (NSDragOperation)dropZoneView:(CDEDropZoneView *)view validateDrop:(id<NSDraggingInfo>)info {
-  NSError *error = nil;
-  BOOL isValid = [self dropIsValidStore:info error:&error];
-  if(isValid == NO) {
-    self.dropZoneView.displayedError = error;
-    return NSDragOperationNone;
-  }
-  return NSDragOperationEvery;
+    NSError *error = nil;
+    BOOL isValid = [self dropIsValidStore:info error:&error];
+    if(isValid == NO) {
+        self.dropZoneView.displayedError = error;
+        return NSDragOperationNone;
+    }
+    return NSDragOperationEvery;
 }
 
 - (BOOL)dropZoneView:(CDEDropZoneView *)view acceptDrop:(id<NSDraggingInfo>)info {
-  NSError *error = nil;
-  BOOL isValid = [self dropIsValidStore:info error:&error];
-  if(isValid == NO) {
-    self.dropZoneView.displayedError = error;
-    return NO;
-  }
-  return YES;
+    NSError *error = nil;
+    BOOL isValid = [self dropIsValidStore:info error:&error];
+    if(isValid == NO) {
+        self.dropZoneView.displayedError = error;
+        return NO;
+    }
+    return YES;
 }
 
 - (void)dropZoneView:(CDEDropZoneView *)view didChangeURL:(NSURL *)newURL {
-  NSError *error = nil;
-  BOOL validStore = [self isValidStoreAtURL:newURL error:&error];
-  if(validStore) {
-    self.validStoreURL = newURL;
-    self.dropZoneView.displayedError = nil;
-    [self.delegate dropStoreViewController:self didChangeStoreURL:newURL];
-  } else {
-    self.dropZoneView.displayedError = error;
-    self.validStoreURL = nil;
-  }
+    NSError *error = nil;
+    BOOL validStore = [self isValidStoreAtURL:newURL error:&error];
+    if(validStore) {
+        self.validStoreURL = newURL;
+        self.dropZoneView.displayedError = nil;
+        [self.delegate dropStoreViewController:self didChangeStoreURL:newURL];
+    } else {
+        self.dropZoneView.displayedError = error;
+        self.validStoreURL = nil;
+    }
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEDropZoneView.m b/Core Data Editor/Core Data Editor/CDEDropZoneView.m
index fbcc6e3..cc5c5c3 100644
--- a/Core Data Editor/Core Data Editor/CDEDropZoneView.m	
+++ b/Core Data Editor/Core Data Editor/CDEDropZoneView.m	
@@ -112,9 +112,6 @@ - (NSRect)errorMessageIconRect {
 - (void)drawBackground {
    NSColor *topColor = [NSColor colorWithCalibratedWhite:1 alpha:0.7];
    NSColor *bottomColor = [NSColor colorWithCalibratedWhite:0.923 alpha:0.7];
-//   NSColor *topColor = [NSColor colorWithCalibratedWhite:0.923 alpha:1.000];
-//   NSColor *bottomColor = [NSColor colorWithCalibratedWhite:0.8 alpha:1.000];
-
    NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:topColor endingColor:bottomColor];
    [gradient drawInRect:self.bounds angle:-90.0];
 }
@@ -146,9 +143,7 @@ - (void)drawDropZone {
    NSAttributedString *titleAttributedString = [self attributedStringToDisplayFrom:title];
    
    NSRect titleRect = dashedBorderRect;
-//   titleRect.origin.x += borderSpacing;
-//   titleRect.size.width -= 2.0 * borderSpacing;
-   
+  
    CGFloat titleHeight = NSHeight([titleAttributedString boundingRectWithSize:NSMakeSize(NSWidth(titleRect), CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin]);
    
     titleRect.origin.y = NSMidY(titleRect) - (0.5 * titleHeight);
@@ -244,15 +239,8 @@ - (void)drawRect:(NSRect)dirtyRect {
       [self drawErrorMessage];
    }
    
-//   [NSGraphicsContext saveGraphicsState];
    [[NSColor grayColor] set];
    [[NSBezierPath bezierPathWithRect:NSInsetRect(self.bounds, 0.0, 0.0)] stroke];
-   
-//   NSRect focusRingFrame = self.bounds;
-//   focusRingFrame.size.height -= 2.0;
-//   NSSetFocusRingStyle(NSFocusRingOnly);
-//   [[NSBezierPath bezierPathWithRect: NSInsetRect(focusRingFrame,0,0)] fill];
-//   [NSGraphicsContext restoreGraphicsState];
 }
 
 
@@ -315,8 +303,7 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
    return YES;
 }
 
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender {
-}
+- (void)concludeDragOperation:(id <NSDraggingInfo>)sender {}
 
 #pragma mark NSAnimationDelegate
 - (void)animation:(NSAnimation *)animation didReachProgressMark:(NSAnimationProgress)progress {
diff --git a/Core Data Editor/Core Data Editor/CDEEditorViewController.xib b/Core Data Editor/Core Data Editor/CDEEditorViewController.xib
index 0dddaba..cbf8511 100644
--- a/Core Data Editor/Core Data Editor/CDEEditorViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEEditorViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="101201" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDEEntitiesViewController.xib b/Core Data Editor/Core Data Editor/CDEEntitiesViewController.xib
index 8f36206..f35a662 100644
--- a/Core Data Editor/Core Data Editor/CDEEntitiesViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEEntitiesViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +20,7 @@
                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="46">
                     <rect key="frame" x="0.0" y="0.0" width="247" height="473"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <clipView key="contentView" drawsBackground="NO" id="kBr-CK-Nkf">
+                    <clipView key="contentView" drawsBackground="NO" id="aaS-cQ-rdS">
                         <rect key="frame" x="0.0" y="0.0" width="247" height="473"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.h b/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.h
deleted file mode 100644
index 0fa731f..0000000
--- a/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.h	
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface CDEManagedObjectSubclassesGenerator : NSObject
-
-#pragma mark Creating
-- (instancetype)initWithOutputDirectory:(NSURL *)initOutputDirectory modelPath:(NSURL *)initModelPath applicationFilesDirectory:(NSURL *)initApplicationFilesDirectory;
-
-#pragma mark Properties
-@property (nonatomic, copy, readonly) NSURL *outputDirectory;
-@property (nonatomic, copy, readonly) NSURL *modelPath;
-@property (nonatomic, copy, readonly) NSURL *applicationFilesDirectory;
-@property (nonatomic, readonly) NSURL *readmeURL;
-@property (nonatomic, assign) BOOL generateARCCompatibleCode;
-@property (assign) BOOL generateFetchResultsControllerCode;
-
-#pragma mark Generate the Subclasses
-- (void)generate;
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.m b/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.m
deleted file mode 100644
index 32d81fc..0000000
--- a/Core Data Editor/Core Data Editor/CDEManagedObjectSubclassesGenerator.m	
+++ /dev/null
@@ -1,123 +0,0 @@
-#import "CDEManagedObjectSubclassesGenerator.h"
-
-@interface CDEManagedObjectSubclassesGenerator ()
-
-#pragma mark Properties
-@property (nonatomic, copy, readwrite) NSURL *outputDirectory;
-@property (nonatomic, copy, readwrite) NSURL *modelPath;
-@property (nonatomic, copy, readwrite) NSURL *applicationFilesDirectory;
-
-#pragma mark Private Methods
-- (NSString *)mogeneratorTemplatesDirectory;
-- (void)createTemplateFolderAndCopyTemplatesIfNeeded;
-- (void)checkIfBundleResource:(NSString *)resource ofType:(NSString *)type existsInDirectoryAndCopyIfNeeded:(NSString *)directory;
-
-@end
-
-@implementation CDEManagedObjectSubclassesGenerator
-
-#pragma mark Creating
-- (instancetype)initWithOutputDirectory:(NSURL *)initOutputDirectory modelPath:(NSURL *)initModelPath applicationFilesDirectory:(NSURL *)initApplicationFilesDirectory {
-    if(initOutputDirectory == nil || initModelPath == nil || initApplicationFilesDirectory == nil) {
-        self = nil;
-        return nil;
-    }
-    self = [super init];
-    if(self) {
-        self.generateARCCompatibleCode = YES;
-        self.generateFetchResultsControllerCode = YES;
-        self.outputDirectory = initOutputDirectory;
-        self.modelPath = initModelPath;
-        self.applicationFilesDirectory = initApplicationFilesDirectory;
-    }
-    return self;
-}
-
-- (instancetype)init {
-    return [self initWithOutputDirectory:nil modelPath:nil applicationFilesDirectory:nil];
-}
-
-#pragma mark Properties
-- (NSURL *)readmeURL {
-    return [NSURL fileURLWithPath:[self.outputDirectory.path stringByAppendingPathComponent:@"Read me.rtf"]];
-}
-
-#pragma mark Generate the Subclasses
-- (void)generate {
-    [self createTemplateFolderAndCopyTemplatesIfNeeded];
-    @try {
-        NSString *mogeneratorBinaryPath = [[NSBundle mainBundle] pathForResource:@"mogenerator" ofType:[NSString string]];
-		NSTask *task = [NSTask new];
-		[task setLaunchPath:mogeneratorBinaryPath];
-        NSString *outputMachinePath = [self.outputDirectory.path stringByAppendingPathComponent:@"Machine"];
-        NSString *outputHumanPath = [self.outputDirectory.path stringByAppendingPathComponent:@"Human"];
-        
-        NSMutableArray *arguments = [@[@"-m", self.modelPath.path, @"-M", outputMachinePath, @"-H", outputHumanPath] mutableCopy];
-        
-        if(self.generateARCCompatibleCode) {
-            [arguments addObject:@"--template-var"];
-            [arguments addObject:@"arc=true"];
-        }
-        
-        if(self.generateFetchResultsControllerCode) {
-            [arguments addObject:@"--template-var"];
-            [arguments addObject:@"frc=true"];
-        }
-        
-        [task setArguments:arguments];
-		
-		NSPipe *pipe = [NSPipe pipe];
-		[task setStandardOutput:pipe];
-		[task setStandardInput:[NSPipe pipe]];
-		[task launch];
-		
-	} @catch(NSException *ex) {
-		NSLog(@"WARNING couldn't launch mogenerator\n");
-	}
-    
-    NSFileManager *fileManager = [NSFileManager new];
-    NSString *sourceReadmePath = [[NSBundle mainBundle] pathForResource:@"mogeneratorReadme" ofType:@"rtf"];
-    NSString *destinationReadmePath = [self.outputDirectory.path stringByAppendingPathComponent:@"Read me.rtf"];
-    [fileManager copyItemAtPath:sourceReadmePath toPath:destinationReadmePath error:nil];
-}
-
-#pragma mark Dealloc
-- (void)dealloc {
-    self.outputDirectory = nil;
-    self.modelPath = nil;
-    self.applicationFilesDirectory = nil;
-}
-
-#pragma mark Private Methods
-
-- (NSString *)mogeneratorTemplatesDirectory {
-    return [self.applicationFilesDirectory.path stringByAppendingPathComponent:@"mogenerator-v-1-26-templates"];
-}
-
-- (void)createTemplateFolderAndCopyTemplatesIfNeeded {
-    NSString *templateDirectoryPath = [self mogeneratorTemplatesDirectory];
-    
-    NSFileManager *fileManager = [NSFileManager new];
-    if([fileManager fileExistsAtPath:templateDirectoryPath isDirectory:nil] == NO) {
-        [fileManager createDirectoryAtPath:templateDirectoryPath withIntermediateDirectories:YES attributes:nil error:nil];
-    }
-    
-    NSString *motemplateType = @"motemplate";
-    [self checkIfBundleResource:@"human.h" ofType:motemplateType existsInDirectoryAndCopyIfNeeded:templateDirectoryPath];
-    [self checkIfBundleResource:@"human.m" ofType:motemplateType existsInDirectoryAndCopyIfNeeded:templateDirectoryPath];
-    [self checkIfBundleResource:@"machine.h" ofType:motemplateType existsInDirectoryAndCopyIfNeeded:templateDirectoryPath];
-    [self checkIfBundleResource:@"machine.m" ofType:motemplateType existsInDirectoryAndCopyIfNeeded:templateDirectoryPath];
-}
-
-- (void)checkIfBundleResource:(NSString *)resource ofType:(NSString *)type existsInDirectoryAndCopyIfNeeded:(NSString *)directory {
-    //   NSBundle *bundle = [NSBundle mainBundle];
-    //   NSString *destinationTemplatePath = [directory stringByAppendingPathComponent:[resource stringByAppendingPathExtension:type]];
-    //    NSFileManager *fileManager = [NSFileManager new];
-    //   BOOL copyFile = ![fileManager fileExistsAtPath:destinationTemplatePath isDirectory:nil];
-    //   if(copyFile) {
-    //      [fileManager copyItemAtPath:[bundle pathForResource:resource ofType:type] toPath:destinationTemplatePath error:nil];
-    //   }
-    
-}
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEManagedObjectView.xib b/Core Data Editor/Core Data Editor/CDEManagedObjectView.xib
index 0e49cec..1f5f10e 100644
--- a/Core Data Editor/Core Data Editor/CDEManagedObjectView.xib	
+++ b/Core Data Editor/Core Data Editor/CDEManagedObjectView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -49,7 +48,7 @@
                                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="21">
                                         <rect key="frame" x="0.0" y="0.0" width="462" height="357"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <clipView key="contentView" id="2yz-vJ-8fC">
+                                        <clipView key="contentView" id="ekz-gf-7SY">
                                             <rect key="frame" x="0.0" y="0.0" width="462" height="357"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDEManagedObjectsPickerViewController.xib b/Core Data Editor/Core Data Editor/CDEManagedObjectsPickerViewController.xib
index 6d43816..d29f70c 100644
--- a/Core Data Editor/Core Data Editor/CDEManagedObjectsPickerViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEManagedObjectsPickerViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDEManagedObjectsViewController.xib b/Core Data Editor/Core Data Editor/CDEManagedObjectsViewController.xib
index a74d8f8..598a4e0 100644
--- a/Core Data Editor/Core Data Editor/CDEManagedObjectsViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEManagedObjectsViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.m b/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.m
index 70431ba..4c9bd43 100644
--- a/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.m	
+++ b/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.m	
@@ -19,41 +19,41 @@ @implementation CDEModelChooserSheetController
 
 #pragma mark - Setting the displayed Model Chooser Items
 - (void)setDisplayedModelChooserItems:(NSArray *)modelChooserItems {
-    NSArray *items = modelChooserItems != nil ? modelChooserItems : @[];
-    [self.modelItemsArrayController setContent:[NSMutableArray arrayWithArray:items]];
+  NSArray *items = modelChooserItems != nil ? modelChooserItems : @[];
+  [self.modelItemsArrayController setContent:[NSMutableArray arrayWithArray:items]];
 }
 
 #pragma mark Actions
 - (IBAction)ok:(id)sender {
-    [NSApp endSheet:self.window];
-    [self.window orderOut:sender];
-    CDEModelChooserItem *selectedItem = [self.modelItemsArrayController.selectedObjects lastObject];
-    (self.completionHandler)(CDEModelChooserSheetControllerResultOKButton, selectedItem);
-    self.completionHandler = nil;
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
+  [self.window orderOut:sender];
+  CDEModelChooserItem *selectedItem = [self.modelItemsArrayController.selectedObjects lastObject];
+  (self.completionHandler)(CDEModelChooserSheetControllerResultOKButton, selectedItem);
+  self.completionHandler = nil;
 }
 
 - (IBAction)cancel:(id)sender {
-    [NSApp endSheet:self.window];
-    [self.window orderOut:sender];
-    (self.completionHandler)(CDEModelChooserSheetControllerResultCancelButton, nil);
-    self.completionHandler = nil;
+  [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
+  [self.window orderOut:sender];
+  (self.completionHandler)(CDEModelChooserSheetControllerResultCancelButton, nil);
+  self.completionHandler = nil;
 }
 
 #pragma mark Creating
 - (id)init {
-   self = [super initWithWindowNibName:NSStringFromClass([self class])];
-   if(self) {
-      self.completionHandler = nil;
-   }
-   return self;
+  self = [super initWithWindowNibName:NSStringFromClass([self class])];
+  if(self) {
+    self.completionHandler = nil;
+  }
+  return self;
 }
 
 #pragma mark Running the Model Chooser
 - (void)beginSheetModalForWindow:(NSWindow *)parentWindow completionHandler:(CDEModelChooserSheetControllerCompletionHandler)handler {
-   if(self.completionHandler != nil) {
-      return;
-   }
-   self.completionHandler = handler;
+  if(self.completionHandler != nil) {
+    return;
+  }
+  self.completionHandler = handler;
   [parentWindow beginSheet:self.window completionHandler:^(NSModalResponse returnCode) {
     
   }];
@@ -61,13 +61,13 @@ - (void)beginSheetModalForWindow:(NSWindow *)parentWindow completionHandler:(CDE
 
 #pragma mark NSTableViewDelegate
 - (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex {
-   if([[tableColumn identifier] isEqualToString:@"Icon"] == NO) {
-      return;
-   }
-    
-   CDEModelChooserItem *itemAtRow = (self.modelItemsArrayController.arrangedObjects)[rowIndex];
-   NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:itemAtRow.URL.path];
-   [cell setImage:icon];
+  if([[tableColumn identifier] isEqualToString:@"Icon"] == NO) {
+    return;
+  }
+  
+  CDEModelChooserItem *itemAtRow = (self.modelItemsArrayController.arrangedObjects)[rowIndex];
+  NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:itemAtRow.URL.path];
+  [cell setImage:icon];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.xib b/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.xib
index fcf548c..141704b 100644
--- a/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEModelChooserSheetController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,7 +12,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-3" userLabel="Application"/>
         <window title="Select a Model" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
@@ -27,7 +26,7 @@
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="4">
                         <rect key="frame" x="20" y="50" width="648" height="198"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" id="zwO-Vw-a85">
+                        <clipView key="contentView" id="a04-oe-cUU">
                             <rect key="frame" x="1" y="1" width="646" height="196"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDENumberAttributeView.xib b/Core Data Editor/Core Data Editor/CDENumberAttributeView.xib
index ba0bdbd..48d0bd7 100644
--- a/Core Data Editor/Core Data Editor/CDENumberAttributeView.xib	
+++ b/Core Data Editor/Core Data Editor/CDENumberAttributeView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDENumberAttributeViewController.m b/Core Data Editor/Core Data Editor/CDENumberAttributeViewController.m
index 4b23f9c..2107a61 100644
--- a/Core Data Editor/Core Data Editor/CDENumberAttributeViewController.m	
+++ b/Core Data Editor/Core Data Editor/CDENumberAttributeViewController.m	
@@ -32,7 +32,7 @@ - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor
   NSAlert *alert = [NSAlert new];
   alert.informativeText = [NSString stringWithFormat:@"Input '%@' does not match validation predicates:\n\n%@", [fieldEditor string], [predicate description]];
   alert.messageText = @"Validation Error";
-  alert.alertStyle = NSCriticalAlertStyle;
+  alert.alertStyle = NSAlertStyleCritical;
   [alert runModal];
   return NO;
 }
diff --git a/Core Data Editor/Core Data Editor/CDEPathPickerPopUpButton.m b/Core Data Editor/Core Data Editor/CDEPathPickerPopUpButton.m
index 5723eae..f9c278f 100644
--- a/Core Data Editor/Core Data Editor/CDEPathPickerPopUpButton.m	
+++ b/Core Data Editor/Core Data Editor/CDEPathPickerPopUpButton.m	
@@ -2,69 +2,54 @@
 
 @implementation CDEPathPickerPopUpButton
 
-- (id)initWithFrame:(NSRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        // Initialization code here.
-    }
-    
-    return self;
-}
-
-- (id)initWithCoder:(NSCoder *)decoder {
-    self = [super initWithCoder:decoder];
-    return self;
-}
-
 #pragma mark - Nib
 - (void)awakeFromNib {
-    [super awakeFromNib];
-    [self createDefaultMenuItems];
-    self.URL = nil;
+  [super awakeFromNib];
+  [self createDefaultMenuItems];
+  self.URL = nil;
 }
 
 #pragma mark - Properties
 - (void)setURL:(NSURL *)URL {
-    _URL = URL;
-    if(self.URL == nil) {
-        [self showPlaceholderInBuildDirectoryPopUpButton];
-    } else {
-        [self showURLInBuildDirectoryPopUpButton:self.URL];
-    }
+  _URL = URL;
+  if(self.URL == nil) {
+    [self showPlaceholderInBuildDirectoryPopUpButton];
+  } else {
+    [self showURLInBuildDirectoryPopUpButton:self.URL];
+  }
 }
 
 #pragma mark - Helper
 - (void)createDefaultMenuItems {
-    NSMenuItem *directoryItem = [self.menu insertItemWithTitle:@"No Directory Set" action:NULL keyEquivalent:@"" atIndex:0];
-    directoryItem.tag = 0;
-    [directoryItem setEnabled:NO];
-    [self.menu insertItem:[NSMenuItem separatorItem] atIndex:1];
-    NSMenuItem *otherItem = [self.menu insertItemWithTitle:@"Other…" action:@selector(otherItemSelected:) keyEquivalent:@"" atIndex:2];
-    otherItem.target = self;
+  NSMenuItem *directoryItem = [self.menu insertItemWithTitle:@"No Directory Set" action:NULL keyEquivalent:@"" atIndex:0];
+  directoryItem.tag = 0;
+  [directoryItem setEnabled:NO];
+  [self.menu insertItem:[NSMenuItem separatorItem] atIndex:1];
+  NSMenuItem *otherItem = [self.menu insertItemWithTitle:@"Other…" action:@selector(otherItemSelected:) keyEquivalent:@"" atIndex:2];
+  otherItem.target = self;
 }
 
 - (void)otherItemSelected:(NSMenuItem *)sender {
-    self.otherItemSelectedHandler ? self.otherItemSelectedHandler(self) : nil;
-    [self selectItemAtIndex:0];
+  self.otherItemSelectedHandler ? self.otherItemSelectedHandler(self) : nil;
+  [self selectItemAtIndex:0];
 }
 
 - (void)showPlaceholderInBuildDirectoryPopUpButton {
-    NSMenuItem *item = [self.menu itemWithTag:0];
-    item.title = @"No Directory Set";
-    [item setEnabled:NO];
-    [item setImage:nil];
-    [self selectItemWithTag:0];
+  NSMenuItem *item = [self.menu itemWithTag:0];
+  item.title = @"No Directory Set";
+  [item setEnabled:NO];
+  [item setImage:nil];
+  [self selectItemWithTag:0];
 }
 
 - (void)showURLInBuildDirectoryPopUpButton:(NSURL *)URL {
-    NSMenuItem *item = [self.menu itemWithTag:0];
-    item.title = [URL lastPathComponent];
-    [item setEnabled:YES];
-    NSImage *directoryImage = [NSImage imageNamed:NSImageNameFolder];
-    directoryImage.size = NSMakeSize(16, 16);
-    [item setImage:directoryImage];
-    [self selectItemWithTag:0];
+  NSMenuItem *item = [self.menu itemWithTag:0];
+  item.title = [URL lastPathComponent];
+  [item setEnabled:YES];
+  NSImage *directoryImage = [NSImage imageNamed:NSImageNameFolder];
+  directoryImage.size = NSMakeSize(16, 16);
+  [item setImage:directoryImage];
+  [self selectItemWithTag:0];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.h b/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.h
deleted file mode 100644
index f05e5d6..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.h	
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@interface CDEPreferencesAutomaticProjectCreationViewController : NSViewController
-
-- (void)displayInfoSheet;
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.xib b/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.xib
deleted file mode 100644
index 8d8004b..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.xib	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CDEPreferencesAutomaticProjectCreationViewController">
-            <connections>
-                <outlet property="buildDirectoryPopUpButton" destination="5" id="22"/>
-                <outlet property="simulatorDirectoryPopUpButton" destination="27" id="35"/>
-                <outlet property="view" destination="1" id="24"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="499" height="368"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <textField verticalHuggingPriority="750" id="3">
-                    <rect key="frame" x="215" y="206" width="267" height="112"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" id="12">
-                        <font key="font" metaFont="smallSystem"/>
-                        <string key="title">If you tell Core Data Editor where your derived data directory is you can then drop store files on the dock icon and Core Data Editor will automatically try to find a matching model by looking at every model (recursively) in your derived data directory. The derived data directory is usually located at ~/Library/Developer/Xcode/DerivedData.</string>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="36">
-                    <rect key="frame" x="213" y="20" width="267" height="140"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" id="37">
-                        <font key="font" metaFont="smallSystem"/>
-                        <string key="title">Please specify your iPhone Simulator directory. This directory is usually located in ~/Library/Developer/CoreSimulator/. Specifying your iPhone Simulator directory enables the project browser feature. The project browser automatically finds compatible SQLite stores and managed object models and let's you quickly create a Core Data Editor projects. You access the project browser from the "Window | Project Browser" menu item.</string>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="4">
-                    <rect key="frame" x="17" y="330" width="194" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Xcode Derived Data Directory:" id="11">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" id="5" customClass="CDEPathPickerPopUpButton">
-                    <rect key="frame" x="216" y="324" width="266" height="25"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="7"/>
-                    </popUpButtonCell>
-                </popUpButton>
-                <textField verticalHuggingPriority="750" id="26">
-                    <rect key="frame" x="15" y="170" width="194" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="iPhone Simulator Directory:" id="33">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" id="27" customClass="CDEPathPickerPopUpButton">
-                    <rect key="frame" x="214" y="166" width="266" height="25"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="28">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="29"/>
-                    </popUpButtonCell>
-                </popUpButton>
-            </subviews>
-        </customView>
-    </objects>
-</document>
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.h b/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.h
deleted file mode 100644
index 916b20d..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.h	
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  CDECDEPreferencesFormattingViewController.h
-//  Core Data Editor
-//
-//  Created by cmk on 7/21/13.
-//  Copyright (c) 2013 Christian Kienle. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface CDEPreferencesFormattingViewController : NSViewController
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.m b/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.m
deleted file mode 100644
index c9da950..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.m	
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  CDECDEPreferencesFormattingViewController.m
-//  Core Data Editor
-//
-//  Created by cmk on 7/21/13.
-//  Copyright (c) 2013 Christian Kienle. All rights reserved.
-//
-
-#import "CDEPreferencesFormattingViewController.h"
-
-@interface CDEPreferencesFormattingViewController ()
-
-@end
-
-@implementation CDEPreferencesFormattingViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Initialization code here.
-    }
-    
-    return self;
-}
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.xib b/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.xib
deleted file mode 100644
index e5e9f01..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesFormattingViewController.xib	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CDEPreferencesFormattingViewController">
-            <connections>
-                <outlet property="view" destination="1" id="2"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="114"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="3">
-                    <rect key="frame" x="271" y="69" width="19" height="27"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <stepperCell key="cell" continuous="YES" alignment="left" maxValue="10" id="27"/>
-                    <connections>
-                        <binding destination="50" name="value" keyPath="values.CDEUserDefaultsNumberOfDecimals" id="52"/>
-                    </connections>
-                </stepper>
-                <textField verticalHuggingPriority="750" id="4">
-                    <rect key="frame" x="235" y="72" width="36" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="25">
-                        <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="26">
-                            <integer key="minimum" value="0"/>
-                            <integer key="maximum" value="10"/>
-                        </numberFormatter>
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                    <connections>
-                        <binding destination="50" name="value" keyPath="values.CDEUserDefaultsNumberOfDecimals" id="51"/>
-                    </connections>
-                </textField>
-                <textField verticalHuggingPriority="750" id="5">
-                    <rect key="frame" x="164" y="74" width="66" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Decimals:" id="24">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="6">
-                    <rect key="frame" x="116" y="45" width="113" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Time Formatting:" id="23">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="7">
-                    <rect key="frame" x="118" y="20" width="111" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Date Formatting:" id="22">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" id="8">
-                    <rect key="frame" x="232" y="15" width="100" height="26"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="push" title="Long" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="18" id="16">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                        <menu key="menu" title="OtherViews" id="17">
-                            <items>
-                                <menuItem title="None" id="21"/>
-                                <menuItem title="Short" id="20"/>
-                                <menuItem title="Medium" id="19"/>
-                                <menuItem title="Long" state="on" id="18"/>
-                            </items>
-                        </menu>
-                    </popUpButtonCell>
-                    <connections>
-                        <binding destination="50" name="selectedIndex" keyPath="values.CDEUserDefaultsDateFormatterDateStyle" id="54"/>
-                    </connections>
-                </popUpButton>
-                <popUpButton verticalHuggingPriority="750" id="9">
-                    <rect key="frame" x="232" y="40" width="100" height="26"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="push" title="Long" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="15" id="10">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                        <menu key="menu" title="OtherViews" id="11">
-                            <items>
-                                <menuItem title="None" id="12"/>
-                                <menuItem title="Short" id="13"/>
-                                <menuItem title="Medium" id="14"/>
-                                <menuItem title="Long" state="on" id="15"/>
-                            </items>
-                        </menu>
-                    </popUpButtonCell>
-                    <connections>
-                        <binding destination="50" name="selectedIndex" keyPath="values.CDEUserDefaultsDateFormatterTimeStyle" id="53"/>
-                    </connections>
-                </popUpButton>
-            </subviews>
-        </customView>
-        <userDefaultsController representsSharedInstance="YES" id="50"/>
-    </objects>
-</document>
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.xib b/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.xib
deleted file mode 100644
index 7faf72a..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.xib	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CDEPreferencesMiscViewController">
-            <connections>
-                <outlet property="view" destination="1" id="2"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="478" height="281"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <textField verticalHuggingPriority="750" id="3">
-                    <rect key="frame" x="72" y="244" width="120" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Object ID Column:" id="20">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <button id="4">
-                    <rect key="frame" x="195" y="243" width="157" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="check" title="Shows name of entity" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="19">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <binding destination="21" name="value" keyPath="values.CDEUserDefaultsShowsNameOfEntityInObjectIDColumn" id="22"/>
-                    </connections>
-                </button>
-                <textField verticalHuggingPriority="750" id="5">
-                    <rect key="frame" x="194" y="223" width="267" height="14"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format: &lt;Entity&gt;/p&lt;Primary Key&gt;" id="18">
-                        <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="6">
-                    <rect key="frame" x="17" y="193" width="175" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Property and Entity Names:" id="17">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <button id="7">
-                    <rect key="frame" x="195" y="192" width="95" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="check" title="Decamelize" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="16">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <binding destination="21" name="value" keyPath="values.CDEUserDefaultsShowsNiceEntityAndPropertyNames" id="25"/>
-                    </connections>
-                </button>
-                <textField verticalHuggingPriority="750" id="8">
-                    <rect key="frame" x="194" y="150" width="267" height="36"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Converts a camel case name into a human-readable name." id="15">
-                        <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="9">
-                    <rect key="frame" x="78" y="128" width="114" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Validation Errors:" id="14">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <button id="10">
-                    <rect key="frame" x="195" y="126" width="265" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="check" title="Automatically resolve validation errors" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="13">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <binding destination="21" name="value" keyPath="values.CDEUserDefaultsAutomaticallyResolvesValidationErrors" id="26"/>
-                    </connections>
-                </button>
-                <textField verticalHuggingPriority="750" id="11">
-                    <rect key="frame" x="194" y="78" width="267" height="42"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="When creating an object Core Data Editor will try to resolve any validation erros for to-one and to-many relationships." id="12">
-                        <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="ety-fA-9T6">
-                    <rect key="frame" x="196" y="20" width="245" height="28"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Open Project Browser when Core Data Editor starts." id="yYK-hb-w1U">
-                        <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="BBT-m9-zD9">
-                    <rect key="frame" x="87" y="56" width="105" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Project Browser:" id="UCu-rI-21s">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <button id="Zj6-f4-W6k">
-                    <rect key="frame" x="196" y="54" width="265" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="check" title="Automatically open on launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QEW-yx-G13">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <binding destination="21" name="value" keyPath="values.CDEUserDefaultsOpenProjectBrowserOnLaunch" id="Bz9-b3-Hcz"/>
-                    </connections>
-                </button>
-            </subviews>
-        </customView>
-        <userDefaultsController representsSharedInstance="YES" id="21"/>
-    </objects>
-</document>
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.m b/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.m
deleted file mode 100644
index 095a00a..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.m	
+++ /dev/null
@@ -1,171 +0,0 @@
-#import "CDEPreferencesWindowController.h"
-#import "NSUserDefaults+CDEAdditions.h"
-#import "NSURL+CDEAdditions.h"
-
-#import "CDEPreferencesAutomaticProjectCreationViewController.h"
-
-@interface CDEPreferencesWindowController ()
-
-#pragma mark - Properties
-@property (nonatomic, copy) CDEPreferencesWindowControllerCompletionHandler completionHandler;
-
-#pragma mark - Tabbed Preferences
-@property (nonatomic, strong, readwrite) NSArray *viewControllers;
-@property (nonatomic, strong) NSViewController *currentViewController;
-@property (nonatomic, strong) NSToolbarItem *currentToolbarItem;
-
-
-@end
-
-@implementation CDEPreferencesWindowController
-
-#pragma mark - Creating
-- (instancetype)init {
-    self = [super initWithWindowNibName:@"CDEPreferencesWindowController"];
-    if(self) {
-        
-    }
-    return self;
-}
-
-#pragma mark - NSWindowController
-- (void)windowDidLoad {
-    [super windowDidLoad];
-    [self createToolbarItemsToViewControllerMapping];
-}
-
-#pragma mark - Showing the Preferences Window
-- (void)showWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
-    self.completionHandler = handler;
-    [self showWindow:self];
-}
-
-- (void)showAutomaticProjectCreationPreferencesAndDisplayInfoSheetWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
-    [self showAutomaticProjectCreationPreferencesWithCompletionHandler:handler];
-    double delayInSeconds = 0.5;
-    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-        NSString *identifier = NSStringFromClass([CDEPreferencesAutomaticProjectCreationViewController class]);
-        CDEPreferencesAutomaticProjectCreationViewController *viewController = (CDEPreferencesAutomaticProjectCreationViewController *)[self existingViewControllerForToolbarItemWithIdentifier:identifier];
-        [viewController displayInfoSheet];
-    });
-}
-
-- (void)showAutomaticProjectCreationPreferencesWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
-    self.completionHandler = handler;
-    [self showWindow:self];
-    NSString *identifier = NSStringFromClass([CDEPreferencesAutomaticProjectCreationViewController class]);
-    CDEPreferencesAutomaticProjectCreationViewController *viewController = (CDEPreferencesAutomaticProjectCreationViewController *)[self existingViewControllerForToolbarItemWithIdentifier:identifier];
-    [self showViewController:viewController];
-}
-
-- (IBAction)dismiss:(id)sender {
-    [self.window performClose:self];
-}
-
-- (void)windowWillClose:(NSNotification *)notification {
-    self.completionHandler ? self.completionHandler() : nil;
-}
-
-#pragma mark - Tabbed Preferences
-- (void)createToolbarItemsToViewControllerMapping {
-    self.viewControllers = @[];
-    
-    if(self.window == nil) {
-        NSLog(@"A preferences controller cannot work without a window. Connect the window outlet to your preferences window.");
-        return;
-    }
-    if(self.window.toolbar == nil) {
-        NSLog(@"A preferences controller cannot work without a toolbar.");
-        return;
-    }
-    
-    NSToolbarItem *firstItem = nil;
-    for(NSToolbarItem *visibleItem in self.window.toolbar.visibleItems) {
-        if(!visibleItem.isEnabled || visibleItem.target != self) {
-            continue;
-        }
-        NSViewController *controller = [self createViewControllerForToolbarItem:visibleItem];
-        if(controller == nil) {
-            continue;
-        }
-        self.viewControllers = [self.viewControllers arrayByAddingObject:controller];
-        if(firstItem == nil) {
-            firstItem = visibleItem;
-        }
-    }
-    if(firstItem != nil) {
-        [self.window.toolbar setSelectedItemIdentifier:firstItem.itemIdentifier];
-        [self showPreferencesFor:firstItem];
-    }
-}
-
-- (NSViewController *)createViewControllerForToolbarItem:(NSToolbarItem *)item {
-    if(item == nil) {
-        return nil;
-    }
-    NSString *identifier = item.itemIdentifier;
-    NSViewController *result = [[NSClassFromString(identifier) alloc] initWithNibName:identifier bundle:nil];
-    if(result == nil) {
-        return nil;
-    }
-    [result view];
-    return result;
-}
-
-- (NSViewController *)existingViewControllerForToolbarItemWithIdentifier:(NSString *)identifier {
-    if(identifier == nil) {
-        return nil;
-    }
-    for(NSViewController *viewController in self.viewControllers) {
-        if([viewController.nibName isEqualToString:identifier]) {
-            return viewController;
-        }
-    }
-    return nil;
-}
-
-- (NSViewController *)existingViewControllerForToolbarItem:(NSToolbarItem *)item {
-    return [self existingViewControllerForToolbarItemWithIdentifier:item.itemIdentifier];
-}
-
-- (void)showViewController:(NSViewController *)newViewController {
-    if(self.currentViewController == nil) {
-        CGFloat deltaHeight = NSHeight([self.window.contentView bounds]) - NSHeight(newViewController.view.frame);
-        CGFloat deltaWidth = NSWidth([self.window.contentView bounds]) - NSWidth(newViewController.view.frame);
-        
-        NSRect newWindowFrame = self.window.frame;
-        
-        newWindowFrame.size.height -= deltaHeight;
-        newWindowFrame.size.width -= deltaWidth;
-        newWindowFrame.origin.y += deltaHeight;
-        [self.window setFrame:newWindowFrame display:YES animate:YES];
-        [self.window.contentView addSubview:newViewController.view];
-        
-        self.currentViewController = newViewController;
-        [self.window.toolbar setSelectedItemIdentifier:NSStringFromClass([newViewController class])];
-        return;
-    }
-    
-    [self.currentViewController.view removeFromSuperview];
-    
-    CGFloat deltaHeight = NSHeight(self.currentViewController.view.frame) - NSHeight(newViewController.view.frame);
-    CGFloat deltaWidth = NSWidth(self.currentViewController.view.frame) - NSWidth(newViewController.view.frame);
-    
-    NSRect newWindowFrame = self.window.frame;
-    
-    newWindowFrame.size.height -= deltaHeight;
-    newWindowFrame.size.width -= deltaWidth;
-    newWindowFrame.origin.y += deltaHeight;
-    [self.window setFrame:newWindowFrame display:YES animate:YES];
-    [self.window.contentView addSubview:newViewController.view];
-    self.currentViewController = newViewController;
-    [self.window.toolbar setSelectedItemIdentifier:NSStringFromClass([newViewController class])];
-}
-- (IBAction)showPreferencesFor:(id)sender {
-    NSViewController *newViewController = [self existingViewControllerForToolbarItem:sender];
-    [self showViewController:newViewController];
-}
-
-
-@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.xib b/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.xib
deleted file mode 100644
index de3fa89..0000000
--- a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.xib	
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSToolbar</string>
-			<string>NSToolbarFlexibleSpaceItem</string>
-			<string>NSToolbarItem</string>
-			<string>NSToolbarSpaceItem</string>
-			<string>NSUserDefaultsController</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">CDEPreferencesWindowController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">3</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {478, 166}}</string>
-				<int key="NSWTFlags">1618477056</int>
-				<string key="NSWindowTitle">Preferences</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSToolbar" key="NSViewClass" id="745911873">
-					<object class="NSMutableString" key="NSToolbarIdentifier">
-						<characters key="NS.bytes">14ED31DD-BB07-4844-A8D9-55464A02CABC</characters>
-					</object>
-					<nil key="NSToolbarDelegate"/>
-					<bool key="NSToolbarPrefersToBeShown">YES</bool>
-					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
-					<bool key="NSToolbarAllowsUserCustomization">NO</bool>
-					<bool key="NSToolbarAutosavesConfiguration">NO</bool>
-					<int key="NSToolbarDisplayMode">1</int>
-					<int key="NSToolbarSizeMode">1</int>
-					<dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
-						<object class="NSToolbarItem" key="2EA9D6EA-E917-4FA7-9421-02F7F23F3125" id="718415900">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">2EA9D6EA-E917-4FA7-9421-02F7F23F3125</characters>
-							</object>
-							<string key="NSToolbarItemLabel">Formatting</string>
-							<string key="NSToolbarItemPaletteLabel">Formatting</string>
-							<string key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">formatting-icon</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarItem" key="AFCAF20C-AA03-46F4-B20C-151019C0A1D9" id="847551892">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">AFCAF20C-AA03-46F4-B20C-151019C0A1D9</characters>
-							</object>
-							<string key="NSToolbarItemLabel">General</string>
-							<string key="NSToolbarItemPaletteLabel">General</string>
-							<string key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSPreferencesGeneral</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarItem" key="BC505480-DBD0-40D2-91E1-FBD1FDD9E52A" id="689690744">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">BC505480-DBD0-40D2-91E1-FBD1FDD9E52A</characters>
-							</object>
-							<string key="NSToolbarItemLabel">Integration</string>
-							<string key="NSToolbarItemPaletteLabel">Integration</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">integration-icon</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarFlexibleSpaceItem" key="NSToolbarFlexibleSpaceItem" id="1066815445">
-							<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
-							<string key="NSToolbarItemLabel"/>
-							<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<nil key="NSToolbarItemImage"/>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{1, 5}</string>
-							<string key="NSToolbarItemMaxSize">{20000, 32}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
-								<bool key="NSIsDisabled">YES</bool>
-								<bool key="NSIsSeparator">YES</bool>
-								<string key="NSTitle"/>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<object class="NSCustomResource" key="NSOnImage" id="954301633">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="704167923">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-							</object>
-						</object>
-						<object class="NSToolbarSpaceItem" key="NSToolbarSpaceItem" id="818367916">
-							<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
-							<string key="NSToolbarItemLabel"/>
-							<string key="NSToolbarItemPaletteLabel">Space</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<nil key="NSToolbarItemImage"/>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{32, 5}</string>
-							<string key="NSToolbarItemMaxSize">{32, 32}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
-								<bool key="NSIsDisabled">YES</bool>
-								<bool key="NSIsSeparator">YES</bool>
-								<string key="NSTitle"/>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<reference key="NSOnImage" ref="954301633"/>
-								<reference key="NSMixedImage" ref="704167923"/>
-							</object>
-						</object>
-					</dictionary>
-					<array key="NSToolbarIBAllowedItems">
-						<reference ref="818367916"/>
-						<reference ref="1066815445"/>
-						<reference ref="718415900"/>
-						<reference ref="689690744"/>
-						<reference ref="847551892"/>
-					</array>
-					<array key="NSToolbarIBDefaultItems">
-						<reference ref="847551892"/>
-						<reference ref="718415900"/>
-						<reference ref="689690744"/>
-						<reference ref="1066815445"/>
-					</array>
-					<array key="NSToolbarIBSelectableItems" id="0"/>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews"/>
-					<string key="NSFrameSize">{478, 166}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSUserDefaultsController" id="719232709">
-				<bool key="NSSharedInstance">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreferencesFor:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="718415900"/>
-					</object>
-					<int key="connectionID">280</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreferencesFor:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="689690744"/>
-					</object>
-					<int key="connectionID">281</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreferencesFor:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="847551892"/>
-					</object>
-					<int key="connectionID">282</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">4</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-							<reference ref="745911873"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="719232709"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">270</int>
-						<reference key="object" ref="745911873"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="818367916"/>
-							<reference ref="1066815445"/>
-							<reference ref="689690744"/>
-							<reference ref="718415900"/>
-							<reference ref="847551892"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="818367916"/>
-						<reference key="parent" ref="745911873"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">274</int>
-						<reference key="object" ref="1066815445"/>
-						<reference key="parent" ref="745911873"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="689690744"/>
-						<reference key="parent" ref="745911873"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">278</int>
-						<reference key="object" ref="718415900"/>
-						<reference key="parent" ref="745911873"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">279</int>
-						<reference key="object" ref="847551892"/>
-						<reference key="parent" ref="745911873"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
-				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="276.designableToolbarItemIdentifier">CDEPreferencesAutomaticProjectCreationViewController</string>
-				<boolean value="YES" key="276.toolbarItem.selectable"/>
-				<string key="278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="278.designableToolbarItemIdentifier">CDEPreferencesFormattingViewController</string>
-				<boolean value="YES" key="278.toolbarItem.selectable"/>
-				<string key="279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="279.designableToolbarItemIdentifier">CDEPreferencesMiscViewController</string>
-				<boolean value="YES" key="279.toolbarItem.selectable"/>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">282</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">CDEPreferencesWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CDEPreferencesWindowController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{11, 11}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
-			<string key="NSPreferencesGeneral">{32, 32}</string>
-			<string key="formatting-icon">{32, 32}</string>
-			<string key="integration-icon">{32, 32}</string>
-		</dictionary>
-	</data>
-</archive>
diff --git a/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.m b/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.m
index f6911f6..9d0c646 100644
--- a/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.m	
+++ b/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.m	
@@ -12,6 +12,33 @@
 
 typedef void(^ProjectBrowserReloadCompletionHandler)(NSArray *projectBrowserItems /* CDEProjectBrowserItem */);
 
+@interface _ProjectBrowserItem: NSObject
+
+@property (copy) NSString *modificationDate;
+@property (copy) NSString *storePath;
+@property (copy) NSString *modelPath;
+@end
+
+@implementation _ProjectBrowserItem
+
+- (instancetype)initWithModificationDate:(NSString *)modificationDate storePath:(NSString *)storePath modelPath:(NSString *)modelPath {
+  self = [super init];
+  self.modificationDate = modificationDate;
+  self.storePath = storePath;
+  self.modelPath = modelPath;
+  return self;
+}
+
+- (instancetype)init {
+  @throw [NSException exceptionWithName:NSInternalInconsistencyException
+                                 reason:@"-init is not a valid initializer for the class _Project"
+                               userInfo:nil];
+}
+
+@end
+
+
+
 @interface CDEProjectBrowserWindowController ()
 
 #pragma mark - Properties
@@ -29,198 +56,197 @@ @implementation CDEProjectBrowserWindowController
 
 #pragma mark - Working with the project browser
 - (void)showWithProjectDirectoryURL:(NSURL *)projectDirectoryURL {
-    self.projectDirectoryURL = projectDirectoryURL;
-    [self showWindow:self];
-    [self updateUI];
-    [self reloadProjectBrowser:self];
+  self.projectDirectoryURL = projectDirectoryURL;
+  [self showWindow:self];
+  [self updateUI];
+  [self reloadProjectBrowser:self];
 }
 
 - (void)updateProjectDirectoryURL:(NSURL *)projectDirectoryURL {
-    self.projectDirectoryURL = projectDirectoryURL;
-    [self reloadProjectBrowser:self];
+  self.projectDirectoryURL = projectDirectoryURL;
+  [self reloadProjectBrowser:self];
 }
 
 - (void)updateUI {
-    [self.reloadButton setEnabled:(self.projectDirectoryURL != nil)];
+  [self.reloadButton setEnabled:(self.projectDirectoryURL != nil)];
 }
 
 #pragma mark - Actions
 - (IBAction)createProject:(id)sender {
-    NSInteger row = [self.tableView rowForView:sender];
-    if(row == -1) {
-        return;
-    }
-    CDEProjectBrowserItem *item = [self.items.arrangedObjects objectAtIndex:row];
-    
-    if(item == nil) {
-        return;
-    }
-    CDEDocument *document = [[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:NO error:NULL];
-    CDEConfiguration *c = [document createConfiguration];
-    NSError *error = nil;
-    NSURL *storeURL = [NSURL fileURLWithPath:item.storePath];
-    NSURL *modelURL = [NSURL fileURLWithPath:item.modelPath];
-    
-    BOOL set = [c setBookmarkDataWithApplicationBundleURL:nil storeURL:storeURL modelURL:modelURL error:&error];
-    if(!set) {
-        NSLog(@"error: %@", error);
-    }
-    error = nil;
-    BOOL setup = [document setupAndStartAccessingConfigurationRelatedURLsAndGetError:&error];
-    if(!setup) {
-        NSLog(@"error: %@", error);
-    }
-    [document makeWindowControllers];
-    [document showWindows];
+  NSInteger row = [self.tableView rowForView:sender];
+  if(row == -1) {
+    return;
+  }
+  CDEProjectBrowserItem *item = [self.items.arrangedObjects objectAtIndex:row];
+  
+  if(item == nil) {
+    return;
+  }
+  CDEDocument *document = [[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:NO error:NULL];
+  CDEConfiguration *c = [document createConfiguration];
+  NSError *error = nil;
+  NSURL *storeURL = [NSURL fileURLWithPath:item.storePath];
+  NSURL *modelURL = [NSURL fileURLWithPath:item.modelPath];
+  
+  BOOL set = [c setBookmarkDataWithApplicationBundleURL:nil storeURL:storeURL modelURL:modelURL error:&error];
+  if(!set) {
+    NSLog(@"error: %@", error);
+  }
+  error = nil;
+  BOOL setup = [document setupAndStartAccessingConfigurationRelatedURLsAndGetError:&error];
+  if(!setup) {
+    NSLog(@"error: %@", error);
+  }
+  [document makeWindowControllers];
+  [document showWindows];
 }
 
 - (void)prepareUIForReload {
-    [self.items setContent:[@[] mutableCopy]];
-    [self.reloadButton setEnabled:NO];
-    [self.reloadProgressIndicator startAnimation:self];
+  [self.items setContent:[@[] mutableCopy]];
+  [self.reloadButton setEnabled:NO];
+  [self.reloadProgressIndicator startAnimation:self];
 }
 
 - (void)performReloadWithCompletionHandler:(ProjectBrowserReloadCompletionHandler)completionHandler {
-    NSParameterAssert(completionHandler);
-    NSAssert(self.projectDirectoryURL != nil, @"");
+  NSParameterAssert(completionHandler);
+  NSAssert(self.projectDirectoryURL != nil, @"");
+  
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    NSDirectoryEnumerator *enumerator = [self newSimulatorDirectoryEnumerator];
+    
+    NSDictionary *metadataByStorePath;
+    NSDictionary *modelByModelPath;
+    
+    [enumerator getMetadataByStorePath:&metadataByStorePath modelByModelPath:&modelByModelPath];
+    
+    NSArray *items = [self compatibleProjectBrowserItemsWithMetadataByStorePath:metadataByStorePath modelByModelPath:modelByModelPath];
     
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSDirectoryEnumerator *enumerator = [self newSimulatorDirectoryEnumerator];
+    double delayInSeconds = 1.0;
+    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
+      completionHandler(items);
+    });
+  });
+}
+
+
+
+- (NSArray<CDEProjectBrowserItem*> *)compatibleProjectBrowserItemsWithMetadataByStorePath:(NSDictionary<NSString*, NSDictionary*> *)metadataByStorePath modelByModelPath:(NSDictionary<NSString*, NSManagedObjectModel*>*)modelByModelPath {
+  NSMutableArray<CDEProjectBrowserItem*> *items = [NSMutableArray new];
+  NSMutableArray<_ProjectBrowserItem*> *projectItems = [NSMutableArray new];
+  // Find compatible combinations
+  [modelByModelPath enumerateKeysAndObjectsUsingBlock:^(NSString *modelPath, NSManagedObjectModel *model, BOOL *stop) {
+    [metadataByStorePath enumerateKeysAndObjectsUsingBlock:^(NSString *storePath, NSDictionary *metadata, BOOL *stop) {
+      BOOL isCompatible = [model isConfiguration:nil compatibleWithStoreMetadata:metadata];
+      if(isCompatible) {
+        NSDate *storeModDate;
+        NSURL *storeURL=[NSURL fileURLWithPath:storePath];
+        NSError *error;
+        [storeURL getResourceValue:&storeModDate forKey:NSURLContentModificationDateKey error:&error];
         
-        NSDictionary *metadataByStorePath;
-        NSDictionary *modelByModelPath;
+        //Also look for: .sqlite-wal (write-ahead log).  Use most recent, although the wal should be most recent if found.
+        NSString *walPath=[NSString stringWithFormat:@"%@-wal",storeURL.absoluteString];
+        NSURL *walUrl=[NSURL URLWithString:walPath];
+        NSDate *walModDate;
+        [walUrl getResourceValue:&walModDate forKey:NSURLContentModificationDateKey error:&error];
         
-        [enumerator getMetadataByStorePath:&metadataByStorePath modelByModelPath:&modelByModelPath];
+        if ([storeModDate compare:walModDate]==NSOrderedAscending) {
+          storeModDate=walModDate;
+        }
         
-        NSArray *items = [self compatibleProjectBrowserItemsWithMetadataByStorePath:metadataByStorePath modelByModelPath:modelByModelPath];
+        NSDate *modelModDate;
+        NSURL *modelURL=[NSURL fileURLWithPath:modelPath];
+        [modelURL getResourceValue:&modelModDate forKey:NSURLContentModificationDateKey error:&error];
         
-        double delayInSeconds = 1.0;
-        dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-        dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-            completionHandler(items);
-        });
-    });
-}
-
-- (NSArray *)compatibleProjectBrowserItemsWithMetadataByStorePath:(NSDictionary *)metadataByStorePath modelByModelPath:(NSDictionary*)modelByModelPath {
-    NSMutableArray *items = [NSMutableArray new];
-    NSMutableArray *itemsWithDates= [NSMutableArray new]; // Each element is dictionary with {modificationDate:, storePath:, modelPath}
-    
-    // Find compatible combinations
-    [modelByModelPath enumerateKeysAndObjectsUsingBlock:^(NSString *modelPath, NSManagedObjectModel *model, BOOL *stop) {
-        [metadataByStorePath enumerateKeysAndObjectsUsingBlock:^(NSString *storePath, NSDictionary *metadata, BOOL *stop) {
-            BOOL isCompatible = [model isConfiguration:nil compatibleWithStoreMetadata:metadata];
-            if(isCompatible) {
-                NSDate *storeModDate;
-                NSURL *storeURL=[NSURL fileURLWithPath:storePath];
-                NSError *error;
-                [storeURL getResourceValue:&storeModDate forKey:NSURLContentModificationDateKey error:&error];
-                
-                //Also look for: .sqlite-wal (write-ahead log).  Use most recent, although the wal should be most recent if found.
-                NSString *walPath=[NSString stringWithFormat:@"%@-wal",storeURL.absoluteString];
-                NSURL *walUrl=[NSURL URLWithString:walPath];
-                NSDate *walModDate;
-                [walUrl getResourceValue:&walModDate forKey:NSURLContentModificationDateKey error:&error];
-                
-                if ([storeModDate compare:walModDate]==NSOrderedAscending) {
-                    storeModDate=walModDate;
-                }
-                
-                NSDate *modelModDate;
-                NSURL *modelURL=[NSURL fileURLWithPath:modelPath];
-                [modelURL getResourceValue:&modelModDate forKey:NSURLContentModificationDateKey error:&error];
-                
-                //NSSortDescriptor doesn't do NSDate, so use a string. Both dates concatenated for nesting.
-                NSString *fileModDateString=[NSString stringWithFormat:@"%@ - %@",storeModDate,modelModDate];
-                
-                NSDictionary *itemWithDate=@{kCDEFileModificationDateKey: fileModDateString,
-                                             kCDEStorePathKey: storePath,
-                                             kCDEModelPathKey: modelPath};
-                
-                [itemsWithDates addObject:itemWithDate];
-            }
-        }];
+        //NSSortDescriptor doesn't do NSDate, so use a string. Both dates concatenated for nesting.
+        NSString *fileModDateString = [NSString stringWithFormat:@"%@ - %@",storeModDate, modelModDate];
+        
+        _ProjectBrowserItem *item = [[_ProjectBrowserItem alloc] initWithModificationDate:fileModDateString storePath:storePath modelPath:modelPath];
+        
+        [projectItems addObject:item];
+      }
     }];
-    //Now sort and display
-    NSSortDescriptor *descriptor = [[NSSortDescriptor alloc] initWithKey:kCDEFileModificationDateKey ascending:NO];
-    NSArray *itemsSorted=[itemsWithDates sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor,nil]];
-    
-    for (NSDictionary *itemWithDate in itemsSorted) {
-        NSString *storePath=itemWithDate[kCDEStorePathKey];
-        NSString *modelPath=itemWithDate[kCDEModelPathKey];
-        CDEProjectBrowserItem *item = [[CDEProjectBrowserItem alloc] initWithStorePath:storePath modelPath:modelPath];
-        [items addObject:item];
-    }
-
-    return items;
+  }];
+  //Now sort and display
+  NSSortDescriptor *descriptor = [[NSSortDescriptor alloc] initWithKey:kCDEFileModificationDateKey ascending:NO];
+  NSArray<_ProjectBrowserItem*> *itemsSorted = [projectItems sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor,nil]];
+  
+  for (_ProjectBrowserItem *item in itemsSorted) {
+    NSString *storePath = item.storePath;
+    NSString *modelPath = item.modelPath;
+    CDEProjectBrowserItem *item = [[CDEProjectBrowserItem alloc] initWithStorePath:storePath modelPath:modelPath];
+    [items addObject:item];
+  }
+  
+  return items;
 }
 
 - (NSDirectoryEnumerator *)newSimulatorDirectoryEnumerator {
-    NSFileManager *fileManager = [NSFileManager defaultManager]; // there is no reason not to use the defaultManager
-    NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtURL:self.projectDirectoryURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles errorHandler:^BOOL(NSURL *url, NSError *error) {
-        NSLog(@"error while enumerating contents of simulator directory: %@", error);
-        return YES;
-    }];
-    return enumerator;
+  NSFileManager *fileManager = [NSFileManager defaultManager]; // there is no reason not to use the defaultManager
+  NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtURL:self.projectDirectoryURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles errorHandler:^BOOL(NSURL *url, NSError *error) {
+    NSLog(@"error while enumerating contents of simulator directory: %@", error);
+    return YES;
+  }];
+  return enumerator;
 }
 
 - (IBAction)reloadProjectBrowser:(id)sender {
-    NSURL *simulatorURL = self.projectDirectoryURL;
-    if(simulatorURL == nil) {
-        NSLog(@"simulator url is nil");
-        [self displayDelayedNoSimulatorDirectoryAlert];
-        return;
-    }
-    
-    [self prepareUIForReload];
-    
-    [self performReloadWithCompletionHandler:^(NSArray *projectBrowserItems) {
-        [self.items setContent:projectBrowserItems];
-        [self.reloadButton setEnabled:YES];
-        [self.reloadProgressIndicator stopAnimation:self];
-    }];
+  NSURL *simulatorURL = self.projectDirectoryURL;
+  if(simulatorURL == nil) {
+    NSLog(@"simulator url is nil");
+    [self displayDelayedNoSimulatorDirectoryAlert];
+    return;
+  }
+  
+  [self prepareUIForReload];
+  
+  [self performReloadWithCompletionHandler:^(NSArray *projectBrowserItems) {
+    [self.items setContent:projectBrowserItems];
+    [self.reloadButton setEnabled:YES];
+    [self.reloadProgressIndicator stopAnimation:self];
+  }];
 }
 
 #pragma mark - Helper
 - (void)displayDelayedNoSimulatorDirectoryAlert {
-    double delayInSeconds = 2.0;
-    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-      NSAlert *alert = [NSAlert new];
-      alert.messageText = @"iPhone Simulator Directory not set";
-      alert.informativeText = @"The Project Browser has to know where the iPhone Simulator directory is. Please go to the preferences and specify your iPhone Simulator directory in the Integration tab.";
-      [alert addButtonWithTitle:@"Open Preferences…"];
-      [alert addButtonWithTitle:@"Close Project Browser"];
-      alert.alertStyle = NSInformationalAlertStyle;
-        [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
-          if(returnCode ==  NSAlertFirstButtonReturn) {
-            // show prefs.
-            [(CDEApplicationDelegate *)[NSApp delegate] showPreferences:self];
-          }
-          [self closeWindowSoon];
-        }];
-    });
+  double delayInSeconds = 2.0;
+  dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+  dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
+    NSAlert *alert = [NSAlert new];
+    alert.messageText = @"iPhone Simulator Directory not set";
+    alert.informativeText = @"The Project Browser has to know where the iPhone Simulator directory is. Please go to the preferences and specify your iPhone Simulator directory in the Integration tab.";
+    [alert addButtonWithTitle:@"Open Preferences…"];
+    [alert addButtonWithTitle:@"Close Project Browser"];
+    alert.alertStyle = NSAlertStyleInformational;
+    [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
+      if(returnCode ==  NSAlertFirstButtonReturn) {
+        // show prefs.
+        [(CDEApplicationDelegate *)[NSApp delegate] showPreferences:self];
+      }
+      [self closeWindowSoon];
+    }];
+  });
 }
 
 - (void)closeWindowSoon {
-    double delayInSeconds = 2.0;
-    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-        [self.window performClose:self];
-    });
+  double delayInSeconds = 2.0;
+  dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+  dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
+    [self.window performClose:self];
+  });
 }
 
 #pragma mark - NSWindowController
 - (instancetype)init {
-    self = [super initWithWindowNibName:@"CDEProjectBrowserWindowController" owner:self];
-    if(self) {
-        
-    }
-    return self;
+  self = [super initWithWindowNibName:@"CDEProjectBrowserWindowController" owner:self];
+  if(self) {
+    
+  }
+  return self;
 }
 
 - (void)windowDidLoad {
-    [super windowDidLoad];
+  [super windowDidLoad];
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.xib b/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.xib
index 18fe828..8c8cebd 100644
--- a/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEProjectBrowserWindowController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -29,7 +28,7 @@
                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="61" horizontalPageScroll="10" verticalLineScroll="61" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="5">
                         <rect key="frame" x="0.0" y="0.0" width="696" height="263"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" id="fHX-ut-dpM">
+                        <clipView key="contentView" id="Xp2-bP-Hxm">
                             <rect key="frame" x="0.0" y="0.0" width="696" height="263"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDERelationshipsViewController.m b/Core Data Editor/Core Data Editor/CDERelationshipsViewController.m
index ce4e8ce..c520e53 100644
--- a/Core Data Editor/Core Data Editor/CDERelationshipsViewController.m	
+++ b/Core Data Editor/Core Data Editor/CDERelationshipsViewController.m	
@@ -134,8 +134,8 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event {
     // '8' => code: 28 7
     // '9' => code: 25 8
     // '0' => code: 29 9
-    NSUInteger flags = [event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
-    if( flags == NSCommandKeyMask ){
+    NSUInteger flags = [event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask;
+    if( flags == NSEventModifierFlagCommand ){
         unsigned short keyCode = [event keyCode];
         
         NSDictionary *itemIndexesByKeyCode = @{ @18 : @0,
diff --git a/Core Data Editor/Core Data Editor/CDERelationshipsViewController.xib b/Core Data Editor/Core Data Editor/CDERelationshipsViewController.xib
index e361f53..415418d 100644
--- a/Core Data Editor/Core Data Editor/CDERelationshipsViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDERelationshipsViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +20,7 @@
                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3">
                     <rect key="frame" x="0.0" y="1" width="192" height="291"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <clipView key="contentView" id="1F6-xE-TUA">
+                    <clipView key="contentView" id="BXr-mi-Jp9">
                         <rect key="frame" x="0.0" y="0.0" width="192" height="291"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDESetupWindowController.m b/Core Data Editor/Core Data Editor/CDESetupWindowController.m
index 18c53ec..1e4ea9d 100644
--- a/Core Data Editor/Core Data Editor/CDESetupWindowController.m	
+++ b/Core Data Editor/Core Data Editor/CDESetupWindowController.m	
@@ -15,14 +15,11 @@ @implementation CDESetupWindowController
 
 - (instancetype)init {
     self = [super initWithWindowNibName:@"CDESetupWindowController" owner:self];
-    if(self) {
-    
-    }
+    if(self) { }
     return self;
 }
 
-- (void)windowDidLoad
-{
+- (void)windowDidLoad {
     [super windowDidLoad];
     
     self.simulatorPathPopupButton.otherItemSelectedHandler = ^(CDEPathPickerPopUpButton *sender) {
@@ -33,7 +30,6 @@ - (void)windowDidLoad
     };
 }
 
-
 - (IBAction)showSimulatorDirectoryPicker:(id)sender {
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     [panel setCanChooseDirectories:YES];
@@ -61,7 +57,6 @@ - (IBAction)showDerivdedDataPicker:(id)sender {
     }];
 }
 
-
 #pragma mark - Actions
 - (IBAction)beginSetupProcess:(id)sender {
     [self.tabView selectNextTabViewItem:sender];
diff --git a/Core Data Editor/Core Data Editor/CDESetupWindowController.xib b/Core Data Editor/Core Data Editor/CDESetupWindowController.xib
index a62d60f..532b952 100644
--- a/Core Data Editor/Core Data Editor/CDESetupWindowController.xib	
+++ b/Core Data Editor/Core Data Editor/CDESetupWindowController.xib	
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CDESetupWindowController">
@@ -30,7 +32,7 @@
                             <tabViewItem label="Welcome" identifier="1" id="18">
                                 <view key="view" id="19">
                                     <rect key="frame" x="10" y="7" width="616" height="311"/>
-                                    <autoresizingMask key="autoresizingMask"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" id="11">
                                             <rect key="frame" x="14" y="82" width="588" height="18"/>
@@ -120,7 +122,7 @@
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" id="37">
                                                 <font key="font" metaFont="smallSystem"/>
-                                                <string key="title">Please specify your iPhone Simulator directory. This directory is usually located in ~/Library/Developer/CoreSimulator/. Specifying your iPhone Simulator directory enables the project browser feature. The project browser automatically finds compatible SQLite stores and managed object models and let's you quickly create a Core Data Editor projects. You access the project browser from the "Window | Project Browser" menu item.</string>
+                                                <string key="title">Please specify your iPhone Simulator directory. This directory is usually located in ~/Library/Application Support/iPhone Simulator/. Specifying your iPhone Simulator directory enables the project browser feature. The project browser automatically finds compatible SQLite stores and managed object models and let's you quickly create a Core Data Editor projects. You access the project browser from the "Window | Project Browser" menu item.</string>
                                                 <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -147,12 +149,9 @@
                                                 <action selector="selectPreviousTabViewItem:" target="17" id="96"/>
                                             </connections>
                                         </button>
-                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="87">
+                                        <box verticalHuggingPriority="750" boxType="separator" id="87">
                                             <rect key="frame" x="14" y="235" width="588" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                            <font key="titleFont" metaFont="system"/>
                                         </box>
                                         <imageView id="92">
                                             <rect key="frame" x="69" y="86" width="142" height="110"/>
@@ -165,7 +164,7 @@
                             <tabViewItem label="Derived Data" identifier="" id="22">
                                 <view key="view" id="23">
                                     <rect key="frame" x="10" y="7" width="616" height="311"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <imageView id="48">
                                             <rect key="frame" x="14" y="246" width="50" height="50"/>
@@ -231,12 +230,9 @@
                                                 <action selector="selectPreviousTabViewItem:" target="17" id="97"/>
                                             </connections>
                                         </button>
-                                        <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="88">
+                                        <box verticalHuggingPriority="750" boxType="separator" id="88">
                                             <rect key="frame" x="14" y="235" width="588" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                            <font key="titleFont" metaFont="system"/>
                                         </box>
                                     </subviews>
                                 </view>
diff --git a/Core Data Editor/Core Data Editor/CDEStringAttributeView.xib b/Core Data Editor/Core Data Editor/CDEStringAttributeView.xib
index 58435d8..29fd0b9 100644
--- a/Core Data Editor/Core Data Editor/CDEStringAttributeView.xib	
+++ b/Core Data Editor/Core Data Editor/CDEStringAttributeView.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/Core Data Editor/Core Data Editor/CDETextEditorViewController.xib b/Core Data Editor/Core Data Editor/CDETextEditorViewController.xib
index 132c2b0..11ec12b 100644
--- a/Core Data Editor/Core Data Editor/CDETextEditorViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDETextEditorViewController.xib	
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +20,7 @@
                 <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="3">
                     <rect key="frame" x="20" y="46" width="538" height="279"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <clipView key="contentView" copiesOnScroll="NO" id="QvB-Jg-asz">
+                    <clipView key="contentView" copiesOnScroll="NO" id="0OV-1i-sqJ">
                         <rect key="frame" x="1" y="1" width="536" height="277"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
diff --git a/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.m b/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.m
index 97364fb..4526a81 100644
--- a/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.m	
+++ b/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.m	
@@ -3,19 +3,19 @@
 #import "NSError+CDEValidation.h"
 
 @interface NSManagedObjectContext (CDEValidationErrorsViewController)
-@property (nonatomic, readonly) NSSet *changedObjects_cde;
+@property (nonatomic, readonly) NSSet<NSManagedObject*> *changedObjects_cde;
 @property (nonatomic, readonly) NSDictionary *validationErrorsByManagedObjectURI_cde;
 
 @end
 @implementation NSManagedObjectContext (CDEValidationErrorsViewController)
-- (NSSet *)changedObjects_cde {
+- (NSSet<NSManagedObject*> *)changedObjects_cde {
     NSMutableSet *result = [NSMutableSet new];
     [result unionSet:self.insertedObjects];
     [result unionSet:self.updatedObjects];
     [result unionSet:self.deletedObjects];
     return result;
 }
-- (NSDictionary *)validationErrorsByManagedObjectURI_cde {
+- (NSDictionary<NSURL*, NSArray<NSError*>*> *)validationErrorsByManagedObjectURI_cde {
     NSMutableDictionary *result = [NSMutableDictionary new];
     NSSet *changedObjects = self.changedObjects_cde;
     for(NSManagedObject *object in changedObjects) {
@@ -27,7 +27,7 @@ - (NSDictionary *)validationErrorsByManagedObjectURI_cde {
     }
     return result;
 }
-- (NSArray *)validationErrorsByManagedObjectURIInArray_cde {
+- (NSArray<NSDictionary*> *)validationErrorsByManagedObjectURIInArray_cde {
     NSMutableArray *result = [NSMutableArray new];
     
     NSDictionary *validationErrorsByManagedObjectURI = [self validationErrorsByManagedObjectURI_cde];
@@ -93,7 +93,6 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 - (void)loadView {
     [super loadView];
     self.tableView.floatsGroupRows = NO;
-  //self.view.allowsVibrancy = YES;
 }
 
 #pragma mark - Private
diff --git a/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.xib b/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.xib
index 41f022b..48e7e63 100644
--- a/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.xib	
+++ b/Core Data Editor/Core Data Editor/CDEValidationErrorsViewController.xib	
@@ -33,7 +33,7 @@
                                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3">
                                         <rect key="frame" x="0.0" y="0.0" width="250" height="450"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="kJF-AI-wpc">
+                                        <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="6LW-vM-IXi">
                                             <rect key="frame" x="0.0" y="0.0" width="250" height="450"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
@@ -140,7 +140,7 @@
                                     <box autoresizesSubviews="NO" boxType="custom" borderType="none" title="Box" titlePosition="noTitle" id="57">
                                         <rect key="frame" x="0.0" y="0.0" width="250" height="450"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <view key="contentView" id="d8w-Ul-yLJ">
+                                        <view key="contentView" id="owr-QC-3KY">
                                             <rect key="frame" x="0.0" y="0.0" width="250" height="450"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
diff --git a/Core Data Editor/Core Data Editor/Core Data Editor-Info.plist b/Core Data Editor/Core Data Editor/Core Data Editor-Info.plist
index c10791b..0f8dff1 100644
--- a/Core Data Editor/Core Data Editor/Core Data Editor-Info.plist	
+++ b/Core Data Editor/Core Data Editor/Core Data Editor-Info.plist	
@@ -155,8 +155,8 @@
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 Christian Kienle. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/Core Data Editor/Core Data Editor/Main.storyboard b/Core Data Editor/Core Data Editor/Main.storyboard
new file mode 100644
index 0000000..f62a9c5
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/Main.storyboard	
@@ -0,0 +1,675 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+    </dependencies>
+    <scenes>
+        <!--Application-->
+        <scene sceneID="JPo-4y-FX3">
+            <objects>
+                <application id="hnw-xV-0zn" sceneMemberID="viewController">
+                    <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+                        <items>
+                            <menuItem title="Core Data Editor" id="1Xt-HY-uBw">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Core Data Editor" systemMenu="apple" id="uQy-DD-JDr">
+                                    <items>
+                                        <menuItem title="About Core Data Editor" id="5kV-Vb-QxS">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                                        <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
+                                            <connections>
+                                                <segue destination="HUm-cZ-0HY" kind="show" identifier="cde.showPreferences" id="RKI-WO-V4p"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
+                                        <menuItem title="Services" id="NMo-om-nkz">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
+                                        <menuItem title="Hide Core Data Editor" keyEquivalent="h" id="Olw-nP-bQN">
+                                            <connections>
+                                                <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Show All" id="Kd2-mp-pUS">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
+                                        <menuItem title="Quit Core Data Editor" keyEquivalent="q" id="4sb-4s-VLi">
+                                            <connections>
+                                                <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="File" id="dMs-cI-mzQ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="File" id="bib-Uj-vzu">
+                                    <items>
+                                        <menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
+                                            <connections>
+                                                <action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
+                                            <connections>
+                                                <action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Open Recent" id="tXI-mr-wws">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
+                                                <items>
+                                                    <menuItem title="Clear Menu" id="vNY-rz-j42">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
+                                        <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
+                                            <connections>
+                                                <action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
+                                            <connections>
+                                                <action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
+                                            <connections>
+                                                <action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
+                                            <connections>
+                                                <action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
+                                        <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
+                                            <connections>
+                                                <action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Edit" id="5QF-Oa-p0T">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Edit" id="W48-6f-4Dl">
+                                    <items>
+                                        <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
+                                            <connections>
+                                                <action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
+                                            <connections>
+                                                <action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
+                                        <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
+                                            <connections>
+                                                <action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
+                                            <connections>
+                                                <action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
+                                            <connections>
+                                                <action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Delete" id="pa3-QI-u2k">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
+                                            <connections>
+                                                <action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
+                                        <menuItem title="Find" id="4EN-yA-p0u">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Find" id="1b7-l0-nxx">
+                                                <items>
+                                                    <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
+                                                        <connections>
+                                                            <action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
+                                                <items>
+                                                    <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
+                                                        <connections>
+                                                            <action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
+                                                        <connections>
+                                                            <action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
+                                                    <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Substitutions" id="9ic-FL-obx">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
+                                                <items>
+                                                    <menuItem title="Show Substitutions" id="z6F-FW-3nz">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
+                                                    <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Quotes" id="hQb-2v-fYv">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Dashes" id="rgM-f4-ycn">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Links" id="cwL-P1-jid">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Data Detectors" id="tRr-pd-1PS">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Text Replacement" id="HFQ-gK-NFA">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Transformations" id="2oI-Rn-ZJC">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
+                                                <items>
+                                                    <menuItem title="Make Upper Case" id="vmV-6d-7jI">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Make Lower Case" id="d9M-CD-aMd">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Capitalize" id="UEZ-Bs-lqG">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Speech" id="xrE-MZ-jX0">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
+                                                <items>
+                                                    <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Format" id="jxT-CU-nIS">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Format" id="GEO-Iw-cKr">
+                                    <items>
+                                        <menuItem title="Font" id="Gi5-1S-RQB">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
+                                                <items>
+                                                    <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq"/>
+                                                    <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27"/>
+                                                    <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq"/>
+                                                    <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
+                                                        <connections>
+                                                            <action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
+                                                    <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL"/>
+                                                    <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST"/>
+                                                    <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
+                                                    <menuItem title="Kern" id="jBQ-r6-VK2">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menu key="submenu" title="Kern" id="tlD-Oa-oAM">
+                                                            <items>
+                                                                <menuItem title="Use Default" id="GUa-eO-cwY">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Use None" id="cDB-IK-hbR">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Tighten" id="46P-cB-AYj">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Loosen" id="ogc-rX-tC1">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                            </items>
+                                                        </menu>
+                                                    </menuItem>
+                                                    <menuItem title="Ligatures" id="o6e-r0-MWq">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
+                                                            <items>
+                                                                <menuItem title="Use Default" id="agt-UL-0e3">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Use None" id="J7y-lM-qPV">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Use All" id="xQD-1f-W4t">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                            </items>
+                                                        </menu>
+                                                    </menuItem>
+                                                    <menuItem title="Baseline" id="OaQ-X3-Vso">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menu key="submenu" title="Baseline" id="ijk-EB-dga">
+                                                            <items>
+                                                                <menuItem title="Use Default" id="3Om-Ey-2VK">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Superscript" id="Rqc-34-cIF">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Subscript" id="I0S-gh-46l">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Raise" id="2h7-ER-AoG">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="Lower" id="1tx-W0-xDw">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                            </items>
+                                                        </menu>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
+                                                    <menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
+                                                        <connections>
+                                                            <action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
+                                                    <menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Text" id="Fal-I4-PZk">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Text" id="d9c-me-L2H">
+                                                <items>
+                                                    <menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
+                                                        <connections>
+                                                            <action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
+                                                        <connections>
+                                                            <action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Justify" id="J5U-5w-g23">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
+                                                        <connections>
+                                                            <action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
+                                                    <menuItem title="Writing Direction" id="H1b-Si-o9J">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
+                                                            <items>
+                                                                <menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                </menuItem>
+                                                                <menuItem id="YGs-j5-SAR">
+                                                                    <string key="title">	Default</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem id="Lbh-J2-qVU">
+                                                                    <string key="title">	Left to Right</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem id="jFq-tB-4Kx">
+                                                                    <string key="title">	Right to Left</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
+                                                                <menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                </menuItem>
+                                                                <menuItem id="Nop-cj-93Q">
+                                                                    <string key="title">	Default</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem id="BgM-ve-c93">
+                                                                    <string key="title">	Left to Right</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem id="RB4-Sm-HuC">
+                                                                    <string key="title">	Right to Left</string>
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                            </items>
+                                                        </menu>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
+                                                    <menuItem title="Show Ruler" id="vLm-3I-IUL">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="View" id="H8h-7b-M4v">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="View" id="HyV-fh-RgO">
+                                    <items>
+                                        <menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
+                                        <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Window" id="aUF-d1-5bR">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
+                                    <items>
+                                        <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
+                                            <connections>
+                                                <action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Zoom" id="R4o-n2-Eq4">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
+                                        <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Help" id="wpr-3q-Mcd">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
+                                    <items>
+                                        <menuItem title="Core Data Editor Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                            <connections>
+                                                <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                    <connections>
+                        <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
+                    </connections>
+                </application>
+                <customObject id="Voe-Tx-rLC" customClass="CDEApplicationDelegate"/>
+                <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-44" y="-267"/>
+        </scene>
+        <!--Preferences-->
+        <scene sceneID="xoh-8e-PrZ">
+            <objects>
+                <controllerPlaceholder storyboardName="Preferences" id="HUm-cZ-0HY" sceneMemberID="viewController"/>
+                <customObject id="ts3-dV-K5a" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="38" y="686"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.h b/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.h
index bb9e434..952686d 100644
--- a/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.h	
+++ b/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.h	
@@ -2,7 +2,7 @@
 
 @interface NSDirectoryEnumerator (ProjectBrowser)
 
-- (void)getMetadataByStorePath:(NSDictionary **)metadataByStorePath modelByModelPath:(NSDictionary **)modelByModelPath;
+- (void)getMetadataByStorePath:(NSDictionary<NSString*, NSDictionary*> **)metadataByStorePath modelByModelPath:(NSDictionary<NSString*, NSManagedObjectModel*> **)modelByModelPath;
 
 @end
 
diff --git a/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.m b/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.m
index 09bd22b..373aadd 100644
--- a/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.m	
+++ b/Core Data Editor/Core Data Editor/NSDirectoryEnumerator+ProjectBrowser.m	
@@ -3,104 +3,104 @@
 
 @implementation NSURL (ProjectBrowser)
 
-- (NSManagedObjectModel *)transformedManagedObjectModel {
-    BOOL isModel = [self isCompiledManagedObjectModelFile_cde];
-    if(isModel == NO) {
-        return nil;
+- (nullable NSManagedObjectModel *)transformedManagedObjectModel {
+  BOOL isModel = [self isCompiledManagedObjectModelFile_cde];
+  if(isModel == NO) {
+    return nil;
+  }
+  
+  // try-catch because it is very well possible that a file seems to be a managed object model
+  // but it isn't or something else goes wrong when we initialize an NSManagedObjectModel with
+  // (unknown) contents of a file.
+  NSManagedObjectModel *transformedModel;
+  @try {
+    NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:self];
+    if(model == nil) {
+      return nil;
     }
-    
-    // try-catch because it is very well possible that a file seems to be a managed object model
-    // but it isn't or something else goes wrong when we initialize an NSManagedObjectModel with
-    // (unknown) contents of a file.
-    NSManagedObjectModel *transformedModel;
-    @try {
-        NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:self];
-        if(model == nil) {
-            return nil;
-        }
-        transformedModel = model.transformedManagedObjectModel_cde;
-        if(transformedModel == nil) {
-            return nil;
-        }
-    }
-    @catch (NSException *exception) {
-        
+    transformedModel = model.transformedManagedObjectModel_cde;
+    if(transformedModel == nil) {
+      return nil;
     }
-    @finally {
-        
-    }
-    return transformedModel;
+  }
+  @catch (NSException *exception) {
+    
+  }
+  @finally {
+    
+  }
+  return transformedModel;
 }
 
-- (NSDictionary *)persistentStoreMetadata {
-    BOOL isData = [self isPublicDataFile_cde];
-    if(isData == NO) {
-        return nil;
-    }
+- (nullable NSDictionary<NSString *, id> *)persistentStoreMetadata {
+  BOOL isData = [self isPublicDataFile_cde];
+  if(isData == NO) {
+    return nil;
+  }
+  
+  if([self isSQLiteURL_cde] == NO) {
+    return nil;
+  }
+  if([self isSQLiteStoreURL_cde] == NO) {
+    return nil;
+  }
+  NSDictionary *metadata;
+  @try {
+    NSError *error;
+    // +metadataForPersistentStoreOfType:URL:error: fails if we have a SQLite file but it is not a Core Data SQLite file...
+    metadata = [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:NSSQLiteStoreType URL:self options:nil error:&error];
     
-    if([self isSQLiteURL_cde] == NO) {
-        return nil;
-    }
-    if([self isSQLiteStoreURL_cde] == NO) {
-        return nil;
+    if(metadata == nil) {
+      return nil;
     }
-    NSDictionary *metadata;
-    @try {
-        NSError *error;
-        // +metadataForPersistentStoreOfType:URL:error: fails if we have a SQLite file but it is not a Core Data SQLite file...
-      
-      metadata = [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:NSSQLiteStoreType URL:self options:nil error:&error];
-        if(metadata == nil) {
-            return nil;
-        }
-    }
-    @catch (NSException *exception) {
-        
-    }
-    @finally {
-        
-    }
-    return metadata;
+  }
+  @catch (NSException *exception) {
+    
+  }
+  @finally {
+    
+  }
+  return metadata;
 }
 
 @end
 
 @implementation NSDirectoryEnumerator (ProjectBrowser)
 
-- (void)getMetadataByStorePath:(NSDictionary **)outMetadataByStorePath modelByModelPath:(NSDictionary **)outModelByModelPath {
-    NSMutableDictionary *metadataByStorePath = [NSMutableDictionary new];
-    NSMutableDictionary *modelByModelPath = [NSMutableDictionary new];
+- (void)getMetadataByStorePath:(NSDictionary<NSString*, NSDictionary*> **)outMetadataByStorePath modelByModelPath:(NSDictionary<NSString*, NSManagedObjectModel*> **)outModelByModelPath {
+  NSMutableDictionary *metadataByStorePath = [NSMutableDictionary new];
+  NSMutableDictionary *modelByModelPath = [NSMutableDictionary new];
+  
+  for(NSURL *URL in self) {
+    // Is URL a managed object model file?
+    NSManagedObjectModel *model = [URL transformedManagedObjectModel];
+    if(model != nil) { // YES
+      modelByModelPath[URL.path] = model;
+      continue;
+    }
     
-    for(NSURL *URL in self) {
-        // Is URL a managed object model file?
-        NSManagedObjectModel *model = [URL transformedManagedObjectModel];
-        if(model != nil) { // YES
-            modelByModelPath[URL.path] = model;
-            continue;
-        }
-                
-        BOOL isData = [URL isPublicDataFile_cde];
-        if(isData == NO) {
-            continue;
-        }
-        
-        if([URL isSQLiteURL_cde] == NO) {
-            continue;
-        }
-        
-        NSDictionary *metadata = [URL persistentStoreMetadata];
-        if(metadata == nil) {
-            continue;
-        }
-        metadataByStorePath[URL.path] = metadata;
+    BOOL isData = [URL isPublicDataFile_cde];
+    if(isData == NO) {
+      continue;
     }
     
-    if(outMetadataByStorePath != NULL) {
-        *outMetadataByStorePath = metadataByStorePath;
+    if([URL isSQLiteURL_cde] == NO) {
+      continue;
     }
-    if(outModelByModelPath != NULL) {
-        *outModelByModelPath = modelByModelPath;
+    
+    NSDictionary *metadata = [URL persistentStoreMetadata];
+    if(metadata == nil) {
+      continue;
     }
+    metadataByStorePath[URL.path] = metadata;
+  }
+  
+  if(outMetadataByStorePath != NULL) {
+    *outMetadataByStorePath = metadataByStorePath;
+  }
+  if(outModelByModelPath != NULL) {
+    *outModelByModelPath = modelByModelPath;
+  }
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.h b/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.h
index 5db5b7e..bffaf6b 100644
--- a/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.h	
+++ b/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.h	
@@ -3,16 +3,16 @@
 @interface NSEntityDescription (CDEAdditions)
 
 #pragma mark - Convenience
-- (NSArray *)supportedAttributes_cde;
-- (NSArray *)sortedToOneRelationships_cde;
-- (NSArray *)sortedRelationships_cde;
+- (NSArray<NSAttributeDescription*> *)supportedAttributes_cde;
+- (NSArray<NSRelationshipDescription*> *)sortedToOneRelationships_cde;
+- (NSArray<NSRelationshipDescription*> *)sortedRelationships_cde;
 @property (nonatomic, readonly) NSString *nameForDisplay_cde;
 
 #pragma mark - CSV
 
 // This method filters out any non supported property names and also respects the sorting of propertyNames
-- (NSArray *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues;
-- (NSArray *)supportedCSVAttributes_cde;
+- (NSArray<NSArray<NSString*>*> *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues;
+- (NSArray<NSAttributeDescription*> *)supportedCSVAttributes_cde;
 
 #pragma mark - UI
 - (NSImage *)icon_cde;
diff --git a/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.m b/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.m
index 8566d50..08a3119 100644
--- a/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSEntityDescription+CDEAdditions.m	
@@ -3,7 +3,7 @@
 @implementation NSEntityDescription (CDEAdditions)
 
 #pragma mark - Convenience
-- (NSArray *)supportedAttributes_cde {
+- (NSArray<NSAttributeDescription*> *)supportedAttributes_cde {
     NSMutableArray *result = [NSMutableArray new];
     for(NSAttributeDescription *attribute in [[self attributesByName] allValues]) {
         // Ignore transient properties
@@ -20,7 +20,7 @@ - (NSArray *)supportedAttributes_cde {
 }
 
 
-- (NSArray *)sortedToOneRelationships_cde {
+- (NSArray<NSRelationshipDescription*> *)sortedToOneRelationships_cde {
     NSMutableArray *result = [NSMutableArray new];
     [self.relationshipsByName enumerateKeysAndObjectsUsingBlock:^(id key, NSRelationshipDescription *relation, BOOL *stop) {
         if(relation.isToMany) {
@@ -33,7 +33,7 @@ - (NSArray *)sortedToOneRelationships_cde {
     }];
 }
 
-- (NSArray *)sortedRelationships_cde {
+- (NSArray<NSRelationshipDescription*> *)sortedRelationships_cde {
     return [self.relationshipsByName.allValues sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(NSRelationshipDescription *relationA, NSRelationshipDescription *relationB) {
         return [relationA.name localizedStandardCompare:relationB.name];
     }];
@@ -46,7 +46,7 @@ - (NSString *)nameForDisplay_cde {
 #pragma mark - CSV
 
 // This method filters out any non supported property names and also respects the sorting of propertyNames
-- (NSArray *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues {
+- (NSArray<NSArray<NSString*>*> *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forPropertyNames:(NSArray *)propertyNames includeHeaderValues_cde:(BOOL)includeHeaderValues {
     NSParameterAssert(objects);
     NSParameterAssert(propertyNames);
 
@@ -81,7 +81,7 @@ - (NSArray *)CSVValuesForEachManagedObjectInArray:(NSArray *)objects forProperty
     return result;
 }
 
-- (NSArray *)supportedCSVAttributes_cde {
+- (NSArray<NSAttributeDescription*> *)supportedCSVAttributes_cde {
     NSMutableArray *result = [NSMutableArray new];
     for(NSAttributeDescription *attribute in self.supportedAttributes_cde) {
         if(attribute.isSupportedCSVAttribute_cde) {
diff --git a/Core Data Editor/Core Data Editor/NSError+CDEValidation.h b/Core Data Editor/Core Data Editor/NSError+CDEValidation.h
index 1502acc..1929d29 100644
--- a/Core Data Editor/Core Data Editor/NSError+CDEValidation.h	
+++ b/Core Data Editor/Core Data Editor/NSError+CDEValidation.h	
@@ -7,7 +7,7 @@
 @property (nonatomic, readonly) NSAttributeDescription *invalidAttribute_cde;
 @property (nonatomic, readonly) NSManagedObject *invalidManagedObject_cde;
 @property (nonatomic, readonly) NSEntityDescription *entityDescription_cde;
-@property (nonatomic, readonly) NSArray *detailedErrors_cde;
+@property (nonatomic, readonly) NSArray<NSError*> *detailedErrors_cde;
 @property (nonatomic, readonly) BOOL containsDetailedErrors_cde;
 
 @end
diff --git a/Core Data Editor/Core Data Editor/NSError+CDEValidation.m b/Core Data Editor/Core Data Editor/NSError+CDEValidation.m
index f90f87d..fe1c150 100644
--- a/Core Data Editor/Core Data Editor/NSError+CDEValidation.m	
+++ b/Core Data Editor/Core Data Editor/NSError+CDEValidation.m	
@@ -62,7 +62,7 @@ - (NSManagedObject *)invalidManagedObject_cde {
 - (NSEntityDescription *)entityDescription_cde {
     return self.invalidManagedObject_cde.entity;
 }
-- (NSArray *)detailedErrors_cde {
+- (NSArray<NSError*> *)detailedErrors_cde {
     if(self.code != NSValidationMultipleErrorsError) {
         return @[];
     }
diff --git a/Core Data Editor/Core Data Editor/NSError-CDEAdditions.m b/Core Data Editor/Core Data Editor/NSError-CDEAdditions.m
index 3d2a7a4..28b052c 100644
--- a/Core Data Editor/Core Data Editor/NSError-CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSError-CDEAdditions.m	
@@ -1,7 +1,6 @@
 #import "NSError-CDEAdditions.h"
 
 @implementation NSError (CDEAdditions)
-//NSLocalizedRecoverySuggestionErrorKey = body, description = title
 #pragma mark Creating
 + (id)newErrorWithCode:(NSInteger)code localizedDescription:(NSString *)localizedDescription localizedRecoverySuggestion_cde:(NSString *)localizedRecoverySuggestion {
     NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
diff --git a/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.h b/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.h
index 4b8a9a8..ea35fba 100644
--- a/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.h	
+++ b/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.h	
@@ -2,14 +2,14 @@
 
 @interface NSManagedObject (CDEAdditions)
 
-@property (nonatomic, readonly) NSArray *validationErrors_cde;
+@property (nonatomic, readonly) NSArray<NSError*> *validationErrors_cde;
 
 #pragma mark - CSV
 // Special Consideration: attributeNames can contain @"objectID" although this is not an official attribute.
 //                        If it does then each objectID value is retrieved and added to the resulting array
 //                        as if it were a normal attribute.
 // This method does not do any further checks regarding attributeNames.
-- (NSArray *)CSVValuesForAttributeNames_cde:(NSArray *)attributeNames;
+- (NSArray<NSString*> *)CSVValuesForAttributeNames_cde:(NSArray<NSString*> *)attributeNames;
 
 #pragma mark - Creating
 + (instancetype)newManagedObjectWithEntity:(NSEntityDescription *)entity insertIntoManagedObjectContext:(NSManagedObjectContext *)context makeInsertedObjectValid_cde:(BOOL)makeInsertedObjectValid;
diff --git a/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.m b/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.m
index cffb801..6a51639 100644
--- a/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSManagedObject+CDEAdditions.m	
@@ -5,7 +5,7 @@
 
 @implementation NSManagedObject (CDEAdditions)
 
-- (NSArray *)validationErrors_cde {
+- (NSArray<NSError*> *)validationErrors_cde {
     BOOL isValid = YES;
     NSError *error = nil;
     if(self.isInserted) {
@@ -30,8 +30,8 @@ - (NSArray *)validationErrors_cde {
 }
 
 #pragma mark - CSV
-- (NSArray *)CSVValuesForAttributeNames_cde:(NSArray *)attributeNames {
-    NSMutableArray *result = [NSMutableArray new];
+- (NSArray<NSString*> *)CSVValuesForAttributeNames_cde:(NSArray<NSString*> *)attributeNames {
+    NSMutableArray<NSString*> *result = [NSMutableArray new];
     for(NSString *attributeName  in attributeNames) {
         id value = [self valueForKey:attributeName];
         if(value == nil) {
diff --git a/Core Data Editor/Core Data Editor/NSManagedObjectModel-CDEAdditions.m b/Core Data Editor/Core Data Editor/NSManagedObjectModel-CDEAdditions.m
index 5411d90..1d7cd86 100644
--- a/Core Data Editor/Core Data Editor/NSManagedObjectModel-CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSManagedObjectModel-CDEAdditions.m	
@@ -12,31 +12,31 @@ @implementation CDEBinaryDataValueTransformer
 
 #pragma mark - Getting the Name
 + (NSString *)valueTransformerName {
-    return @"CDEBinaryDataValueTransformer";
+  return @"CDEBinaryDataValueTransformer";
 }
 
 #pragma mark - NSObject
 + (void)initialize {
-    if(self == [CDEBinaryDataValueTransformer class]) {
-        [NSValueTransformer setValueTransformer:[CDEBinaryDataValueTransformer new] forName:@"CDEBinaryDataValueTransformer"];
-    }
+  if(self == [CDEBinaryDataValueTransformer class]) {
+    [NSValueTransformer setValueTransformer:[CDEBinaryDataValueTransformer new] forName:@"CDEBinaryDataValueTransformer"];
+  }
 }
 
 #pragma mark - NSValueTransformer
 + (BOOL)allowsReverseTransformation {
-	return YES;
+  return YES;
 }
 
 + (Class)transformedValueClass {
-	return [NSData class];
+  return [NSData class];
 }
 
 - (id)transformedValue:(id)value {
-    return [NSData dataWithData:value];
+  return [NSData dataWithData:value];
 }
 
 - (id)reverseTransformedValue:(id)value {
-    return [NSData dataWithData:value];
+  return [NSData dataWithData:value];
 }
 
 @end
@@ -45,100 +45,101 @@ @implementation NSManagedObjectModel (CDEAdditions)
 
 #pragma mark - Creating
 + (BOOL)canInitWithContentsOfURL:(NSURL *)URL error_cde:(NSError **)error {
-    if(URL == nil) {
-        NSLog(@"WARNING: Called '%@' with a nil URL.", NSStringFromSelector(_cmd));
-        return NO;
-    }
-
-    @try {
-        NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:URL];
-        if(model != nil) {
-            // More Analysis: Find relations with no inverse
-            for(NSEntityDescription *entity in model) {
-                for(NSRelationshipDescription *relation in [[entity relationshipsByName] allValues]) {
-                    if(relation.inverseRelationship == nil) {
-                        if(error != NULL) {
-                            NSString *description = [NSString stringWithFormat:@"The model %@ cannot be handled", URL.lastPathComponent];
-                            NSString *reason = [NSString stringWithFormat:@"Your model has at least one relationship (%@) without an inverse. This is not supported.", relation.name];
-                            *error = [NSError newErrorWithCode:-1 localizedDescription:description localizedRecoverySuggestion_cde:reason];
-                        }
-
-                        return NO;
-                    }
-                }
+  if(URL == nil) {
+    NSLog(@"WARNING: Called '%@' with a nil URL.", NSStringFromSelector(_cmd));
+    return NO;
+  }
+  
+  @try {
+    NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:URL];
+    if(model != nil) {
+      // More Analysis: Find relations with no inverse
+      for(NSEntityDescription *entity in model) {
+        for(NSRelationshipDescription *relation in [[entity relationshipsByName] allValues]) {
+          if(relation.inverseRelationship == nil) {
+            if(error != NULL) {
+              NSString *description = [NSString stringWithFormat:@"The model %@ cannot be handled", URL.lastPathComponent];
+              NSString *reason = [NSString stringWithFormat:@"Your model has at least one relationship (%@) without an inverse. This is not supported.", relation.name];
+              *error = [NSError newErrorWithCode:-1 localizedDescription:description localizedRecoverySuggestion_cde:reason];
             }
-            return YES;
+            
+            return NO;
+          }
         }
+      }
+      return YES;
     }
-    @catch (NSException *exception) {
-        if(error != NULL) {
-            NSString *description = [NSString stringWithFormat:@"The model %@ cannot be handled", URL.lastPathComponent];
-            NSString *reason = [NSString stringWithFormat:@"Opening the model raised an exception: %@", exception.name];
-            *error = [NSError newErrorWithCode:-1 localizedDescription:description localizedRecoverySuggestion_cde:reason];
-        }
-        return NO;
+  }
+  @catch (NSException *exception) {
+    if(error != NULL) {
+      NSString *description = [NSString stringWithFormat:@"The model %@ cannot be handled", URL.lastPathComponent];
+      NSString *reason = [NSString stringWithFormat:@"Opening the model raised an exception: %@", exception.name];
+      *error = [NSError newErrorWithCode:-1 localizedDescription:description localizedRecoverySuggestion_cde:reason];
     }
-
     return NO;
+  }
+  
+  return NO;
 }
 
 #pragma mark - Transforming
 - (NSManagedObjectModel *)transformedManagedObjectModel_cde {
-    NSData *originalModelData = [NSKeyedArchiver archivedDataWithRootObject:self];
-    NSManagedObjectModel *transformedModel = [NSKeyedUnarchiver unarchiveObjectWithData:originalModelData];
-
-    // Remove custom Value Transformers
-    for(NSEntityDescription *entityDescription in transformedModel) {
-        NSArray *attributes = [[entityDescription attributesByName] allValues];
-        for(NSAttributeDescription *attributeDescription in attributes) {
-            if(attributeDescription.attributeType != NSTransformableAttributeType) {
-                continue;
-            }
-            NSString *transformerName = attributeDescription.valueTransformerName;
-            if([[NSValueTransformer valueTransformerNames] containsObject:transformerName] == YES) {
-                continue;
-            }
-            attributeDescription.valueTransformerName = [CDEBinaryDataValueTransformer valueTransformerName];
-        }
-    }
-
-    NSMutableDictionary *localizationDictionary = [NSMutableDictionary dictionary];
-    for(NSEntityDescription *entityDescription in transformedModel) {
-        NSDictionary *propertiesByName = entityDescription.propertiesByName;
-        [propertiesByName enumerateKeysAndObjectsUsingBlock:^(NSString *propertyName, NSPropertyDescription *propertyDescription, BOOL *stop) {
-            NSString *name = propertyName;
-            NSString *entityName = entityDescription.name;
-            NSString *localizedEntryKey = [NSString stringWithFormat:@"//Property/%@/Entity/%@", name, entityName];
-            NSString *localizedEntryValue = name;
-            if(localizedEntryKey != nil) {
-                localizationDictionary[localizedEntryKey] = localizedEntryValue;
-            }
-        }];
+  NSData *originalModelData = [NSKeyedArchiver archivedDataWithRootObject:self];
+  NSManagedObjectModel *transformedModel = [NSKeyedUnarchiver unarchiveObjectWithData:originalModelData];
+  
+  // Remove custom Value Transformers
+  for(NSEntityDescription *entityDescription in transformedModel) {
+    NSArray *attributes = [[entityDescription attributesByName] allValues];
+    for(NSAttributeDescription *attributeDescription in attributes) {
+      if(attributeDescription.attributeType != NSTransformableAttributeType) {
+        continue;
+      }
+      NSString *transformerName = attributeDescription.valueTransformerName;
+      if([[NSValueTransformer valueTransformerNames] containsObject:transformerName] == YES) {
+        continue;
+      }
+      attributeDescription.valueTransformerName = [CDEBinaryDataValueTransformer valueTransformerName];
     }
-    transformedModel.localizationDictionary = localizationDictionary;
-    return transformedModel;
+  }
+  
+  NSMutableDictionary *localizationDictionary = [NSMutableDictionary dictionary];
+  for(NSEntityDescription *entityDescription in transformedModel) {
+    NSDictionary *propertiesByName = entityDescription.propertiesByName;
+    [propertiesByName enumerateKeysAndObjectsUsingBlock:^(NSString *propertyName, NSPropertyDescription *propertyDescription, BOOL *stop) {
+      NSString *name = propertyName;
+      NSString *entityName = entityDescription.name;
+      NSString *localizedEntryKey = [NSString stringWithFormat:@"//Property/%@/Entity/%@", name, entityName];
+      NSString *localizedEntryValue = name;
+      if(localizedEntryKey != nil) {
+        localizationDictionary[localizedEntryKey] = localizedEntryValue;
+      }
+    }];
+  }
+  transformedModel.localizationDictionary = localizationDictionary;
+  return transformedModel;
 }
 
 #pragma mark - Compatibility
 - (BOOL)isCompatibleWithStoreAtURL:(NSURL *)URL error_cde:(NSError **)error {
-    NSParameterAssert(URL);
-    NSError *metadataError = nil;
+  NSParameterAssert(URL);
+  NSError *metadataError = nil;
+  
   NSDictionary *metadata = [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:NSSQLiteStoreType URL:URL options:nil error:&metadataError];
-    if(metadata == nil) {
-        if(error != NULL) {
-            *error = metadataError;
-        }
-        NSLog(@"Failed to determine metadata: %@", metadataError);
-        return NO;
+  if(metadata == nil) {
+    if(error != NULL) {
+      *error = metadataError;
     }
-
-    BOOL isCompatible = [self isConfiguration:nil compatibleWithStoreMetadata:metadata];
-    if(isCompatible == NO) {
-        if(error != NULL) {
-            *error = [NSError newErrorWithCode:-1 localizedDescription:@"Store is incompatible with Model" localizedRecoverySuggestion_cde:@"Make sure that the store file was generated by using the correct version of your model."];
-        }
+    NSLog(@"Failed to determine metadata: %@", metadataError);
+    return NO;
+  }
+  
+  BOOL isCompatible = [self isConfiguration:nil compatibleWithStoreMetadata:metadata];
+  if(isCompatible == NO) {
+    if(error != NULL) {
+      *error = [NSError newErrorWithCode:-1 localizedDescription:@"Store is incompatible with Model" localizedRecoverySuggestion_cde:@"Make sure that the store file was generated by using the correct version of your model."];
     }
-    return isCompatible;
+  }
+  return isCompatible;
 }
 
 @end
diff --git a/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.h b/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.h
index 6a6a524..d49bbba 100644
--- a/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.h	
+++ b/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.h	
@@ -3,7 +3,7 @@
 @interface NSPasteboard (CDEAdditions)
 
 #pragma mark Getting URLs from the Pasteboard
-- (NSArray *)cde_URLs;
+- (NSArray<NSURL*> *)cde_URLs;
 - (NSURL *)cde_URL;
 
 @end
diff --git a/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.m b/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.m
index 2a61b08..bdbc289 100644
--- a/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSPasteboard-CDEAdditions.m	
@@ -3,7 +3,7 @@
 @implementation NSPasteboard (CDEAdditions)
 
 #pragma mark Getting URLs from the Pasteboard
-- (NSArray *)cde_URLs {
+- (NSArray<NSURL*> *)cde_URLs {
    NSArray *classes = @[[NSURL class]];
    NSDictionary *options = @{NSPasteboardURLReadingFileURLsOnlyKey: @YES};
    NSArray *fileURLs = [self readObjectsForClasses:classes options:options];
diff --git a/Core Data Editor/Core Data Editor/NSPersistentStore+CDEStoreAnalyzer.m b/Core Data Editor/Core Data Editor/NSPersistentStore+CDEStoreAnalyzer.m
index 90ee1ae..632f517 100644
--- a/Core Data Editor/Core Data Editor/NSPersistentStore+CDEStoreAnalyzer.m	
+++ b/Core Data Editor/Core Data Editor/NSPersistentStore+CDEStoreAnalyzer.m	
@@ -4,10 +4,10 @@ @implementation NSPersistentStore (CDEStoreAnalyzer)
 
 #pragma mark - Getting the Type of a Store
 // Returns nil if no store type could be determined
-+ (NSString *)typeOfPersistentStoreAtURL_cde:(NSURL *)URL {
++ (NSString *)typeOfPersistentStoreAtURL_cde:(NSURL *)storeURL {
   NSError *error = nil;
   @try {
-    NSDictionary *metadata =   [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:NSSQLiteStoreType URL:URL options:nil error:&error];
+    NSDictionary *metadata = [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:NSSQLiteStoreType URL:storeURL options:nil error:&error];
 
     if(metadata == nil) {
       NSLog(@"Failed to determine store metadata: %@", error);
diff --git a/Core Data Editor/Core Data Editor/NSURL+CDEAdditions.m b/Core Data Editor/Core Data Editor/NSURL+CDEAdditions.m
index 0c7252b..9b364be 100644
--- a/Core Data Editor/Core Data Editor/NSURL+CDEAdditions.m	
+++ b/Core Data Editor/Core Data Editor/NSURL+CDEAdditions.m	
@@ -117,4 +117,4 @@ - (BOOL)isSQLiteStoreURL_cde {
     return primaryKeyTableFound;
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Core Data Editor/Core Data Editor/Preferences.storyboard b/Core Data Editor/Core Data Editor/Preferences.storyboard
new file mode 100644
index 0000000..6e8a490
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/Preferences.storyboard	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="oXe-lp-5jh">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Window Controller-->
+        <scene sceneID="Afb-kf-Ae2">
+            <objects>
+                <windowController id="oXe-lp-5jh" customClass="PreferencesWC" sceneMemberID="viewController">
+                    <window key="window" title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="cde.preferenceswc" animationBehavior="default" id="cdp-ZF-jUE">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="163" y="199" width="480" height="270"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+                    </window>
+                    <connections>
+                        <segue destination="GXZ-WF-qfa" kind="relationship" relationship="window.shadowedContentViewController" id="IWj-MM-IJb"/>
+                    </connections>
+                </windowController>
+                <customObject id="S2u-mA-dxa" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-220" y="-165"/>
+        </scene>
+        <!--PreferencesVC-->
+        <scene sceneID="LF3-GS-xVO">
+            <objects>
+                <tabViewController tabStyle="toolbar" id="GXZ-WF-qfa" customClass="PreferencesVC" sceneMemberID="viewController">
+                    <tabViewItems>
+                        <tabViewItem label="General" image="NSPreferencesGeneral" id="OcV-9F-nbM"/>
+                        <tabViewItem label="Formatting" image="formatting-icon" id="VgA-jB-F45"/>
+                        <tabViewItem label="Integration" image="integration-icon" id="cMV-rm-8LZ"/>
+                    </tabViewItems>
+                    <tabView key="tabView" type="noTabsNoBorder" id="HK1-L0-Zo7">
+                        <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <font key="font" metaFont="message"/>
+                        <tabViewItems>
+                            <tabViewItem label="Item 0" identifier="" id="oHA-Tq-mE0">
+                                <view key="view" id="TKj-Qd-sIb">
+                                    <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </view>
+                            </tabViewItem>
+                        </tabViewItems>
+                    </tabView>
+                    <connections>
+                        <segue destination="YPB-vv-Hk0" kind="relationship" relationship="tabItems" id="T90-ua-GA6"/>
+                        <segue destination="UEY-wQ-jra" kind="relationship" relationship="tabItems" id="d7J-XP-ndb"/>
+                        <segue destination="Qae-YB-2Py" kind="relationship" relationship="tabItems" id="h8y-0c-eAy"/>
+                    </connections>
+                </tabViewController>
+                <customObject id="gfY-Jo-P3m" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-202" y="303"/>
+        </scene>
+        <!--PreferencesGeneral-->
+        <scene sceneID="rjS-mK-dpX">
+            <objects>
+                <controllerPlaceholder storyboardName="PreferencesGeneral" id="YPB-vv-Hk0" sceneMemberID="viewController"/>
+                <customObject id="qGr-6S-f7O" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-384" y="660"/>
+        </scene>
+        <!--PreferencesFormatting-->
+        <scene sceneID="NOJ-Tg-sTG">
+            <objects>
+                <controllerPlaceholder storyboardName="PreferencesFormatting" id="UEY-wQ-jra" sceneMemberID="viewController"/>
+                <customObject id="vod-sg-gLK" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-121" y="641"/>
+        </scene>
+        <!--PreferencesIntegration-->
+        <scene sceneID="Ccc-HN-JhR">
+            <objects>
+                <controllerPlaceholder storyboardName="PreferencesIntegration" id="Qae-YB-2Py" sceneMemberID="viewController"/>
+                <customObject id="Nph-MH-oeR" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-43" y="674"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="NSPreferencesGeneral" width="32" height="32"/>
+        <image name="formatting-icon" width="32" height="32"/>
+        <image name="integration-icon" width="32" height="32"/>
+    </resources>
+</document>
diff --git a/Core Data Editor/Core Data Editor/PreferencesFormatting.storyboard b/Core Data Editor/Core Data Editor/PreferencesFormatting.storyboard
new file mode 100644
index 0000000..70de254
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesFormatting.storyboard	
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="rNY-gy-Es0">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
+    </dependencies>
+    <scenes>
+        <!--Preferences-->
+        <scene sceneID="yUD-6q-8gK">
+            <objects>
+                <viewController title="Preferences" id="rNY-gy-Es0" customClass="PreferencesFormattingVC" sceneMemberID="viewController">
+                    <view key="view" id="5e4-Gf-jHV">
+                        <rect key="frame" x="0.0" y="0.0" width="471" height="159"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rTo-Uk-8rn">
+                                <rect key="frame" x="82" y="39" width="308" height="81"/>
+                                <subviews>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qx4-Df-GIp">
+                                        <rect key="frame" x="0.0" y="58" width="308" height="23"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zWe-GK-APL">
+                                                <rect key="frame" x="-2" y="3" width="154" height="17"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="eYN-iG-fnc"/>
+                                                </constraints>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Decimals:" id="ApZ-k4-ulL">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" red="0.73926084574080853" green="1" blue="0.96834557818998723" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7LJ-rH-ltE">
+                                                <rect key="frame" x="158" y="0.0" width="150" height="23"/>
+                                                <subviews>
+                                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QuN-7B-035">
+                                                        <rect key="frame" x="0.0" y="1" width="129" height="22"/>
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="oXn-qg-3Qj">
+                                                            <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="Klw-Nb-gUA">
+                                                                <integer key="minimum" value="0"/>
+                                                                <integer key="maximum" value="10"/>
+                                                            </numberFormatter>
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                        <connections>
+                                                            <binding destination="cvg-sM-0ST" name="value" keyPath="values.CDEUserDefaultsNumberOfDecimals" id="LRa-FV-xWM"/>
+                                                        </connections>
+                                                    </textField>
+                                                    <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GLf-1D-LUx">
+                                                        <rect key="frame" x="134" y="-2" width="19" height="27"/>
+                                                        <stepperCell key="cell" continuous="YES" alignment="left" maxValue="10" id="7p0-vG-94a"/>
+                                                        <connections>
+                                                            <binding destination="cvg-sM-0ST" name="value" keyPath="values.CDEUserDefaultsNumberOfDecimals" id="Xng-Zn-Zqw"/>
+                                                        </connections>
+                                                    </stepper>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="Ouh-iW-02N"/>
+                                                </constraints>
+                                                <visibilityPriorities>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                </visibilityPriorities>
+                                                <customSpacing>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                </customSpacing>
+                                            </stackView>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="u8K-PB-h75">
+                                        <rect key="frame" x="0.0" y="29" width="308" height="21"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JeS-Fh-rFT">
+                                                <rect key="frame" x="-2" y="4" width="154" height="17"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="kLa-B3-Duo"/>
+                                                </constraints>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Time Formatting:" id="QSs-Le-isT">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" red="0.73926084574080853" green="1" blue="0.96834557818998723" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gb6-J1-H0v">
+                                                <rect key="frame" x="156" y="-3" width="155" height="26"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="Cm6-j2-2O6"/>
+                                                </constraints>
+                                                <popUpButtonCell key="cell" type="push" title="Long" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="YKl-VU-Yth" id="cyp-Wv-pVe">
+                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="menu"/>
+                                                    <menu key="menu" title="OtherViews" id="0ub-d5-YGN">
+                                                        <items>
+                                                            <menuItem title="None" id="GG3-eJ-eTb"/>
+                                                            <menuItem title="Short" id="atP-e2-ucS"/>
+                                                            <menuItem title="Medium" id="eHn-Ho-kiZ"/>
+                                                            <menuItem title="Long" state="on" id="YKl-VU-Yth"/>
+                                                        </items>
+                                                    </menu>
+                                                </popUpButtonCell>
+                                                <connections>
+                                                    <binding destination="cvg-sM-0ST" name="selectedIndex" keyPath="values.CDEUserDefaultsDateFormatterTimeStyle" id="4d3-BB-K6Z"/>
+                                                </connections>
+                                            </popUpButton>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aj2-XF-o0M">
+                                        <rect key="frame" x="0.0" y="0.0" width="308" height="21"/>
+                                        <subviews>
+                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FCk-T6-t5q">
+                                                <rect key="frame" x="-2" y="4" width="154" height="17"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="ULb-LU-EGe"/>
+                                                </constraints>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Date Formatting:" id="O11-6T-Do7">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" red="0.73926084574080853" green="1" blue="0.96834557818998723" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sWS-u8-kRp">
+                                                <rect key="frame" x="156" y="-3" width="155" height="26"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="150" id="hN4-vg-gs1"/>
+                                                </constraints>
+                                                <popUpButtonCell key="cell" type="push" title="Long" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="2EK-zW-i2R" id="VnN-Mh-A6W">
+                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="menu"/>
+                                                    <menu key="menu" title="OtherViews" id="5Yd-67-HPK">
+                                                        <items>
+                                                            <menuItem title="None" id="eiX-ji-aBo"/>
+                                                            <menuItem title="Short" id="LIx-di-3Zg"/>
+                                                            <menuItem title="Medium" id="VZf-GC-pCX"/>
+                                                            <menuItem title="Long" state="on" id="2EK-zW-i2R"/>
+                                                        </items>
+                                                    </menu>
+                                                </popUpButtonCell>
+                                                <connections>
+                                                    <binding destination="cvg-sM-0ST" name="selectedIndex" keyPath="values.CDEUserDefaultsDateFormatterDateStyle" id="FMC-bC-Myu"/>
+                                                </connections>
+                                            </popUpButton>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="308" id="8p6-3w-Pgu"/>
+                                    <constraint firstAttribute="height" constant="81" id="xNv-wH-sX6"/>
+                                </constraints>
+                                <visibilityPriorities>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                </visibilityPriorities>
+                                <customSpacing>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                </customSpacing>
+                            </stackView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="rTo-Uk-8rn" firstAttribute="centerY" secondItem="5e4-Gf-jHV" secondAttribute="centerY" id="V8k-R6-iyR"/>
+                            <constraint firstItem="rTo-Uk-8rn" firstAttribute="centerX" secondItem="5e4-Gf-jHV" secondAttribute="centerX" id="aQE-dn-fUc"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <customObject id="7mj-UP-wD2" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+                <userDefaultsController representsSharedInstance="YES" id="cvg-sM-0ST"/>
+            </objects>
+            <point key="canvasLocation" x="303.5" y="113.5"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Core Data Editor/Core Data Editor/PreferencesFormattingVC.h b/Core Data Editor/Core Data Editor/PreferencesFormattingVC.h
new file mode 100644
index 0000000..e1cc754
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesFormattingVC.h	
@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+@interface PreferencesFormattingVC : NSViewController
+
+@end
diff --git a/Core Data Editor/Core Data Editor/PreferencesFormattingVC.m b/Core Data Editor/Core Data Editor/PreferencesFormattingVC.m
new file mode 100644
index 0000000..608646f
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesFormattingVC.m	
@@ -0,0 +1,19 @@
+#import "PreferencesFormattingVC.h"
+
+@interface PreferencesFormattingVC ()
+
+@end
+
+@implementation PreferencesFormattingVC
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Initialization code here.
+    }
+    
+    return self;
+}
+
+@end
diff --git a/Core Data Editor/Core Data Editor/PreferencesGeneral.storyboard b/Core Data Editor/Core Data Editor/PreferencesGeneral.storyboard
new file mode 100644
index 0000000..ed5ecff
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesGeneral.storyboard	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="ZXf-T3-iiU">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Preferences GeneralVC-->
+        <scene sceneID="X9k-rA-3Rz">
+            <objects>
+                <viewController id="ZXf-T3-iiU" customClass="PreferencesGeneralVC" sceneMemberID="viewController">
+                    <view key="view" id="zav-v6-iFr">
+                        <rect key="frame" x="0.0" y="0.0" width="498" height="287"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Del-ic-dkO">
+                                <rect key="frame" x="0.0" y="0.0" width="498" height="287"/>
+                                <subviews>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ipx-Cg-9j6">
+                                        <rect key="frame" x="72" y="250" width="120" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Object ID Column:" id="uRn-V8-Yo3">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ld2-sV-8JG">
+                                        <rect key="frame" x="195" y="249" width="157" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title="Shows name of entity" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Gg7-l4-NIg">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <binding destination="rqP-BK-AEN" name="value" keyPath="values.CDEUserDefaultsShowsNameOfEntityInObjectIDColumn" id="yiN-Sv-Oq5"/>
+                                        </connections>
+                                    </button>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Hz-TL-4n3">
+                                        <rect key="frame" x="194" y="229" width="267" height="14"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format: &lt;Entity&gt;/p&lt;Primary Key&gt;" id="iNl-eE-LVs">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8IE-vu-cbt">
+                                        <rect key="frame" x="17" y="199" width="175" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Property and Entity Names:" id="k05-7F-Cw4">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S1k-dd-ih2">
+                                        <rect key="frame" x="195" y="198" width="95" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title="Decamelize" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TXv-Hv-Awx">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <binding destination="rqP-BK-AEN" name="value" keyPath="values.CDEUserDefaultsShowsNiceEntityAndPropertyNames" id="pjN-Vx-cq7"/>
+                                        </connections>
+                                    </button>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="263" translatesAutoresizingMaskIntoConstraints="NO" id="jBA-Pg-yK8">
+                                        <rect key="frame" x="194" y="156" width="267" height="36"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Converts a camel case name into a human-readable name." id="M2Q-Cw-nWW">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QJr-NQ-wIR">
+                                        <rect key="frame" x="78" y="134" width="114" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Validation Errors:" id="n7c-Mf-21b">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hzj-Cx-6U3">
+                                        <rect key="frame" x="195" y="132" width="265" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title="Automatically resolve validation errors" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="kcC-5O-c8V">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <binding destination="rqP-BK-AEN" name="value" keyPath="values.CDEUserDefaultsAutomaticallyResolvesValidationErrors" id="7tB-kl-Zac"/>
+                                        </connections>
+                                    </button>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="263" translatesAutoresizingMaskIntoConstraints="NO" id="DHa-Fs-Rzx">
+                                        <rect key="frame" x="194" y="84" width="267" height="42"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="When creating an object Core Data Editor will try to resolve any validation erros for to-one and to-many relationships." id="d6G-Vj-wX2">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="241" translatesAutoresizingMaskIntoConstraints="NO" id="0ij-Bn-c8t">
+                                        <rect key="frame" x="196" y="26" width="245" height="28"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Open Project Browser when Core Data Editor starts." id="ilQ-TT-7g6">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Vu-HT-TZR">
+                                        <rect key="frame" x="87" y="62" width="105" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Project Browser:" id="0I1-FV-xUy">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WrC-Yr-2Gr">
+                                        <rect key="frame" x="196" y="60" width="265" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title="Automatically open on launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="aZM-Rr-2bK">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <binding destination="rqP-BK-AEN" name="value" keyPath="values.CDEUserDefaultsOpenProjectBrowserOnLaunch" id="Vxi-6c-Yu3"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="287" id="T2T-j9-qQw"/>
+                                    <constraint firstAttribute="width" constant="498" id="leE-Tc-drB"/>
+                                </constraints>
+                            </customView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="Del-ic-dkO" secondAttribute="trailing" id="Fzy-TL-lcc"/>
+                            <constraint firstAttribute="bottom" secondItem="Del-ic-dkO" secondAttribute="bottom" id="GnF-9e-GSG"/>
+                            <constraint firstItem="Del-ic-dkO" firstAttribute="top" secondItem="zav-v6-iFr" secondAttribute="top" id="Hts-CM-u2V"/>
+                            <constraint firstItem="Del-ic-dkO" firstAttribute="leading" secondItem="zav-v6-iFr" secondAttribute="leading" id="JFb-1a-7C5"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <customObject id="jNb-E8-ekb" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+                <userDefaultsController representsSharedInstance="YES" id="rqP-BK-AEN"/>
+            </objects>
+            <point key="canvasLocation" x="58" y="108.5"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.h b/Core Data Editor/Core Data Editor/PreferencesGeneralVC.h
similarity index 75%
rename from Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.h
rename to Core Data Editor/Core Data Editor/PreferencesGeneralVC.h
index 3088909..1f6260d 100644
--- a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.h	
+++ b/Core Data Editor/Core Data Editor/PreferencesGeneralVC.h	
@@ -8,6 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface CDEPreferencesMiscViewController : NSViewController
+@interface PreferencesGeneralVC : NSViewController
 
 @end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.m b/Core Data Editor/Core Data Editor/PreferencesGeneralVC.m
similarity index 74%
rename from Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.m
rename to Core Data Editor/Core Data Editor/PreferencesGeneralVC.m
index 8f3853f..1d06810 100644
--- a/Core Data Editor/Core Data Editor/CDEPreferencesMiscViewController.m	
+++ b/Core Data Editor/Core Data Editor/PreferencesGeneralVC.m	
@@ -6,13 +6,13 @@
 //  Copyright (c) 2013 Christian Kienle. All rights reserved.
 //
 
-#import "CDEPreferencesMiscViewController.h"
+#import "PreferencesGeneralVC.h"
 
-@interface CDEPreferencesMiscViewController ()
+@interface PreferencesGeneralVC ()
 
 @end
 
-@implementation CDEPreferencesMiscViewController
+@implementation PreferencesGeneralVC
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
diff --git a/Core Data Editor/Core Data Editor/PreferencesIntegration.storyboard b/Core Data Editor/Core Data Editor/PreferencesIntegration.storyboard
new file mode 100644
index 0000000..1793985
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesIntegration.storyboard	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="mMt-1O-wkv">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Preferences IntegrationVC-->
+        <scene sceneID="rMZ-qZ-5vL">
+            <objects>
+                <viewController id="mMt-1O-wkv" customClass="PreferencesIntegrationVC" sceneMemberID="viewController">
+                    <view key="view" id="YyU-oa-U4q">
+                        <rect key="frame" x="0.0" y="0.0" width="505" height="402"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="i8m-uU-8CW">
+                                <rect key="frame" x="0.0" y="0.0" width="505" height="402"/>
+                                <subviews>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="263" translatesAutoresizingMaskIntoConstraints="NO" id="AUu-cU-vZt">
+                                        <rect key="frame" x="217" y="240" width="267" height="112"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" id="4vf-jU-r4R">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <string key="title">If you tell Core Data Editor where your derived data directory is you can then drop store files on the dock icon and Core Data Editor will automatically try to find a matching model by looking at every model (recursively) in your derived data directory. The derived data directory is usually located at ~/Library/Developer/Xcode/DerivedData.</string>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="263" translatesAutoresizingMaskIntoConstraints="NO" id="VCi-lm-P8P">
+                                        <rect key="frame" x="216" y="48" width="267" height="140"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" id="kx2-Tp-4mW">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <string key="title">Please specify your iPhone Simulator directory. This directory is usually located in ~/Library/Application Support/iPhone Simulator/. Specifying your iPhone Simulator directory enables the project browser feature. The project browser automatically finds compatible SQLite stores and managed object models and let's you quickly create a Core Data Editor projects. You access the project browser from the "Window | Project Browser" menu item.</string>
+                                            <color key="textColor" red="0.49124053029999998" green="0.49124053029999998" blue="0.49124053029999998" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H7K-Uv-OVw" customClass="CDEPathPickerPopUpButton">
+                                        <rect key="frame" x="217" y="358" width="266" height="25"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WfM-DB-feH">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="menu"/>
+                                            <menu key="menu" title="OtherViews" id="j4I-lV-rAt"/>
+                                        </popUpButtonCell>
+                                    </popUpButton>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="v8m-pC-kOj">
+                                        <rect key="frame" x="18" y="198" width="194" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="iPhone Simulator Directory:" id="u2A-kF-0nR">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Cf6-uq-08c" customClass="CDEPathPickerPopUpButton">
+                                        <rect key="frame" x="217" y="194" width="266" height="25"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Mvf-Ex-O1P">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="menu"/>
+                                            <menu key="menu" title="OtherViews" id="PT2-YM-cO0"/>
+                                        </popUpButtonCell>
+                                    </popUpButton>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uqr-SN-chS">
+                                        <rect key="frame" x="19" y="365" width="194" height="17"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Xcode Derived Data Directory:" id="eDK-BT-ejB">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="402" id="Wql-UJ-zXZ"/>
+                                    <constraint firstAttribute="width" constant="505" id="wMd-xx-F9f"/>
+                                </constraints>
+                            </customView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="i8m-uU-8CW" firstAttribute="top" secondItem="YyU-oa-U4q" secondAttribute="top" id="RLl-8g-6jv"/>
+                            <constraint firstAttribute="bottom" secondItem="i8m-uU-8CW" secondAttribute="bottom" id="iEf-0i-FsD"/>
+                            <constraint firstItem="i8m-uU-8CW" firstAttribute="leading" secondItem="YyU-oa-U4q" secondAttribute="leading" id="p0C-Qe-z3Q"/>
+                            <constraint firstAttribute="trailing" secondItem="i8m-uU-8CW" secondAttribute="trailing" id="pxb-Lw-aMN"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="buildDirectoryPopUpButton" destination="H7K-Uv-OVw" id="Oqs-jF-xVr"/>
+                        <outlet property="simulatorDirectoryPopUpButton" destination="Cf6-uq-08c" id="Bgd-I3-kE2"/>
+                    </connections>
+                </viewController>
+                <customObject id="vVS-hv-wR8" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="174.5" y="269"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Core Data Editor/Core Data Editor/PreferencesIntegrationVC.h b/Core Data Editor/Core Data Editor/PreferencesIntegrationVC.h
new file mode 100644
index 0000000..e408bf4
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesIntegrationVC.h	
@@ -0,0 +1,7 @@
+#import <Cocoa/Cocoa.h>
+
+@interface PreferencesIntegrationVC : NSViewController
+
+- (void)displayInfoSheet;
+
+@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.m b/Core Data Editor/Core Data Editor/PreferencesIntegrationVC.m
similarity index 94%
rename from Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.m
rename to Core Data Editor/Core Data Editor/PreferencesIntegrationVC.m
index 5cfd3ca..0cc7ae1 100644
--- a/Core Data Editor/Core Data Editor/CDEPreferencesAutomaticProjectCreationViewController.m	
+++ b/Core Data Editor/Core Data Editor/PreferencesIntegrationVC.m	
@@ -1,8 +1,8 @@
-#import "CDEPreferencesAutomaticProjectCreationViewController.h"
+#import "PreferencesIntegrationVC.h"
 #import "NSURL+CDEAdditions.h"
 #import "CDEPathPickerPopUpButton.h"
 
-@interface CDEPreferencesAutomaticProjectCreationViewController ()
+@interface PreferencesIntegrationVC ()
 
 #pragma mark - Properties
 @property (nonatomic, weak) IBOutlet CDEPathPickerPopUpButton *buildDirectoryPopUpButton;
@@ -10,7 +10,7 @@ @interface CDEPreferencesAutomaticProjectCreationViewController ()
 
 @end
 
-@implementation CDEPreferencesAutomaticProjectCreationViewController
+@implementation PreferencesIntegrationVC
 
 - (void)loadView {
     [super loadView];
diff --git a/Core Data Editor/Core Data Editor/PreferencesVC.h b/Core Data Editor/Core Data Editor/PreferencesVC.h
new file mode 100644
index 0000000..d54b1c9
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesVC.h	
@@ -0,0 +1,4 @@
+#import <Cocoa/Cocoa.h>
+
+@interface PreferencesVC : NSTabViewController
+@end
diff --git a/Core Data Editor/Core Data Editor/PreferencesVC.m b/Core Data Editor/Core Data Editor/PreferencesVC.m
new file mode 100644
index 0000000..cb99fb1
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesVC.m	
@@ -0,0 +1,4 @@
+#import "PreferencesVC.h"
+
+@implementation PreferencesVC
+@end
diff --git a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.h b/Core Data Editor/Core Data Editor/PreferencesWC.h
similarity index 80%
rename from Core Data Editor/Core Data Editor/CDEPreferencesWindowController.h
rename to Core Data Editor/Core Data Editor/PreferencesWC.h
index 7debcd4..86e77e8 100644
--- a/Core Data Editor/Core Data Editor/CDEPreferencesWindowController.h	
+++ b/Core Data Editor/Core Data Editor/PreferencesWC.h	
@@ -1,12 +1,8 @@
 #import <Cocoa/Cocoa.h>
-
 typedef void(^CDEPreferencesWindowControllerCompletionHandler)(void);
 
-@interface CDEPreferencesWindowController : NSWindowController
-
-#pragma mark - Showing the Preferences Window
+@interface PreferencesWC : NSWindowController
 - (void)showWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler;
 - (void)showAutomaticProjectCreationPreferencesAndDisplayInfoSheetWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler;
 - (void)showAutomaticProjectCreationPreferencesWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler;
-
 @end
diff --git a/Core Data Editor/Core Data Editor/PreferencesWC.m b/Core Data Editor/Core Data Editor/PreferencesWC.m
new file mode 100644
index 0000000..5a4a1fc
--- /dev/null
+++ b/Core Data Editor/Core Data Editor/PreferencesWC.m	
@@ -0,0 +1,45 @@
+#import "PreferencesWC.h"
+
+@interface PreferencesWC ()
+
+@end
+
+@implementation PreferencesWC
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+    
+    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+}
+
+#pragma mark - Showing the Preferences Window
+- (void)showWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
+//  self.completionHandler = handler;
+//  [self showWindow:self];
+}
+
+- (void)showAutomaticProjectCreationPreferencesAndDisplayInfoSheetWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
+  assert(false);
+
+//  [self showAutomaticProjectCreationPreferencesWithCompletionHandler:handler];
+//  double delayInSeconds = 0.5;
+//  dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+//  dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
+//    NSString *identifier = NSStringFromClass([CDEPreferencesAutomaticProjectCreationViewController class]);
+//    CDEPreferencesAutomaticProjectCreationViewController *viewController = (CDEPreferencesAutomaticProjectCreationViewController *)[self existingViewControllerForToolbarItemWithIdentifier:identifier];
+//    [viewController displayInfoSheet];
+//  });
+}
+
+- (void)showAutomaticProjectCreationPreferencesWithCompletionHandler:(CDEPreferencesWindowControllerCompletionHandler)handler {
+  assert(false);
+
+//  self.completionHandler = handler;
+//  [self showWindow:self];
+//  NSString *identifier = NSStringFromClass([CDEPreferencesAutomaticProjectCreationViewController class]);
+//  CDEPreferencesAutomaticProjectCreationViewController *viewController = (CDEPreferencesAutomaticProjectCreationViewController *)[self existingViewControllerForToolbarItemWithIdentifier:identifier];
+//  [self showViewController:viewController];
+}
+
+
+@end
diff --git a/Core Data Editor/Core Data Editor/VibrantView.h b/Core Data Editor/Core Data Editor/VibrantView.h
deleted file mode 100644
index 3bb4a61..0000000
--- a/Core Data Editor/Core Data Editor/VibrantView.h	
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  VibrantView.h
-//  Core Data Editor
-//
-//  Created by cmk on 02/10/14.
-//  Copyright (c) 2014 Christian Kienle. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface VibrantView : NSView
-
-@end
diff --git a/Core Data Editor/Core Data Editor/VibrantView.m b/Core Data Editor/Core Data Editor/VibrantView.m
deleted file mode 100644
index f13c5c7..0000000
--- a/Core Data Editor/Core Data Editor/VibrantView.m	
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  VibrantView.m
-//  Core Data Editor
-//
-//  Created by cmk on 02/10/14.
-//  Copyright (c) 2014 Christian Kienle. All rights reserved.
-//
-
-#import "VibrantView.h"
-
-@implementation VibrantView
-
-- (void)drawRect:(NSRect)dirtyRect {
-    [super drawRect:dirtyRect];
-    
-    // Drawing code here.
-}
-
-- (BOOL)allowsVibrancy { return YES; }
-
-@end
diff --git a/Core Data Editor/Core Data Editor/en.lproj/CDEDocument.xib b/Core Data Editor/Core Data Editor/en.lproj/CDEDocument.xib
index 3a7362a..f50cc0a 100644
--- a/Core Data Editor/Core Data Editor/en.lproj/CDEDocument.xib	
+++ b/Core Data Editor/Core Data Editor/en.lproj/CDEDocument.xib	
@@ -1,588 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">101000</int>
-		<string key="IBDocument.SystemVersion">14A379a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">6249</string>
-		<string key="IBDocument.AppKitVersion">1343.13</string>
-		<string key="IBDocument.HIToolboxVersion">755.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">6249</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSCustomView</string>
-			<string>NSToolbar</string>
-			<string>NSToolbarFlexibleSpaceItem</string>
-			<string>NSToolbarItem</string>
-			<string>NSToolbarSpaceItem</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="580458321">
-			<object class="NSCustomObject" id="512844837">
-				<string key="NSClassName">CDEDocument</string>
-			</object>
-			<object class="NSCustomObject" id="613418571">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSWindowTemplate" id="275939982">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{133, 235}, {562, 458}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSToolbar" key="NSViewClass" id="269832227">
-					<object class="NSMutableString" key="NSToolbarIdentifier">
-						<characters key="NS.bytes">56A4D294-07E7-4E39-AF1E-36FEE88351FC</characters>
-					</object>
-					<nil key="NSToolbarDelegate"/>
-					<bool key="NSToolbarPrefersToBeShown">YES</bool>
-					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
-					<bool key="NSToolbarAllowsUserCustomization">NO</bool>
-					<bool key="NSToolbarAutosavesConfiguration">NO</bool>
-					<int key="NSToolbarDisplayMode">1</int>
-					<int key="NSToolbarSizeMode">2</int>
-					<dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
-						<object class="NSToolbarItem" key="44533143-C9D0-4AA1-B7F0-54EEB1F8BB44" id="1052724960">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">44533143-C9D0-4AA1-B7F0-54EEB1F8BB44</characters>
-							</object>
-							<string key="NSToolbarItemLabel">Generate Code</string>
-							<string key="NSToolbarItemPaletteLabel">Generate Code</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">code-icon</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">2</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarItem" key="7C37B1DE-B96E-4A4A-8CC4-B0083C9FEA2E" id="960350188">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">7C37B1DE-B96E-4A4A-8CC4-B0083C9FEA2E</characters>
-							</object>
-							<string key="NSToolbarItemLabel">Configuration</string>
-							<string key="NSToolbarItemPaletteLabel">Configuration</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSAdvanced</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarItem" key="EAA2489A-5079-468A-B1FE-58ABC60F23C2" id="53871328">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">EAA2489A-5079-468A-B1FE-58ABC60F23C2</characters>
-							</object>
-							<string key="NSToolbarItemLabel">CSV Import</string>
-							<string key="NSToolbarItemPaletteLabel">CSV Import</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">csv-icon</string>
-							</object>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{0, 0}</string>
-							<string key="NSToolbarItemMaxSize">{0, 0}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-						</object>
-						<object class="NSToolbarFlexibleSpaceItem" key="NSToolbarFlexibleSpaceItem" id="913690658">
-							<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
-							<string key="NSToolbarItemLabel"/>
-							<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<nil key="NSToolbarItemImage"/>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{1, 5}</string>
-							<string key="NSToolbarItemMaxSize">{20000, 32}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
-								<bool key="NSIsDisabled">YES</bool>
-								<bool key="NSIsSeparator">YES</bool>
-								<string key="NSTitle"/>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<object class="NSCustomResource" key="NSOnImage" id="450322701">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="955587594">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-							</object>
-						</object>
-						<object class="NSToolbarSpaceItem" key="NSToolbarSpaceItem" id="131874403">
-							<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
-							<string key="NSToolbarItemLabel"/>
-							<string key="NSToolbarItemPaletteLabel">Space</string>
-							<nil key="NSToolbarItemToolTip"/>
-							<nil key="NSToolbarItemView"/>
-							<nil key="NSToolbarItemImage"/>
-							<nil key="NSToolbarItemTarget"/>
-							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{32, 5}</string>
-							<string key="NSToolbarItemMaxSize">{32, 10000}</string>
-							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">-1</int>
-							<bool key="NSToolbarIsUserRemovable">YES</bool>
-							<int key="NSToolbarItemVisibilityPriority">0</int>
-							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
-								<bool key="NSIsDisabled">YES</bool>
-								<bool key="NSIsSeparator">YES</bool>
-								<string key="NSTitle"/>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<reference key="NSOnImage" ref="450322701"/>
-								<reference key="NSMixedImage" ref="955587594"/>
-							</object>
-						</object>
-					</dictionary>
-					<array key="NSToolbarIBAllowedItems">
-						<reference ref="131874403"/>
-						<reference ref="913690658"/>
-						<reference ref="960350188"/>
-						<reference ref="53871328"/>
-						<reference ref="1052724960"/>
-					</array>
-					<array class="NSMutableArray" key="NSToolbarIBDefaultItems">
-						<reference ref="960350188"/>
-						<reference ref="53871328"/>
-						<reference ref="1052724960"/>
-					</array>
-					<array key="NSToolbarIBSelectableItems" id="0"/>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{500, 300}</string>
-				<object class="NSView" key="NSWindowView" id="568628114">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSCustomView" id="44238641">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">274</int>
-							<string key="NSFrameSize">{562, 458}</string>
-							<reference key="NSSuperview" ref="568628114"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<string key="NSClassName">NSView</string>
-						</object>
-					</array>
-					<string key="NSFrameSize">{562, 458}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="44238641"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 777}}</string>
-				<string key="NSMinSize">{500, 378}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSCustomObject" id="796877042">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="275939982"/>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showConfiguration:</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="960350188"/>
-					</object>
-					<int key="connectionID">100034</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">containerView</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="44238641"/>
-					</object>
-					<int key="connectionID">100042</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showImportCSVFileWindow:</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="53871328"/>
-					</object>
-					<int key="connectionID">100053</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">generateCode:</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="1052724960"/>
-					</object>
-					<int key="connectionID">100055</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="275939982"/>
-						<reference key="destination" ref="512844837"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="580458321"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="512844837"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="613418571"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="275939982"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="568628114"/>
-							<reference ref="269832227"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Window</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="568628114"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="44238641"/>
-						</array>
-						<reference key="parent" ref="275939982"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="796877042"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100027</int>
-						<reference key="object" ref="269832227"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="131874403"/>
-							<reference ref="913690658"/>
-							<reference ref="960350188"/>
-							<reference ref="53871328"/>
-							<reference ref="1052724960"/>
-						</array>
-						<reference key="parent" ref="275939982"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100028</int>
-						<reference key="object" ref="131874403"/>
-						<reference key="parent" ref="269832227"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100031</int>
-						<reference key="object" ref="913690658"/>
-						<reference key="parent" ref="269832227"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100033</int>
-						<reference key="object" ref="960350188"/>
-						<reference key="parent" ref="269832227"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100035</int>
-						<reference key="object" ref="44238641"/>
-						<reference key="parent" ref="568628114"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100052</int>
-						<reference key="object" ref="53871328"/>
-						<reference key="parent" ref="269832227"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100054</int>
-						<reference key="object" ref="1052724960"/>
-						<reference key="parent" ref="269832227"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100027.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100028.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100031.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100033.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100035.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100052.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100052.designableToolbarItemIdentifier">CDECSV</string>
-				<string key="100054.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100054.designableToolbarItemIdentifier">CDECode</string>
-				<boolean value="YES" key="5.IBNSWindowAutoPositionCentersHorizontal"/>
-				<boolean value="YES" key="5.IBNSWindowAutoPositionCentersVertical"/>
-				<string key="5.IBPersistedLastKnownCanvasPosition">{277, 336}</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBWindowTemplateEditedContentRect">{{133, 170}, {507, 413}}</string>
-				<boolean value="YES" key="5.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">100059</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">CDEDocument</string>
-					<string key="superclassName">NSPersistentDocument</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Core Data Editor/Core Data Editor/CDEDocument.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">CDEDocument</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="copySelectedObjectsAsCSV:">id</string>
-						<string key="deleteSelectedObjcts:">id</string>
-						<string key="generateCode:">id</string>
-						<string key="insertObject:">id</string>
-						<string key="showConfiguration:">id</string>
-						<string key="showImportCSVFileWindow:">id</string>
-						<string key="takeQueryFromSender:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="copySelectedObjectsAsCSV:">
-							<string key="name">copySelectedObjectsAsCSV:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="deleteSelectedObjcts:">
-							<string key="name">deleteSelectedObjcts:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="generateCode:">
-							<string key="name">generateCode:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="insertObject:">
-							<string key="name">insertObject:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showConfiguration:">
-							<string key="name">showConfiguration:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showImportCSVFileWindow:">
-							<string key="name">showImportCSVFileWindow:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="takeQueryFromSender:">
-							<string key="name">takeQueryFromSender:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">containerView</string>
-						<string key="NS.object.0">NSView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">containerView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">containerView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Core Data Editor/Core Data Editor/CDEDocument.m</string>
-					</object>
-				</object>
-			</array>
-			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSDocument</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="printDocument:">id</string>
-						<string key="revertDocumentToSaved:">id</string>
-						<string key="runPageLayout:">id</string>
-						<string key="saveDocument:">id</string>
-						<string key="saveDocumentAs:">id</string>
-						<string key="saveDocumentTo:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="printDocument:">
-							<string key="name">printDocument:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="revertDocumentToSaved:">
-							<string key="name">revertDocumentToSaved:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="runPageLayout:">
-							<string key="name">runPageLayout:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="saveDocument:">
-							<string key="name">saveDocument:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="saveDocumentAs:">
-							<string key="name">saveDocumentAs:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="saveDocumentTo:">
-							<string key="name">saveDocumentTo:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDocument.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenu</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPersistentDocument</string>
-					<string key="superclassName">NSDocument</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPersistentDocument.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSToolbar</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSToolbarItem</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="4600" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSAdvanced">{32, 32}</string>
-			<string key="NSMenuCheckmark">{12, 12}</string>
-			<string key="NSMenuMixedState">{10, 2}</string>
-			<string key="code-icon">{39, 39}</string>
-			<string key="csv-icon">{39, 39}</string>
-		</dictionary>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="CDEDocument">
+            <connections>
+                <outlet property="containerView" destination="100035" id="100042"/>
+                <outlet property="window" destination="5" id="18"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="5" userLabel="Window">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="133" y="235" width="562" height="458"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <value key="minSize" type="size" width="500" height="300"/>
+            <view key="contentView" id="6">
+                <rect key="frame" x="0.0" y="0.0" width="562" height="458"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView id="100035">
+                        <rect key="frame" x="0.0" y="0.0" width="562" height="458"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    </customView>
+                </subviews>
+            </view>
+            <toolbar key="toolbar" implicitIdentifier="56A4D294-07E7-4E39-AF1E-36FEE88351FC" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconAndLabel" sizeMode="small" id="100027">
+                <allowedToolbarItems>
+                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="100028"/>
+                    <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="100031"/>
+                    <toolbarItem implicitItemIdentifier="7C37B1DE-B96E-4A4A-8CC4-B0083C9FEA2E" label="Configuration" paletteLabel="Configuration" tag="-1" image="NSAdvanced" id="100033">
+                        <nil key="toolTip"/>
+                        <connections>
+                            <action selector="showConfiguration:" target="-2" id="100034"/>
+                        </connections>
+                    </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="EAA2489A-5079-468A-B1FE-58ABC60F23C2" explicitItemIdentifier="CDECSV" label="CSV Import" paletteLabel="CSV Import" tag="1" image="csv-icon" id="100052">
+                        <nil key="toolTip"/>
+                        <connections>
+                            <action selector="showImportCSVFileWindow:" target="-2" id="100053"/>
+                        </connections>
+                    </toolbarItem>
+                </allowedToolbarItems>
+                <defaultToolbarItems>
+                    <toolbarItem reference="100033"/>
+                    <toolbarItem reference="100052"/>
+                </defaultToolbarItems>
+            </toolbar>
+            <connections>
+                <outlet property="delegate" destination="-2" id="17"/>
+            </connections>
+            <point key="canvasLocation" x="277" y="336"/>
+        </window>
+        <customObject id="-3" userLabel="Application"/>
+    </objects>
+    <resources>
+        <image name="NSAdvanced" width="32" height="32"/>
+        <image name="csv-icon" width="39" height="39"/>
+    </resources>
+</document>
diff --git a/Core Data Editor/Core Data Editor/mogenerator/mogenerator b/Core Data Editor/Core Data Editor/mogenerator/mogenerator
deleted file mode 100755
index a846844..0000000
Binary files a/Core Data Editor/Core Data Editor/mogenerator/mogenerator and /dev/null differ
diff --git a/Core Data Editor/Core Data Editor/mogenerator/mogeneratorReadme.rtf b/Core Data Editor/Core Data Editor/mogenerator/mogeneratorReadme.rtf
deleted file mode 100644
index 5196265..0000000
--- a/Core Data Editor/Core Data Editor/mogenerator/mogeneratorReadme.rtf	
+++ /dev/null
@@ -1,11 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
-{\colortbl;\red255\green255\blue255;\red78\green78\blue78;\red246\green247\blue254;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww11900\viewh13760\viewkind1
-\deftab720
-\pard\pardeftab720\sl320\sa260\ql\qnatural
-
-\f0\fs24 \cf2 \cb3 The classes for your model are located in the directory "Human" and "Machine". These files were generated by "{\field{\*\fldinst{HYPERLINK "https://github.com/rentzsch/mogenerator"}}{\fldrslt mogenerator}}".\
-"{\field{\*\fldinst{HYPERLINK "https://github.com/rentzsch/mogenerator"}}{\fldrslt mogenerator}} is a command-line tool that, given an .xcdatamodel file, will generate two classes per entity. The first class, _MyEntity, is intended solely for machine consumption and will be continuously overwritten to stay in sync with your data model. The second class, MyEntity, subclasses _MyEntity, won't ever be overwritten and is a great place to put your custom logic."\
-If you would like to learn more about {\field{\*\fldinst{HYPERLINK "https://github.com/rentzsch/mogenerator"}}{\fldrslt mogenerator}} visit the {\field{\*\fldinst{HYPERLINK "https://github.com/rentzsch/mogenerator"}}{\fldrslt project page}} on {\field{\*\fldinst{HYPERLINK "https://github.com"}}{\fldrslt github.com}}.\
-}
\ No newline at end of file
diff --git a/Core Data Editor/Core Data Editor/mogenerator/unsigned/mogenerator b/Core Data Editor/Core Data Editor/mogenerator/unsigned/mogenerator
deleted file mode 100755
index 05daa63..0000000
Binary files a/Core Data Editor/Core Data Editor/mogenerator/unsigned/mogenerator and /dev/null differ
diff --git a/Core Data Editor/Graphics/App.sketch/metadata b/Core Data Editor/Graphics/App.sketch/metadata
new file mode 100644
index 0000000..e504c45
--- /dev/null
+++ b/Core Data Editor/Graphics/App.sketch/metadata	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>app</key>
+	<string>com.bohemiancoding.sketch</string>
+	<key>build</key>
+	<integer>5355</integer>
+	<key>commit</key>
+	<string>b7d299b0a34651d1a0e066786b75aa36168d5809</string>
+	<key>fonts</key>
+	<array>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+		<string>Menlo-Regular</string>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+		<string>Helvetica</string>
+	</array>
+	<key>length</key>
+	<integer>95243</integer>
+	<key>version</key>
+	<integer>18</integer>
+</dict>
+</plist>
diff --git a/Core Data Editor/Untitled-1.fw.png b/Core Data Editor/Untitled-1.fw.png
deleted file mode 100644
index 39f9524..0000000
Binary files a/Core Data Editor/Untitled-1.fw.png and /dev/null differ
diff --git a/README.md b/README.md
index 0825017..cbc2fde 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-<a href="https://flattr.com/submit/auto?user_id=ChristianKienle&url=https%3A%2F%2Fgithub.com%2FChristianKienle%2FCore-Data-Editor" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></a>
-
 # Build Status
 | Branch        | Status           | 
 | ------------- |:-------------:|
@@ -7,18 +5,17 @@
 | Develop      | [![Build Status](https://travis-ci.org/ChristianKienle/Core-Data-Editor.svg?branch=develop)](https://travis-ci.org/ChristianKienle/Core-Data-Editor)      |
 
 # Core Data Editor
-<img src="http://thermal-core.com/img/cde/icon_256x256.png" alt="Core Data Editor Logo" title="Core Data Editor Logo" align="right" />
+
+<img src="app-icon.png" alt="Core Data Editor Logo" title="Core Data Editor Logo" align="right" />
 
 Core Data Editor lets you easily view, edit and analyze applications‘ data. Core Data Editor is compatible with Mac and iOS applications and supports XML, SQLite and binary stores, visualizes all relationships and is able to edit the data and generate Objective-C code for the data model.
 
 Core Data Editor will guide you through a short setup process when you initially launch the app. This setup process is entirely optional. You can skip over each and every step if you know what you are doing. It is recommended that you take your time and go though the setup process. It only takes a few minutes. 
 
-![](http://thermal-core.com/img/cde/screenshot_main_cut.png)
+![](screenshot.png)
 
 # Donations
-If you want to support Core Data Editor you can donate via PayPal to me@christian-kienle.de. You can also flattr Core Data Editor:
-
-<a href="https://flattr.com/submit/auto?user_id=ChristianKienle&url=https%3A%2F%2Fgithub.com%2FChristianKienle%2FCore-Data-Editor" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></a>
+If you want to support Core Data Editor you can [donate via PayPal](https://www.paypal.me/christiankienle).
 
 Thanks.
 
@@ -59,8 +56,9 @@ A data coordinator is represented by an instance of  `CDERequestDataCoordinator`
 
 That being said there should be little reason to introduce a new coordinator subclass. 
 
+
 # Contributing
-Without you, Core Data Editor will probably die soon. If you want to contribute send me pull requests. Have a look at the issue tracker to find out what should be done next. 
+If you want to contribute send me pull requests. Have a look at the issue tracker to find out what should be done next. 
 
 # Credits
 Core Data Editor has the following third party dependencies:
@@ -78,9 +76,8 @@ Core Data Editor has the following third party dependencies:
 * [danydev](https://github.com/danydev)
 * [Roberto Dries](https://github.com/robertodries92)
 * [Mitch Cohen](https://github.com/mitchcohen)
-
 # Contact
-[Christian Kienle (me@christian-kienle.de)](mailto:me@christian-kienle.de) 
+[Christian Kienle (kienle.christian@icloud.com)](mailto:kienle.christian@icloud.com) 
 
 # License
 3-clause BSD (please don't sue me)
diff --git a/app-icon.png b/app-icon.png
new file mode 100644
index 0000000..cc087ea
Binary files /dev/null and b/app-icon.png differ
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000..b8cff58
Binary files /dev/null and b/screenshot.png differ