diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index cb3e98f..92a390d 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit cb3e98f268e615aac3906572fa001ada5e99eadc
+Subproject commit 92a390d01eaafbce5852531d8e072ae29752dedb
diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj
index 0c51ac2..5b71699 100644
--- a/Delta.xcodeproj/project.pbxproj
+++ b/Delta.xcodeproj/project.pbxproj
@@ -172,7 +172,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Riley Testut";
 				TargetAttributes = {
 					BFFA71D61AAC406100EE9DD1 = {
@@ -267,6 +267,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -339,6 +340,7 @@
 				INFOPLIST_FILE = Delta/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -354,6 +356,7 @@
 				INFOPLIST_FILE = Delta/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/Delta/DirectoryContentsDataSource.swift b/Delta/DirectoryContentsDataSource.swift
index 1dec4b8..ad46f72 100644
--- a/Delta/DirectoryContentsDataSource.swift
+++ b/Delta/DirectoryContentsDataSource.swift
@@ -87,16 +87,13 @@ private extension DirectoryContentsDataSource
 {
     func didUpdateDirectoryContents()
     {
-        var error: NSError? = nil
-        var contents = NSFileManager.defaultManager().contentsOfDirectoryAtURL(self.directoryURL, includingPropertiesForKeys: nil, options:NSDirectoryEnumerationOptions.SkipsSubdirectoryDescendants | NSDirectoryEnumerationOptions.SkipsHiddenFiles, error: &error) as! [NSURL]?
-        
-        if let contents = contents
+        do
         {
-            self.directoryContents = contents
+            self.directoryContents = try NSFileManager.defaultManager().contentsOfDirectoryAtURL(self.directoryURL, includingPropertiesForKeys: nil, options:[NSDirectoryEnumerationOptions.SkipsSubdirectoryDescendants, NSDirectoryEnumerationOptions.SkipsHiddenFiles])
         }
-        else
+        catch let error as NSError
         {
-            println(error?.userInfo)
+            print("\(error) \(error.userInfo)")
         }
         
         self.contentsUpdateHandler?()
@@ -112,7 +109,7 @@ extension DirectoryContentsDataSource: UITableViewDataSource
     
     public func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell
     {
-        let tableViewCell = tableView.dequeueReusableCellWithIdentifier(self.tableViewCellIdentifier, forIndexPath: indexPath) as! UITableViewCell
+        let tableViewCell = tableView.dequeueReusableCellWithIdentifier(self.tableViewCellIdentifier, forIndexPath: indexPath) as UITableViewCell
         
         self.cellConfigurationBlock?(tableViewCell, indexPath, self.URLAtIndexPath(indexPath))
         
diff --git a/Delta/EmulationViewController.swift b/Delta/EmulationViewController.swift
index 2299d13..425f6cb 100644
--- a/Delta/EmulationViewController.swift
+++ b/Delta/EmulationViewController.swift
@@ -41,7 +41,7 @@ class EmulationViewController: UIViewController
         
         self.controllerView.controllerSkin = controllerSkin
         
-        println(self.controllerView.intrinsicContentSize())
+        print(self.controllerView.intrinsicContentSize())
     }
     
     override func viewDidAppear(animated: Bool)
diff --git a/Delta/GamesViewController.swift b/Delta/GamesViewController.swift
index 81e50d5..1bc025c 100644
--- a/Delta/GamesViewController.swift
+++ b/Delta/GamesViewController.swift
@@ -15,20 +15,28 @@ class GamesViewController: UITableViewController
     
     override init(style: UITableViewStyle)
     {
-        let error: NSError? = nil;
-        let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first as! NSURL
-        
-        self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
+        if let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first
+        {
+            self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
+        }
+        else
+        {
+            self.directoryContentsDataSource = nil
+        }
         
         super.init(style: style)
     }
 
     required init(coder aDecoder: NSCoder)
     {
-        let error: NSError? = nil;
-        let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first as! NSURL
-        
-        self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
+        if let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first
+        {
+            self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
+        }
+        else
+        {
+            self.directoryContentsDataSource = nil
+        }
         
         super.init(coder: aDecoder)
     }
diff --git a/External/Roxas b/External/Roxas
index f58b2ea..43b0ef2 160000
--- a/External/Roxas
+++ b/External/Roxas
@@ -1 +1 @@
-Subproject commit f58b2ea50683f13d20f486486b41307267ddd7ac
+Subproject commit 43b0ef22a303ac87d54fd89069b372be77fb4bc5