 								}
 							// Exists!
 							} else {
+								var devices = Array(json["devices"].dictionary!.keys)
 								
-								// WARNING: Does not currently add new devices. Fix pls
 								let cdDevices = CDManager.sharedManager.fetchedResultsController.fetchedObjects as! [Device]
 								for device in cdDevices {
+									devices.removeAtIndex(devices.indexOf(device.deviceCode!)!)
 									device.name = json["devices"][device.deviceID!]["name"].stringValue
 									
 									CDManager.sharedManager.saveCoreData(nil)

									
									CDManager.sharedManager.saveCoreData(nil)
								}
							}
						}
					}
				case .Failure(_):
					debugPrint(response)
			}
			print("Finished!")
		})
		
	}
	

							print("Data is the same! Don't need to do anything")
						} else {
							NSUserDefaults.standardUserDefaults().setObject(response.data!.sha1.hexString, forKey: "firmwares.json.sha1")
							let json = JSON(value)*/
		
		let json = JSON(data: NSFileManager.defaultManager().contentsAtPath(NSBundle.mainBundle().bundlePath.stringByAppendingString("/condensed.json"))!)
		NSUserDefaults.standardUserDefaults().setObject(NSFileManager.defaultManager().contentsAtPath(NSBundle.mainBundle().bundlePath.stringByAppendingString("/condensed.json"))!.sha1.hexString, forKey: "firmwares.json.sha1")
							// First time?
							if !self.shaExists() {
								let devices = Array(json["devices"].dictionary!.keys)
