diff --git a/Cartfile b/Cartfile
index a9e8bed0..ab370253 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,16 +1,16 @@
-github "OpenStack-Mobile/SwiftFoundation" "Swift.2.2"
+github "PureSwift/JSON" "master"
+github "PureSwift/Predicate" "master"
 github "OpenStack-Mobile/aerogear-ios-http" "master"
 github "OpenStack-Mobile/aerogear-ios-oauth2" "openstack"
 github "JonasGessner/JGProgressHUD"
-github "OpenStack-Mobile/XLPagerTabStrip" "master"
+github "xmartlabs/XLPagerTabStrip"
 github "OpenStack-Mobile/SWRevealViewController" "master"
-github "OpenStack-Mobile/R.swift.Library" "OpenStack"
+github "mac-cain13/R.swift.Library"
 github "OpenStack-Mobile/HanekeSwift" "master"
 github "OpenStack-Mobile/KTCenterFlowLayout" "master"
 github "OpenStack-Mobile/AFHorizontalDayPicker" "master"
-github "OpenStack-Mobile/Cosmos" "swift-2.3"
-github "OpenStack-Mobile/AHKActionSheet" "master"
-github "OpenStack-Mobile/ImageSlideshow" "master"
+github "marketplacer/Cosmos"
+github "zvonicek/ImageSlideshow"
 github "OpenStack-Mobile/XCDYouTubeKit"
 github "OpenStack-Mobile/MTDates" "master"
-github "OpenStack-mobile/SlackTextViewController"
+github "OpenStack-Mobile/SlackTextViewController"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 12458ecd..82b7763e 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,17 +1,17 @@
-github "OpenStack-Mobile/AHKActionSheet" "4ac799305b10ac39306dfdf45a359f88c94cc41d"
-github "OpenStack-Mobile/Cosmos" "2ee4a896fcbdc915e95bcb7456f996c27492fb34"
-github "OpenStack-Mobile/HanekeSwift" "9854d345ecb620299b9c2eb1c2f94cbda6e692d6"
-github "OpenStack-Mobile/ImageSlideshow" "38587ee81532ffafff989a18f45cb0be399fa078"
+github "marketplacer/Cosmos" "9.0.0"
+github "OpenStack-Mobile/HanekeSwift" "e97c06307fd8cd5b3a03875d0950d73db688f2bd"
+github "zvonicek/ImageSlideshow" "1.3.0"
 github "JonasGessner/JGProgressHUD" "v1.4.1"
-github "PureSwift/JSON-C" "cb04249de9ed23ecc5e3ea772a4c6c46f86b3d86"
+github "PureSwift/JSON" "e208ddd1df2749d4f2fc5bc2392d8bebd1edafb8"
 github "OpenStack-Mobile/KTCenterFlowLayout" "603f33180563cfa4fcab99a0623bbde21e49665b"
 github "OpenStack-Mobile/MTDates" "def729947a5f07d6440ce9b97f2761af299bc13c"
-github "OpenStack-Mobile/R.swift.Library" "45bfbc29afc2ac9115187a4b4f869339f2447648"
+github "AliSoftware/OHHTTPStubs" "6.0.0"
+github "PureSwift/Predicate" "36141936dfcacd847f6b5a3a0a08b38e22354576"
+github "mac-cain13/R.swift.Library" "v3.0.2"
 github "OpenStack-Mobile/SWRevealViewController" "c3113e1508597ee2d9ea7081d97caa5117dddf00"
-github "OpenStack-mobile/SlackTextViewController" "v1.9.5"
+github "OpenStack-Mobile/SlackTextViewController" "v1.9.5"
 github "OpenStack-Mobile/XCDYouTubeKit" "2.5.3"
-github "OpenStack-Mobile/XLPagerTabStrip" "dd31ec30fc71d7cd534cf81662b9f1ff3875b7d0"
-github "OpenStack-Mobile/aerogear-ios-http" "274b560fbf9fb902fbb329bdbd20a728521fd186"
+github "xmartlabs/XLPagerTabStrip" "7.0.0"
 github "OpenStack-Mobile/AFHorizontalDayPicker" "74c3521f935039b2b6e945380ecd06752076ec8a"
-github "OpenStack-Mobile/SwiftFoundation" "6288d7a238fd503498fd26cf199c17ed3894c508"
-github "OpenStack-Mobile/aerogear-ios-oauth2" "8a3a5599adea4586e28f0ac7a1540bbc09af4c8d"
+github "OpenStack-Mobile/aerogear-ios-http" "baeeaf6947d1afb58e3235a732b50c5a58923cad"
+github "OpenStack-Mobile/aerogear-ios-oauth2" "6a134a2e68ea612960ba10e18524280aa69ca356"
diff --git a/OpenStack Summit/CoreSummit/Affiliation.swift b/OpenStack Summit/CoreSummit/Affiliation.swift
index d3e1f653..0928acd7 100644
--- a/OpenStack Summit/CoreSummit/Affiliation.swift	
+++ b/OpenStack Summit/CoreSummit/Affiliation.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public struct Affiliation: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/AffiliationJSON.swift b/OpenStack Summit/CoreSummit/AffiliationJSON.swift
index 8513c720..aa91ab8d 100644
--- a/OpenStack Summit/CoreSummit/AffiliationJSON.swift	
+++ b/OpenStack Summit/CoreSummit/AffiliationJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Affiliation {
     
@@ -18,14 +18,14 @@ public extension Affiliation {
 
 extension Affiliation: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let isCurrent = JSONObject[JSONKey.is_current.rawValue]?.rawValue as? Bool,
             let organizationJSON = JSONObject[JSONKey.organization.rawValue],
-            let organization = AffiliationOrganization(JSONValue: organizationJSON),
-            let member = JSONObject[JSONKey.owner_id.rawValue]?.rawValue as? Int
+            let organization = AffiliationOrganization(json: organizationJSON),
+            let member = JSONObject[JSONKey.owner_id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
@@ -35,7 +35,7 @@ extension Affiliation: JSONDecodable {
         
         // optional values
         
-        if let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int {
+        if let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue {
             
             self.start = Date(timeIntervalSince1970: TimeInterval(startDate))
             
@@ -44,7 +44,7 @@ extension Affiliation: JSONDecodable {
             self.start = nil
         }
 
-        if let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int {
+        if let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue {
             
             self.end = Date(timeIntervalSince1970: TimeInterval(endDate))
             
diff --git a/OpenStack Summit/CoreSummit/AffiliationManagedObject.swift b/OpenStack Summit/CoreSummit/AffiliationManagedObject.swift
index e682c0d4..624382c9 100644
--- a/OpenStack Summit/CoreSummit/AffiliationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/AffiliationManagedObject.swift	
@@ -7,15 +7,15 @@
 //
 
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class AffiliationManagedObject: Entity {
     
     @NSManaged public var member: MemberManagedObject
     
-    @NSManaged public var start: NSDate?
+    @NSManaged public var start: Date?
     
-    @NSManaged public var end: NSDate?
+    @NSManaged public var end: Date?
     
     @NSManaged public var isCurrent: Bool
     
@@ -26,14 +26,14 @@ extension Affiliation: CoreDataDecodable {
     
     public init(managedObject: AffiliationManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.isCurrent = managedObject.isCurrent
-        self.member =  managedObject.member.identifier
+        self.member =  managedObject.member.id
         self.organization = AffiliationOrganization(managedObject: managedObject.organization)
         
         if let startDate = managedObject.start {
             
-            self.start = Date(foundation: startDate)
+            self.start = startDate
             
         } else {
             
@@ -42,7 +42,7 @@ extension Affiliation: CoreDataDecodable {
         
         if let endDate = managedObject.end {
             
-            self.end = Date(foundation: endDate)
+            self.end = endDate
             
         } else {
             
@@ -53,12 +53,12 @@ extension Affiliation: CoreDataDecodable {
 
 extension Affiliation: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> AffiliationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> AffiliationManagedObject {
         
         let managedObject = try cached(context)
 
-        managedObject.start = start?.toFoundation()
-        managedObject.end = end?.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.isCurrent = isCurrent
         managedObject.member = try context.relationshipFault(member)
         managedObject.organization = try context.relationshipFault(organization)
diff --git a/OpenStack Summit/CoreSummit/AffiliationOrganizationJSON.swift b/OpenStack Summit/CoreSummit/AffiliationOrganizationJSON.swift
index 0340097f..0a3d88e6 100644
--- a/OpenStack Summit/CoreSummit/AffiliationOrganizationJSON.swift	
+++ b/OpenStack Summit/CoreSummit/AffiliationOrganizationJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension AffiliationOrganization {
     
@@ -18,10 +18,10 @@ public extension AffiliationOrganization {
 
 extension AffiliationOrganization: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String
             else { return nil }
         
diff --git a/OpenStack Summit/CoreSummit/AffiliationOrganizationManagedObject.swift b/OpenStack Summit/CoreSummit/AffiliationOrganizationManagedObject.swift
index f07cf2c5..55f1dd50 100644
--- a/OpenStack Summit/CoreSummit/AffiliationOrganizationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/AffiliationOrganizationManagedObject.swift	
@@ -17,14 +17,14 @@ extension AffiliationOrganization: CoreDataDecodable {
     
     public init(managedObject: AffiliationOrganizationManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
     }
 }
 
 extension AffiliationOrganization: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> AffiliationOrganizationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> AffiliationOrganizationManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/AttendeeJSON.swift b/OpenStack Summit/CoreSummit/AttendeeJSON.swift
index 3c3ba345..63a98b09 100644
--- a/OpenStack Summit/CoreSummit/AttendeeJSON.swift	
+++ b/OpenStack Summit/CoreSummit/AttendeeJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Attendee {
     
@@ -18,15 +18,15 @@ public extension Attendee {
 
 extension Attendee: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let member = JSONObject[JSONKey.member_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let member = JSONObject[JSONKey.member_id.rawValue]?.integerValue,
             let scheduledEventsJSONArray = JSONObject[JSONKey.schedule.rawValue]?.arrayValue,
-            let scheduledEvents = Identifier.fromJSON(scheduledEventsJSONArray),
+            let scheduledEvents = Identifier.from(json: scheduledEventsJSONArray),
             let ticketsJSONArray = JSONObject[JSONKey.tickets.rawValue]?.arrayValue,
-            let tickets = Identifier.fromJSON(ticketsJSONArray)
+            let tickets = Identifier.from(json: ticketsJSONArray)
             else { return nil }
         
         self.identifier = identifier
diff --git a/OpenStack Summit/CoreSummit/AttendeeManagedObject.swift b/OpenStack Summit/CoreSummit/AttendeeManagedObject.swift
index d9770a76..d78f9851 100644
--- a/OpenStack Summit/CoreSummit/AttendeeManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/AttendeeManagedObject.swift	
@@ -22,8 +22,8 @@ extension Attendee: CoreDataDecodable {
     
     public init(managedObject: AttendeeManagedObject) {
         
-        self.identifier = managedObject.identifier
-        self.member = managedObject.member.identifier
+        self.identifier = managedObject.id
+        self.member = managedObject.member.id
         self.tickets = managedObject.tickets.identifiers
         self.schedule = managedObject.schedule.identifiers
     }
@@ -31,7 +31,7 @@ extension Attendee: CoreDataDecodable {
 
 extension Attendee: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> AttendeeManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> AttendeeManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/CollectionType.swift b/OpenStack Summit/CoreSummit/CollectionType.swift
index 5457e273..7e4250c3 100644
--- a/OpenStack Summit/CoreSummit/CollectionType.swift	
+++ b/OpenStack Summit/CoreSummit/CollectionType.swift	
@@ -6,16 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-public extension CollectionType {
-    
-    @inline(__always)
-    func firstMatching(@noescape predicate: (Self.Generator.Element) throws -> Bool) rethrows -> Self.Generator.Element? {
-        
-        guard let index = try self.indexOf(predicate)
-            else { return nil }
-        
-        return self[index]
-    }
+public extension Collection {
     
     /// Attempt to reduce and convert the contents of the collection to another type.
     func reduce<T>(to type: T.Type) -> [T] {
@@ -32,4 +23,4 @@ public extension CollectionType {
         
         return newTypeArray
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/CompanyJSON.swift b/OpenStack Summit/CoreSummit/CompanyJSON.swift
index 37b22d3c..d3a78b80 100644
--- a/OpenStack Summit/CoreSummit/CompanyJSON.swift	
+++ b/OpenStack Summit/CoreSummit/CompanyJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Company {
     
@@ -18,14 +18,14 @@ public extension Company {
 
 extension Company: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String
             else { return nil }
         
         self.identifier = identifier
         self.name = name
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/CompanyManagedObject.swift b/OpenStack Summit/CoreSummit/CompanyManagedObject.swift
index a1ff637a..c34141d1 100644
--- a/OpenStack Summit/CoreSummit/CompanyManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/CompanyManagedObject.swift	
@@ -24,14 +24,14 @@ extension Company: CoreDataDecodable {
     
     public init(managedObject: CompanyManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
     }
 }
 
 extension Company: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> CompanyManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> CompanyManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/Comparison.swift b/OpenStack Summit/CoreSummit/Comparison.swift
deleted file mode 100644
index 34320a82..00000000
--- a/OpenStack Summit/CoreSummit/Comparison.swift	
+++ /dev/null
@@ -1,270 +0,0 @@
-//
-//  Comparison.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-public struct Comparision {
-    
-    public var expression: (left: Expression, right: Expression)
-    
-    public var type: Operator
-    
-    public var modifier: Modifier?
-    
-    public var options: Set<Option>
-    
-    init(expression: (left: Expression, right: Expression),
-         type: Operator = .equalTo,
-         modifier: Modifier? = nil,
-         options: Set<Option> = []) {
-        
-        self.expression = expression
-        self.type = type
-        self.modifier = modifier
-        self.options = options
-    }
-}
-
-// MARK: - Supporting Types
-
-public extension Comparision {
-
-    public enum Modifier: String {
-        
-        case all        = "ALL"
-        case any        = "ANY"
-    }
-    
-    public enum Option: String {
-        
-        /// A case-insensitive predicate.
-        case caseInsensitive        = "c"
-        
-        /// A diacritic-insensitive predicate.
-        case diacriticInsensitive   = "d"
-        
-        /// Indicates that the strings to be compared have been preprocessed.
-        case normalized             = "n"
-        
-        /// Indicates that strings to be compared using `<`, `<=`, `=`, `=>`, `>`
-        /// should be handled in a locale-aware fashion.
-        case localeSensitive        = "l"
-    }
-    
-    public enum Operator: String {
-        
-        case lessThan               = "<"
-        case lessThanOrEqualTo      = "<="
-        case greaterThan            = ">"
-        case greaterThanOrEqualTo   = ">="
-        case equalTo                = "="
-        case notEqualTo             = "!="
-        case matches                = "MATCHES"
-        case like                   = "LIKE"
-        case beginsWith             = "BEGINSWITH"
-        case endsWith               = "ENDSWITH"
-        case `in`                   = "IN"
-        case contains               = "CONTAINS"
-        case between                = "BETWEEN"
-    }
-}
-
-// MARK: - Equatable
-
-extension Comparision: Equatable { }
-
-public func == (lhs: Comparision, rhs: Comparision) -> Bool {
-    
-    return lhs.expression.left == rhs.expression.left
-        && lhs.expression.right == rhs.expression.right
-        && lhs.type == rhs.type
-        && lhs.modifier == rhs.modifier
-        && lhs.options == rhs.options
-}
-
-// MARK: - CustomStringConvertible
-
-extension Comparision: CustomStringConvertible {
-    
-    public var description: String {
-        
-        let modifier = self.modifier?.rawValue ?? ""
-        
-        let leftExpression = "\(self.expression.left)"
-        
-        let type = self.type.rawValue
-        
-        let options = self.options.isEmpty ? "" : "[" + self.options
-            .sort({ $0.0.rawValue < $0.1.rawValue })
-            .reduce("") { $0.0 + $0.1.rawValue }
-            + "]"
-        
-        let rightExpression = "\(self.expression.right)"
-        
-        let components = [modifier, leftExpression, type + options, rightExpression]
-        
-        return components.reduce("") { $0.0 + "\($0.0.isEmpty ? "" : " ")" + $0.1 }
-    }
-}
-
-// MARK: - Operators
-
-public func < (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .lessThan)
-    
-    return .comparison(comparision)
-}
-
-public func <= (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .lessThanOrEqualTo)
-    
-    return .comparison(comparision)
-}
-
-public func > (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .greaterThan)
-    
-    return .comparison(comparision)
-}
-
-public func >= (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .greaterThanOrEqualTo)
-    
-    return .comparison(comparision)
-}
-
-public func == (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .equalTo)
-    
-    return .comparison(comparision)
-}
-
-public func != (lhs: Expression, rhs: Expression) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: lhs, right: rhs),
-                                  type: .notEqualTo)
-    
-    return .comparison(comparision)
-}
-
-// LHS keypath and RHS predicate value
-
-public func < <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .lessThan)
-    
-    return .comparison(comparision)
-}
-
-public func <= <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .lessThanOrEqualTo)
-    
-    return .comparison(comparision)
-}
-
-public func > <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .greaterThan)
-    
-    return .comparison(comparision)
-}
-
-public func >= <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .greaterThanOrEqualTo)
-    
-    return .comparison(comparision)
-}
-
-public func == <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .equalTo)
-    
-    return .comparison(comparision)
-}
-
-
-public func != <T: PredicateValue>(lhs: String, rhs: T) -> Predicate {
-    
-    let comparision = Comparision(expression: (left: .keyPath(lhs), right: .value(rhs.predicateValue)),
-                                  type: .notEqualTo)
-    
-    return .comparison(comparision)
-}
-
-// Extensions for KeyPath comparisions
-public extension String {
-    
-    func compare(type: Comparision.Operator, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (.keyPath(self), rhs), type: type)
-        
-        return .comparison(comparision)
-    }
-    
-    func compare(type: Comparision.Operator, _ options: Set<Comparision.Option>, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (.keyPath(self), rhs), type: type, options: options)
-        
-        return .comparison(comparision)
-    }
-    
-    func compare(modifier: Comparision.Modifier, _ type: Comparision.Operator, _ options: Set<Comparision.Option>, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (.keyPath(self), rhs), type: type, modifier: modifier, options: options)
-        
-        return .comparison(comparision)
-    }
-    
-    func any <Value: PredicateValue> (in collection: [Value]) -> Predicate {
-        
-        let values = collection.map { $0.predicateValue }
-        
-        let rightExpression = Expression.value(.collection(values))
-        
-        let comparision = Comparision(expression: (.keyPath(self), rightExpression), type: .`in`, modifier: .any)
-        
-        return .comparison(comparision)
-    }
-    
-    func all <Value: PredicateValue> (in collection: [Value]) -> Predicate {
-        
-        let values = collection.map { $0.predicateValue }
-        
-        let rightExpression = Expression.value(.collection(values))
-        
-        let comparision = Comparision(expression: (.keyPath(self), rightExpression), type: .`in`, modifier: .all)
-        
-        return .comparison(comparision)
-    }
-    
-    func `in` <Value: PredicateValue> (collection: [Value], options: Set<Comparision.Option> = []) -> Predicate {
-        
-        let values = collection.map { $0.predicateValue }
-        
-        let rightExpression = Expression.value(.collection(values))
-        
-        let comparision = Comparision(expression: (.keyPath(self), rightExpression), type: .`in`, options: options)
-        
-        return .comparison(comparision)
-    }
-}
diff --git a/OpenStack Summit/CoreSummit/Compound.swift b/OpenStack Summit/CoreSummit/Compound.swift
deleted file mode 100644
index ac0ea387..00000000
--- a/OpenStack Summit/CoreSummit/Compound.swift	
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-//  Compound.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-/// Predicate type used to represent logical “gate” operations (AND/OR/NOT) and comparison operations.
-public indirect enum Compound {
-    
-    case and([Predicate])
-    case or([Predicate])
-    case not(Predicate)
-}
-
-// MARK: - Accessors
-
-public extension Compound {
-    
-    public var type: Logical​Type {
-        
-        switch self {
-        case .and:  return .and
-        case .or:   return .or
-        case .not:  return .not
-        }
-    }
-    
-    public var subpredicates: [Predicate] {
-        
-        switch self {
-        case let .and(subpredicates):   return subpredicates
-        case let .or(subpredicates):    return subpredicates
-        case let .not(subpredicate):    return [subpredicate]
-        }
-    }
-}
-
-// MARK: - Supporting Types
-
-public extension Compound {
-    
-    /// Possible Compund Predicate types.
-    public enum Logical​Type: String {
-        
-        /// A logical NOT predicate.
-        case not = "NOT"
-        
-        /// A logical AND predicate.
-        case and = "AND"
-        
-        /// A logical OR predicate.
-        case or = "OR"
-    }
-}
-
-// MARK: - Equatable
-
-extension Compound: Equatable { }
-
-public func == (lhs: Compound, rhs: Compound) -> Bool {
-    
-    switch (lhs, rhs) {
-    case let (.and(lhsValue), .and(rhsValue)): return lhsValue == rhsValue
-    case let (.or(lhsValue), .or(rhsValue)): return lhsValue == rhsValue
-    case let (.not(lhsValue), .not(rhsValue)): return lhsValue == rhsValue
-    default: return false
-    }
-}
-
-// MARK: - CustomStringConvertible
-
-extension Compound: CustomStringConvertible {
-    
-    public var description: String {
-        
-        guard subpredicates.isEmpty == false else {
-            
-            return "(Empty \(type) predicate)"
-        }
-        
-        var text = ""
-        
-        for (index, predicate) in subpredicates.enumerate() {
-            
-            let showType: Bool
-            
-            if index == 0 {
-                
-                showType = subpredicates.count == 1
-                
-            } else {
-                
-                showType = true
-                
-                text += " "
-            }
-            
-            if showType {
-                
-                text += type.rawValue + " "
-            }
-            
-            let includeBrackets: Bool
-            
-            switch predicate {
-            case .compound: includeBrackets = true
-            case .comparison, .value: includeBrackets = false
-            }
-            
-            text += includeBrackets ? "(" + predicate.description + ")" : predicate.description
-        }
-        
-        return text
-    }
-}
-
-// MARK: - Predicate Operators
-
-// Not `&&` becuase of Swift 2 compiler limitations
-// http://stackoverflow.com/questions/28816048/swift-expressions-was-too-complex-to-be-solved-in-reasonable-time
-
-infix operator &&& {
-    associativity left
-    precedence 120
-}
-
-infix operator ||| {
-    associativity left
-    precedence 110
-}
-
-public func &&& (lhs: Predicate, rhs: Predicate) -> Predicate {
-    
-    return .compound(.and([lhs, rhs]))
-}
-
-public func &&& (lhs: Predicate, rhs: [Predicate]) -> Predicate {
-    
-    return .compound(.and([lhs] + rhs))
-}
-
-public func ||| (lhs: Predicate, rhs: Predicate) -> Predicate {
-    
-    return .compound(.or([lhs, rhs]))
-}
-
-public func ||| (lhs: Predicate, rhs: [Predicate]) -> Predicate {
-    
-    return .compound(.or([lhs] + rhs))
-}
-
-public prefix func ! (rhs: Predicate) -> Predicate {
-    
-    return .compound(.not(rhs))
-}
diff --git a/OpenStack Summit/CoreSummit/Configuration.swift b/OpenStack Summit/CoreSummit/Configuration.swift
index b3daf881..75f9d68a 100644
--- a/OpenStack Summit/CoreSummit/Configuration.swift	
+++ b/OpenStack Summit/CoreSummit/Configuration.swift	
@@ -20,7 +20,7 @@ public protocol Configuration {
     static var serviceAccount: (client: String, secret: String) { get }
     
     /// OpenStack Summit Webpage URL.
-    static var webpageURL: String { get }
+    static var webpage: URL { get }
 }
 
 public extension Environment {
@@ -28,8 +28,8 @@ public extension Environment {
     var configuration: Configuration.Type {
         
         switch self {
-        case .Staging: return CoreSummit.Staging.self
-        case .Production: return CoreSummit.Production.self
+        case .staging: return Staging.self
+        case .production: return Production.self
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/CoreDataDecodable.swift b/OpenStack Summit/CoreSummit/CoreDataDecodable.swift
index 2a1178e6..9d5dc5f6 100644
--- a/OpenStack Summit/CoreSummit/CoreDataDecodable.swift	
+++ b/OpenStack Summit/CoreSummit/CoreDataDecodable.swift	
@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 /// Specifies how a type can be decoded from Core Data.
 public protocol CoreDataDecodable {
@@ -20,12 +21,12 @@ public protocol CoreDataDecodable {
 public extension NSManagedObjectContext {
     
     /// Executes a fetch request and returns ```CoreDataDecodable``` types.
-    func fetch<T: CoreDataDecodable>(fetchRequest: NSFetchRequest) throws -> [T] {
+    func fetch<T: CoreDataDecodable>(_ fetchRequest: NSFetchRequest<T.ManagedObject>) throws -> [T] {
         
-        guard fetchRequest.resultType == .ManagedObjectResultType
+        guard fetchRequest.resultType == NSFetchRequestResultType()
             else { fatalError("Method only supports fetch requests with NSFetchRequestManagedObjectResultType") }
         
-        let managedObjects = try self.executeFetchRequest(fetchRequest) as! [T.ManagedObject]
+        let managedObjects = try self.fetch(fetchRequest)
         
         let decodables = managedObjects.map { T.init(managedObject: $0) }
         
@@ -33,46 +34,96 @@ public extension NSManagedObjectContext {
     }
     
     @inline(__always)
-    func managedObjects<T: CoreDataDecodable>(decodableType: T.Type, predicate: NSPredicate? = nil, sortDescriptors: [NSSortDescriptor] = [], limit: Int = 0) throws -> [T] {
+    func managedObjects<T: CoreDataDecodable>(_ decodableType: T.Type,
+                        predicate: NSPredicate? = nil,
+                        sortDescriptors: [NSSortDescriptor] = [],
+                        limit: Int = 0) throws -> [T] {
         
-        let results = try self.managedObjects(decodableType.ManagedObject.self, predicate: predicate, sortDescriptors: sortDescriptors, limit: limit)
+        let results = try self.managedObjects(decodableType.ManagedObject.self,
+                                              predicate: predicate,
+                                              sortDescriptors: sortDescriptors,
+                                              limit: limit)
         
         return T.from(managedObjects: results)
     }
     
     @inline(__always)
-    func managedObjects<T: CoreDataDecodable>(decodableType: T.Type, predicate: Predicate, sortDescriptors: [NSSortDescriptor] = []) throws -> [T] {
+    func managedObjects<T: CoreDataDecodable>(_ decodableType: T.Type,
+                        predicate: Predicate,
+                        sortDescriptors: [NSSortDescriptor] = [],
+                        limit: Int = 0) throws -> [T] {
         
-        let results = try self.managedObjects(decodableType.ManagedObject.self, predicate: predicate.toFoundation(), sortDescriptors: sortDescriptors)
+        let results = try self.managedObjects(decodableType.ManagedObject.self,
+                                              predicate: predicate.toFoundation(),
+                                              sortDescriptors: sortDescriptors,
+                                              limit: limit)
         
         return T.from(managedObjects: results)
     }
 }
 
+/* Swift 3 compile error
 @available(OSX 10.12, *)
 public extension NSFetchedResultsController {
     
-    convenience init<T: CoreDataDecodable>(_ decodable: T.Type, delegate: NSFetchedResultsControllerDelegate? = nil, predicate: NSPredicate? = nil, sortDescriptors: [NSSortDescriptor] = [], sectionNameKeyPath: String? = nil, context: NSManagedObjectContext) {
+    convenience init <T: CoreDataDecodable>
+        (_ decodable: T.Type,
+         delegate: NSFetchedResultsControllerDelegate? = nil,
+         predicate: NSPredicate? = nil,
+         sortDescriptors: [NSSortDescriptor] = [],
+         sectionNameKeyPath: String? = nil,
+         context: NSManagedObjectContext) {
         
         let managedObjectType = T.ManagedObject.self
         
         let entity = context.persistentStoreCoordinator!.managedObjectModel[managedObjectType]!
         
-        let fetchRequest = NSFetchRequest(entityName: entity.name!)
+        let fetchRequest = NSFetchRequest<T.ManagedObject>(entityName: entity.name!)
         
         fetchRequest.predicate = predicate
         
         fetchRequest.sortDescriptors = sortDescriptors
         
-        self.init(fetchRequest: fetchRequest, managedObjectContext: context, sectionNameKeyPath: sectionNameKeyPath, cacheName: nil)
+        self.init(fetchRequest: fetchRequest as! NSFetchRequest<_>,
+                  managedObjectContext: context, sectionNameKeyPath: sectionNameKeyPath, cacheName: nil)
         
         self.delegate = delegate
     }
 }
+ */
+
+public func NSFetchedResultsController <T: CoreDataDecodable>
+    (_ decodable: T.Type,
+     delegate: NSFetchedResultsControllerDelegate? = nil,
+     predicate: Predicate? = nil,
+     sortDescriptors: [NSSortDescriptor] = [],
+     sectionNameKeyPath: String? = nil,
+     context: NSManagedObjectContext) -> NSFetchedResultsController<T.ManagedObject> {
+    
+    let managedObjectType = T.ManagedObject.self
+    
+    let entity = context.persistentStoreCoordinator!.managedObjectModel[managedObjectType]!
+    
+    let fetchRequest = NSFetchRequest<T.ManagedObject>(entityName: entity.name!)
+    
+    fetchRequest.predicate = predicate?.toFoundation()
+    
+    fetchRequest.sortDescriptors = sortDescriptors
+    
+    let fetchedResultsController = CoreData.NSFetchedResultsController.init(fetchRequest: fetchRequest,
+                                                                            managedObjectContext: context,
+                                                                            sectionNameKeyPath: sectionNameKeyPath,
+                                                                            cacheName: nil)
+    
+    fetchedResultsController.delegate = delegate
+    
+    return fetchedResultsController
+}
 
 public extension CoreDataDecodable {
     
-    static func from<C: CollectionType where C.Generator.Element == ManagedObject>(managedObjects managedObjects: C) -> [Self] {
+    static func from <C: RandomAccessCollection> (managedObjects: C) -> [Self]
+        where C.Iterator.Element == ManagedObject {
         
         return managedObjects.map { self.init(managedObject: $0) }
     }
@@ -80,7 +131,7 @@ public extension CoreDataDecodable {
 
 public extension CoreDataDecodable where Self: Hashable {
     
-    static func from(managedObjects managedObjects: Set<ManagedObject>) -> Set<Self> {
+    static func from(managedObjects: Set<ManagedObject>) -> Set<Self> {
         
         return Set(managedObjects.map({ self.init(managedObject: $0) }))
     }
diff --git a/OpenStack Summit/CoreSummit/CoreDataEncodable.swift b/OpenStack Summit/CoreSummit/CoreDataEncodable.swift
index eaa58bba..90543b86 100644
--- a/OpenStack Summit/CoreSummit/CoreDataEncodable.swift	
+++ b/OpenStack Summit/CoreSummit/CoreDataEncodable.swift	
@@ -14,14 +14,14 @@ public protocol CoreDataEncodable {
     
     associatedtype ManagedObject: NSManagedObject
     
-    func save(context: NSManagedObjectContext) throws -> ManagedObject
+    func save(_ context: NSManagedObjectContext) throws -> ManagedObject
 }
 
-public extension CollectionType where Generator.Element: CoreDataEncodable {
+public extension Collection where Iterator.Element: CoreDataEncodable {
     
-    func save(context: NSManagedObjectContext) throws -> Set<Self.Generator.Element.ManagedObject> {
+    func save(_ context: NSManagedObjectContext) throws -> Set<Self.Iterator.Element.ManagedObject> {
         
-        var managedObjects = ContiguousArray<Generator.Element.ManagedObject>()
+        var managedObjects = ContiguousArray<Iterator.Element.ManagedObject>()
         managedObjects.reserveCapacity(numericCast(self.count))
         
         for element in self {
@@ -33,4 +33,4 @@ public extension CollectionType where Generator.Element: CoreDataEncodable {
         
         return Set(managedObjects)
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/CoreDataExtensions.swift b/OpenStack Summit/CoreSummit/CoreDataExtensions.swift
index e8085650..89b262ad 100644
--- a/OpenStack Summit/CoreSummit/CoreDataExtensions.swift	
+++ b/OpenStack Summit/CoreSummit/CoreDataExtensions.swift	
@@ -8,18 +8,19 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 public extension NSManagedObjectContext {
     
     /// Wraps the block to allow for error throwing.
     @available(OSX 10.7, *)
-    func performErrorBlockAndWait<T>(block: () throws -> T) throws -> T {
+    func performErrorBlockAndWait<T>(_ block: @escaping () throws -> T) throws -> T {
         
-        var blockError: ErrorType?
+        var blockError: Swift.Error?
         
         var value: T!
         
-        self.performBlockAndWait {
+        self.performAndWait {
             
             do { value = try block() }
             
@@ -37,11 +38,11 @@ public extension NSManagedObjectContext {
     }
     
     @inline(__always)
-    func find<T: NSManagedObject, V: AnyObject>(entity: NSEntityDescription, resourceID: V, identifierProperty: String, returnsObjectsAsFaults: Bool = true, includesSubentities: Bool = true) throws -> T? {
+    func find<T: NSManagedObject, V: AnyObject>(_ entity: NSEntityDescription, resourceID: V, identifierProperty: String, returnsObjectsAsFaults: Bool = true, includesSubentities: Bool = true) throws -> T? {
         
         // get cached resource...
         
-        let fetchRequest = NSFetchRequest(entityName: entity.name!)
+        let fetchRequest = NSFetchRequest<T>(entityName: entity.name!)
         
         fetchRequest.fetchLimit = 1
         
@@ -51,15 +52,15 @@ public extension NSManagedObjectContext {
         
         // create predicate
         
-        fetchRequest.predicate = NSComparisonPredicate(leftExpression: NSExpression(forKeyPath: identifierProperty), rightExpression: NSExpression(forConstantValue: resourceID), modifier: NSComparisonPredicateModifier.DirectPredicateModifier, type: NSPredicateOperatorType.EqualToPredicateOperatorType, options: NSComparisonPredicateOptions.NormalizedPredicateOption)
+        fetchRequest.predicate = NSComparisonPredicate(leftExpression: NSExpression(forKeyPath: identifierProperty), rightExpression: NSExpression(forConstantValue: resourceID), modifier: NSComparisonPredicate.Modifier.direct, type: NSComparisonPredicate.Operator.equalTo, options: NSComparisonPredicate.Options.normalized)
         
         // fetch
         
-        return try self.executeFetchRequest(fetchRequest).first as! T?
+        return try self.fetch(fetchRequest).first
     }
     
     @inline(__always)
-    func findOrCreate<T: NSManagedObject, V: AnyObject>(entity: NSEntityDescription, resourceID: V, identifierProperty: String, returnsObjectsAsFaults: Bool = true, includesSubentities: Bool = true) throws -> T {
+    func findOrCreate<T: NSManagedObject, V: AnyObject>(_ entity: NSEntityDescription, resourceID: V, identifierProperty: String, returnsObjectsAsFaults: Bool = true, includesSubentities: Bool = true) throws -> T {
         
         let resource: T
         
@@ -72,7 +73,7 @@ public extension NSManagedObjectContext {
         else {
             
             // create a new entity
-            let newManagedObject = NSEntityDescription.insertNewObjectForEntityForName(entity.name!, inManagedObjectContext: self)
+            let newManagedObject = NSEntityDescription.insertNewObject(forEntityName: entity.name!, into: self)
             
             // set resource ID
             (newManagedObject).setValue(resourceID, forKey: identifierProperty)
@@ -84,11 +85,11 @@ public extension NSManagedObjectContext {
     }
     
     @inline(__always)
-    func managedObjects<ManagedObject: NSManagedObject>(managedObjectType: ManagedObject.Type, predicate: NSPredicate? = nil, sortDescriptors: [NSSortDescriptor] = [], limit: Int = 0) throws -> [ManagedObject] {
+    func managedObjects<ManagedObject: NSManagedObject>(_ managedObjectType: ManagedObject.Type, predicate: NSPredicate? = nil, sortDescriptors: [NSSortDescriptor] = [], limit: Int = 0) throws -> [ManagedObject] {
         
         let entity = self.persistentStoreCoordinator!.managedObjectModel[managedObjectType]!
         
-        let fetchRequest = NSFetchRequest(entityName: entity.name!)
+        let fetchRequest = NSFetchRequest<ManagedObject>(entityName: entity.name!)
         
         fetchRequest.predicate = predicate
         
@@ -96,37 +97,37 @@ public extension NSManagedObjectContext {
         
         fetchRequest.fetchLimit = limit
         
-        return try self.executeFetchRequest(fetchRequest) as! [ManagedObject]
+        return try self.fetch(fetchRequest)
     }
     
     @inline(__always)
-    func managedObjects<ManagedObject: NSManagedObject>(managedObjectType: ManagedObject.Type, predicate: Predicate, sortDescriptors: [NSSortDescriptor] = []) throws -> [ManagedObject] {
+    func managedObjects<ManagedObject: NSManagedObject>(_ managedObjectType: ManagedObject.Type, predicate: Predicate, sortDescriptors: [NSSortDescriptor] = [], limit: Int = 0) throws -> [ManagedObject] {
         
-        return try managedObjects(managedObjectType, predicate: predicate.toFoundation(), sortDescriptors: sortDescriptors)
+        return try managedObjects(managedObjectType, predicate: predicate.toFoundation(), sortDescriptors: sortDescriptors, limit: limit)
     }
     
     @inline(__always)
-    func count<ManagedObject: NSManagedObject>(managedObjectType: ManagedObject.Type, predicate: NSPredicate? = nil) throws -> Int {
+    func count<ManagedObject: NSManagedObject>(_ managedObjectType: ManagedObject.Type, predicate: NSPredicate? = nil) throws -> Int {
         
         let entity = self.persistentStoreCoordinator!.managedObjectModel[managedObjectType]!
         
-        let fetchRequest = NSFetchRequest(entityName: entity.name!)
+        let fetchRequest = NSFetchRequest<NSNumber>(entityName: entity.name!)
         
-        fetchRequest.resultType = .CountResultType
+        fetchRequest.resultType = .countResultType
         
         fetchRequest.predicate = predicate
         
-        return (try self.executeFetchRequest(fetchRequest) as! [NSNumber]).first!.integerValue
+        return try self.fetch(fetchRequest).first!.intValue
     }
     
     @inline(__always)
-    func count<ManagedObject: NSManagedObject>(managedObjectType: ManagedObject.Type, predicate: CoreSummit.Predicate) throws -> Int {
+    func count<ManagedObject: NSManagedObject>(_ managedObjectType: ManagedObject.Type, predicate: Predicate) throws -> Int {
         
         return try count(managedObjectType, predicate: predicate.toFoundation())
     }
     
     /// Save and attempt to recover from validation errors
-    func validateAndSave(fileName: String = #file, _ lineNumber: Int = #line) throws {
+    func validateAndSave(_ fileName: String = #file, _ lineNumber: Int = #line) throws {
         
         do { try save() }
         
@@ -139,7 +140,7 @@ public extension NSManagedObjectContext {
                 else { throw error }
             
             // delete invalid objects
-            invalidObjects.forEach { self.deleteObject($0) }
+            invalidObjects.forEach { self.delete($0) }
             
             #if DEBUG
             print("CoreData validation error at \(fileName):\(lineNumber)\n\(error)")
@@ -159,7 +160,7 @@ public extension NSManagedObjectModel {
         
         let className = NSStringFromClass(managedObjectType)
         
-        return self.entities.firstMatching { $0.managedObjectClassName == className }
+        return self.entities.first { $0.managedObjectClassName == className }
     }
 }
 
diff --git a/OpenStack Summit/CoreSummit/DataUpdate.swift b/OpenStack Summit/CoreSummit/DataUpdate.swift
index 6da0646d..c393b585 100644
--- a/OpenStack Summit/CoreSummit/DataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/DataUpdate.swift	
@@ -6,8 +6,9 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreData
+import JSON
 
 public struct DataUpdate {
     
@@ -28,16 +29,16 @@ public extension DataUpdate {
     
     public enum Operation: String {
         
-        case Insert     = "INSERT"
-        case Update     = "UPDATE"
-        case Delete     = "DELETE"
-        case Truncate   = "TRUNCATE"
+        case insert     = "INSERT"
+        case update     = "UPDATE"
+        case delete     = "DELETE"
+        case truncate   = "TRUNCATE"
     }
     
     public enum Entity {
         
-        case Identifier(CoreSummit.Identifier)
-        case JSON(SwiftFoundation.JSON.Object)
+        case identifier(CoreSummit.Identifier)
+        case json(JSON.Object)
     }
     
     public enum ClassName: String {
@@ -70,25 +71,26 @@ public extension DataUpdate {
         case SponsorFromEvent
         case SummitGroupEvent
         case SummitWIFIConnection
+        case SummitExternalLocation
         
         internal var type: Updatable.Type? {
             
             switch self {
             case .WipeData: return nil
-            case .MySchedule, .MyFavorite: return CoreSummit.EventDataUpdate.self
+            case .MySchedule, .MyFavorite: return CoreSummit.Event.DataUpdate.self
             case .Summit: return CoreSummit.Summit.DataUpdate.self
-            case .Presentation: return CoreSummit.EventDataUpdate.self
-            case .SummitEvent, .SummitEventWithFile: return CoreSummit.EventDataUpdate.self
+            case .Presentation: return CoreSummit.Event.DataUpdate.self
+            case .SummitEvent, .SummitEventWithFile: return CoreSummit.Event.DataUpdate.self
             case .SummitGroupEvent: return CoreSummit.GroupEventDataUpdate.self
             case .SummitType: return CoreSummit.SummitType.self
             case .SummitEventType: return CoreSummit.EventType.self
             case .PresentationSpeaker: return CoreSummit.Speaker.self
             case .SummitTicketType: return CoreSummit.TicketType.self
-            case .SummitVenue: return CoreSummit.Venue.self
+            case .SummitVenue, .SummitExternalLocation: return CoreSummit.Venue.self
             case .SummitVenueFloor: return CoreSummit.VenueFloor.self
-            case .SummitVenueRoom: return CoreSummit.VenueRoomDataUpdate.self
+            case .SummitVenueRoom: return CoreSummit.VenueRoom.DataUpdate.self
             case .PresentationCategory: return CoreSummit.Track.self
-            case .PresentationCategoryGroup, .PrivatePresentationCategoryGroup: return CoreSummit.TrackGroupDataUpdate.self
+            case .PresentationCategoryGroup, .PrivatePresentationCategoryGroup: return CoreSummit.TrackGroup.DataUpdate.self
             case .SummitLocationMap, .SummitLocationImage: return CoreSummit.Image.self
             case .SummitWIFIConnection: return CoreSummit.WirelessNetwork.self
             case .PresentationVideo: return CoreSummit.Video.self
@@ -122,7 +124,7 @@ public extension Store {
             #endif
             
             // truncate
-            guard dataUpdate.operation != .Truncate else {
+            guard dataUpdate.operation != .truncate else {
                 
                 guard dataUpdate.className == .WipeData
                     else { return false }
@@ -148,11 +150,11 @@ public extension Store {
                 
                 switch dataUpdate.operation {
                     
-                case .Insert:
+                case .insert:
                     
                     guard let entityJSON = dataUpdate.entity,
-                        case let .JSON(jsonObject) = entityJSON,
-                        let event = EventDataUpdate.init(JSONValue: .Object(jsonObject))
+                        case let .json(jsonObject) = entityJSON,
+                        let event = Event.DataUpdate.init(json: .object(jsonObject))
                         else { return false }
                     
                     let eventManagedObject = try event.write(context, summit: summit) as! EventManagedObject
@@ -161,10 +163,10 @@ public extension Store {
                     
                     return true
                     
-                case .Delete:
+                case .delete:
                     
                     guard let entityID = dataUpdate.entity,
-                        case let .Identifier(identifier) = entityID
+                        case let .identifier(identifier) = entityID
                         else { return false }
                     
                     if let eventManagedObject = try EventManagedObject.find(identifier, context: context) {
@@ -187,11 +189,11 @@ public extension Store {
                 
                 switch dataUpdate.operation {
                     
-                case .Insert:
+                case .insert:
                     
                     guard let entityJSON = dataUpdate.entity,
-                        case let .JSON(jsonObject) = entityJSON,
-                        let event = EventDataUpdate.init(JSONValue: .Object(jsonObject))
+                        case let .json(jsonObject) = entityJSON,
+                        let event = Event.DataUpdate.init(json: .object(jsonObject))
                         else { return false }
                     
                     let eventManagedObject = try event.write(context, summit: summit) as! EventManagedObject
@@ -200,10 +202,10 @@ public extension Store {
                     
                     return true
                     
-                case .Delete:
+                case .delete:
                     
                     guard let entityID = dataUpdate.entity,
-                        case let .Identifier(identifier) = entityID
+                        case let .identifier(identifier) = entityID
                         else { return false }
                     
                     if let eventManagedObject = try EventManagedObject.find(identifier, context: context) {
@@ -222,16 +224,16 @@ public extension Store {
                 else { return true }
             
             // delete
-            guard dataUpdate.operation != .Delete else {
+            guard dataUpdate.operation != .delete else {
                 
                 guard let entityID = dataUpdate.entity,
-                    case let .Identifier(identifier) = entityID
+                    case let .identifier(identifier) = entityID
                     else { return false }
                 
                 // if it doesnt exist, dont delete it
                 if let foundEntity = try type.find(identifier, context: context) {
                     
-                    context.deleteObject(foundEntity)
+                    context.delete(foundEntity)
                 }
                 
                 return true
@@ -239,8 +241,8 @@ public extension Store {
             
             // parse JSON
             guard let entityJSON = dataUpdate.entity,
-                case let .JSON(jsonObject) = entityJSON,
-                let entity = type.init(JSONValue: .Object(jsonObject))
+                case let .json(jsonObject) = entityJSON,
+                let entity = type.init(json: .object(jsonObject))
                 else { return false }
             
             switch dataUpdate.className {
@@ -269,7 +271,7 @@ public extension Store {
             default:
                 
                 // insert or update
-                try entity.write(context, summit: summit)
+                let _ = try entity.write(context, summit: summit)
                 
                 return true
             }
@@ -284,22 +286,22 @@ public extension Store {
 /// The model type can be updated remotely
 internal protocol Updatable: JSONDecodable {
     
-    static func find(identifier: Identifier, context: NSManagedObjectContext) throws -> Entity?
+    static func find(_ identifier: Identifier, context: NSManagedObjectContext) throws -> Entity?
     
     /// Encodes to CoreData.
-    func write(context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity
+    func write(_ context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity
 }
 
 extension Updatable where Self: CoreDataEncodable, Self.ManagedObject: Entity {
     
     @inline(__always)
-    static func find(identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
+    static func find(_ identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
         
         return try ManagedObject.find(identifier, context: context)
     }
     
     @inline(__always)
-    func write(context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
+    func write(_ context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
         
         return try self.save(context)
     }
@@ -312,9 +314,9 @@ extension Speaker: Updatable { }
 extension TicketType: Updatable { }
 extension Venue: Updatable { }
 extension VenueFloor: Updatable { }
-extension VenueRoomDataUpdate: Updatable { }
+extension VenueRoom.DataUpdate: Updatable { }
 extension Track: Updatable { }
-extension TrackGroupDataUpdate: Updatable { }
+extension TrackGroup.DataUpdate: Updatable { }
 extension Image: Updatable { }
 extension GroupEventDataUpdate: Updatable { }
 extension WirelessNetwork: Updatable { }
diff --git a/OpenStack Summit/CoreSummit/DataUpdateJSON.swift b/OpenStack Summit/CoreSummit/DataUpdateJSON.swift
index 402ce456..ba78be76 100644
--- a/OpenStack Summit/CoreSummit/DataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/DataUpdateJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import struct Foundation.Date
+import JSON
 
 public extension DataUpdate {
     
@@ -18,11 +19,11 @@ public extension DataUpdate {
 
 extension DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let created = JSONObject[JSONKey.created.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let created = JSONObject[JSONKey.created.rawValue]?.integerValue,
             let classNameString = JSONObject[JSONKey.class_name.rawValue]?.rawValue as? String,
             let className = ClassName(rawValue: classNameString),
             let typeString = JSONObject[JSONKey.type.rawValue]?.rawValue as? String,
@@ -36,11 +37,11 @@ extension DataUpdate: JSONDecodable {
         
         if let entityJSON = JSONObject[JSONKey.entity.rawValue]?.objectValue {
             
-            self.entity = .JSON(entityJSON)
+            self.entity = .json(entityJSON)
             
-        } else if let entityID = JSONObject[JSONKey.entity_id.rawValue]?.rawValue as? Int {
+        } else if let entityID = JSONObject[JSONKey.entity_id.rawValue]?.integerValue {
             
-            self.entity = .Identifier(entityID)
+            self.entity = .identifier(entityID)
             
         } else {
             
diff --git a/OpenStack Summit/CoreSummit/DataUpdatePoller.swift b/OpenStack Summit/CoreSummit/DataUpdatePoller.swift
index a745cc03..be2ee25d 100644
--- a/OpenStack Summit/CoreSummit/DataUpdatePoller.swift	
+++ b/OpenStack Summit/CoreSummit/DataUpdatePoller.swift	
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import SwiftFoundation
+import JSON
 
 #if os(iOS)
 import Crashlytics
@@ -30,7 +30,7 @@ public final class DataUpdatePoller {
     
     // MARK: - Private Properties
     
-    private var timer: NSTimer?
+    private var timer: Timer?
     
     // MARK: - Initialization
     
@@ -51,7 +51,7 @@ public final class DataUpdatePoller {
         
         timer?.invalidate()
         
-        timer = NSTimer.scheduledTimerWithTimeInterval(pollingInterval, target: self, selector: #selector(DataUpdatePoller.pollServer), userInfo: nil, repeats: true)
+        timer = Timer.scheduledTimer(timeInterval: pollingInterval, target: self, selector: #selector(DataUpdatePoller.pollServer), userInfo: nil, repeats: true)
         
         pollServer()
     }
@@ -76,19 +76,19 @@ public final class DataUpdatePoller {
         log?("Polling server for data updates for summit \(summitID)")
         
         /// Handles the polling of the data updates
-        func process(response response: ErrorValue<[DataUpdate]>) {
+        func process(response: ErrorValue<[DataUpdate]>) {
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 log?("Error polling server for data updates: \(error)")
                                 
-            case let .Value(dataUpdates):
+            case let .value(dataUpdates):
                 
                 for update in dataUpdates {
                     
-                    if store.process(update, summit: summit.identifier) == false {
+                    if store.process(dataUpdate: update, summit: summit.id) == false {
                         
                         // could not process update
                         
@@ -97,9 +97,9 @@ public final class DataUpdatePoller {
                             var errorUserInfo = [NSLocalizedDescriptionKey: "Could not process data update.", "DataUpdate": "\(update)"]
                             
                             if let updateEntity = update.entity,
-                                case let .JSON(jsonObject) = updateEntity {
+                                case let .json(jsonObject) = updateEntity {
                                 
-                                let jsonString = JSON.Value.Object(jsonObject).toString()!
+                                let jsonString = try! JSON.Value.object(jsonObject).toString(options: .prettyPrint)
                                 
                                 errorUserInfo["JSON"] = jsonString
                             }
@@ -136,11 +136,11 @@ public final class DataUpdatePoller {
         
         if let latestDataUpdate = storage.latestDataUpdate {
             
-            store.dataUpdates(summit.identifier, latestDataUpdate: latestDataUpdate) { process(response: $0) }
+            store.dataUpdates(summit.id, latestDataUpdate: latestDataUpdate) { process(response: $0) }
             
         } else {
             
-            store.dataUpdates(summit.identifier, from: Date(foundation: summit.initialDataLoad ?? NSDate())) { process(response: $0) }
+            store.dataUpdates(summit.id, from: summit.initialDataLoad ?? Date()) { process(response: $0) }
         }
     }
 }
@@ -164,23 +164,23 @@ public extension DataUpdatePollerStorage {
 
 public final class UserDefaultsDataUpdatePollerStorage: DataUpdatePollerStorage {
     
-    public let userDefaults: NSUserDefaults
+    public let userDefaults: UserDefaults
     
-    public init(userDefaults: NSUserDefaults = NSUserDefaults.standardUserDefaults()) {
+    public init(userDefaults: UserDefaults = UserDefaults.standard) {
         
         self.userDefaults = userDefaults
     }
     
     public var latestDataUpdate: Identifier? {
         
-        get { return userDefaults.objectForKey(Key.LatestDataUpdate.rawValue) as? Int }
+        get { return userDefaults.object(forKey: Key.LatestDataUpdate.rawValue) as? Identifier }
         
         set {
             
             guard let value = newValue
-                else { userDefaults.removeObjectForKey(Key.LatestDataUpdate.rawValue); return }
+                else { userDefaults.removeObject(forKey: Key.LatestDataUpdate.rawValue); return }
             
-            userDefaults.setObject(value, forKey: Key.LatestDataUpdate.rawValue)
+            userDefaults.set(value, forKey: Key.LatestDataUpdate.rawValue)
         }
     }
     
diff --git a/OpenStack Summit/CoreSummit/DataUpdateRequest.swift b/OpenStack Summit/CoreSummit/DataUpdateRequest.swift
index f98948fb..d673950a 100644
--- a/OpenStack Summit/CoreSummit/DataUpdateRequest.swift	
+++ b/OpenStack Summit/CoreSummit/DataUpdateRequest.swift	
@@ -6,13 +6,14 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func dataUpdates(summit: Identifier? = nil, latestDataUpdate: Identifier, limit: Int = 100, completion: (ErrorValue<[DataUpdate]>) -> ()) {
+    func dataUpdates(_ summit: Identifier? = nil, latestDataUpdate: Identifier, limit: Int = 100, completion: @escaping (ErrorValue<[DataUpdate]>) -> ()) {
         
         let summitID: String
         
@@ -25,12 +26,12 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/" + summitID + "/entity-events?limit=\(limit)&last_event_id=\(latestDataUpdate)"
+        let uri = "/api/v1/summits/" + summitID + "/entity-events?limit=\(limit)&last_event_id=\(latestDataUpdate)"
         
-        dataUpdates(URI, completion: completion)
+        dataUpdates(uri, completion: completion)
     }
     
-    func dataUpdates(summit: Identifier? = nil, from date: Date, limit: Int = 50, completion: (ErrorValue<[DataUpdate]>) -> ()) {
+    func dataUpdates(_ summit: Identifier? = nil, from date: Date, limit: Int = 50, completion: @escaping (ErrorValue<[DataUpdate]>) -> ()) {
         
         let summitID: String
         
@@ -43,9 +44,9 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/" + summitID + "/entity-events?limit=\(limit)&from_date=\(Int(date.timeIntervalSince1970))"
+        let uri = "/api/v1/summits/" + summitID + "/entity-events?limit=\(limit)&from_date=\(Int(date.timeIntervalSince1970))"
         
-        dataUpdates(URI, completion: completion)
+        dataUpdates(uri, completion: completion)
     }
 }
 
@@ -53,25 +54,25 @@ public extension Store {
 
 private extension Store {
     
-    func dataUpdates(URI: String, completion: (ErrorValue<[DataUpdate]>) -> ()) {
+    func dataUpdates(_ uri: String, completion: @escaping (ErrorValue<[DataUpdate]>) -> ()) {
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.isLoggedIn ? self.createHTTP(.OpenIDJSON) : self.createHTTP(.ServiceAccount)
+        let http = self.isLoggedIn ? self.createHTTP(.openIDJSON) : self.createHTTP(.serviceAccount)
         
-        http.GET(URL) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
             // parse
-            guard let json = JSON.Value(string: responseObject as! String),
+            guard let json = try? JSON.Value(string: responseObject as! String),
                 let jsonArray = json.arrayValue,
-                let dataUpdates = DataUpdate.fromJSON(jsonArray)
-                else { completion(.Error(Error.InvalidResponse)); return }
+                let dataUpdates = DataUpdate.from(json: jsonArray)
+                else { completion(.error(Error.invalidResponse)); return }
             
-            completion(.Value(dataUpdates))
+            completion(.value(dataUpdates))
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Entity.swift b/OpenStack Summit/CoreSummit/Entity.swift
index 00ae6bb5..0a971ec1 100644
--- a/OpenStack Summit/CoreSummit/Entity.swift	
+++ b/OpenStack Summit/CoreSummit/Entity.swift	
@@ -8,15 +8,16 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 /// Base CoreData Entity `NSManagedObject` subclass for CoreSummit.
-public class Entity: NSManagedObject {
+open class Entity: NSManagedObject {
     
     /// The unique identifier of this entity.
-    @NSManaged public var id: Int64
+    @NSManaged open var id: Int64
     
     /// The date this object was stored in its entirety.
-    @NSManaged public var cached: NSDate?
+    @NSManaged open var cached: Date?
 }
 
 // MARK: - Extensions
@@ -26,9 +27,9 @@ public extension NSManagedObjectModel {
     /// CoreData Managed Object Model for CoreSummit framework (OpenStack Foundation Summit).
     static var summitModel: NSManagedObjectModel {
         
-        guard let bundle = NSBundle(identifier: "org.openstack.CoreSummit"),
-            let modelURL = bundle.URLForResource("Model", withExtension: "momd"),
-            let managedObjectModel = NSManagedObjectModel(contentsOfURL: modelURL)
+        guard let bundle = Bundle(identifier: "org.openstack.CoreSummit"),
+            let modelURL = bundle.url(forResource: "Model", withExtension: "momd"),
+            let managedObjectModel = NSManagedObjectModel(contentsOf: modelURL)
             else { fatalError("Could not load managed object model") }
         
         return managedObjectModel
@@ -38,12 +39,10 @@ public extension NSManagedObjectModel {
 public extension Entity {
     
     static var identifierProperty: String { return "id" }
-    
-    var identifier: Int { return Int(self.id) }
-    
+        
     func didCache() {
         
-        self.cached = NSDate()
+        self.cached = Date()
     }
     
     static func entity(in context: NSManagedObjectContext) -> NSEntityDescription {
@@ -69,32 +68,32 @@ public extension Entity {
         return entity
     }
     
-    static func find(identifier: Identifier,
+    static func find(_ identifier: Identifier,
                      context: NSManagedObjectContext,
                      returnsObjectsAsFaults: Bool = true,
                      includesSubentities: Bool = true) throws -> Self? {
         
         let entity = self.entity(in: context)
         
-        let resourceID = NSNumber(longLong: Int64(identifier))
+        let resourceID = NSNumber(value: Int64(identifier) as Int64)
         
         return try context.find(entity, resourceID: resourceID, identifierProperty: self.identifierProperty, returnsObjectsAsFaults: returnsObjectsAsFaults, includesSubentities: includesSubentities)
     }
     
     /// Find or create.
-    static func cached(identifier: Identifier,
+    static func cached(_ identifier: Identifier,
                        context: NSManagedObjectContext,
                        returnsObjectsAsFaults: Bool = true,
                        includesSubentities: Bool = true) throws -> Self {
         
         let entity = self.entity(in: context)
         
-        let resourceID = NSNumber(longLong: Int64(identifier))
+        let resourceID = NSNumber(value: Int64(identifier) as Int64)
         
         return try context.findOrCreate(entity, resourceID: resourceID, identifierProperty: self.identifierProperty, returnsObjectsAsFaults: returnsObjectsAsFaults, includesSubentities: includesSubentities)
     }
     
-    static func filter(predicate: NSPredicate? = nil,
+    static func filter(_ predicate: NSPredicate? = nil,
                        sort: [NSSortDescriptor] = [NSSortDescriptor(key: Entity.identifierProperty, ascending: true)],
                        fetchLimit: Int? = nil,
                        returnsObjectsAsFaults: Bool = true,
@@ -103,7 +102,7 @@ public extension Entity {
         
         let entity = self.entity(in: context)
         
-        let fetchRequest = NSFetchRequest(entityName: entity.name!)
+        let fetchRequest = NSFetchRequest<Entity>(entityName: entity.name!)
         
         if let limit = fetchLimit {
             
@@ -118,7 +117,7 @@ public extension Entity {
         
         fetchRequest.sortDescriptors = sort
         
-        return try context.executeFetchRequest(fetchRequest) as! [Entity]
+        return try context.fetch(fetchRequest)
     }
 }
 
@@ -134,20 +133,20 @@ public extension Fault where Value: CoreDataDecodable, Value.ManagedObject: Enti
             
         } else {
             
-            self = .identifier(managedObject.identifier)
+            self = .identifier(managedObject.id)
         }
     }
 }
 
-public extension CollectionType where Generator.Element: Entity {
+public extension Collection where Iterator.Element: Entity {
     
-    var identifiers: Set<Identifier> { return Set(self.map({ Int($0.id) })) }
+    var identifiers: Set<Identifier> { return Set(self.map({ $0.id })) }
 }
 
 public extension CoreDataDecodable where Self: Unique, ManagedObject: Entity {
     
     @inline(__always)
-    static func find(identifier: Identifier,
+    static func find(_ identifier: Identifier,
                      context: NSManagedObjectContext,
                      includesSubentities: Bool = true) throws -> Self? {
         
@@ -160,7 +159,7 @@ public extension CoreDataDecodable where Self: Unique, ManagedObject: Entity {
         return Self.init(managedObject: managedObject)
     }
     
-    static func filter(predicate: NSPredicate,
+    static func filter(_ predicate: NSPredicate,
                        sort: [NSSortDescriptor] = [NSSortDescriptor(key: Entity.identifierProperty, ascending: true)],
                        fetchLimit: Int? = nil,
                        context: NSManagedObjectContext) throws -> [Self] {
@@ -175,7 +174,7 @@ public extension CoreDataDecodable where Self: Unique, ManagedObject: Entity {
         return Self.from(managedObjects: managedObjects)
     }
     
-    static func filter(predicate: Predicate,
+    static func filter(_ predicate: Predicate,
                        sort: [NSSortDescriptor] = [NSSortDescriptor(key: Entity.identifierProperty, ascending: true)],
                        fetchLimit: Int? = nil,
                        context: NSManagedObjectContext) throws -> [Self] {
@@ -190,7 +189,7 @@ public extension CoreDataDecodable where Self: Unique, ManagedObject: Entity {
         return Self.from(managedObjects: managedObjects)
     }
     
-    static func all(context: NSManagedObjectContext) throws -> [Self] {
+    static func all(_ context: NSManagedObjectContext) throws -> [Self] {
         
         let managedObjects = try ManagedObject.filter(returnsObjectsAsFaults: false,
                                                       includesSubentities: true,
@@ -203,7 +202,7 @@ public extension CoreDataDecodable where Self: Unique, ManagedObject: Entity {
 public extension CoreDataEncodable where Self: Unique, ManagedObject: Entity {
     
     @inline(__always)
-    func cached(context: NSManagedObjectContext) throws -> ManagedObject {
+    func cached(_ context: NSManagedObjectContext) throws -> ManagedObject {
         
         return try ManagedObject.cached(self.identifier, context: context, returnsObjectsAsFaults: true, includesSubentities: true)
     }
@@ -218,7 +217,7 @@ public extension EntityController {
         
         let entityName = entity.name!
         
-        let resourceID = NSNumber(longLong: Int64(identifier))
+        let resourceID = NSNumber(value: Int64(identifier) as Int64)
         
         self.init(entityName: entityName, identifier: (key: Entity.identifierProperty, value: resourceID), context: context)
     }
@@ -228,28 +227,28 @@ internal extension NSManagedObjectContext {
     
     /// Caches to-many relationship.
     @inline(__always)
-    func relationshipFault<T: CoreDataEncodable>(encodables: Set<T>) throws -> Set<T.ManagedObject> {
+    func relationshipFault<T: CoreDataEncodable>(_ encodables: Set<T>) throws -> Set<T.ManagedObject> {
         
         return try encodables.save(self)
     }
     
     /// Caches to-one relationship.
     @inline(__always)
-    func relationshipFault<T: CoreDataEncodable>(encodable: T?) throws -> T.ManagedObject? {
+    func relationshipFault<T: CoreDataEncodable>(_ encodable: T?) throws -> T.ManagedObject? {
         
         return try encodable?.save(self)
     }
     
     /// Caches to-one relationship.
     @inline(__always)
-    func relationshipFault<T: CoreDataEncodable>(encodable: T) throws -> T.ManagedObject {
+    func relationshipFault<T: CoreDataEncodable>(_ encodable: T) throws -> T.ManagedObject {
         
         return try encodable.save(self)
     }
     
     /// Returns faults for to-many relationships.
     @inline(__always)
-    func relationshipFault<ManagedObject: Entity>(identifiers: Set<Identifier>) throws -> Set<ManagedObject> {
+    func relationshipFault<ManagedObject: Entity>(_ identifiers: Set<Identifier>) throws -> Set<ManagedObject> {
         
         let managedObjects = try identifiers.map { try ManagedObject.cached($0, context: self, returnsObjectsAsFaults: true, includesSubentities: true) }
         
@@ -258,7 +257,7 @@ internal extension NSManagedObjectContext {
     
     /// Returns faults for to-one relationship.
     @inline(__always)
-    func relationshipFault<ManagedObject: Entity>(identifier: Identifier?) throws -> ManagedObject? {
+    func relationshipFault<ManagedObject: Entity>(_ identifier: Identifier?) throws -> ManagedObject? {
         
         guard let identifier = identifier
             else { return nil }
@@ -268,14 +267,15 @@ internal extension NSManagedObjectContext {
     
     /// Returns faults for to-one relationship.
     @inline(__always)
-    func relationshipFault<ManagedObject: Entity>(identifier: Identifier) throws -> ManagedObject {
+    func relationshipFault<ManagedObject: Entity>(_ identifier: Identifier) throws -> ManagedObject {
         
         return try ManagedObject.cached(identifier, context: self, returnsObjectsAsFaults: true, includesSubentities: true)
     }
     
     /// Returns managed object for fault value type.
     @inline(__always)
-    func relationshipFault<Encodable: Unique where Encodable: CoreDataEncodable, Encodable.ManagedObject: Entity>(fault: Fault<Encodable>) throws -> Encodable.ManagedObject {
+    func relationshipFault<Encodable: Unique>(_ fault: Fault<Encodable>) throws -> Encodable.ManagedObject
+        where Encodable: CoreDataEncodable, Encodable.ManagedObject: Entity {
         
         switch fault {
             
diff --git a/OpenStack Summit/CoreSummit/EntityController.swift b/OpenStack Summit/CoreSummit/EntityController.swift
index b825f2bc..270a9ed8 100644
--- a/OpenStack Summit/CoreSummit/EntityController.swift	
+++ b/OpenStack Summit/CoreSummit/EntityController.swift	
@@ -53,6 +53,8 @@ public final class EntityController<Decodable: CoreDataDecodable> {
 
 public struct ManagedObjectObserverEvent<Decodable: CoreDataDecodable> {
     
+    public var inserted: (Decodable) -> () = { _ in }
+    
     public var updated: (Decodable) -> () = { _ in }
     
     public var deleted: () -> () = { _ in }
@@ -79,13 +81,13 @@ public struct ManagedObjectObserverEvent<Decodable: CoreDataDecodable> {
             
             if newValue {
                 
-                NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(objectsDidChange(_:)), name: NSManagedObjectContextObjectsDidChangeNotification, object: context)
+                NotificationCenter.default.addObserver(self, selector: #selector(objectsDidChange(_:)), name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, object: context)
                 
                 self.update()
             }
             else {
                 
-                NSNotificationCenter.defaultCenter().removeObserver(self, name: NSManagedObjectContextObjectsDidChangeNotification, object: self.context)
+                NotificationCenter.default.removeObserver(self, name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, object: self.context)
             }
         }
     }
@@ -113,52 +115,62 @@ public struct ManagedObjectObserverEvent<Decodable: CoreDataDecodable> {
             
         } else {
             
-            self.delegate?.managedObjectDeletedForObserver(self)
+            self.delegate?.managedObjectDeleted(for: self)
         }
     }
     
-    @objc func objectsDidChange(notification: NSNotification) {
+    @objc func objectsDidChange(_ notification: Foundation.Notification) {
         
-        if let updatedObjects = notification.userInfo?[NSUpdatedObjectsKey] as! Set<NSManagedObject>? {
+        func filter(managedObject: NSManagedObject) -> Bool {
             
-            for managedObject in updatedObjects {
-                
-                if managedObject.valueForKey(identifier.key) as? NSObject == identifier.value
-                    && managedObject.entity.name! == self.entityName {
-                        
-                        self.delegate?.observer(self, managedObjectUpdated: managedObject)
-                        
-                        return
-                }
-            }
+            return managedObject.value(forKey: identifier.key) as? NSObject == identifier.value
+                && managedObject.entity.name! == self.entityName
         }
         
-        if let deletedObjects = notification.userInfo?[NSDeletedObjectsKey] as! Set<NSManagedObject>? {
+        let insertedObjects = notification.userInfo?[NSInsertedObjectsKey] as! Set<NSManagedObject>? ?? []
+        
+        if let managedObject = insertedObjects.first(where: filter) {
             
-            for managedObject in deletedObjects {
-                
-                if managedObject.valueForKey(identifier.key) as? NSObject == identifier.value &&
-                    managedObject.entity.name! == self.entityName {
-                        
-                        self.delegate?.managedObjectDeletedForObserver(self)
-                        
-                        return
-                }
-            }
+            self.delegate?.observer(self, managedObjectInserted: managedObject)
+        }
+        
+        let updatedObjects = notification.userInfo?[NSUpdatedObjectsKey] as! Set<NSManagedObject>? ?? []
+        
+        if let managedObject = updatedObjects.first(where: filter) {
+            
+            self.delegate?.observer(self, managedObjectUpdated: managedObject)
+        }
+        
+        let deletedObjects = notification.userInfo?[NSDeletedObjectsKey] as! Set<NSManagedObject>? ?? []
+        
+        if deletedObjects.contains(where: filter) {
+            
+            self.delegate?.managedObjectDeleted(for: self)
         }
     }
 }
 
 private protocol PrivateEntityControllerDelegate: class {
     
-    func observer(observer: PrivateEntityController, managedObjectUpdated managedObject: NSManagedObject)
+    func observer(_ observer: PrivateEntityController, managedObjectUpdated managedObject: NSManagedObject)
     
-    func managedObjectDeletedForObserver(observer: PrivateEntityController)
+    func observer(_ observer: PrivateEntityController, managedObjectInserted managedObject: NSManagedObject)
+    
+    func managedObjectDeleted(for observer: PrivateEntityController)
 }
 
 extension EntityController: PrivateEntityControllerDelegate {
     
-    private func observer(observer: PrivateEntityController, managedObjectUpdated managedObject: NSManagedObject) {
+    fileprivate func observer(_ observer: PrivateEntityController, managedObjectInserted managedObject: NSManagedObject) {
+        
+        let managedObject = managedObject as! Decodable.ManagedObject
+        
+        let decodable = Decodable(managedObject: managedObject)
+        
+        self.event.inserted(decodable)
+    }
+    
+    fileprivate func observer(_ observer: PrivateEntityController, managedObjectUpdated managedObject: NSManagedObject) {
         
         let managedObject = managedObject as! Decodable.ManagedObject
         
@@ -167,7 +179,7 @@ extension EntityController: PrivateEntityControllerDelegate {
         self.event.updated(decodable)
     }
     
-    private func managedObjectDeletedForObserver(observer: PrivateEntityController) {
+    fileprivate func managedObjectDeleted(for observer: PrivateEntityController) {
         
         self.event.deleted()
     }
diff --git a/OpenStack Summit/CoreSummit/Environment.swift b/OpenStack Summit/CoreSummit/Environment.swift
index af496c4c..dc94b193 100644
--- a/OpenStack Summit/CoreSummit/Environment.swift	
+++ b/OpenStack Summit/CoreSummit/Environment.swift	
@@ -8,6 +8,6 @@
 
 public enum Environment: String {
     
-    case Staging
-    case Production
-}
\ No newline at end of file
+    case staging = "Staging"
+    case production = "Production"
+}
diff --git a/OpenStack Summit/CoreSummit/ErrorValue.swift b/OpenStack Summit/CoreSummit/ErrorValue.swift
index 06e7d225..745c7ceb 100644
--- a/OpenStack Summit/CoreSummit/ErrorValue.swift	
+++ b/OpenStack Summit/CoreSummit/ErrorValue.swift	
@@ -9,6 +9,6 @@
 /// Basic wrapper for error / value pairs.
 public enum ErrorValue<T> {
     
-    case Error(ErrorType)
-    case Value(T)
-}
\ No newline at end of file
+    case error(Error)
+    case value(T)
+}
diff --git a/OpenStack Summit/CoreSummit/Event.swift b/OpenStack Summit/CoreSummit/Event.swift
index 3ae0a166..ab21fa6a 100644
--- a/OpenStack Summit/CoreSummit/Event.swift	
+++ b/OpenStack Summit/CoreSummit/Event.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
+import struct Foundation.URL
 
 public struct Event: Named {
     
@@ -38,7 +39,7 @@ public struct Event: Named {
     
     public var willRecord: Bool
     
-    public var attachment: String?
+    public var attachment: URL?
         
     public var sponsors: Set<Identifier>
     
diff --git a/OpenStack Summit/CoreSummit/EventDataUpdate.swift b/OpenStack Summit/CoreSummit/EventDataUpdate.swift
index a120cd72..f87102bf 100644
--- a/OpenStack Summit/CoreSummit/EventDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/EventDataUpdate.swift	
@@ -6,53 +6,56 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
-/// The `DataUpdate` version of an `Event`.
-public struct EventDataUpdate: Named {
-    
-    public let identifier: Identifier
-    
-    public let name: String
-    
-    public let descriptionText: String?
-    
-    public let socialDescription: String?
-    
-    public let start: Date
-    
-    public let end: Date
-    
-    public let track: Identifier?
-    
-    public let allowFeedback: Bool
-    
-    public let averageFeedback: Double
-    
-    public let type: Identifier
-    
-    public let sponsors: Set<Company>
-    
-    public let tags: Set<Tag>
-    
-    public let location: Identifier?
-    
-    public let presentation: PresentationDataUpdate
-    
-    public let videos: Set<Video>
-    
-    public let slides: Set<Slide>
-    
-    public let links: Set<Link>
-    
-    public let rsvp: String?
-    
-    public let attachment: String?
+public extension Event {
+    
+    /// The `DataUpdate` version of an `Event`.
+    public struct DataUpdate: Named {
+        
+        public let identifier: Identifier
+        
+        public let name: String
+        
+        public let descriptionText: String?
+        
+        public let socialDescription: String?
+        
+        public let start: Date
+        
+        public let end: Date
+        
+        public let track: Identifier?
+        
+        public let allowFeedback: Bool
+        
+        public let averageFeedback: Double
+        
+        public let type: Identifier
+        
+        public let sponsors: Set<Company>
+        
+        public let tags: Set<Tag>
+        
+        public let location: Identifier?
+        
+        public let presentation: Presentation.DataUpdate
+        
+        public let videos: Set<Video>
+        
+        public let slides: Set<Slide>
+        
+        public let links: Set<Link>
+        
+        public let rsvp: String?
+        
+        public let attachment: String?
+    }
 }
 
 // MARK: - Equatable
 
-public func == (lhs: EventDataUpdate, rhs: EventDataUpdate) -> Bool {
+public func == (lhs: Event.DataUpdate, rhs: Event.DataUpdate) -> Bool {
     
     return lhs.identifier == rhs.identifier
         && lhs.name == rhs.name
diff --git a/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift
index 1af3cc5a..5650be24 100644
--- a/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift	
@@ -6,32 +6,30 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import struct Foundation.Date
+import JSON
 
-private extension EventDataUpdate {
+private extension Event.DataUpdate {
     
     typealias JSONKey = Event.JSONKey
 }
 
-extension EventDataUpdate: JSONDecodable {
+extension Event.DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
-            let eventType = JSONObject[JSONKey.type_id.rawValue]?.rawValue as? Int,
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
+            let eventType = JSONObject[JSONKey.type_id.rawValue]?.integerValue,
             let tagsJSONArray = JSONObject[JSONKey.tags.rawValue]?.arrayValue,
-            let tags = Tag.fromJSON(tagsJSONArray),
+            let tags = Tag.from(json: tagsJSONArray),
             let allowFeedback = JSONObject[JSONKey.allow_feedback.rawValue]?.rawValue as? Bool,
             let sponsorsJSONArray = JSONObject[JSONKey.sponsors.rawValue]?.arrayValue,
-            let sponsors = Company.fromJSON(sponsorsJSONArray),
-            /* let speakersJSONArray = JSONObject[JSONKey.speakers.rawValue]?.arrayValue, */
-            /* let speakers = PresentationSpeaker.fromJSON(speakersJSONArray), */
-            /* let trackIdentifier = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int */
-            let presentation = PresentationDataUpdate(JSONValue: JSONValue),
+            let sponsors = Company.from(json: sponsorsJSONArray),
+            let presentation = Presentation.DataUpdate(json: JSONValue),
             let averageFeedbackJSON = JSONObject[JSONKey.avg_feedback_rate.rawValue]
             else { return nil }
         
@@ -49,7 +47,7 @@ extension EventDataUpdate: JSONDecodable {
             
             self.averageFeedback = doubleValue
             
-        } else if let integerValue = averageFeedbackJSON.rawValue as? Int {
+        } else if let integerValue = averageFeedbackJSON.integerValue {
             
             self.averageFeedback = Double(integerValue)
             
@@ -64,8 +62,8 @@ extension EventDataUpdate: JSONDecodable {
         self.rsvp = JSONObject[JSONKey.rsvp_link.rawValue]?.rawValue as? String
         self.attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String
         
-        if let track = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int
-            where track > 0 {
+        if let track = JSONObject[JSONKey.track_id.rawValue]?.integerValue,
+            track > 0 {
             
             self.track = track
             
@@ -74,8 +72,8 @@ extension EventDataUpdate: JSONDecodable {
             self.track = nil
         }
         
-        if let location = JSONObject[JSONKey.location_id.rawValue]?.rawValue as? Int
-            where location > 0 {
+        if let location = JSONObject[JSONKey.location_id.rawValue]?.integerValue,
+            location > 0 {
             
             self.location = location
             
@@ -86,7 +84,7 @@ extension EventDataUpdate: JSONDecodable {
         
         if let videosJSONArray = JSONObject[JSONKey.videos.rawValue]?.arrayValue {
             
-            guard let videos = Video.fromJSON(videosJSONArray)
+            guard let videos = Video.from(json: videosJSONArray)
                 else { return nil }
             
             self.videos = Set(videos)
@@ -96,24 +94,18 @@ extension EventDataUpdate: JSONDecodable {
             self.videos = []
         }
         
-        if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
+        if let jsonArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            guard let slides = Slide.fromJSON(slidesJSONArray)
-                else { return nil }
-            
-            self.slides = Set(slides)
+            self.slides = Set(Slide.forceDecode(json: jsonArray))
             
         } else {
             
             self.slides = []
         }
         
-        if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
-            
-            guard let links = Link.fromJSON(linksJSONArray)
-                else { return nil }
+        if let jsonArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
             
-            self.links = Set(links)
+            self.links = Set(Link.forceDecode(json: jsonArray))
             
         } else {
             
diff --git a/OpenStack Summit/CoreSummit/EventDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/EventDataUpdateManagedObject.swift
index 2a73c865..34235767 100644
--- a/OpenStack Summit/CoreSummit/EventDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/EventDataUpdateManagedObject.swift	
@@ -8,18 +8,17 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
 
-extension EventDataUpdate: Updatable {
+extension Event.DataUpdate: Updatable {
     
     @inline(__always)
-    static func find(identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
+    static func find(_ identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
         
         return try EventManagedObject.find(identifier, context: context)
     }
     
     /// update current summit with Data Update
-    func write(context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
+    func write(_ context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
         
         let managedObject = try EventManagedObject.cached(self.identifier, context: context, returnsObjectsAsFaults: true, includesSubentities: false)
         
@@ -28,8 +27,8 @@ extension EventDataUpdate: Updatable {
         managedObject.name = name
         managedObject.descriptionText = descriptionText
         managedObject.socialDescription = socialDescription
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.allowFeedback = allowFeedback
         managedObject.averageFeedback = averageFeedback
         managedObject.rsvp = rsvp
diff --git a/OpenStack Summit/CoreSummit/EventJSON.swift b/OpenStack Summit/CoreSummit/EventJSON.swift
index bf538c2a..cbce6fa1 100644
--- a/OpenStack Summit/CoreSummit/EventJSON.swift	
+++ b/OpenStack Summit/CoreSummit/EventJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 internal extension Event {
     
@@ -16,24 +16,23 @@ internal extension Event {
     }
 }
 
-extension Event: JSONParametrizedDecodable {
+public extension Event {
     
-    public init?(JSONValue: JSON.Value, parameters summit: Identifier) {
+    public init?(json: JSON.Value, summit: Identifier) {
         
-        guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+        guard let JSONObject = json.objectValue,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
-            let eventTypeJSON = JSONObject[JSONKey.type_id.rawValue],
-            let eventType = Int(JSONValue: eventTypeJSON),
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
+            let eventType = JSONObject[JSONKey.type_id.rawValue]?.integerValue,
             let tagsJSONArray = JSONObject[JSONKey.tags.rawValue]?.arrayValue,
-            let tags = Tag.fromJSON(tagsJSONArray),
+            let tags = Tag.from(json: tagsJSONArray),
             let allowFeedback = JSONObject[JSONKey.allow_feedback.rawValue]?.rawValue as? Bool,
             let sponsorsJSONArray = JSONObject[JSONKey.sponsors.rawValue]?.arrayValue,
-            let sponsors = Identifier.fromJSON(sponsorsJSONArray),
+            let sponsors = Identifier.from(json: sponsorsJSONArray),
             let averageFeedbackJSON = JSONObject[JSONKey.avg_feedback_rate.rawValue],
-            let presentation = Presentation(JSONValue: JSONValue)
+            let presentation = Presentation(json: json)
             else { return nil }
         
         self.identifier = identifier
@@ -53,7 +52,7 @@ extension Event: JSONParametrizedDecodable {
             
             self.averageFeedback = doubleValue
             
-        } else if let integerValue = averageFeedbackJSON.rawValue as? Int {
+        } else if let integerValue = averageFeedbackJSON.integerValue {
             
             self.averageFeedback = Double(integerValue)
             
@@ -66,9 +65,10 @@ extension Event: JSONParametrizedDecodable {
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
         self.socialDescription = JSONObject[JSONKey.social_description.rawValue]?.rawValue as? String
         self.rsvp = JSONObject[JSONKey.rsvp_link.rawValue]?.rawValue as? String
-        self.attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String
+        self.attachment = JSONObject[JSONKey.attachment.rawValue]?.urlValue
         
-        if let track = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int where track > 0 {
+        if let track = JSONObject[JSONKey.track_id.rawValue]?.integerValue,
+            track > 0 {
             
             self.track = track
             
@@ -77,8 +77,8 @@ extension Event: JSONParametrizedDecodable {
             self.track = nil
         }
         
-        if let location = JSONObject[JSONKey.location_id.rawValue]?.rawValue as? Int
-            where location > 0 {
+        if let location = JSONObject[JSONKey.location_id.rawValue]?.integerValue,
+            location > 0 {
             
             self.location = location
             
@@ -89,7 +89,7 @@ extension Event: JSONParametrizedDecodable {
         
         if let videosJSONArray = JSONObject[JSONKey.videos.rawValue]?.arrayValue {
             
-            guard let videos = Video.fromJSON(videosJSONArray)
+            guard let videos = Video.from(json: videosJSONArray)
                 else { return nil }
             
             self.videos = Set(videos)
@@ -99,24 +99,18 @@ extension Event: JSONParametrizedDecodable {
             self.videos = []
         }
         
-        if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
+        if let jsonArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            guard let slides = Slide.fromJSON(slidesJSONArray)
-                else { return nil }
-            
-            self.slides = Set(slides)
+            self.slides = Set(Slide.forceDecode(json: jsonArray))
             
         } else {
             
             self.slides = []
         }
         
-        if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
+        if let jsonArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
             
-            guard let links = Link.fromJSON(linksJSONArray)
-                else { return nil }
-            
-            self.links = Set(links)
+            self.links = Set(Link.forceDecode(json: jsonArray))
             
         } else {
             
@@ -132,25 +126,25 @@ extension MemberResponse.Event: JSONDecodable {
     
     private typealias JSONKey = Event.JSONKey
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let summit = JSONObject[JSONKey.summit_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let summit = JSONObject[JSONKey.summit_id.rawValue]?.integerValue,
             let title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
             let eventTypeJSON = JSONObject[JSONKey.type.rawValue],
-            let eventType = EventType(JSONValue: eventTypeJSON),
+            let eventType = EventType(json: eventTypeJSON),
             let tagsJSONArray = JSONObject[JSONKey.tags.rawValue]?.arrayValue,
-            let tags = Tag.fromJSON(tagsJSONArray),
+            let tags = Tag.from(json: tagsJSONArray),
             let allowFeedback = JSONObject[JSONKey.allow_feedback.rawValue]?.rawValue as? Bool,
             let sponsorsJSONArray = JSONObject[JSONKey.sponsors.rawValue]?.arrayValue,
-            let sponsors = Company.fromJSON(sponsorsJSONArray),
+            let sponsors = Company.from(json: sponsorsJSONArray),
             let averageFeedbackJSON = JSONObject[JSONKey.avg_feedback_rate.rawValue],
-            let presentation = MemberResponse.Presentation(JSONValue: JSONValue),
+            let presentation = MemberResponse.Presentation(json: JSONValue),
             let groupsJSONArray = JSONObject[JSONKey.groups.rawValue]?.arrayValue,
-            let groups = Group.fromJSON(groupsJSONArray)
+            let groups = Group.from(json: groupsJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -171,7 +165,7 @@ extension MemberResponse.Event: JSONDecodable {
             
             self.averageFeedback = doubleValue
             
-        } else if let integerValue = averageFeedbackJSON.rawValue as? Int {
+        } else if let integerValue = averageFeedbackJSON.integerValue {
             
             self.averageFeedback = Double(integerValue)
             
@@ -184,11 +178,11 @@ extension MemberResponse.Event: JSONDecodable {
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
         self.socialDescription = JSONObject[JSONKey.social_description.rawValue]?.rawValue as? String
         self.rsvp = JSONObject[JSONKey.rsvp_link.rawValue]?.rawValue as? String
-        self.attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String
+        self.attachment = JSONObject[JSONKey.attachment.rawValue]?.urlValue
         
         if let trackJSON = JSONObject[JSONKey.track.rawValue] {
             
-            guard let track = MemberResponse.Track(JSONValue: trackJSON)
+            guard let track = MemberResponse.Track(json: trackJSON)
                 else { return nil }
             
             self.track = track
@@ -200,7 +194,7 @@ extension MemberResponse.Event: JSONDecodable {
         
         if let locationJSON = JSONObject[JSONKey.location.rawValue] {
             
-            guard let location = Location(JSONValue: locationJSON)
+            guard let location = Location(json: locationJSON)
                 else { return nil }
             
             self.location = location
@@ -212,7 +206,7 @@ extension MemberResponse.Event: JSONDecodable {
         
         if let videosJSONArray = JSONObject[JSONKey.videos.rawValue]?.arrayValue {
             
-            guard let videos = Video.fromJSON(videosJSONArray)
+            guard let videos = Video.from(json: videosJSONArray)
                 else { return nil }
             
             self.videos = videos
@@ -224,7 +218,7 @@ extension MemberResponse.Event: JSONDecodable {
         
         if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            guard let slides = Slide.fromJSON(slidesJSONArray)
+            guard let slides = Slide.from(json: slidesJSONArray)
                 else { return nil }
             
             self.slides = slides
@@ -236,7 +230,7 @@ extension MemberResponse.Event: JSONDecodable {
         
         if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
             
-            guard let links = Link.fromJSON(linksJSONArray)
+            guard let links = Link.from(json: linksJSONArray)
                 else { return nil }
             
             self.links = links
@@ -247,3 +241,25 @@ extension MemberResponse.Event: JSONDecodable {
         }
     }
 }
+
+// MARK: - Extensions
+
+public extension Event {
+    
+    /// Decodes from an array of JSON values.
+    static func from(json array: JSON.Array, summit: Identifier) -> [Event]? {
+        
+        var jsonDecodables: ContiguousArray<Event> = ContiguousArray()
+        
+        jsonDecodables.reserveCapacity(array.count)
+        
+        for jsonValue in array {
+            
+            guard let jsonDecodable = self.init(json: jsonValue, summit: summit) else { return nil }
+            
+            jsonDecodables.append(jsonDecodable)
+        }
+        
+        return Array(jsonDecodables)
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/EventManagedObject.swift b/OpenStack Summit/CoreSummit/EventManagedObject.swift
index da788ef2..ab3ba767 100644
--- a/OpenStack Summit/CoreSummit/EventManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/EventManagedObject.swift	
@@ -8,7 +8,7 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Predicate
 
 public final class EventManagedObject: Entity {
     
@@ -18,9 +18,9 @@ public final class EventManagedObject: Entity {
     
     @NSManaged public var socialDescription: String?
     
-    @NSManaged public var start: NSDate
+    @NSManaged public var start: Date
     
-    @NSManaged public var end: NSDate
+    @NSManaged public var end: Date
     
     @NSManaged public var allowFeedback: Bool
     
@@ -55,6 +55,10 @@ public final class EventManagedObject: Entity {
     @NSManaged public var groups: Set<GroupManagedObject>
     
     @NSManaged public var summit: SummitManagedObject
+    
+    // MARK: - Inverse Relationhips
+    
+    @NSManaged public var attendees: Set<AttendeeManagedObject>
 }
 
 // MARK: - Encoding
@@ -63,24 +67,24 @@ extension Event: CoreDataDecodable {
     
     public init(managedObject: EventManagedObject) {
         
-        self.identifier = managedObject.identifier
-        self.summit = managedObject.summit.identifier
+        self.identifier = managedObject.id
+        self.summit = managedObject.summit.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.socialDescription = managedObject.socialDescription
-        self.start = Date(foundation: managedObject.start)
-        self.end = Date(foundation: managedObject.end)
+        self.start = managedObject.start
+        self.end = managedObject.end
         self.allowFeedback = managedObject.allowFeedback
         self.averageFeedback = managedObject.averageFeedback
         self.rsvp = managedObject.rsvp
         self.externalRSVP = managedObject.externalRSVP
         self.willRecord = managedObject.willRecord
-        self.attachment = managedObject.attachment
-        self.track = managedObject.track?.identifier
-        self.type = managedObject.eventType.identifier
+        self.attachment = URL(string: managedObject.attachment ?? "")
+        self.track = managedObject.track?.id
+        self.type = managedObject.eventType.id
         self.sponsors = managedObject.sponsors.identifiers
         self.tags = Tag.from(managedObjects: managedObject.tags)
-        self.location = managedObject.location?.identifier
+        self.location = managedObject.location?.id
         self.presentation = Presentation(managedObject: managedObject.presentation)
         self.videos = Video.from(managedObjects: managedObject.videos)
         self.slides = Slide.from(managedObjects: managedObject.slides)
@@ -91,21 +95,21 @@ extension Event: CoreDataDecodable {
 
 extension Event: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> EventManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> EventManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
         managedObject.socialDescription = socialDescription
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.allowFeedback = allowFeedback
         managedObject.averageFeedback = averageFeedback
         managedObject.rsvp = rsvp
         managedObject.externalRSVP = externalRSVP
         managedObject.willRecord = willRecord
-        managedObject.attachment = attachment
+        managedObject.attachment = attachment?.absoluteString
         
         managedObject.summit = try context.relationshipFault(summit)
         managedObject.track = try context.relationshipFault(track)
@@ -127,21 +131,21 @@ extension Event: CoreDataEncodable {
 
 extension MemberResponse.Event: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> EventManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> EventManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
         managedObject.socialDescription = socialDescription
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.allowFeedback = allowFeedback
         managedObject.averageFeedback = averageFeedback
         managedObject.rsvp = rsvp
         managedObject.externalRSVP = externalRSVP
         managedObject.willRecord = willRecord
-        managedObject.attachment = attachment
+        managedObject.attachment = attachment?.absoluteString
         
         managedObject.summit = try context.relationshipFault(summit)
         managedObject.track = try context.relationshipFault(track)
@@ -167,95 +171,114 @@ public extension EventManagedObject {
     
     static var sortDescriptors: [NSSortDescriptor] {
         
-        return [NSSortDescriptor(key: "start", ascending: true),
-                NSSortDescriptor(key: "end", ascending: true),
-                NSSortDescriptor(key: "name", ascending: true)]
+        return [NSSortDescriptor(key: #keyPath(EventManagedObject.start), ascending: true),
+                NSSortDescriptor(key: #keyPath(EventManagedObject.end), ascending: true),
+                NSSortDescriptor(key: #keyPath(EventManagedObject.name), ascending: true)]
     }
     
-    static func search(searchTerm: String, context: NSManagedObjectContext) throws -> [EventManagedObject] {
+    static func search(_ searchTerm: String, context: NSManagedObjectContext) throws -> [EventManagedObject] {
         
-        let predicate = NSPredicate(format: "name CONTAINS [c] %@ or ANY presentation.speakers.firstName CONTAINS [c] %@ or ANY presentation.speakers.lastName CONTAINS [c] %@ or presentation.level CONTAINS [c] %@ or ANY tags.name CONTAINS [c] %@ or eventType.name CONTAINS [c] %@", searchTerm, searchTerm, searchTerm, searchTerm, searchTerm, searchTerm)
+        let value = Expression.value(.string(searchTerm))
+        
+        //let predicate = NSPredicate(format: "name CONTAINS [c] %@ or ANY presentation.speakers.firstName CONTAINS [c] %@ or ANY presentation.speakers.lastName CONTAINS [c] %@ or presentation.level CONTAINS [c] %@ or ANY tags.name CONTAINS [c] %@ or eventType.name CONTAINS [c] %@", searchTerm, searchTerm, searchTerm, searchTerm, searchTerm, searchTerm)
+        let predicate: Predicate = (#keyPath(EventManagedObject.name)).compare(.contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.presentation.speakers.firstName)).compare(.any, .contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.presentation.speakers.lastName)).compare(.any, .contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.presentation.level)).compare(.contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.tags.name)).compare(.any, .contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.eventType.name)).compare(.contains, [.caseInsensitive], value)
         
         return try context.managedObjects(self, predicate: predicate, sortDescriptors: self.sortDescriptors)
     }
     
-    static func filter(date: DateFilter,
-                       tracks: [Identifier]?,
-                       trackGroups: [Identifier]?,
-                       levels: [String]?,
-                       venues: [Identifier]?,
+    static func filter(_ date: DateFilter,
+                       tracks: [Identifier] = [],
+                       trackGroups: [Identifier] = [],
+                       levels: [Level] = [],
+                       venues: [Identifier] = [],
                        summit: Identifier,
                        context: NSManagedObjectContext) throws -> [EventManagedObject] {
         
-        guard let summit = try SummitManagedObject.find(summit, context: context)
-            else { return [] }
-        
-        let summitPredicate = NSPredicate(format: "summit == %@", summit)
+        let summitPredicate: Predicate = #keyPath(EventManagedObject.summit.id) == summit
         
-        let datePredicate: NSPredicate
+        let datePredicate: Predicate
         
         switch date {
             
         case .now:
             
-            let now = NSDate()
+            let now = Date()
             
-            datePredicate = NSPredicate(format: "start <= %@ AND end >= %@", now, now)
+            //datePredicate = NSPredicate(format: "start <= %@ AND end >= %@", now, now)
+            datePredicate = #keyPath(EventManagedObject.start) <= now
+                && #keyPath(EventManagedObject.end) >= now
             
         case let .interval(start, end):
             
-            datePredicate = NSPredicate(format: "end >= %@ AND end <= %@", start.toFoundation(), end.toFoundation())
+            //datePredicate = NSPredicate(format: "end >= %@ AND end <= %@", start, end)
+            datePredicate = #keyPath(EventManagedObject.end) >= start
+                && #keyPath(EventManagedObject.end) <= end
         }
         
         var predicates = [summitPredicate, datePredicate]
         
-        if let trackGroups = trackGroups where trackGroups.isEmpty == false {
+        if trackGroups.isEmpty == false {
             
-            let trackGroupPredicate = NSPredicate(format: "ANY track.groups.id IN %@", trackGroups)
+            //let trackGroupPredicate = NSPredicate(format: "ANY track.groups.id IN %@", trackGroups)
+            let trackGroupPredicate: Predicate = (#keyPath(EventManagedObject.track.groups.id)).any(in: trackGroups)
             
             predicates.append(trackGroupPredicate)
         }
         
-        if let tracks = tracks where tracks.isEmpty == false {
+        if tracks.isEmpty == false {
             
-            let tracksPredicate = NSPredicate(format: "track.id IN %@", tracks)
+            //let tracksPredicate = NSPredicate(format: "track.id IN %@", tracks)
+            let tracksPredicate: Predicate = (#keyPath(EventManagedObject.track.id)).in(tracks)
             
             predicates.append(tracksPredicate)
         }
         
-        if let levels = levels where levels.isEmpty == false {
+        if levels.isEmpty == false {
             
-            let levelsPredicate = NSPredicate(format: "presentation.level IN %@", levels)
+            //let levelsPredicate = NSPredicate(format: "presentation.level IN %@", levels)
+            let levelsPredicate: Predicate = (#keyPath(EventManagedObject.presentation.level)).in(levels.rawValues)
             
             predicates.append(levelsPredicate)
         }
         
-        if let venues = venues where venues.isEmpty == false {
+        if venues.isEmpty == false {
+            
+            // NSPredicate(format: "venue.id IN %@", venues)
+            let venueRoomsPredicate: Predicate = (#keyPath(VenueRoomManagedObject.venue.id)).in(venues)
             
             // get all rooms for the specified venue
-            let venueRooms = try context.managedObjects(VenueRoomManagedObject.self, predicate: NSPredicate(format: "venue.id IN %@", venues))
+            let venueRooms = try context.managedObjects(VenueRoomManagedObject.self, predicate: venueRoomsPredicate).identifiers
+            
+            let locations = venues + venueRooms
             
-            let predicate = NSPredicate(format: "location.id IN %@ OR location IN %@", venues, venueRooms)
+            //let predicate = NSPredicate(format: "location.id IN %@ OR location IN %@", venues, venueRooms)
+            let predicate: Predicate = (#keyPath(EventManagedObject.location.id)).in(locations)
             
             predicates.append(predicate)
         }
         
         assert(predicates.count > 1)
         
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
-        
-        return try context.managedObjects(EventManagedObject.self, predicate: predicate, sortDescriptors: sortDescriptors)
+        return try context.managedObjects(self,
+                                          predicate: .compound(.and(predicates)),
+                                          sortDescriptors: sortDescriptors)
     }
     
-    static func speakerPresentations(speaker: Identifier, startDate: NSDate, endDate: NSDate, summit: Identifier, context: NSManagedObjectContext) throws -> [EventManagedObject] {
-        
-        guard let speaker = try SpeakerManagedObject.find(speaker, context: context),
-            let summit = try SummitManagedObject.find(summit, context: context)
-            else { return [] }
+    static func presentations(for speaker: Identifier, start: Date, end: Date, summit: Identifier, context: NSManagedObjectContext) throws -> [EventManagedObject] {
         
-        let predicate = NSPredicate(format: "(ANY presentation.speakers == %@ OR presentation.moderator == %@) AND (end >= %@ AND end <= %@) AND summit == %@", speaker, speaker, startDate, endDate, summit)
+        //let predicate = NSPredicate(format: "(ANY presentation.speakers == %@ OR presentation.moderator == %@) AND (end >= %@ AND end <= %@) AND summit == %@", speaker, speaker, startDate, endDate, summit)
+        let predicate: Predicate = ((#keyPath(EventManagedObject.presentation.speakers.id)).any(in: [speaker])
+            || #keyPath(EventManagedObject.presentation.moderator.id) == speaker)
+            && #keyPath(EventManagedObject.end) >= start
+            && #keyPath(EventManagedObject.end) <= end
+            && #keyPath(EventManagedObject.summit.id) == summit
         
-        return try context.managedObjects(EventManagedObject.self, predicate: predicate, sortDescriptors: sortDescriptors)
+        return try context.managedObjects(self, predicate: predicate, sortDescriptors: sortDescriptors)
     }
 }
 
diff --git a/OpenStack Summit/CoreSummit/EventScheduleRequest.swift b/OpenStack Summit/CoreSummit/EventScheduleRequest.swift
index 8e400969..72254f59 100644
--- a/OpenStack Summit/CoreSummit/EventScheduleRequest.swift	
+++ b/OpenStack Summit/CoreSummit/EventScheduleRequest.swift	
@@ -6,13 +6,14 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func addEventToSchedule(summit: Identifier? = nil, event: Identifier, completion: (ErrorType?) -> ()) {
+    func addEventToSchedule(_ summit: Identifier? = nil, event: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let summitID: String
         
@@ -25,15 +26,15 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
+        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDGetFormUrlEncoded)
+        let http = self.createHTTP(.openIDGetFormUrlEncoded)
         
         let context = privateQueueManagedObjectContext
         
-        http.POST(URL, parameters: nil, completionHandler: {(responseObject, error) in
+        http.request(method: .post, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -52,10 +53,10 @@ public extension Store {
             }
             
             completion(nil)
-        })
+        }
     }
     
-    func removeEventFromSchedule(summit: Identifier? = nil, event: Identifier, completion: (ErrorType?) -> ()) {
+    func removeEventFromSchedule(_ summit: Identifier? = nil, event: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let summitID: String
         
@@ -68,15 +69,15 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
+        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDGetFormUrlEncoded)
+        let http = self.createHTTP(.openIDGetFormUrlEncoded)
         
         let context = privateQueueManagedObjectContext
         
-        http.DELETE(URL, parameters: nil, completionHandler: {(responseObject, error) in
+        http.request(method: .delete, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -95,10 +96,10 @@ public extension Store {
             }
             
             completion(nil)
-        })
+        }
     }
     
-    func removeRSVP(summit: Identifier? = nil, event: Identifier, completion: (ErrorType?) -> ()) {
+    func removeRSVP(_ summit: Identifier? = nil, event: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let summitID: String
         
@@ -111,15 +112,15 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)/rsvp"
+        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)/rsvp"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDGetFormUrlEncoded)
+        let http = self.createHTTP(.openIDGetFormUrlEncoded)
         
         let context = privateQueueManagedObjectContext
         
-        http.DELETE(URL, parameters: nil, completionHandler: {(responseObject, error) in
+        http.request(method: .delete, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -138,6 +139,6 @@ public extension Store {
             }
             
             completion(nil)
-        })
+        }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/EventTypeJSON.swift b/OpenStack Summit/CoreSummit/EventTypeJSON.swift
index 8fabcaae..df482247 100644
--- a/OpenStack Summit/CoreSummit/EventTypeJSON.swift	
+++ b/OpenStack Summit/CoreSummit/EventTypeJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension EventType {
     
@@ -18,10 +18,10 @@ public extension EventType {
 
 extension EventType: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let color = JSONObject[JSONKey.color.rawValue]?.rawValue as? String,
             let blackOutTimes = JSONObject[JSONKey.black_out_times.rawValue]?.rawValue as? Bool
diff --git a/OpenStack Summit/CoreSummit/EventTypeManagedObject.swift b/OpenStack Summit/CoreSummit/EventTypeManagedObject.swift
index 9f779d9d..2f49bddf 100644
--- a/OpenStack Summit/CoreSummit/EventTypeManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/EventTypeManagedObject.swift	
@@ -28,7 +28,7 @@ extension EventType: CoreDataDecodable {
     
     public init(managedObject: EventTypeManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.color = managedObject.color
         self.blackOutTimes = managedObject.blackOutTimes
@@ -37,7 +37,7 @@ extension EventType: CoreDataDecodable {
 
 extension EventType: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> EventTypeManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> EventTypeManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/Expression.swift b/OpenStack Summit/CoreSummit/Expression.swift
deleted file mode 100644
index 05ec7687..00000000
--- a/OpenStack Summit/CoreSummit/Expression.swift	
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  Expression.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-/// Used to represent expressions in a predicate.
-public enum Expression {
-    
-    /// Expression that represents a given constant value.
-    case value(Value)
-    
-    /// Expression that invokes `value​For​Key​Path:​` with a given key path.
-    case keyPath(String)
-}
-
-// MARK: - Equatable
-
-extension Expression: Equatable { }
-
-public func == (lhs: Expression, rhs: Expression) -> Bool {
-    
-    switch (lhs, rhs) {
-    case let (.keyPath(lhsValue), .keyPath(rhsValue)): return lhsValue == rhsValue
-    case let (.value(lhsValue), .value(rhsValue)): return lhsValue == rhsValue
-    default: return false
-    }
-}
-
-// MARK: - CustomStringConvertible
-
-extension Expression: CustomStringConvertible {
-    
-    public var description: String {
-        
-        switch self {
-        case let .value(value):    return "\(value)"
-        case let .keyPath(value):  return "\(value)"
-        }
-    }
-}
-
-// MARK: - Extensions
-
-public extension Expression {
-    
-    func compare(type: Comparision.Operator, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (self, rhs), type: type)
-        
-        return .comparison(comparision)
-    }
-    
-    func compare(type: Comparision.Operator, _ options: Set<Comparision.Option>, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (self, rhs), type: type, options: options)
-        
-        return .comparison(comparision)
-    }
-    
-    func compare(modifier: Comparision.Modifier, _ type: Comparision.Operator, _ options: Set<Comparision.Option>, _ rhs: Expression) -> Predicate {
-        
-        let comparision = Comparision(expression: (self, rhs), type: type, modifier: modifier, options: options)
-        
-        return .comparison(comparision)
-    }
-}
-
diff --git a/OpenStack Summit/CoreSummit/Fault.swift b/OpenStack Summit/CoreSummit/Fault.swift
index 96d18946..069c425c 100644
--- a/OpenStack Summit/CoreSummit/Fault.swift	
+++ b/OpenStack Summit/CoreSummit/Fault.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 /// Represents a relationship fault.
 public enum Fault<Value: Unique>: Unique {
diff --git a/OpenStack Summit/CoreSummit/FaultJSON.swift b/OpenStack Summit/CoreSummit/FaultJSON.swift
index 2f1f2d53..2a9e1ca2 100644
--- a/OpenStack Summit/CoreSummit/FaultJSON.swift	
+++ b/OpenStack Summit/CoreSummit/FaultJSON.swift	
@@ -6,19 +6,19 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Fault where Value: JSONDecodable {
     
-    init?(JSONValue: JSON.Value) {
+    init?(json: JSON.Value) {
         
-        if let identifier = JSONValue.rawValue as? Int {
+        if let identifier = json.integerValue {
             
             self = .identifier(identifier)
             
         } else {
             
-            guard let decodable = Value.init(JSONValue: JSONValue)
+            guard let decodable = Value.init(json: json)
                 else { return nil }
             
             self = .value(decodable)
diff --git a/OpenStack Summit/CoreSummit/FavoriteEventRequest.swift b/OpenStack Summit/CoreSummit/FavoriteEventRequest.swift
index e4ee079b..a481df10 100644
--- a/OpenStack Summit/CoreSummit/FavoriteEventRequest.swift	
+++ b/OpenStack Summit/CoreSummit/FavoriteEventRequest.swift	
@@ -6,22 +6,25 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreData
+import AeroGearHttp
 
 public extension Store {
     
-    func favorite(isFavorite: Bool = true, event: Identifier, summit: Identifier, completion: (ErrorType?) -> ()) {
+    func favorite(_ isFavorite: Bool = true, event: Identifier, summit: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/summits/\(summit)/members/me/favorites/\(event)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        let requestCompletion: (AnyObject?, NSError?) -> () = { (responseObject, error) in
+        let httpMethod: HttpMethod = isFavorite ? .post : .delete
+        
+        http.request(method: httpMethod, path: url) { (responseObject, error) in
             
             if error == nil {
                 
@@ -46,14 +49,5 @@ public extension Store {
             
             completion(error)
         }
-        
-        if isFavorite {
-            
-            http.POST(url, completionHandler: requestCompletion)
-            
-        } else {
-            
-            http.DELETE(url, completionHandler: requestCompletion)
-        }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Feedback.swift b/OpenStack Summit/CoreSummit/Feedback.swift
index a075da93..f7254561 100644
--- a/OpenStack Summit/CoreSummit/Feedback.swift	
+++ b/OpenStack Summit/CoreSummit/Feedback.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public protocol FeedbackProtocol: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/FeedbackJSON.swift b/OpenStack Summit/CoreSummit/FeedbackJSON.swift
index df4c58e9..62105f2c 100644
--- a/OpenStack Summit/CoreSummit/FeedbackJSON.swift	
+++ b/OpenStack Summit/CoreSummit/FeedbackJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 extension Feedback: JSONDecodable {
     
@@ -15,20 +15,20 @@ extension Feedback: JSONDecodable {
         case id, event_id, rate, note, created_date, owner
     }
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let rate = JSONObject[JSONKey.rate.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let rate = JSONObject[JSONKey.rate.rawValue]?.integerValue,
             let review = JSONObject[JSONKey.note.rawValue]?.rawValue as? String,
-            let createdDate = JSONObject[JSONKey.created_date.rawValue]?.rawValue as? Int,
-            let event = JSONObject[JSONKey.event_id.rawValue]?.rawValue as? Int,
+            let createdDate = JSONObject[JSONKey.created_date.rawValue]?.integerValue,
+            let event = JSONObject[JSONKey.event_id.rawValue]?.integerValue,
             let memberJSON = JSONObject[JSONKey.owner.rawValue],
-            let member = Member(JSONValue: memberJSON)
+            let member = Member(json: memberJSON)
             else { return nil }
         
         self.identifier = identifier
-        self.rate = rate
+        self.rate = Int(rate)
         self.review = review
         self.date = Date(timeIntervalSince1970: TimeInterval(createdDate))
         self.event = event
@@ -43,19 +43,19 @@ extension MemberResponse.Feedback: JSONDecodable {
         case id, event_id, rate, note, created_date, owner_id
     }
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let rate = JSONObject[JSONKey.rate.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let rate = JSONObject[JSONKey.rate.rawValue]?.integerValue,
             let review = JSONObject[JSONKey.note.rawValue]?.rawValue as? String,
-            let createdDate = JSONObject[JSONKey.created_date.rawValue]?.rawValue as? Int,
-            let event = JSONObject[JSONKey.event_id.rawValue]?.rawValue as? Int,
-            let member = JSONObject[JSONKey.owner_id.rawValue]?.rawValue as? Int
+            let createdDate = JSONObject[JSONKey.created_date.rawValue]?.integerValue,
+            let event = JSONObject[JSONKey.event_id.rawValue]?.integerValue,
+            let member = JSONObject[JSONKey.owner_id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
-        self.rate = rate
+        self.rate = Int(rate)
         self.review = review
         self.date = Date(timeIntervalSince1970: TimeInterval(createdDate))
         self.event = event
diff --git a/OpenStack Summit/CoreSummit/FeedbackManagedObject.swift b/OpenStack Summit/CoreSummit/FeedbackManagedObject.swift
index fc7fdc98..d94c03da 100644
--- a/OpenStack Summit/CoreSummit/FeedbackManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/FeedbackManagedObject.swift	
@@ -8,19 +8,19 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
-public class FeedbackManagedObject: Entity {
+open class FeedbackManagedObject: Entity {
     
-    @NSManaged public var rate: Int16
+    @NSManaged open var rate: Int16
     
-    @NSManaged public var review: String
+    @NSManaged open var review: String
     
-    @NSManaged public var date: NSDate
+    @NSManaged open var date: Date
     
-    @NSManaged public var event: EventManagedObject
+    @NSManaged open var event: EventManagedObject
     
-    @NSManaged public var member: MemberManagedObject
+    @NSManaged open var member: MemberManagedObject
 }
 
 // MARK: - Encoding
@@ -29,24 +29,24 @@ extension Feedback: CoreDataDecodable {
     
     public init(managedObject: FeedbackManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.rate = Int(managedObject.rate)
         self.review = managedObject.review
-        self.date = Date(foundation: managedObject.date)
-        self.event = managedObject.event.identifier
+        self.date = managedObject.date
+        self.event = managedObject.event.id
         self.member = Member(managedObject: managedObject.member)
     }
 }
 
 extension Feedback: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> FeedbackManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> FeedbackManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.rate = Int16(rate)
         managedObject.review = review
-        managedObject.date = date.toFoundation()
+        managedObject.date = date
         managedObject.event = try context.relationshipFault(event)
         managedObject.member = try context.relationshipFault(member)
         
@@ -58,13 +58,13 @@ extension Feedback: CoreDataEncodable {
 
 extension MemberResponse.Feedback: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> FeedbackManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> FeedbackManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.rate = Int16(rate)
         managedObject.review = review
-        managedObject.date = date.toFoundation()
+        managedObject.date = date
         managedObject.event = try context.relationshipFault(event)
         managedObject.member = try context.relationshipFault(member)
         
diff --git a/OpenStack Summit/CoreSummit/FeedbackRequest.swift b/OpenStack Summit/CoreSummit/FeedbackRequest.swift
index 641832f7..344bb717 100644
--- a/OpenStack Summit/CoreSummit/FeedbackRequest.swift	
+++ b/OpenStack Summit/CoreSummit/FeedbackRequest.swift	
@@ -6,31 +6,32 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func feedback(summit: Identifier, event: Identifier, page: Int, objectsPerPage: Int, completion: (ErrorValue<Page<Feedback>>) -> ()) {
+    func feedback(_ summit: Identifier, event: Identifier, page: Int, objectsPerPage: Int, completion: @escaping (ErrorValue<Page<Feedback>>) -> ()) {
         
-        let URI = "/api/v1/summits/\(summit)/events/\(event)/feedback?expand=owner&page=\(page)&per_page=\(objectsPerPage)"
+        let uri = "/api/v1/summits/\(summit)/events/\(event)/feedback?expand=owner&page=\(page)&per_page=\(objectsPerPage)"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.ServiceAccount)
+        let http = self.createHTTP(.serviceAccount)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(URL) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let page = Page<Feedback>(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let page = Page<Feedback>(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
@@ -39,36 +40,36 @@ public extension Store {
                 guard let _ = try EventManagedObject.find(event, context: context)
                     else { return }
                 
-                try page.items.save(context)
+                let _ = try page.items.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(page))
+            completion(.value(page))
         }
     }
     
-    func averageFeedback(summit: Identifier, event: Identifier, completion: (ErrorValue<Double>) -> ()) {
+    func averageFeedback(_ summit: Identifier, event: Identifier, completion: @escaping (ErrorValue<Double>) -> ()) {
         
-        let URI = "/api/v1/summits/\(summit)/events/\(event)/published?fields=id,avg_feedback_rate&relations=none"
+        let uri = "/api/v1/summits/\(summit)/events/\(event)/published?fields=id,avg_feedback_rate&relations=none"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.ServiceAccount)
+        let http = self.createHTTP(.serviceAccount)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(URL) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
+            guard let json = try? JSON.Value(string: responseObject as! String),
                 let jsonObject = json.objectValue,
                 let averageFeedbackJSON = jsonObject[Event.JSONKey.avg_feedback_rate.rawValue]
-                else { completion(.Error(Error.InvalidResponse)); return }
+                else { completion(.error(Error.invalidResponse)); return }
             
             let averageFeedback: Double
             
@@ -76,13 +77,13 @@ public extension Store {
                 
                 averageFeedback = doubleValue
                 
-            } else if let integerValue = averageFeedbackJSON.rawValue as? Int {
+            } else if let integerValue = averageFeedbackJSON.integerValue {
                 
                 averageFeedback = Double(integerValue)
                 
             } else {
                 
-                completion(.Error(Error.InvalidResponse)); return
+                completion(.error(Error.invalidResponse)); return
             }
                         
             // update cache
@@ -97,31 +98,31 @@ public extension Store {
             }
             
             // success
-            completion(.Value(averageFeedback))
+            completion(.value(averageFeedback))
         }
     }
     
-    func addFeedback(summit: Identifier, event: Identifier, rate: Int, review: String, completion: (ErrorValue<Identifier>) -> ()) {
+    func addFeedback(_ summit: Identifier, event: Identifier, rate: Int, review: String, completion: @escaping (ErrorValue<Identifier>) -> ()) {
         
-        let URI = "/api/v2/summits/\(summit)/events/\(event)/feedback"
+        let uri = "/api/v2/summits/\(summit)/events/\(event)/feedback"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
-        var jsonDictionary = [String: AnyObject]()
+        var jsonDictionary = [String: Any]()
         jsonDictionary["rate"] = rate
         jsonDictionary["note"] = review
         
         let context = privateQueueManagedObjectContext
         
-        http.POST(URL, parameters: jsonDictionary) { (responseObject, error) in
+        http.request(method: .post, path: url, parameters: jsonDictionary) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            let identifier = Int(responseObject as! String)!
+            let identifier = Identifier(responseObject as! String)!
             
             // create new feedback in cache
             try! context.performErrorBlockAndWait {
@@ -140,25 +141,25 @@ public extension Store {
                 }
             }
             
-            completion(.Value(identifier))
+            completion(.value(identifier))
         }
     }
     
-    func editFeedback(summit: Identifier, event: Identifier, rate: Int, review: String, completion: (ErrorType?) -> ()) {
+    func editFeedback(_ summit: Identifier, event: Identifier, rate: Int, review: String, completion: @escaping (Swift.Error?) -> ()) {
         
-        let URI = "/api/v2/summits/\(summit)/events/\(event)/feedback"
+        let uri = "/api/v2/summits/\(summit)/events/\(event)/feedback"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
-        var jsonDictionary = [String: AnyObject]()
+        var jsonDictionary = [String: Any]()
         jsonDictionary["rate"] = rate
         jsonDictionary["note"] = review
         
         let context = privateQueueManagedObjectContext
         
-        http.PUT(URL, parameters: jsonDictionary) { (responseObject, error) in
+        http.request(method: .put, path: url, parameters: jsonDictionary) { (responseObject, error) in
             
             // forward error
             guard error == nil
diff --git a/OpenStack Summit/CoreSummit/Group.swift b/OpenStack Summit/CoreSummit/Group.swift
index 1b94e5dc..2783856a 100644
--- a/OpenStack Summit/CoreSummit/Group.swift	
+++ b/OpenStack Summit/CoreSummit/Group.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct Group: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/GroupEventDataUpdate.swift b/OpenStack Summit/CoreSummit/GroupEventDataUpdate.swift
index ad55331f..3b222707 100644
--- a/OpenStack Summit/CoreSummit/GroupEventDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/GroupEventDataUpdate.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct GroupEventDataUpdate: Named {
     
@@ -38,7 +38,7 @@ public struct GroupEventDataUpdate: Named {
     
     public let location: Identifier?
     
-    public let presentation: PresentationDataUpdate
+    public let presentation: Presentation.DataUpdate
     
     public let videos: Set<Video>
     
diff --git a/OpenStack Summit/CoreSummit/GroupEventDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/GroupEventDataUpdateJSON.swift
index 7fe6c34d..8ea3299c 100644
--- a/OpenStack Summit/CoreSummit/GroupEventDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/GroupEventDataUpdateJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import struct Foundation.Date
+import JSON
 
 private extension GroupEventDataUpdate {
     
@@ -15,24 +16,24 @@ private extension GroupEventDataUpdate {
 
 extension GroupEventDataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let summit = JSONObject[JSONKey.summit_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let summit = JSONObject[JSONKey.summit_id.rawValue]?.integerValue,
             let title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
-            let eventType = JSONObject[JSONKey.type_id.rawValue]?.rawValue as? Int,
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
+            let eventType = JSONObject[JSONKey.type_id.rawValue]?.integerValue,
             let tagsJSONArray = JSONObject[JSONKey.tags.rawValue]?.arrayValue,
-            let tags = Tag.fromJSON(tagsJSONArray),
+            let tags = Tag.from(json: tagsJSONArray),
             let allowFeedback = JSONObject[JSONKey.allow_feedback.rawValue]?.rawValue as? Bool,
             let sponsorsJSONArray = JSONObject[JSONKey.sponsors.rawValue]?.arrayValue,
-            let sponsors = Company.fromJSON(sponsorsJSONArray),
-            let presentation = PresentationDataUpdate(JSONValue: JSONValue),
+            let sponsors = Company.from(json: sponsorsJSONArray),
+            let presentation = Presentation.DataUpdate(json: JSONValue),
             let averageFeedbackJSON = JSONObject[JSONKey.avg_feedback_rate.rawValue],
             let groupsJSONArray = JSONObject[JSONKey.groups.rawValue]?.arrayValue,
-            let groups = Int.fromJSON(groupsJSONArray)
+            let groups = Identifier.from(json: groupsJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -51,7 +52,7 @@ extension GroupEventDataUpdate: JSONDecodable {
             
             self.averageFeedback = doubleValue
             
-        } else if let integerValue = averageFeedbackJSON.rawValue as? Int {
+        } else if let integerValue = averageFeedbackJSON.integerValue {
             
             self.averageFeedback = Double(integerValue)
             
@@ -65,8 +66,7 @@ extension GroupEventDataUpdate: JSONDecodable {
         self.socialDescription = JSONObject[JSONKey.social_description.rawValue]?.rawValue as? String
         self.rsvp = JSONObject[JSONKey.rsvp_link.rawValue]?.rawValue as? String
         
-        if let track = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int
-            where track > 0 {
+        if let track = JSONObject[JSONKey.track_id.rawValue]?.integerValue, track > 0 {
             
             self.track = track
             
@@ -75,8 +75,7 @@ extension GroupEventDataUpdate: JSONDecodable {
             self.track = nil
         }
         
-        if let location = JSONObject[JSONKey.location_id.rawValue]?.rawValue as? Int
-            where location > 0 {
+        if let location = JSONObject[JSONKey.location_id.rawValue]?.integerValue, location > 0 {
             
             self.location = location
             
@@ -87,7 +86,7 @@ extension GroupEventDataUpdate: JSONDecodable {
         
         if let videosJSONArray = JSONObject[JSONKey.videos.rawValue]?.arrayValue {
             
-            guard let videos = Video.fromJSON(videosJSONArray)
+            guard let videos = Video.from(json: videosJSONArray)
                 else { return nil }
             
             self.videos = Set(videos)
diff --git a/OpenStack Summit/CoreSummit/GroupEventDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/GroupEventDataUpdateManagedObject.swift
index 1e5c9854..fa415d93 100644
--- a/OpenStack Summit/CoreSummit/GroupEventDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/GroupEventDataUpdateManagedObject.swift	
@@ -8,19 +8,19 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 extension GroupEventDataUpdate: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> EventManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> EventManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
         managedObject.socialDescription = socialDescription
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.allowFeedback = allowFeedback
         managedObject.averageFeedback = averageFeedback
         managedObject.rsvp = rsvp
diff --git a/OpenStack Summit/CoreSummit/GroupJSON.swift b/OpenStack Summit/CoreSummit/GroupJSON.swift
index 56d75d73..71c4f12a 100644
--- a/OpenStack Summit/CoreSummit/GroupJSON.swift	
+++ b/OpenStack Summit/CoreSummit/GroupJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 private extension Group {
     
@@ -18,10 +18,10 @@ private extension Group {
 
 extension Group: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String,
             let code = JSONObject[JSONKey.code.rawValue]?.rawValue as? String
             else { return nil }
diff --git a/OpenStack Summit/CoreSummit/GroupManagedObject.swift b/OpenStack Summit/CoreSummit/GroupManagedObject.swift
index 672bee87..a09a7413 100644
--- a/OpenStack Summit/CoreSummit/GroupManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/GroupManagedObject.swift	
@@ -24,7 +24,7 @@ extension Group: CoreDataDecodable {
     
     public init(managedObject: GroupManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.title = managedObject.title
         self.descriptionText = managedObject.descriptionText
         self.code = managedObject.code
@@ -33,7 +33,7 @@ extension Group: CoreDataDecodable {
 
 extension Group: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> GroupManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> GroupManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/Image.swift b/OpenStack Summit/CoreSummit/Image.swift
index cdc59793..a1e186f3 100644
--- a/OpenStack Summit/CoreSummit/Image.swift	
+++ b/OpenStack Summit/CoreSummit/Image.swift	
@@ -6,11 +6,13 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-public struct Image: Unique, Equatable {
+import struct Foundation.URL
+
+public struct Image: Unique {
     
     public let identifier: Identifier
     
-    public var url: String
+    public var url: URL
 }
 
 public func == (lhs: Image, rhs: Image) -> Bool {
diff --git a/OpenStack Summit/CoreSummit/ImageJSON.swift b/OpenStack Summit/CoreSummit/ImageJSON.swift
index fbddd5fd..7ec50a6f 100644
--- a/OpenStack Summit/CoreSummit/ImageJSON.swift	
+++ b/OpenStack Summit/CoreSummit/ImageJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
+import struct Foundation.URL
 
 public extension Image {
     
@@ -18,14 +19,15 @@ public extension Image {
 
 extension Image: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let url = JSONObject[JSONKey.image_url.rawValue]?.rawValue as? String
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let urlString = JSONObject[JSONKey.image_url.rawValue]?.rawValue as? String,
+            let url = URL(string: urlString)
             else { return nil }
         
         self.identifier = identifier
         self.url = url
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/ImageManagedObject.swift b/OpenStack Summit/CoreSummit/ImageManagedObject.swift
index 9a089c24..7cd7f80d 100644
--- a/OpenStack Summit/CoreSummit/ImageManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/ImageManagedObject.swift	
@@ -18,21 +18,21 @@ extension Image: CoreDataDecodable {
     
     public init(managedObject: ImageManagedObject) {
         
-        self.identifier = managedObject.identifier
-        self.url = managedObject.url
+        self.identifier = managedObject.id
+        self.url = URL(string: managedObject.url)!
     }
 }
 
 extension Image: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> ImageManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> ImageManagedObject {
         
         let managedObject = try cached(context)
         
-        managedObject.url = url
+        managedObject.url = url.absoluteString
         
         managedObject.didCache()
         
         return managedObject
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/JSONExtensions.swift b/OpenStack Summit/CoreSummit/JSONExtensions.swift
new file mode 100644
index 00000000..b5abc8a3
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/JSONExtensions.swift	
@@ -0,0 +1,61 @@
+//
+//  JSONExtensions.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/12/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import JSON
+import struct Foundation.URL
+
+// MARK: - Extensions
+
+public extension JSONDecodable {
+    
+    /// Decodes from an array of JSON values and skips values that cannot be decoded.
+    static func forceDecode(json array: JSON.Array) -> [Self] {
+        
+        var jsonDecodables: ContiguousArray<Self> = ContiguousArray()
+        
+        jsonDecodables.reserveCapacity(array.count)
+        
+        for jsonValue in array {
+            
+            guard let jsonDecodable = self.init(json: jsonValue) else { continue }
+            
+            jsonDecodables.append(jsonDecodable)
+        }
+        
+        return Array(jsonDecodables)
+    }
+}
+
+// MARK: - URL JSON Support
+
+extension URL: JSONDecodable {
+    
+    public init?(json: JSON.Value) {
+        
+        guard let urlString = json.stringValue
+            else { return nil }
+        
+        self.init(string: urlString)
+    }
+}
+
+extension URL: JSONEncodable {
+    
+    public func toJSON() -> JSON.Value {
+        
+        return .string(absoluteString)
+    }
+}
+
+public extension JSON.Value {
+    
+    public var urlValue: URL? {
+        
+        return URL(json: self)
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/Level.swift b/OpenStack Summit/CoreSummit/Level.swift
index 2567f886..9a27ccc4 100644
--- a/OpenStack Summit/CoreSummit/Level.swift	
+++ b/OpenStack Summit/CoreSummit/Level.swift	
@@ -8,18 +8,18 @@
 
 public enum Level: String, Comparable {
     
-    case Beginner
-    case Intermediate
-    case Advanced
-    case NotApplicable = "N/A"
+    case beginner = "Beginner"
+    case intermediate = "Intermediate"
+    case advanced = "Advanced"
+    case notApplicable = "N/A"
     
     public var order: Int {
         
         switch self {
-        case .Beginner: return 0
-        case .Intermediate: return 1
-        case .Advanced: return 2
-        case .NotApplicable: return 3
+        case .beginner:         return 0
+        case .intermediate:     return 1
+        case .advanced:         return 2
+        case .notApplicable:    return 3
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Link.swift b/OpenStack Summit/CoreSummit/Link.swift
index f46c747f..c0e60a84 100644
--- a/OpenStack Summit/CoreSummit/Link.swift	
+++ b/OpenStack Summit/CoreSummit/Link.swift	
@@ -6,6 +6,8 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
+import struct Foundation.URL
+
 public struct Link: PresentationMaterial {
     
     public let identifier: Identifier
@@ -18,9 +20,9 @@ public struct Link: PresentationMaterial {
     
     public var featured: Bool
     
-    public var order: Int
+    public var order: Int64
     
-    public var link: String
+    public var link: URL
     
     public var event: Identifier
 }
diff --git a/OpenStack Summit/CoreSummit/LinkJSON.swift b/OpenStack Summit/CoreSummit/LinkJSON.swift
index 29f0fe30..e01c4626 100644
--- a/OpenStack Summit/CoreSummit/LinkJSON.swift	
+++ b/OpenStack Summit/CoreSummit/LinkJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Link {
     
@@ -18,15 +18,15 @@ public extension Link {
 
 extension Link: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let featured = JSONObject[JSONKey.featured.rawValue]?.rawValue as? Bool,
             let displayOnSite = JSONObject[JSONKey.display_on_site.rawValue]?.rawValue as? Bool,
-            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.rawValue as? Identifier,
-            let order = JSONObject[JSONKey.order.rawValue]?.rawValue as? Int,
-            let link = JSONObject[JSONKey.link.rawValue]?.rawValue as? String
+            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.integerValue,
+            let order = JSONObject[JSONKey.order.rawValue]?.integerValue,
+            let link = JSONObject[JSONKey.link.rawValue]?.urlValue
             else { return nil }
         
         self.identifier = identifier
@@ -39,8 +39,8 @@ extension Link: JSONDecodable {
         // optional
         self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
         
-        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
-            where descriptionText.isEmpty == false {
+        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String,
+            descriptionText.isEmpty == false {
             
             self.descriptionText = descriptionText
             
diff --git a/OpenStack Summit/CoreSummit/LinkManagedObject.swift b/OpenStack Summit/CoreSummit/LinkManagedObject.swift
index bb3b7898..ca764a48 100644
--- a/OpenStack Summit/CoreSummit/LinkManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/LinkManagedObject.swift	
@@ -30,20 +30,20 @@ extension Link: CoreDataDecodable {
     
     public init(managedObject: LinkManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.displayOnSite = managedObject.displayOnSite
         self.featured = managedObject.featured
-        self.link = managedObject.link
-        self.event = managedObject.event.identifier
-        self.order = Int(managedObject.order)
+        self.link = URL(string: managedObject.link)!
+        self.event = managedObject.event.id
+        self.order = managedObject.order
     }
 }
 
 extension Link: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> LinkManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> LinkManagedObject {
         
         let managedObject = try cached(context)
         
@@ -51,8 +51,8 @@ extension Link: CoreDataEncodable {
         managedObject.descriptionText = descriptionText
         managedObject.displayOnSite = displayOnSite
         managedObject.featured = featured
-        managedObject.link = link
-        managedObject.order = Int64(order)
+        managedObject.link = link.absoluteString
+        managedObject.order = order
         managedObject.event = try context.relationshipFault(event)
         
         managedObject.didCache()
diff --git a/OpenStack Summit/CoreSummit/ListMembersRequest.swift b/OpenStack Summit/CoreSummit/ListMembersRequest.swift
index 8f8772ea..3c02132f 100644
--- a/OpenStack Summit/CoreSummit/ListMembersRequest.swift	
+++ b/OpenStack Summit/CoreSummit/ListMembersRequest.swift	
@@ -6,46 +6,47 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func members(filter: MemberListRequest.Filter? = nil,
+    func members(_ filter: MemberListRequest.Filter? = nil,
                  sort: MemberListRequest.SortDescriptor? = nil,
                  page: Int = 1,
                  perPage: Int = 10,
-                 completion: (ErrorValue<Page<Member>>) -> ()) {
+                 completion: @escaping (ErrorValue<Page<Member>>) -> ()) {
         
         let request = MemberListRequest(page: page, perPage: perPage, filter: filter, sort: sort)
         
         let url = request.toURL(environment.configuration.serverURL)
         
-        let http = self.createHTTP(.ServiceAccount)
+        let http = self.createHTTP(.serviceAccount)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let page = Page<Member>(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let page = Page<Member>(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try page.items.save(context)
+                let _ = try page.items.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(page))
+            completion(.value(page))
         }
     }
 }
@@ -62,31 +63,31 @@ public struct MemberListRequest {
     
     public var sort: SortDescriptor?
     
-    public func toURL(serverURL: String) -> String {
+    public func toURL(_ serverURL: String) -> String {
         
-        let urlComponents = NSURLComponents(string: serverURL + "/api/v1/members")!
+        var urlComponents = URLComponents(string: serverURL + "/api/v1/members")!
         
-        var queryItems = [NSURLQueryItem]()
+        var queryItems = [URLQueryItem]()
         
-        queryItems.append(NSURLQueryItem(name: "page", value: "\(page)"))
-        queryItems.append(NSURLQueryItem(name: "per_page", value: "\(perPage)"))
-        queryItems.append(NSURLQueryItem(name: "expand", value: "groups"))
+        queryItems.append(URLQueryItem(name: "page", value: "\(page)"))
+        queryItems.append(URLQueryItem(name: "per_page", value: "\(perPage)"))
+        queryItems.append(URLQueryItem(name: "expand", value: "groups"))
         
         if let filter = filter {
             
             let queryValueString = filter.property.rawValue + filter.filterOperator.rawValue + filter.value
             
-            queryItems.append(NSURLQueryItem(name: "filter", value: queryValueString))
+            queryItems.append(URLQueryItem(name: "filter", value: queryValueString))
         }
         
         if let sort = sort {
             
-            queryItems.append(NSURLQueryItem(name: "sort", value: sort.rawValue))
+            queryItems.append(URLQueryItem(name: "sort", value: sort.rawValue))
         }
         
         urlComponents.queryItems = queryItems
         
-        return urlComponents.URL!.absoluteString!
+        return urlComponents.url!.absoluteString
     }
 }
 
diff --git a/OpenStack Summit/CoreSummit/LocationJSON.swift b/OpenStack Summit/CoreSummit/LocationJSON.swift
index 6f09604a..d3e8631c 100644
--- a/OpenStack Summit/CoreSummit/LocationJSON.swift	
+++ b/OpenStack Summit/CoreSummit/LocationJSON.swift	
@@ -6,9 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import Foundation
-
-import SwiftFoundation
+import JSON
 
 public enum LocationJSONKey: String {
     
@@ -17,7 +15,7 @@ public enum LocationJSONKey: String {
 
 extension Location: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let className = JSONValue.objectValue?[LocationJSONKey.class_name.rawValue]?.rawValue as? String
             else { return nil }
@@ -26,7 +24,7 @@ extension Location: JSONDecodable {
             
         case VenueRoom.JSONClassName:
             
-            if let room = VenueRoom(JSONValue: JSONValue) {
+            if let room = VenueRoom(json: JSONValue) {
                 
                 self = .room(room)
                 
@@ -37,7 +35,7 @@ extension Location: JSONDecodable {
             
         default:
             
-            if let venue = Venue(JSONValue: JSONValue) {
+            if let venue = Venue(json: JSONValue) {
                 
                 self = .venue(venue)
                 
@@ -47,4 +45,4 @@ extension Location: JSONDecodable {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/LocationManagedObject.swift b/OpenStack Summit/CoreSummit/LocationManagedObject.swift
index b270aab2..dd1334aa 100644
--- a/OpenStack Summit/CoreSummit/LocationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/LocationManagedObject.swift	
@@ -9,17 +9,17 @@
 import Foundation
 import CoreData
 
-public class LocationManagedObject: Entity {
+open class LocationManagedObject: Entity {
     
-    @NSManaged public var name: String
+    @NSManaged open var name: String
     
-    @NSManaged public var descriptionText: String?
+    @NSManaged open var descriptionText: String?
     
     // Inverse Relationships
     
-    @NSManaged public var events: Set<EventManagedObject>
+    @NSManaged open var events: Set<EventManagedObject>
     
-    @NSManaged public var summits: SummitManagedObject
+    @NSManaged open var summit: SummitManagedObject
 }
 
 extension Location: CoreDataDecodable {
@@ -48,7 +48,7 @@ extension Location: CoreDataDecodable {
 
 extension Location: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> LocationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> LocationManagedObject {
         
         switch self {
         case let .venue(venue): return try venue.save(context)
diff --git a/OpenStack Summit/CoreSummit/Login.swift b/OpenStack Summit/CoreSummit/Login.swift
index fb56222b..57cb33bb 100644
--- a/OpenStack Summit/CoreSummit/Login.swift	
+++ b/OpenStack Summit/CoreSummit/Login.swift	
@@ -6,10 +6,11 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
 import CoreData
+import Predicate
 
 public extension Store {
     
@@ -23,26 +24,26 @@ public extension Store {
             // delete member
             if let member = try self.authenticatedMember(context) {
                 
-                context.deleteObject(member)
+                context.delete(member)
             }
             
             // delete all notifications except 'EVERYBODY' type
-            let notifications = try context.managedObjects(NotificationManagedObject.self, predicate: "channel" != CoreSummit.Notification.Channel.everyone.rawValue)
+            let notifications = try context.managedObjects(NotificationManagedObject.self, predicate: #keyPath(NotificationManagedObject.channel) != CoreSummit.Notification.Channel.everyone.rawValue)
             
-            notifications.forEach { context.deleteObject($0) }
+            notifications.forEach { context.delete($0) }
             
             try context.validateAndSave()
         }
         
         session.clear()
         
-        NSNotificationCenter.defaultCenter().postNotificationName(Notification.LoggedOut.rawValue, object: self)
+        NotificationCenter.default.post(name: Store.Notification.loggedOut, object: self)
     }
     
     /// Login via OAuth with OpenStack ID
-    func login(summit: Identifier, loginCallback: () -> (), completion: (ErrorType?) -> ()) {
-                
-        oauthModuleOpenID.login { (accessToken: AnyObject?, claims: OpenIDClaim?, error: NSError?) in // [1]
+    func login(_ summit: Identifier, loginCallback: @escaping () -> (), completion: @escaping (Swift.Error?) -> ()) {
+        
+        oauthModuleOpenID.login { (accessToken: AnyObject?, claims: OpenIdClaim?, error: NSError?) in // [1]
             
             guard error == nil
                 else { completion(error!) ; return }
@@ -53,17 +54,17 @@ public extension Store {
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     completion(error)
                     
-                case let .Value(member):
+                case let .value(member):
                     
                     self.session.member = member.identifier
                     
                     completion(nil)
                     
-                    NSNotificationCenter.defaultCenter().postNotificationName(Notification.LoggedIn.rawValue, object: self)
+                    NotificationCenter.default.post(name: Store.Notification.loggedIn, object: self)
                 }
             }
         }
diff --git a/OpenStack Summit/CoreSummit/Member.swift b/OpenStack Summit/CoreSummit/Member.swift
index d8865acc..bcc56df5 100644
--- a/OpenStack Summit/CoreSummit/Member.swift	
+++ b/OpenStack Summit/CoreSummit/Member.swift	
@@ -6,6 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
+import struct Foundation.URL
+
 public struct Member: Named {
     
     public let identifier: Identifier
@@ -16,7 +18,7 @@ public struct Member: Named {
     
     public let gender: String?
     
-    public let pictureURL: String
+    public let picture: URL
         
     public let twitter: String?
     
@@ -48,7 +50,7 @@ public func == (lhs: Member, rhs: Member) -> Bool {
     return lhs.identifier == rhs.identifier
         && lhs.firstName == rhs.firstName
         && lhs.lastName == rhs.lastName
-        && lhs.pictureURL == rhs.pictureURL
+        && lhs.picture == rhs.picture
         && lhs.twitter == rhs.twitter
         && lhs.irc == rhs.irc
         && lhs.linkedIn == rhs.linkedIn
diff --git a/OpenStack Summit/CoreSummit/MemberJSON.swift b/OpenStack Summit/CoreSummit/MemberJSON.swift
index cd63f370..b579ffe3 100644
--- a/OpenStack Summit/CoreSummit/MemberJSON.swift	
+++ b/OpenStack Summit/CoreSummit/MemberJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
+import struct Foundation.URL
 
 private extension Member {
     
@@ -18,20 +19,20 @@ private extension Member {
 
 extension Member: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let memberID = JSONObject[JSONKey.member_id.rawValue]?.rawValue as? Int
-                ?? JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let memberID = JSONObject[JSONKey.member_id.rawValue]?.integerValue
+                ?? JSONObject[JSONKey.id.rawValue]?.integerValue,
             let firstName = JSONObject[JSONKey.first_name.rawValue]?.rawValue as? String,
             let lastName = JSONObject[JSONKey.last_name.rawValue]?.rawValue as? String,
-            let pictureURL = JSONObject[JSONKey.pic.rawValue]?.rawValue as? String
+            let picture = JSONObject[JSONKey.pic.rawValue]?.urlValue
             else { return nil }
         
         self.identifier = memberID
         self.firstName = firstName
         self.lastName = lastName
-        self.pictureURL = pictureURL
+        self.picture = picture
         
         // optional
         self.biography = JSONObject[JSONKey.bio.rawValue]?.rawValue as? String
@@ -42,7 +43,7 @@ extension Member: JSONDecodable {
         
         if let speakerJSON = JSONObject[JSONKey.speaker.rawValue] {
             
-            guard let speaker = Speaker(JSONValue: speakerJSON)
+            guard let speaker = Speaker(json: speakerJSON)
                 else { return nil }
             
             self.speakerRole = speaker
@@ -54,7 +55,7 @@ extension Member: JSONDecodable {
         
         if let groupsJSONArray = JSONObject[JSONKey.groups.rawValue]?.arrayValue {
             
-            guard let groups = Group.fromJSON(groupsJSONArray)
+            guard let groups = Group.from(json: groupsJSONArray)
                 else { return nil }
             
             self.groups = Set(groups)
@@ -66,7 +67,7 @@ extension Member: JSONDecodable {
         
         if let affiliationsJSONArray = JSONObject[JSONKey.affiliations.rawValue]?.arrayValue {
             
-            guard let affiliations = Affiliation.fromJSON(affiliationsJSONArray)
+            guard let affiliations = Affiliation.from(json: affiliationsJSONArray)
                 else { return nil }
             
             self.affiliations = Set(affiliations)
@@ -88,27 +89,27 @@ extension MemberResponse.Member: JSONDecodable {
     
     private typealias JSONKey = Member.JSONKey
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let firstName = JSONObject[JSONKey.first_name.rawValue]?.rawValue as? String,
             let lastName = JSONObject[JSONKey.last_name.rawValue]?.rawValue as? String,
-            let pictureURL = JSONObject[JSONKey.pic.rawValue]?.rawValue as? String,
+            let picture = JSONObject[JSONKey.pic.rawValue]?.urlValue,
             let groupsJSONArray = JSONObject[JSONKey.groups.rawValue]?.arrayValue,
-            let groups = Group.fromJSON(groupsJSONArray),
+            let groups = Group.from(json: groupsJSONArray),
             let groupEventsJSONArray = JSONObject[JSONKey.groups_events.rawValue]?.arrayValue,
-            let groupEvents = MemberResponse.Event.fromJSON(groupEventsJSONArray),
+            let groupEvents = MemberResponse.Event.from(json: groupEventsJSONArray),
             let feedbackJSONArray = JSONObject[JSONKey.feedback.rawValue]?.arrayValue,
-            let feedback = MemberResponse.Feedback.fromJSON(feedbackJSONArray),
+            let feedback = MemberResponse.Feedback.from(json: feedbackJSONArray),
             let favoriteEventsJSONArray = JSONObject[JSONKey.favorite_summit_events.rawValue]?.arrayValue,
-            let favoriteEvents = Identifier.fromJSON(favoriteEventsJSONArray)
+            let favoriteEvents = Identifier.from(json: favoriteEventsJSONArray)
             else { return nil }
         
         self.identifier = identifier
         self.firstName = firstName
         self.lastName = lastName
-        self.pictureURL = pictureURL
+        self.picture = picture
         self.groups = groups
         self.groupEvents = groupEvents
         self.feedback = feedback
@@ -123,7 +124,7 @@ extension MemberResponse.Member: JSONDecodable {
         
         if let speakerJSON = JSONObject[JSONKey.speaker.rawValue] {
             
-            guard let speaker = Speaker(JSONValue: speakerJSON)
+            guard let speaker = Speaker(json: speakerJSON)
                 else { return nil }
             
             self.speakerRole = speaker
@@ -135,7 +136,7 @@ extension MemberResponse.Member: JSONDecodable {
         
         if let attendeeJSON = JSONObject[JSONKey.attendee.rawValue] {
             
-            guard let attendee = Attendee(JSONValue: attendeeJSON)
+            guard let attendee = Attendee(json: attendeeJSON)
                 else { return nil }
             
             self.attendeeRole = attendee
@@ -147,7 +148,7 @@ extension MemberResponse.Member: JSONDecodable {
         
         if let affiliationsJSONArray = JSONObject[JSONKey.affiliations.rawValue]?.arrayValue {
             
-            guard let affiliations = Affiliation.fromJSON(affiliationsJSONArray)
+            guard let affiliations = Affiliation.from(json: affiliationsJSONArray)
                 else { return nil }
             
             self.affiliations = affiliations
diff --git a/OpenStack Summit/CoreSummit/MemberManagedObject.swift b/OpenStack Summit/CoreSummit/MemberManagedObject.swift
index b046bab3..a22adda6 100644
--- a/OpenStack Summit/CoreSummit/MemberManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/MemberManagedObject.swift	
@@ -8,7 +8,7 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class MemberManagedObject: Entity {
     
@@ -49,10 +49,10 @@ extension Member: CoreDataDecodable {
     
     public init(managedObject: MemberManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.firstName = managedObject.firstName
         self.lastName = managedObject.lastName
-        self.pictureURL = managedObject.pictureURL
+        self.picture = URL(string: managedObject.pictureURL)!
         self.twitter = managedObject.twitter
         self.irc = managedObject.irc
         self.linkedIn = managedObject.linkedIn
@@ -86,13 +86,13 @@ extension Member: CoreDataDecodable {
 
 extension Member: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> MemberManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> MemberManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.firstName = firstName
         managedObject.lastName = lastName
-        managedObject.pictureURL = pictureURL
+        managedObject.pictureURL = picture.absoluteString
         managedObject.twitter = twitter
         managedObject.irc = irc
         managedObject.linkedIn = linkedIn
@@ -121,13 +121,13 @@ extension Member: CoreDataEncodable {
 
 extension MemberResponse.Member: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> MemberManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> MemberManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.firstName = firstName
         managedObject.lastName = lastName
-        managedObject.pictureURL = pictureURL
+        managedObject.pictureURL = picture.absoluteString
         managedObject.twitter = twitter
         managedObject.irc = irc
         managedObject.linkedIn = linkedIn
@@ -153,26 +153,21 @@ extension MemberResponse.Member: CoreDataEncodable {
 public extension MemberManagedObject {
     
     @inline(__always)
-    func isScheduled(event event: Identifier) -> Bool {
+    func isScheduled(event: Identifier) -> Bool {
         
-        return attendeeRole?.schedule.contains({ $0.identifier == event }) ?? false
+        return attendeeRole?.schedule.contains(where: { $0.id == event }) ?? false
     }
     
     @inline(__always)
-    func isFavorite(event event: Identifier) -> Bool {
+    func isFavorite(event: Identifier) -> Bool {
         
-        return favoriteEvents.contains { $0.identifier == event }
+        return favoriteEvents.contains(where: { $0.id == event })
     }
     
     @inline(__always)
     func feedback(for event: Identifier) -> FeedbackManagedObject? {
         
-        return feedback.firstMatching({ $0.event.identifier == event})
-    }
-    
-    var givenFeedback: [FeedbackManagedObject] {
-        
-        return feedback.sort { Date(foundation: $0.0.date) < Date(foundation: $0.1.date) } ?? []
+        return feedback.first(where: { $0.event.id == event })
     }
 }
 
@@ -187,7 +182,7 @@ public extension Store {
     }
     
     /// The member that is logged in.
-    internal func authenticatedMember(context: NSManagedObjectContext) throws -> MemberManagedObject? {
+    internal func authenticatedMember(_ context: NSManagedObjectContext) throws -> MemberManagedObject? {
         
         guard let memberID = session.member,
             let member = try MemberManagedObject.find(memberID, context: context)
@@ -209,6 +204,6 @@ public extension Store {
     @inline(__always)
     func isEventScheduledByLoggedMember(event eventID: Identifier) -> Bool {
         
-        return self.authenticatedMember?.attendeeRole?.schedule.contains({ $0.identifier == eventID }) ?? false
+        return self.authenticatedMember?.attendeeRole?.schedule.contains(where: { $0.id == eventID }) ?? false
     }
 }
diff --git a/OpenStack Summit/CoreSummit/MemberRequest.swift b/OpenStack Summit/CoreSummit/MemberRequest.swift
index 0ca93ca9..d5fb2a9b 100644
--- a/OpenStack Summit/CoreSummit/MemberRequest.swift	
+++ b/OpenStack Summit/CoreSummit/MemberRequest.swift	
@@ -6,43 +6,44 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func currentMember(for summit: Identifier, completion: (ErrorValue<MemberResponse.Member>) -> ()) {
+    func currentMember(for summit: Identifier, completion: @escaping (ErrorValue<MemberResponse.Member>) -> ()) {
         
-        let URI = "/api/v1/summits/\(summit)/members/me?expand=attendee,speaker,feedback,groups"
+        let uri = "/api/v1/summits/\(summit)/members/me?expand=attendee,speaker,feedback,groups"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(URL, parameters: nil, completionHandler: { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let member = MemberResponse.Member(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let member = MemberResponse.Member(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try member.save(context)
+                let _ = try member.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(member))
-        })
+            completion(.value(member))
+        }
     }
 }
 
@@ -60,7 +61,7 @@ public struct MemberResponse {
         
         public let gender: String?
         
-        public let pictureURL: String
+        public let picture: URL
         
         public let twitter: String?
         
@@ -115,7 +116,7 @@ public struct MemberResponse {
         
         public let willRecord: Bool
         
-        public let attachment: String?
+        public let attachment: URL?
         
         public let sponsors: [Company]
         
@@ -158,7 +159,7 @@ public struct MemberResponse {
         public let member: Identifier
     }
     
-    public typealias Presentation = PresentationDataUpdate
+    public typealias Presentation = CoreSummit.Presentation.DataUpdate
 }
 
 public extension MemberResponse.Member {
@@ -200,7 +201,7 @@ public func == (lhs: MemberResponse.Member, rhs: MemberResponse.Member) -> Bool
     return lhs.identifier == rhs.identifier
         && lhs.firstName == rhs.firstName
         && lhs.lastName == rhs.lastName
-        && lhs.pictureURL == rhs.pictureURL
+        && lhs.picture == rhs.picture
         && lhs.twitter == rhs.twitter
         && lhs.irc == rhs.irc
         && lhs.linkedIn == rhs.linkedIn
diff --git a/OpenStack Summit/CoreSummit/NSPredicate.swift b/OpenStack Summit/CoreSummit/NSPredicate.swift
deleted file mode 100644
index b3602b8c..00000000
--- a/OpenStack Summit/CoreSummit/NSPredicate.swift	
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-//  NSPredicate.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-import Foundation
-
-public extension NSPredicate {
-    
-    convenience init(_ predicate: Predicate) {
-        
-        fatalError()
-    }
-}
-
-public extension Predicate {
-    
-    func toFoundation() -> NSPredicate {
-        
-        switch self {
-        case let .compound(predicate): return predicate.toFoundation()
-        case let .comparison(predicate): return predicate.toFoundation()
-        case let .value(value): return NSPredicate(value: value)
-        }
-    }
-}
-
-public extension Compound {
-    
-    func toFoundation() -> NSCompoundPredicate {
-        
-        let subpredicates = self.subpredicates.map { $0.toFoundation() }
-        
-        return NSCompoundPredicate(type: type.toFoundation(), subpredicates: subpredicates)
-    }
-}
-
-public extension Compound.Logical​Type {
-    
-    func toFoundation() -> NSCompoundPredicateType {
-        switch self {
-        case .and: return .AndPredicateType
-        case .or: return .OrPredicateType
-        case .not: return .NotPredicateType
-        }
-    }
-}
-
-public extension Comparision {
-    
-    func toFoundation() -> NSComparisonPredicate {
-        
-        var rawOptions: UInt = 0
-        
-        self.options.forEach { rawOptions = rawOptions | $0.toFoundation().rawValue }
-        
-        let options = NSComparisonPredicateOptions(rawValue: rawOptions)
-        
-        return NSComparisonPredicate(leftExpression: expression.left.toFoundation(),
-                                     rightExpression: expression.right.toFoundation(),
-                                     modifier: modifier?.toFoundation() ?? .DirectPredicateModifier,
-                                     type: type.toFoundation(),
-                                     options: options)
-    }
-}
-
-public extension Comparision.Modifier {
-    
-    func toFoundation() -> NSComparisonPredicateModifier {
-        
-        switch self {
-        case .all: return .AllPredicateModifier
-        case .any: return .AnyPredicateModifier
-        }
-    }
-}
-
-public extension Comparision.Operator {
-    
-    func toFoundation() -> NSPredicateOperatorType {
-        
-        switch self {
-        case .lessThan:             return .LessThanPredicateOperatorType
-        case .lessThanOrEqualTo:    return .LessThanOrEqualToPredicateOperatorType
-        case .greaterThan:          return .GreaterThanPredicateOperatorType
-        case .greaterThanOrEqualTo: return .GreaterThanOrEqualToPredicateOperatorType
-        case .equalTo:              return .EqualToPredicateOperatorType
-        case .notEqualTo:           return .NotEqualToPredicateOperatorType
-        case .matches:              return .MatchesPredicateOperatorType
-        case .like:                 return .LikePredicateOperatorType
-        case .beginsWith:           return .BeginsWithPredicateOperatorType
-        case .endsWith:             return .EndsWithPredicateOperatorType
-        case .`in`:                 return .InPredicateOperatorType
-        case .contains:             return .ContainsPredicateOperatorType
-        case .between:              return .BetweenPredicateOperatorType
-        }
-    }
-}
-
-public extension Comparision.Option {
-    
-    func toFoundation() -> NSComparisonPredicateOptions {
-        
-        /// `NSLocale​Sensitive​Predicate​Option` is not availible in Swift for some reason.
-        /// Lack of Swift annotation it seems.
-        
-        switch self {
-        case .caseInsensitive: return .CaseInsensitivePredicateOption
-        case .diacriticInsensitive: return .DiacriticInsensitivePredicateOption
-        case .normalized: return .NormalizedPredicateOption
-        case .localeSensitive: return NSComparisonPredicateOptions(rawValue: 0x08)
-        }
-    }
-}
-
-public extension Expression {
-    
-    func toFoundation() -> NSExpression {
-        
-        switch self {
-        case let .keyPath(keyPath): return NSExpression(forKeyPath: keyPath)
-        case let .value(value): return NSExpression(forConstantValue: value.toFoundation())
-        }
-    }
-}
-
-public extension Value {
-    
-    func toFoundation() -> AnyObject? {
-        
-        switch self {
-        case .null: return nil
-        case let .string(value):    return value as NSString
-        case let .data(value):      return value.toFoundation()
-        case let .date(value):      return value.toFoundation()
-        case let .bool(value):      return NSNumber(bool: value)
-        case let .int16(value):     return NSNumber(short: value)
-        case let .int32(value):     return NSNumber(int: value)
-        case let .int64(value):     return NSNumber(longLong: value)
-        case let .float(value):     return NSNumber(float: value)
-        case let .double(value):    return NSNumber(double: value)
-        case let .collection(value): return value.map({ $0.toFoundation() ?? NSNull() }) as NSArray
-        }
-    }
-}
diff --git a/OpenStack Summit/CoreSummit/Named.swift b/OpenStack Summit/CoreSummit/Named.swift
index f0d58a4c..0fdc6ba5 100644
--- a/OpenStack Summit/CoreSummit/Named.swift	
+++ b/OpenStack Summit/CoreSummit/Named.swift	
@@ -12,10 +12,10 @@ public protocol Named: Unique {
     var name: String { get }
 }
 
-public extension CollectionType where Generator.Element: Named {
+public extension Collection where Iterator.Element: Named {
     
     var names: [String] {
         
         return self.map { $0.name }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/NonConfirmedAttendee.swift b/OpenStack Summit/CoreSummit/NonConfirmedAttendee.swift
index 82b87ec5..1d524b88 100644
--- a/OpenStack Summit/CoreSummit/NonConfirmedAttendee.swift	
+++ b/OpenStack Summit/CoreSummit/NonConfirmedAttendee.swift	
@@ -27,4 +27,4 @@ public func == (lhs: NonConfirmedAttendee, rhs: NonConfirmedAttendee) -> Bool {
     return lhs.identifier == rhs.identifier
         && lhs.firstName == rhs.firstName
         && lhs.lastName == rhs.lastName
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/NonConfirmedAttendeeJSON.swift b/OpenStack Summit/CoreSummit/NonConfirmedAttendeeJSON.swift
index 62d50560..a438dfb6 100644
--- a/OpenStack Summit/CoreSummit/NonConfirmedAttendeeJSON.swift	
+++ b/OpenStack Summit/CoreSummit/NonConfirmedAttendeeJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension NonConfirmedAttendee {
     
@@ -18,10 +18,10 @@ public extension NonConfirmedAttendee {
 
 extension NonConfirmedAttendee: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.external_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.external_id.rawValue]?.integerValue,
             let firstName = JSONObject[JSONKey.first_name.rawValue]?.rawValue as? String,
             let lastName = JSONObject[JSONKey.last_name.rawValue]?.rawValue as? String
             else { return nil }
@@ -30,4 +30,4 @@ extension NonConfirmedAttendee: JSONDecodable {
         self.firstName = firstName
         self.lastName = lastName
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/Notification.swift b/OpenStack Summit/CoreSummit/Notification.swift
index 054e2b7e..87bd50b1 100644
--- a/OpenStack Summit/CoreSummit/Notification.swift	
+++ b/OpenStack Summit/CoreSummit/Notification.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import struct Foundation.Date
 
 public struct Notification: Unique {
     
@@ -108,7 +108,7 @@ public extension Notification {
             }
         }
         
-        private static func parse(string: String, with prefix: String) -> Notification.Topic? {
+        private static func parse(_ string: String, with prefix: String) -> Notification.Topic? {
             
             let rawValue = string
             
@@ -118,11 +118,11 @@ public extension Notification {
                 static var prefixRegularExpressions = [String: [Prefix: NSRegularExpression]]()
             }
             
-            func parseIdentifier(prefix: Prefix) -> Identifier? {
+            func parseIdentifier(_ prefix: Prefix) -> Identifier? {
                 
                 let prefixString = topicPrefixString + prefix.rawValue + "_"
                 
-                guard rawValue.containsString(prefixString) else { return nil }
+                guard rawValue.contains(prefixString) else { return nil }
                 
                 // get regex
                 
@@ -156,18 +156,17 @@ public extension Notification {
                 
                 // run regex
                 
-                guard let match = regularExpression.firstMatchInString(rawValue, options: [], range: NSMakeRange(0, (rawValue as NSString).length))
-                    where match.numberOfRanges == 2
+                guard let match = regularExpression.firstMatch(in: rawValue, options: [], range: NSMakeRange(0, (rawValue as NSString).length)), match.numberOfRanges == 2
                     else { return nil }
                 
-                let matchString = (rawValue as NSString).substringWithRange(match.range)
+                let matchString = (rawValue as NSString).substring(with: match.range)
                 
                 guard matchString == rawValue
                     else { return nil }
                 
-                let captureGroup = (rawValue as NSString).substringWithRange(match.rangeAtIndex(1))
+                let captureGroup = (rawValue as NSString).substring(with: match.rangeAt(1))
                 
-                guard let identifier = Int(captureGroup)
+                guard let identifier = Identifier(captureGroup)
                     else { return nil }
                 
                 return identifier
@@ -175,7 +174,7 @@ public extension Notification {
             
             func parseCollection() -> Topic? {
                 
-                let prefixString = rawValue.stringByReplacingOccurrencesOfString(topicPrefixString, withString: "")
+                let prefixString = rawValue.replacingOccurrences(of: topicPrefixString, with: "")
                 
                 guard let prefix = Prefix(rawValue: prefixString)
                     else { return nil }
diff --git a/OpenStack Summit/CoreSummit/NotificationManagedObject.swift b/OpenStack Summit/CoreSummit/NotificationManagedObject.swift
index b008d67f..36829201 100644
--- a/OpenStack Summit/CoreSummit/NotificationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/NotificationManagedObject.swift	
@@ -8,11 +8,11 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class NotificationManagedObject: Entity {
     
-    @NSManaged public var created: NSDate
+    @NSManaged public var created: Date
     
     @NSManaged public var body: String
     
@@ -31,23 +31,23 @@ extension Notification: CoreDataDecodable {
     
     public init(managedObject: NotificationManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.body = managedObject.body
-        self.created = Date(foundation: managedObject.created)
+        self.created = managedObject.created
         self.from = Topic(rawValue: managedObject.from)!
         self.channel = Channel(rawValue: managedObject.channel)!
-        self.summit = managedObject.summit.identifier
-        self.event = managedObject.event?.identifier
+        self.summit = managedObject.summit.id
+        self.event = managedObject.event?.id
     }
 }
 
 extension Notification: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> NotificationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> NotificationManagedObject {
         
         let managedObject = try cached(context)
         
-        managedObject.created = created.toFoundation()
+        managedObject.created = created
         managedObject.body = body
         managedObject.from = from.rawValue
         managedObject.channel = channel.rawValue
diff --git a/OpenStack Summit/CoreSummit/Page.swift b/OpenStack Summit/CoreSummit/Page.swift
index cce76b6c..e968595b 100644
--- a/OpenStack Summit/CoreSummit/Page.swift	
+++ b/OpenStack Summit/CoreSummit/Page.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 /// Used for fetching requests that require paging.
 public struct Page<Item> {
diff --git a/OpenStack Summit/CoreSummit/PageController.swift b/OpenStack Summit/CoreSummit/PageController.swift
index 16c4347c..f4dff469 100644
--- a/OpenStack Summit/CoreSummit/PageController.swift	
+++ b/OpenStack Summit/CoreSummit/PageController.swift	
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import SwiftFoundation
+import Foundation
 
 public final class PageController<Item> {
     
@@ -15,13 +15,13 @@ public final class PageController<Item> {
     
     public let perPage: Int
     
-    public var fetch: (page: Int, perPage: Int, response: (ErrorValue<Page<Item>>) -> ()) -> ()
+    public var fetch: (_ page: Int, _ perPage: Int, _ response: @escaping (ErrorValue<Page<Item>>) -> ()) -> ()
     
     public var cached: (() -> [Item])?
     
     public var callback = PageControllerCallback<Item>()
     
-    public let operationQueue: NSOperationQueue
+    public let operationQueue: OperationQueue
     
     public private(set) var pages = [Page<Item>]() {
         
@@ -39,9 +39,9 @@ public final class PageController<Item> {
     
     // MARK: - Initialization
     
-    public init(fetch: (page: Int, perPage: Int, response: (ErrorValue<Page<Item>>) -> ()) -> (),
+    public init(fetch: @escaping (_ page: Int, _ perPage: Int, _ response: @escaping (ErrorValue<Page<Item>>) -> ()) -> (),
                 perPage: Int = 10,
-                operationQueue: NSOperationQueue = NSOperationQueue.mainQueue()) {
+                operationQueue: OperationQueue = OperationQueue.main) {
         
         self.fetch = fetch
         self.perPage = perPage
@@ -71,21 +71,21 @@ public final class PageController<Item> {
         
         callback.willLoadData()
         
-        fetch(page: nextPage, perPage: perPage) { [weak self] (response) in
+        fetch(nextPage, perPage) { [weak self] (response) in
             
             guard let controller = self else { return }
             
-            controller.operationQueue.addOperationWithBlock {
+            controller.operationQueue.addOperation {
                 
                 controller.isLoading = false
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
-                    controller.callback.didLoadNextPage(.Error(error))
+                    controller.callback.didLoadNextPage(.error(error))
                     
-                case let .Value(value):
+                case let .value(value):
                     
                     if controller.cacheLoaded {
                         
@@ -108,7 +108,7 @@ public final class PageController<Item> {
                         
                         let removedRow = PageControllerChange(index: previousLastIndex, change: .delete)
                         
-                        controller.callback.didLoadNextPage(.Value([removedRow]))
+                        controller.callback.didLoadNextPage(.value([removedRow]))
                         
                         return
                     }
@@ -127,7 +127,7 @@ public final class PageController<Item> {
                         changes.append(PageControllerChange(index: index, change: .insert))
                     }
                     
-                    controller.callback.didLoadNextPage(.Value(changes))
+                    controller.callback.didLoadNextPage(.value(changes))
                 }
             }
         }
@@ -146,7 +146,7 @@ public final class PageController<Item> {
     // MARK: - Private Methods
     
     @inline(__always)
-    private func updateItems(oldValue: [Page<Item>]) {
+    private func updateItems(_ oldValue: [Page<Item>]) {
         
         // reset if loaded from cache previously
         if oldValue.isEmpty && items.isEmpty == false {
@@ -163,7 +163,7 @@ public final class PageController<Item> {
             
             // get items from pages
             
-            items = pages.reduce([Item](), combine: { $0.0 + $0.1.items }).map({ .item($0) })
+            items = pages.reduce([Item](), { $0.0 + $0.1.items }).map({ .item($0) })
             
             if dataLoaded == false && items.isEmpty == false {
                 
diff --git a/OpenStack Summit/CoreSummit/PageJSON.swift b/OpenStack Summit/CoreSummit/PageJSON.swift
index 6882ac59..05f49981 100644
--- a/OpenStack Summit/CoreSummit/PageJSON.swift	
+++ b/OpenStack Summit/CoreSummit/PageJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 enum PageJSONKey: String {
     
@@ -15,21 +15,21 @@ enum PageJSONKey: String {
 
 public extension Page where Item: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let currentPage = JSONObject[PageJSONKey.current_page.rawValue]?.rawValue as? Int,
-            let total = JSONObject[PageJSONKey.total.rawValue]?.rawValue as? Int,
-            let lastPage = JSONObject[PageJSONKey.last_page.rawValue]?.rawValue as? Int,
-            let perPage = JSONObject[PageJSONKey.per_page.rawValue]?.rawValue as? Int,
+            let currentPage = JSONObject[PageJSONKey.current_page.rawValue]?.integerValue,
+            let total = JSONObject[PageJSONKey.total.rawValue]?.integerValue,
+            let lastPage = JSONObject[PageJSONKey.last_page.rawValue]?.integerValue,
+            let perPage = JSONObject[PageJSONKey.per_page.rawValue]?.integerValue,
             let dataArray = JSONObject[PageJSONKey.data.rawValue]?.arrayValue,
-            let items = Item.fromJSON(dataArray)
+            let items = Item.from(json: dataArray)
             else { return nil }
         
-        self.currentPage = currentPage
-        self.total = total
-        self.lastPage = lastPage
-        self.perPage = perPage
+        self.currentPage = Int(currentPage)
+        self.total = Int(total)
+        self.lastPage = Int(lastPage)
+        self.perPage = Int(perPage)
         self.items = items
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Person.swift b/OpenStack Summit/CoreSummit/Person.swift
index b62ece13..4ee03cad 100644
--- a/OpenStack Summit/CoreSummit/Person.swift	
+++ b/OpenStack Summit/CoreSummit/Person.swift	
@@ -12,7 +12,7 @@ public protocol Person: Named {
     
     var lastName: String { get }
         
-    var pictureURL: String { get }
+    var picture: URL { get }
     
     var title: String? { get }
     
@@ -30,22 +30,26 @@ public protocol Person: Named {
 public extension Person {
     
     var name: String { return firstName + " " + lastName }
+}
+
+// MARK: - Address Book 
+
+/// Type for organizing `Person` entities into an address book.
+public struct AddressBook {
+    
+    /// All the sections in the address book.
+    public static let sections = ["#","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"]
     
     /// Generate an uppercase letter to use as an address book section derived from the person's name.
-    var addressBookSectionName: String {
+    public static func section<T: Person>(for person: T) -> String {
         
-        let unknownLetter = "#"
+        let unknownLetter = sections[0] // "#"
         
-        guard let firstLetter = self.name.characters.first
+        guard let firstLetter = person.name.characters.first
             else { return unknownLetter }
         
-        let uppercaseLetter = String(firstLetter).uppercaseString
-        
-        return Self.addressBookSections.contains(uppercaseLetter) ? uppercaseLetter : unknownLetter
-    }
-    
-    static var addressBookSections: [String] {
+        let uppercaseLetter = String(firstLetter).uppercased()
         
-        return ["#","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"]
+        return sections.contains(uppercaseLetter) ? uppercaseLetter : unknownLetter
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Predicate.swift b/OpenStack Summit/CoreSummit/Predicate.swift
deleted file mode 100644
index 6babde11..00000000
--- a/OpenStack Summit/CoreSummit/Predicate.swift	
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  Predicate.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-/// You use predicates to represent logical conditions, used for describing objects in persistent stores and in-memory filtering of objects.
-public enum Predicate {
-    
-    case comparison(Comparision)
-    case compound(Compound)
-    case value(Bool)
-}
-
-// MARK: - Equatable
-
-extension Predicate: Equatable { }
-
-public func == (lhs: Predicate, rhs: Predicate) -> Bool {
-    
-    switch (lhs, rhs) {
-    case let (.comparison(lhsValue), .comparison(rhsValue)): return lhsValue == rhsValue
-    case let (.compound(lhsValue), .compound(rhsValue)): return lhsValue == rhsValue
-    case let (.value(lhsValue), .value(rhsValue)): return lhsValue == rhsValue
-    default: return false
-    }
-}
-
-// MARK: - CustomStringConvertible
-
-extension Predicate: CustomStringConvertible {
-    
-    public var description: String {
-        
-        switch self {
-        case let .comparison(value):    return "\(value)"
-        case let .compound(value):      return "\(value)"
-        case let .value(value):         return "\(value)"
-        }
-    }
-}
-
-// MARK: - Evaluate
-
-/// Protocol for types that can be evaluated with a predicate.
-public protocol PredicateEvaluatable {
-    
-    func evaluate(with predicate: Predicate) throws -> Bool
-}
-
-extension SequenceType where Generator.Element: PredicateEvaluatable {
-    
-    func evaluate(with predicate: Predicate) throws -> Bool {
-        
-        for element in self {
-            
-            guard try element.evaluate(with: predicate)
-                else { return false }
-        }
-        
-        return true
-    }
-}
-
-// MARK: - Convert
-
-/// Value can be converted to a predicate, typically an expression constant value.
-public protocol PredicateConvertible {
-    
-    func toPredicate() -> Predicate
-}
diff --git a/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift b/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift
index 97c88086..98d2ff6a 100644
--- a/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift	
@@ -6,20 +6,23 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-public struct PresentationDataUpdate: Unique {
+public extension Presentation {
     
-    public let identifier: Identifier
-    
-    public let level: Level?
-    
-    public let moderator: Identifier?
-    
-    public let speakers: Set<Speaker>
+    public struct DataUpdate: Unique {
+        
+        public let identifier: Identifier
+        
+        public let level: Level?
+        
+        public let moderator: Identifier?
+        
+        public let speakers: Set<Speaker>
+    }
 }
 
 // MARK: - Equatable
 
-public func == (lhs: PresentationDataUpdate, rhs: PresentationDataUpdate) -> Bool {
+public func == (lhs: Presentation.DataUpdate, rhs: Presentation.DataUpdate) -> Bool {
     
     return lhs.identifier == rhs.identifier
         && lhs.level == rhs.level
diff --git a/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift
index 55083c23..4d1975b1 100644
--- a/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift	
@@ -6,26 +6,26 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
-public extension PresentationDataUpdate {
+public extension Presentation.DataUpdate {
     
     typealias JSONKey = Presentation.JSONKey
 }
 
-extension PresentationDataUpdate: JSONDecodable {
+extension Presentation.DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
         
         // optional
-        if let moderator = JSONObject[JSONKey.moderator_speaker_id.rawValue]?.rawValue as? Int
-            where moderator > 0 {
+        if let moderator = JSONObject[JSONKey.moderator_speaker_id.rawValue]?.integerValue,
+            moderator > 0 {
             
             self.moderator = moderator
             
@@ -48,7 +48,7 @@ extension PresentationDataUpdate: JSONDecodable {
         
         if let speakersJSONArray = JSONObject[JSONKey.speakers.rawValue]?.arrayValue {
             
-            guard let speakers = Speaker.fromJSON(speakersJSONArray)
+            guard let speakers = Speaker.from(json: speakersJSONArray)
                 else { return nil }
             
             self.speakers = Set(speakers)
diff --git a/OpenStack Summit/CoreSummit/PresentationDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/PresentationDataUpdateManagedObject.swift
index 2001c62d..3c89143d 100644
--- a/OpenStack Summit/CoreSummit/PresentationDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationDataUpdateManagedObject.swift	
@@ -9,9 +9,9 @@
 import Foundation
 import CoreData
 
-extension PresentationDataUpdate: CoreDataEncodable {
+extension Presentation.DataUpdate: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> PresentationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> PresentationManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/PresentationJSON.swift b/OpenStack Summit/CoreSummit/PresentationJSON.swift
index 85a0d39b..6f1c887a 100644
--- a/OpenStack Summit/CoreSummit/PresentationJSON.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Presentation {
     
@@ -18,17 +18,17 @@ public extension Presentation {
 
 extension Presentation: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
         
         // optional
-        if let moderator = JSONObject[JSONKey.moderator_speaker_id.rawValue]?.rawValue as? Int
-            where moderator > 0 {
+        if let moderator = JSONObject[JSONKey.moderator_speaker_id.rawValue]?.integerValue,
+            moderator > 0 {
             
             self.moderator = moderator
             
@@ -51,7 +51,7 @@ extension Presentation: JSONDecodable {
         
         if let speakersJSONArray = JSONObject[JSONKey.speakers.rawValue]?.arrayValue {
             
-            guard let speakers = Int.fromJSON(speakersJSONArray)
+            guard let speakers = Identifier.from(json: speakersJSONArray)
                 else { return nil }
             
             self.speakers = Set(speakers)
diff --git a/OpenStack Summit/CoreSummit/PresentationManagedObject.swift b/OpenStack Summit/CoreSummit/PresentationManagedObject.swift
index b0fb24b0..88a3d116 100644
--- a/OpenStack Summit/CoreSummit/PresentationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationManagedObject.swift	
@@ -18,22 +18,26 @@ public final class PresentationManagedObject: Entity {
     @NSManaged public var moderator: SpeakerManagedObject?
     
     @NSManaged public var speakers: Set<SpeakerManagedObject>
+    
+    // Inverse Relationships
+    
+    @NSManaged public var event: EventManagedObject
 }
 
 extension Presentation: CoreDataDecodable {
     
     public init(managedObject: PresentationManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.level = managedObject.level != nil ? Level(rawValue: managedObject.level!) : nil
-        self.moderator = managedObject.moderator?.identifier
+        self.moderator = managedObject.moderator?.id
         self.speakers = managedObject.speakers.identifiers
     }
 }
 
 extension Presentation: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> PresentationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> PresentationManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/PresentationMaterial.swift b/OpenStack Summit/CoreSummit/PresentationMaterial.swift
index a2ec381c..50f06a99 100644
--- a/OpenStack Summit/CoreSummit/PresentationMaterial.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationMaterial.swift	
@@ -14,17 +14,17 @@ public protocol PresentationMaterial: Named {
     
     var featured: Bool { get }
     
-    var order: Int { get }
+    var order: Int64 { get }
     
     var event: Identifier { get }
 }
 
 // MARK: - Extensions
 
-public extension CollectionType where Generator.Element: PresentationMaterial {
+public extension Collection where Iterator.Element: PresentationMaterial {
     
-    func ordered() -> [Generator.Element] {
+    func ordered() -> [Iterator.Element] {
         
-        return self.sort { $0.0.order < $0.1.order }
+        return self.sorted { $0.0.order < $0.1.order }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/RawRepresentable.swift b/OpenStack Summit/CoreSummit/RawRepresentable.swift
new file mode 100644
index 00000000..e2eb52ab
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/RawRepresentable.swift	
@@ -0,0 +1,39 @@
+//
+//  RawRepresentable.swift
+//  SwiftFoundation
+//
+//  Created by Alsey Coleman Miller on 7/4/15.
+//  Copyright © 2015 PureSwift. All rights reserved.
+//
+
+// MARK: - Convert Array of RawRepresentables
+
+internal extension RawRepresentable {
+    
+    /// Creates a collection of ```RawRepresentable``` from a collection of raw values. 
+    /// åReturns ```nil``` if an element in the array had an invalid raw value.
+    static func from(rawValues: [RawValue]) -> [Self]? {
+        
+        var representables = [Self]()
+        
+        for element in rawValues {
+            
+            guard let rawRepresentable = self.init(rawValue: element) else { return nil }
+            
+            representables.append(rawRepresentable)
+        }
+        
+        return representables
+    }
+}
+
+internal extension Sequence where Self.Iterator.Element: RawRepresentable {
+
+    /// Convertes a sequence of `RawRepresentable` to its raw values.
+    var rawValues: [Self.Iterator.Element.RawValue] {
+        
+        return self.map { $0.rawValue }
+    }
+
+}
+
diff --git a/OpenStack Summit/CoreSummit/Reachability.swift b/OpenStack Summit/CoreSummit/Reachability.swift
index 2d602464..1755efea 100755
--- a/OpenStack Summit/CoreSummit/Reachability.swift	
+++ b/OpenStack Summit/CoreSummit/Reachability.swift	
@@ -13,13 +13,15 @@ public struct Reachability {
     public static var connected: Bool {
         
         var zeroAddress = sockaddr_in()
-        zeroAddress.sin_len = UInt8(sizeofValue(zeroAddress))
+        zeroAddress.sin_len = UInt8(MemoryLayout.size(ofValue: zeroAddress))
         zeroAddress.sin_family = sa_family_t(AF_INET)
-        let defaultRouteReachability = withUnsafePointer(&zeroAddress) {
-            SCNetworkReachabilityCreateWithAddress(nil, UnsafePointer($0))
-        }
+        let defaultRouteReachability = withUnsafePointer(to: &zeroAddress, {
+             $0.withMemoryRebound(to: sockaddr.self, capacity: 1) { zeroSockAddress in
+                SCNetworkReachabilityCreateWithAddress(nil, zeroSockAddress)!
+            }
+        })
         var flags = SCNetworkReachabilityFlags()
-        if !SCNetworkReachabilityGetFlags(defaultRouteReachability!, &flags) {
+        if !SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags) {
             return false
         }
         let isReachable = (flags.rawValue & UInt32(kSCNetworkFlagsReachable)) != 0
diff --git a/OpenStack Summit/CoreSummit/Session.swift b/OpenStack Summit/CoreSummit/Session.swift
index baa9d8cd..a38696f4 100644
--- a/OpenStack Summit/CoreSummit/Session.swift	
+++ b/OpenStack Summit/CoreSummit/Session.swift	
@@ -29,23 +29,23 @@ public extension SessionStorage {
 
 public final class UserDefaultsSessionStorage: SessionStorage {
     
-    public let userDefaults: NSUserDefaults
+    public let userDefaults: UserDefaults
     
-    public init(userDefaults: NSUserDefaults = NSUserDefaults.standardUserDefaults()) {
+    public init(userDefaults: UserDefaults = UserDefaults.standard) {
         
         self.userDefaults = userDefaults
     }
     
     public var member: Identifier? {
         
-        get { return (userDefaults.objectForKey(Key.member.rawValue) as? NSNumber)?.integerValue }
+        get { return (userDefaults.object(forKey: Key.member.rawValue) as? NSNumber)?.int64Value }
         
         set {
             
             guard let member = newValue
-                else { userDefaults.removeObjectForKey(Key.member.rawValue); return }
+                else { userDefaults.removeObject(forKey: Key.member.rawValue); return }
             
-            userDefaults.setObject(NSNumber(long: member), forKey: Key.member.rawValue)
+            userDefaults.set(NSNumber(value: member), forKey: Key.member.rawValue)
             
             userDefaults.synchronize()
         }
@@ -53,9 +53,9 @@ public final class UserDefaultsSessionStorage: SessionStorage {
     
     public var hadPasscode: Bool {
         
-        get { return userDefaults.boolForKey(Key.hadPasscode.rawValue) }
+        get { return userDefaults.bool(forKey: Key.hadPasscode.rawValue) }
         
-        set { userDefaults.setBool(newValue, forKey: Key.hadPasscode.rawValue) }
+        set { userDefaults.set(newValue, forKey: Key.hadPasscode.rawValue) }
     }
     
     private enum Key: String {
diff --git a/OpenStack Summit/CoreSummit/Slide.swift b/OpenStack Summit/CoreSummit/Slide.swift
index ade7485f..12ab3955 100644
--- a/OpenStack Summit/CoreSummit/Slide.swift	
+++ b/OpenStack Summit/CoreSummit/Slide.swift	
@@ -18,9 +18,9 @@ public struct Slide: PresentationMaterial {
     
     public var featured: Bool
     
-    public var order: Int
+    public var order: Int64
     
-    public var link: String
+    public var link: URL
     
     public var event: Identifier
 }
diff --git a/OpenStack Summit/CoreSummit/SlideJSON.swift b/OpenStack Summit/CoreSummit/SlideJSON.swift
index 456bc9d1..75d96b11 100644
--- a/OpenStack Summit/CoreSummit/SlideJSON.swift	
+++ b/OpenStack Summit/CoreSummit/SlideJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
+import struct Foundation.URL
 
 public extension Slide {
     
@@ -18,15 +19,15 @@ public extension Slide {
 
 extension Slide: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let featured = JSONObject[JSONKey.featured.rawValue]?.rawValue as? Bool,
             let displayOnSite = JSONObject[JSONKey.display_on_site.rawValue]?.rawValue as? Bool,
-            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.rawValue as? Identifier,
-            let order = JSONObject[JSONKey.order.rawValue]?.rawValue as? Int,
-            let link = JSONObject[JSONKey.link.rawValue]?.rawValue as? String
+            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.integerValue,
+            let order = JSONObject[JSONKey.order.rawValue]?.integerValue,
+            let link = JSONObject[JSONKey.link.rawValue]?.urlValue
             else { return nil }
         
         self.identifier = identifier
@@ -39,8 +40,8 @@ extension Slide: JSONDecodable {
         // optional
         self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
         
-        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
-            where descriptionText.isEmpty == false {
+        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String,
+            descriptionText.isEmpty == false {
             
             self.descriptionText = descriptionText
             
diff --git a/OpenStack Summit/CoreSummit/SlideManagedObject.swift b/OpenStack Summit/CoreSummit/SlideManagedObject.swift
index 4a0a4ccd..38af5725 100644
--- a/OpenStack Summit/CoreSummit/SlideManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/SlideManagedObject.swift	
@@ -30,20 +30,20 @@ extension Slide: CoreDataDecodable {
     
     public init(managedObject: SlideManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.displayOnSite = managedObject.displayOnSite
         self.featured = managedObject.featured
-        self.link = managedObject.link
-        self.event = managedObject.event.identifier
-        self.order = Int(managedObject.order)
+        self.link = URL(string: managedObject.link)!
+        self.event = managedObject.event.id
+        self.order = managedObject.order
     }
 }
 
 extension Slide: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> SlideManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> SlideManagedObject {
         
         let managedObject = try cached(context)
         
@@ -51,8 +51,8 @@ extension Slide: CoreDataEncodable {
         managedObject.descriptionText = descriptionText
         managedObject.displayOnSite = displayOnSite
         managedObject.featured = featured
-        managedObject.link = link
-        managedObject.order = Int64(order)
+        managedObject.link = link.absoluteString
+        managedObject.order = order
         managedObject.event = try context.relationshipFault(event)
         
         managedObject.didCache()
diff --git a/OpenStack Summit/CoreSummit/Speaker.swift b/OpenStack Summit/CoreSummit/Speaker.swift
index 71bdd876..51644d7c 100644
--- a/OpenStack Summit/CoreSummit/Speaker.swift	
+++ b/OpenStack Summit/CoreSummit/Speaker.swift	
@@ -16,7 +16,7 @@ public struct Speaker: Person {
     
     public var title: String?
     
-    public var pictureURL: String
+    public var picture: URL
             
     public var twitter: String?
     
@@ -42,7 +42,7 @@ public func == (lhs: Speaker, rhs: Speaker) -> Bool {
         && lhs.firstName == rhs.firstName
         && lhs.lastName == rhs.lastName
         && lhs.title == rhs.title
-        && lhs.pictureURL == rhs.pictureURL
+        && lhs.picture == rhs.picture
         && lhs.twitter == rhs.twitter
         && lhs.irc == rhs.irc
         && lhs.biography == rhs.biography
diff --git a/OpenStack Summit/CoreSummit/SpeakerJSON.swift b/OpenStack Summit/CoreSummit/SpeakerJSON.swift
index 85641c05..dd7251e0 100644
--- a/OpenStack Summit/CoreSummit/SpeakerJSON.swift	
+++ b/OpenStack Summit/CoreSummit/SpeakerJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Speaker {
     
@@ -18,19 +18,19 @@ public extension Speaker {
 
 extension Speaker: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let firstName = JSONObject[JSONKey.first_name.rawValue]?.rawValue as? String,
             let lastName = JSONObject[JSONKey.last_name.rawValue]?.rawValue as? String,
-            let pictureURL = JSONObject[JSONKey.pic.rawValue]?.rawValue as? String
+            let picture = JSONObject[JSONKey.pic.rawValue]?.urlValue
             else { return nil }
         
         self.identifier = identifier
         self.firstName = firstName
         self.lastName = lastName
-        self.pictureURL = pictureURL
+        self.picture = picture
         
         // optional
         self.title = JSONObject[JSONKey.title.rawValue]?.rawValue as? String
@@ -40,7 +40,7 @@ extension Speaker: JSONDecodable {
         
         if let affiliationsJSONArray = JSONObject[JSONKey.affiliations.rawValue]?.arrayValue {
             
-            guard let affiliations = Affiliation.fromJSON(affiliationsJSONArray)
+            guard let affiliations = Affiliation.from(json: affiliationsJSONArray)
                 else { return nil }
             
             self.affiliations = Set(affiliations)
diff --git a/OpenStack Summit/CoreSummit/SpeakerManagedObject.swift b/OpenStack Summit/CoreSummit/SpeakerManagedObject.swift
index d304bbd2..f1e5dbb2 100644
--- a/OpenStack Summit/CoreSummit/SpeakerManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/SpeakerManagedObject.swift	
@@ -32,6 +32,10 @@ public final class SpeakerManagedObject: Entity {
     // Inverse Relationships
     
     @NSManaged public var summits: Set<SummitManagedObject>
+    
+    @NSManaged public var presentationModerator: Set<PresentationManagedObject>
+    
+    @NSManaged public var presentationSpeaker: Set<PresentationManagedObject>
 }
 
 // MARK: - Encoding
@@ -40,11 +44,11 @@ extension Speaker: CoreDataDecodable {
     
     public init(managedObject: SpeakerManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.firstName = managedObject.firstName
         self.lastName = managedObject.lastName
         self.title = managedObject.title
-        self.pictureURL = managedObject.pictureURL
+        self.picture = URL(string: managedObject.pictureURL)!
         self.twitter = managedObject.twitter
         self.irc = managedObject.irc
         self.biography = managedObject.biography
@@ -54,15 +58,15 @@ extension Speaker: CoreDataDecodable {
 
 extension Speaker: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> SpeakerManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> SpeakerManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.firstName = firstName
         managedObject.lastName = lastName
-        managedObject.addressBookSectionName = addressBookSectionName
+        managedObject.addressBookSectionName = AddressBook.section(for: self)
         managedObject.title = title
-        managedObject.pictureURL = pictureURL
+        managedObject.pictureURL = picture.absoluteString
         managedObject.twitter = twitter
         managedObject.irc = irc
         managedObject.biography = biography
@@ -78,70 +82,11 @@ extension Speaker: CoreDataEncodable {
 
 public extension SpeakerManagedObject {
     
-    public enum Property: String {
-        
-        case id, firstName, lastName, addressBookSectionName, title, pictureURL, twitter, irc, biography, member
-    }
-    
     static var sortDescriptors: [NSSortDescriptor] {
         
-        return [NSSortDescriptor(key: Property.addressBookSectionName.rawValue, ascending: true),
-                NSSortDescriptor(key: Property.firstName.rawValue, ascending: true),
-                NSSortDescriptor(key: Property.lastName.rawValue, ascending: true),
-                NSSortDescriptor(key: Property.id.rawValue, ascending: true)]
-    }
-}
-
-public extension Speaker {
-    
-    static func filter(searchTerm: String = "",
-                       page: Int, objectsPerPage: Int,
-                       summit: Identifier? = nil,
-                       context: NSManagedObjectContext) throws -> [Speaker] {
-        
-        var predicates = [NSPredicate]()
-        
-        if searchTerm.isEmpty == false {
-            
-            let searchPredicate = NSPredicate(format: "firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@", searchTerm, searchTerm)
-            
-            predicates.append(searchPredicate)
-        }
-        
-        if let summitID = summit,
-            let summit = try SummitManagedObject.find(summitID, context: context) {
-            
-            let summitPredicate = NSPredicate(format: "%@ IN summits", summit)
-            
-            predicates.append(summitPredicate)
-        }
-        
-        let predicate: NSPredicate?
-        
-        if predicates.count > 1 {
-            
-            predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
-            
-        } else {
-            
-            predicate = predicates.first
-        }
-        
-        let results = try context.managedObjects(ManagedObject.self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
-        
-        var speakers = [ManagedObject]()
-        
-        let startRecord = (page - 1) * objectsPerPage
-        
-        let endRecord = (startRecord + (objectsPerPage - 1)) <= results.count ? startRecord + (objectsPerPage - 1) : results.count - 1
-        
-        if (startRecord <= endRecord) {
-            
-            for index in (startRecord...endRecord) {
-                speakers.append(results[index])
-            }
-        }
-        
-        return Speaker.from(managedObjects: speakers)
+        return [NSSortDescriptor(key: #keyPath(addressBookSectionName), ascending: true),
+                NSSortDescriptor(key:#keyPath(SpeakerManagedObject.firstName), ascending: true),
+                NSSortDescriptor(key:#keyPath(SpeakerManagedObject.lastName), ascending: true),
+                NSSortDescriptor(key:#keyPath(SpeakerManagedObject.id), ascending: true)]
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Store.swift b/OpenStack Summit/CoreSummit/Store.swift
index e9a82d72..1dcd0a65 100644
--- a/OpenStack Summit/CoreSummit/Store.swift	
+++ b/OpenStack Summit/CoreSummit/Store.swift	
@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
 import AeroGearHttp
 import AeroGearOAuth2
 
@@ -42,12 +41,12 @@ public final class Store {
     private var persistentStore: NSPersistentStore
     
     /// The managed object context running on a background thread for asyncronous caching.
-    public let privateQueueManagedObjectContext = NSManagedObjectContext(concurrencyType: NSManagedObjectContextConcurrencyType.PrivateQueueConcurrencyType)
+    public let privateQueueManagedObjectContext = NSManagedObjectContext(concurrencyType: NSManagedObjectContextConcurrencyType.privateQueueConcurrencyType)
     
     /// Request queue
-    private let requestQueue: NSOperationQueue = {
+    internal let requestQueue: OperationQueue = {
         
-        let queue = NSOperationQueue()
+        let queue = OperationQueue()
         
         queue.name = "\(Store.self) Request Queue"
         
@@ -63,16 +62,16 @@ public final class Store {
     deinit {
     
         // stop recieving 'didSave' notifications from private context
-        NSNotificationCenter.defaultCenter().removeObserver(self, name: NSManagedObjectContextDidSaveNotification, object: self.privateQueueManagedObjectContext)
+        NotificationCenter.default.removeObserver(self, name: NSNotification.Name.NSManagedObjectContextDidSave, object: self.privateQueueManagedObjectContext)
     
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
     
     public init(environment: Environment,
                  session: SessionStorage,
-                 contextConcurrencyType: NSManagedObjectContextConcurrencyType = .MainQueueConcurrencyType,
-                 createPersistentStore: (NSPersistentStoreCoordinator) throws -> NSPersistentStore,
-                 deletePersistentStore: (NSPersistentStoreCoordinator, NSPersistentStore) throws -> ()) throws {
+                 contextConcurrencyType: NSManagedObjectContextConcurrencyType = .mainQueueConcurrencyType,
+                 createPersistentStore: @escaping (NSPersistentStoreCoordinator) throws -> NSPersistentStore,
+                 deletePersistentStore: @escaping (NSPersistentStoreCoordinator, NSPersistentStore) throws -> ()) throws {
         
         // store values
         self.environment = environment
@@ -97,30 +96,32 @@ public final class Store {
         self.persistentStore = try createPersistentStore(persistentStoreCoordinator)
         
         // listen for notifications (for merging changes)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(Store.mergeChangesFromContextDidSaveNotification(_:)), name: NSManagedObjectContextDidSaveNotification, object: self.privateQueueManagedObjectContext)
+        NotificationCenter.default.addObserver(self, selector: #selector(Store.mergeChangesFromContextDidSaveNotification(_:)), name: NSNotification.Name.NSManagedObjectContextDidSave, object: self.privateQueueManagedObjectContext)
         
         
         // config OAuth and HTTP
         configOAuthAccounts()
         
-        NSNotificationCenter.defaultCenter().removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(
+        /* Removed from lib
+        NotificationCenter.default.removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(revokedAccess),
             name: OAuth2Module.revokeNotification,
             object: nil)
+        */
     }
     
     // MARK: - Accessors
     
     public var deviceHasPasscode: Bool {
         
-        let secret = "Device has passcode set?".dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
-        let attributes = [kSecClass as String: kSecClassGenericPassword, kSecAttrService as String: "LocalDeviceServices", kSecAttrAccount as String:"NoAccount", kSecValueData as String: secret!, kSecAttrAccessible as String:kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly]
+        let secret = "Device has passcode set?".data(using: String.Encoding.utf8, allowLossyConversion: false)
+        let attributes = [kSecClass as String: kSecClassGenericPassword, kSecAttrService as String: "LocalDeviceServices", kSecAttrAccount as String:"NoAccount", kSecValueData as String: secret!, kSecAttrAccessible as String:kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly] as [String : Any]
         
-        let status = SecItemAdd(attributes, nil)
+        let status = SecItemAdd(attributes as CFDictionary, nil)
         if status == 0 {
-            SecItemDelete(attributes)
+            SecItemDelete(attributes as CFDictionary)
             return true
         }
         return false
@@ -137,7 +138,7 @@ public final class Store {
         self.privateQueueManagedObjectContext.reset()
         
         // manually send notification
-        NSNotificationCenter.defaultCenter().postNotificationName(NSManagedObjectContextObjectsDidChangeNotification, object: self.managedObjectContext, userInfo: [:])
+        NotificationCenter.default.post(name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, object: self.managedObjectContext, userInfo: [:])
         
         #if os(iOS)
         // logout
@@ -149,22 +150,22 @@ public final class Store {
     
     /// Convenience function for adding a block to the request queue.
     @inline(__always)
-    internal func newRequest(block: () -> ()) {
+    internal func newRequest(_ block: @escaping () -> ()) {
         
-        self.requestQueue.addOperationWithBlock(block)
+        self.requestQueue.addOperation(block)
     }
     
     // MARK: - OAuth2
     
-    internal func createHTTP(type: RequestType) -> Http {
+    internal func createHTTP(_ type: RequestType) -> Http {
         
         let http: Http
-        if (type == .OpenIDGetFormUrlEncoded) {
+        if (type == .openIDGetFormUrlEncoded) {
             http = Http(responseSerializer: StringResponseSerializer())
             http.authzModule = oauthModuleOpenID
         }
-        else if (type == .OpenIDJSON) {
-            http = Http(responseSerializer: StringResponseSerializer(), requestSerializer: JsonRequestSerializer())
+        else if (type == .openIDJSON) {
+            http = Http(requestSerializer: JsonRequestSerializer(), responseSerializer: StringResponseSerializer())
             http.authzModule = oauthModuleOpenID
         }
         else {
@@ -190,7 +191,7 @@ public final class Store {
         
         var serviceAccountScopes = ["\(environment.configuration.serverURL)/summits/read"]
         
-        if environment == .Staging {
+        if environment == .staging {
             
             // openID staging scopes
             
@@ -234,74 +235,74 @@ public final class Store {
         oauthModuleServiceAccount = createOAuthModule(config, hasPasscode: hasPasscode)
     }
     
-    private func createOAuthModule(config: AeroGearOAuth2.Config, hasPasscode: Bool) -> OAuth2Module {
+    private func createOAuthModule(_ config: AeroGearOAuth2.Config, hasPasscode: Bool) -> OAuth2Module {
         var session: OAuth2Session
         
         config.accountId = "ACCOUNT_FOR_CLIENTID_\(config.clientId)"
         
         if self.session.hadPasscode && !hasPasscode {
             
-            session = TrustedPersistantOAuth2Session(accountId: config.accountId!)
+            session = TrustedPersistentOAuth2Session(accountId: config.accountId!)
             session.clearTokens()
         }
         
-        session = hasPasscode ? TrustedPersistantOAuth2Session(accountId: config.accountId!) : UntrustedMemoryOAuth2Session.getInstance(config.accountId!)
+        session = hasPasscode ? TrustedPersistentOAuth2Session(accountId: config.accountId!) : UntrustedMemoryOAuth2Session(accountId: config.accountId!)
         
-        return AccountManager.addAccount(config, session: session, moduleClass: OpenStackOAuth2Module.self)
+        return AccountManager.addAccountWith(config: config, moduleClass: OpenStackOAuth2Module.self, session: session)
     }
     
     // MARK: Notifications
     
-    @objc private func mergeChangesFromContextDidSaveNotification(notification: NSNotification) {
+    @objc private func mergeChangesFromContextDidSaveNotification(_ notification: Foundation.Notification) {
         
-        self.managedObjectContext.performBlockAndWait {
+        self.managedObjectContext.performAndWait {
             
-            self.managedObjectContext.mergeChangesFromContextDidSaveNotification(notification)
+            self.managedObjectContext.mergeChanges(fromContextDidSave: notification)
             
             // manually send notification
-            NSNotificationCenter.defaultCenter().postNotificationName(NSManagedObjectContextObjectsDidChangeNotification, object: self.managedObjectContext, userInfo: notification.userInfo)
+            NotificationCenter.default.post(name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, object: self.managedObjectContext, userInfo: notification.userInfo)
         }
     }
     
-    @objc private func revokedAccess(notification: NSNotification) {
+    @objc private func revokedAccess(_ notification: Foundation.Notification) {
         
         self.session.clear()
         
-        let notification = NSNotification(name: Notification.ForcedLoggedOut.rawValue, object:self, userInfo:nil)
-        NSNotificationCenter.defaultCenter().postNotification(notification)
+        let notification = Foundation.Notification(name: Store.Notification.forcedLoggedOut, object: self, userInfo: nil)
+        NotificationCenter.default.post(notification)
     }
 }
 
 // MARK: - Supporting Types
 
 /// Convenience function for adding a block to the main queue.
-internal func mainQueue(block: () -> ()) {
+internal func mainQueue(_ block: @escaping () -> ()) {
     
-    NSOperationQueue.mainQueue().addOperationWithBlock(block)
+    OperationQueue.main.addOperation(block)
 }
 
 public extension Store {
     
-    public enum Error: ErrorType {
+    public enum Error: Swift.Error {
         
         /// The server returned a status code indicating an error.
-        case ErrorStatusCode(Int)
+        case errorStatusCode(Int)
         
         /// The server returned an invalid response.
-        case InvalidResponse
+        case invalidResponse
         
         /// A custom error from the server.
-        case CustomServerError(String)
+        case customServerError(String)
     }
 }
 
 public extension Store {
     
-    public enum Notification: String {
+    public struct Notification {
         
-        case LoggedIn           = "CoreSummit.Store.Notification.LoggedIn"
-        case LoggedOut          = "CoreSummit.Store.Notification.LoggedOut"
-        case ForcedLoggedOut    = "CoreSummit.Store.Notification.ForcedLoggedOut"
+        public static let loggedIn = Foundation.Notification.Name(rawValue: "CoreSummit.Store.Notification.LoggedIn")
+        public static let loggedOut = Foundation.Notification.Name(rawValue: "CoreSummit.Store.Notification.LoggedOut")
+        public static let forcedLoggedOut = Foundation.Notification.Name(rawValue: "CoreSummit.Store.Notification.ForcedLoggedOut")
     }
 }
 
@@ -309,6 +310,6 @@ internal extension Store {
     
     enum RequestType {
         
-        case OpenIDGetFormUrlEncoded, OpenIDJSON, ServiceAccount
+        case openIDGetFormUrlEncoded, openIDJSON, serviceAccount
     }
 }
diff --git a/OpenStack Summit/CoreSummit/String.swift b/OpenStack Summit/CoreSummit/String.swift
index 921773c4..8b05dced 100644
--- a/OpenStack Summit/CoreSummit/String.swift	
+++ b/OpenStack Summit/CoreSummit/String.swift	
@@ -8,13 +8,61 @@
 
 import Foundation
 
+// MARK: - UTF8 Encoding
+
+public extension String {
+    
+    init?(UTF8Data: Data) {
+        
+        let data = UTF8Data
+        
+        var string = ""
+        
+        var generator = data.makeIterator()
+        
+        var encoding = UTF8()
+        
+        repeat {
+            
+            switch encoding.decode(&generator) {
+                
+            case let .scalarValue(scalar):
+                
+                let scalarString = String(scalar)
+                
+                string.append(scalarString)
+                
+            case .emptyInput:
+                
+                self = string
+                
+                return
+                
+            case .error:
+                
+                return nil
+            }
+            
+        } while true
+        
+        return nil
+    }
+    
+    func toUTF8Data() -> Data {
+        
+        return Data(bytes: Array(utf8))
+    }
+}
+
+// MARK: - OpenStack Encoding
+
 public extension String {
     
     /// Encodes to the encoding used with OpenStack API.
     public func toOpenStackEncoding() -> String? {
         
-        guard let cString = self.cStringUsingEncoding(NSNonLossyASCIIStringEncoding),
-            let encoded = String(CString: cString, encoding: NSUTF8StringEncoding)
+        guard let cString = self.cString(using: String.Encoding.nonLossyASCII),
+            let encoded = String(cString: cString, encoding: String.Encoding.utf8)
             else { return nil }
         
         return encoded
@@ -22,8 +70,8 @@ public extension String {
     /// Decodes from encoding used with OpenStack API.
     public init?(openStackEncoded string: String) {
         
-        guard let cString = string.cStringUsingEncoding(NSUTF8StringEncoding),
-            let encoded = String(CString: cString, encoding: NSNonLossyASCIIStringEncoding)
+        guard let cString = string.cString(using: String.Encoding.utf8),
+            let encoded = String(cString: cString, encoding: String.Encoding.nonLossyASCII)
             else { return nil }
         
         self = encoded
diff --git a/OpenStack Summit/CoreSummit/Summit.swift b/OpenStack Summit/CoreSummit/Summit.swift
index e596bcfb..71b67535 100644
--- a/OpenStack Summit/CoreSummit/Summit.swift	
+++ b/OpenStack Summit/CoreSummit/Summit.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public struct Summit: Named, Equatable {
     
@@ -27,7 +27,7 @@ public struct Summit: Named, Equatable {
     
     public var active: Bool
     
-    public var webpageURL: String
+    public var webpage: URL
     
     public var sponsors: Set<Company>
     
@@ -71,6 +71,6 @@ public func == (lhs: Summit, rhs: Summit) -> Bool {
         && lhs.trackGroups == rhs.trackGroups
         && lhs.eventTypes == rhs.eventTypes
         && lhs.schedule == rhs.schedule
-        && lhs.webpageURL == rhs.webpageURL
+        && lhs.webpage == rhs.webpage
         && lhs.wirelessNetworks == rhs.wirelessNetworks
 }
diff --git a/OpenStack Summit/CoreSummit/SummitDataUpdate.swift b/OpenStack Summit/CoreSummit/SummitDataUpdate.swift
index 378a26b4..e5471833 100644
--- a/OpenStack Summit/CoreSummit/SummitDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/SummitDataUpdate.swift	
@@ -6,38 +6,36 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public extension Summit {
     
-    typealias DataUpdate = SummitDataUpdate
-}
-
-/// The `DataUpdate` version of a `Summit`.
-public struct SummitDataUpdate: Named {
-    
-    public let identifier: Identifier
-    
-    public let name: String
-    
-    public let timeZone: String // should be `TimeZone` but would require Realm Schema migration
-    
-    public let datesLabel: String?
-    
-    public let start: Date
-    
-    public let end: Date
-    
-    public let active: Bool
-    
-    public let startShowingVenues: Date?
-    
-    public let ticketTypes: Set<TicketType>
-    
-    // Venue and Venue Rooms
-    public let locations: Set<Location>
-            
-    public let webpageURL: String
+    /// The `DataUpdate` version of a `Summit`.
+    public struct DataUpdate: Named {
+        
+        public let identifier: Identifier
+        
+        public let name: String
+        
+        public let timeZone: String // should be `TimeZone` but would require Realm Schema migration
+        
+        public let datesLabel: String?
+        
+        public let start: Date
+        
+        public let end: Date
+        
+        public let active: Bool
+        
+        public let startShowingVenues: Date?
+        
+        public let ticketTypes: Set<TicketType>
+        
+        // Venue and Venue Rooms
+        public let locations: Set<Location>
+        
+        public let webpageURL: String
+    }
 }
 
 // MARK: - Equatable
diff --git a/OpenStack Summit/CoreSummit/SummitDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/SummitDataUpdateJSON.swift
index 5b50ac0b..a7025d98 100644
--- a/OpenStack Summit/CoreSummit/SummitDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/SummitDataUpdateJSON.swift	
@@ -6,28 +6,29 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import struct Foundation.Date
+import JSON
 
-public extension SummitDataUpdate {
+extension Summit.DataUpdate {
     
     typealias JSONKey = Summit.JSONKey
 }
 
-extension SummitDataUpdate: JSONDecodable {
+extension Summit.DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
             let timeZoneJSON = JSONObject[JSONKey.time_zone.rawValue],
-            let timeZone = TimeZone(JSONValue: timeZoneJSON),
+            let timeZone = TimeZone(json: timeZoneJSON),
             let ticketTypeJSONArray = JSONObject[JSONKey.ticket_types.rawValue]?.arrayValue,
-            let ticketTypes = TicketType.fromJSON(ticketTypeJSONArray),
+            let ticketTypes = TicketType.from(json: ticketTypeJSONArray),
             let locationsJSONArray = JSONObject[JSONKey.locations.rawValue]?.arrayValue,
-            let locations = Location.fromJSON(locationsJSONArray),
+            let locations = Location.from(json: locationsJSONArray),
             let webpageURL = JSONObject[JSONKey.page_url.rawValue]?.rawValue as? String,
             let active = JSONObject[JSONKey.active.rawValue]?.rawValue as? Bool
             else { return nil }
@@ -56,7 +57,7 @@ extension SummitDataUpdate: JSONDecodable {
         
         self.datesLabel = JSONObject[JSONKey.dates_label.rawValue]?.rawValue as? String
         
-        if let startShowingVenuesDate = JSONObject[JSONKey.start_showing_venues_date.rawValue]?.rawValue as? Int {
+        if let startShowingVenuesDate = JSONObject[JSONKey.start_showing_venues_date.rawValue]?.integerValue {
             
             self.startShowingVenues = Date(timeIntervalSince1970: TimeInterval(startShowingVenuesDate))
             
diff --git a/OpenStack Summit/CoreSummit/SummitDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/SummitDataUpdateManagedObject.swift
index 15978c22..2a054ad9 100644
--- a/OpenStack Summit/CoreSummit/SummitDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/SummitDataUpdateManagedObject.swift	
@@ -8,29 +8,29 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
-extension SummitDataUpdate: Updatable {
+extension Summit.DataUpdate: Updatable {
     
     @inline(__always)
-    static func find(identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
+    static func find(_ identifier: Identifier, context: NSManagedObjectContext) throws -> Entity? {
         
         return try SummitManagedObject.find(identifier, context: context)
     }
     
     /// update current summit with Data Update
-    func write(context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
+    func write(_ context: NSManagedObjectContext, summit: SummitManagedObject) throws -> Entity {
         
         let managedObject = summit
         
         managedObject.name = name
         managedObject.timeZone = timeZone
         managedObject.datesLabel = datesLabel
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
+        managedObject.start = start
+        managedObject.end = end
         managedObject.webpageURL = webpageURL
         managedObject.active = active
-        managedObject.startShowingVenues = startShowingVenues?.toFoundation()
+        managedObject.startShowingVenues = startShowingVenues
         managedObject.ticketTypes = try context.relationshipFault(ticketTypes)
         managedObject.locations = try context.relationshipFault(locations)
         
@@ -41,4 +41,4 @@ extension SummitDataUpdate: Updatable {
         
         return managedObject
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/SummitJSON.swift b/OpenStack Summit/CoreSummit/SummitJSON.swift
index 06f54aac..5ce18315 100644
--- a/OpenStack Summit/CoreSummit/SummitJSON.swift	
+++ b/OpenStack Summit/CoreSummit/SummitJSON.swift	
@@ -6,7 +6,8 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
+import struct Foundation.URL
 
 public extension Summit {
     
@@ -18,35 +19,35 @@ public extension Summit {
 
 extension Summit: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
-            let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-            let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
+            let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+            let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
             let timeZoneJSON = JSONObject[JSONKey.time_zone.rawValue],
-            let timeZone = TimeZone(JSONValue: timeZoneJSON),
+            let timeZone = TimeZone(json: timeZoneJSON),
             let active = JSONObject[JSONKey.active.rawValue]?.rawValue as? Bool,
             let sponsorsJSONArray = JSONObject[JSONKey.sponsors.rawValue]?.arrayValue,
-            let sponsors = Company.fromJSON(sponsorsJSONArray),
+            let sponsors = Company.from(json: sponsorsJSONArray),
             let speakersJSONArray = JSONObject[JSONKey.speakers.rawValue]?.arrayValue,
-            let speakers = Speaker.fromJSON(speakersJSONArray),
+            let speakers = Speaker.from(json: speakersJSONArray),
             let ticketTypeJSONArray = JSONObject[JSONKey.ticket_types.rawValue]?.arrayValue,
-            let ticketTypes = TicketType.fromJSON(ticketTypeJSONArray),
+            let ticketTypes = TicketType.from(json: ticketTypeJSONArray),
             let locationsJSONArray = JSONObject[JSONKey.locations.rawValue]?.arrayValue,
-            let locations = Location.fromJSON(locationsJSONArray),
+            let locations = Location.from(json: locationsJSONArray),
             let tracksJSONArray = JSONObject[JSONKey.tracks.rawValue]?.arrayValue,
-            let tracks = Track.fromJSON(tracksJSONArray),
+            let tracks = Track.from(json: tracksJSONArray),
             let trackGroupsJSONArray = JSONObject[JSONKey.track_groups.rawValue]?.arrayValue,
-            let trackGroups = TrackGroup.fromJSON(trackGroupsJSONArray),
+            let trackGroups = TrackGroup.from(json: trackGroupsJSONArray),
             let eventsJSONArray = JSONObject[JSONKey.schedule.rawValue]?.arrayValue,
-            let events = Event.fromJSON(eventsJSONArray, parameters: identifier),
+            let events = Event.from(json: eventsJSONArray, summit: identifier),
             let eventTypesJSONArray = JSONObject[JSONKey.event_types.rawValue]?.arrayValue,
-            let eventTypes = EventType.fromJSON(eventTypesJSONArray),
-            let webpageURL = JSONObject[JSONKey.page_url.rawValue]?.rawValue as? String,
+            let eventTypes = EventType.from(json: eventTypesJSONArray),
+            let webpage = JSONObject[JSONKey.page_url.rawValue]?.urlValue,
             let wirelessNetworksJSONArray = JSONObject[JSONKey.wifi_connections.rawValue]?.arrayValue,
-            let wirelessNetworks = WirelessNetwork.fromJSON(wirelessNetworksJSONArray)
+            let wirelessNetworks = WirelessNetwork.from(json: wirelessNetworksJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -54,7 +55,7 @@ extension Summit: JSONDecodable {
         self.start = Date(timeIntervalSince1970: TimeInterval(startDate))
         self.end = Date(timeIntervalSince1970: TimeInterval(endDate))
         self.timeZone = timeZone.name
-        self.webpageURL = webpageURL
+        self.webpage = webpage
         self.active = active
         self.ticketTypes = Set(ticketTypes)
         self.tracks = Set(tracks)
@@ -80,7 +81,7 @@ extension Summit: JSONDecodable {
         
         self.datesLabel = JSONObject[JSONKey.dates_label.rawValue]?.rawValue as? String
         
-        if let startShowingVenuesDate = JSONObject[JSONKey.start_showing_venues_date.rawValue]?.rawValue as? Int {
+        if let startShowingVenuesDate = JSONObject[JSONKey.start_showing_venues_date.rawValue]?.integerValue {
             
             self.startShowingVenues = Date(timeIntervalSince1970: TimeInterval(startShowingVenuesDate))
             
@@ -89,7 +90,7 @@ extension Summit: JSONDecodable {
             self.startShowingVenues = nil
         }
         
-        if let scheduleStartDate = JSONObject[JSONKey.schedule_start_date.rawValue]?.rawValue as? Int {
+        if let scheduleStartDate = JSONObject[JSONKey.schedule_start_date.rawValue]?.integerValue {
             
             self.defaultStart = Date(timeIntervalSince1970: TimeInterval(scheduleStartDate))
             
diff --git a/OpenStack Summit/CoreSummit/SummitManagedObject.swift b/OpenStack Summit/CoreSummit/SummitManagedObject.swift
index e11b7cef..94ef4d25 100644
--- a/OpenStack Summit/CoreSummit/SummitManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/SummitManagedObject.swift	
@@ -8,12 +8,12 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class SummitManagedObject: Entity {
     
     /// The date this summit was fetched from the server.
-    @NSManaged public var initialDataLoad: NSDate?
+    @NSManaged public var initialDataLoad: Date?
     
     @NSManaged public var name: String
     
@@ -21,17 +21,17 @@ public final class SummitManagedObject: Entity {
     
     @NSManaged public var datesLabel: String?
     
-    @NSManaged public var start: NSDate
+    @NSManaged public var start: Date
     
-    @NSManaged public var end: NSDate
+    @NSManaged public var end: Date
     
-    @NSManaged public var defaultStart: NSDate?
+    @NSManaged public var defaultStart: Date?
     
     @NSManaged public var webpageURL: String
     
     @NSManaged public var active: Bool
     
-    @NSManaged public var startShowingVenues: NSDate?
+    @NSManaged public var startShowingVenues: Date?
     
     @NSManaged public var sponsors: Set<CompanyManagedObject>
     
@@ -56,18 +56,18 @@ extension Summit: CoreDataDecodable {
     
     public init(managedObject: SummitManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.timeZone = managedObject.timeZone
         self.datesLabel = managedObject.datesLabel
-        self.start = Date(foundation: managedObject.start)
-        self.end = Date(foundation: managedObject.end)
-        self.webpageURL = managedObject.webpageURL
+        self.start = managedObject.start
+        self.end = managedObject.end
+        self.webpage = URL(string: managedObject.webpageURL)!
         self.active = managedObject.active
         
         if let startShowingVenues = managedObject.startShowingVenues {
             
-            self.startShowingVenues = Date(foundation: startShowingVenues)
+            self.startShowingVenues = startShowingVenues
             
         } else {
             
@@ -76,7 +76,7 @@ extension Summit: CoreDataDecodable {
         
         if let defaultStart = managedObject.defaultStart {
             
-            self.defaultStart = Date(foundation: defaultStart)
+            self.defaultStart = defaultStart
             
         } else {
             
@@ -97,19 +97,19 @@ extension Summit: CoreDataDecodable {
 
 extension Summit: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> SummitManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> SummitManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.timeZone = timeZone
         managedObject.datesLabel = datesLabel
-        managedObject.start = start.toFoundation()
-        managedObject.end = end.toFoundation()
-        managedObject.defaultStart = defaultStart?.toFoundation()
-        managedObject.webpageURL = webpageURL
+        managedObject.start = start
+        managedObject.end = end
+        managedObject.defaultStart = defaultStart
+        managedObject.webpageURL = webpage.absoluteString
         managedObject.active = active
-        managedObject.startShowingVenues = startShowingVenues?.toFoundation()
+        managedObject.startShowingVenues = startShowingVenues
         managedObject.sponsors = try context.relationshipFault(sponsors)
         managedObject.speakers = try context.relationshipFault(speakers)
         managedObject.ticketTypes = try context.relationshipFault(ticketTypes)
diff --git a/OpenStack Summit/CoreSummit/SummitRequest.swift b/OpenStack Summit/CoreSummit/SummitRequest.swift
index 1f174805..04decfaa 100644
--- a/OpenStack Summit/CoreSummit/SummitRequest.swift	
+++ b/OpenStack Summit/CoreSummit/SummitRequest.swift	
@@ -6,9 +6,10 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     #if MOCKED
@@ -18,9 +19,9 @@ public extension Store {
     
         let JSONString = try! String(contentsOfFile: resourcePath)
     
-        let json = JSON.Value(string: JSONString)!
+        let json = try? JSON.Value(string: JSONString)!
     
-        let summit = Summit(JSONValue: json)!
+        let summit = Summit(json: json)!
         
         let context = self.privateQueueManagedObjectContext
         
@@ -37,7 +38,7 @@ public extension Store {
         completion(.Value(summit))
     }
     #else
-    func summit(identifier: Identifier? = nil, completion: ErrorValue<Summit> -> ()) {
+    func summit(_ identifier: Identifier? = nil, completion: @escaping (ErrorValue<Summit>) -> ()) {
         
         let summitID: String
         
@@ -50,36 +51,36 @@ public extension Store {
             summitID = "current"
         }
         
-        let URI = "/api/v1/summits/\(summitID)?expand=schedule"
+        let uri = "/api/v1/summits/\(summitID)?expand=schedule"
         
-        let http = self.createHTTP(.ServiceAccount)
+        let http = self.createHTTP(.serviceAccount)
         
-        let url = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let summit = Summit(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let summit = Summit(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
                 let managedObject = try summit.save(context)
                 
-                managedObject.initialDataLoad = NSDate()
+                managedObject.initialDataLoad = Date()
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(summit))
+            completion(.value(summit))
         }
     }
     #endif
diff --git a/OpenStack Summit/CoreSummit/SummitTypeJSON.swift b/OpenStack Summit/CoreSummit/SummitTypeJSON.swift
index b5bd1477..0046d527 100644
--- a/OpenStack Summit/CoreSummit/SummitTypeJSON.swift	
+++ b/OpenStack Summit/CoreSummit/SummitTypeJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension SummitType {
     
@@ -18,10 +18,10 @@ public extension SummitType {
 
 extension SummitType: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let color = JSONObject[JSONKey.color.rawValue]?.rawValue as? String
             /* let type = JSONObject[JSONKey.type.rawValue]?.rawValue as? String */
diff --git a/OpenStack Summit/CoreSummit/SummitTypeManagedObject.swift b/OpenStack Summit/CoreSummit/SummitTypeManagedObject.swift
index ec2088d9..dd98768e 100644
--- a/OpenStack Summit/CoreSummit/SummitTypeManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/SummitTypeManagedObject.swift	
@@ -20,7 +20,7 @@ extension SummitType: CoreDataDecodable {
     
     public init(managedObject: SummitTypeManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.color = managedObject.color
     }
@@ -28,7 +28,7 @@ extension SummitType: CoreDataDecodable {
 
 extension SummitType: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> SummitTypeManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> SummitTypeManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/SummitsRequest.swift b/OpenStack Summit/CoreSummit/SummitsRequest.swift
index b2ff1d18..7d9b04b9 100644
--- a/OpenStack Summit/CoreSummit/SummitsRequest.swift	
+++ b/OpenStack Summit/CoreSummit/SummitsRequest.swift	
@@ -6,32 +6,33 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func summits(page: Int = 1, objectsPerPage: Int = 30, completion: ErrorValue<Page<SummitsResponse.Summit>> -> ()) {
+    func summits(_ page: Int = 1, objectsPerPage: Int = 30, completion: @escaping (ErrorValue<Page<SummitsResponse.Summit>>) -> ()) {
         
-        let URI = "/api/v1/summits?page=\(page)&per_page=\(objectsPerPage)"
+        let uri = "/api/v1/summits?page=\(page)&per_page=\(objectsPerPage)"
         
-        let http = self.createHTTP(.ServiceAccount)
+        let http = self.createHTTP(.serviceAccount)
         
-        let url = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let response = SummitsResponse(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let response = SummitsResponse(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // success
-            completion(.Value(response.page))
+            completion(.value(response.page))
         }
     }
 }
@@ -42,9 +43,9 @@ public struct SummitsResponse: JSONDecodable {
     
     public let page: Page<Summit>
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
-        guard let page = Page<Summit>(JSONValue: JSONValue)
+        guard let page = Page<Summit>(json: JSONValue)
             else { return nil }
         
         self.page = page
@@ -71,15 +72,15 @@ public extension SummitsResponse {
         
         public let active: Bool
         
-        public init?(JSONValue: JSON.Value) {
+        public init?(json JSONValue: JSON.Value) {
             
             guard let JSONObject = JSONValue.objectValue,
-                let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+                let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
                 let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
-                let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int,
-                let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int,
+                let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue,
+                let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue,
                 let timeZoneJSON = JSONObject[JSONKey.time_zone.rawValue],
-                let timeZone = TimeZone(JSONValue: timeZoneJSON),
+                let timeZone = TimeZone(json: timeZoneJSON),
                 let active = JSONObject[JSONKey.active.rawValue]?.rawValue as? Bool
                 else { return nil }
             
diff --git a/OpenStack Summit/CoreSummit/TagJSON.swift b/OpenStack Summit/CoreSummit/TagJSON.swift
index ae83b8ea..a90a0b1d 100644
--- a/OpenStack Summit/CoreSummit/TagJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TagJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Tag {
     
@@ -18,14 +18,14 @@ public extension Tag {
 
 extension Tag: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let tag = JSONObject[JSONKey.tag.rawValue]?.rawValue as? String
             else { return nil }
         
         self.identifier = identifier
         self.name = tag
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/TagManagedObject.swift b/OpenStack Summit/CoreSummit/TagManagedObject.swift
index 88fcb470..847ae941 100644
--- a/OpenStack Summit/CoreSummit/TagManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TagManagedObject.swift	
@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 public final class TagManagedObject: Entity {
     
@@ -20,14 +21,14 @@ extension Tag: CoreDataDecodable {
     
     public init(managedObject: TagManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
     }
 }
 
 extension Tag: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TagManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TagManagedObject {
         
         let managedObject = try cached(context)
         
@@ -51,12 +52,11 @@ public extension TagManagedObject {
 
 public extension Tag {
     
-    static func search(searchTerm: String, context: NSManagedObjectContext) throws -> [Tag] {
+    static func search(_ searchTerm: String, context: NSManagedObjectContext) throws -> [Tag] {
         
-        let predicate = NSPredicate(format: "name CONTAINS[c] %@", searchTerm)
+        //let predicate = NSPredicate(format: "name CONTAINS[c] %@", searchTerm)
+        let predicate: Predicate = (#keyPath(TagManagedObject.name)).compare(.contains, [.caseInsensitive], .value(.string(searchTerm)))
         
-        let managedObjects = try context.managedObjects(ManagedObject.self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
-        
-        return Tag.from(managedObjects: managedObjects)
+        return try context.managedObjects(self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Team.swift b/OpenStack Summit/CoreSummit/Team.swift
index 6a66c823..2f733b69 100644
--- a/OpenStack Summit/CoreSummit/Team.swift	
+++ b/OpenStack Summit/CoreSummit/Team.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct Team: Named {
     
@@ -52,6 +52,6 @@ public extension Team {
             return .admin
         }
         
-        return members.firstMatching({ $0.member.identifier == member })?.permission
+        return members.first(where: { $0.member.identifier == member })?.permission
     }
 }
diff --git a/OpenStack Summit/CoreSummit/TeamInvitation.swift b/OpenStack Summit/CoreSummit/TeamInvitation.swift
index 0f4437cb..45e39174 100644
--- a/OpenStack Summit/CoreSummit/TeamInvitation.swift	
+++ b/OpenStack Summit/CoreSummit/TeamInvitation.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct TeamInvitation: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/TeamInvitationJSON.swift b/OpenStack Summit/CoreSummit/TeamInvitationJSON.swift
index c03e1254..80e29389 100644
--- a/OpenStack Summit/CoreSummit/TeamInvitationJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TeamInvitationJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 private enum TeamInvitationJSONKey: String {
     
@@ -15,21 +15,21 @@ private enum TeamInvitationJSONKey: String {
 
 extension TeamInvitation: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         typealias JSONKey = TeamInvitationJSONKey
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let team = JSONObject[JSONKey.team_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let team = JSONObject[JSONKey.team_id.rawValue]?.integerValue,
             let inviteeJSON = JSONObject[JSONKey.invitee.rawValue],
-            let invitee = Member(JSONValue: inviteeJSON),
+            let invitee = Member(json: inviteeJSON),
             let inviterJSON = JSONObject[JSONKey.inviter.rawValue],
-            let inviter = Member(JSONValue: inviterJSON),
+            let inviter = Member(json: inviterJSON),
             let permissionString = JSONObject[JSONKey.permission.rawValue]?.rawValue as? String,
             let permission = TeamPermission(rawValue: permissionString),
-            let created = JSONObject[JSONKey.created_at.rawValue]?.rawValue as? Int,
-            let updated = JSONObject[JSONKey.updated_at.rawValue]?.rawValue as? Int,
+            let created = JSONObject[JSONKey.created_at.rawValue]?.integerValue,
+            let updated = JSONObject[JSONKey.updated_at.rawValue]?.integerValue,
             let accepted = JSONObject[JSONKey.is_accepted.rawValue]?.rawValue as? Bool
             else { return nil }
         
@@ -46,22 +46,22 @@ extension TeamInvitation: JSONDecodable {
 
 extension ListTeamInvitations.Response.Invitation: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         typealias JSONKey = TeamInvitationJSONKey
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let teamJSON = JSONObject[JSONKey.team.rawValue],
-            let team = Team(JSONValue: teamJSON),
+            let team = Team(json: teamJSON),
             let inviteeJSON = JSONObject[JSONKey.invitee.rawValue],
-            let invitee = Member(JSONValue: inviteeJSON),
+            let invitee = Member(json: inviteeJSON),
             let inviterJSON = JSONObject[JSONKey.inviter.rawValue],
-            let inviter = Member(JSONValue: inviterJSON),
+            let inviter = Member(json: inviterJSON),
             let permissionString = JSONObject[JSONKey.permission.rawValue]?.rawValue as? String,
             let permission = TeamPermission(rawValue: permissionString),
-            let created = JSONObject[JSONKey.created_at.rawValue]?.rawValue as? Int,
-            let updated = JSONObject[JSONKey.updated_at.rawValue]?.rawValue as? Int,
+            let created = JSONObject[JSONKey.created_at.rawValue]?.integerValue,
+            let updated = JSONObject[JSONKey.updated_at.rawValue]?.integerValue,
             let accepted = JSONObject[JSONKey.is_accepted.rawValue]?.rawValue as? Bool
             else { return nil }
         
@@ -78,9 +78,9 @@ extension ListTeamInvitations.Response.Invitation: JSONDecodable {
 
 extension ListTeamInvitations.Response: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
-        guard let page = Page<ListTeamInvitations.Response.Invitation>(JSONValue: JSONValue)
+        guard let page = Page<ListTeamInvitations.Response.Invitation>(json: JSONValue)
             else { return nil }
         
         self.page = page
diff --git a/OpenStack Summit/CoreSummit/TeamInvitationManagedObject.swift b/OpenStack Summit/CoreSummit/TeamInvitationManagedObject.swift
index d21eb433..59ac7c34 100644
--- a/OpenStack Summit/CoreSummit/TeamInvitationManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TeamInvitationManagedObject.swift	
@@ -8,13 +8,13 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class TeamInvitationManagedObject: Entity {
     
-    @NSManaged public var created: NSDate
+    @NSManaged public var created: Date
     
-    @NSManaged public var updatedDate: NSDate
+    @NSManaged public var updatedDate: Date
     
     @NSManaged public var permission: String
     
@@ -33,25 +33,25 @@ extension TeamInvitation: CoreDataDecodable {
     
     public init(managedObject: TeamInvitationManagedObject) {
         
-        self.identifier = managedObject.identifier
-        self.created = Date(foundation: managedObject.created)
-        self.updated = Date(foundation: managedObject.updatedDate)
+        self.identifier = managedObject.id
+        self.created = managedObject.created
+        self.updated = managedObject.updatedDate
         self.accepted = managedObject.accepted
         self.permission = TeamPermission(rawValue: managedObject.permission)!
         self.invitee = Member(managedObject: managedObject.invitee)
         self.inviter = Member(managedObject: managedObject.inviter)
-        self.team = managedObject.team.identifier
+        self.team = managedObject.team.id
     }
 }
 
 extension TeamInvitation: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TeamInvitationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TeamInvitationManagedObject {
         
         let managedObject = try cached(context)
         
-        managedObject.created = created.toFoundation()
-        managedObject.updatedDate = updated.toFoundation()
+        managedObject.created = created
+        managedObject.updatedDate = updated
         managedObject.accepted = accepted
         managedObject.permission = permission.rawValue
         managedObject.invitee = try context.relationshipFault(invitee)
@@ -66,12 +66,12 @@ extension TeamInvitation: CoreDataEncodable {
 
 extension ListTeamInvitations.Response.Invitation: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TeamInvitationManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TeamInvitationManagedObject {
         
         let managedObject = try cached(context)
         
-        managedObject.created = created.toFoundation()
-        managedObject.updatedDate = updated.toFoundation()
+        managedObject.created = created
+        managedObject.updatedDate = updated
         managedObject.accepted = accepted
         managedObject.permission = permission.rawValue
         managedObject.invitee = try context.relationshipFault(invitee)
diff --git a/OpenStack Summit/CoreSummit/TeamInvitationRequest.swift b/OpenStack Summit/CoreSummit/TeamInvitationRequest.swift
index 4591c5f4..010d89e7 100644
--- a/OpenStack Summit/CoreSummit/TeamInvitationRequest.swift	
+++ b/OpenStack Summit/CoreSummit/TeamInvitationRequest.swift	
@@ -6,22 +6,23 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreData
+import JSON
 
 public extension Store {
     
-    func accept(invitation identifier: Identifier, completion: (ErrorType?) -> ()) {
+    func accept(invitation identifier: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/members/me/team-invitations/\(identifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.PUT(url) { (responseObject, error) in
+        http.request(method: .put, path: url) { (responseObject, error) in
             
             if error == nil {
                 
@@ -41,17 +42,17 @@ public extension Store {
         }
     }
     
-    func decline(invitation identifier: Identifier, completion: (ErrorType?) -> ()) {
+    func decline(invitation identifier: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/members/me/team-invitations/\(identifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.DELETE(url) { (responseObject, error) in
+        http.request(method: .delete, path: url) { (responseObject, error) in
             
             if error == nil {
                 
@@ -72,39 +73,39 @@ public extension Store {
         }
     }
     
-    func invitations(page: Int = 1,
+    func invitations(_ page: Int = 1,
                      perPage: Int = 10,
                      filter: ListTeamInvitations.Request.Filter? = nil,
-                     completion: (ErrorValue<Page<ListTeamInvitations.Response.Invitation>>) -> ()) {
+                     completion: @escaping (ErrorValue<Page<ListTeamInvitations.Response.Invitation>>) -> ()) {
         
         let request = ListTeamInvitations.Request(filter: filter, page: page, perPage: perPage)
         
         let url = request.toURL(environment.configuration.serverURL)
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let response = ListTeamInvitations.Response(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let response = ListTeamInvitations.Response(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try response.page.items.save(context)
+                let _ = try response.page.items.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(response.page))
+            completion(.value(response.page))
         }
     }
 }
@@ -127,7 +128,7 @@ public struct ListTeamInvitations {
         
         public var perPage: Int
         
-        public func toURL(serverURL: String) -> String {
+        public func toURL(_ serverURL: String) -> String {
             
             let filterString: String
             
diff --git a/OpenStack Summit/CoreSummit/TeamJSON.swift b/OpenStack Summit/CoreSummit/TeamJSON.swift
index 0805bb25..9f1773f8 100644
--- a/OpenStack Summit/CoreSummit/TeamJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TeamJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Team {
     
@@ -18,18 +18,18 @@ public extension Team {
 
 extension Team: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let encodedName = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let name = String(openStackEncoded: encodedName),
-            let created = JSONObject[JSONKey.created_at.rawValue]?.rawValue as? Int,
-            let updated = JSONObject[JSONKey.updated_at.rawValue]?.rawValue as? Int,
+            let created = JSONObject[JSONKey.created_at.rawValue]?.integerValue,
+            let updated = JSONObject[JSONKey.updated_at.rawValue]?.integerValue,
             let ownerJSON = JSONObject[JSONKey.owner.rawValue],
-            let owner = Member(JSONValue: ownerJSON),
+            let owner = Member(json: ownerJSON),
             let membersJSONArray = JSONObject[JSONKey.members.rawValue]?.arrayValue,
-            let members = TeamMember.fromJSON(membersJSONArray)
+            let members = TeamMember.from(json: membersJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -52,7 +52,7 @@ extension Team: JSONDecodable {
         
         if let invitationsJSONArray = JSONObject[JSONKey.invitations.rawValue]?.arrayValue {
             
-            guard let invitations = TeamInvitation.fromJSON(invitationsJSONArray)
+            guard let invitations = TeamInvitation.from(json: invitationsJSONArray)
                 else { return nil }
             
             self.invitations = Set(invitations)
diff --git a/OpenStack Summit/CoreSummit/TeamManagedObject.swift b/OpenStack Summit/CoreSummit/TeamManagedObject.swift
index e5f5571e..b39a2c75 100644
--- a/OpenStack Summit/CoreSummit/TeamManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TeamManagedObject.swift	
@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
 
 public final class TeamManagedObject: Entity {
     
@@ -16,9 +15,9 @@ public final class TeamManagedObject: Entity {
     
     @NSManaged public var descriptionText: String?
     
-    @NSManaged public var created: NSDate
+    @NSManaged public var created: Date
     
-    @NSManaged public var updatedDate: NSDate
+    @NSManaged public var updatedDate: Date
     
     @NSManaged public var owner: MemberManagedObject
     
@@ -37,10 +36,10 @@ extension Team: CoreDataDecodable {
     
     public init(managedObject: TeamManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
-        self.created = Date(foundation: managedObject.created)
-        self.updated = Date(foundation: managedObject.updatedDate)
+        self.created = managedObject.created
+        self.updated = managedObject.updatedDate
         self.descriptionText = managedObject.descriptionText
         self.owner = Member(managedObject: managedObject.owner)
         self.members = TeamMember.from(managedObjects: managedObject.members)
@@ -50,24 +49,24 @@ extension Team: CoreDataDecodable {
 
 extension Team: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TeamManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TeamManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
-        managedObject.created = created.toFoundation()
-        managedObject.updatedDate = updated.toFoundation()
+        managedObject.created = created
+        managedObject.updatedDate = updated
         
         // delete previous team members and owner, to not have nil inverse relationships
-        managedObject.members.forEach { context.deleteObject($0) }
+        managedObject.members.forEach { context.delete($0) }
         
         // set members
         managedObject.owner = try context.relationshipFault(owner)
         managedObject.members = try context.relationshipFault(members)
         
         // set invitations
-        managedObject.invitations.forEach { context.deleteObject($0) } // invitations must always have a team
+        managedObject.invitations.forEach { context.delete($0) } // invitations must always have a team
         managedObject.invitations = try context.relationshipFault(invitations)
         
         managedObject.didCache()
diff --git a/OpenStack Summit/CoreSummit/TeamMember.swift b/OpenStack Summit/CoreSummit/TeamMember.swift
index 402ae255..47f13294 100644
--- a/OpenStack Summit/CoreSummit/TeamMember.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMember.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct TeamMember: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/TeamMemberJSON.swift b/OpenStack Summit/CoreSummit/TeamMemberJSON.swift
index d4f3f90c..18c0859f 100644
--- a/OpenStack Summit/CoreSummit/TeamMemberJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMemberJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension TeamMember {
     
@@ -18,15 +18,15 @@ public extension TeamMember {
 
 extension TeamMember: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let team = JSONObject[JSONKey.team_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let team = JSONObject[JSONKey.team_id.rawValue]?.integerValue,
             let permissionString = JSONObject[JSONKey.permission.rawValue]?.rawValue as? String,
             let permission = TeamPermission(rawValue: permissionString),
             let memberJSON = JSONObject[JSONKey.member.rawValue],
-            let member = Member(JSONValue: memberJSON)
+            let member = Member(json: memberJSON)
             else { return nil }
         
         self.identifier = identifier
diff --git a/OpenStack Summit/CoreSummit/TeamMemberManagedObject.swift b/OpenStack Summit/CoreSummit/TeamMemberManagedObject.swift
index e4a0f732..f1992d28 100644
--- a/OpenStack Summit/CoreSummit/TeamMemberManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMemberManagedObject.swift	
@@ -24,16 +24,16 @@ extension TeamMember: CoreDataDecodable {
     
     public init(managedObject: TeamMemberManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.permission = TeamPermission(rawValue: managedObject.permission)!
-        self.team = managedObject.team.identifier
+        self.team = managedObject.team.id
         self.member = Member(managedObject: managedObject.member)
     }
 }
 
 extension TeamMember: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TeamMemberManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TeamMemberManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/TeamMemberRequest.swift b/OpenStack Summit/CoreSummit/TeamMemberRequest.swift
index 0b0bbba1..e6cca4b9 100644
--- a/OpenStack Summit/CoreSummit/TeamMemberRequest.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMemberRequest.swift	
@@ -6,47 +6,51 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func add(member memberIdentifier: Identifier, to team: Identifier, permission: TeamPermission = .read, completion: (ErrorValue<Identifier>) -> ()) {
+    func add(member memberIdentifier: Identifier,
+             to team: Identifier,
+             permission: TeamPermission = .read,
+             completion: @escaping (ErrorValue<Identifier>) -> ()) {
         
         let uri = "/api/v1/teams/\(team)/members/\(memberIdentifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
-        http.POST(url, parameters: ["permission": permission.rawValue]) { (responseObject, error) in
+        http.request(method: .post, path: url, parameters: ["permission": permission.rawValue]) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
+            guard let json = try? JSON.Value(string: responseObject as! String),
                 let jsonObject = json.objectValue,
-                let identifier = jsonObject["id"]?.rawValue as? Int
-                else { completion(.Error(Error.InvalidResponse)); return }
+                let identifier = jsonObject["id"]?.integerValue
+                else { completion(.error(Error.invalidResponse)); return }
             
             // success
-            completion(.Value(identifier))
+            completion(.value(identifier))
         }
     }
     
-    func remove(member identifier: Identifier, from team: Identifier, completion: (ErrorType?) -> ()) {
+    func remove(member identifier: Identifier, from team: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/teams/\(team)/members/\(identifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.DELETE(url) { (responseObject, error) in
+        http.request(method: .delete, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -57,7 +61,7 @@ public extension Store {
                 
                 if let managedObject = try TeamMemberManagedObject.find(identifier, context: context) {
                     
-                    context.deleteObject(managedObject)
+                    context.delete(managedObject)
                     
                     try context.validateAndSave()
                 }
diff --git a/OpenStack Summit/CoreSummit/TeamMessage.swift b/OpenStack Summit/CoreSummit/TeamMessage.swift
index 84125091..99366974 100644
--- a/OpenStack Summit/CoreSummit/TeamMessage.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMessage.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct TeamMessage: Unique {
     
diff --git a/OpenStack Summit/CoreSummit/TeamMessageJSON.swift b/OpenStack Summit/CoreSummit/TeamMessageJSON.swift
index 19999c3f..74d70dce 100644
--- a/OpenStack Summit/CoreSummit/TeamMessageJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMessageJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension TeamMessage {
     
@@ -18,14 +18,14 @@ public extension TeamMessage {
 
 extension TeamMessage: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let teamIdentifier = JSONObject[JSONKey.team_id.rawValue]?.rawValue as? Int,
-            let fromMemberIdentifier = JSONObject[JSONKey.from_id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
+            let teamIdentifier = JSONObject[JSONKey.team_id.rawValue]?.integerValue,
+            let fromMemberIdentifier = JSONObject[JSONKey.from_id.rawValue]?.integerValue,
             let body = JSONObject[JSONKey.body.rawValue]?.rawValue as? String,
-            let created = JSONObject[JSONKey.created_at.rawValue]?.rawValue as? Int
+            let created = JSONObject[JSONKey.created_at.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
diff --git a/OpenStack Summit/CoreSummit/TeamMessageManagedObject.swift b/OpenStack Summit/CoreSummit/TeamMessageManagedObject.swift
index cdb8e4ba..0c44d64a 100644
--- a/OpenStack Summit/CoreSummit/TeamMessageManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMessageManagedObject.swift	
@@ -8,13 +8,13 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class TeamMessageManagedObject: Entity {
         
     @NSManaged public var body: String
     
-    @NSManaged public var created: NSDate
+    @NSManaged public var created: Date
     
     @NSManaged public var team: TeamManagedObject
     
@@ -27,9 +27,9 @@ extension TeamMessage: CoreDataDecodable {
     
     public init(managedObject: TeamMessageManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.body = managedObject.body
-        self.created = Date(foundation: managedObject.created)
+        self.created = managedObject.created
         self.from = Fault<Member>(managedObject: managedObject.from)
         self.team = Fault<Team>(managedObject: managedObject.team)
     }
@@ -37,12 +37,12 @@ extension TeamMessage: CoreDataDecodable {
 
 extension TeamMessage: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TeamMessageManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TeamMessageManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.body = body
-        managedObject.created = created.toFoundation()
+        managedObject.created = created
         managedObject.from = try context.relationshipFault(from)
         managedObject.team = try context.relationshipFault(team)
         
diff --git a/OpenStack Summit/CoreSummit/TeamMessageRequest.swift b/OpenStack Summit/CoreSummit/TeamMessageRequest.swift
index 4a54ed23..4719e0dc 100644
--- a/OpenStack Summit/CoreSummit/TeamMessageRequest.swift	
+++ b/OpenStack Summit/CoreSummit/TeamMessageRequest.swift	
@@ -6,50 +6,51 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func send(message: String, to team: Identifier, priority: TeamMessage.Priority = .normal, completion: (ErrorValue<TeamMessage>) -> ()) {
+    func send(_ message: String, to team: Identifier, priority: TeamMessage.Priority = .normal, completion: @escaping (ErrorValue<TeamMessage>) -> ()) {
         
         let uri = "/api/v1/teams/\(team)/messages"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        guard let member = self.authenticatedMember?.identifier
+        guard let member = self.authenticatedMember?.id
             else { fatalError("Must be logged in") }
         
         let messageASCII = message.toOpenStackEncoding()!
         
-        http.POST(url, parameters: ["body": messageASCII, "priority": priority.rawValue]) { (responseObject, error) in
+        http.request(method: .post, path: url, parameters: ["body": messageASCII, "priority": priority.rawValue]) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
+            guard let json = try? JSON.Value(string: responseObject as! String),
                 let jsonObject = json.objectValue,
-                let identifier = jsonObject["id"]?.rawValue as? Int
-                else { completion(.Error(Error.InvalidResponse)); return }
+                let identifier = jsonObject["id"]?.integerValue
+                else { completion(.error(Error.invalidResponse)); return }
             
             let message = TeamMessage(identifier: identifier, team: .identifier(team), body: message, created: Date(), from: .identifier(member))
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try message.save(context)
+                let _ = try message.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(message))
+            completion(.value(message))
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/TeamRequest.swift b/OpenStack Summit/CoreSummit/TeamRequest.swift
index 56571212..edd12677 100644
--- a/OpenStack Summit/CoreSummit/TeamRequest.swift	
+++ b/OpenStack Summit/CoreSummit/TeamRequest.swift	
@@ -6,41 +6,42 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func create(team name: String, description: String?, completion: (ErrorValue<Team>) -> ()) {
+    func create(team name: String, description: String?, completion: @escaping (ErrorValue<Team>) -> ()) {
         
         let uri = "/api/v1/teams"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        var jsonDictionary = [String: AnyObject]()
+        var jsonDictionary = [String: Any]()
         
         jsonDictionary["name"] = name.toOpenStackEncoding()!
         
-        if let description = description where description.isEmpty == false {
+        if let description = description, description.isEmpty == false {
             jsonDictionary["description"] = description.toOpenStackEncoding()!
         }
         
-        http.POST(url, parameters: jsonDictionary) { (responseObject, error) in
+        http.request(method: .post, path: url, parameters: jsonDictionary) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
             // parse
-            guard let json = JSON.Value(string: responseObject as! String),
+            guard let json = try? JSON.Value(string: responseObject as! String),
                 let jsonObject = json.objectValue,
-                let identifier = jsonObject["id"]?.rawValue as? Int
-                else { completion(.Error(Error.InvalidResponse)); return }
+                let identifier = jsonObject["id"]?.integerValue
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
@@ -53,35 +54,35 @@ public extension Store {
                 
                 let team = Team(identifier: identifier, name: name, descriptionText: description, created: Date(), updated: Date(), owner: owner, members: [], invitations: [])
                 
-                try team.save(context)
+                let _ = try team.save(context)
                 
                 try context.validateAndSave()
                 
                 // success
-                completion(.Value(team))
+                completion(.value(team))
             }
         }
     }
     
-    func update(team identifier: Identifier, name: String, description: String? = nil, completion: (ErrorType?) -> ()) {
+    func update(team identifier: Identifier, name: String, description: String? = nil, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/teams/\(identifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        var jsonDictionary = [String: AnyObject]()
+        var jsonDictionary = [String: Any]()
         
         jsonDictionary["name"] = name.toOpenStackEncoding()!
         
-        if let description = description where description.isEmpty == false {
+        if let description = description, description.isEmpty == false {
             jsonDictionary["description"] = description.toOpenStackEncoding()!
         }
         
-        http.PUT(url, parameters: jsonDictionary)  { (responseObject, error) in
+        http.request(method: .put, path: url, parameters: jsonDictionary) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -96,7 +97,7 @@ public extension Store {
                     
                     managedObject.descriptionText = description
                     
-                    managedObject.updatedDate = NSDate()
+                    managedObject.updatedDate = Date()
                     
                     managedObject.didCache()
                     
@@ -109,50 +110,50 @@ public extension Store {
         }
     }
     
-    func fetch(team identifier: Identifier, completion: (ErrorValue<Team>) -> ()) {
+    func fetch(team identifier: Identifier, completion: @escaping (ErrorValue<Team>) -> ()) {
         
         let uri = "/api/v1/teams/\(identifier)?expand=owner,members,member,groups"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let entity = Team(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let entity = Team(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try entity.save(context)
+                let _ = try entity.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(entity))
+            completion(.value(entity))
         }
     }
     
-    func delete(team identifier: Identifier, completion: (ErrorType?) -> ()) {
+    func delete(team identifier: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
         let uri = "/api/v1/teams/\(identifier)"
         
         let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.DELETE(url) { (responseObject, error) in
+        http.request(method: .delete, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
@@ -163,7 +164,7 @@ public extension Store {
                 
                 if let managedObject = try TeamManagedObject.find(identifier, context: context) {
                     
-                    context.deleteObject(managedObject)
+                    context.delete(managedObject)
                     
                     try context.validateAndSave()
                 }
@@ -174,44 +175,44 @@ public extension Store {
         }
     }
     
-    func teams(page page: Int = 1,
+    func teams(page: Int = 1,
                perPage: Int = 10,
-               completion: (ErrorValue<Page<Team>>) -> ()) {
+               completion: @escaping (ErrorValue<Page<Team>>) -> ()) {
         
-        let urlComponents = NSURLComponents(string: environment.configuration.serverURL + "/api/v1/teams")!
+        var urlComponents = URLComponents(string: environment.configuration.serverURL + "/api/v1/teams")!
         
-        var queryItems = [NSURLQueryItem]()
-        queryItems.append(NSURLQueryItem(name: "page", value: "\(page)"))
-        queryItems.append(NSURLQueryItem(name: "per_page", value: "\(perPage)"))
-        queryItems.append(NSURLQueryItem(name: "expand", value: "owner,members,member,groups"))
+        var queryItems = [URLQueryItem]()
+        queryItems.append(URLQueryItem(name: "page", value: "\(page)"))
+        queryItems.append(URLQueryItem(name: "per_page", value: "\(perPage)"))
+        queryItems.append(URLQueryItem(name: "expand", value: "owner,members,member,groups"))
         urlComponents.queryItems = queryItems
         
-        let url = urlComponents.URL!.absoluteString!
+        let url = urlComponents.url!.absoluteString
         
-        let http = self.createHTTP(.OpenIDJSON)
+        let http = self.createHTTP(.openIDJSON)
         
         let context = privateQueueManagedObjectContext
         
-        http.GET(url) { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String),
-                let page = Page<Team>(JSONValue: json)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String),
+                let page = Page<Team>(json: json)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // cache
             try! context.performErrorBlockAndWait {
                 
-                try page.items.save(context)
+                let _ = try page.items.save(context)
                 
                 try context.validateAndSave()
             }
             
             // success
-            completion(.Value(page))
+            completion(.value(page))
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/TicketOrderRequest.swift b/OpenStack Summit/CoreSummit/TicketOrderRequest.swift
index 1ac325a2..3e94f7ac 100644
--- a/OpenStack Summit/CoreSummit/TicketOrderRequest.swift	
+++ b/OpenStack Summit/CoreSummit/TicketOrderRequest.swift	
@@ -6,55 +6,56 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import AeroGearHttp
 import AeroGearOAuth2
+import JSON
 
 public extension Store {
     
-    func attendees(for ticketOrder: Int, summit: Identifier, completion: (ErrorValue<[NonConfirmedAttendee]>) -> ()) {
+    func attendees(for ticketOrder: Int, summit: Identifier, completion: @escaping (ErrorValue<[NonConfirmedAttendee]>) -> ()) {
         
-        let URI = "/api/v1/summits/\(summit)/external-orders/\(ticketOrder)"
+        let uri = "/api/v1/summits/\(summit)/external-orders/\(ticketOrder)"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDGetFormUrlEncoded)
+        let http = self.createHTTP(.openIDGetFormUrlEncoded)
         
-        http.GET(URL, parameters: nil, completionHandler: { (responseObject, error) in
+        http.request(method: .get, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
-                else { completion(.Error(error!)); return }
+                else { completion(.error(error!)); return }
             
-            guard let json = JSON.Value(string: responseObject as! String)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let json = try? JSON.Value(string: responseObject as! String)
+                else { completion(.error(Error.invalidResponse)); return }
             
             guard let attendeesJSONArray = json.objectValue?["attendees"]?.arrayValue
-                else { completion(.Value([])); return }
+                else { completion(.value([])); return }
             
-            guard let attendees = NonConfirmedAttendee.fromJSON(attendeesJSONArray)
-                else { completion(.Error(Error.InvalidResponse)); return }
+            guard let attendees = NonConfirmedAttendee.from(json: attendeesJSONArray)
+                else { completion(.error(Error.invalidResponse)); return }
             
             // success
-            completion(.Value(attendees))
-        })
+            completion(.value(attendees))
+        }
     }
     
-    func confirmAttendee(for ticketOrder: Int, externalAttendee: Identifier, summit: Identifier, completion: (ErrorType?) -> ()) {
+    func confirmAttendee(for ticketOrder: Int, externalAttendee: Identifier, summit: Identifier, completion: @escaping (Swift.Error?) -> ()) {
         
-        let URI = "/api/v1/summits/\(summit)/external-orders/\(ticketOrder)/external-attendees/\(externalAttendee)/confirm"
+        let uri = "/api/v1/summits/\(summit)/external-orders/\(ticketOrder)/external-attendees/\(externalAttendee)/confirm"
         
-        let URL = environment.configuration.serverURL + URI
+        let url = environment.configuration.serverURL + uri
         
-        let http = self.createHTTP(.OpenIDGetFormUrlEncoded)
+        let http = self.createHTTP(.openIDGetFormUrlEncoded)
         
-        http.POST(URL, parameters: nil, completionHandler: { (responseObject, error) in
+        http.request(method: .post, path: url) { (responseObject, error) in
             
             // forward error
             guard error == nil
                 else { completion(error!); return }
             
             completion(nil)
-        })
+        }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/TicketTypeJSON.swift b/OpenStack Summit/CoreSummit/TicketTypeJSON.swift
index b7a13ec3..0303bb53 100644
--- a/OpenStack Summit/CoreSummit/TicketTypeJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TicketTypeJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension TicketType {
     
@@ -18,10 +18,10 @@ public extension TicketType {
 
 extension TicketType: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String
             else { return nil }
         
@@ -29,4 +29,4 @@ extension TicketType: JSONDecodable {
         self.name = name
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/TicketTypeManagedObject.swift b/OpenStack Summit/CoreSummit/TicketTypeManagedObject.swift
index c1f4ca70..d7af595f 100644
--- a/OpenStack Summit/CoreSummit/TicketTypeManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TicketTypeManagedObject.swift	
@@ -20,7 +20,7 @@ extension TicketType: CoreDataDecodable {
     
     public init(managedObject: TicketTypeManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
     }
@@ -28,7 +28,7 @@ extension TicketType: CoreDataDecodable {
 
 extension TicketType: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TicketTypeManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TicketTypeManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/TimeZoneJSON.swift b/OpenStack Summit/CoreSummit/TimeZoneJSON.swift
index 9a079aa1..607d57f0 100644
--- a/OpenStack Summit/CoreSummit/TimeZoneJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TimeZoneJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension TimeZone {
     
@@ -18,7 +18,7 @@ public extension TimeZone {
 
 extension TimeZone: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
             let countryCode = JSONObject[JSONKey.country_code.rawValue]?.rawValue as? String,
@@ -26,7 +26,7 @@ extension TimeZone: JSONDecodable {
             let longitude = JSONObject[JSONKey.longitude.rawValue]?.rawValue as? Double,
             let comments = JSONObject[JSONKey.comments.rawValue]?.rawValue as? String,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
-            let offset = JSONObject[JSONKey.offset.rawValue]?.rawValue as? Int
+            let offset = JSONObject[JSONKey.offset.rawValue]?.integerValue
             else { return nil }
         
         self.countryCode = countryCode
@@ -34,6 +34,6 @@ extension TimeZone: JSONDecodable {
         self.longitude = longitude
         self.comments = comments
         self.name = name
-        self.offset = offset
+        self.offset = Int(offset)
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/TrackGroupDataUpdate.swift b/OpenStack Summit/CoreSummit/TrackGroupDataUpdate.swift
index 5d4f810f..aded887f 100644
--- a/OpenStack Summit/CoreSummit/TrackGroupDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/TrackGroupDataUpdate.swift	
@@ -6,23 +6,26 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-/// The `DataUpdate` version of a `TrackGroup`.
-public struct TrackGroupDataUpdate: Named {
+public extension TrackGroup {
     
-    public let identifier: Identifier
-    
-    public let name: String
-    
-    public let descriptionText: String?
-    
-    public let color: String
-    
-    public let tracks: Set<Track>
+    /// The `DataUpdate` version of a `TrackGroup`.
+    public struct DataUpdate: Named {
+        
+        public let identifier: Identifier
+        
+        public let name: String
+        
+        public let descriptionText: String?
+        
+        public let color: String
+        
+        public let tracks: Set<Track>
+    }
 }
 
 // MARK: - Equatable
 
-public func == (lhs: TrackGroupDataUpdate, rhs: TrackGroupDataUpdate) -> Bool {
+public func == (lhs: TrackGroup.DataUpdate, rhs: TrackGroup.DataUpdate) -> Bool {
     
     return lhs.identifier == rhs.identifier
         && lhs.name == rhs.name
diff --git a/OpenStack Summit/CoreSummit/TrackGroupDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/TrackGroupDataUpdateJSON.swift
index 2c082d78..164dc73d 100644
--- a/OpenStack Summit/CoreSummit/TrackGroupDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TrackGroupDataUpdateJSON.swift	
@@ -6,23 +6,23 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
-public extension TrackGroupDataUpdate {
+extension TrackGroup.DataUpdate {
     
     typealias JSONKey = TrackGroup.JSONKey
 }
 
-extension TrackGroupDataUpdate: JSONDecodable {
+extension TrackGroup.DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let color = JSONObject[JSONKey.color.rawValue]?.rawValue as? String,
             let tracksJSONArray = JSONObject[JSONKey.tracks.rawValue]?.arrayValue,
-            let tracks = Track.fromJSON(tracksJSONArray)
+            let tracks = Track.from(json: tracksJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -33,4 +33,4 @@ extension TrackGroupDataUpdate: JSONDecodable {
         // optional
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/TrackGroupDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/TrackGroupDataUpdateManagedObject.swift
index 0200b5b2..4d0604e7 100644
--- a/OpenStack Summit/CoreSummit/TrackGroupDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TrackGroupDataUpdateManagedObject.swift	
@@ -9,9 +9,9 @@
 import Foundation
 import CoreData
 
-extension TrackGroupDataUpdate: CoreDataEncodable {
+extension TrackGroup.DataUpdate: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TrackGroupManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TrackGroupManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/TrackGroupJSON.swift b/OpenStack Summit/CoreSummit/TrackGroupJSON.swift
index 3b7af758..9e4ee077 100644
--- a/OpenStack Summit/CoreSummit/TrackGroupJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TrackGroupJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension TrackGroup {
     
@@ -18,14 +18,14 @@ public extension TrackGroup {
 
 extension TrackGroup: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let color = JSONObject[JSONKey.color.rawValue]?.rawValue as? String,
             let tracksJSONArray = JSONObject[JSONKey.tracks.rawValue]?.arrayValue,
-            let tracks = Int.fromJSON(tracksJSONArray)
+            let tracks = Identifier.from(json: tracksJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -36,4 +36,4 @@ extension TrackGroup: JSONDecodable {
         // optional
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/TrackGroupManagedObject.swift b/OpenStack Summit/CoreSummit/TrackGroupManagedObject.swift
index 0ae13fe7..e542af94 100644
--- a/OpenStack Summit/CoreSummit/TrackGroupManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TrackGroupManagedObject.swift	
@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 public final class TrackGroupManagedObject: Entity {
     
@@ -18,6 +19,10 @@ public final class TrackGroupManagedObject: Entity {
     @NSManaged public var color: String
     
     @NSManaged public var tracks: Set<TrackManagedObject>
+    
+    // Inverse Relationships
+    
+    @NSManaged public var summits: Set<SummitManagedObject>
 }
 
 // MARK: - Encoding
@@ -26,7 +31,7 @@ extension TrackGroup: CoreDataDecodable {
     
     public init(managedObject: TrackGroupManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.color = managedObject.color
@@ -36,7 +41,7 @@ extension TrackGroup: CoreDataDecodable {
 
 extension TrackGroup: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TrackGroupManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TrackGroupManagedObject {
         
         let managedObject = try cached(context)
         
@@ -57,7 +62,7 @@ public extension TrackGroupManagedObject {
     
     static var sortDescriptors: [NSSortDescriptor] {
         
-        return [NSSortDescriptor(key: "name", ascending: true)]
+        return [NSSortDescriptor(key: #keyPath(TrackGroupManagedObject.name), ascending: true)]
     }
 }
 
@@ -66,14 +71,16 @@ public extension TrackGroup {
     /// Fetch all track groups that have some event associated with them.
     static func scheduled(for summit: Identifier, context: NSManagedObjectContext) throws -> [TrackGroup] {
         
-        guard let summitManagedObject = try SummitManagedObject.find(summit, context: context)
-            else { return [] }
+        // NSPredicate(format: "track != nil AND summit == %@", summitManagedObject))
+        let eventsPredicate: Predicate = .keyPath(#keyPath(EventManagedObject.track)) != .value(.null)
+            && #keyPath(EventManagedObject.summit.id) == summit
         
-        let events = try context.managedObjects(EventManagedObject.self, predicate: NSPredicate(format: "track != nil AND summit == %@", summitManagedObject))
+        let events = try context.managedObjects(EventManagedObject.self, predicate: eventsPredicate)
         
-        var groups = events.reduce([TrackGroupManagedObject](), combine: { $0.0 + Array($0.1.track!.groups) })
-                
-        groups = (Set(groups) as NSSet).sortedArrayUsingDescriptors(ManagedObject.sortDescriptors) as! [TrackGroupManagedObject]
+        let groups = events
+            .flatMap({ $0.track?.groups })
+            .reduce([TrackGroupManagedObject](), { $0.0 + Array($0.1) })
+            .sorted(by: { $0.0.name < $0.1.name })
         
         return TrackGroup.from(managedObjects: groups)
     }
diff --git a/OpenStack Summit/CoreSummit/TrackJSON.swift b/OpenStack Summit/CoreSummit/TrackJSON.swift
index 28adba84..1c19f810 100644
--- a/OpenStack Summit/CoreSummit/TrackJSON.swift	
+++ b/OpenStack Summit/CoreSummit/TrackJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 private extension Track {
     
@@ -18,13 +18,13 @@ private extension Track {
 
 extension Track: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let trackGroupsJSONArray = JSONObject[JSONKey.track_groups.rawValue]?.arrayValue,
-            let trackGroups = Int.fromJSON(trackGroupsJSONArray)
+            let trackGroups = Identifier.from(json: trackGroupsJSONArray)
             else { return nil }
         
         self.identifier = identifier
@@ -37,13 +37,13 @@ extension MemberResponse.Track: JSONDecodable {
     
     private typealias JSONKey = Track.JSONKey
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             let trackGroupsJSONArray = JSONObject[JSONKey.track_groups.rawValue]?.arrayValue,
-            let trackGroups = TrackGroup.fromJSON(trackGroupsJSONArray)
+            let trackGroups = TrackGroup.from(json: trackGroupsJSONArray)
             else { return nil }
         
         self.identifier = identifier
diff --git a/OpenStack Summit/CoreSummit/TrackManagedObject.swift b/OpenStack Summit/CoreSummit/TrackManagedObject.swift
index 0b96cc27..d4c2c262 100644
--- a/OpenStack Summit/CoreSummit/TrackManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/TrackManagedObject.swift	
@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import Predicate
 
 public final class TrackManagedObject: Entity {
     
@@ -17,7 +18,9 @@ public final class TrackManagedObject: Entity {
     
     // Inverse Relationships
     
-    @NSManaged public var presentations: Set<PresentationManagedObject>
+    @NSManaged public var events: Set<EventManagedObject>
+    
+    @NSManaged public var summits: Set<SummitManagedObject>
 }
 
 // MARK: - Encoding
@@ -26,7 +29,7 @@ extension Track: CoreDataDecodable {
     
     public init(managedObject: TrackManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.groups = managedObject.groups.identifiers
     }
@@ -34,7 +37,7 @@ extension Track: CoreDataDecodable {
 
 extension Track: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TrackManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TrackManagedObject {
         
         let managedObject = try cached(context)
         
@@ -49,7 +52,7 @@ extension Track: CoreDataEncodable {
 
 extension MemberResponse.Track: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> TrackManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> TrackManagedObject {
         
         let managedObject = try cached(context)
         
@@ -68,43 +71,43 @@ public extension TrackManagedObject {
     
     static var sortDescriptors: [NSSortDescriptor] {
         
-        return [NSSortDescriptor(key: "name", ascending: true)]
+        return [NSSortDescriptor(key: #keyPath(TrackManagedObject.name), ascending: true)]
     }
 }
 
 public extension Track {
     
-    static func search(searchTerm: String, context: NSManagedObjectContext) throws -> [Track] {
-        
-        let predicate = NSPredicate(format: "name CONTAINS[c] %@", searchTerm)
+    static func search(_ searchTerm: String, context: NSManagedObjectContext) throws -> [Track] {
         
-        let managedObjects = try context.managedObjects(TrackManagedObject.self, predicate: predicate, sortDescriptors: TrackManagedObject.sortDescriptors)
+        let predicate: Predicate = (#keyPath(TrackManagedObject.name)).compare(.contains, [.caseInsensitive], .value(.string(searchTerm)))
         
-        return Track.from(managedObjects: managedObjects)
+        return try Track.filter(predicate,
+                                sort: ManagedObject.sortDescriptors,
+                                context: context)
     }
     
     /// Get scheduled tracks that belong to track groups.
-    static func `for`(groups trackGroups: [Identifier], context: NSManagedObjectContext) throws -> [Track] {
+    static func `for`(groups trackGroups: [Identifier] = [], context: NSManagedObjectContext) throws -> [Track] {
         
-        let predicate: NSPredicate
+        let predicate: Predicate
         
-        let scheduledTracksPredicate = NSPredicate(format: "events.@count > 0")
+        // let scheduledTracksPredicate = Predicate(format: "events.@count > 0")
+        let scheduledTracks: Predicate = #keyPath(TrackManagedObject.events) + ".@count" > 0
         
         // optionally filter for track groups
         if trackGroups.isEmpty == false {
             
-            let trackGroupIdentifiers = trackGroups.map { NSNumber(longLong: Int64($0)) }
-            
-            let trackGroupsPredicate = NSPredicate(format: "ANY groups.id IN %@", [trackGroupIdentifiers])
+            //let trackGroupsPredicate = NSPredicate(format: "ANY groups.id IN %@", [trackGroups])
+            let trackGroupsPredicate: Predicate = (#keyPath(TrackManagedObject.groups.id)).in(trackGroups)
             
-            predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [scheduledTracksPredicate, trackGroupsPredicate])
+            predicate = .compound(.and([scheduledTracks, trackGroupsPredicate]))
             
         } else {
             
-            predicate = scheduledTracksPredicate
+            predicate = scheduledTracks
         }
         
-        return try context.managedObjects(Track.self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
+        return try context.managedObjects(self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
     }
 }
 
diff --git a/OpenStack Summit/CoreSummit/Unique.swift b/OpenStack Summit/CoreSummit/Unique.swift
index deef8a68..219ad1a6 100644
--- a/OpenStack Summit/CoreSummit/Unique.swift	
+++ b/OpenStack Summit/CoreSummit/Unique.swift	
@@ -12,7 +12,7 @@ public protocol Unique: Equatable, Hashable, Comparable {
     var identifier: Identifier { get }
 }
 
-public typealias Identifier = Int
+public typealias Identifier = Int64
 
 // MARK: - Hashable
 
@@ -20,7 +20,7 @@ public extension Unique {
     
     var hashValue: Int {
         
-        return identifier
+        return Int(identifier)
     }
 }
 
@@ -33,7 +33,7 @@ public func < <T: Unique> (lhs: T, rhs: T) -> Bool {
 
 // MARK: - Extensions
 
-public extension CollectionType where Generator.Element: Unique {
+public extension Collection where Iterator.Element: Unique {
     
     var identifiers: [Identifier] {
         
@@ -41,8 +41,8 @@ public extension CollectionType where Generator.Element: Unique {
     }
     
     @inline(__always)
-    func with(identifier: Identifier) -> Self.Generator.Element? {
+    func with(_ identifier: Identifier) -> Self.Iterator.Element? {
         
-        return firstMatching { $0.identifier == identifier }
+        return self.first(where: { $0.identifier == identifier })
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/Value.swift b/OpenStack Summit/CoreSummit/Value.swift
deleted file mode 100644
index 2a5b0615..00000000
--- a/OpenStack Summit/CoreSummit/Value.swift	
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-//  Value.swift
-//  Predicate
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-import SwiftFoundation
-
-/// Constant value used in predicate expressions.
-public enum Value {
-    
-    case null
-    case string(String)
-    case data(Data)
-    case date(Date)
-    case bool(Bool)
-    case int16(Int16)
-    case int32(Int32)
-    case int64(Int64)
-    case float(Float)
-    case double(Double)
-    case collection([Value])
-}
-
-// MARK: - Equatable
-
-extension Value: Equatable { }
-
-public func == (lhs: Value, rhs: Value) -> Bool {
-    
-    switch (lhs, rhs) {
-    case (.null, .null):                                return true
-    case let (.string(lhsValue), .string(rhsValue)):    return lhsValue == rhsValue
-    case let (.data(lhsValue), .data(rhsValue)):        return lhsValue == rhsValue
-    case let (.date(lhsValue), .date(rhsValue)):        return lhsValue == rhsValue
-    case let (.bool(lhsValue), .bool(rhsValue)):        return lhsValue == rhsValue
-    case let (.int16(lhsValue), .int16(rhsValue)):      return lhsValue == rhsValue
-    case let (.int32(lhsValue), .int32(rhsValue)):      return lhsValue == rhsValue
-    case let (.int64(lhsValue), .int64(rhsValue)):      return lhsValue == rhsValue
-    case let (.float(lhsValue), .float(rhsValue)):      return lhsValue == rhsValue
-    case let (.double(lhsValue), .double(rhsValue)):    return lhsValue == rhsValue
-    case let (.collection(lhsValue), .collection(rhsValue)): return lhsValue == rhsValue
-    default: return false
-    }
-}
-
-// MARK: - CustomStringConvertible
-
-extension Value: CustomStringConvertible {
-    
-    public var description: String {
-        
-        switch self {
-        case .null:                 return "NULL"
-        case let .string(value):    return "\"\(value)\""
-        case let .data(value):      return "\(value)"
-        case let .date(value):      return "\(value)"
-        case let .bool(value):      return "\(value)"
-        case let .int16(value):     return "\(value)"
-        case let .int32(value):     return "\(value)"
-        case let .int64(value):     return "\(value)"
-        case let .float(value):     return "\(value)"
-        case let .double(value):    return "\(value)"
-            
-        case let .collection(values):
-            
-            var text = "{"
-            
-            for (index, value) in values.enumerate() {
-                
-                text += value.description
-                
-                if index != values.count - 1 {
-                    
-                    text += ", "
-                }
-            }
-            
-            text += "}"
-            
-            return text
-        }
-    }
-}
-
-// MARK: - Supporting Types
-
-public protocol PredicateValue {
-    
-    var predicateValue: Value { get }
-}
-
-extension String: PredicateValue {
-    public var predicateValue: Value { return .string(self) }
-}
-
-extension Data: PredicateValue {
-    public var predicateValue: Value { return .data(self) }
-}
-
-extension Date: PredicateValue {
-    public var predicateValue: Value { return .date(self) }
-}
-
-extension Bool: PredicateValue {
-    public var predicateValue: Value { return .bool(self) }
-}
-
-extension Int16: PredicateValue {
-    public var predicateValue: Value { return .int16(self) }
-}
-
-extension Int32: PredicateValue {
-    public var predicateValue: Value { return .int32(self) }
-}
-
-extension Int64: PredicateValue {
-    public var predicateValue: Value { return .int64(self) }
-}
-
-extension Int: PredicateValue {
-    public var predicateValue: Value { return .int64(Int64(self)) }
-}
-
-extension Float: PredicateValue {
-    public var predicateValue: Value { return .float(self) }
-}
-
-extension Double: PredicateValue {
-    public var predicateValue: Value { return .double(self) }
-}
-
-extension Array where Element: PredicateValue {
-    public var predicateValue: Value { return .collection(self.map({ $0.predicateValue })) }
-}
diff --git a/OpenStack Summit/CoreSummit/VenueFloor.swift b/OpenStack Summit/CoreSummit/VenueFloor.swift
index e24244da..08139e5f 100644
--- a/OpenStack Summit/CoreSummit/VenueFloor.swift	
+++ b/OpenStack Summit/CoreSummit/VenueFloor.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-public struct VenueFloor: Named, Equatable {
+public struct VenueFloor: Named {
     
     public let identifier: Identifier
     
@@ -14,9 +14,9 @@ public struct VenueFloor: Named, Equatable {
     
     public var descriptionText: String?
     
-    public var number: Int
+    public var number: Int16
     
-    public var imageURL: String?
+    public var image: URL?
     
     public var venue: Identifier
     
@@ -31,7 +31,7 @@ public func == (lhs: VenueFloor, rhs: VenueFloor) -> Bool {
         && lhs.name == rhs.name
         && lhs.descriptionText == rhs.descriptionText
         && lhs.number == rhs.number
-        && lhs.imageURL == rhs.imageURL
+        && lhs.image == rhs.image
         && lhs.venue == rhs.venue
         && lhs.rooms == rhs.rooms
 }
diff --git a/OpenStack Summit/CoreSummit/VenueFloorJSON.swift b/OpenStack Summit/CoreSummit/VenueFloorJSON.swift
index 1a25c7c7..af8b9736 100644
--- a/OpenStack Summit/CoreSummit/VenueFloorJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VenueFloorJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension VenueFloor {
     
@@ -18,13 +18,14 @@ public extension VenueFloor {
 
 extension VenueFloor: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
-            let number = JSONObject[JSONKey.number.rawValue]?.rawValue as? Int,
-            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.rawValue as? Int
+            let numberInteger = JSONObject[JSONKey.number.rawValue]?.integerValue,
+            let number = Int16(exactly: numberInteger),
+            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
@@ -33,11 +34,11 @@ extension VenueFloor: JSONDecodable {
         self.venue = venueIdentifier
         
         // optional
-        self.imageURL = JSONObject[JSONKey.image.rawValue]?.rawValue as? String
+        self.image = JSONObject[JSONKey.image.rawValue]?.urlValue
         
         if let roomsJSONArray = JSONObject[JSONKey.rooms.rawValue]?.arrayValue {
             
-            guard let rooms = Int.fromJSON(roomsJSONArray)
+            guard let rooms = Identifier.from(json: roomsJSONArray)
                 else { return nil }
             
             self.rooms = Set(rooms)
@@ -49,4 +50,4 @@ extension VenueFloor: JSONDecodable {
         
         self.descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/VenueFloorManagedObject.swift b/OpenStack Summit/CoreSummit/VenueFloorManagedObject.swift
index 9f448339..5ef70fc5 100644
--- a/OpenStack Summit/CoreSummit/VenueFloorManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VenueFloorManagedObject.swift	
@@ -28,26 +28,26 @@ extension VenueFloor: CoreDataDecodable {
     
     public init(managedObject: VenueFloorManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
-        self.number = Int(managedObject.number)
-        self.imageURL = managedObject.imageURL
-        self.venue = managedObject.venue.identifier
+        self.number = managedObject.number
+        self.image = URL(string: managedObject.imageURL ?? "")
+        self.venue = managedObject.venue.id
         self.rooms = managedObject.rooms.identifiers
     }
 }
 
 extension VenueFloor: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> VenueFloorManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> VenueFloorManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
-        managedObject.number = Int16(number)
-        managedObject.imageURL = imageURL
+        managedObject.number = number
+        managedObject.imageURL = image?.absoluteString
         managedObject.venue = try context.relationshipFault(venue)
         managedObject.rooms = try context.relationshipFault(rooms)
         
diff --git a/OpenStack Summit/CoreSummit/VenueJSON.swift b/OpenStack Summit/CoreSummit/VenueJSON.swift
index 52f3dd74..1b6e4c97 100644
--- a/OpenStack Summit/CoreSummit/VenueJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VenueJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Venue {
     
@@ -18,21 +18,21 @@ public extension Venue {
 
 extension Venue: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
                 
         guard let JSONObject = JSONValue.objectValue,
             let classNameString = JSONObject[LocationJSONKey.class_name.rawValue]?.rawValue as? String,
             let type = ClassName(rawValue: classNameString),
-            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[LocationJSONKey.name.rawValue]?.rawValue as? String,
+            name.isEmpty == false,
             let country = JSONObject[JSONKey.country.rawValue]?.rawValue as? String,
             let mapsJSONArray = JSONObject[JSONKey.maps.rawValue]?.arrayValue,
-            let maps = Image.fromJSON(mapsJSONArray),
+            let maps = Image.from(json: mapsJSONArray),
             let imagesJSONArray = JSONObject[JSONKey.images.rawValue]?.arrayValue,
-            let images = Image.fromJSON(imagesJSONArray),
+            let images = Image.from(json: imagesJSONArray),
             let locationTypeString = JSONObject[JSONKey.location_type.rawValue]?.rawValue as? String,
             let locationType = LocationType(rawValue: locationTypeString)
-            where name.isEmpty == false
             else { return nil }
         
         self.identifier = identifier
@@ -53,7 +53,7 @@ extension Venue: JSONDecodable {
         
         if let floorsJSONArray = JSONObject[JSONKey.floors.rawValue]?.arrayValue {
             
-            guard let floors = VenueFloor.fromJSON(floorsJSONArray)
+            guard let floors = VenueFloor.from(json: floorsJSONArray)
                 else { return nil }
             
             self.floors = Set(floors)
diff --git a/OpenStack Summit/CoreSummit/VenueManagedObject.swift b/OpenStack Summit/CoreSummit/VenueManagedObject.swift
index 33e90d50..3823c6db 100644
--- a/OpenStack Summit/CoreSummit/VenueManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VenueManagedObject.swift	
@@ -42,7 +42,7 @@ extension Venue: CoreDataDecodable {
     
     public init(managedObject: VenueManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.type = ClassName(rawValue: managedObject.venueType)!
@@ -62,7 +62,7 @@ extension Venue: CoreDataDecodable {
 
 extension Venue: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> VenueManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> VenueManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummit/VenueRoomDataUpdate.swift b/OpenStack Summit/CoreSummit/VenueRoomDataUpdate.swift
index cca2e93c..3b44ef99 100644
--- a/OpenStack Summit/CoreSummit/VenueRoomDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/VenueRoomDataUpdate.swift	
@@ -8,27 +8,25 @@
 
 public extension VenueRoom {
     
-    typealias DataUpdate = VenueRoomDataUpdate
-}
-
-public struct VenueRoomDataUpdate: LocationProtocol {
-    
-    public let identifier: Identifier
-    
-    public let name: String
-    
-    public let descriptionText: String?
-    
-    public let capacity: Int?
-    
-    public let venue: Identifier
-    
-    public let floor: VenueFloor?
+    public struct DataUpdate: LocationProtocol {
+        
+        public let identifier: Identifier
+        
+        public let name: String
+        
+        public let descriptionText: String?
+        
+        public let capacity: Int?
+        
+        public let venue: Identifier
+        
+        public let floor: VenueFloor?
+    }
 }
 
 // MARK: - Equatable
 
-public func == (lhs: VenueRoomDataUpdate, rhs: VenueRoomDataUpdate) -> Bool {
+public func == (lhs: VenueRoom.DataUpdate, rhs: VenueRoom.DataUpdate) -> Bool {
     
     return lhs.identifier == rhs.identifier
         && lhs.name == rhs.name
diff --git a/OpenStack Summit/CoreSummit/VenueRoomDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/VenueRoomDataUpdateJSON.swift
index df423f4a..ad83bb0c 100644
--- a/OpenStack Summit/CoreSummit/VenueRoomDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VenueRoomDataUpdateJSON.swift	
@@ -6,25 +6,25 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
-public extension VenueRoomDataUpdate {
+internal extension VenueRoom.DataUpdate {
     
     typealias JSONKey = VenueRoom.JSONKey
 }
 
-extension VenueRoomDataUpdate: JSONDecodable {
+extension VenueRoom.DataUpdate: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
             let classNameString = JSONObject[LocationJSONKey.class_name.rawValue]?.rawValue as? String,
-            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[LocationJSONKey.name.rawValue]?.rawValue as? String,
-            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.rawValue as? Int,
+            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.integerValue,
             let floorJSON = JSONObject[JSONKey.floor.rawValue],
-            let floor = VenueFloor(JSONValue: floorJSON)
-            where classNameString == VenueRoom.JSONClassName
+            let floor = VenueFloor(json: floorJSON),
+            classNameString == VenueRoom.JSONClassName
             else { return nil }
         
         self.identifier = identifier
@@ -34,6 +34,14 @@ extension VenueRoomDataUpdate: JSONDecodable {
         
         // optional
         self.descriptionText = JSONObject[LocationJSONKey.description.rawValue]?.rawValue as? String
-        self.capacity = JSONObject[JSONKey.Capacity.rawValue]?.rawValue as? Int
+        
+        if let capacity = JSONObject[JSONKey.Capacity.rawValue]?.integerValue {
+            
+            self.capacity = Int(capacity)
+            
+        } else {
+            
+            self.capacity = nil
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/VenueRoomDataUpdateManagedObject.swift b/OpenStack Summit/CoreSummit/VenueRoomDataUpdateManagedObject.swift
index cba840b5..18686c7d 100644
--- a/OpenStack Summit/CoreSummit/VenueRoomDataUpdateManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VenueRoomDataUpdateManagedObject.swift	
@@ -9,15 +9,15 @@
 import Foundation
 import CoreData
 
-extension VenueRoomDataUpdate: CoreDataEncodable {
+extension VenueRoom.DataUpdate: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> VenueRoomManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> VenueRoomManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
-        managedObject.capacity = capacity != nil ? NSNumber(int: Int32(capacity!)) : nil
+        managedObject.capacity = capacity != nil ? NSNumber(value: Int32(capacity!) as Int32) : nil
         managedObject.venue = try context.relationshipFault(venue)
         managedObject.floor = try context.relationshipFault(floor)
         
diff --git a/OpenStack Summit/CoreSummit/VenueRoomJSON.swift b/OpenStack Summit/CoreSummit/VenueRoomJSON.swift
index bc9fafa6..384029f9 100644
--- a/OpenStack Summit/CoreSummit/VenueRoomJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VenueRoomJSON.swift	
@@ -6,9 +6,9 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
-public extension VenueRoom {
+internal extension VenueRoom {
     
     static var JSONClassName: String { return "SummitVenueRoom" }
     
@@ -20,15 +20,15 @@ public extension VenueRoom {
 
 extension VenueRoom: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
             let classNameString = JSONObject[LocationJSONKey.class_name.rawValue]?.rawValue as? String,
-            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.rawValue as? Int,
+            classNameString == VenueRoom.JSONClassName,
+            let identifier = JSONObject[LocationJSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[LocationJSONKey.name.rawValue]?.rawValue as? String,
-            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.rawValue as? Int,
-            let floorIdentifier = JSONObject[JSONKey.floor_id.rawValue]?.rawValue as? Int
-            where classNameString == VenueRoom.JSONClassName
+            let venueIdentifier = JSONObject[JSONKey.venue_id.rawValue]?.integerValue,
+            let floorIdentifier = JSONObject[JSONKey.floor_id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
@@ -38,6 +38,15 @@ extension VenueRoom: JSONDecodable {
         
         // optional
         self.descriptionText = JSONObject[LocationJSONKey.description.rawValue]?.rawValue as? String
-        self.capacity = JSONObject[JSONKey.Capacity.rawValue]?.rawValue as? Int
+        
+        if let capacity = JSONObject[JSONKey.Capacity.rawValue]?.integerValue {
+            
+            self.capacity = Int(capacity)
+            
+        } else {
+            
+            self.capacity = nil
+        }
+        
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/CoreSummit/VenueRoomManagedObject.swift b/OpenStack Summit/CoreSummit/VenueRoomManagedObject.swift
index 458d2d2e..1910f43d 100644
--- a/OpenStack Summit/CoreSummit/VenueRoomManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VenueRoomManagedObject.swift	
@@ -22,24 +22,24 @@ extension VenueRoom: CoreDataDecodable {
     
     public init(managedObject: VenueRoomManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
-        self.capacity = managedObject.capacity?.integerValue
+        self.capacity = managedObject.capacity?.intValue
         self.descriptionText = managedObject.descriptionText
-        self.venue = managedObject.venue.identifier
-        self.floor = managedObject.floor?.identifier
+        self.venue = managedObject.venue.id
+        self.floor = managedObject.floor?.id
     }
 }
 
 extension VenueRoom: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> VenueRoomManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> VenueRoomManagedObject {
         
         let managedObject = try cached(context)
         
         managedObject.name = name
         managedObject.descriptionText = descriptionText
-        managedObject.capacity = capacity != nil ? NSNumber(int: Int32(capacity!)) : nil
+        managedObject.capacity = capacity != nil ? NSNumber(value: Int32(capacity!) as Int32) : nil
         managedObject.venue = try context.relationshipFault(venue)
         managedObject.floor = try context.relationshipFault(floor)
         
diff --git a/OpenStack Summit/CoreSummit/Video.swift b/OpenStack Summit/CoreSummit/Video.swift
index f033236d..8d3a0d02 100644
--- a/OpenStack Summit/CoreSummit/Video.swift	
+++ b/OpenStack Summit/CoreSummit/Video.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public struct Video: PresentationMaterial {
     
@@ -26,9 +26,9 @@ public struct Video: PresentationMaterial {
     
     public var dataUploaded: Date
     
-    public var order: Int
+    public var order: Int64
     
-    public var views: Int
+    public var views: Int64
     
     public var event: Identifier
 }
diff --git a/OpenStack Summit/CoreSummit/VideoJSON.swift b/OpenStack Summit/CoreSummit/VideoJSON.swift
index 01377423..25f460e3 100644
--- a/OpenStack Summit/CoreSummit/VideoJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VideoJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 public extension Video {
     
@@ -18,18 +18,18 @@ public extension Video {
 
 extension Video: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let featured = JSONObject[JSONKey.featured.rawValue]?.rawValue as? Bool,
             let displayOnSite = JSONObject[JSONKey.display_on_site.rawValue]?.rawValue as? Bool,
-            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.rawValue as? Identifier,
+            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.integerValue,
             let youtube = JSONObject[JSONKey.youtube_id.rawValue]?.rawValue as? String,
-            let dataUploaded = JSONObject[JSONKey.data_uploaded.rawValue]?.rawValue as? Int,
+            let dataUploaded = JSONObject[JSONKey.data_uploaded.rawValue]?.integerValue,
             let highlighted = JSONObject[JSONKey.highlighted.rawValue]?.rawValue as? Bool,
-            let views = JSONObject[JSONKey.views.rawValue]?.rawValue as? Int,
-            let order = JSONObject[JSONKey.order.rawValue]?.rawValue as? Int
+            let views = JSONObject[JSONKey.views.rawValue]?.integerValue,
+            let order = JSONObject[JSONKey.order.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
@@ -45,8 +45,8 @@ extension Video: JSONDecodable {
         // optional
         self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
         
-        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
-            where descriptionText.isEmpty == false {
+        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String,
+            descriptionText.isEmpty == false {
             
             self.descriptionText = descriptionText
             
diff --git a/OpenStack Summit/CoreSummit/VideoManagedObject.swift b/OpenStack Summit/CoreSummit/VideoManagedObject.swift
index a381b0eb..96dc6fba 100644
--- a/OpenStack Summit/CoreSummit/VideoManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VideoManagedObject.swift	
@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-import struct SwiftFoundation.Date
 
 public final class VideoManagedObject: Entity {
     
@@ -28,7 +27,7 @@ public final class VideoManagedObject: Entity {
     
     @NSManaged public var highlighted: Bool
     
-    @NSManaged public var dataUploaded: NSDate
+    @NSManaged public var dataUploaded: Date
     
     @NSManaged public var event: EventManagedObject
 }
@@ -37,23 +36,23 @@ extension Video: CoreDataDecodable {
     
     public init(managedObject: VideoManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.descriptionText = managedObject.descriptionText
         self.displayOnSite = managedObject.displayOnSite
         self.featured = managedObject.featured
         self.youtube = managedObject.youtube
-        self.event = managedObject.event.identifier
-        self.order = Int(managedObject.order)
-        self.views = Int(managedObject.views)
+        self.event = managedObject.event.id
+        self.order = managedObject.order
+        self.views = managedObject.views
         self.highlighted = managedObject.highlighted
-        self.dataUploaded = Date(foundation: managedObject.dataUploaded)
+        self.dataUploaded = managedObject.dataUploaded
     }
 }
 
 extension Video: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> VideoManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> VideoManagedObject {
         
         let managedObject = try cached(context)
         
@@ -65,7 +64,7 @@ extension Video: CoreDataEncodable {
         managedObject.order = Int64(order)
         managedObject.views = Int64(views)
         managedObject.highlighted = highlighted
-        managedObject.dataUploaded = dataUploaded.toFoundation()
+        managedObject.dataUploaded = dataUploaded
         managedObject.event = try context.relationshipFault(event)
         
         managedObject.didCache()
diff --git a/OpenStack Summit/CoreSummit/WebConvertible.swift b/OpenStack Summit/CoreSummit/WebConvertible.swift
index 49a07685..0b79055d 100644
--- a/OpenStack Summit/CoreSummit/WebConvertible.swift	
+++ b/OpenStack Summit/CoreSummit/WebConvertible.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 /// A type which can export a URL to open the summit data on the website.
 public protocol WebConvertible: Unique {
@@ -16,9 +16,12 @@ public protocol WebConvertible: Unique {
 
 public extension WebConvertible {
     
-    func toWebpageURL(summit: Summit) -> String {
+    func webpage(for summit: Summit) -> URL {
         
-        return summit.webpageURL + "/summit-schedule/" + Self.webPathComponent.rawValue + "/\(identifier)"
+        return summit.webpage
+            .appendingPathComponent("summit-schedule")
+            .appendingPathComponent(Self.webPathComponent.rawValue)
+            .appendingPathComponent("\(identifier)")
     }
 }
 
diff --git a/OpenStack Summit/CoreSummit/WirelessNetwork.swift b/OpenStack Summit/CoreSummit/WirelessNetwork.swift
index 809f5222..1788e55d 100644
--- a/OpenStack Summit/CoreSummit/WirelessNetwork.swift	
+++ b/OpenStack Summit/CoreSummit/WirelessNetwork.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 
 public struct WirelessNetwork: Named {
     
diff --git a/OpenStack Summit/CoreSummit/WirelessNetworkJSON.swift b/OpenStack Summit/CoreSummit/WirelessNetworkJSON.swift
index 98be1e87..37aefc17 100644
--- a/OpenStack Summit/CoreSummit/WirelessNetworkJSON.swift	
+++ b/OpenStack Summit/CoreSummit/WirelessNetworkJSON.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import JSON
 
 private extension WirelessNetwork {
     
@@ -18,13 +18,13 @@ private extension WirelessNetwork {
 
 extension WirelessNetwork: JSONDecodable {
     
-    public init?(JSONValue: JSON.Value) {
+    public init?(json JSONValue: JSON.Value) {
         
         guard let JSONObject = JSONValue.objectValue,
-            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let name = JSONObject[JSONKey.ssid.rawValue]?.rawValue as? String,
             let password = JSONObject[JSONKey.password.rawValue]?.rawValue as? String,
-            let summit = JSONObject[JSONKey.summit_id.rawValue]?.rawValue as? Int
+            let summit = JSONObject[JSONKey.summit_id.rawValue]?.integerValue
             else { return nil }
         
         self.identifier = identifier
diff --git a/OpenStack Summit/CoreSummit/WirelessNetworkManagedObject.swift b/OpenStack Summit/CoreSummit/WirelessNetworkManagedObject.swift
index 57c876c5..283e958c 100644
--- a/OpenStack Summit/CoreSummit/WirelessNetworkManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/WirelessNetworkManagedObject.swift	
@@ -8,7 +8,7 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 
 public final class WirelessNetworkManagedObject: Entity {
     
@@ -27,17 +27,17 @@ extension WirelessNetwork: CoreDataDecodable {
     
     public init(managedObject: WirelessNetworkManagedObject) {
         
-        self.identifier = managedObject.identifier
+        self.identifier = managedObject.id
         self.name = managedObject.name
         self.password = managedObject.password
         self.descriptionText = managedObject.descriptionText
-        self.summit = managedObject.summit.identifier
+        self.summit = managedObject.summit.id
     }
 }
 
 extension WirelessNetwork: CoreDataEncodable {
     
-    public func save(context: NSManagedObjectContext) throws -> WirelessNetworkManagedObject {
+    public func save(_ context: NSManagedObjectContext) throws -> WirelessNetworkManagedObject {
         
         let managedObject = try cached(context)
         
diff --git a/OpenStack Summit/CoreSummitTests/CoreDataTests.swift b/OpenStack Summit/CoreSummitTests/CoreDataTests.swift
index cc7e1fad..5e859751 100644
--- a/OpenStack Summit/CoreSummitTests/CoreDataTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/CoreDataTests.swift	
@@ -9,7 +9,7 @@
 import XCTest
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 @testable import CoreSummit
 
 final class CoreDataTests: XCTestCase {
@@ -23,7 +23,7 @@ final class CoreDataTests: XCTestCase {
             // load test data
             let testJSON = loadJSON("Summit\(summitID)")
             
-            guard let summit = Summit(JSONValue: testJSON)
+            guard let summit = Summit(json: testJSON)
                 else { XCTFail("Could not decode from JSON"); return }
             
             // decode
@@ -59,7 +59,7 @@ final class CoreDataTests: XCTestCase {
             // load test data
             let testJSON = loadJSON("Member\(memberID)")
             
-            guard let member = MemberResponse.Member(JSONValue: testJSON)
+            guard let member = MemberResponse.Member(json: testJSON)
                 else { XCTFail("Could not decode from JSON"); return }
             
             // cache in CoreData
@@ -79,7 +79,7 @@ final class CoreDataTests: XCTestCase {
         
         let eventEntity = model[EventManagedObject.self]!
         
-        let _ = try! context.findOrCreate(eventEntity, resourceID: 1, identifierProperty: Entity.identifierProperty)
+        let _ = try! context.findOrCreate(eventEntity, resourceID: 1 as NSNumber, identifierProperty: Entity.identifierProperty)
         
         do { try context.validateAndSave() }
         
@@ -93,10 +93,10 @@ private extension CoreDataTests {
     
     func testContext() -> NSManagedObjectContext {
         
-        let managedObjectContext = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
+        let managedObjectContext = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
         managedObjectContext.undoManager = nil
         managedObjectContext.persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: NSManagedObjectModel.summitModel)
-        try! managedObjectContext.persistentStoreCoordinator!.addPersistentStoreWithType(NSInMemoryStoreType, configuration: nil, URL: nil, options: nil)
+        try! managedObjectContext.persistentStoreCoordinator!.addPersistentStore(ofType: NSInMemoryStoreType, configurationName: nil, at: nil, options: nil)
         
         return managedObjectContext
     }
diff --git a/OpenStack Summit/CoreSummitTests/JSONTests.swift b/OpenStack Summit/CoreSummitTests/JSONTests.swift
index 5384a416..cfedb3c5 100644
--- a/OpenStack Summit/CoreSummitTests/JSONTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/JSONTests.swift	
@@ -7,12 +7,12 @@
 //
 
 import XCTest
-import SwiftFoundation
+import Foundation
 @testable import CoreSummit
 
-let SummitJSONIdentifiers = [6, 7, 22]
+let SummitJSONIdentifiers: [Identifier] = [6, 7, 22]
 
-let MemberJSONIdentifiers = 1 ... 3
+let MemberJSONIdentifiers: CountableClosedRange<Identifier> = 1 ... 3
 
 final class JSONTests: XCTestCase {
     
@@ -22,7 +22,7 @@ final class JSONTests: XCTestCase {
             
             let testJSON = loadJSON("Summit\(summitID)")
             
-            guard let summit = Summit(JSONValue: testJSON)
+            guard let summit = Summit(json: testJSON)
                 else { XCTFail("Could not decode from JSON"); return }
             
             XCTAssert(summit.schedule.isEmpty == false, "No Events")
@@ -36,7 +36,7 @@ final class JSONTests: XCTestCase {
             
             let testJSON = loadJSON("Member\(memberJSONID)")
             
-            guard let _ = MemberResponse.Member(JSONValue: testJSON)
+            guard let _ = MemberResponse.Member(json: testJSON)
                 else { XCTFail("Could not decode from JSON"); return }
         }
     }
@@ -45,7 +45,7 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("AllSummits")
         
-        guard let reponse = SummitsResponse(JSONValue: testJSON)
+        guard let reponse = SummitsResponse(json: testJSON)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(reponse.page.items.isEmpty == false, "No summits parsed")
@@ -55,7 +55,7 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("ListMembers")
         
-        guard let page = Page<Member>(JSONValue: testJSON)
+        guard let page = Page<Member>(json: testJSON)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(page.items.isEmpty == false, "No members parsed")
@@ -65,7 +65,7 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("Feedback")
         
-        guard let page = Page<Feedback>(JSONValue: testJSON)
+        guard let page = Page<Feedback>(json: testJSON)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(page.items.isEmpty == false, "No feedback parsed")
@@ -76,7 +76,7 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates1")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
@@ -88,15 +88,15 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates2")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
         XCTAssert(dataUpdates.count == 1, "\(dataUpdates.count) DataUpdate. Should be 1")
         
         guard let dataUpdateEntity = dataUpdates.first?.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = EventDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Event.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -107,7 +107,7 @@ final class JSONTests: XCTestCase {
         let dataUpdatesCount = 67
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
@@ -119,12 +119,12 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates4")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         guard let dataUpdateEntity = dataUpdates.first?.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = SummitDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Summit.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -135,7 +135,7 @@ final class JSONTests: XCTestCase {
         let dataUpdatesCount = 4
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
@@ -143,11 +143,11 @@ final class JSONTests: XCTestCase {
         
         for dataUpdate in dataUpdates {
             
-            guard dataUpdate.operation == .Update,
+            guard dataUpdate.operation == .update,
                 let dataUpdateEntity = dataUpdate.entity,
-                case let .JSON(entityJSON) = dataUpdateEntity,
+                case let .json(entityJSON) = dataUpdateEntity,
                 let type = dataUpdate.className.type,
-                let _ = type.init(JSONValue: .Object(entityJSON))
+                let _ = type.init(json: .object(entityJSON))
                 else { XCTFail("Could not decode \(dataUpdate.className) from JSON"); return }
         }
     }
@@ -157,15 +157,15 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates6")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
         XCTAssert(dataUpdates.count == 1, "\(dataUpdates.count) DataUpdate. Should be 1")
         
         guard let dataUpdateEntity = dataUpdates.first?.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = VenueRoomDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = VenueRoom.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -174,7 +174,7 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates7")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
@@ -183,11 +183,11 @@ final class JSONTests: XCTestCase {
         for dataUpdate in dataUpdates {
             
             guard let dataUpdateEntity = dataUpdate.entity,
-                case let .JSON(entityJSON) = dataUpdateEntity
-                where dataUpdate.className == .MySchedule
+                case let .json(entityJSON) = dataUpdateEntity,
+                dataUpdate.className == .MySchedule
                 else { continue }
             
-            guard let _ = EventDataUpdate(JSONValue: .Object(entityJSON))
+            guard let _ = Event.DataUpdate(json: .object(entityJSON))
                 else { XCTFail("Could not decode from JSON"); return }
         }
     }
@@ -197,15 +197,15 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates8")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
         XCTAssert(dataUpdates.count == 1, "\(dataUpdates.count) DataUpdates. Should be 1")
         
         guard let dataUpdateEntity = dataUpdates.first?.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = GroupEventDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = GroupEventDataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -214,7 +214,7 @@ final class JSONTests: XCTestCase {
         let testJSON = loadJSON("DataUpdates9")
         
         guard let jsonArray = testJSON.arrayValue,
-            let dataUpdates = DataUpdate.fromJSON(jsonArray)
+            let dataUpdates = DataUpdate.from(json: jsonArray)
             else { XCTFail("Could not decode from JSON"); return }
         
         XCTAssert(dataUpdates.isEmpty == false, "No DataUpdate parsed")
@@ -223,11 +223,11 @@ final class JSONTests: XCTestCase {
         for dataUpdate in dataUpdates {
             
             guard let dataUpdateEntity = dataUpdate.entity,
-                case let .JSON(entityJSON) = dataUpdateEntity
-                where dataUpdate.className == .SummitWIFIConnection
+                case let .json(entityJSON) = dataUpdateEntity,
+                dataUpdate.className == .SummitWIFIConnection
                 else { continue }
             
-            guard let _ = WirelessNetwork(JSONValue: .Object(entityJSON))
+            guard let _ = WirelessNetwork(json: .object(entityJSON))
                 else { XCTFail("Could not decode from JSON"); return }
         }
     }
@@ -236,15 +236,15 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates10")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON)
+        guard let dataUpdate = DataUpdate(json: testJSON)
             else { XCTFail("Could not decode from JSON"); return }
         
         guard let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity
-            where dataUpdate.className == .MyFavorite
+            case let .json(entityJSON) = dataUpdateEntity,
+            dataUpdate.className == .MyFavorite
             else { XCTFail("Could not decode from JSON"); return }
         
-        guard let _ = EventDataUpdate(JSONValue: .Object(entityJSON))
+        guard let _ = Event.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -252,10 +252,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates11")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = Venue(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Venue(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -263,10 +263,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates12")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = TrackGroupDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = TrackGroup.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -274,10 +274,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates13")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = Video(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Video(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -285,10 +285,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates14")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = Slide(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Slide(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -296,10 +296,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates15")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = Link(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Link(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
     
@@ -307,10 +307,10 @@ final class JSONTests: XCTestCase {
         
         let testJSON = loadJSON("DataUpdates16")
         
-        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+        guard let dataUpdate = DataUpdate(json: testJSON),
             let dataUpdateEntity = dataUpdate.entity,
-            case let .JSON(entityJSON) = dataUpdateEntity,
-            let _ = EventDataUpdate(JSONValue: .Object(entityJSON))
+            case let .json(entityJSON) = dataUpdateEntity,
+            let _ = Event.DataUpdate(json: .object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
 }
diff --git a/OpenStack Summit/CoreSummitTests/ModelTests.swift b/OpenStack Summit/CoreSummitTests/ModelTests.swift
index 500e60d7..9ad77962 100644
--- a/OpenStack Summit/CoreSummitTests/ModelTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/ModelTests.swift	
@@ -7,7 +7,6 @@
 //
 
 import XCTest
-import SwiftFoundation
 @testable import CoreSummit
 
 final class ModelTests: XCTestCase {
diff --git a/OpenStack Summit/CoreSummitTests/PredicateTests.swift b/OpenStack Summit/CoreSummitTests/PredicateTests.swift
deleted file mode 100644
index b8dbc5bc..00000000
--- a/OpenStack Summit/CoreSummitTests/PredicateTests.swift	
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-//  PredicateTests.swift
-//  PredicateTests
-//
-//  Created by Alsey Coleman Miller on 4/2/17.
-//  Copyright © 2017 PureSwift. All rights reserved.
-//
-
-import XCTest
-import Foundation
-import struct SwiftFoundation.Date
-import struct SwiftFoundation.Data
-@testable import CoreSummit
-
-final class PredicateTests: XCTestCase {
-    
-    class Person: NSObject {
-        var id: Int
-        var name: String
-        init(id: Int, name: String) {
-            self.id = id
-            self.name = name
-            super.init()
-        }
-    }
-    
-    class Event: NSObject {
-        var id: Int
-        var name: String
-        var start: NSDate
-        var speakers: Set<Person>
-        init(id: Int, name: String, start: NSDate, speakers: Set<Person>) {
-            self.id = id
-            self.name = name
-            self.start = start
-            self.speakers = speakers
-            super.init()
-        }
-    }
-    
-    func testPredicate1() {
-        
-        let predicate: Predicate = "id" > Int64(0)
-            &&& "id" != Int64(99)
-            &&& "name".compare(.beginsWith, .value(.string("C")))
-            &&& "name".compare(.contains, [.diacriticInsensitive, .caseInsensitive], .value(.string("COLE")))
-        
-        let nsPredicate = predicate.toFoundation()
-        
-        print(predicate)
-        print(nsPredicate)
-        
-        XCTAssert(predicate.description == nsPredicate.description, "Invalid description")
-        XCTAssert(nsPredicate.evaluateWithObject(Person(id: 1, name: "Coléman")))
-    }
-    
-    func testPredicate2() {
-        
-        let identifiers: [Int64] = [1, 2, 3]
-        
-        let predicate: Predicate = "name".any(in: ["coleman", "miller"])
-            &&& "id".any(in: identifiers)
-            ||| "id".all(in: [Int16]())
-        
-        let nsPredicate = predicate.toFoundation()
-        
-        print(predicate)
-        print(nsPredicate)
-        
-        XCTAssert(predicate.description == nsPredicate.description, "Invalid description")
-        let test = [Person(id: 1, name: "coleman"), Person(id: 2, name: "miller")]
-        XCTAssert(nsPredicate.evaluateWithObject(test))
-    }
-    
-    func testPredicate3() {
-        
-        let identifiers: [Int64] = [1, 2, 3]
-        
-        let predicate: Predicate = "name".`in`(["coleman", "miller"])
-            &&& "id".`in`(identifiers)
-        
-        let nsPredicate = predicate.toFoundation()
-        
-        print(predicate)
-        print(nsPredicate)
-        
-        XCTAssert(predicate.description == nsPredicate.description, "Invalid description")
-        XCTAssert(nsPredicate.evaluateWithObject(Person(id: 1, name: "coleman")))
-        XCTAssert(([Person(id: 1, name: "coleman"), Person(id: 2, name: "miller")] as NSArray).filteredArrayUsingPredicate(nsPredicate).count == 2)
-    }
-    
-    func testPredicate4() {
-        
-        let events = [Event(id: 100, name: "Awesome Event", start: NSDate(timeIntervalSince1970: 0.0), speakers: [Person(id: 1, name: "Alsey Coleman Miller")])]
-        
-        let now = Date()
-        
-        let identifiers: [Int64] = [100, 200, 300]
-        
-        let predicate: Predicate = "name".compare(.contains, [.caseInsensitive], .value(.string("event")))
-            &&& "name".`in`(["Awesome Event"])
-            &&& "id".`in`(identifiers)
-            &&& "start" < now
-            &&& "speakers.name".all(in: ["Alsey Coleman Miller"])
-        
-        let nsPredicate = predicate.toFoundation()
-        
-        print(predicate)
-        print(nsPredicate)
-        
-        XCTAssert(nsPredicate.evaluateWithObject(events[0]))
-        XCTAssert((events as NSArray).filteredArrayUsingPredicate(nsPredicate).count == events.count)
-    }
-}
diff --git a/OpenStack Summit/CoreSummitTests/StoreTests.swift b/OpenStack Summit/CoreSummitTests/StoreTests.swift
index 31832a2b..9526e587 100644
--- a/OpenStack Summit/CoreSummitTests/StoreTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/StoreTests.swift	
@@ -9,7 +9,7 @@
 import XCTest
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 @testable import CoreSummit
 
 final class StoreTests: XCTestCase {
@@ -18,17 +18,17 @@ final class StoreTests: XCTestCase {
         
         let store = try! createStore()
         
-        let expectation = expectationWithDescription("API Request")
+        let expectation = self.expectation(description: "API Request")
         
         store.summits() { (response) in
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 XCTFail("\(error)");
                 
-            case let .Value(value):
+            case let .value(value):
                 
                 XCTAssert(value.items.isEmpty == false, "No summits")
                 
@@ -38,24 +38,24 @@ final class StoreTests: XCTestCase {
             expectation.fulfill()
         }
         
-        waitForExpectationsWithTimeout(60, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
     
     func testCurrentSummitRequest() {
         
         let store = try! createStore()
         
-        let expectation = expectationWithDescription("API Request")
+        let expectation = self.expectation(description: "API Request")
         
         store.summit() { (response) in
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 XCTFail("\(error)");
                 
-            case let .Value(summit):
+            case let .value(summit):
                                 
                 dump(summit, "StoreTestsCurrentSummitDump.txt")
             }
@@ -63,7 +63,7 @@ final class StoreTests: XCTestCase {
             expectation.fulfill()
         }
         
-        waitForExpectationsWithTimeout(60, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
     
     func testSummitRequest() {
@@ -72,17 +72,17 @@ final class StoreTests: XCTestCase {
         
         for summitID in SummitJSONIdentifiers {
             
-            let expectation = expectationWithDescription("API Request")
+            let expectation = self.expectation(description: "API Request")
             
             store.summit(summitID) { (response) in
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     XCTFail("\(error)");
                     
-                case let .Value(summit):
+                case let .value(summit):
                     
                     XCTAssert(summit.speakers.isEmpty == false, "No Events")
                     XCTAssert(summit.speakers.isEmpty == false, "No Speakers")
@@ -93,7 +93,7 @@ final class StoreTests: XCTestCase {
                 expectation.fulfill()
             }
             
-            waitForExpectationsWithTimeout(60, handler: nil)
+            waitForExpectations(timeout: 60, handler: nil)
         }
     }
     
@@ -101,21 +101,21 @@ final class StoreTests: XCTestCase {
         
         let store = try! createStore()
         
-        let summitID = 22  // Boston 2017
+        let summitID: Identifier = 22  // Boston 2017
         
         let date = Date() - (60*60*24*30) // last month
         
-        let expectation = expectationWithDescription("API Request")
+        let expectation = self.expectation(description: "API Request")
         
         store.dataUpdates(summitID, from: date, limit: 100) { (response) in
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 XCTFail("\(error)");
                 
-            case .Value:
+            case .value:
                 
                 break
             }
@@ -123,28 +123,28 @@ final class StoreTests: XCTestCase {
             expectation.fulfill()
         }
         
-        waitForExpectationsWithTimeout(60, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
     
     func testFeedbackRequest() {
         
         let store = try! createStore()
         
-        let summit = 7 // Barcelona
+        let summit: Identifier = 7 // Barcelona
         
-        let event = 16638 // Upstream University - Day 1
+        let event: Identifier = 16638 // Upstream University - Day 1
         
-        let expectation = expectationWithDescription("API Request")
+        let expectation = self.expectation(description: "API Request")
         
         store.feedback(summit, event: event, page: 1, objectsPerPage: 10) { (response) in
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 XCTFail("\(error)");
                 
-            case let .Value(value):
+            case let .value(value):
                 
                 if value.total > 0 {
                     
@@ -155,24 +155,24 @@ final class StoreTests: XCTestCase {
             expectation.fulfill()
         }
         
-        waitForExpectationsWithTimeout(60, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
     
     func testListMembersRequest() {
         
         let store = try! createStore()
         
-        let expectation = expectationWithDescription("API Request")
+        let expectation = self.expectation(description: "API Request")
         
         store.members(MemberListRequest.Filter(value: "Jimmy", property: .firstName)) { (response) in
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 XCTFail("\(error)");
                 
-            case let .Value(value):
+            case let .value(value):
                 
                 if value.total > 0 {
                     
@@ -183,6 +183,6 @@ final class StoreTests: XCTestCase {
             expectation.fulfill()
         }
         
-        waitForExpectationsWithTimeout(60, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
 }
diff --git a/OpenStack Summit/CoreSummitTests/TestUtilities.swift b/OpenStack Summit/CoreSummitTests/TestUtilities.swift
index 3ee85d84..55ba9851 100644
--- a/OpenStack Summit/CoreSummitTests/TestUtilities.swift	
+++ b/OpenStack Summit/CoreSummitTests/TestUtilities.swift	
@@ -8,29 +8,30 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import JSON
 @testable import CoreSummit
 
-internal func loadJSON(filename: String) -> JSON.Value {
+internal func loadJSON(_ filename: String) -> JSON.Value {
     
-    let testBundle = NSBundle(forClass: JSONTests.self)
+    let testBundle = Bundle(for: JSONTests.self)
     
-    let resourcePath = testBundle.pathForResource(filename, ofType: "json", inDirectory: nil, forLocalization: nil)!
+    let resourcePath = testBundle.path(forResource: filename, ofType: "json", inDirectory: nil, forLocalization: nil)!
     
     let JSONString = try! String(contentsOfFile: resourcePath)
     
-    return JSON.Value(string: JSONString)!
+    return try! JSON.Value(string: JSONString)
 }
 
-internal func dump(dumpable: Any, _ outputFileName: String) -> String {
+@discardableResult
+internal func dump(_ dumpable: Any, _ outputFileName: String) -> String {
     
     var dumpString = ""
     
-    dump(dumpable, &dumpString)
+    dump(dumpable, to: &dumpString)
     
-    let stringData = dumpString.toUTF8Data().toFoundation()
+    let stringData = dumpString.toUTF8Data()
     
-    stringData.writeToFile(outputDirectory + outputFileName, atomically: true)
+    try? stringData.write(to: Foundation.URL(fileURLWithPath: outputDirectory + outputFileName), options: [.atomic])
     
     return dumpString
 }
@@ -41,9 +42,9 @@ let outputDirectory: String = {
     
     var isDirectory: ObjCBool = false
     
-    if NSFileManager.defaultManager().fileExistsAtPath(outputDirectory, isDirectory: &isDirectory) == false {
+    if Foundation.FileManager.default.fileExists(atPath: outputDirectory, isDirectory: &isDirectory) == false {
         
-        try! NSFileManager.defaultManager().createDirectoryAtPath(outputDirectory, withIntermediateDirectories: false, attributes: nil)
+        try! Foundation.FileManager.default.createDirectory(atPath: outputDirectory, withIntermediateDirectories: false, attributes: nil)
     }
     
     print("Test output directory: \(outputDirectory)")
@@ -53,12 +54,12 @@ let outputDirectory: String = {
 
 func createStore() throws -> Store {
     
-    return try Store(environment: .Staging,
+    return try Store(environment: .staging,
                      session: UserDefaultsSessionStorage(),
                      createPersistentStore: {
-                        try $0.addPersistentStoreWithType(NSInMemoryStoreType,
-                            configuration: nil,
-                            URL: nil,
+                        try $0.addPersistentStore(ofType: NSInMemoryStoreType,
+                            configurationName: nil,
+                            at: nil,
                             options: nil) },
                      deletePersistentStore: { _ in fatalError("Not needed") })
 }
diff --git a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj
index f534b73c..b7bca769 100644
--- a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
+++ b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
@@ -103,11 +103,6 @@
 		6E0B5F691D77D4DF0005F6CE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E0B5F681D77D4DF0005F6CE /* Assets.xcassets */; };
 		6E0B5F6D1D77D4DF0005F6CE /* OpenStackSummitWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 6E0B5F4F1D77D4DE0005F6CE /* OpenStackSummitWatch.app */; };
 		6E0D3D7B1DC09B7C00EEB8A7 /* SummitsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0D3D7A1DC09B7C00EEB8A7 /* SummitsViewController.swift */; };
-		6E0FD0B01E92A7DB000C6DBA /* PredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */; };
-		6E0FD0B11E92A7DB000C6DBA /* PredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */; };
-		6E0FD0B21E92A7DB000C6DBA /* PredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */; };
-		6E0FD0B31E92A7DB000C6DBA /* PredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */; };
-		6E0FD0B51E92E57F000C6DBA /* SwiftFoundation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6E0FD0B71E92E57F000C6DBA /* JSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54EB1E612BDD005EAB86 /* JSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6E0FD0B91E92E57F000C6DBA /* AeroGearHttp.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54E51E612BDD005EAB86 /* AeroGearHttp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6E0FD0BB1E92E57F000C6DBA /* AeroGearOAuth2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54E71E612BDD005EAB86 /* AeroGearOAuth2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -176,13 +171,12 @@
 		6E1651921D845E5000574CE5 /* Venues.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E1651911D845E4F00574CE5 /* Venues.storyboard */; };
 		6E1651941D84628200574CE5 /* VenueDirectoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1651931D84628200574CE5 /* VenueDirectoryViewController.swift */; };
 		6E1651981D84639300574CE5 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E1651951D8462AE00574CE5 /* MapKit.framework */; };
-		6E172D771EBCCBE000C9CAF3 /* ModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */; };
-		6E172D781EBCCBE100C9CAF3 /* ModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */; };
-		6E172D791EBCCBE200C9CAF3 /* ModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */; };
-		6E172D7A1EBCCBE300C9CAF3 /* ModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */; };
 		6E1748B51D37FDFA00C0F25D /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E1748B41D37FDFA00C0F25D /* Feedback.storyboard */; };
 		6E1748B71D37FE0D00C0F25D /* FeedbackGivenListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1748B61D37FE0D00C0F25D /* FeedbackGivenListViewController.swift */; };
 		6E1949331DCBB3E000A00603 /* Member.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E10A5281D10675C008CBD0C /* Member.swift */; };
+		6E1A5CFC1EC6D84E006E72BE /* URLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1A5CFB1EC6D84E006E72BE /* URLExtensions.swift */; };
+		6E1A5CFD1EC6DC11006E72BE /* URLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1A5CFB1EC6D84E006E72BE /* URLExtensions.swift */; };
+		6E1A5CFE1EC6DC12006E72BE /* URLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1A5CFB1EC6D84E006E72BE /* URLExtensions.swift */; };
 		6E1BCFE21E35CBF100059E94 /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1BCFE11E35CBF100059E94 /* Group.swift */; };
 		6E1BCFE31E35CBF100059E94 /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1BCFE11E35CBF100059E94 /* Group.swift */; };
 		6E1BCFE41E35CBF100059E94 /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1BCFE11E35CBF100059E94 /* Group.swift */; };
@@ -431,6 +425,10 @@
 		6E53B2A71D85340700641A8F /* SpeakerDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53B2A61D85340700641A8F /* SpeakerDetailViewController.swift */; };
 		6E53B2A91D8534F600641A8F /* SpeakerSearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53B2A81D8534F600641A8F /* SpeakerSearchResultsViewController.swift */; };
 		6E53B2AB1D85366400641A8F /* SpeakerDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E53B2AA1D85366400641A8F /* SpeakerDetail.storyboard */; };
+		6E53C86D1EC656EF009ADC8C /* JSONExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */; };
+		6E53C86E1EC656F0009ADC8C /* JSONExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */; };
+		6E53C86F1EC656F1009ADC8C /* JSONExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */; };
+		6E53C8701EC656F2009ADC8C /* JSONExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */; };
 		6E55B4E61EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */; };
 		6E55B4E71EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */; };
 		6E55B4E81EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */; };
@@ -447,15 +445,10 @@
 		6E55B5001EBCB704003AAFE6 /* DataUpdates14.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */; };
 		6E55B5011EBCB704003AAFE6 /* DataUpdates14.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */; };
 		6E55B5021EBCB704003AAFE6 /* DataUpdates14.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */; };
-		6E55B5041EBCBCD6003AAFE6 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5031EBCBCD6003AAFE6 /* Link.swift */; };
 		6E55B5051EBCBCD6003AAFE6 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5031EBCBCD6003AAFE6 /* Link.swift */; };
 		6E55B5061EBCBCD6003AAFE6 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5031EBCBCD6003AAFE6 /* Link.swift */; };
 		6E55B5071EBCBCD6003AAFE6 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5031EBCBCD6003AAFE6 /* Link.swift */; };
-		6E55B5091EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
-		6E55B50A1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
 		6E55B50B1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
-		6E55B50C1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
-		6E55B50E1EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */; };
 		6E55B50F1EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */; };
 		6E55B5101EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */; };
 		6E55B5111EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */; };
@@ -723,15 +716,36 @@
 		6E7558C61E58EB4A003B6844 /* VenuesMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7558C51E58EB4A003B6844 /* VenuesMapViewController.swift */; };
 		6E7558CF1E595753003B6844 /* NSDate+MTDates.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7558CC1E595753003B6844 /* NSDate+MTDates.m */; };
 		6E7558D01E595753003B6844 /* NSDateComponents+MTDates.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7558CE1E595753003B6844 /* NSDateComponents+MTDates.m */; };
+		6E7614D61EC7C00D008FBC8A /* RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */; };
+		6E7614D71EC7C00D008FBC8A /* RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */; };
+		6E7614D81EC7C00D008FBC8A /* RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */; };
+		6E7614D91EC7C00D008FBC8A /* RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */; };
+		6E7614DA1EC7CF35008FBC8A /* DataUpdatePoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EDAF38D1D5BB22700B75B28 /* DataUpdatePoller.swift */; };
+		6E7614DB1EC7CF37008FBC8A /* DataUpdatePoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EDAF38D1D5BB22700B75B28 /* DataUpdatePoller.swift */; };
+		6E7614DC1EC7CF6B008FBC8A /* DataUpdatePoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1399E01DD7A7B900FD1D37 /* DataUpdatePoller.swift */; };
+		6E7614DD1EC811FD008FBC8A /* DataUpdateJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E2529211D5924D300173B1F /* DataUpdateJSON.swift */; };
+		6E7614DE1EC8122C008FBC8A /* DataUpdateRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25291D1D58E6F200173B1F /* DataUpdateRequest.swift */; };
+		6E7614DF1EC8123D008FBC8A /* TicketOrderRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EF2FB381D524BCC00BF9EDE /* TicketOrderRequest.swift */; };
+		6E7614E01EC81244008FBC8A /* FeedbackRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E066D9C1D356A2F005A8D2D /* FeedbackRequest.swift */; };
+		6E7614E11EC81246008FBC8A /* EventScheduleRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFC6E681D2322E70087057A /* EventScheduleRequest.swift */; };
 		6E77C70D1DBE5C6B008BF684 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E77C70C1DBE5C6B008BF684 /* ComplicationController.swift */; };
 		6E7847F11DC9224700B8AD05 /* LocationManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7847F01DC9224700B8AD05 /* LocationManagedObject.swift */; };
 		6E7847F21DC9224700B8AD05 /* LocationManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7847F01DC9224700B8AD05 /* LocationManagedObject.swift */; };
 		6E7847F31DC9224700B8AD05 /* LocationManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7847F01DC9224700B8AD05 /* LocationManagedObject.swift */; };
+		6E793E6B1EC4B9F700C636AE /* PresentationMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */; };
+		6E793E6C1EC4BA2A00C636AE /* Slide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EA1EAFA20B0007D89A /* Slide.swift */; };
+		6E793E6D1EC4BA2E00C636AE /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5031EBCBCD6003AAFE6 /* Link.swift */; };
+		6E793E6E1EC4BB2A00C636AE /* LinkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */; };
+		6E793E6F1EC4BCE000C636AE /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
+		6E793E701EC4BCE100C636AE /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
+		6E793E711EC4BCE900C636AE /* LinkJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */; };
 		6E7E18EA1D490DAC009549BA /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7E18E91D490DAC009549BA /* Preference.swift */; };
+		6E7F770D1ECF3D040003738D /* AppReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F770C1ECF3D040003738D /* AppReview.swift */; };
 		6E7FEA2B1D78959900B9E809 /* VenuesInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7FEA2A1D78959900B9E809 /* VenuesInterfaceController.swift */; };
 		6E7FEA321D78AA6200B9E809 /* EventDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7FEA2E1D78A19000B9E809 /* EventDetail.swift */; };
 		6E7FEA331D78E8D800B9E809 /* YouTubeThumbnail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E6AB19D1D650B8C00E940BE /* YouTubeThumbnail.swift */; };
 		6E7FEA341D78E8E000B9E809 /* UserActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E3E1E6C1D769E6800F6CB29 /* UserActivity.swift */; };
+		6E81DE5C1EC1092C000A0806 /* MainRevealViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E81DE5B1EC1092C000A0806 /* MainRevealViewController.swift */; };
 		6E8220EF1E48D0670025FE58 /* PagingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E8220EE1E48D0670025FE58 /* PagingTableViewController.swift */; };
 		6E8220F01E48D0670025FE58 /* PagingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E8220EE1E48D0670025FE58 /* PagingTableViewController.swift */; };
 		6E8220F21E48E0E50025FE58 /* WirelessNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E8220F11E48E0E50025FE58 /* WirelessNetwork.swift */; };
@@ -865,6 +879,7 @@
 		6EB1FE001E1D6BB90048045D /* PageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EB1FDFF1E1D6BB90048045D /* PageController.swift */; };
 		6EB1FE011E1D6BB90048045D /* PageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EB1FDFF1E1D6BB90048045D /* PageController.swift */; };
 		6EB2951A1DA97B230021C846 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB295161DA97B0B0021C846 /* Crashlytics.framework */; };
+		6EB2B3871EC746E900648958 /* Predicate.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB2B3861EC746E900648958 /* Predicate.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6EB3EA0D1D1B5158000BA5A4 /* TableViewHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EB3EA091D1B5158000BA5A4 /* TableViewHeaderView.swift */; };
 		6EB3EA0E1D1B5158000BA5A4 /* TableViewHeaderViewDark.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EB3EA0A1D1B5158000BA5A4 /* TableViewHeaderViewDark.xib */; };
 		6EB3EA101D1B5158000BA5A4 /* FeedbackTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EB3EA0C1D1B5158000BA5A4 /* FeedbackTableViewCell.xib */; };
@@ -959,30 +974,6 @@
 		6EE74DEB1DBF8E5A00616BEA /* DataUpdates5.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E35086E1D9AE4900055801C /* DataUpdates5.json */; };
 		6EE74DEC1DBF8E5A00616BEA /* DataUpdates6.json in Resources */ = {isa = PBXBuildFile; fileRef = 9D6AADA81DBE4ABE0057888E /* DataUpdates6.json */; };
 		6EE74DED1DBF8E5A00616BEA /* DataUpdates7.json in Resources */ = {isa = PBXBuildFile; fileRef = 6EE74DE71DBF8E4B00616BEA /* DataUpdates7.json */; };
-		6EE9544E1E92A0BC006B1330 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954481E92A0BC006B1330 /* Predicate.swift */; };
-		6EE9544F1E92A0BC006B1330 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954481E92A0BC006B1330 /* Predicate.swift */; };
-		6EE954501E92A0BC006B1330 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954481E92A0BC006B1330 /* Predicate.swift */; };
-		6EE954511E92A0BC006B1330 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954481E92A0BC006B1330 /* Predicate.swift */; };
-		6EE954521E92A0BC006B1330 /* Compound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954491E92A0BC006B1330 /* Compound.swift */; };
-		6EE954531E92A0BC006B1330 /* Compound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954491E92A0BC006B1330 /* Compound.swift */; };
-		6EE954541E92A0BC006B1330 /* Compound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954491E92A0BC006B1330 /* Compound.swift */; };
-		6EE954551E92A0BC006B1330 /* Compound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE954491E92A0BC006B1330 /* Compound.swift */; };
-		6EE954561E92A0BC006B1330 /* Comparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544A1E92A0BC006B1330 /* Comparison.swift */; };
-		6EE954571E92A0BC006B1330 /* Comparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544A1E92A0BC006B1330 /* Comparison.swift */; };
-		6EE954581E92A0BC006B1330 /* Comparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544A1E92A0BC006B1330 /* Comparison.swift */; };
-		6EE954591E92A0BC006B1330 /* Comparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544A1E92A0BC006B1330 /* Comparison.swift */; };
-		6EE9545A1E92A0BC006B1330 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544B1E92A0BC006B1330 /* Expression.swift */; };
-		6EE9545B1E92A0BC006B1330 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544B1E92A0BC006B1330 /* Expression.swift */; };
-		6EE9545C1E92A0BC006B1330 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544B1E92A0BC006B1330 /* Expression.swift */; };
-		6EE9545D1E92A0BC006B1330 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544B1E92A0BC006B1330 /* Expression.swift */; };
-		6EE9545E1E92A0BC006B1330 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544C1E92A0BC006B1330 /* Value.swift */; };
-		6EE9545F1E92A0BC006B1330 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544C1E92A0BC006B1330 /* Value.swift */; };
-		6EE954601E92A0BC006B1330 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544C1E92A0BC006B1330 /* Value.swift */; };
-		6EE954611E92A0BC006B1330 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544C1E92A0BC006B1330 /* Value.swift */; };
-		6EE954621E92A0BC006B1330 /* NSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */; };
-		6EE954631E92A0BC006B1330 /* NSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */; };
-		6EE954641E92A0BC006B1330 /* NSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */; };
-		6EE954651E92A0BC006B1330 /* NSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */; };
 		6EEBAEA41D8CD6530067B228 /* DataUpdates4.json in Resources */ = {isa = PBXBuildFile; fileRef = 6EEBAEA31D8CD6530067B228 /* DataUpdates4.json */; };
 		6EEBAEA51D8CD6530067B228 /* DataUpdates4.json in Resources */ = {isa = PBXBuildFile; fileRef = 6EEBAEA31D8CD6530067B228 /* DataUpdates4.json */; };
 		6EEBAEA61D8CD6530067B228 /* DataUpdates4.json in Resources */ = {isa = PBXBuildFile; fileRef = 6EEBAEA31D8CD6530067B228 /* DataUpdates4.json */; };
@@ -1072,7 +1063,6 @@
 		6EFC99BF1D218280009FD0DA /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFC99BE1D218280009FD0DA /* MenuViewController.swift */; };
 		6EFC99C11D2198DF009FD0DA /* Menu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6EFC99C01D2198DF009FD0DA /* Menu.storyboard */; };
 		6EFC99C71D21DBE5009FD0DA /* Event.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6EFC99C61D21DBE5009FD0DA /* Event.storyboard */; };
-		6EFE54F31E612C7A005EAB86 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */; };
 		6EFE54F41E612C7A005EAB86 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54EB1E612BDD005EAB86 /* JSON.framework */; };
 		6EFE54F51E612C7A005EAB86 /* AeroGearHttp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54E51E612BDD005EAB86 /* AeroGearHttp.framework */; };
 		6EFE54F61E612C7A005EAB86 /* AeroGearOAuth2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFE54E71E612BDD005EAB86 /* AeroGearOAuth2.framework */; };
@@ -1114,11 +1104,9 @@
 		9DABFF941DA6A75B00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
 		9DABFF951DA6A75C00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
 		9DABFF961DA6A75E00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
-		9DE1C8EB1EAFA20B0007D89A /* Slide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EA1EAFA20B0007D89A /* Slide.swift */; };
 		9DE1C8EC1EAFA20B0007D89A /* Slide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EA1EAFA20B0007D89A /* Slide.swift */; };
 		9DE1C8ED1EAFA20B0007D89A /* Slide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EA1EAFA20B0007D89A /* Slide.swift */; };
 		9DE1C8EE1EAFA20B0007D89A /* Slide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EA1EAFA20B0007D89A /* Slide.swift */; };
-		9DE1C8F01EB018630007D89A /* PresentationMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */; };
 		9DE1C8F11EB018630007D89A /* PresentationMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */; };
 		9DE1C8F21EB018630007D89A /* PresentationMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */; };
 		9DE1C8F31EB018630007D89A /* PresentationMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */; };
@@ -1304,9 +1292,9 @@
 				6E0FD0B91E92E57F000C6DBA /* AeroGearHttp.framework in Embed Frameworks */,
 				6E0FD0BD1E92E57F000C6DBA /* XCDYouTubeKit.framework in Embed Frameworks */,
 				6E75588E1E58D0F8003B6844 /* CoreSummit.framework in Embed Frameworks */,
-				6E0FD0B51E92E57F000C6DBA /* SwiftFoundation.framework in Embed Frameworks */,
 				6E0FD0B71E92E57F000C6DBA /* JSON.framework in Embed Frameworks */,
 				6E0FD0BB1E92E57F000C6DBA /* AeroGearOAuth2.framework in Embed Frameworks */,
+				6EB2B3871EC746E900648958 /* Predicate.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1347,7 +1335,6 @@
 		6E0B5F681D77D4DF0005F6CE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		6E0B5F6A1D77D4DF0005F6CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E0D3D7A1DC09B7C00EEB8A7 /* SummitsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SummitsViewController.swift; sourceTree = "<group>"; };
-		6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredicateTests.swift; sourceTree = "<group>"; };
 		6E104D2E1D1061AC00541E84 /* OpenStackSummit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenStackSummit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E104D311D1061AC00541E84 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		6E104D381D1061AC00541E84 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -1418,6 +1405,7 @@
 		6E1651951D8462AE00574CE5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; };
 		6E1748B41D37FDFA00C0F25D /* Feedback.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Feedback.storyboard; sourceTree = "<group>"; };
 		6E1748B61D37FE0D00C0F25D /* FeedbackGivenListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbackGivenListViewController.swift; sourceTree = "<group>"; };
+		6E1A5CFB1EC6D84E006E72BE /* URLExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLExtensions.swift; sourceTree = "<group>"; };
 		6E1BCFE11E35CBF100059E94 /* Group.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Group.swift; sourceTree = "<group>"; };
 		6E1BCFE91E36A3B800059E94 /* GroupJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupJSON.swift; sourceTree = "<group>"; };
 		6E1BCFED1E379F4400059E94 /* GroupManagedObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupManagedObject.swift; sourceTree = "<group>"; };
@@ -1534,6 +1522,7 @@
 		6E53B2A61D85340700641A8F /* SpeakerDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpeakerDetailViewController.swift; sourceTree = "<group>"; };
 		6E53B2A81D8534F600641A8F /* SpeakerSearchResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpeakerSearchResultsViewController.swift; sourceTree = "<group>"; };
 		6E53B2AA1D85366400641A8F /* SpeakerDetail.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SpeakerDetail.storyboard; sourceTree = "<group>"; };
+		6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONExtensions.swift; sourceTree = "<group>"; };
 		6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates13.json; sourceTree = "<group>"; };
 		6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlideJSON.swift; sourceTree = "<group>"; };
 		6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlideManagedObject.swift; sourceTree = "<group>"; };
@@ -1608,14 +1597,17 @@
 		6E7558CC1E595753003B6844 /* NSDate+MTDates.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDate+MTDates.m"; path = "../../Carthage/Checkouts/MTDates/MTDates/NSDate+MTDates.m"; sourceTree = "<group>"; };
 		6E7558CD1E595753003B6844 /* NSDateComponents+MTDates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDateComponents+MTDates.h"; path = "../../Carthage/Checkouts/MTDates/MTDates/NSDateComponents+MTDates.h"; sourceTree = "<group>"; };
 		6E7558CE1E595753003B6844 /* NSDateComponents+MTDates.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDateComponents+MTDates.m"; path = "../../Carthage/Checkouts/MTDates/MTDates/NSDateComponents+MTDates.m"; sourceTree = "<group>"; };
+		6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RawRepresentable.swift; sourceTree = "<group>"; };
 		6E761D031D8CBA53009A2AAC /* SummitDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SummitDataUpdate.swift; sourceTree = "<group>"; };
 		6E779E4C1D2581AE00A184A0 /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SWRevealViewController.h; path = ../../Carthage/Checkouts/SWRevealViewController/SWRevealController/SWRevealViewController.h; sourceTree = "<group>"; };
 		6E779E4D1D2581AE00A184A0 /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SWRevealViewController.m; path = ../../Carthage/Checkouts/SWRevealViewController/SWRevealController/SWRevealViewController.m; sourceTree = "<group>"; };
 		6E77C70C1DBE5C6B008BF684 /* ComplicationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComplicationController.swift; sourceTree = "<group>"; };
 		6E7847F01DC9224700B8AD05 /* LocationManagedObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationManagedObject.swift; sourceTree = "<group>"; };
 		6E7E18E91D490DAC009549BA /* Preference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preference.swift; sourceTree = "<group>"; };
+		6E7F770C1ECF3D040003738D /* AppReview.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppReview.swift; sourceTree = "<group>"; };
 		6E7FEA2A1D78959900B9E809 /* VenuesInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenuesInterfaceController.swift; sourceTree = "<group>"; };
 		6E7FEA2E1D78A19000B9E809 /* EventDetail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDetail.swift; sourceTree = "<group>"; };
+		6E81DE5B1EC1092C000A0806 /* MainRevealViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainRevealViewController.swift; sourceTree = "<group>"; };
 		6E8220EE1E48D0670025FE58 /* PagingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PagingTableViewController.swift; sourceTree = "<group>"; };
 		6E8220F11E48E0E50025FE58 /* WirelessNetwork.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WirelessNetwork.swift; sourceTree = "<group>"; };
 		6E8220F61E48E1BD0025FE58 /* WirelessNetworkJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WirelessNetworkJSON.swift; sourceTree = "<group>"; };
@@ -1690,6 +1682,7 @@
 		6EB1FDF21E1C073E0048045D /* TeamInvitationRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamInvitationRequest.swift; sourceTree = "<group>"; };
 		6EB1FDFF1E1D6BB90048045D /* PageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageController.swift; sourceTree = "<group>"; };
 		6EB295161DA97B0B0021C846 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
+		6EB2B3861EC746E900648958 /* Predicate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Predicate.framework; sourceTree = "<group>"; };
 		6EB3EA091D1B5158000BA5A4 /* TableViewHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewHeaderView.swift; sourceTree = "<group>"; };
 		6EB3EA0A1D1B5158000BA5A4 /* TableViewHeaderViewDark.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableViewHeaderViewDark.xib; sourceTree = "<group>"; };
 		6EB3EA0B1D1B5158000BA5A4 /* FeedbackTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbackTableViewCell.swift; sourceTree = "<group>"; };
@@ -1751,12 +1744,6 @@
 		6EDE52351D42D52D00DF4BEA /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		6EDF8C121D247DB300D8DD27 /* EventDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDetailViewController.swift; sourceTree = "<group>"; };
 		6EE74DE71DBF8E4B00616BEA /* DataUpdates7.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = DataUpdates7.json; sourceTree = "<group>"; };
-		6EE954481E92A0BC006B1330 /* Predicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Predicate.swift; sourceTree = "<group>"; };
-		6EE954491E92A0BC006B1330 /* Compound.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Compound.swift; sourceTree = "<group>"; };
-		6EE9544A1E92A0BC006B1330 /* Comparison.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Comparison.swift; sourceTree = "<group>"; };
-		6EE9544B1E92A0BC006B1330 /* Expression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Expression.swift; sourceTree = "<group>"; };
-		6EE9544C1E92A0BC006B1330 /* Value.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Value.swift; sourceTree = "<group>"; };
-		6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSPredicate.swift; sourceTree = "<group>"; };
 		6EEBAEA31D8CD6530067B228 /* DataUpdates4.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates4.json; sourceTree = "<group>"; };
 		6EEED0281E3A48AF00795B3D /* InboxViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboxViewController.swift; sourceTree = "<group>"; };
 		6EEED02A1E3A494400795B3D /* NotificationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = "<group>"; };
@@ -1818,7 +1805,6 @@
 		6EFE54E51E612BDD005EAB86 /* AeroGearHttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AeroGearHttp.framework; sourceTree = "<group>"; };
 		6EFE54E71E612BDD005EAB86 /* AeroGearOAuth2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AeroGearOAuth2.framework; sourceTree = "<group>"; };
 		6EFE54EB1E612BDD005EAB86 /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JSON.framework; sourceTree = "<group>"; };
-		6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftFoundation.framework; sourceTree = "<group>"; };
 		6EFE54F11E612BDD005EAB86 /* XCDYouTubeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCDYouTubeKit.framework; sourceTree = "<group>"; };
 		9D13D0A51EB39C3D00991DD2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		9D1CE1051DA43DCF0064B3B1 /* VenueFloor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueFloor.swift; sourceTree = "<group>"; };
@@ -1958,7 +1944,6 @@
 			files = (
 				6E11E4F81E5A122300EBA211 /* MapKit.framework in Frameworks */,
 				6E75588D1E58D0F8003B6844 /* CoreSummit.framework in Frameworks */,
-				6EFE54F31E612C7A005EAB86 /* SwiftFoundation.framework in Frameworks */,
 				6EFE54F41E612C7A005EAB86 /* JSON.framework in Frameworks */,
 				6E0FD0BC1E92E57F000C6DBA /* XCDYouTubeKit.framework in Frameworks */,
 				6EFE54F51E612C7A005EAB86 /* AeroGearHttp.framework in Frameworks */,
@@ -2103,7 +2088,6 @@
 				6E323D1D1D77189500E8C9B3 /* WebConvertible.swift */,
 				6E25291F1D591C2D00173B1F /* DataUpdate.swift */,
 				6EB1FDFF1E1D6BB90048045D /* PageController.swift */,
-				6EE954471E92A092006B1330 /* Predicate */,
 				6E74FAF01D7C992A0018633D /* Swift Extensions */,
 				6E10A5B01D106D85008CBD0C /* Requests */,
 				6E10A5A01D10678E008CBD0C /* Model */,
@@ -2121,7 +2105,6 @@
 				6E10A50F1D10672D008CBD0C /* JSONTests.swift */,
 				6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */,
 				6E10A5101D10672D008CBD0C /* CoreDataTests.swift */,
-				6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */,
 				6E52FCBA1D130553006A7302 /* StoreTests.swift */,
 				6E10A5111D10672D008CBD0C /* TestUtilities.swift */,
 				6E10A5031D1066E9008CBD0C /* Info.plist */,
@@ -2212,6 +2195,7 @@
 		6E10A5A11D1067BB008CBD0C /* JSON */ = {
 			isa = PBXGroup;
 			children = (
+				6E53C86B1EC6551E009ADC8C /* JSONExtensions.swift */,
 				9D4B1C331E85554700F98ECB /* AffiliationJSON.swift */,
 				9D4B1C2E1E8554AB00F98ECB /* AffiliationOrganizationJSON.swift */,
 				6E10A51B1D10675C008CBD0C /* CompanyJSON.swift */,
@@ -2268,6 +2252,7 @@
 				6EF7AA1B1D74C24800790ED0 /* CoreSpotlight.swift */,
 				6E3E1E6C1D769E6800F6CB29 /* UserActivity.swift */,
 				6E6179681DE7657500EED286 /* SummitManager.swift */,
+				6E1A5CFB1EC6D84E006E72BE /* URLExtensions.swift */,
 			);
 			name = Model;
 			sourceTree = "<group>";
@@ -2436,6 +2421,7 @@
 				6E3E8C271D47E64D00A29003 /* ShowVenueDetail.swift */,
 				6EC417E71D76B60000E5888C /* ShowVideo.swift */,
 				6E57DDC61E4AD22100783BA6 /* PresentPopover.swift */,
+				6E7F770C1ECF3D040003738D /* AppReview.swift */,
 			);
 			name = Extensions;
 			sourceTree = "<group>";
@@ -2601,6 +2587,7 @@
 			children = (
 				6EEEEBF81D7945D200965631 /* CollectionType.swift */,
 				6E3A53551E325EE100EA7CAF /* String.swift */,
+				6E7614D51EC7C00D008FBC8A /* RawRepresentable.swift */,
 			);
 			name = "Swift Extensions";
 			sourceTree = "<group>";
@@ -2867,19 +2854,6 @@
 			name = Speakers;
 			sourceTree = "<group>";
 		};
-		6EE954471E92A092006B1330 /* Predicate */ = {
-			isa = PBXGroup;
-			children = (
-				6EE954481E92A0BC006B1330 /* Predicate.swift */,
-				6EE954491E92A0BC006B1330 /* Compound.swift */,
-				6EE9544A1E92A0BC006B1330 /* Comparison.swift */,
-				6EE9544B1E92A0BC006B1330 /* Expression.swift */,
-				6EE9544C1E92A0BC006B1330 /* Value.swift */,
-				6EE9544D1E92A0BC006B1330 /* NSPredicate.swift */,
-			);
-			name = Predicate;
-			sourceTree = "<group>";
-		};
 		6EEED02F1E3A60E900795B3D /* Beta */ = {
 			isa = PBXGroup;
 			children = (
@@ -2931,6 +2905,8 @@
 				6EB699E31D3412B00095474D /* Protocols */,
 				6E49054C1D2ED21300D56870 /* AboutViewController.swift */,
 				6E2F49B11E4274E8001083AD /* LaunchScreenViewController.swift */,
+				6E81DE5B1EC1092C000A0806 /* MainRevealViewController.swift */,
+				6EFC99BE1D218280009FD0DA /* MenuViewController.swift */,
 				6E0D3D7A1DC09B7C00EEB8A7 /* SummitsViewController.swift */,
 				6EF12C4E1D1497C100814AD0 /* RevealTabStripViewController.swift */,
 				6E2538231D1A1049003E3400 /* ScheduleViewController.swift */,
@@ -2942,7 +2918,6 @@
 				6EDF8C121D247DB300D8DD27 /* EventDetailViewController.swift */,
 				6EF24DFC1E8C55080081D939 /* FeedbackViewController.swift */,
 				6E1748B61D37FE0D00C0F25D /* FeedbackGivenListViewController.swift */,
-				6EFC99BE1D218280009FD0DA /* MenuViewController.swift */,
 				6EFC6E641D2300260087057A /* VenuesViewController.swift */,
 				6E313C171D4123AE005132DA /* VenueListViewController.swift */,
 				6E313C1F1D413254005132DA /* VenueDetailViewController.swift */,
@@ -3007,7 +2982,7 @@
 		6EFE54E41E612BDD005EAB86 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */,
+				6EB2B3861EC746E900648958 /* Predicate.framework */,
 				6EFE54EB1E612BDD005EAB86 /* JSON.framework */,
 				6EFE54E51E612BDD005EAB86 /* AeroGearHttp.framework */,
 				6EFE54E71E612BDD005EAB86 /* AeroGearOAuth2.framework */,
@@ -3358,17 +3333,23 @@
 				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = OpenStack;
 				TargetAttributes = {
+					6E0B5EB21D77C8950005F6CE = {
+						LastSwiftMigration = 0830;
+					};
 					6E0B5F4E1D77D4DE0005F6CE = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 775U6X6R5M;
+						LastSwiftMigration = 0830;
 					};
 					6E0B5F5A1D77D4DF0005F6CE = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 775U6X6R5M;
+						LastSwiftMigration = 0830;
 					};
 					6E104D2D1D1061AC00541E84 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 775U6X6R5M;
+						LastSwiftMigration = 0830;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -3383,13 +3364,16 @@
 					};
 					6E10A4F01D1066E9008CBD0C = {
 						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 0830;
 					};
 					6E10A4F91D1066E9008CBD0C = {
 						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 0830;
 					};
 					6E65D2031E4F78D100F8F582 = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = 775U6X6R5M;
+						LastSwiftMigration = 0830;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.iOS = {
@@ -3403,7 +3387,7 @@
 					6E75586C1E58C62B003B6844 = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = 775U6X6R5M;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 0830;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.Maps.Mac = {
@@ -3417,6 +3401,7 @@
 					6E9F28EE1D7C903E002B7C7A = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 775U6X6R5M;
+						LastSwiftMigration = 0830;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.iOS = {
@@ -3752,10 +3737,10 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/../Carthage/Build/WatchOS/SwiftFoundation.framework",
 				"$(SRCROOT)/../Carthage/Build/WatchOS/JSON.framework",
 				"$(SRCROOT)/../Carthage/Build/WatchOS/AeroGearHttp.framework",
 				"$(SRCROOT)/../Carthage/Build/WatchOS/AeroGearOAuth2.framework",
+				"$(SRCROOT)/../Carthage/Build/WatchOS/Predicate.framework",
 			);
 			name = "Copy Frameworks";
 			outputPaths = (
@@ -3840,13 +3825,13 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/../Carthage/Build/tvOS/SwiftFoundation.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/JSON.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/XCDYouTubeKit.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/AeroGearHttp.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/AeroGearOAuth2.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/Rswift.framework",
 				"$(SRCROOT)/../Carthage/Build/tvOS/Haneke.framework",
+				"$(SRCROOT)/../Carthage/Build/tvOS/Predicate.framework",
 			);
 			name = "Copy Frameworks";
 			outputPaths = (
@@ -3889,7 +3874,6 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/../Carthage/Build/iOS/SwiftFoundation.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/JSON.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Rswift.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Haneke.framework",
@@ -3902,10 +3886,10 @@
 				"$(SRCROOT)/../Carthage/Build/iOS/JGProgressHUD.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/MTDates.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Cosmos.framework",
-				"$(SRCROOT)/../Carthage/Build/iOS/AHKActionSheet.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/ImageSlideshow.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/XCDYouTubeKit.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/SlackTextViewController.framework",
+				"$(SRCROOT)/../Carthage/Build/iOS/Predicate.framework",
 			);
 			name = "Copy Frameworks";
 			outputPaths = (
@@ -3948,17 +3932,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6E919B4F1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
 				6EBC48F91E1309790077806B /* FaultJSON.swift in Sources */,
 				6E1BCFEC1E36A3B800059E94 /* GroupJSON.swift in Sources */,
 				6E0B5EB51D77C8950005F6CE /* NonConfirmedAttendee.swift in Sources */,
-				6EA38A821DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
 				6EB1FDE91E1A9C280048045D /* TeamInvitation.swift in Sources */,
 				6EF4F85D1DC8CAED00D31A99 /* EventManagedObject.swift in Sources */,
 				6E730B941DA2E40C005E486B /* Page.swift in Sources */,
 				6E0B5EB61D77C8950005F6CE /* Event.swift in Sources */,
 				6E6FD17C1D7A1A24003D13D7 /* Production.swift in Sources */,
 				6E6FD17D1D7A1A24003D13D7 /* Staging.swift in Sources */,
+				6E7614DB1EC7CF37008FBC8A /* DataUpdatePoller.swift in Sources */,
 				6EB1FDF11E1AF9F50048045D /* TeamInvitationJSON.swift in Sources */,
 				6E0B5EB71D77C8950005F6CE /* VenueRoom.swift in Sources */,
 				6EEED03F1E3BCB5E00795B3D /* NotificationManagedObject.swift in Sources */,
@@ -3968,7 +3951,6 @@
 				6E0B5EBF1D77C8950005F6CE /* ImageJSON.swift in Sources */,
 				6E3D4D011E12D44A00D542CD /* TeamMember.swift in Sources */,
 				6E8220F91E48E1BD0025FE58 /* WirelessNetworkJSON.swift in Sources */,
-				6EE9545D1E92A0BC006B1330 /* Expression.swift in Sources */,
 				6E0B5EC01D77C8950005F6CE /* EventTypeJSON.swift in Sources */,
 				6EF4F8811DC9296100D31A99 /* VenueFloorManagedObject.swift in Sources */,
 				6E982E451E15A93800ECB76E /* TeamMessageRequest.swift in Sources */,
@@ -3978,21 +3960,17 @@
 				6E61796D1DE7920E00EED286 /* SummitsRequest.swift in Sources */,
 				6E488F5F1DD1107500EA6B0F /* EntityController.swift in Sources */,
 				6E0B5EC41D77C8950005F6CE /* ErrorValue.swift in Sources */,
-				6E0B5EC51D77C8950005F6CE /* PresentationDataUpdate.swift in Sources */,
 				6E3D4D051E12D45400D542CD /* TeamMessage.swift in Sources */,
 				6E0B5EC61D77C8950005F6CE /* Company.swift in Sources */,
 				6EBC48F11E12F7D50077806B /* TeamMessageManagedObject.swift in Sources */,
 				9DE1C8F31EB018630007D89A /* PresentationMaterial.swift in Sources */,
-				6E93D4451D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
 				9D4B1C3C1E85635200F98ECB /* AffiliationOrganizationManagedObject.swift in Sources */,
 				6E0B5EC71D77C8950005F6CE /* TrackGroup.swift in Sources */,
-				6EA38A7E1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
 				6E0B5EC91D77C8950005F6CE /* Tag.swift in Sources */,
 				6EF4F8751DC9233F00D31A99 /* VenueManagedObject.swift in Sources */,
 				9D4B1C281E84B05F00F98ECB /* AffiliationOrganization.swift in Sources */,
 				9D4B1C321E8554AB00F98ECB /* AffiliationOrganizationJSON.swift in Sources */,
 				6E0B5ECC1D77C8950005F6CE /* EventDataUpdate.swift in Sources */,
-				9D6AADB41DBE58040057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
 				6E0B5ECD1D77C8950005F6CE /* Speaker.swift in Sources */,
 				6E0B5ECE1D77C8950005F6CE /* Summit.swift in Sources */,
 				6EBC48F51E12FA1A0077806B /* Fault.swift in Sources */,
@@ -4002,17 +3980,15 @@
 				6E0B5ED21D77C8950005F6CE /* VenueRoomJSON.swift in Sources */,
 				6E2D9FF81DC9D2FE0015C588 /* AttendeeManagedObject.swift in Sources */,
 				6E0B5ED41D77C8950005F6CE /* CompanyJSON.swift in Sources */,
+				6E7614DE1EC8122C008FBC8A /* DataUpdateRequest.swift in Sources */,
 				6E0B5ED51D77C8950005F6CE /* TrackGroupJSON.swift in Sources */,
 				6E1BCFF01E379F4400059E94 /* GroupManagedObject.swift in Sources */,
-				6E0B5ED91D77C8950005F6CE /* EventDataUpdateJSON.swift in Sources */,
 				6E8220FE1E48E2BA0025FE58 /* WirelessNetworkManagedObject.swift in Sources */,
 				6E0B5EDA1D77C8950005F6CE /* TrackJSON.swift in Sources */,
 				6E1BCFF41E37A61200059E94 /* MemberRequest.swift in Sources */,
-				6EE954591E92A0BC006B1330 /* Comparison.swift in Sources */,
 				6EF4F87D1DC928D700D31A99 /* ImageManagedObject.swift in Sources */,
 				6E0B5EDB1D77C8950005F6CE /* FeedbackJSON.swift in Sources */,
 				6E0B5EDD1D77C8950005F6CE /* LocationJSON.swift in Sources */,
-				6EA38A7A1DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
 				6E0B5EDE1D77C8950005F6CE /* Configuration.swift in Sources */,
 				9D4B1C371E85554700F98ECB /* AffiliationJSON.swift in Sources */,
 				6E2D9FF01DC9B0F50015C588 /* VideoManagedObject.swift in Sources */,
@@ -4028,9 +4004,7 @@
 				6E8D109B1DF87F3B00A0BBDC /* Team.swift in Sources */,
 				6EF4F86D1DC8D1D300D31A99 /* CoreDataDecodable.swift in Sources */,
 				6E0B5EE01D77C8950005F6CE /* Venue.swift in Sources */,
-				6E5D05C81D8CBC9600451639 /* SummitDataUpdate.swift in Sources */,
 				6E2D9FEC1DC9B0D40015C588 /* TagManagedObject.swift in Sources */,
-				9D6AADB11DBE57FD0057888E /* VenueRoomDataUpdate.swift in Sources */,
 				6EEEEBFA1D7945DB00965631 /* CollectionType.swift in Sources */,
 				6E0B5EE11D77C8950005F6CE /* TicketTypeJSON.swift in Sources */,
 				6E0B5EE41D77C8950005F6CE /* SummitJSON.swift in Sources */,
@@ -4049,46 +4023,39 @@
 				6E0B5EED1D77C8950005F6CE /* Unique.swift in Sources */,
 				6E2D9FD41DC98E330015C588 /* PresentationManagedObject.swift in Sources */,
 				6EF4F86A1DC8D1D300D31A99 /* CoreDataEncodable.swift in Sources */,
+				6E793E711EC4BCE900C636AE /* LinkJSON.swift in Sources */,
 				6EF4F8711DC920B800D31A99 /* EventTypeManagedObject.swift in Sources */,
 				6E0B5EF01D77C8950005F6CE /* Define.swift in Sources */,
 				6E99B8AC1DC7D68F009CE28D /* Model.xcdatamodeld in Sources */,
 				6E3A53581E325EE100EA7CAF /* String.swift in Sources */,
 				6E0B5EF21D77C8950005F6CE /* Store.swift in Sources */,
-				6E93D4491D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
+				6E7614E11EC81246008FBC8A /* EventScheduleRequest.swift in Sources */,
+				6E7614D91EC7C00D008FBC8A /* RawRepresentable.swift in Sources */,
 				6E1C8AD01E4EBE6400BE8BC9 /* FavoriteEventRequest.swift in Sources */,
 				6E0B5EF31D77C8950005F6CE /* Named.swift in Sources */,
 				6E3D4D091E12DB3400D542CD /* TeamMemberManagedObject.swift in Sources */,
 				9D4B1C2D1E84B09100F98ECB /* Affiliation.swift in Sources */,
 				9DABFF961DA6A75E00B3101A /* VenueFloorJSON.swift in Sources */,
+				6E53C8701EC656F2009ADC8C /* JSONExtensions.swift in Sources */,
 				6E0B5EF41D77C8950005F6CE /* SummitType.swift in Sources */,
 				6E0B5EF51D77C8950005F6CE /* Person.swift in Sources */,
 				6E0B5EF71D77C8950005F6CE /* TagJSON.swift in Sources */,
 				6E7847F31DC9224700B8AD05 /* LocationManagedObject.swift in Sources */,
-				6E919B4B1E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
 				6E0B5EF91D77C8950005F6CE /* TimeZoneJSON.swift in Sources */,
-				6EE954511E92A0BC006B1330 /* Predicate.swift in Sources */,
 				6EBC49011E13902A0077806B /* TeamMemberJSON.swift in Sources */,
-				6E55B50C1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */,
-				6EE954611E92A0BC006B1330 /* Value.swift in Sources */,
 				6E982E411E15A92F00ECB76E /* TeamMemberRequest.swift in Sources */,
-				6EA38A861DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
-				6EA38A701DCB059400B703CE /* DataUpdate.swift in Sources */,
 				6E0B5EFA1D77C8950005F6CE /* Feedback.swift in Sources */,
 				6E0B5EFB1D77C8950005F6CE /* PresentationJSON.swift in Sources */,
-				6EA38A761DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
 				6E0B5EFC1D77C8950005F6CE /* AttendeeJSON.swift in Sources */,
 				6E55B4F81EBCB025003AAFE6 /* SlideJSON.swift in Sources */,
 				9D4B1C411E8563B200F98ECB /* AffiliationManagedObject.swift in Sources */,
-				6EEBAEA71D8CD7A30067B228 /* SummitDataUpdateJSON.swift in Sources */,
 				6E0B5F011D77C8950005F6CE /* EventJSON.swift in Sources */,
 				6E0B5F041D77C8950005F6CE /* Location.swift in Sources */,
 				6E0B5F071D77C8950005F6CE /* Environment.swift in Sources */,
 				6E2D9FFC1DC9D4320015C588 /* FeedbackManagedObject.swift in Sources */,
 				6EF4F8551DC8C68700D31A99 /* SummitManagedObject.swift in Sources */,
-				6E919B531E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
 				6E2D9FE81DC9A5B90015C588 /* TrackGroupManagedObject.swift in Sources */,
 				6EF4F8591DC8C7D600D31A99 /* CompanyManagedObject.swift in Sources */,
-				6EE954551E92A0BC006B1330 /* Compound.swift in Sources */,
 				6EB1FDF51E1C073E0048045D /* TeamInvitationRequest.swift in Sources */,
 				6EBC49051E1394FE0077806B /* TeamMessageJSON.swift in Sources */,
 				9DEF13101EA67153001798D4 /* Level.swift in Sources */,
@@ -4096,14 +4063,33 @@
 				6E0B5F0A1D77C8950005F6CE /* Video.swift in Sources */,
 				6E1BCFF11E37A5FE00059E94 /* MemberJSON.swift in Sources */,
 				6EF4F8791DC9234A00D31A99 /* VenueRoomManagedObject.swift in Sources */,
-				6E0B5F0B1D77C8950005F6CE /* PresentationDataUpdateJSON.swift in Sources */,
 				6E982E3D1E158DC800ECB76E /* TeamRequest.swift in Sources */,
 				6E2D9FD81DC994210015C588 /* TrackManagedObject.swift in Sources */,
+				6E7614E01EC81244008FBC8A /* FeedbackRequest.swift in Sources */,
 				6E959E1B1DF61557002981FD /* TeamManagedObject.swift in Sources */,
 				6E0B5F0C1D77C8950005F6CE /* TimeZone.swift in Sources */,
 				6E0B5F0E1D77C8950005F6CE /* Track.swift in Sources */,
 				6E0B5F101D77C8950005F6CE /* Image.swift in Sources */,
-				6EE954651E92A0BC006B1330 /* NSPredicate.swift in Sources */,
+				6E7614DF1EC8123D008FBC8A /* TicketOrderRequest.swift in Sources */,
+				6E919B4F1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
+				6E93D4451D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
+				6E93D4491D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
+				6EA38A7E1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
+				6E0B5ED91D77C8950005F6CE /* EventDataUpdateJSON.swift in Sources */,
+				6EA38A7A1DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
+				6E5D05C81D8CBC9600451639 /* SummitDataUpdate.swift in Sources */,
+				6EEBAEA71D8CD7A30067B228 /* SummitDataUpdateJSON.swift in Sources */,
+				6EA38A761DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
+				6E7614DD1EC811FD008FBC8A /* DataUpdateJSON.swift in Sources */,
+				6E919B4B1E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
+				6E919B531E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
+				9D6AADB11DBE57FD0057888E /* VenueRoomDataUpdate.swift in Sources */,
+				6EA38A861DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
+				9D6AADB41DBE58040057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
+				6E0B5EC51D77C8950005F6CE /* PresentationDataUpdate.swift in Sources */,
+				6EA38A821DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
+				6E0B5F0B1D77C8950005F6CE /* PresentationDataUpdateJSON.swift in Sources */,
+				6EA38A701DCB059400B703CE /* DataUpdate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4114,8 +4100,6 @@
 				6E574B6C1DCB2DFB00AE4837 /* CoreDataTests.swift in Sources */,
 				6E0B5F241D77C8AB0005F6CE /* TestUtilities.swift in Sources */,
 				6E0B5F251D77C8AB0005F6CE /* JSONTests.swift in Sources */,
-				6E172D7A1EBCCBE300C9CAF3 /* ModelTests.swift in Sources */,
-				6E0FD0B31E92A7DB000C6DBA /* PredicateTests.swift in Sources */,
 				6E0B5F261D77C8AB0005F6CE /* StoreTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4164,6 +4148,7 @@
 				6EFC6E651D2300260087057A /* VenuesViewController.swift in Sources */,
 				6E00D1A71D1C2F1100278274 /* ScheduleViewController.swift in Sources */,
 				6E313C181D4123AE005132DA /* VenueListViewController.swift in Sources */,
+				6E1A5CFC1EC6D84E006E72BE /* URLExtensions.swift in Sources */,
 				6EA6FD341D956C4D009B66B0 /* DetailImageTableViewCell.swift in Sources */,
 				6E57DDC91E4ADCB300783BA6 /* EventViewController.swift in Sources */,
 				6EDE52141D429F8700DF4BEA /* VenueLocationDetailViewController.swift in Sources */,
@@ -4182,6 +4167,7 @@
 				6E3E8C251D47D68100A29003 /* NSDate+MTDates.m in Sources */,
 				6EB752641D18B77300BC294D /* ErrorAlert.swift in Sources */,
 				6EDA4AC01DFA1CEB00ADF96D /* TeamMessagesViewController.swift in Sources */,
+				6E81DE5C1EC1092C000A0806 /* MainRevealViewController.swift in Sources */,
 				6E1748B71D37FE0D00C0F25D /* FeedbackGivenListViewController.swift in Sources */,
 				6E8220EF1E48D0670025FE58 /* PagingTableViewController.swift in Sources */,
 				6E6AB19E1D650B8C00E940BE /* YouTubeThumbnail.swift in Sources */,
@@ -4202,6 +4188,7 @@
 				6EB3EA111D1B520B000BA5A4 /* FeedbackTableViewCell.swift in Sources */,
 				6E25384B1D1AF416003E3400 /* Filter.swift in Sources */,
 				6E2D18541E29417F0095508A /* PushNotificationManager.swift in Sources */,
+				6E7F770D1ECF3D040003738D /* AppReview.swift in Sources */,
 				6EF3A88E1E47095100CD85EF /* TableViewController.swift in Sources */,
 				6EF12C681D149CA600814AD0 /* R.generated.swift in Sources */,
 				6EF3A8911E470BEC00CD85EF /* CollectionViewController.swift in Sources */,
@@ -4260,8 +4247,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6E2D9FE61DC9A5B90015C588 /* TrackGroupManagedObject.swift in Sources */,
+				6E99B8AA1DC7D68F009CE28D /* Model.xcdatamodeld in Sources */,
+				9DEF130D1EA67153001798D4 /* Level.swift in Sources */,
 				6E1BCFEA1E36A3B800059E94 /* GroupJSON.swift in Sources */,
+				6E2529221D5924D300173B1F /* DataUpdateJSON.swift in Sources */,
 				6E10A56E1D10675D008CBD0C /* NonConfirmedAttendee.swift in Sources */,
 				6E10A5601D10675D008CBD0C /* Event.swift in Sources */,
 				6E10A59E1D10675D008CBD0C /* VenueRoom.swift in Sources */,
@@ -4271,36 +4260,28 @@
 				6E10A5B21D106DF1008CBD0C /* SummitRequest.swift in Sources */,
 				6ECA1CD21D4EC46C00806924 /* Session.swift in Sources */,
 				6E2537CA1D199D0C003E3400 /* Login.swift in Sources */,
-				6E2529221D5924D300173B1F /* DataUpdateJSON.swift in Sources */,
 				6EF4F87B1DC928D700D31A99 /* ImageManagedObject.swift in Sources */,
 				6E2D9FEA1DC9B0D40015C588 /* TagManagedObject.swift in Sources */,
 				6EBC48F71E1309790077806B /* FaultJSON.swift in Sources */,
-				6E919B511E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
 				6E10A5671D10675D008CBD0C /* ImageJSON.swift in Sources */,
 				6E10A5631D10675D008CBD0C /* EventTypeJSON.swift in Sources */,
 				6E10A56F1D10675D008CBD0C /* NonConfirmedAttendeeJSON.swift in Sources */,
 				6EF4F86B1DC8D1D300D31A99 /* CoreDataDecodable.swift in Sources */,
 				6E10A58C1D10675D008CBD0C /* Attendee.swift in Sources */,
 				6EFC6E691D2322E70087057A /* EventScheduleRequest.swift in Sources */,
-				9DEF130D1EA67153001798D4 /* Level.swift in Sources */,
 				6E10A55F1D10675D008CBD0C /* ErrorValue.swift in Sources */,
-				6E570A361D67753D00189992 /* PresentationDataUpdate.swift in Sources */,
-				9D6AADB21DBE58030057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
 				6EF4F8651DC8D1D300D31A99 /* CoreDataExtensions.swift in Sources */,
 				9D4B1C2F1E8554AB00F98ECB /* AffiliationOrganizationJSON.swift in Sources */,
 				6E10A55D1D10675D008CBD0C /* Company.swift in Sources */,
 				6E6FD17B1D7A1A24003D13D7 /* Staging.swift in Sources */,
 				6EB1FDE71E1A9C280048045D /* TeamInvitation.swift in Sources */,
 				6EF4F8771DC9234A00D31A99 /* VenueRoomManagedObject.swift in Sources */,
-				6E55B5041EBCBCD6003AAFE6 /* Link.swift in Sources */,
-				9DE1C8F01EB018630007D89A /* PresentationMaterial.swift in Sources */,
-				6EEBAEA91D8CD7A40067B228 /* SummitDataUpdateJSON.swift in Sources */,
 				6E10A5981D10675D008CBD0C /* TrackGroup.swift in Sources */,
 				6E2D9FD21DC98E330015C588 /* PresentationManagedObject.swift in Sources */,
 				6EBC49071E1398F10077806B /* ListMembersRequest.swift in Sources */,
 				9D4B1C3E1E8563B200F98ECB /* AffiliationManagedObject.swift in Sources */,
-				6EE954561E92A0BC006B1330 /* Comparison.swift in Sources */,
 				6E730B921DA2E40A005E486B /* Page.swift in Sources */,
+				6E793E6D1EC4BA2E00C636AE /* Link.swift in Sources */,
 				6EF4F86F1DC920B800D31A99 /* EventTypeManagedObject.swift in Sources */,
 				6E10A5911D10675D008CBD0C /* Tag.swift in Sources */,
 				6EBC48FF1E13902A0077806B /* TeamMemberJSON.swift in Sources */,
@@ -4309,27 +4290,23 @@
 				6E10A56B1D10675D008CBD0C /* Member.swift in Sources */,
 				6E10A56C1D10675D008CBD0C /* MemberJSON.swift in Sources */,
 				6E61796B1DE7920E00EED286 /* SummitsRequest.swift in Sources */,
-				6E570A341D6771CF00189992 /* EventDataUpdate.swift in Sources */,
-				6E55B50E1EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */,
 				9DABFF941DA6A75B00B3101A /* VenueFloorJSON.swift in Sources */,
 				6E10A5731D10675D008CBD0C /* Speaker.swift in Sources */,
-				6EE9545E1E92A0BC006B1330 /* Value.swift in Sources */,
 				6E10A58B1D10675D008CBD0C /* Summit.swift in Sources */,
 				6E2D9FEE1DC9B0F50015C588 /* VideoManagedObject.swift in Sources */,
 				9D4B1C391E85635200F98ECB /* AffiliationOrganizationManagedObject.swift in Sources */,
+				6E7614D61EC7C00D008FBC8A /* RawRepresentable.swift in Sources */,
 				6E10A5931D10675D008CBD0C /* TicketType.swift in Sources */,
-				6EE9545A1E92A0BC006B1330 /* Expression.swift in Sources */,
 				6E10A5901D10675D008CBD0C /* SummitTypeJSON.swift in Sources */,
+				6E793E6E1EC4BB2A00C636AE /* LinkManagedObject.swift in Sources */,
 				6E982E3B1E158DC800ECB76E /* TeamRequest.swift in Sources */,
-				6E10A59F1D10675D008CBD0C /* VenueRoomJSON.swift in Sources */,
-				6EA38A741DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
 				6E10A55E1D10675D008CBD0C /* CompanyJSON.swift in Sources */,
 				6E3D4D031E12D45400D542CD /* TeamMessage.swift in Sources */,
 				6E10A5991D10675D008CBD0C /* TrackGroupJSON.swift in Sources */,
 				6EFC6E671D2320610087057A /* Reachability.swift in Sources */,
 				6EF4F85F1DC8CE1600D31A99 /* Entity.swift in Sources */,
 				9DABFF931DA6A74D00B3101A /* VenueFloor.swift in Sources */,
-				6E570A391D6775C700189992 /* EventDataUpdateJSON.swift in Sources */,
+				6E10A59F1D10675D008CBD0C /* VenueRoomJSON.swift in Sources */,
 				6E10A59A1D10675D008CBD0C /* TrackJSON.swift in Sources */,
 				6E3A53561E325EE100EA7CAF /* String.swift in Sources */,
 				6EB1FDEF1E1AF9F50048045D /* TeamInvitationJSON.swift in Sources */,
@@ -4348,31 +4325,24 @@
 				9D4B1C2A1E84B09100F98ECB /* Affiliation.swift in Sources */,
 				6EF4F8681DC8D1D300D31A99 /* CoreDataEncodable.swift in Sources */,
 				6E10A59C1D10675D008CBD0C /* Venue.swift in Sources */,
-				9D6AADAF1DBE57FA0057888E /* VenueRoomDataUpdate.swift in Sources */,
 				6E10A5941D10675D008CBD0C /* TicketTypeJSON.swift in Sources */,
 				6EB1FE001E1D6BB90048045D /* PageController.swift in Sources */,
 				6EF2FB391D524BCC00BF9EDE /* TicketOrderRequest.swift in Sources */,
 				6E10A58E1D10675D008CBD0C /* SummitJSON.swift in Sources */,
 				6E2D9FDE1DC9A5730015C588 /* SummitTypeManagedObject.swift in Sources */,
-				6EE954521E92A0BC006B1330 /* Compound.swift in Sources */,
 				6E6FD17A1D7A1A24003D13D7 /* Production.swift in Sources */,
-				6E99B8AA1DC7D68F009CE28D /* Model.xcdatamodeld in Sources */,
 				6E8220F21E48E0E50025FE58 /* WirelessNetwork.swift in Sources */,
 				6E323D1E1D77189500E8C9B3 /* WebConvertible.swift in Sources */,
 				6E8220F71E48E1BD0025FE58 /* WirelessNetworkJSON.swift in Sources */,
-				6EA38A841DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
 				9D4B1C341E85554700F98ECB /* AffiliationJSON.swift in Sources */,
 				6E2D9FE21DC9A5960015C588 /* TicketTypeManagedObject.swift in Sources */,
 				6E10A5711D10675D008CBD0C /* Presentation.swift in Sources */,
-				6E919B4D1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
-				9DE1C8EB1EAFA20B0007D89A /* Slide.swift in Sources */,
+				6E53C86D1EC656EF009ADC8C /* JSONExtensions.swift in Sources */,
 				6EBC48EF1E12F7D50077806B /* TeamMessageManagedObject.swift in Sources */,
-				6E919B491E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
 				6E8D10991DF87F3B00A0BBDC /* Team.swift in Sources */,
 				6EB1FDEB1E1AB1A20048045D /* TeamInvitationManagedObject.swift in Sources */,
 				6E10A5741D10675D008CBD0C /* SpeakerJSON.swift in Sources */,
 				6E730B951DA2F0CB005E486B /* PageJSON.swift in Sources */,
-				6E5D05C61D8CBC9500451639 /* SummitDataUpdate.swift in Sources */,
 				6E10A59D1D10675D008CBD0C /* VenueJSON.swift in Sources */,
 				6ECA1CD01D4EC09400806924 /* MemberRequest.swift in Sources */,
 				6E959E191DF61557002981FD /* TeamManagedObject.swift in Sources */,
@@ -4380,6 +4350,7 @@
 				6EBC48FB1E138EB20077806B /* TeamJSON.swift in Sources */,
 				6E2D9FD61DC994210015C588 /* TrackManagedObject.swift in Sources */,
 				6EF4F87F1DC9296100D31A99 /* VenueFloorManagedObject.swift in Sources */,
+				6E793E6C1EC4BA2A00C636AE /* Slide.swift in Sources */,
 				6E10A59B1D10675D008CBD0C /* Unique.swift in Sources */,
 				6E1C8ACE1E4EBE6400BE8BC9 /* FavoriteEventRequest.swift in Sources */,
 				6E57DB701D11BE8B00F5574C /* Define.swift in Sources */,
@@ -4388,6 +4359,7 @@
 				6E10A5AF1D106C9A008CBD0C /* Store.swift in Sources */,
 				6EBC49031E1394FE0077806B /* TeamMessageJSON.swift in Sources */,
 				6E488F5D1DD1107500EA6B0F /* EntityController.swift in Sources */,
+				6E793E6B1EC4B9F700C636AE /* PresentationMaterial.swift in Sources */,
 				6E10A56D1D10675D008CBD0C /* Named.swift in Sources */,
 				6EB1FDF31E1C073E0048045D /* TeamInvitationRequest.swift in Sources */,
 				6E10A58F1D10675D008CBD0C /* SummitType.swift in Sources */,
@@ -4396,35 +4368,46 @@
 				6E10A5921D10675D008CBD0C /* TagJSON.swift in Sources */,
 				6E10A5961D10675D008CBD0C /* TimeZoneJSON.swift in Sources */,
 				6E8220FC1E48E2BA0025FE58 /* WirelessNetworkManagedObject.swift in Sources */,
-				6EA38A781DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
 				6E10A5641D10675D008CBD0C /* Feedback.swift in Sources */,
 				6E10A5721D10675D008CBD0C /* PresentationJSON.swift in Sources */,
 				6E10A58D1D10675D008CBD0C /* AttendeeJSON.swift in Sources */,
-				6E2529201D591C2D00173B1F /* DataUpdate.swift in Sources */,
-				6E93D4471D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
 				6E982E431E15A93800ECB76E /* TeamMessageRequest.swift in Sources */,
-				6E93D4431D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
-				6EA38A7C1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
+				6E2D9FE61DC9A5B90015C588 /* TrackGroupManagedObject.swift in Sources */,
 				6E066D9D1D356A2F005A8D2D /* FeedbackRequest.swift in Sources */,
-				6E55B5091EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */,
-				6EE9544E1E92A0BC006B1330 /* Predicate.swift in Sources */,
-				6EA38A801DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
 				6EEED03D1E3BCB5E00795B3D /* NotificationManagedObject.swift in Sources */,
 				6E10A5611D10675D008CBD0C /* EventJSON.swift in Sources */,
-				6EDAF38E1D5BB22700B75B28 /* DataUpdatePoller.swift in Sources */,
 				6E10A5691D10675D008CBD0C /* Location.swift in Sources */,
-				6E25291E1D58E6F200173B1F /* DataUpdateRequest.swift in Sources */,
 				6E7847F11DC9224700B8AD05 /* LocationManagedObject.swift in Sources */,
 				6E087DCE1D4A5DE900CDC935 /* Environment.swift in Sources */,
 				6E2BB3A81D63A57E0085C876 /* Video.swift in Sources */,
 				9D4B1C251E84B05D00F98ECB /* AffiliationOrganization.swift in Sources */,
 				6EF4F8531DC8C68700D31A99 /* SummitManagedObject.swift in Sources */,
-				6E570A3B1D6775D200189992 /* PresentationDataUpdateJSON.swift in Sources */,
 				6E10A5951D10675D008CBD0C /* TimeZone.swift in Sources */,
 				6E55B4FA1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */,
 				6E10A5971D10675D008CBD0C /* Track.swift in Sources */,
 				6E10A5661D10675D008CBD0C /* Image.swift in Sources */,
-				6EE954621E92A0BC006B1330 /* NSPredicate.swift in Sources */,
+				6E5D05C61D8CBC9500451639 /* SummitDataUpdate.swift in Sources */,
+				6EEBAEA91D8CD7A40067B228 /* SummitDataUpdateJSON.swift in Sources */,
+				6EA38A741DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
+				6E570A341D6771CF00189992 /* EventDataUpdate.swift in Sources */,
+				6E570A391D6775C700189992 /* EventDataUpdateJSON.swift in Sources */,
+				6EA38A781DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
+				6E919B491E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
+				6E919B4D1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
+				6E919B511E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
+				9D6AADAF1DBE57FA0057888E /* VenueRoomDataUpdate.swift in Sources */,
+				6E793E701EC4BCE100C636AE /* LinkJSON.swift in Sources */,
+				9D6AADB21DBE58030057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
+				6EA38A841DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
+				6E93D4431D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
+				6E93D4471D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
+				6EA38A7C1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
+				6E570A361D67753D00189992 /* PresentationDataUpdate.swift in Sources */,
+				6E570A3B1D6775D200189992 /* PresentationDataUpdateJSON.swift in Sources */,
+				6EA38A801DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
+				6E2529201D591C2D00173B1F /* DataUpdate.swift in Sources */,
+				6EDAF38E1D5BB22700B75B28 /* DataUpdatePoller.swift in Sources */,
+				6E25291E1D58E6F200173B1F /* DataUpdateRequest.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4435,8 +4418,6 @@
 				6E574B6E1DCB2DFD00AE4837 /* CoreDataTests.swift in Sources */,
 				6E10A5141D10672D008CBD0C /* TestUtilities.swift in Sources */,
 				6E10A5121D10672D008CBD0C /* JSONTests.swift in Sources */,
-				6E172D771EBCCBE000C9CAF3 /* ModelTests.swift in Sources */,
-				6E0FD0B01E92A7DB000C6DBA /* PredicateTests.swift in Sources */,
 				6E52FCBB1D130553006A7302 /* StoreTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4450,7 +4431,6 @@
 				6E1BCFF21E37A61000059E94 /* MemberRequest.swift in Sources */,
 				6E2923A71D7AF8C900D14F0A /* NonConfirmedAttendee.swift in Sources */,
 				6E3D4D041E12D45400D542CD /* TeamMessage.swift in Sources */,
-				6EE9545C1E92A0BC006B1330 /* Expression.swift in Sources */,
 				6E2923A81D7AF8C900D14F0A /* Event.swift in Sources */,
 				6E2923A91D7AF8C900D14F0A /* VenueRoom.swift in Sources */,
 				6E55B4FC1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */,
@@ -4459,21 +4439,17 @@
 				6E2923AD1D7AF8C900D14F0A /* SummitRequest.swift in Sources */,
 				6E2923AE1D7AF8C900D14F0A /* Session.swift in Sources */,
 				6E2D9FEB1DC9B0D40015C588 /* TagManagedObject.swift in Sources */,
-				6E2923B11D7AF8C900D14F0A /* DataUpdateJSON.swift in Sources */,
 				6EEED03E1E3BCB5E00795B3D /* NotificationManagedObject.swift in Sources */,
-				6EA38A7D1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
 				9D4B1C311E8554AB00F98ECB /* AffiliationOrganizationJSON.swift in Sources */,
 				6E8D109A1DF87F3B00A0BBDC /* Team.swift in Sources */,
 				6E959E1A1DF61557002981FD /* TeamManagedObject.swift in Sources */,
 				6E7847F21DC9224700B8AD05 /* LocationManagedObject.swift in Sources */,
-				6EE954601E92A0BC006B1330 /* Value.swift in Sources */,
 				6E2923B21D7AF8C900D14F0A /* ImageJSON.swift in Sources */,
 				6E2923B31D7AF8C900D14F0A /* EventTypeJSON.swift in Sources */,
 				6E2923B41D7AF8C900D14F0A /* NonConfirmedAttendeeJSON.swift in Sources */,
 				6E2923B51D7AF8C900D14F0A /* Attendee.swift in Sources */,
 				6E2923B61D7AF8C900D14F0A /* EventScheduleRequest.swift in Sources */,
 				9D4B1C271E84B05E00F98ECB /* AffiliationOrganization.swift in Sources */,
-				6EA38A791DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
 				6E2923B71D7AF8C900D14F0A /* ErrorValue.swift in Sources */,
 				9D4B1C2C1E84B09100F98ECB /* Affiliation.swift in Sources */,
 				6E2923B81D7AF8C900D14F0A /* PresentationDataUpdate.swift in Sources */,
@@ -4483,9 +4459,7 @@
 				6EB1FDE81E1A9C280048045D /* TeamInvitation.swift in Sources */,
 				6EBC48F41E12FA1A0077806B /* Fault.swift in Sources */,
 				6EBC49081E1398F10077806B /* ListMembersRequest.swift in Sources */,
-				6EA38A811DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
 				6EF4F8701DC920B800D31A99 /* EventTypeManagedObject.swift in Sources */,
-				6EEBAEA81D8CD7A40067B228 /* SummitDataUpdateJSON.swift in Sources */,
 				6E1BCFE31E35CBF100059E94 /* Group.swift in Sources */,
 				6E2D9FDB1DC9944E0015C588 /* SpeakerManagedObject.swift in Sources */,
 				9D4B1C361E85554700F98ECB /* AffiliationJSON.swift in Sources */,
@@ -4495,11 +4469,9 @@
 				6E2923BD1D7AF8C900D14F0A /* Tag.swift in Sources */,
 				6E2923BE1D7AF8C900D14F0A /* Member.swift in Sources */,
 				6E2923BF1D7AF8C900D14F0A /* MemberJSON.swift in Sources */,
-				6EE954501E92A0BC006B1330 /* Predicate.swift in Sources */,
 				6E2923C01D7AF8C900D14F0A /* EventDataUpdate.swift in Sources */,
 				9DABFF951DA6A75C00B3101A /* VenueFloorJSON.swift in Sources */,
 				6EEED03A1E3BB9FA00795B3D /* Notification.swift in Sources */,
-				6E919B4E1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
 				6E2923C11D7AF8C900D14F0A /* Speaker.swift in Sources */,
 				6E2923C21D7AF8C900D14F0A /* Summit.swift in Sources */,
 				6E55B50B1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */,
@@ -4515,8 +4487,6 @@
 				9DABFF921DA6A74C00B3101A /* VenueFloor.swift in Sources */,
 				6E2D9FEF1DC9B0F50015C588 /* VideoManagedObject.swift in Sources */,
 				6E919B4A1E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
-				6EA38A851DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
-				6E2923CD1D7AF8C900D14F0A /* EventDataUpdateJSON.swift in Sources */,
 				6EB1FDF41E1C073E0048045D /* TeamInvitationRequest.swift in Sources */,
 				6E2923CE1D7AF8C900D14F0A /* TrackJSON.swift in Sources */,
 				6E2923CF1D7AF8C900D14F0A /* FeedbackJSON.swift in Sources */,
@@ -4546,8 +4516,8 @@
 				6E730B961DA2F0CB005E486B /* PageJSON.swift in Sources */,
 				6E5D05C71D8CBC9500451639 /* SummitDataUpdate.swift in Sources */,
 				6EB1FDF01E1AF9F50048045D /* TeamInvitationJSON.swift in Sources */,
-				6EE954581E92A0BC006B1330 /* Comparison.swift in Sources */,
 				6E2D9FD31DC98E330015C588 /* PresentationManagedObject.swift in Sources */,
+				6E53C86F1EC656F1009ADC8C /* JSONExtensions.swift in Sources */,
 				6E2923DF1D7AF8C900D14F0A /* VenueJSON.swift in Sources */,
 				6E61796C1DE7920E00EED286 /* SummitsRequest.swift in Sources */,
 				6E2923E11D7AF8C900D14F0A /* VideoJSON.swift in Sources */,
@@ -4561,7 +4531,6 @@
 				6E3A53571E325EE100EA7CAF /* String.swift in Sources */,
 				6E2923EA1D7AF8C900D14F0A /* Person.swift in Sources */,
 				6E2923EC1D7AF8C900D14F0A /* TagJSON.swift in Sources */,
-				6EA38A751DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
 				9D4B1C3B1E85635200F98ECB /* AffiliationOrganizationManagedObject.swift in Sources */,
 				6E55B5101EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */,
 				6E2D9FDF1DC9A5730015C588 /* SummitTypeManagedObject.swift in Sources */,
@@ -4570,35 +4539,30 @@
 				6EBC48FC1E138EB20077806B /* TeamJSON.swift in Sources */,
 				6EF4F8781DC9234A00D31A99 /* VenueRoomManagedObject.swift in Sources */,
 				6E8220F81E48E1BD0025FE58 /* WirelessNetworkJSON.swift in Sources */,
-				6E919B521E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
 				6EBC48F81E1309790077806B /* FaultJSON.swift in Sources */,
 				6E8220F31E48E0E50025FE58 /* WirelessNetwork.swift in Sources */,
 				6E2923F01D7AF8C900D14F0A /* PresentationJSON.swift in Sources */,
 				6E55B5061EBCBCD6003AAFE6 /* Link.swift in Sources */,
 				6E2923F11D7AF8C900D14F0A /* AttendeeJSON.swift in Sources */,
-				6E2923F21D7AF8C900D14F0A /* DataUpdate.swift in Sources */,
-				6E93D4481D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
 				6E1BCFEF1E379F4400059E94 /* GroupManagedObject.swift in Sources */,
 				6E93D4441D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
 				6E2923F41D7AF8C900D14F0A /* FeedbackRequest.swift in Sources */,
 				6E982E3C1E158DC800ECB76E /* TeamRequest.swift in Sources */,
 				9DE1C8F21EB018630007D89A /* PresentationMaterial.swift in Sources */,
 				9D4B1C401E8563B200F98ECB /* AffiliationManagedObject.swift in Sources */,
+				6E7614DA1EC7CF35008FBC8A /* DataUpdatePoller.swift in Sources */,
 				6E2923F61D7AF8C900D14F0A /* EventJSON.swift in Sources */,
 				6EF4F8581DC8C7D600D31A99 /* CompanyManagedObject.swift in Sources */,
 				6EF4F8801DC9296100D31A99 /* VenueFloorManagedObject.swift in Sources */,
 				6E2D9FE31DC9A5960015C588 /* TicketTypeManagedObject.swift in Sources */,
 				6E2923F91D7AF8C900D14F0A /* Location.swift in Sources */,
 				6E2923FB1D7AF8C900D14F0A /* DataUpdateRequest.swift in Sources */,
-				6EE954541E92A0BC006B1330 /* Compound.swift in Sources */,
 				6E1C8ACF1E4EBE6400BE8BC9 /* FavoriteEventRequest.swift in Sources */,
 				6E2923FC1D7AF8C900D14F0A /* Environment.swift in Sources */,
 				6EF4F85C1DC8CAEC00D31A99 /* EventManagedObject.swift in Sources */,
 				6EF4F8661DC8D1D300D31A99 /* CoreDataExtensions.swift in Sources */,
 				6E2923FF1D7AF8C900D14F0A /* Video.swift in Sources */,
-				9D6AADB31DBE58040057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
 				6E8220FD1E48E2BA0025FE58 /* WirelessNetworkManagedObject.swift in Sources */,
-				6E2924001D7AF8C900D14F0A /* PresentationDataUpdateJSON.swift in Sources */,
 				6E488F5E1DD1107500EA6B0F /* EntityController.swift in Sources */,
 				6EB1FDEC1E1AB1A20048045D /* TeamInvitationManagedObject.swift in Sources */,
 				6E2924011D7AF8C900D14F0A /* TimeZone.swift in Sources */,
@@ -4607,7 +4571,21 @@
 				6E2D9FFB1DC9D4320015C588 /* FeedbackManagedObject.swift in Sources */,
 				6EF4F87C1DC928D700D31A99 /* ImageManagedObject.swift in Sources */,
 				6E2924051D7AF8C900D14F0A /* Image.swift in Sources */,
-				6EE954641E92A0BC006B1330 /* NSPredicate.swift in Sources */,
+				6EEBAEA81D8CD7A40067B228 /* SummitDataUpdateJSON.swift in Sources */,
+				6E919B4E1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
+				6E2923CD1D7AF8C900D14F0A /* EventDataUpdateJSON.swift in Sources */,
+				6E93D4481D9AED1800E3302A /* TrackGroupDataUpdateJSON.swift in Sources */,
+				9D6AADB31DBE58040057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
+				6E2924001D7AF8C900D14F0A /* PresentationDataUpdateJSON.swift in Sources */,
+				6EA38A7D1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.swift in Sources */,
+				6EA38A791DCB1CA000B703CE /* EventDataUpdateManagedObject.swift in Sources */,
+				6EA38A811DCB1D7100B703CE /* PresentationDataUpdateManagedObject.swift in Sources */,
+				6E7614D81EC7C00D008FBC8A /* RawRepresentable.swift in Sources */,
+				6EA38A851DCB1D8100B703CE /* VenueRoomDataUpdateManagedObject.swift in Sources */,
+				6EA38A751DCB1BF900B703CE /* SummitDataUpdateManagedObject.swift in Sources */,
+				6E919B521E39C8E300FBF910 /* GroupEventDataUpdateManagedObject.swift in Sources */,
+				6E2923F21D7AF8C900D14F0A /* DataUpdate.swift in Sources */,
+				6E2923B11D7AF8C900D14F0A /* DataUpdateJSON.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4618,8 +4596,6 @@
 				6E574B6D1DCB2DFC00AE4837 /* CoreDataTests.swift in Sources */,
 				6E2924171D7AF8CC00D14F0A /* TestUtilities.swift in Sources */,
 				6E2924181D7AF8CC00D14F0A /* JSONTests.swift in Sources */,
-				6E172D791EBCCBE200C9CAF3 /* ModelTests.swift in Sources */,
-				6E0FD0B21E92A7DB000C6DBA /* PredicateTests.swift in Sources */,
 				6E2924191D7AF8CC00D14F0A /* StoreTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4653,11 +4629,9 @@
 				6E7557AD1E58C48C003B6844 /* SummitRequest.swift in Sources */,
 				6E7557AE1E58C48C003B6844 /* Session.swift in Sources */,
 				6E7557AF1E58C48C003B6844 /* Login.swift in Sources */,
-				6E7557B01E58C48C003B6844 /* DataUpdateJSON.swift in Sources */,
 				6E7557B11E58C48C003B6844 /* ImageManagedObject.swift in Sources */,
 				6E7557B21E58C48C003B6844 /* TagManagedObject.swift in Sources */,
 				6E7557B31E58C48C003B6844 /* FaultJSON.swift in Sources */,
-				6E7557B41E58C48C003B6844 /* GroupEventDataUpdateManagedObject.swift in Sources */,
 				6E7557B51E58C48C003B6844 /* ImageJSON.swift in Sources */,
 				6E7557B61E58C48C003B6844 /* EventTypeJSON.swift in Sources */,
 				6E7557B71E58C48C003B6844 /* NonConfirmedAttendeeJSON.swift in Sources */,
@@ -4667,7 +4641,6 @@
 				9DEF130E1EA67153001798D4 /* Level.swift in Sources */,
 				6E7557BB1E58C48C003B6844 /* ErrorValue.swift in Sources */,
 				6E7557BC1E58C48C003B6844 /* PresentationDataUpdate.swift in Sources */,
-				6E7557BD1E58C48C003B6844 /* VenueRoomDataUpdateJSON.swift in Sources */,
 				6E7557BE1E58C48C003B6844 /* CoreDataExtensions.swift in Sources */,
 				9D4B1C301E8554AB00F98ECB /* AffiliationOrganizationJSON.swift in Sources */,
 				6E7557BF1E58C48C003B6844 /* Company.swift in Sources */,
@@ -4676,12 +4649,10 @@
 				6E7557C21E58C48C003B6844 /* VenueRoomManagedObject.swift in Sources */,
 				6E55B5051EBCBCD6003AAFE6 /* Link.swift in Sources */,
 				9DE1C8F11EB018630007D89A /* PresentationMaterial.swift in Sources */,
-				6E7557C31E58C48C003B6844 /* SummitDataUpdateJSON.swift in Sources */,
 				6E7557C41E58C48C003B6844 /* TrackGroup.swift in Sources */,
 				6E7557C51E58C48C003B6844 /* PresentationManagedObject.swift in Sources */,
 				6E7557C61E58C48C003B6844 /* ListMembersRequest.swift in Sources */,
 				9D4B1C3F1E8563B200F98ECB /* AffiliationManagedObject.swift in Sources */,
-				6EE954571E92A0BC006B1330 /* Comparison.swift in Sources */,
 				6E7557C71E58C48C003B6844 /* Page.swift in Sources */,
 				6E7557C81E58C48C003B6844 /* EventTypeManagedObject.swift in Sources */,
 				6E7557C91E58C48C003B6844 /* Tag.swift in Sources */,
@@ -4695,23 +4666,20 @@
 				6E55B50F1EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */,
 				6E7557D11E58C48C003B6844 /* VenueFloorJSON.swift in Sources */,
 				6E7557D21E58C48C003B6844 /* Speaker.swift in Sources */,
-				6EE9545F1E92A0BC006B1330 /* Value.swift in Sources */,
+				6E7614D71EC7C00D008FBC8A /* RawRepresentable.swift in Sources */,
 				6E7557D31E58C48C003B6844 /* Summit.swift in Sources */,
 				6E7557D41E58C48C003B6844 /* VideoManagedObject.swift in Sources */,
 				9D4B1C3A1E85635200F98ECB /* AffiliationOrganizationManagedObject.swift in Sources */,
 				6E7557D51E58C48C003B6844 /* TicketType.swift in Sources */,
-				6EE9545B1E92A0BC006B1330 /* Expression.swift in Sources */,
 				6E7557D61E58C48C003B6844 /* SummitTypeJSON.swift in Sources */,
 				6E7557D71E58C48C003B6844 /* TeamRequest.swift in Sources */,
 				6E7557D81E58C48C003B6844 /* VenueRoomJSON.swift in Sources */,
-				6E7557D91E58C48C003B6844 /* SummitDataUpdateManagedObject.swift in Sources */,
 				6E7557DA1E58C48C003B6844 /* CompanyJSON.swift in Sources */,
 				6E7557DB1E58C48C003B6844 /* TeamMessage.swift in Sources */,
 				6E7557DC1E58C48C003B6844 /* TrackGroupJSON.swift in Sources */,
 				6E7557DD1E58C48C003B6844 /* Reachability.swift in Sources */,
 				6E7557DE1E58C48C003B6844 /* Entity.swift in Sources */,
 				6E7557DF1E58C48C003B6844 /* VenueFloor.swift in Sources */,
-				6E7557E01E58C48C003B6844 /* EventDataUpdateJSON.swift in Sources */,
 				6E7557E11E58C48C003B6844 /* TrackJSON.swift in Sources */,
 				6E7557E21E58C48C003B6844 /* String.swift in Sources */,
 				6E7557E31E58C48C003B6844 /* TeamInvitationJSON.swift in Sources */,
@@ -4734,19 +4702,17 @@
 				6E7557F21E58C48C003B6844 /* TicketTypeJSON.swift in Sources */,
 				6E7557F31E58C48C003B6844 /* PageController.swift in Sources */,
 				6E7557F41E58C48C003B6844 /* TicketOrderRequest.swift in Sources */,
+				6E53C86E1EC656F0009ADC8C /* JSONExtensions.swift in Sources */,
 				6E7557F51E58C48C003B6844 /* SummitJSON.swift in Sources */,
 				6E7557F61E58C48C003B6844 /* SummitTypeManagedObject.swift in Sources */,
-				6EE954531E92A0BC006B1330 /* Compound.swift in Sources */,
 				6E7557F71E58C48C003B6844 /* Production.swift in Sources */,
 				6E7557F81E58C48C003B6844 /* Model.xcdatamodeld in Sources */,
 				6E7557F91E58C48C003B6844 /* WirelessNetwork.swift in Sources */,
 				6E7557FA1E58C48C003B6844 /* WebConvertible.swift in Sources */,
 				6E7557FB1E58C48C003B6844 /* WirelessNetworkJSON.swift in Sources */,
-				6E7557FC1E58C48C003B6844 /* VenueRoomDataUpdateManagedObject.swift in Sources */,
 				9D4B1C351E85554700F98ECB /* AffiliationJSON.swift in Sources */,
 				6E7557FD1E58C48C003B6844 /* TicketTypeManagedObject.swift in Sources */,
 				6E7557FE1E58C48C003B6844 /* Presentation.swift in Sources */,
-				6E7557FF1E58C48C003B6844 /* GroupEventDataUpdateJSON.swift in Sources */,
 				9DE1C8EC1EAFA20B0007D89A /* Slide.swift in Sources */,
 				6E7558001E58C48C003B6844 /* TeamMessageManagedObject.swift in Sources */,
 				6E7558011E58C48C003B6844 /* GroupEventDataUpdate.swift in Sources */,
@@ -4778,35 +4744,41 @@
 				6E75581C1E58C48C003B6844 /* TagJSON.swift in Sources */,
 				6E75581D1E58C48C003B6844 /* TimeZoneJSON.swift in Sources */,
 				6E75581E1E58C48C003B6844 /* WirelessNetworkManagedObject.swift in Sources */,
-				6E75581F1E58C48C003B6844 /* EventDataUpdateManagedObject.swift in Sources */,
 				6E7558201E58C48C003B6844 /* Feedback.swift in Sources */,
 				6E7558211E58C48C003B6844 /* PresentationJSON.swift in Sources */,
 				6E7558221E58C48C003B6844 /* AttendeeJSON.swift in Sources */,
-				6E7558231E58C48C003B6844 /* DataUpdate.swift in Sources */,
-				6E7558241E58C48C003B6844 /* TrackGroupDataUpdateJSON.swift in Sources */,
 				6E7558251E58C48C003B6844 /* TeamMessageRequest.swift in Sources */,
 				6E7558261E58C48C003B6844 /* TrackGroupDataUpdate.swift in Sources */,
-				6E7558271E58C48C003B6844 /* TrackGroupDataUpdateManagedObject.swift in Sources */,
 				6E7558281E58C48C003B6844 /* FeedbackRequest.swift in Sources */,
-				6E55B50A1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */,
-				6EE9544F1E92A0BC006B1330 /* Predicate.swift in Sources */,
-				6E7558291E58C48C003B6844 /* PresentationDataUpdateManagedObject.swift in Sources */,
 				6E75582A1E58C48C003B6844 /* NotificationManagedObject.swift in Sources */,
 				6E75582B1E58C48C003B6844 /* EventJSON.swift in Sources */,
 				6E75582C1E58C48C003B6844 /* DataUpdatePoller.swift in Sources */,
 				6E75582D1E58C48C003B6844 /* Location.swift in Sources */,
+				6E793E6F1EC4BCE000C636AE /* LinkJSON.swift in Sources */,
 				6E75582E1E58C48C003B6844 /* DataUpdateRequest.swift in Sources */,
 				6E75582F1E58C48C003B6844 /* LocationManagedObject.swift in Sources */,
 				6E7558301E58C48C003B6844 /* Environment.swift in Sources */,
 				6E7558311E58C48C003B6844 /* Video.swift in Sources */,
 				9D4B1C261E84B05E00F98ECB /* AffiliationOrganization.swift in Sources */,
 				6E7558321E58C48C003B6844 /* SummitManagedObject.swift in Sources */,
-				6E7558331E58C48C003B6844 /* PresentationDataUpdateJSON.swift in Sources */,
 				6E7558341E58C48C003B6844 /* TimeZone.swift in Sources */,
 				6E55B4FB1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */,
 				6E7558351E58C48C003B6844 /* Track.swift in Sources */,
 				6E7558361E58C48C003B6844 /* Image.swift in Sources */,
-				6EE954631E92A0BC006B1330 /* NSPredicate.swift in Sources */,
+				6E7557B41E58C48C003B6844 /* GroupEventDataUpdateManagedObject.swift in Sources */,
+				6E7557D91E58C48C003B6844 /* SummitDataUpdateManagedObject.swift in Sources */,
+				6E7557FC1E58C48C003B6844 /* VenueRoomDataUpdateManagedObject.swift in Sources */,
+				6E75581F1E58C48C003B6844 /* EventDataUpdateManagedObject.swift in Sources */,
+				6E7558271E58C48C003B6844 /* TrackGroupDataUpdateManagedObject.swift in Sources */,
+				6E7558291E58C48C003B6844 /* PresentationDataUpdateManagedObject.swift in Sources */,
+				6E7557BD1E58C48C003B6844 /* VenueRoomDataUpdateJSON.swift in Sources */,
+				6E7557C31E58C48C003B6844 /* SummitDataUpdateJSON.swift in Sources */,
+				6E7557E01E58C48C003B6844 /* EventDataUpdateJSON.swift in Sources */,
+				6E7557FF1E58C48C003B6844 /* GroupEventDataUpdateJSON.swift in Sources */,
+				6E7558241E58C48C003B6844 /* TrackGroupDataUpdateJSON.swift in Sources */,
+				6E7558331E58C48C003B6844 /* PresentationDataUpdateJSON.swift in Sources */,
+				6E7558231E58C48C003B6844 /* DataUpdate.swift in Sources */,
+				6E7557B01E58C48C003B6844 /* DataUpdateJSON.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4817,8 +4789,6 @@
 				6E7558491E58C4A7003B6844 /* CoreDataTests.swift in Sources */,
 				6E75584A1E58C4A7003B6844 /* TestUtilities.swift in Sources */,
 				6E75584B1E58C4A7003B6844 /* JSONTests.swift in Sources */,
-				6E172D781EBCCBE100C9CAF3 /* ModelTests.swift in Sources */,
-				6E0FD0B11E92A7DB000C6DBA /* PredicateTests.swift in Sources */,
 				6E75584C1E58C4A7003B6844 /* StoreTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4834,6 +4804,7 @@
 				6E31ECB31E5BCD6A000E5BAC /* EventDetailViewController.swift in Sources */,
 				6E7558D01E595753003B6844 /* NSDateComponents+MTDates.m in Sources */,
 				6E31ECA81E5B8E46000E5BAC /* ContentBackgroundView.swift in Sources */,
+				6E1A5CFE1EC6DC12006E72BE /* URLExtensions.swift in Sources */,
 				6E7558BE1E58D81E003B6844 /* Observable.swift in Sources */,
 				6EF58C931E5EABAA00009053 /* SummitActivityHandling.swift in Sources */,
 				6E7558721E58C62B003B6844 /* SummitsViewController.swift in Sources */,
@@ -4888,6 +4859,7 @@
 				6E1D51B31D835BB8007391A3 /* YouTubeThumbnail.swift in Sources */,
 				6EB9B8A11D83499F00917077 /* UIColor+HexString.swift in Sources */,
 				6E74FB031D7CAC270018633D /* ErrorAlert.swift in Sources */,
+				6E7614DC1EC7CF6B008FBC8A /* DataUpdatePoller.swift in Sources */,
 				6E1651941D84628200574CE5 /* VenueDirectoryViewController.swift in Sources */,
 				6EBCB4891DDE10B800727130 /* Store.swift in Sources */,
 				6E96C1C91DE8F0F8002F4690 /* SummitManager.swift in Sources */,
@@ -4917,6 +4889,7 @@
 				6E74FB041D7CAFDB0018633D /* Define.swift in Sources */,
 				6EDA19001D7F4A6100AB450F /* EventDetailViewController.swift in Sources */,
 				6E74FAFE1D7C9EBC0018633D /* NSDateComponents+MTDates.m in Sources */,
+				6E1A5CFD1EC6DC11006E72BE /* URLExtensions.swift in Sources */,
 				6EBC583E1E4CBFE000F5DD68 /* MessageEnabledViewController.swift in Sources */,
 				6E6964361D84846B00BA576E /* VenueMapViewController.swift in Sources */,
 			);
@@ -5297,7 +5270,7 @@
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
@@ -5347,7 +5320,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VALIDATE_PRODUCT = YES;
@@ -5375,6 +5348,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStack Summit/OpenStackSummit-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = $SRCROOT/../Vendor/Firebase;
 			};
 			name = Debug;
@@ -5397,6 +5371,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.ios.summit$BUNDLE_ID_SUFFIX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStack Summit/OpenStackSummit-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = $SRCROOT/../Vendor/Firebase;
 			};
 			name = Release;
@@ -5460,6 +5435,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS) $(PROJECT_DIR)/Carthage/Build/iOS";
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.CoreSummitTests;
 				PRODUCT_NAME = CoreSummitTests;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -5470,6 +5446,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.CoreSummitTests;
 				PRODUCT_NAME = CoreSummitTests;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -5850,6 +5827,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStackSummit macOS/OpenStackSummit macOS-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -5874,6 +5852,7 @@
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStackSummit macOS/OpenStackSummit macOS-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Mocked;
 		};
@@ -5897,6 +5876,7 @@
 				PRODUCT_NAME = OpenStackSummit;
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStackSummit macOS/OpenStackSummit macOS-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -5920,6 +5900,7 @@
 				PRODUCT_NAME = OpenStackSummit;
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStackSummit macOS/OpenStackSummit macOS-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Beta;
 		};
@@ -5966,7 +5947,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VALIDATE_PRODUCT = YES;
@@ -5992,6 +5973,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.ios.summit$BUNDLE_ID_SUFFIX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStack Summit/OpenStackSummit-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = $SRCROOT/../Vendor/Firebase;
 			};
 			name = Beta;
@@ -6029,6 +6011,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS) $(PROJECT_DIR)/Carthage/Build/iOS";
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.CoreSummitTests;
 				PRODUCT_NAME = CoreSummitTests;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Beta;
 		};
@@ -6090,7 +6073,7 @@
 				OTHER_SWIFT_FLAGS = "-D DEBUG -D MOCKED";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
@@ -6115,6 +6098,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.ios.summit$BUNDLE_ID_SUFFIX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "OpenStack Summit/OpenStackSummit-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				USER_HEADER_SEARCH_PATHS = $SRCROOT/../Vendor/Firebase;
 			};
 			name = Mocked;
@@ -6159,6 +6143,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS) $(PROJECT_DIR)/Carthage/Build/iOS";
 				PRODUCT_BUNDLE_IDENTIFIER = org.openstack.CoreSummitTests;
 				PRODUCT_NAME = CoreSummitTests;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Mocked;
 		};
diff --git a/OpenStack Summit/OpenStack Summit/AboutViewController.swift b/OpenStack Summit/OpenStack Summit/AboutViewController.swift
index 14d727bb..1ec69926 100755
--- a/OpenStack Summit/OpenStack Summit/AboutViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/AboutViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 import CoreData
 import CoreSummit
+import Predicate
 import MessageUI
 
 final class AboutViewController: UITableViewController, RevealViewController, EmailComposerViewController {
@@ -40,7 +41,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         // set user activity for handoff
         let userActivity = NSUserActivity(activityType: AppActivity.screen.rawValue)
         userActivity.title = "About the Summit"
-        userActivity.webpageURL = NSURL(string: AppEnvironment.configuration.webpageURL)
+        userActivity.webpageURL = AppEnvironment.configuration.webpage
         userActivity.userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.about.rawValue]
         userActivity.requiredUserInfoKeys = [AppActivityUserInfo.screen.rawValue]
         self.userActivity = userActivity
@@ -49,30 +50,36 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         configureView()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         userActivity?.becomeCurrent()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
         userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        requestAppReview()
+    }
+    
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.about.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - Actions
     
-    @IBAction func showLink(sender: UIButton) {
+    @IBAction func showLink(_ sender: UIButton) {
         
         let link = Link(rawValue: sender.tag)!
         
@@ -80,15 +87,15 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
             
         case .openStackWebsite:
             
-            let url = NSURL(string: "https://openstack.org")!
+            let url = URL(string: "https://openstack.org")!
             
-            open(url: url)
+            open(url)
             
         case .codeOfConduct:
             
-            let url = NSURL(string: "https://www.openstack.org/summit/barcelona-2016/code-of-conduct")!
+            let url = URL(string: "https://www.openstack.org/summit/barcelona-2016/code-of-conduct")!
             
-            open(url: url)
+            open(url)
             
         case .appSupport:
             
@@ -132,7 +139,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
                 
                 let sort = [NSSortDescriptor(key: "name", ascending: true)]
                 
-                let wirelessNetworks = try! WirelessNetwork.filter(("summit.id" == summit.identifier).toFoundation(), sort: sort, context: Store.shared.managedObjectContext)
+                let wirelessNetworks = try! WirelessNetwork.filter((#keyPath(WirelessNetworkManagedObject.summit.id) == summit.identifier), sort: sort, context: Store.shared.managedObjectContext)
                 
                 if wirelessNetworks.isEmpty == false {
                     
@@ -142,13 +149,13 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
             
             // setup handoff
             
-            userActivity?.webpageURL = NSURL(string: summit.webpageURL)!
+            userActivity?.webpageURL = summit.webpage
             
         } else {
             
             summitCache = nil
             
-            userActivity?.webpageURL = NSURL(string: AppEnvironment.configuration.webpageURL)!
+            userActivity?.webpageURL = AppEnvironment.configuration.webpage
         }
         
         var aboutCells = [AboutCell]()
@@ -163,7 +170,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
     }
     
     @inline(__always)
-    private func configure(cell cell: WirelessNetworkCell, with network: WirelessNetwork) {
+    private func configure(cell: WirelessNetworkCell, with network: WirelessNetwork) {
         
         cell.nameLabel.text = network.name
         
@@ -171,7 +178,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
     }
     
     @inline(__always)
-    private func configure(cell cell: AboutNameCell) {
+    private func configure(cell: AboutNameCell) {
         
         guard let summit = self.summitCache
             else { fatalError("No summit cache") }
@@ -184,13 +191,13 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
         else {
             
-            let dateFormatter = NSDateFormatter()
-            dateFormatter.timeZone = NSTimeZone(name: summit.timeZone)
+            let dateFormatter = DateFormatter()
+            dateFormatter.timeZone = TimeZone(identifier: summit.timeZone)
             dateFormatter.dateFormat = "MMMM dd-"
-            let stringDateFrom = dateFormatter.stringFromDate(summit.start.toFoundation())
+            let stringDateFrom = dateFormatter.string(from: summit.start)
             
             dateFormatter.dateFormat = "dd, yyyy"
-            let stringDateTo = dateFormatter.stringFromDate(summit.end.toFoundation())
+            let stringDateTo = dateFormatter.string(from: summit.end)
             
             cell.dateLabel.text = "\(stringDateFrom)\(stringDateTo)"
         }
@@ -200,11 +207,11 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
     }
     
     @inline(__always)
-    private func open(url url: NSURL) {
+    private func open(_ url: URL) {
         
-        if UIApplication.sharedApplication().canOpenURL(url) {
+        if UIApplication.shared.canOpenURL(url) {
             
-            UIApplication.sharedApplication().openURL(url)
+            UIApplication.shared.openURL(url)
             
         } else {
             
@@ -214,12 +221,12 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return sections.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection index: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection index: Int) -> Int {
         
         let section = sections[index]
         
@@ -233,7 +240,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let section = sections[indexPath.section]
         
@@ -241,7 +248,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         
         case .name:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.aboutNameCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.aboutNameCell, for: indexPath)!
             
             configure(cell: cell)
             
@@ -249,7 +256,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
             
         case let .wirelessNetworks(networks):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.wirelessNetworkCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.wirelessNetworkCell, for: indexPath)!
             
             let network = networks[indexPath.row]
             
@@ -265,18 +272,18 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
             
             case .links:
                 
-                return tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.aboutLinksCell, forIndexPath: indexPath)!
+                return tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.aboutLinksCell, for: indexPath)!
                 
             case .description:
                 
-                return tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.aboutDescriptionCell, forIndexPath: indexPath)!
+                return tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.aboutDescriptionCell, for: indexPath)!
             }
         }
     }
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, heightForHeaderInSection index: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, heightForHeaderInSection index: Int) -> CGFloat {
         
         let section = sections[index]
         
@@ -286,7 +293,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
     }
     
-    override func tableView(tableView: UITableView, viewForHeaderInSection index: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForHeaderInSection index: Int) -> UIView? {
         
         let section = sections[index]
         
@@ -296,7 +303,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
     }
     
-    override func tableView(tableView: UITableView, heightForFooterInSection index: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, heightForFooterInSection index: Int) -> CGFloat {
         
         let section = sections[index]
         
@@ -306,7 +313,7 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
         }
     }
     
-    override func tableView(tableView: UITableView, viewForFooterInSection index: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForFooterInSection index: Int) -> UIView? {
         
         let section = sections[index]
         
@@ -318,9 +325,9 @@ final class AboutViewController: UITableViewController, RevealViewController, Em
     
     // MARK: - MFMailComposeViewControllerDelegate
     
-    func mailComposeController(controller: MFMailComposeViewController, didFinishWithResult result: MFMailComposeResult, error: NSError?) {
+    func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Swift.Error?) {
         
-        dismissViewControllerAnimated(true) {
+        dismiss(animated: true) {
             
             if let error = error {
                 
@@ -358,18 +365,18 @@ private extension AboutViewController {
 
 final class WirelessNetworkCell: UITableViewCell {
     
-    @IBOutlet weak var nameLabel: CopyableLabel!
+    @IBOutlet private(set) weak var nameLabel: CopyableLabel!
     
-    @IBOutlet weak var passwordLabel: CopyableLabel!
+    @IBOutlet private(set) weak var passwordLabel: CopyableLabel!
 }
 
 final class AboutNameCell: UITableViewCell {
     
-    @IBOutlet weak var nameLabel: CopyableLabel!
+    @IBOutlet private(set) weak var nameLabel: CopyableLabel!
     
-    @IBOutlet weak var dateLabel: CopyableLabel!
+    @IBOutlet private(set) weak var dateLabel: CopyableLabel!
     
-    @IBOutlet weak var buildVersionLabel: CopyableLabel!
+    @IBOutlet private(set) weak var buildVersionLabel: CopyableLabel!
     
-    @IBOutlet weak var buildNumberLabel: CopyableLabel!
+    @IBOutlet private(set) weak var buildNumberLabel: CopyableLabel!
 }
diff --git a/OpenStack Summit/OpenStack Summit/ActivityViewController.swift b/OpenStack Summit/OpenStack Summit/ActivityViewController.swift
index c763837b..f65e4c50 100644
--- a/OpenStack Summit/OpenStack Summit/ActivityViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/ActivityViewController.swift	
@@ -23,7 +23,7 @@ protocol ActivityViewController {
     
     func showActivityIndicator()
     
-    func dismissActivityIndicator(animated animated: Bool)
+    func dismissActivityIndicator(_ animated: Bool)
 }
 
 #if os(iOS)
@@ -32,18 +32,18 @@ extension ActivityViewController {
     
     func showActivityIndicator() {
         
-        view.userInteractionEnabled = false
+        view.isUserInteractionEnabled = false
         
-        progressHUD.showInView(view)
+        progressHUD.show(in: view)
         
-        view.bringSubviewToFront(progressHUD)
+        view.bringSubview(toFront: progressHUD)
     }
     
-    func dismissActivityIndicator(animated animated: Bool = true) {
+    func dismissActivityIndicator(_ animated: Bool = true) {
         
-        view.userInteractionEnabled = true
+        view.isUserInteractionEnabled = true
         
-        progressHUD.dismissAnimated(animated)
+        progressHUD.dismiss(animated: animated)
     }
 }
 
diff --git a/OpenStack Summit/OpenStack Summit/AddTeamMemberViewController.swift b/OpenStack Summit/OpenStack Summit/AddTeamMemberViewController.swift
index 38c3c873..5ee38038 100644
--- a/OpenStack Summit/OpenStack Summit/AddTeamMemberViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/AddTeamMemberViewController.swift	
@@ -8,7 +8,7 @@
 
 import Foundation
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import JGProgressHUD
 
@@ -32,12 +32,12 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
     
     private(set) var permission: TeamPermission? {
         
-        didSet { if isViewLoaded() { configureView() } }
+        didSet { if isViewLoaded { configureView() } }
     }
     
     private(set) var member: Member? {
         
-        didSet { if isViewLoaded() { configureView() } }
+        didSet { if isViewLoaded { configureView() } }
     }
     
     private lazy var permissionCells: [UITableViewCell] = [self.adminPermissionCell,
@@ -46,7 +46,7 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
     
     private var teamCache: Team!
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
@@ -58,12 +58,12 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
     
     // MARK: - Actions
     
-    @IBAction func cancel(sender: AnyObject? = nil) {
+    @IBAction func cancel(_ sender: AnyObject? = nil) {
         
-        self.dismissViewControllerAnimated(true, completion: nil)
+        self.dismiss(animated: true, completion: nil)
     }
     
-    @IBAction func done(sender: AnyObject? = nil) {
+    @IBAction func done(_ sender: AnyObject? = nil) {
         
         guard let permission = self.permission,
             let member = self.member
@@ -73,7 +73,7 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
         
         Store.shared.add(member: member.identifier, to: team, permission: permission) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -81,13 +81,13 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error as NSError)
                     
-                case .Value:
+                case .value:
                     
-                    controller.dismissViewControllerAnimated(true, completion: nil)
+                    controller.dismiss(animated: true, completion: nil)
                 }
             }
         }
@@ -106,33 +106,33 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
         
         if let selectedMember = self.member {
             
-            self.selectedMemberCell.selectMemberLabel.hidden = true
+            self.selectedMemberCell.selectMemberLabel.isHidden = true
             self.selectedMemberCell.nameLabel.text = selectedMember.name
             self.selectedMemberCell.titleLabel.text = selectedMember.title ?? selectedMember.twitter ?? selectedMember.irc
-            self.selectedMemberCell.pictureURL = selectedMember.pictureURL
+            self.selectedMemberCell.picture = selectedMember.picture
             
         } else {
             
-            self.selectedMemberCell.pictureURL = ""
+            self.selectedMemberCell.picture = nil
         }
         
-        self.selectedMemberCell.selectMemberLabel.hidden = self.member != nil
-        self.selectedMemberCell.nameLabel.hidden = self.member == nil
-        self.selectedMemberCell.titleLabel.hidden = self.member == nil
+        self.selectedMemberCell.selectMemberLabel.isHidden = self.member != nil
+        self.selectedMemberCell.nameLabel.isHidden = self.member == nil
+        self.selectedMemberCell.titleLabel.isHidden = self.member == nil
         
         // configure permission cells
         
-        permissionCells.forEach { $0.accessoryType = .None }
+        permissionCells.forEach { $0.accessoryType = .none }
         
         if let selectedPermission = self.permission {
             
             let cell = self.cell(for: selectedPermission)
             
-            cell.accessoryType = .Checkmark
+            cell.accessoryType = .checkmark
         }
         
         // enable `Done` button
-        self.doneBarButtonItem.enabled = self.member != nil && self.permission != nil
+        self.doneBarButtonItem.isEnabled = self.member != nil && self.permission != nil
     }
     
     private func cell(for permission: TeamPermission) -> UITableViewCell {
@@ -156,23 +156,23 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
     
     // MARK: - SearchMembersViewControllerDelegate
     
-    private func searchMembersViewController(searchMembersViewController: SearchMembersViewController, didSelect member: Member) {
+    private func searchMembersViewController(_ searchMembersViewController: SearchMembersViewController, didSelect member: Member) {
         
         guard teamCache.permission(for: member.identifier) == nil
             else { return }
         
         self.member = member
         
-        self.navigationController!.popViewControllerAnimated(true)
+        self.navigationController!.popViewController(animated: true)
     }
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
-        guard let cell = tableView.cellForRowAtIndexPath(indexPath)
+        guard let cell = tableView.cellForRow(at: indexPath)
             else { return }
         
         let section = Section(rawValue: indexPath.section)!
@@ -187,7 +187,7 @@ final class AddTeamMemberViewController: UITableViewController, MessageEnabledVi
             
             searchMembersViewController.selectedMember = { [weak self] in self?.searchMembersViewController($0.0, didSelect: $0.1) }
             
-            self.showViewController(searchMembersViewController, sender: self)
+            self.show(searchMembersViewController, sender: self)
             
         case .permission:
             
@@ -216,23 +216,23 @@ final class SelectTeamMemberTableViewCell: UITableViewCell {
     @IBOutlet private weak var pictureImageView: UIImageView!
     @IBOutlet private(set) weak var selectMemberLabel: UILabel!
     
-    var pictureURL: String = "" {
+    fileprivate var picture: URL? {
         
         didSet {
             
-            let picUrlInternal: String
-            
-            picUrlInternal = pictureURL.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
+            let placeholder = #imageLiteral(resourceName: "generic-user-avatar")
             
-            if (!picUrlInternal.isEmpty) {
-                let placeholder = R.image.genericUserAvatar()!
-                pictureImageView.hnk_setImageFromURL(NSURL(string: picUrlInternal)!, placeholder: placeholder)
-            }
-            else {
-                pictureImageView.image = R.image.genericUserAvatar()!
+            if let url = picture {
+                
+                pictureImageView.hnk_setImageFromURL(url.environmentScheme, placeholder: placeholder)
+                
+            } else {
+                
+                pictureImageView.image = #imageLiteral(resourceName: "generic-user-avatar")
             }
+            
             pictureImageView.layer.cornerRadius = pictureImageView.frame.size.width / 2
-            pictureImageView.clipsToBounds = true;
+            pictureImageView.clipsToBounds = true
         }
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/AppDelegate.swift b/OpenStack Summit/OpenStack Summit/AppDelegate.swift
index 2d052cc2..6017e9c8 100644
--- a/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
+++ b/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
@@ -6,10 +6,10 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
+import Foundation
 import UIKit
 import UserNotifications
 import CoreSpotlight
-import SwiftFoundation
 import CoreSummit
 //import GoogleMaps
 import var AeroGearOAuth2.AGAppLaunchedWithURLNotification
@@ -23,17 +23,13 @@ import FirebaseMessaging
 @UIApplicationMain
 final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandling {
     
-    static var shared: AppDelegate { return unsafeBitCast(UIApplication.sharedApplication().delegate!, AppDelegate.self) }
+    static var shared: AppDelegate { return unsafeBitCast(UIApplication.shared.delegate!, to: AppDelegate.self) }
 
     var window: UIWindow?
     
-    lazy var menuViewController: MenuViewController = R.storyboard.menu.menuViewController()!
-    
-    lazy var revealViewController: SWRevealViewController = SWRevealViewController(rearViewController: self.menuViewController, frontViewController: UINavigationController(rootViewController: self.menuViewController.generalScheduleViewController))
-    
-    lazy var launchScreenViewController: LaunchScreenViewController = (self.window!.rootViewController as! UINavigationController).viewControllers.first as! LaunchScreenViewController
+    let appLaunch = Date()
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         
         // print app info
         print("Launching OpenStack Summit v\(AppVersion) Build \(AppBuild)")
@@ -43,7 +39,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         Preference.appBuild = AppBuild
         
         // setup Fabric
-        Crashlytics.startWithAPIKey(AppConsumerKey(AppEnvironment).fabric)
+        Crashlytics.start(withAPIKey: AppConsumerKey(AppEnvironment).fabric)
         
         // setup Google Maps
         GMSServices.provideAPIKey(AppConsumerKey(AppEnvironment).googleMaps)
@@ -67,7 +63,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         #endif
         
         // validate R.swift on debug builds
-        R.assertValid()
+        #if DEBUG
+        try! R.validate()
+        #endif
         
         // configure global appearance
         SetAppearance()
@@ -75,7 +73,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         // Core Spotlight
         if CSSearchableIndex.isIndexingAvailable() {
             
+            #if DEBUG
             SpotlightController.shared.log = { print("SpotlightController: " + $0) }
+            #endif
         }
         
         // Setup Notification Manager
@@ -91,9 +91,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         FIRMessaging.messaging().remoteMessageDelegate = PushNotificationManager.shared
         
         // Add observer for InstanceID token refresh callback.
-        NSNotificationCenter.defaultCenter().addObserver(self,
+        NotificationCenter.default.addObserver(self,
                                                          selector: #selector(self.tokenRefreshNotification),
-                                                         name: kFIRInstanceIDTokenRefreshNotification,
+                                                         name: .firInstanceIDTokenRefresh,
                                                          object: nil)
         
         connectToFcm()
@@ -101,48 +101,49 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
         
         FIRMessaging.messaging().disconnect()
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
         
         connectToFcm()
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
     
-    func application(application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: NSError) {
+    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Swift.Error) {
         
         print("Unable to register for remote notifications: \(error.localizedDescription)")
     }
     
-    func application(application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: NSData) {
+    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         
         print("APNs token retrieved: \(deviceToken)")
         
-        FIRInstanceID.instanceID().setAPNSToken(deviceToken, type: .Sandbox)
+        FIRInstanceID.instanceID().setAPNSToken(deviceToken, type: .sandbox)
     }
     
-    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject], fetchCompletionHandler: (UIBackgroundFetchResult) -> ()) {
+    // HACK: implemented old delegate to make notifications work as is on iOS 10
+    func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {
         
         // app was just brought from background to foreground
-        if application.applicationState == .Active {
+        if application.applicationState == .active {
             
             // called when push notification received in foreground
             print("Recieved remote notification: \(userInfo)")
@@ -152,110 +153,75 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
             // called when push notification tapped
             print("Tapped on remote notification: \(userInfo)")
             
-            PushNotificationManager.shared.process(userInfo as! [String: AnyObject], unread: false)
+            PushNotificationManager.shared.process(pushNotification: userInfo as! [String: Any], unread: false)
             
             // redirect to inbox
-            
-            
-            /// force view load
-            let _ = self.revealViewController.view
-            let _ = self.menuViewController.view
-            let _ = self.revealViewController.frontViewController.view
-            let _ = self.launchScreenViewController.view
-            
-            if self.launchScreenViewController.navigationController?.topViewController == self.launchScreenViewController {
-                
-                if self.launchScreenViewController.willTransition {
-                    
-                    let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(3 * Double(NSEC_PER_SEC)))
-                    
-                    dispatch_after(delayTime, dispatch_get_main_queue()) { self.menuViewController.showInbox() }
-                    
-                } else {
-                    
-                    self.launchScreenViewController.showRevealController() { self.menuViewController.showInbox() }
-                }
-                
-            } else {
-                
-                menuViewController.showInbox()
-            }
+            self.view(screen: .inbox)
         }
-        
-        fetchCompletionHandler(.NoData)
     }
     
-    func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [NSObject : AnyObject], completionHandler: () -> Void) {
+    func application(_ application: UIApplication, handleActionWithIdentifier identifier: String?, for notification: UILocalNotification, withResponseInfo responseInfo: [AnyHashable : Any], completionHandler: @escaping () -> Void) {
         
         PushNotificationManager.shared.handleNotification(action: identifier, for: notification, with: responseInfo as! [String: AnyObject], completion: completionHandler)
     }
     
-    func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
+    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
         
-        var options = [String : AnyObject]()
+        var options = [UIApplicationOpenURLOptionsKey : Any]()
         
         if let sourceApplication = sourceApplication {
             
-            options[UIApplicationOpenURLOptionsSourceApplicationKey] = sourceApplication
+            options[.sourceApplication] = sourceApplication
         }
         
-        return self.application(application, openURL: url, options: options)
+        return self.application(application, open: url, options: options)
     }
     
-    func application(app: UIApplication, openURL url: NSURL, options: [String : AnyObject]) -> Bool {
+    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
         
-        if let sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey] as? String {
+        if let sourceApplication = options[UIApplicationOpenURLOptionsKey.sourceApplication] as? String {
             
-            let bundleID = NSBundle.mainBundle().bundleIdentifier
+            let bundleID = Bundle.main.bundleIdentifier
             
             if sourceApplication == bundleID || sourceApplication == "com.apple.SafariViewService" {
                 
-                let notification = NSNotification(name: AGAppLaunchedWithURLNotification, object: nil, userInfo: [UIApplicationLaunchOptionsURLKey:url])
-                NSNotificationCenter.defaultCenter().postNotification(notification)
+                let notification = Foundation.Notification (name: Notification.Name(rawValue: AGAppLaunchedWithURLNotification), object: nil, userInfo: [UIApplicationLaunchOptionsKey.url:url])
+                NotificationCenter.default.post(notification)
                 
                 return true
             }
         }
         
         // HACK: async is needed in case app was not already opened
-        dispatch_async(dispatch_get_main_queue()) {
-            return self.openSchemeURL(url)
+        DispatchQueue.main.async {
+            let _ = self.openScheme(url: url)
         }
         
         return false
     }
     
-    func application(application: UIApplication, continueUserActivity userActivity: NSUserActivity, restorationHandler: ([AnyObject]?) -> Void) -> Bool {
-        
-        /// force view load
-        let _ = self.revealViewController.view
-        let _ = self.menuViewController.view
-        let _ = self.revealViewController.frontViewController.view
-        
-        if self.launchScreenViewController.navigationController?.topViewController == self.launchScreenViewController
-            && self.launchScreenViewController.willTransition == false {
-            
-            self.launchScreenViewController.showRevealController() { self.application(application, continueUserActivity: userActivity, restorationHandler: restorationHandler) }
-            return true
-        }
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
         
         print("Continue activity \(userActivity.activityType)\n\(userActivity.userInfo?.description ?? "")")
         
         if userActivity.activityType == CSSearchableItemActionType {
             
             guard let searchIdentifierString = userActivity.userInfo?[CSSearchableItemActivityIdentifier] as? String,
-                let searchURL = NSURL(string: searchIdentifierString)
-                where searchURL.pathComponents?.count == 2
+                let searchURL = Foundation.URL(string: searchIdentifierString),
+                searchURL.pathComponents.count == 2
                 else { return false }
             
-            let searchTypeString = searchURL.pathComponents![0]
-            let identifierString = searchURL.pathComponents![1]
+            let searchTypeString = searchURL.pathComponents[0]
+            let identifierString = searchURL.pathComponents[1]
             
             guard let dataType = AppActivitySummitDataType(rawValue: searchTypeString),
-                let identifier = Int(identifierString)
+                let identifier = Identifier(identifierString)
+                else { return false }
+            
+            guard self.canView(data: dataType, identifier: identifier)
                 else { return false }
             
-            return self.view(dataType, identifier: identifier)
+            self.view(data: dataType, identifier: identifier)
         }
         
         if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
@@ -264,17 +230,20 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
             guard let url = userActivity.webpageURL
                 else { return false }
             
-            guard openWebURL(url)
-                else { UIApplication.sharedApplication().openURL(url); return false }
+            guard self.openWeb(url: url)
+                else { UIApplication.shared.openURL(url); return false }
             
         } else if userActivity.activityType == AppActivity.view.rawValue {
             
             guard let typeString = userActivity.userInfo?[AppActivityUserInfo.type.rawValue] as? String,
                 let dataType = AppActivitySummitDataType(rawValue: typeString),
-                let identifier = userActivity.userInfo?[AppActivityUserInfo.identifier.rawValue] as? Int
+                let identifier = userActivity.userInfo?[AppActivityUserInfo.identifier.rawValue] as? Identifier
+                else { return false }
+            
+            guard self.canView(data: dataType, identifier: identifier)
                 else { return false }
             
-            return self.view(dataType, identifier: identifier)
+            self.view(data: dataType, identifier: identifier)
             
         } else if userActivity.activityType == AppActivity.screen.rawValue {
             
@@ -282,7 +251,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
                 let screen = AppActivityScreen(rawValue: screenString)
                 else { return false }
             
-            self.view(screen)
+            self.view(screen: screen)
         }
         
         return false
@@ -299,9 +268,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         // Disconnect previous FCM connection if it exists.
         FIRMessaging.messaging().disconnect()
         
-        FIRMessaging.messaging().connectWithCompletion { (error) in
+        FIRMessaging.messaging().connect { (error) in
             if error != nil {
-                print("Unable to connect with FCM. \(error)")
+                print("Unable to connect with FCM. \(error!)")
             } else {
                 print("Connected to FCM.")
             }
@@ -310,7 +279,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
     
     // MARK: - Notifications
     
-    func tokenRefreshNotification(notification: NSNotification) {
+    func tokenRefreshNotification(_ notification: Foundation.Notification) {
         
         if let refreshedToken = FIRInstanceID.instanceID().token() {
             
@@ -323,61 +292,28 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
     
     // MARK: - SummitActivityHandling
     
-    func view(data: AppActivitySummitDataType, identifier: Identifier) -> Bool  {
+    func view(data: AppActivitySummitDataType, identifier: Identifier)  {
         
-        // find in cache
-        guard let managedObject = try! data.managedObject.find(identifier, context: Store.shared.managedObjectContext)
-            else { return false }
+        guard let topViewController = (self.window?.rootViewController as? UINavigationController)?.topViewController as? SummitActivityHandlingViewController
+            else { fatalError("Visible view controller doesn't support deep linking") }
         
-        switch data {
-            
-        case .event:
-            
-            self.menuViewController.showEvents()
-            
-            let _ = self.menuViewController.generalScheduleViewController.view
-            
-            let eventDetailVC = R.storyboard.event.eventDetailViewController()!
-            eventDetailVC.event = identifier
-            self.menuViewController.generalScheduleViewController.showViewController(eventDetailVC, sender: nil)
-            
-        case .speaker:
-            
-            self.menuViewController.showSpeakers()
-            
-            let memberProfileVC = MemberProfileViewController(profile: .speaker(identifier))
-            self.menuViewController.speakersViewController.showViewController(memberProfileVC, sender: nil)
-            
-        case .video:
-            
-            let video = Video(managedObject: managedObject as! VideoManagedObject)
-            
-            self.window?.rootViewController?.playVideo(video)
-            
-        case .venue, .venueRoom:
-            
-            self.menuViewController.showVenues()
-            
-            self.menuViewController.venuesViewController.showLocationDetail(identifier)
-        }
-        
-        return true
+        return topViewController.view(data: data, identifier: identifier)
     }
     
     func view(screen: AppActivityScreen) {
         
-        switch screen {
-            
-        case .venues: self.menuViewController.showVenues()
-        case .events: self.menuViewController.showEvents()
-        case .speakers: self.menuViewController.showSpeakers()
-        case .about: self.menuViewController.showAbout()
-        }
+        guard let topViewController = (self.window?.rootViewController as? UINavigationController)?.topViewController as? SummitActivityHandlingViewController
+            else { fatalError("Visible view controller doesn't support deep linking") }
+        
+        topViewController.view(screen: screen)
     }
     
-    func search(searchTerm: String) {
+    func search(_ searchTerm: String) {
+        
+        guard let topViewController = (self.window?.rootViewController as? UINavigationController)?.topViewController as? SummitActivityHandlingViewController
+            else { fatalError("Visible view controller doesn't support deep linking") }
         
-        self.menuViewController.showSearch(for: searchTerm)
+        topViewController.search(searchTerm)
     }
 }
 
diff --git a/OpenStack Summit/OpenStack Summit/AppReview.swift b/OpenStack Summit/OpenStack Summit/AppReview.swift
new file mode 100644
index 00000000..1b967cd9
--- /dev/null
+++ b/OpenStack Summit/OpenStack Summit/AppReview.swift	
@@ -0,0 +1,55 @@
+//
+//  AppReview.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/19/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import StoreKit
+
+extension UIViewController {
+    
+    /// Attempts to prompt the user to review the app in the App Store.
+    ///
+    /// This method is called after certain events occur 
+    /// (e.g. event rated, video finished playing, about screen loaded)
+    /// and can only show if the following requirements are met:
+    /// - Running iOS 10.3 or above
+    /// - App has been running for at least 5 minutes
+    /// - It's been a week since we last prompted the user for a review.
+    func requestAppReview() {
+        
+        guard canReviewApp
+            else { return }
+        
+        // store new value
+        Preference.lastAppReview = Date()
+        
+        // show UI
+        if #available(iOS 10.3, *) {
+            SKStoreReviewController.requestReview()
+        }
+    }
+    
+    private var canReviewApp: Bool {
+        
+        let lastReview = Preference.lastAppReview
+        
+        // first prompt or interval after last prompt
+        if let lastReview = lastReview {
+            
+            let interval: Double = 60 * 24 * 7 // 1 week
+            
+            return Date() >= lastReview.addingTimeInterval(interval)
+            
+        } else {
+            
+            let interval: Double = 60 * 5 // 5 min
+            
+            return Date() >= AppDelegate.shared.appLaunch.addingTimeInterval(interval)
+        }
+    }
+}
diff --git a/OpenStack Summit/OpenStack Summit/Appearance.swift b/OpenStack Summit/OpenStack Summit/Appearance.swift
index 6859f927..04e8b371 100644
--- a/OpenStack Summit/OpenStack Summit/Appearance.swift	
+++ b/OpenStack Summit/OpenStack Summit/Appearance.swift	
@@ -10,13 +10,13 @@ import UIKit
 
 func SetAppearance() {
     
-    UINavigationBar.appearance().translucent = false
-    UINavigationBar.appearance().barStyle = UIBarStyle.Black
+    UINavigationBar.appearance().isTranslucent = false
+    UINavigationBar.appearance().barStyle = UIBarStyle.black
     UINavigationBar.appearance().barTintColor = UIColor(hexString: "#214065")
-    UINavigationBar.appearance().tintColor = UIColor.whiteColor()
+    UINavigationBar.appearance().tintColor = UIColor.white
     UINavigationBar.appearance().titleTextAttributes = [NSFontAttributeName: UIFont(name: "OpenSans-Semibold", size: 17)!]
     
-    UIBarButtonItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont(name: "OpenSans-Semibold", size: 17)!], forState: .Normal)
+    UIBarButtonItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont(name: "OpenSans-Semibold", size: 17)!], for: UIControlState())
     
     UISearchBar.appearance().tintColor = UIColor(hexString: "#214065")
 }
diff --git a/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift b/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift
index 09625e95..6e07692c 100644
--- a/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift	
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 import CoreData
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import JGProgressHUD
 
@@ -17,7 +17,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     
     // MARK: - Properties
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     private var input: Input = .orderNumber {
         
@@ -63,12 +63,12 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     
     // MARK: - Actions
     
-    @IBAction func cancel(sender: AnyObject? = nil) {
+    @IBAction func cancel(_ sender: AnyObject? = nil) {
         
-        self.dismissViewControllerAnimated(true, completion: nil)
+        self.dismiss(animated: true, completion: nil)
     }
     
-    @IBAction func addOrder(sender: AnyObject? = nil) {
+    @IBAction func addOrder(_ sender: AnyObject? = nil) {
         
         self.resignResponder(view)
         
@@ -84,7 +84,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
         }
     }
     
-    @IBAction func resignTap(sender: AnyObject? = nil) {
+    @IBAction func resignTap(_ sender: AnyObject? = nil) {
         
         self.resignResponder(view)
     }
@@ -107,7 +107,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
         updateActionButtons()
     }
     
-    private func resignResponder(view: UIView) {
+    private func resignResponder(_ view: UIView) {
         
         view.resignFirstResponder()
         
@@ -118,9 +118,9 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     private func updateActionButtons() {
         
         // update UI
-        if let actionButtonsCellIndex = cells.indexOf(.action) {
+        if let actionButtonsCellIndex = cells.index(of: .action) {
             
-            tableView.reloadRowsAtIndexPaths([NSIndexPath(forRow: actionButtonsCellIndex, inSection: 0)], withRowAnimation: .None)
+            tableView.reloadRows(at: [IndexPath(row: actionButtonsCellIndex, section: 0)], with: .none)
         }
     }
     
@@ -139,7 +139,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 controller.dismissActivityIndicator()
                 
@@ -160,7 +160,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
                     controller.showErrorMessage(error)
                 }
                 
-            case let .Value(attendees):
+            case let .value(attendees):
                 
                 controller.selectedAttendee = nil
                 controller.attendees = attendees
@@ -199,7 +199,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
         
         Store.shared.confirmAttendee(for: orderNumber, externalAttendee: selectedAttendee.identifier, summit: summit) { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
@@ -207,7 +207,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
                 
                 switch response {
                     
-                case let .Some(error):
+                case let .some(error):
                     
                     let code = (error as NSError).code
                     
@@ -226,19 +226,19 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
                         controller.showErrorMessage(error)
                     }
                     
-                case .None:
+                case .none:
                     
                     Store.shared.currentMember(for: summit) { (response) in
                         
-                        NSOperationQueue.mainQueue().addOperationWithBlock {
+                        OperationQueue.main.addOperation {
                             
                             switch response {
                                 
-                            case let .Error(error):
+                            case let .error(error):
                                 
                                 controller.showErrorMessage(error)
                                 
-                            case .Value:
+                            case .value:
                                 
                                 controller.cancel()
                             }
@@ -251,17 +251,17 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return cells.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let cell = self.cells[indexPath.row]
         
@@ -269,13 +269,13 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
             
         case .order:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.attendeeConfirmOrderTableViewCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.attendeeConfirmOrderTableViewCell)!
             
             return cell
             
         case .selection:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.attendeeConfirmSelectionTableViewCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.attendeeConfirmSelectionTableViewCell)!
             
             cell.pickerView.reloadAllComponents()
             
@@ -283,7 +283,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
             
         case .action:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.attendeeConfirmActionTableViewCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.attendeeConfirmActionTableViewCell)!
             
             let confirmEnabled: Bool
             
@@ -298,7 +298,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
                 confirmEnabled = selectedAttendee != nil
             }
             
-            cell.confirmButton.enabled = confirmEnabled
+            cell.confirmButton.isEnabled = confirmEnabled
             
             return cell
         }
@@ -306,7 +306,7 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     
     // MARK: - UITextFieldDelegate
     
-    func textFieldShouldReturn(textField: UITextField) -> Bool {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         
         textField.resignFirstResponder()
         
@@ -320,9 +320,9 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
         return true
     }
     
-    func textField(textField: UITextField, shouldChangeCharactersInRange range: NSRange, replacementString string: String) -> Bool {
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         
-        let newString = (textField.text ?? "" as NSString).stringByReplacingCharactersInRange(range, withString: string)
+        let newString = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
         
         guard let orderNumer = Int(newString)
             else { return newString.isEmpty }
@@ -334,24 +334,24 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
     
     // MARK: - UIPickerViewDataSource
     
-    func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
         
         return 1
     }
     
-    func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
         
         return attendees.count
     }
     
-    func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
         
         return attendees[row].name
     }
     
     // MARK: - UIPickerViewDelegate
     
-    func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         
         self.selectedAttendee = attendees[row]
     }
diff --git a/OpenStack Summit/OpenStack Summit/BackBarButtonItem.swift b/OpenStack Summit/OpenStack Summit/BackBarButtonItem.swift
index d03a8ca3..809aff05 100644
--- a/OpenStack Summit/OpenStack Summit/BackBarButtonItem.swift	
+++ b/OpenStack Summit/OpenStack Summit/BackBarButtonItem.swift	
@@ -12,6 +12,6 @@ extension UIViewController {
     
     func setBlankBackBarButtonItem() {
         
-        navigationItem.backBarButtonItem = UIBarButtonItem(title:"", style:.Plain, target:nil, action:nil)
+        navigationItem.backBarButtonItem = UIBarButtonItem(title:"", style:.plain, target:nil, action:nil)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/Button.swift b/OpenStack Summit/OpenStack Summit/Button.swift
index 5ef8df57..fb8eeed1 100644
--- a/OpenStack Summit/OpenStack Summit/Button.swift	
+++ b/OpenStack Summit/OpenStack Summit/Button.swift	
@@ -29,7 +29,7 @@ import UIKit
         didSet { configureView() }
     }
     
-    override var highlighted: Bool {
+    override var isHighlighted: Bool {
         
         didSet { configureView() }
     }
@@ -51,10 +51,10 @@ import UIKit
         layer.masksToBounds = cornerRadius > 0.0
         
         // background color
-        let defaultColor = self.color ?? self.backgroundColor ?? .clearColor()
+        let defaultColor = self.color ?? self.backgroundColor ?? .clear
         let selectedColor = self.selectedColor ?? defaultColor
         
-        if highlighted {
+        if isHighlighted {
             
             self.backgroundColor = selectedColor
             
diff --git a/OpenStack Summit/OpenStack Summit/CollectionViewController.swift b/OpenStack Summit/OpenStack Summit/CollectionViewController.swift
index b7964862..bd508b22 100644
--- a/OpenStack Summit/OpenStack Summit/CollectionViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/CollectionViewController.swift	
@@ -14,49 +14,49 @@ class CollectionViewController: UICollectionViewController, NSFetchedResultsCont
     
     // MARK: - Properties
     
-    final var fetchedResultsController: NSFetchedResultsController!
+    final var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
     
     final private var changes = [Change]()
     
     // MARK: - UICollectionViewDataSource
     
-    override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
+    override func numberOfSections(in collectionView: UICollectionView) -> Int {
         
         return self.fetchedResultsController?.sections?.count ?? 0
     }
     
-    override func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         
         return self.fetchedResultsController.sections?[section].numberOfObjects ?? 0
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.changes = []
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         switch type {
-        case .Insert:
+        case .insert:
             
             if let insertIndexPath = newIndexPath {
                 self.changes.append(.insert(insertIndexPath))
             }
-        case .Delete:
+        case .delete:
             
             if let deleteIndexPath = indexPath {
                 self.changes.append(.delete(deleteIndexPath))
             }
-        case .Update:
+        case .update:
             if let updateIndexPath = indexPath,
-                let _ = self.collectionView!.cellForItemAtIndexPath(updateIndexPath) {
+                let _ = self.collectionView!.cellForItem(at: updateIndexPath) {
                 
                 self.changes.append(.update(updateIndexPath))
             }
-        case .Move:
+        case .move:
             
             if let old = indexPath,
                 let new = newIndexPath {
@@ -66,12 +66,12 @@ class CollectionViewController: UICollectionViewController, NSFetchedResultsCont
         }
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
         
         self.changes.append(.section(index: sectionIndex, type: type))
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.collectionView?.performBatchUpdates({ [weak self] in
             
@@ -87,32 +87,32 @@ class CollectionViewController: UICollectionViewController, NSFetchedResultsCont
                     
                     switch type {
                         
-                    case .Insert:
+                    case .insert:
                         
-                        collectionView.insertSections(NSIndexSet(index: index))
+                        collectionView.insertSections(IndexSet(integer: index))
                         
-                    case .Delete:
+                    case .delete:
                         
-                        collectionView.deleteSections(NSIndexSet(index: index))
+                        collectionView.deleteSections(IndexSet(integer: index))
                         
                     default: break
                     }
                     
                 case let .insert(indexPath):
                     
-                    collectionView.insertItemsAtIndexPaths([indexPath])
+                    collectionView.insertItems(at: [indexPath])
                     
                 case let .delete(indexPath):
                     
-                    collectionView.deleteItemsAtIndexPaths([indexPath])
+                    collectionView.deleteItems(at: [indexPath])
                     
                 case let .update(indexPath):
                     
-                    collectionView.reloadItemsAtIndexPaths([indexPath])
+                    collectionView.reloadItems(at: [indexPath])
                     
                 case let .move(old, new):
                     
-                    collectionView.moveItemAtIndexPath(old, toIndexPath: new)
+                    collectionView.moveItem(at: old, to: new)
                 }
             }
             
@@ -127,9 +127,9 @@ private extension CollectionViewController {
     enum Change {
         
         case section(index: Int, type: NSFetchedResultsChangeType)
-        case insert(NSIndexPath)
-        case delete(NSIndexPath)
-        case update(NSIndexPath)
-        case move(old: NSIndexPath, new: NSIndexPath)
+        case insert(IndexPath)
+        case delete(IndexPath)
+        case update(IndexPath)
+        case move(old: IndexPath, new: IndexPath)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/ContextMenuViewController.swift b/OpenStack Summit/OpenStack Summit/ContextMenuViewController.swift
index 39f196e5..3b623e42 100644
--- a/OpenStack Summit/OpenStack Summit/ContextMenuViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/ContextMenuViewController.swift	
@@ -21,7 +21,7 @@ extension ContextMenuViewController {
         guard let viewController = self as? UIViewController
             else { fatalError("\(self) is not a view controller") }
         
-        let barButtonItem = UIBarButtonItem(image: R.image.contextMenu(), style: UIBarButtonItemStyle.Plain, target: self, action: #selector(UIViewController.showControllerContextMenu))
+        let barButtonItem = UIBarButtonItem(image: #imageLiteral(resourceName: "context-menu"), style: UIBarButtonItemStyle.plain, target: self, action: #selector(UIViewController.showControllerContextMenu))
         
         viewController.navigationItem.rightBarButtonItem = barButtonItem
     }
@@ -29,7 +29,7 @@ extension ContextMenuViewController {
 
 private extension UIViewController {
     
-    @objc func showControllerContextMenu(sender: UIBarButtonItem) {
+    @objc func showControllerContextMenu(_ sender: UIBarButtonItem) {
         
         guard let contextMenuViewController = self as? ContextMenuViewController
             else { fatalError("\(self) is not a ContextMenuViewController") }
@@ -42,17 +42,17 @@ private extension UIViewController {
 
 extension UIViewController {
     
-    func show(contextMenu contextMenu: ContextMenu, sender: PopoverPresentingView) {
+    func show(contextMenu: ContextMenu, sender: PopoverPresentingView) {
         
         let menuViewController: UIViewController
         
         if contextMenu.shareItems.isEmpty {
             
-            let alertViewController = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet)
+            let alertViewController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
             
             contextMenu.actions.forEach { (action) in
                 
-                let action = UIAlertAction(title: action.title, style: .Default, handler: { [weak self] _ in
+                let action = UIAlertAction(title: action.title, style: .default, handler: { [weak self] _ in
                 
                     switch action.handler {
                         
@@ -60,21 +60,21 @@ extension UIViewController {
                         
                         let viewController = handler { _ in
                             
-                            self?.dismissViewControllerAnimated(true, completion: nil)
+                            self?.dismiss(animated: true, completion: nil)
                         }
                         
                         self?.present(viewController: viewController, sender: sender)
                         
                     case let .background(handler):
                         
-                        alertViewController.dismissViewControllerAnimated(true, completion: { handler { _ in } })
+                        alertViewController.dismiss(animated: true, completion: { handler { _ in } })
                     }
                 })
                 
                 alertViewController.addAction(action)
             }
             
-            let cancel = UIAlertAction(title: "Cancel", style: .Cancel, handler: { _ in })
+            let cancel = UIAlertAction(title: "Cancel", style: .cancel, handler: { _ in })
             
             alertViewController.addAction(cancel)
             
@@ -90,8 +90,8 @@ extension UIViewController {
             
             if contextMenu.systemActions == false {
                 
-                activityViewController.excludedActivityTypes = [UIActivityTypeAddToReadingList,
-                                                                UIActivityTypeOpenInIBooks]
+                activityViewController.excludedActivityTypes = [UIActivityType.addToReadingList,
+                                                                UIActivityType.openInIBooks]
             }
             
             menuViewController = activityViewController
@@ -105,7 +105,7 @@ struct ContextMenu {
     
     var actions = [Action]()
     
-    var shareItems = [AnyObject]()
+    var shareItems = [Any]()
     
     var systemActions = true
 }
@@ -116,7 +116,7 @@ extension ContextMenu {
         
         let activityType: String
         
-        let image: (() -> UIImage)?
+        let image: UIImage?
         
         let title: String
         
@@ -124,8 +124,8 @@ extension ContextMenu {
         
         enum Handler {
             
-            case modal((Bool -> ()) -> UIViewController)
-            case background((Bool -> ()) -> ())
+            case modal((@escaping (Bool) -> ()) -> UIViewController)
+            case background((@escaping (Bool) -> ()) -> ())
         }
     }
 }
@@ -143,32 +143,32 @@ extension ContextMenu {
         super.init()
     }
     
-    override class func activityCategory() -> UIActivityCategory {
+    override class var activityCategory : UIActivityCategory {
         
-        return .Action
+        return .action
     }
     
-    override func activityType() -> String? {
+    override var activityType : UIActivityType {
         
-        return action.activityType
+        return UIActivityType(rawValue: action.activityType)
     }
     
-    override func activityTitle() -> String? {
+    override var activityTitle : String? {
         
         return action.title
     }
     
-    override func activityImage() -> UIImage? {
+    override var activityImage : UIImage? {
         
-        return action.image?()
+        return action.image
     }
     
-    override func canPerformWithActivityItems(activityItems: [AnyObject]) -> Bool {
+    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
         
         return true
     }
     
-    override func activityViewController() -> UIViewController? {
+    override var activityViewController : UIViewController? {
         
         switch action.handler {
             
@@ -182,11 +182,11 @@ extension ContextMenu {
         }
     }
     
-    override func performActivity() {
+    override func perform() {
         
         switch action.handler {
             
-        case .modal: super.performActivity()
+        case .modal: super.perform()
             
         case let .background(handler):
             
@@ -197,50 +197,50 @@ extension ContextMenu {
 
 final class OpenInSafariActivity: UIActivity {
     
-    private var url: NSURL!
+    private var url: URL!
     
-    override class func activityCategory() -> UIActivityCategory {
+    override class var activityCategory : UIActivityCategory {
         
-        return .Action
+        return .action
     }
     
-    override func activityType() -> String? {
+    override var activityType : UIActivityType {
         
-        return "\(self.dynamicType)"
+        return UIActivityType(rawValue: "\(type(of: self))")
     }
     
-    override func activityTitle() -> String? {
+    override var activityTitle : String? {
         
         return "Open in Safari"
     }
     
-    override func activityImage() -> UIImage? {
+    override var activityImage : UIImage? {
         
-        return R.image.openInSafariActivity()!
+        return #imageLiteral(resourceName: "OpenInSafariActivity")
     }
     
-    override func canPerformWithActivityItems(activityItems: [AnyObject]) -> Bool {
+    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
         
-        return url(from: activityItems) != nil
+        return self.url(from: activityItems) != nil
     }
     
-    override func prepareWithActivityItems(activityItems: [AnyObject]) {
+    override func prepare(withActivityItems activityItems: [Any]) {
         
-        self.url = url(from: activityItems)!
+        self.url = self.url(from: activityItems)!
     }
     
-    override func performActivity() {
+    override func perform() {
         
-        let completed = UIApplication.sharedApplication().openURL(self.url)
+        let completed = UIApplication.shared.openURL(self.url)
         
         self.activityDidFinish(completed)
     }
     
-    private func url(from activityItems: [AnyObject]) -> NSURL? {
+    private func url(from activityItems: [Any]) -> URL? {
         
-        return activityItems.firstMatching({ (item) in
+        return activityItems.first(where: { (item) in
             
-            if let url = item as? NSURL where UIApplication.sharedApplication().canOpenURL(url) {
+            if let url = item as? URL, UIApplication.shared.canOpenURL(url) {
                 
                 return true
                 
@@ -249,56 +249,56 @@ final class OpenInSafariActivity: UIActivity {
                 return false
             }
             
-        }) as! NSURL?
+        }) as! URL?
     }
 }
 
 final class CopyLinkActivity: UIActivity {
     
-    private var url: NSURL!
+    private var url: URL!
     
-    override class func activityCategory() -> UIActivityCategory {
+    override class var activityCategory : UIActivityCategory {
         
-        return .Action
+        return .action
     }
     
-    override func activityType() -> String? {
+    override var activityType : UIActivityType {
         
-        return "\(self.dynamicType)"
+        return UIActivityType(rawValue: "\(type(of: self))")
     }
     
-    override func activityTitle() -> String? {
+    override var activityTitle : String? {
         
         return "Copy Link"
     }
     
-    override func activityImage() -> UIImage? {
+    override var activityImage : UIImage? {
         
-        return R.image.openInSafariActivity()!
+        return #imageLiteral(resourceName: "OpenInSafariActivity")
     }
     
-    override func canPerformWithActivityItems(activityItems: [AnyObject]) -> Bool {
+    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
         
-        return url(from: activityItems) != nil
+        return self.url(from: activityItems) != nil
     }
     
-    override func prepareWithActivityItems(activityItems: [AnyObject]) {
+    override func prepare(withActivityItems activityItems: [Any]) {
         
-        self.url = url(from: activityItems)!
+        self.url = self.url(from: activityItems)!
     }
     
-    override func performActivity() {
+    override func perform() {
         
-        UIPasteboard.generalPasteboard().string = self.url.absoluteString ?? ""
+        UIPasteboard.general.string = self.url.absoluteString 
         
         self.activityDidFinish(true)
     }
     
-    private func url(from activityItems: [AnyObject]) -> NSURL? {
+    private func url(from activityItems: [Any]) -> URL? {
         
-        return activityItems.firstMatching({ (item) in
+        return activityItems.first(where: { (item) in
             
-            if let url = item as? NSURL where UIApplication.sharedApplication().canOpenURL(url) {
+            if let url = item as? NSURL, UIApplication.shared.canOpenURL(url as URL) {
                 
                 return true
                 
@@ -307,6 +307,6 @@ final class CopyLinkActivity: UIActivity {
                 return false
             }
             
-        }) as! NSURL?
+        }) as! URL?
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/CopyableLabel.swift b/OpenStack Summit/OpenStack Summit/CopyableLabel.swift
index 6f7b6b3f..1e56b307 100644
--- a/OpenStack Summit/OpenStack Summit/CopyableLabel.swift	
+++ b/OpenStack Summit/OpenStack Summit/CopyableLabel.swift	
@@ -27,44 +27,44 @@ final class CopyableLabel: UILabel {
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        userInteractionEnabled = true
+        isUserInteractionEnabled = true
     }
     
     private func setup() {
         
-        userInteractionEnabled = true
+        isUserInteractionEnabled = true
         addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(CopyableLabel.showMenu(_:))))
     }
     
     // MARK: - Actions
     
-    func showMenu(sender: AnyObject?) {
+    func showMenu(_ sender: AnyObject?) {
         
         becomeFirstResponder()
         
-        let menuController = UIMenuController.sharedMenuController()
-        if !menuController.menuVisible {
-            menuController.setTargetRect(bounds, inView: self)
+        let menuController = UIMenuController.shared
+        if !menuController.isMenuVisible {
+            menuController.setTargetRect(bounds, in: self)
             menuController.setMenuVisible(true, animated: true)
         }
     }
     
-    override func copy(sender: AnyObject?) {
+    override func copy(_ sender: Any?) {
         
-        let pasteBoard = UIPasteboard.generalPasteboard()
+        let pasteBoard = UIPasteboard.general
         pasteBoard.string = text
-        let menuController = UIMenuController.sharedMenuController()
+        let menuController = UIMenuController.shared
         menuController.setMenuVisible(false, animated: true)
     }
     
     // MARK: - Methods
     
-    override func canBecomeFirstResponder() -> Bool {
+    override var canBecomeFirstResponder : Bool {
         
         return true
     }
     
-    override func canPerformAction(action: Selector, withSender sender: AnyObject?) -> Bool {
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
         
         switch action {
             
diff --git a/OpenStack Summit/OpenStack Summit/CoreSpotlight.swift b/OpenStack Summit/OpenStack Summit/CoreSpotlight.swift
index 4b56422b..e8714572 100644
--- a/OpenStack Summit/OpenStack Summit/CoreSpotlight.swift	
+++ b/OpenStack Summit/OpenStack Summit/CoreSpotlight.swift	
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import SwiftFoundation
+import Foundation
 import CoreSpotlight
 import MobileCoreServices
 import CoreSummit
@@ -43,23 +43,23 @@ extension Event: CoreSpotlightSearchable {
     
     func toSearchableItem() -> CSSearchableItem {
         
-        let attributeSet = CSSearchableItemAttributeSet(itemContentType: self.dynamicType.itemContentType)
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: type(of: self).itemContentType)
         
         attributeSet.displayName = name
-        attributeSet.startDate = start.toFoundation()
-        attributeSet.endDate = end.toFoundation()
+        attributeSet.startDate = start
+        attributeSet.endDate = end
         
         let tags = self.tags.map { $0.name }
         attributeSet.keywords = tags
         
         if let descriptionText = self.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType, NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             attributeSet.contentDescription = attributedString.string
         }
         
-        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: self.dynamicType.searchDomain, attributeSet: attributeSet)
+        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: type(of: self).searchDomain, attributeSet: attributeSet)
     }
 }
 
@@ -72,7 +72,7 @@ extension Speaker: CoreSpotlightSearchable {
     
     func toSearchableItem() -> CSSearchableItem {
         
-        let attributeSet = CSSearchableItemAttributeSet(itemContentType: self.dynamicType.itemContentType)
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: type(of: self).itemContentType)
         
         attributeSet.displayName = name
         attributeSet.contentDescription = title
@@ -86,7 +86,7 @@ extension Speaker: CoreSpotlightSearchable {
             attributeSet.thumbnailData = NSData(contentsOfURL: imageURL)
         }*/
         
-        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: self.dynamicType.searchDomain, attributeSet: attributeSet)
+        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: type(of: self).searchDomain, attributeSet: attributeSet)
     }
 }
 
@@ -99,20 +99,20 @@ extension Video: CoreSpotlightSearchable {
     
     func toSearchableItem() -> CSSearchableItem {
         
-        let attributeSet = CSSearchableItemAttributeSet(itemContentType: self.dynamicType.itemContentType)
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: type(of: self).itemContentType)
         
         attributeSet.displayName = name
         
         if let descriptionText = self.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             attributeSet.contentDescription = attributedString.string
         }
         
         attributeSet.local = false
         
-        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: self.dynamicType.searchDomain, attributeSet: attributeSet)
+        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: type(of: self).searchDomain, attributeSet: attributeSet)
     }
 }
 
@@ -125,24 +125,24 @@ extension Venue: CoreSpotlightSearchable {
     
     func toSearchableItem() -> CSSearchableItem {
         
-        let attributeSet = CSSearchableItemAttributeSet(itemContentType: self.dynamicType.itemContentType)
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: type(of: self).itemContentType)
         
         attributeSet.displayName = name
         
         if let descriptionText = self.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             attributeSet.contentDescription = attributedString.string
         }
         
         attributeSet.country = country
         attributeSet.city = city
-        attributeSet.longitude = location?.longitude
-        attributeSet.latitude = location?.latitude
+        attributeSet.longitude = location?.longitude as NSNumber?
+        attributeSet.latitude = location?.latitude as NSNumber?
         attributeSet.namedLocation = name
         
-        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: self.dynamicType.searchDomain, attributeSet: attributeSet)
+        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: type(of: self).searchDomain, attributeSet: attributeSet)
     }
 }
 
@@ -155,20 +155,20 @@ extension VenueRoom: CoreSpotlightSearchable {
     
     func toSearchableItem() -> CSSearchableItem {
         
-        let attributeSet = CSSearchableItemAttributeSet(itemContentType: self.dynamicType.itemContentType)
+        let attributeSet = CSSearchableItemAttributeSet(itemContentType: type(of: self).itemContentType)
         
         attributeSet.displayName = name
         
         if let descriptionText = self.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             attributeSet.contentDescription = attributedString.string
         }
         
         attributeSet.namedLocation = name
         
-        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: self.dynamicType.searchDomain, attributeSet: attributeSet)
+        return CSSearchableItem(uniqueIdentifier: searchIdentifier, domainIdentifier: type(of: self).searchDomain, attributeSet: attributeSet)
     }
 }
 
@@ -180,32 +180,32 @@ final class SpotlightController: NSObject, NSFetchedResultsControllerDelegate {
     
     static let shared = SpotlightController()
     
-    let spotlightIndex = CSSearchableIndex.defaultSearchableIndex()
+    let spotlightIndex = CSSearchableIndex.default()
     
     var log: ((String) -> ())?
     
-    private let queue = dispatch_queue_create("CoreSpotlight Update Queue", nil)
+    private let queue = DispatchQueue(label: "CoreSpotlight Update Queue")
     
     deinit {
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
 
     private override init() {
         
         super.init()
         
-        NSNotificationCenter.defaultCenter().addObserver(
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(managedObjectContextObjectsDidChange),
-            name: NSManagedObjectContextObjectsDidChangeNotification,
+            name: NSNotification.Name.NSManagedObjectContextObjectsDidChange,
             object: Store.shared.managedObjectContext)
         
     }
     
     @objc private func managedObjectContextObjectsDidChange(notification: NSNotification) {
         
-        func completionHandler(error: NSError?) {
+        func completionHandler(error: Swift.Error?) {
             
             if let error = error {
                 
@@ -223,12 +223,12 @@ final class SpotlightController: NSObject, NSFetchedResultsControllerDelegate {
         
         if let updatedObjects = notification.userInfo?[NSUpdatedObjectsKey] as! Set<NSManagedObject>? {
             
-            indexableManagedObjects.appendContentsOf(updatedObjects)
+            indexableManagedObjects.append(contentsOf: updatedObjects)
         }
         
         if let insertedObjects = notification.userInfo?[NSInsertedObjectsKey] as! Set<NSManagedObject>? {
             
-            indexableManagedObjects.appendContentsOf(insertedObjects)
+            indexableManagedObjects.append(contentsOf: insertedObjects)
         }
         
         if indexableManagedObjects.isEmpty == false {
@@ -253,7 +253,7 @@ final class SpotlightController: NSObject, NSFetchedResultsControllerDelegate {
             
             if searchableItems.isEmpty == false {
                 
-                spotlightIndex.deleteSearchableItemsWithIdentifiers(searchableItems, completionHandler: completionHandler)
+                spotlightIndex.deleteSearchableItems(withIdentifiers: searchableItems, completionHandler: completionHandler)
             }
         }
     }
diff --git a/OpenStack Summit/OpenStack Summit/CreateTeamViewController.swift b/OpenStack Summit/OpenStack Summit/CreateTeamViewController.swift
index dfc0c680..6c220b5d 100644
--- a/OpenStack Summit/OpenStack Summit/CreateTeamViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/CreateTeamViewController.swift	
@@ -9,7 +9,7 @@
 import Foundation
 import CoreData
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import JGProgressHUD
 
@@ -17,24 +17,24 @@ final class CreateTeamViewController: UITableViewController, ActivityViewControl
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var nameTextField: UITextField!
+    @IBOutlet private(set) weak var nameTextField: UITextField!
     
-    @IBOutlet weak var descriptionTextField: UITextField!
+    @IBOutlet private(set) weak var descriptionTextField: UITextField!
     
     // MARK: - Properties
     
     var completion: (done: (CreateTeamViewController) -> (), cancel: (CreateTeamViewController) -> ())?
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Actions
     
-    @IBAction func cancel(sender: AnyObject? = nil) {
+    @IBAction func cancel(_ sender: AnyObject? = nil) {
         
         self.completion?.cancel(self)
     }
     
-    @IBAction func done(sender: AnyObject? = nil) {
+    @IBAction func done(_ sender: AnyObject? = nil) {
         
         let name = self.nameTextField.text ?? ""
         
@@ -44,7 +44,7 @@ final class CreateTeamViewController: UITableViewController, ActivityViewControl
         
         Store.shared.create(team: name, description: description) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -52,11 +52,11 @@ final class CreateTeamViewController: UITableViewController, ActivityViewControl
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error as NSError)
                     
-                case .Value:
+                case .value:
                     
                     controller.completion?.done(controller)
                 }
diff --git a/OpenStack Summit/OpenStack Summit/DataUpdatePoller.swift b/OpenStack Summit/OpenStack Summit/DataUpdatePoller.swift
index 6e070304..3ab7b736 100644
--- a/OpenStack Summit/OpenStack Summit/DataUpdatePoller.swift	
+++ b/OpenStack Summit/OpenStack Summit/DataUpdatePoller.swift	
@@ -21,7 +21,8 @@ extension DataUpdatePoller {
                 
                 poller.summit = SummitManager.shared.summit.value
                 
-                SummitManager.shared.summit.observe { poller.summit = $0.0 }
+                // we never deinit, so no need to remove observer
+                let _ = SummitManager.shared.summit.observe { poller.summit = $0.0 }
                 
                 return poller
             }()
diff --git a/OpenStack Summit/OpenStack Summit/Define.swift b/OpenStack Summit/OpenStack Summit/Define.swift
index 769fc4c8..da265820 100755
--- a/OpenStack Summit/OpenStack Summit/Define.swift	
+++ b/OpenStack Summit/OpenStack Summit/Define.swift	
@@ -11,17 +11,17 @@ import enum CoreSummit.Environment
 import protocol CoreSummit.Configuration
 
 /// Version of the app.
-public let AppVersion = NSBundle.mainBundle().infoDictionary!["CFBundleShortVersionString"] as! String
+public let AppVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
 
 /// Build of the app.
-public let AppBuild = Int(NSBundle.mainBundle().infoDictionary!["CFBundleVersion"] as! String)!
+public let AppBuild = Int(Bundle.main.infoDictionary!["CFBundleVersion"] as! String)!
 
 #if os(iOS) || os(tvOS) || os(OSX)
     
 /// The app's environment.
 let AppEnvironment: Environment = {
     
-    let environmentString = NSBundle.mainBundle().infoDictionary!["SummitEnvironment"] as! String
+    let environmentString = Bundle.main.infoDictionary!["SummitEnvironment"] as! String
     
     guard let environment = Environment(rawValue: environmentString)
         else { fatalError("Invalid Environment: \(environmentString)") }
@@ -31,9 +31,9 @@ let AppEnvironment: Environment = {
 
 #elseif os(watchOS)
     #if Production
-    let AppEnvironment = Environment.Production
+    let AppEnvironment = Environment.production
     #elseif Staging
-    let AppEnvironment = Environment.Staging
+    let AppEnvironment = Environment.staging
     #endif
 #endif
 
diff --git a/OpenStack Summit/OpenStack Summit/DetailImageTableViewCell.swift b/OpenStack Summit/OpenStack Summit/DetailImageTableViewCell.swift
index ad3ba621..8c9d98a1 100644
--- a/OpenStack Summit/OpenStack Summit/DetailImageTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/DetailImageTableViewCell.swift	
@@ -16,7 +16,7 @@ final class DetailImageTableViewCell: UITableViewCell {
     typealias Label = UILabel
     #endif
     
-    @IBOutlet weak var detailImageView: UIImageView!
+    @IBOutlet private(set) weak var detailImageView: UIImageView!
     
-    @IBOutlet weak var titleLabel: Label!
+    @IBOutlet private(set) weak var titleLabel: Label!
 }
diff --git a/OpenStack Summit/OpenStack Summit/EmailComposerViewController.swift b/OpenStack Summit/OpenStack Summit/EmailComposerViewController.swift
index 0a3b691a..11a20b6b 100644
--- a/OpenStack Summit/OpenStack Summit/EmailComposerViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EmailComposerViewController.swift	
@@ -35,6 +35,6 @@ extension EmailComposerViewController {
         
         composerVC.mailComposeDelegate = self
         
-        viewController.presentViewController(composerVC, animated: true, completion: nil)
+        viewController.present(composerVC, animated: true, completion: nil)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/Error.swift b/OpenStack Summit/OpenStack Summit/Error.swift
index 351bef06..900350a3 100644
--- a/OpenStack Summit/OpenStack Summit/Error.swift	
+++ b/OpenStack Summit/OpenStack Summit/Error.swift	
@@ -8,13 +8,13 @@
 
 import Foundation
 
-struct Error {
+struct AppError {
     
     static let domain = "org.openstack.ios.summit"
     
-    static let getSpeakerProfile = NSError(domain: Error.domain, code: 9001, userInfo: [NSLocalizedDescriptionKey: "There was an error getting speaker data"])
+    static let getSpeakerProfile = NSError(domain: AppError.domain, code: 9001, userInfo: [NSLocalizedDescriptionKey: "There was an error getting speaker data"])
     
-    static let getMemberProfile = NSError(domain: Error.domain, code: 9001, userInfo: [NSLocalizedDescriptionKey: "There was an error getting member data"])
+    static let getMemberProfile = NSError(domain: AppError.domain, code: 9001, userInfo: [NSLocalizedDescriptionKey: "There was an error getting member data"])
     
-    static let reachability = NSError(domain: Error.domain, code: 13002, userInfo: [NSLocalizedDescriptionKey: "There is no network connectivity."])
+    static let reachability = NSError(domain: AppError.domain, code: 13002, userInfo: [NSLocalizedDescriptionKey: "There is no network connectivity."])
 }
diff --git a/OpenStack Summit/OpenStack Summit/ErrorAlert.swift b/OpenStack Summit/OpenStack Summit/ErrorAlert.swift
index c3043416..6c536178 100644
--- a/OpenStack Summit/OpenStack Summit/ErrorAlert.swift	
+++ b/OpenStack Summit/OpenStack Summit/ErrorAlert.swift	
@@ -12,31 +12,31 @@ import UIKit
 public extension UIViewController {
     
     /** Presents an error alert controller with the specified completion handlers.  */
-    func showErrorAlert(localizedText: String, okHandler: (() -> ())? = nil, retryHandler: (()-> ())? = nil) {
+    func showErrorAlert(_ localizedText: String, okHandler: (() -> ())? = nil, retryHandler: (()-> ())? = nil) {
         
         let alert = UIAlertController(title: NSLocalizedString("Error", comment: "Error"),
             message: localizedText,
-            preferredStyle: UIAlertControllerStyle.Alert)
+            preferredStyle: UIAlertControllerStyle.alert)
         
-        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: UIAlertActionStyle.Default, handler: { (UIAlertAction) -> Void in
+        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: UIAlertActionStyle.default, handler: { (UIAlertAction) -> Void in
             
             okHandler?()
             
-            alert.dismissViewControllerAnimated(true, completion: nil)
+            alert.dismiss(animated: true, completion: nil)
         }))
         
         // optionally add retry button
         
         if retryHandler != nil {
             
-            alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: "Retry"), style: UIAlertActionStyle.Default, handler: { (UIAlertAction) -> Void in
+            alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: "Retry"), style: UIAlertActionStyle.default, handler: { (UIAlertAction) -> Void in
                 
                 retryHandler!()
                 
-                alert.dismissViewControllerAnimated(true, completion: nil)
+                alert.dismiss(animated: true, completion: nil)
             }))
         }
         
-        self.presentViewController(alert, animated: true, completion: nil)
+        self.present(alert, animated: true, completion: nil)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/EventDetail.swift b/OpenStack Summit/OpenStack Summit/EventDetail.swift
index 1e2d953f..ca0e8e25 100644
--- a/OpenStack Summit/OpenStack Summit/EventDetail.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventDetail.swift	
@@ -7,53 +7,54 @@
 //
 
 import Foundation
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
-public struct EventDetail: CoreDataDecodable {
-    
-    // MARK: - Properties
+struct EventDetail {
     
-    public let identifier: Identifier
-    public let name: String
-    public let summit: Identifier
-    public let start: Date
-    public let end: Date
-    public let timeZone: String
-    public let dateTime: String
-    public let day: String
-    public let time: String
-    public let location: String
-    public let track: String
-    public let sponsors: String
-    public let eventType: String
-    public let trackGroupColor: String
+    let identifier: Identifier
+    let name: String
+    let summit: Identifier
+    let start: Date
+    let end: Date
+    let timeZone: String
+    let dateTime: String
+    let day: String
+    let time: String
+    let location: String
+    let track: String
+    let sponsors: String
+    let eventType: String
+    let trackGroupColor: String
     
-    public let venue: Location?
-    public let eventDescription: String
-    public let socialDescription: String
-    public let tags: String
-    public let speakers: [SpeakerDetail]
-    public let finished: Bool
-    public let allowFeedback: Bool
-    public let level: String
-    public let averageFeedback: Double
-    public let video: Video?
-    public let willRecord: Bool
-    public let rsvp: String
-    public let externalRSVP: Bool
-    public let attachment: String
-    public let webpageURL: NSURL
-    
-    // MARK: - Initialization
+    let venue: Location?
+    let eventDescription: String
+    let socialDescription: String
+    let tags: String
+    let speakers: [SpeakerDetail]
+    let finished: Bool
+    let allowFeedback: Bool
+    let level: String
+    let averageFeedback: Double
+    let video: Video?
+    let willRecord: Bool
+    let rsvp: URL?
+    let externalRSVP: Bool
+    let attachment: URL?
+    let webpage: URL
+}
+
+// MARK: - CoreData
+
+extension EventDetail: CoreDataDecodable {
     
-    public init(managedObject event: EventManagedObject) {
+    init(managedObject event: EventManagedObject) {
         
-        self.identifier = event.identifier
+        self.identifier = event.id
         self.name = event.name
-        self.summit = event.summit.identifier
-        self.start = Date(foundation: event.start)
-        self.end = Date(foundation: event.end)
+        self.summit = event.summit.id
+        self.start = event.start
+        self.end = event.end
         self.timeZone = event.summit.timeZone
         self.eventType = event.eventType.name
         self.location = ScheduleItem.getLocation(event)
@@ -63,10 +64,10 @@ public struct EventDetail: CoreDataDecodable {
         self.track = ScheduleItem.getTrack(event)
         self.sponsors = ScheduleItem.getSponsors(event)
         self.trackGroupColor = ScheduleItem.getTrackGroupColor(event)
-        self.rsvp = event.rsvp ?? ""
+        self.rsvp = URL(string: event.rsvp ?? "")
         self.externalRSVP = event.externalRSVP
         self.willRecord = event.willRecord
-        self.attachment = event.attachment ?? Slide.from(managedObjects: event.slides).ordered().first?.link ?? ""
+        self.attachment = URL(string: event.attachment ?? "") ?? Slide.from(managedObjects: event.slides).ordered().first?.link
         
         if let locationManagedObject = event.location {
             
@@ -77,7 +78,7 @@ public struct EventDetail: CoreDataDecodable {
             self.venue = nil
         }
         
-        self.finished = event.end.compare(NSDate()) == .OrderedAscending
+        self.finished = event.end.compare(NSDate() as Date) == .orderedAscending
         self.eventDescription = event.descriptionText ?? ""
         self.socialDescription = event.socialDescription ?? ""
         self.allowFeedback = event.allowFeedback
@@ -96,8 +97,8 @@ public struct EventDetail: CoreDataDecodable {
         
         var speakers = [SpeakerDetail]()
         
-        if let managedObject = event.presentation.moderator
-            where managedObject.id > 0 {
+        if let managedObject = event.presentation.moderator,
+            managedObject.id > 0 {
             
             let moderatorSpeaker = CoreSummit.Speaker(managedObject: managedObject)
             let speakerDetail = SpeakerDetail(speaker: moderatorSpeaker, isModerator: true)
@@ -110,61 +111,49 @@ public struct EventDetail: CoreDataDecodable {
         
         speakers += presentationSpeakers
         
-        self.speakers = speakers.sort()
+        self.speakers = speakers.sorted()
         
-        if let videoManagedObject = event.videos.first {
-            
-            self.video = Video(managedObject: videoManagedObject)
-            
-        } else {
-            
-            self.video = nil
-        }
+        self.video = Video.from(managedObjects: event.videos).sorted().first
         
         let summit = Summit(managedObject: event.summit)
         
-        let webpageURLString = Event(managedObject: event).toWebpageURL(summit)
-        
-        guard let webpageURL = NSURL(string: webpageURLString)
-            else { fatalError("Invalid URL \(webpageURLString)") }
-        
-        self.webpageURL = webpageURL
+        self.webpage = Event(managedObject: event).webpage(for: summit)
     }
 }
 
 // MARK: - Supporting Types
 
-public extension EventDetail {
+extension EventDetail {
     
-    public struct SpeakerDetail: Person {
+    struct SpeakerDetail: Person {
         
-        public let identifier: Identifier
+        let identifier: Identifier
         
-        public let firstName: String
+        let firstName: String
         
-        public let lastName: String
+        let lastName: String
         
-        public let title: String?
+        let title: String?
         
-        public let pictureURL: String
+        let picture: URL
         
-        public let twitter: String?
+        let twitter: String?
         
-        public let irc: String?
+        let irc: String?
         
-        public var linkedIn: String? { return nil }
+        var linkedIn: String? { return nil }
         
-        public let biography: String?
+        let biography: String?
         
-        public let isModerator: Bool
+        let isModerator: Bool
                 
-        private init(speaker: Speaker, isModerator: Bool = false) {
+        fileprivate init(speaker: Speaker, isModerator: Bool = false) {
             
             self.identifier = speaker.identifier
             self.firstName = speaker.firstName
             self.lastName = speaker.lastName
             self.title = speaker.title
-            self.pictureURL = speaker.pictureURL
+            self.picture = speaker.picture
             self.twitter = speaker.twitter
             self.irc = speaker.irc
             self.biography = speaker.biography
@@ -173,13 +162,13 @@ public extension EventDetail {
     }
 }
 
-public func == (lhs: EventDetail.SpeakerDetail, rhs: EventDetail.SpeakerDetail) -> Bool {
+func == (lhs: EventDetail.SpeakerDetail, rhs: EventDetail.SpeakerDetail) -> Bool {
     
     return lhs.identifier == rhs.identifier
         && lhs.firstName == rhs.firstName
         && lhs.lastName == rhs.lastName
         && lhs.title == rhs.title
-        && lhs.pictureURL == rhs.pictureURL
+        && lhs.picture == rhs.picture
         && lhs.twitter == rhs.twitter
         && lhs.irc == rhs.irc
         && lhs.biography == rhs.biography
diff --git a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift
index 4f6cccb8..2303cb03 100755
--- a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
@@ -9,12 +9,12 @@
 import UIKit
 import Haneke
 import Cosmos
-import AHKActionSheet
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import XCDYouTubeKit
 import EventKit
 import JGProgressHUD
+import Predicate
     
 final class EventDetailViewController: UITableViewController, EventViewController, ActivityViewController, MessageEnabledViewController, TextViewController, ContextMenuViewController {
     
@@ -29,7 +29,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
     var event: Identifier!
     var eventRequestInProgress = false
     lazy var eventStore: EKEventStore = EKEventStore()
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     var contextMenu: ContextMenu { return contextMenu(for: eventDetail) }
     
     // MARK: - Private Properties
@@ -61,7 +61,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         // must be set later, or else will trigger datasource methods with nil `self.eventDetail`
         defer { tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: 20)) }
         // https://github.com/mac-cain13/R.swift/issues/144
-        tableView.registerNib(R.nib.tableViewHeaderViewLight(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
+        tableView.register(R.nib.tableViewHeaderViewLight(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
         
         // entityController 
         entityController = EntityController(identifier: event, entity: EventManagedObject.self, context: Store.shared.managedObjectContext)
@@ -88,7 +88,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         self.updateUI()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         // handoff
@@ -105,32 +105,33 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         loadFeedback()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
         self.userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue,
-                        AppActivityUserInfo.identifier.rawValue: self.event]
+                        AppActivityUserInfo.identifier.rawValue: self.event] as [String : Any]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - Actions
     
-    @IBAction func playVideo(sender: UIButton) {
+    @IBAction func playVideo(_ sender: UIButton) {
         
-        assert(eventDetail.video != nil, "No video")
+        guard let video = eventDetail.video
+            else { fatalError("No video") }
         
-        self.playVideo(eventDetail.video!)
+        self.play(video: video)
     }
     
-    @IBAction func favoriteAction(sender: UIButton) {
+    @IBAction func favoriteAction(_ sender: UIButton) {
         
         guard eventRequestInProgress == false else { return }
         
@@ -140,7 +141,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         self.toggleFavorite(for: eventDetail)
     }
     
-    @IBAction func scheduleAction(sender: UIButton) {
+    @IBAction func scheduleAction(_ sender: UIButton) {
         
         guard eventRequestInProgress == false else { return }
         
@@ -150,7 +151,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         self.toggleScheduledStatus(for: eventDetail)
     }
     
-    @IBAction func rateAction(sender: UIButton) {
+    @IBAction func rateAction(_ sender: UIButton) {
         
         guard Store.shared.isLoggedIn
             else { showErrorAlert("Login to use this function"); return }
@@ -161,25 +162,25 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         guard eventDetail.start < Date()
             else { showErrorAlert("Can only rate after event has started."); return }
         
-        let viewController = self.feedbackController(for: eventDetail) { $0.dismissViewControllerAnimated(true, completion: nil) }
+        let viewController = self.feedbackController(for: eventDetail) { $0.dismiss(animated: true, completion: nil) }
         
-        self.presentViewController(viewController, animated: true, completion: nil)
+        self.present(viewController, animated: true, completion: nil)
     }
     
-    @IBAction func rsvp(sender: AnyObject? = nil) {
+    @IBAction func rsvp(_ sender: AnyObject? = nil) {
         
-        guard let url = NSURL(string: eventDetail.rsvp)
-            else { return }
+        guard let url = eventDetail?.rsvp
+            else { fatalError("No URL") }
         
-        UIApplication.sharedApplication().openURL(url)
+        UIApplication.shared.openURL(url)
     }
     
-    @IBAction func showAttachment(sender: AnyObject? = nil) {
+    @IBAction func showAttachment(_ sender: AnyObject? = nil) {
         
-        guard let url = NSURL(string: eventDetail.attachment)
-            else { return }
+        guard let url = eventDetail?.attachment
+            else { fatalError("No URL") }
         
-        UIApplication.sharedApplication().openURL(url)
+        UIApplication.shared.openURL(url)
     }
     
     // MARK: - Private Methods
@@ -194,10 +195,10 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         // handle event deletion
         guard let eventManagedObject = try! EventManagedObject.find(event, context: context) else {
             
-            self.view.userInteractionEnabled = false
+            self.view.isUserInteractionEnabled = false
             self.navigationItem.rightBarButtonItems = []
             showErrorAlert("The event has been deleted.",
-                           okHandler: { self.navigationController?.popToRootViewControllerAnimated(true) })
+                           okHandler: { self.navigationController?.popToRootViewController(animated: true) })
             return
         }
         
@@ -213,7 +214,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         
         self.data.append(.description)
         
-        if eventDetail.attachment.isEmpty == false {
+        if eventDetail.attachment != nil {
             
             data.append(.attachment)
         }
@@ -232,18 +233,18 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         
         titleHeader.titleLabel.text = eventDetail.name
         titleHeader.trackLabel.text = eventDetail.track
-        titleHeader.trackLabel.textColor = UIColor(hexString: eventDetail.trackGroupColor) ?? .whiteColor()
-        titleHeader.trackLabel.hidden = eventDetail.track.isEmpty
+        titleHeader.trackLabel.textColor = UIColor(hexString: eventDetail.trackGroupColor) ?? .white
+        titleHeader.trackLabel.isHidden = eventDetail.track.isEmpty
         
-        titleHeader.scheduleButton.setTitle(eventDetail.rsvp.isEmpty ? "Schedule" : "RSVP", forState: .Normal)
+        titleHeader.scheduleButton.setTitle(eventDetail.rsvp == nil ? "Schedule" : "RSVP", for: UIControlState())
         
         let didConfirm = Store.shared.isEventScheduledByLoggedMember(event: event)
         let isFavorite = Store.shared.authenticatedMember?.isFavorite(event: event) ?? false
         
-        titleHeader.scheduleButton.highlighted = didConfirm
-        titleHeader.favoriteButton.highlighted = isFavorite
+        titleHeader.scheduleButton.isHighlighted = didConfirm
+        titleHeader.favoriteButton.isHighlighted = isFavorite
         
-        titleHeader.favoriteButton.hidden = !eventDetail.willRecord
+        titleHeader.favoriteButton.isHidden = !eventDetail.willRecord
 
         // action buttons
         
@@ -272,7 +273,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         // set user activity for handoff
         let userActivity = NSUserActivity(activityType: AppActivity.view.rawValue)
         userActivity.title = eventDetail.name
-        userActivity.webpageURL = eventDetail.webpageURL
+        userActivity.webpageURL = eventDetail.webpage
         userActivity.requiredUserInfoKeys = [AppActivityUserInfo.type.rawValue, AppActivityUserInfo.identifier.rawValue]
         userActivity.userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue, AppActivityUserInfo.identifier.rawValue: self.event]
         
@@ -292,7 +293,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         
         Store.shared.feedback(self.eventDetail.summit, event: self.event, page: nextPage, objectsPerPage: 5) { [weak self] (response) in
             
-            dispatch_async(dispatch_get_main_queue()) {
+            DispatchQueue.main.async {
                 
                 guard let controller = self else { return }
                 
@@ -302,11 +303,11 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     print("Error loading feedback: \(error)")
                     
-                case let .Value(feedbackPage):
+                case let .value(feedbackPage):
                     
                     controller.currentFeedbackPage = feedbackPage
                     controller.loadedAllFeedback = feedbackPage.items.isEmpty
@@ -329,7 +330,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         
         Store.shared.averageFeedback(summit, event: event) { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -337,11 +338,11 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error)
                     
-                case .Value:
+                case .value:
                     
                     controller.configureAverageRatingView()
                 }
@@ -349,21 +350,21 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         }
     }
     
-    private func configure(cell cell: PeopleTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: PeopleTableViewCell, at indexPath: IndexPath) {
         
         assert(indexPath.section == Section.speakers.rawValue, "\(indexPath.section) is not speaker section")
         
         let speaker = eventDetail.speakers[indexPath.row]
         cell.name = speaker.name
-        cell.title = speaker.title
-        cell.pictureURL = speaker.pictureURL
+        cell.title = speaker.title ?? ""
+        cell.picture = speaker.picture
         cell.isModerator = speaker.isModerator
         
-        cell.layoutMargins = UIEdgeInsetsZero
-        cell.separatorInset = UIEdgeInsetsZero
+        cell.layoutMargins = UIEdgeInsets.zero
+        cell.separatorInset = UIEdgeInsets.zero
     }
     
-    private func configure(cell cell: EventDetailFeedbackTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: EventDetailFeedbackTableViewCell, at indexPath: IndexPath) {
         
         assert(indexPath.section == Section.feedback.rawValue, "\(indexPath.section) is not feedback section")
         
@@ -376,11 +377,11 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
     
     private func configureAverageRatingView() {
         
-        feedBackHeader.averageRatingLabel.hidden = loadingAverageRating
-        feedBackHeader.averageRatingView.hidden = loadingAverageRating
+        feedBackHeader.averageRatingLabel.isHidden = loadingAverageRating
+        feedBackHeader.averageRatingView.isHidden = loadingAverageRating
         feedBackHeader.averageRatingLabel.text = "\(eventCache.averageFeedback)"
         feedBackHeader.averageRatingView.rating = eventCache.averageFeedback
-        feedBackHeader.averageRatingActivityIndicator.hidden = loadingAverageRating == false
+        feedBackHeader.averageRatingActivityIndicator.isHidden = loadingAverageRating == false
         
         if loadingFeedback {
             
@@ -412,12 +413,12 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return Section.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let section = Section(rawValue: section)!
         
@@ -428,7 +429,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         }
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let section = Section(rawValue: indexPath.section)!
         
@@ -442,23 +443,23 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
             case .video:
                 
-                let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailVideoTableViewCell, forIndexPath: indexPath)!
+                let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailVideoTableViewCell, for: indexPath)!
                 
                 guard let video = self.eventDetail?.video
                     else { fatalError("Event has no video") }
                 
                 cell.videoImageView.image = nil
-                cell.playButton.hidden = true
-                cell.activityIndicator.hidden = false
+                cell.playButton.isHidden = true
+                cell.activityIndicator.isHidden = false
                 cell.activityIndicator.startAnimating()
                 
-                guard let thumbnailURL = NSURL(youtubeThumbnail: video.youtube)
+                guard let thumbnailURL = Foundation.URL(youtubeThumbnail: video.youtube)
                     else { return cell }
                 
-                cell.videoImageView.hnk_setImageFromURL(thumbnailURL, success: { (image) in
+                cell.videoImageView.hnk_setImageFromURL(thumbnailURL.environmentScheme, success: { (image) in
                     
-                    cell.playButton.hidden = false
-                    cell.activityIndicator.hidden = true
+                    cell.playButton.isHidden = false
+                    cell.activityIndicator.isHidden = true
                     cell.activityIndicator.stopAnimating()
                     cell.videoImageView.image = image
                 })
@@ -467,7 +468,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
             case .description:
                 
-                let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailDescriptionTableViewCell, forIndexPath: indexPath)!
+                let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailDescriptionTableViewCell, for: indexPath)!
                 
                 // date and time
                 
@@ -476,12 +477,12 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
                 // video
                 
-                cell.willRecordImageView.hidden = eventDetail.willRecord == false
+                cell.willRecordImageView.isHidden = eventDetail.willRecord == false
                 
                 // description text
                 
                 let eventDescriptionHTML = String(format:"<style>p:last-of-type { display:compact }</style><span style=\"font-family: OpenSans; font-size: 13\">%@</span>", eventDetail.eventDescription)
-                if let data = eventDescriptionHTML.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: false),
+                if let data = eventDescriptionHTML.data(using: String.Encoding.unicode, allowLossyConversion: false),
                     let attrStr = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil) {
                     
                     cell.descriptionTextView.attributedText = attrStr
@@ -491,7 +492,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                     cell.descriptionTextView.text = ""
                 }
                 
-                cell.descriptionTextView.textContainerInset = UIEdgeInsetsZero
+                cell.descriptionTextView.textContainerInset = UIEdgeInsets.zero
                 cell.descriptionTextView.delegate = self
                 
                 // sponsors
@@ -504,7 +505,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
             case .location:
                 
-                let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailTableViewCell, forIndexPath: indexPath)!
+                let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailTableViewCell, for: indexPath)!
                 
                 cell.sectionLabel.text = "VENUE"
                 cell.valueLabel.text = eventDetail.location
@@ -513,7 +514,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
             case .level:
                 
-                let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailTableViewCell, forIndexPath: indexPath)!
+                let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailTableViewCell, for: indexPath)!
                 
                 cell.sectionLabel.text = "LEVEL"
                 cell.valueLabel.text = eventDetail.level
@@ -522,17 +523,17 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
             case .attachment:
                 
-                let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailDownloadAttachmentTableViewCell, forIndexPath: indexPath)!
+                let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailDownloadAttachmentTableViewCell, for: indexPath)!
                 
                 let title = eventDetail.eventType == "Presentation" ? "Download slides" : "Download attachment"
-                cell.downloadButton.setTitle(title, forState: .Normal)
+                cell.downloadButton.setTitle(title, for: .normal)
                 
                 return cell
             }
             
         case .speakers:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.speakerTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.speakerTableViewCell, for: indexPath)!
             
             configure(cell: cell, at: indexPath)
             
@@ -540,7 +541,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
             
         case .feedback:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailFeedbackTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.eventDetailFeedbackTableViewCell, for: indexPath)!
             
             configure(cell: cell, at: indexPath)
             
@@ -558,9 +559,9 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         let section = Section(rawValue: indexPath.section)!
         
@@ -577,15 +578,18 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 guard let venue = eventDetail.venue
                     else { return }
                 
-                showLocationDetail(venue.identifier)
+                show(location: venue.identifier)
                 
             case .level:
                 
+                guard let level = eventCache.presentation.level
+                    else { fatalError("No level for event:\n\(eventCache)") }
+                
                 let levelScheduleViewController = R.storyboard.schedule.levelScheduleViewController()!
                 
-                levelScheduleViewController.level = eventDetail.level
+                levelScheduleViewController.level = level
                 
-                self.showViewController(levelScheduleViewController, sender: self)
+                self.show(levelScheduleViewController, sender: self)
                 
             default: break
             }
@@ -596,23 +600,23 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
             
             let memberViewController = MemberProfileViewController(profile: PersonIdentifier.speaker(speaker.identifier))
             
-            self.showViewController(memberViewController, sender: self)
+            self.show(memberViewController, sender: self)
             
         case .feedback:
             
             let feedback = feedbackList[indexPath.row]
             
-            guard feedback.member.identifier == Store.shared.authenticatedMember?.identifier
+            guard feedback.member.identifier == Store.shared.authenticatedMember?.id
                 && canAddFeedback(for: eventDetail)
                 else { return }
             
-            let viewController = self.feedbackController(for: eventDetail) { $0.dismissViewControllerAnimated(true, completion: nil) }
+            let viewController = self.feedbackController(for: eventDetail) { $0.dismiss(animated: true, completion: nil) }
             
-            self.presentViewController(viewController, animated: true, completion: nil)
+            self.present(viewController, animated: true, completion: nil)
         }
     }
     
-    override func tableView(tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
         
         let section = Section(rawValue: section)!
         
@@ -636,7 +640,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         }
     }
     
-    override func tableView(tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         
         let section = Section(rawValue: section)!
         
@@ -660,7 +664,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         }
     }
     
-    override func tableView(tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         let section = Section(rawValue: section)!
         
@@ -683,7 +687,7 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
             guard eventDetail.speakers.isEmpty == false
                 else { return nil }
             
-            let headerView = tableView.dequeueReusableHeaderFooterViewWithIdentifier(TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
+            let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
             
             headerView.titleLabel.text = "SPEAKERS"
             
@@ -694,9 +698,9 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
     // MARK: - UITextViewDelegate
     
     // Swift Protocol extensions are not visible to ObjC, need to place implementation here and not in extension
-    func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
+    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange) -> Bool {
         
-        guard self.openWebURL(URL)
+        guard self.openWeb(url: URL)
             else { return true }
         
         return false
diff --git a/OpenStack Summit/OpenStack Summit/EventViewController.swift b/OpenStack Summit/OpenStack Summit/EventViewController.swift
index cddaf7f1..aaa44653 100644
--- a/OpenStack Summit/OpenStack Summit/EventViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventViewController.swift	
@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 import CoreData
 import EventKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 protocol EventViewController: class, MessageEnabledViewController {
@@ -31,11 +31,11 @@ extension EventViewController {
     
     func canAddToCalendar() -> Bool {
         
-        let status = EKEventStore.authorizationStatusForEntityType(.Event)
+        let status = EKEventStore.authorizationStatus(for: .event)
         
         switch status {
-        case .NotDetermined, .Authorized: return true
-        case .Restricted, .Denied: return false
+        case .notDetermined, .authorized: return true
+        case .restricted, .denied: return false
         }
     }
     
@@ -45,13 +45,13 @@ extension EventViewController {
         
         let message = "Check out this #OpenStack session I’m attending at the #OpenStackSummit!"
         
-        let url = event.webpageURL
+        let url = event.webpage
         
         var actions: [ContextMenu.Action] = []
         
         if Store.shared.isLoggedIn && canAddFeedback(for: event) {
             
-            let rate = ContextMenu.Action(activityType: "Event.Rate", image: { R.image.contextMenuRate()! }, title: "Rate", handler: .modal({ [weak self] (didComplete) -> UIViewController in
+            let rate = ContextMenu.Action(activityType: "Event.Rate", image: #imageLiteral(resourceName: "ContextMenuRate"), title: "Rate", handler: .modal({ [weak self] (didComplete) -> UIViewController in
                 
                 return self!.feedbackController(for: event) { _ in didComplete(true) }
                 }))
@@ -67,14 +67,14 @@ extension EventViewController {
             
             var title = newValue ? "Schedule" : "Unschedule"
             
-            if !event.rsvp.isEmpty {
+            if event.rsvp != nil {
                 
                 title = newValue ? "RSVP" : "unRSVP"
             }
             
-            let image = newValue ? R.image.contextMenuScheduleAdd()! : R.image.contextMenuScheduleRemove()!
+            let image = newValue ? #imageLiteral(resourceName: "ContextMenuScheduleAdd") : #imageLiteral(resourceName: "ContextMenuScheduleRemove")
             
-            let scheduleEvent = ContextMenu.Action(activityType: "Event.Schedule", image: { image }, title: title, handler: .background({ [weak self] (didComplete) in
+            let scheduleEvent = ContextMenu.Action(activityType: "Event.Schedule", image: image, title: title, handler: .background({ [weak self] (didComplete) in
                 
                 guard let controller = self else { return }
                 
@@ -94,7 +94,7 @@ extension EventViewController {
             
             let title = newValue ? "Watch Later" : "Don’t Watch Later"
             
-            let favoriteEvent = ContextMenu.Action(activityType: "Event.Favorite", image: { R.image.contextMenuWatchListAdd()! }, title: title, handler: .background({ [weak self] (didComplete) in
+            let favoriteEvent = ContextMenu.Action(activityType: "Event.Favorite", image: #imageLiteral(resourceName: "ContextMenuWatchListAdd"), title: title, handler: .background({ [weak self] (didComplete) in
                 
                 guard let controller = self else { return }
                 
@@ -106,17 +106,17 @@ extension EventViewController {
             actions.append(favoriteEvent)
         }
         
-        var shareItems = [url, message]
+        var shareItems = [url, message] as [Any]
         
         if event.socialDescription.isEmpty == false {
             
             shareItems.append(event.socialDescription)
         }
         
-        return ContextMenu(actions: actions, shareItems: shareItems, systemActions: false)
+        return ContextMenu(actions: actions, shareItems: shareItems as [AnyObject], systemActions: false)
     }
     
-    func feedbackController(for event: EventDetail, rating: Int? = nil, completion: (FeedbackViewController -> ())? = nil) -> UINavigationController {
+    func feedbackController(for event: EventDetail, rating: Int? = nil, completion: ((FeedbackViewController) -> ())? = nil) -> UINavigationController {
         
         let feedbackViewController = R.storyboard.feedback.feedbackViewController()!
         
@@ -133,7 +133,7 @@ extension EventViewController {
         
         let navigationController = UINavigationController(rootViewController: feedbackViewController)
         
-        navigationController.modalPresentationStyle = .FormSheet
+        navigationController.modalPresentationStyle = .formSheet
         
         return navigationController
     }
@@ -142,7 +142,7 @@ extension EventViewController {
         
         let scheduled = Store.shared.isEventScheduledByLoggedMember(event: event.identifier)
         
-        let rsvpURL = event.rsvp.isEmpty ? nil : NSURL(string: event.rsvp)
+        let rsvpURL = event.rsvp
         
         let externalRSVP = event.externalRSVP
         
@@ -152,7 +152,7 @@ extension EventViewController {
         switch (newValue, rsvpURL, externalRSVP) {
             
         // non-RSVP
-        case let (newValue, .None, externalRSVP):
+        case let (newValue, .none, externalRSVP):
             
             assert(externalRSVP == false, "External RSVP should always have RSVP urls")
             
@@ -164,7 +164,7 @@ extension EventViewController {
             setScheduledOnServer(request, for: event, cacheValue: newValue) { }
             
         // external RSVP
-        case let (newValue, .Some(url), true):
+        case let (newValue, .some(url), true):
             
             // rsvp_external (boolean) if true, then before redirect to WEBView, mobile app should add the event to my schedule calling API ( this is only for attendees)
             
@@ -174,16 +174,16 @@ extension EventViewController {
             let request = newValue ? Store.shared.addEventToSchedule : Store.shared.removeEventFromSchedule
             
             // update cache immediately, add to schedule and open RSVP link
-            setScheduledOnServer(request, for: event, cacheValue: newValue) { UIApplication.sharedApplication().openURL(url) }
+            setScheduledOnServer(request, for: event, cacheValue: newValue) { UIApplication.shared.openURL(url) }
             
         // internal RSVPing
-        case let (true, .Some(url), false):
+        case let (true, .some(url), false):
             
             // just open RSVP link
-            UIApplication.sharedApplication().openURL(url)
+            UIApplication.shared.openURL(url)
           
         // internal unRSVPing
-        case (false, .Some, false):
+        case (false, .some, false):
             
             // When event has internal RSVP, clicking unRSVP button needs to ping the unRSVP endpoint 
             // (replacing the unSCHEDULE call since its done automatically by the server).
@@ -192,7 +192,7 @@ extension EventViewController {
         }
     }
     
-    private func setScheduledLocally(value: Bool, for event: Identifier) {
+    private func setScheduledLocally(_ value: Bool, for event: Identifier) {
         
         guard let attendee = Store.shared.authenticatedMember?.attendeeRole
             else { return }
@@ -211,13 +211,13 @@ extension EventViewController {
         }
     }
     
-    private typealias EventRequest = (summit: Identifier?, event: Identifier, completion: (ErrorType?) -> ()) -> ()
+    private typealias EventRequest = (_ summit: Identifier?, _ event: Identifier, _ completion: @escaping (Error?) -> ()) -> ()
     
-    private func setScheduledOnServer(request: EventRequest, for event: EventDetail, cacheValue: Bool? = nil, success: () -> ()) {
+    private func setScheduledOnServer(_ request: EventRequest, for event: EventDetail, cacheValue: Bool? = nil, success: @escaping () -> ()) {
         
-        let completion: ErrorType? -> () = { [weak self] (response) in
+        let completion: (Swift.Error?) -> () = { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
@@ -225,7 +225,7 @@ extension EventViewController {
                 
                 switch response {
                     
-                case let .Some(error):
+                case let .some(error):
                     
                     // restore original value
                     if let cacheValue = cacheValue {
@@ -236,7 +236,7 @@ extension EventViewController {
                     // show error
                     controller.showErrorMessage(error)
                     
-                case .None:
+                case .none:
                     
                     // handle success
                     success()
@@ -253,7 +253,7 @@ extension EventViewController {
         eventRequestInProgress = true
         
         // make API request
-        request(summit: event.summit, event: event.identifier, completion: completion)
+        request(event.summit, event.identifier, completion)
     }
     
     func toggleFavorite(for event: EventDetail) {
@@ -264,7 +264,7 @@ extension EventViewController {
         
         eventRequestInProgress = true
         
-        func setFavorite(newValue: Bool) {
+        func setFavorite(_ newValue: Bool) {
             
             // update model
             if let managedObject = try! EventManagedObject.find(event.identifier, context: Store.shared.managedObjectContext) {
@@ -284,7 +284,7 @@ extension EventViewController {
         
         Store.shared.favorite(!isFavorite, event: event.identifier, summit: event.summit) { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
@@ -292,7 +292,7 @@ extension EventViewController {
                 
                 switch response {
                     
-                case let .Some(error):
+                case let .some(error):
                     
                     // show error
                     controller.showErrorMessage(error)
@@ -300,31 +300,31 @@ extension EventViewController {
                     // restore old value
                     setFavorite(isFavorite)
                     
-                case .None: break
+                case .none: break
                 }
             }
         }
     }
     
-    func addToCalendar(event: EventDetail) {
+    func addToCalendar(_ event: EventDetail) {
         
-        let status = EKEventStore.authorizationStatusForEntityType(.Event)
+        let status = EKEventStore.authorizationStatus(for: .event)
         
         switch status {
             
-        case .Restricted, .Denied:
+        case .restricted, .denied:
             
             break
             
-        case .NotDetermined:
+        case .notDetermined:
             
-            eventStore.requestAccessToEntityType(.Event) { [weak self] (granted, error) in
+            eventStore.requestAccess(to: .event) { [weak self] (granted, error) in
                 
                 // retry
                 self?.addToCalendar(event)
             }
         
-        case .Authorized:
+        case .authorized:
             
             let calendarListTitle = "OpenStack Summit"
             
@@ -332,13 +332,13 @@ extension EventViewController {
             
             let calendar: EKCalendar
             
-            if let existingCalendar = eventStore.calendarsForEntityType(.Event).firstMatching({ $0.title == calendarListTitle }) {
+            if let existingCalendar = eventStore.calendars(for: .event).first(where: { $0.title == calendarListTitle }) {
                 
                 calendar = existingCalendar
                 
             } else {
                 
-                calendar = EKCalendar(forEntityType: .Event, eventStore: eventStore)
+                calendar = EKCalendar(for: .event, eventStore: eventStore)
                 
                 calendar.title = calendarListTitle
                 
@@ -359,19 +359,19 @@ extension EventViewController {
             
             calendarEvent.calendar = calendar
             calendarEvent.title = event.name
-            calendarEvent.startDate = event.start.toFoundation()
-            calendarEvent.endDate = event.end.toFoundation()
-            calendarEvent.timeZone = NSTimeZone(name: event.timeZone)
-            calendarEvent.URL = event.webpageURL
+            calendarEvent.startDate = event.start
+            calendarEvent.endDate = event.end
+            calendarEvent.timeZone = TimeZone(identifier: event.timeZone)
+            calendarEvent.url = event.webpage
             calendarEvent.location = event.location
             
-            if let data = event.eventDescription.dataUsingEncoding(NSUTF8StringEncoding),
-                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            if let data = event.eventDescription.data(using: String.Encoding.utf8),
+                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                 
                 calendarEvent.notes = attributedString.string
             }
             
-            do { try eventStore.saveEvent(calendarEvent, span: .ThisEvent, commit: true) }
+            do { try eventStore.save(calendarEvent, span: .thisEvent, commit: true) }
                 
             catch { showErrorMessage(error, fileName: #file, lineNumber: #line) }
         }
diff --git a/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift b/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift
index 3166de8c..7c2d5c7b 100644
--- a/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift	
@@ -9,7 +9,7 @@
 import UIKit
 import XLPagerTabStrip
 import CoreSummit
-import SwiftFoundation
+import Foundation
 
 final class FavoriteEventsViewController: ScheduleViewController, IndicatorInfoProvider {
     
@@ -23,20 +23,19 @@ final class FavoriteEventsViewController: ScheduleViewController, IndicatorInfoP
     
     // MARK: - Methods
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         guard let member = Store.shared.authenticatedMember
             else { return [] }
         
         let events = member.favoriteEvents
-            .filter({ Date(foundation: $0.start) >= Date(foundation: startDate)
-                && Date(foundation: $0.end) <= Date(foundation: endDate) })
-            .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
+            .filter({ $0.start >= startDate && $0.end <= endDate })
+            .sorted(by: { $0.0.start < $0.1.start })
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -45,23 +44,22 @@ final class FavoriteEventsViewController: ScheduleViewController, IndicatorInfoP
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         guard let member = Store.shared.authenticatedMember,
             case .interval(let interval) = filter
             else { return [] }
         
         let events = member.favoriteEvents
-            .filter({ Date(foundation: $0.start) >= interval.start
-                && Date(foundation: $0.end) <= interval.end })
-            .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
+            .filter({ $0.start >= interval.start && $0.end <= interval.end })
+            .sorted(by: { $0.0.start < $0.1.start })
         
         return ScheduleItem.from(managedObjects: events)
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Watch List")
     }
diff --git a/OpenStack Summit/OpenStack Summit/FeedbackDetail.swift b/OpenStack Summit/OpenStack Summit/FeedbackDetail.swift
index 936ae80e..c9156a5a 100644
--- a/OpenStack Summit/OpenStack Summit/FeedbackDetail.swift	
+++ b/OpenStack Summit/OpenStack Summit/FeedbackDetail.swift	
@@ -9,9 +9,7 @@
 import Foundation
 import CoreSummit
 
-public struct FeedbackDetail {
-
-    // MARK: - Properties
+public struct FeedbackDetail: Unique {
     
     public let identifier: Identifier
     public let rate: Int
@@ -20,15 +18,31 @@ public struct FeedbackDetail {
     public let eventName: String
     public let event: Identifier
     public let member: Member
+}
+
+// MARK: - Equatable
+
+public func == (lhs: FeedbackDetail, rhs: FeedbackDetail) -> Bool {
     
-    // MARK: - Initialization
+    return lhs.identifier == rhs.identifier
+        && lhs.rate == rhs.rate
+        && lhs.review == rhs.review
+        && lhs.date == rhs.date
+        && lhs.eventName == rhs.eventName
+        && lhs.event == rhs.event
+        && lhs.member == rhs.member
+}
+
+// MARK: - CoreData
+
+extension FeedbackDetail: CoreDataDecodable {
     
     public init(managedObject feedback: FeedbackManagedObject) {
         
-        self.identifier = feedback.identifier
+        self.identifier = feedback.id
         self.rate = Int(feedback.rate)
         self.review = feedback.review
-        self.event = feedback.event.identifier
+        self.event = feedback.event.id
         self.eventName = feedback.event.name
         self.date = FeedbackDetail.timeAgoSinceDate(feedback.date, numericDates: false)
         self.member = Member(managedObject: feedback.member)
@@ -36,64 +50,64 @@ public struct FeedbackDetail {
     
     // MARK: - Static Methods
     
-    private static func timeAgoSinceDate(date: NSDate, numericDates: Bool) -> String {
+    private static func timeAgoSinceDate(_ date: Date, numericDates: Bool) -> String {
         
-        let calendar = NSCalendar.currentCalendar()
-        let now = NSDate()
-        let earliest = now.earlierDate(date)
+        let calendar = Calendar.current
+        let now = Date()
+        let earliest = (now as NSDate).earlierDate(date)
         let latest = (earliest == now) ? date : now
-        let components:NSDateComponents = calendar.components([NSCalendarUnit.Minute , NSCalendarUnit.Hour , NSCalendarUnit.Day , NSCalendarUnit.WeekOfYear , NSCalendarUnit.Month , NSCalendarUnit.Year , NSCalendarUnit.Second], fromDate: earliest, toDate: latest, options: NSCalendarOptions())
+        let components: DateComponents = (calendar as NSCalendar).components([NSCalendar.Unit.minute , NSCalendar.Unit.hour , NSCalendar.Unit.day , NSCalendar.Unit.weekOfYear , NSCalendar.Unit.month , NSCalendar.Unit.year , NSCalendar.Unit.second], from: earliest, to: latest, options: NSCalendar.Options())
         
-        if (components.year >= 2) {
-            return "\(components.year) years ago"
-        } else if (components.year >= 1){
+        if let year = components.year, year >= 2 {
+            return "\(year) years ago"
+        } else if (components.year! >= 1){
             if (numericDates){
                 return "1 year ago"
             } else {
                 return "Last year"
             }
-        } else if (components.month >= 2) {
-            return "\(components.month) months ago"
-        } else if (components.month >= 1){
+        } else if let month = components.month, month >= 2 {
+            return "\(month) months ago"
+        } else if let month = components.month, month >= 1 {
             if (numericDates){
                 return "1 month ago"
             } else {
                 return "Last month"
             }
-        } else if (components.weekOfYear >= 2) {
-            return "\(components.weekOfYear) weeks ago"
-        } else if (components.weekOfYear >= 1){
+        } else if let weekOfYear = components.weekOfYear, weekOfYear >= 2 {
+            return "\(weekOfYear) weeks ago"
+        } else if let weekOfYear = components.weekOfYear, weekOfYear >= 1 {
             if (numericDates){
                 return "1 week ago"
             } else {
                 return "Last week"
             }
-        } else if (components.day >= 2) {
-            return "\(components.day) days ago"
-        } else if (components.day >= 1){
+        } else if let day = components.day, day >= 2 {
+            return "\(day) days ago"
+        } else if let day = components.day, day >= 1 {
             if (numericDates){
                 return "1 day ago"
             } else {
                 return "Yesterday"
             }
-        } else if (components.hour >= 2) {
-            return "\(components.hour) hours ago"
-        } else if (components.hour >= 1){
+        } else if let hour = components.hour, hour >= 2 {
+            return "\(hour) hours ago"
+        } else if let hour = components.hour, hour >= 1 {
             if (numericDates){
                 return "1 hour ago"
             } else {
                 return "An hour ago"
             }
-        } else if (components.minute >= 2) {
-            return "\(components.minute) minutes ago"
-        } else if (components.minute >= 1){
+        } else if let minute = components.minute, minute >= 2 {
+            return "\(minute) minutes ago"
+        } else if let minute = components.minute, minute >= 1 {
             if (numericDates){
                 return "1 minute ago"
             } else {
                 return "A minute ago"
             }
-        } else if (components.second >= 3) {
-            return "\(components.second) seconds ago"
+        } else if let second = components.second, second >= 3 {
+            return "\(second) seconds ago"
         } else {
             return "Just now"
         }
diff --git a/OpenStack Summit/OpenStack Summit/FeedbackGivenListViewController.swift b/OpenStack Summit/OpenStack Summit/FeedbackGivenListViewController.swift
index 2b1d4cb8..2d56d6e4 100755
--- a/OpenStack Summit/OpenStack Summit/FeedbackGivenListViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/FeedbackGivenListViewController.swift	
@@ -14,7 +14,7 @@ final class FeedbackGivenListViewController: UIViewController, UITableViewDelega
     
     // MARK: - IB Outlet
     
-    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet private(set) weak var tableView: UITableView!
     
     // MARK: - Properties
     
@@ -26,7 +26,7 @@ final class FeedbackGivenListViewController: UIViewController, UITableViewDelega
         super.viewDidLoad()
         
         // setup table view
-        tableView.registerNib(R.nib.feedbackTableViewCell)
+        tableView.register(R.nib.feedbackTableViewCell)
         tableView.estimatedRowHeight = 120
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.delegate = self
@@ -40,12 +40,12 @@ final class FeedbackGivenListViewController: UIViewController, UITableViewDelega
     private func reloadData() {
         
         // Get Logged Member Given Feedback
-        feedbackList = (Store.shared.authenticatedMember?.givenFeedback ?? []).map { FeedbackDetail(managedObject: $0) }
+        feedbackList = (Store.shared.authenticatedMember?.feedback ?? []).map { FeedbackDetail(managedObject: $0) }
         
         tableView.reloadData()
     }
     
-    private func configure(cell cell: FeedbackTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: FeedbackTableViewCell, at indexPath: IndexPath) {
         
         let feedback = feedbackList[indexPath.row]
         cell.eventName = feedback.eventName
@@ -54,25 +54,25 @@ final class FeedbackGivenListViewController: UIViewController, UITableViewDelega
         cell.review = feedback.review
         cell.date = feedback.date
         
-        cell.separatorInset = UIEdgeInsetsZero
-        cell.layoutMargins = UIEdgeInsetsZero
+        cell.separatorInset = UIEdgeInsets.zero
+        cell.layoutMargins = UIEdgeInsets.zero
     }
     
     // MARK: - UITableViewDataSource
     
-    func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return feedbackList.count
     }
     
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.feedbackTableViewCell)!
+        let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.feedbackTableViewCell)!
         
         configure(cell: cell, at: indexPath)
         
@@ -81,7 +81,7 @@ final class FeedbackGivenListViewController: UIViewController, UITableViewDelega
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Reviews")
     }
diff --git a/OpenStack Summit/OpenStack Summit/FeedbackTableViewCell.swift b/OpenStack Summit/OpenStack Summit/FeedbackTableViewCell.swift
index 3cd85824..fe9541f0 100755
--- a/OpenStack Summit/OpenStack Summit/FeedbackTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/FeedbackTableViewCell.swift	
@@ -13,13 +13,13 @@ final class FeedbackTableViewCell: UITableViewCell {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var eventNameLabel: UILabel!
-    @IBOutlet weak var ownerLabel: UILabel!
-    @IBOutlet weak var reviewLabel: UILabel!
-    @IBOutlet weak var dateLabel: UILabel!
-    @IBOutlet weak var rateView: CosmosView!
+    @IBOutlet private(set) weak var eventNameLabel: UILabel!
+    @IBOutlet private(set) weak var ownerLabel: UILabel!
+    @IBOutlet private(set) weak var reviewLabel: UILabel!
+    @IBOutlet private(set) weak var dateLabel: UILabel!
+    @IBOutlet private(set) weak var rateView: CosmosView!
     
-    @IBOutlet weak var rateViewWidthConstraint: NSLayoutConstraint!
+    @IBOutlet private(set) weak var rateViewWidthConstraint: NSLayoutConstraint!
     
     // MARK: - Accessors
     
@@ -85,7 +85,7 @@ final class FeedbackTableViewCell: UITableViewCell {
     
     // MARK: - Selection
     
-    override func setSelected(selected: Bool, animated: Bool) {
+    override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
         
         // Configure the view for the selected state
diff --git a/OpenStack Summit/OpenStack Summit/FeedbackViewController.swift b/OpenStack Summit/OpenStack Summit/FeedbackViewController.swift
index d26e3c55..4886ba95 100644
--- a/OpenStack Summit/OpenStack Summit/FeedbackViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/FeedbackViewController.swift	
@@ -9,7 +9,7 @@
 import Foundation
 import CoreData
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import Cosmos
 import JGProgressHUD
@@ -30,11 +30,11 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
     
     // MARK: - Properties
     
-    var completion: (FeedbackViewController -> ())?
+    var completion: ((FeedbackViewController) -> ())?
     
     var event: Identifier = 0 {
         
-         didSet { if isViewLoaded() { configureView() } }
+         didSet { if isViewLoaded { configureView() } }
     }
     
     private var mode: Mode = .new
@@ -43,13 +43,13 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
     
     private let minimumBottomSpace: CGFloat = 100
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
     deinit {
         
-        if isViewLoaded() {
+        if isViewLoaded {
             
             unregisterKeyboardNotifications()
         }
@@ -65,22 +65,22 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
         registerKeyboardNotifications()
     }
     
-    override func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
+    override var supportedInterfaceOrientations : UIInterfaceOrientationMask {
         
-        return [.Portrait]
+        return [.portrait]
     }
     
     // MARK: - Actions
     
-    @IBAction func close(sender: AnyObject? = nil) {
+    @IBAction func close(_ sender: AnyObject? = nil) {
         
         completion?(self)
     }
     
-    @IBAction func send(sender: AnyObject? = nil) {
+    @IBAction func send(_ sender: AnyObject? = nil) {
         
         guard Reachability.connected
-            else { showErrorMessage(Error.reachability); return }
+            else { showErrorMessage(AppError.reachability); return }
         
         // get new values
         
@@ -94,7 +94,7 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
         if rate == 0 {
             validationErrorText = "You must provide a rate using stars at the top"
         }
-        else if review.characters.count > 500 {
+        else if (review?.characters.count)! > 500 {
             validationErrorText = "Review exceeded 500 characters limit"
         }
         else {
@@ -121,9 +121,9 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
             
         case .new:
             
-            Store.shared.addFeedback(summit, event: event, rate: rate, review: review) { [weak self] (response) in
+            Store.shared.addFeedback(summit, event: event, rate: rate, review: review!) { [weak self] (response) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock {
+                OperationQueue.main.addOperation {
                     
                     guard let controller = self else { return }
                     
@@ -131,11 +131,13 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
                     
                     switch response {
                         
-                    case let .Error(error):
+                    case let .error(error):
                         
                         controller.showErrorMessage(error)
                         
-                    case .Value:
+                    case .value:
+                        
+                        controller.requestAppReview()
                         
                         controller.close()
                     }
@@ -144,9 +146,9 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
             
         case .edit:
             
-            Store.shared.editFeedback(summit, event: event, rate: rate, review: review)  { [weak self] (error) in
+            Store.shared.editFeedback(summit, event: event, rate: rate, review: review!)  { [weak self] (error) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock {
+                OperationQueue.main.addOperation {
                     
                     guard let controller = self else { return }
                     
@@ -154,11 +156,11 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
                     
                     switch error {
                         
-                    case let .Some(error):
+                    case let .some(error):
                         
                         controller.showErrorMessage(error)
                         
-                    case .None:
+                    case .none:
                         
                         controller.close()
                     }
@@ -205,9 +207,9 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
     
     // MARK: - UITextViewDelegate
     
-    func textViewShouldBeginEditing(textView: UITextView) -> Bool {
+    func textViewShouldBeginEditing(_ textView: UITextView) -> Bool {
         
-        reviewTextView.textColor = UIColor.blackColor()
+        reviewTextView.textColor = UIColor.black
         
         if reviewTextView.text == placeHolderText  {
             reviewTextView.text = ""
@@ -216,17 +218,17 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
         return true
     }
     
-    func textViewDidEndEditing(textView: UITextView) {
+    func textViewDidEndEditing(_ textView: UITextView) {
         
         if reviewTextView.text == "" {
             reviewTextView.text = placeHolderText
-            reviewTextView.textColor = UIColor.lightGrayColor()
+            reviewTextView.textColor = UIColor.lightGray
         }
     }
     
-    func textView(textView: UITextView, shouldChangeTextInRange range: NSRange, replacementText text: String) -> Bool {
+    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
         if text.characters.count == 1 {
-            if let _ = text.rangeOfCharacterFromSet(.newlineCharacterSet(), options: .BackwardsSearch) {
+            if let _ = text.rangeOfCharacter(from: .newlines, options: .backwards) {
                 textView.resignFirstResponder()
                 return false
             }
@@ -238,34 +240,34 @@ final class FeedbackViewController: UIViewController, MessageEnabledViewControll
     
     @objc private func registerKeyboardNotifications() {
         
-        NSNotificationCenter.defaultCenter().addObserver(self,
+        NotificationCenter.default.addObserver(self,
                                                          selector: #selector(keyboardDidShow),
-                                                         name: UIKeyboardDidShowNotification,
+                                                         name: NSNotification.Name.UIKeyboardDidShow,
                                                          object: nil)
         
-        NSNotificationCenter.defaultCenter().addObserver(self,
+        NotificationCenter.default.addObserver(self,
                                                          selector: #selector(keyboardWillHide),
-                                                         name: UIKeyboardWillHideNotification,
+                                                         name: NSNotification.Name.UIKeyboardWillHide,
                                                          object: nil)
     }
     
     @objc private func unregisterKeyboardNotifications() {
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
     
-    @objc private func keyboardDidShow(notification: NSNotification) {
+    @objc private func keyboardDidShow(_ notification: Foundation.Notification) {
         
-        let userInfo: NSDictionary = notification.userInfo!
-        var keyboardRect = userInfo.objectForKey(UIKeyboardFrameBeginUserInfoKey)!.CGRectValue
-        keyboardRect = view.convertRect(keyboardRect, fromView: nil)
+        let userInfo: [String: AnyObject] = notification.userInfo as! [String : AnyObject]
+        var keyboardRect = (userInfo[UIKeyboardFrameBeginUserInfoKey] as! NSValue).cgRectValue
+        keyboardRect = view.convert(keyboardRect, from: nil)
         
         let visibleHeight = self.view.frame.size.height - keyboardRect.size.height
         bottomViewHeightConstraint.constant = visibleHeight
         view.updateConstraints()
     }
     
-    @objc private func keyboardWillHide(notification: NSNotification) {
+    @objc private func keyboardWillHide(_ notification: Foundation.Notification) {
         
         bottomViewHeightConstraint.constant = minimumBottomSpace
         view.updateConstraints()
diff --git a/OpenStack Summit/OpenStack Summit/Filter.swift b/OpenStack Summit/OpenStack Summit/Filter.swift
index 4274e422..8adf2c01 100644
--- a/OpenStack Summit/OpenStack Summit/Filter.swift	
+++ b/OpenStack Summit/OpenStack Summit/Filter.swift	
@@ -6,9 +6,10 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import CoreData
+import Predicate
 
 enum FilterCategory {
     
@@ -31,7 +32,7 @@ enum Filter {
     case activeTalks
     
     case trackGroup(Identifier)
-    case level(String)
+    case level(Level)
     case venue(Identifier)
 }
 
@@ -93,22 +94,23 @@ struct ScheduleFilter: Equatable {
         
         // fetch data
         let trackGroups = try! TrackGroup.scheduled(for: summitID, context: context)
-        let levels = try! Set(context.managedObjects(PresentationManagedObject.self, predicate: "event.summit.id" == summitID)
+        let levels = try! Set(context.managedObjects(PresentationManagedObject.self, predicate: #keyPath(PresentationManagedObject.event.summit.id) == summitID)
             .flatMap { $0.level })
             .flatMap { Level(rawValue: $0) }
-            .sort { (lhs: Level, rhs: Level) -> Bool in lhs < rhs }
-            .map { $0.rawValue }
+            .sorted()
         
-        let venues = try! context.managedObjects(Venue.self, predicate: NSPredicate(format: "summit == %@", summit), sortDescriptors: VenueManagedObject.sortDescriptors)
+        let venues = try! context.managedObjects(Venue.self,
+                                                 predicate: #keyPath(VenueManagedObject.summit.id) == summitID,
+                                                 sortDescriptors: VenueManagedObject.sortDescriptors)
         
         // populate filter categories
         
-        let summitTimeZoneOffset = NSTimeZone(name: summit.timeZone)!.secondsFromGMT
-        let startDate = summit.start.mt_dateSecondsAfter(summitTimeZoneOffset).mt_startOfCurrentDay()
-        let endDate = summit.end.mt_dateSecondsAfter(summitTimeZoneOffset).mt_dateDaysAfter(1)
-        let now = NSDate()
+        let summitTimeZoneOffset = TimeZone(identifier: summit.timeZone)!.secondsFromGMT()
+        let startDate = ((summit.start as NSDate).mt_dateSeconds(after: summitTimeZoneOffset) as NSDate).mt_startOfCurrentDay()
+        let endDate = ((summit.end as NSDate).mt_dateSeconds(after: summitTimeZoneOffset) as NSDate).mt_dateDays(after: 1)
+        let now = Date()
         
-        if now.mt_isBetweenDate(startDate, andDate: endDate) {
+        if (now as NSDate).mt_isBetweenDate(startDate, andDate: endDate) {
             
             allFilters[.activeTalks] = [.activeTalks]
         }
@@ -143,12 +145,12 @@ struct ScheduleFilter: Equatable {
         guard let summit = try! SummitManagedObject.find(summitID, context: context)
             else { return }
         
-        let summitTimeZoneOffset = NSTimeZone(name: summit.timeZone)!.secondsFromGMT
-        let startDate = summit.start.mt_dateSecondsAfter(summitTimeZoneOffset).mt_startOfCurrentDay()
-        let endDate = summit.end.mt_dateSecondsAfter(summitTimeZoneOffset).mt_dateDaysAfter(1)
-        let now = NSDate()
+        let summitTimeZoneOffset = TimeZone(identifier: summit.timeZone)!.secondsFromGMT()
+        let startDate = ((summit.start as NSDate).mt_dateSeconds(after: summitTimeZoneOffset) as NSDate).mt_startOfCurrentDay()
+        let endDate = ((summit.end as NSDate).mt_dateSeconds(after: summitTimeZoneOffset) as NSDate).mt_dateDays(after: 1)
+        let now = Date()
         
-        if now.mt_isBetweenDate(startDate, andDate: endDate) {
+        if (now as NSDate).mt_isBetweenDate(startDate, andDate: endDate) {
             
             // dont want to override selection
             if didChangeActiveTalks == false {
@@ -171,18 +173,20 @@ struct ScheduleFilter: Equatable {
         activeFilters.removeAll()
     }
     
-    mutating func enable(filter newFilter: Filter) -> Bool {
+    @discardableResult
+    mutating func enable(_ filter: Filter) -> Bool {
         
-        let validFilter = allFilters.values.contains { $0.contains(newFilter) }
+        let validFilter = allFilters.values.contains { $0.contains(filter) }
         
         guard validFilter else { return false }
         
-        activeFilters.insert(newFilter)
+        activeFilters.insert(filter)
         
         return true
     }
     
-    mutating func disable(filter filter: Filter) -> Bool {
+    @discardableResult
+    mutating func disable(_ filter: Filter) -> Bool {
         
         let validFilter = allFilters.values.contains { $0.contains(filter) }
         
@@ -204,8 +208,8 @@ struct ScheduleFilter: Equatable {
 
 func == (lhs: ScheduleFilter, rhs: ScheduleFilter) -> Bool {
     
-    let lhsFilters = lhs.allFilters.values.reduce([Filter](), combine: { $0.0 + $0.1 })
-    let rhsFilters = rhs.allFilters.values.reduce([Filter](), combine: { $0.0 + $0.1 })
+    let lhsFilters = lhs.allFilters.values.reduce([Filter](), { $0.0 + $0.1 })
+    let rhsFilters = rhs.allFilters.values.reduce([Filter](), { $0.0 + $0.1 })
     
     return lhs.activeFilters == rhs.activeFilters
         && lhsFilters == rhsFilters
@@ -220,40 +224,48 @@ final class FilterManager {
     
     var filter = Observable(ScheduleFilter())
     
-    private var timer: NSTimer!
+    private var timer: Timer!
+    
+    private var summitObserver: Int!
     
     deinit {
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
+        
+        SummitManager.shared.summit.remove(summitObserver)
     }
     
     private init() {
         
         // update sections from Core Data
-        filter.value.update()
+        self.filter.value.update()
+        
+        self.timer = Timer.scheduledTimer(timeInterval: 10,
+                                     target: self,
+                                     selector: #selector(timerUpdate),
+                                     userInfo: nil,
+                                     repeats: true)
         
-        timer = NSTimer.scheduledTimerWithTimeInterval(10, target: self, selector: #selector(timerUpdate), userInfo: nil, repeats: true)
+        self.summitObserver = SummitManager.shared.summit.observe(currentSummitChanged)
         
-        NSNotificationCenter.defaultCenter().addObserver(
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(managedObjectContextObjectsDidChange),
-            name: NSManagedObjectContextObjectsDidChangeNotification,
+            name: NSNotification.Name.NSManagedObjectContextObjectsDidChange,
             object: Store.shared.managedObjectContext)
-        
-        SummitManager.shared.summit.observe(currentSummitChanged)
     }
     
-    @objc private func timerUpdate(sender: NSTimer) {
+    @objc private func timerUpdate(_ sender: Timer) {
         
         filter.value.updateActiveTalks()
     }
     
-    @objc private func managedObjectContextObjectsDidChange(notification: NSNotification) {
+    @objc private func managedObjectContextObjectsDidChange(_ notification: Foundation.Notification) {
         
         self.filter.value.update()
     }
     
-    private func currentSummitChanged(summit: Identifier, oldValue: Identifier) {
+    private func currentSummitChanged(_ summit: Identifier, oldValue: Identifier) {
         
         self.filter.value.update()
     }
diff --git a/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift b/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift
index a4de4966..207d6f21 100644
--- a/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift	
@@ -7,8 +7,9 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
+import Predicate
 
 final class GeneralScheduleFilterViewController: UITableViewController {
     
@@ -36,7 +37,7 @@ final class GeneralScheduleFilterViewController: UITableViewController {
         tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: 30))
         
         // https://github.com/mac-cain13/R.swift/issues/144
-        tableView.registerNib(R.nib.tableViewHeaderViewLight(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
+        tableView.register(R.nib.tableViewHeaderViewLight(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
         
         // observe filter
         filterObserver = FilterManager.shared.filter.observe { [weak self] _ in self?.configureView() }
@@ -45,7 +46,7 @@ final class GeneralScheduleFilterViewController: UITableViewController {
         configureView()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         FilterManager.shared.filter.value.update()
@@ -53,25 +54,25 @@ final class GeneralScheduleFilterViewController: UITableViewController {
     
     // MARK: - Actions
     
-    @IBAction func filterChanged(sender: UISwitch) {
+    @IBAction func filterChanged(_ sender: UISwitch) {
         
-        let buttonOrigin = sender.convertPoint(.zero, toView: tableView)
-        let indexPath = tableView.indexPathForRowAtPoint(buttonOrigin)!
+        let buttonOrigin = sender.convert(CGPoint.zero, to: tableView)
+        let indexPath = tableView.indexPathForRow(at: buttonOrigin)!
         let filter = self[indexPath].filter
         
-        if sender.on {
+        if sender.isOn {
             
-            FilterManager.shared.filter.value.enable(filter: filter)
+            FilterManager.shared.filter.value.enable(filter)
             
         } else {
             
-            FilterManager.shared.filter.value.disable(filter: filter)
+            FilterManager.shared.filter.value.disable(filter)
         }
     }
     
-    @IBAction func dismiss(sender: AnyObject? = nil) {
+    @IBAction func dismiss(_ sender: AnyObject? = nil) {
         
-        self.dismissViewControllerAnimated(true, completion: nil)
+        self.dismiss(animated: true, completion: nil)
     }
     
     // MARK: - Private Methods
@@ -98,7 +99,7 @@ final class GeneralScheduleFilterViewController: UITableViewController {
             
             switch filter {
             case .activeTalks: return "Hide Past Talks"
-            case let .level(level): return level
+            case let .level(level): return level.rawValue
             case .trackGroup, .venue: fatalError("Invalid filter: \(filter)")
             }
         }
@@ -113,9 +114,10 @@ final class GeneralScheduleFilterViewController: UITableViewController {
         if let trackGroupsSection = scheduleFilter.allFilters[.trackGroup] {
             
             // fetch from CoreData because it caches fetch request results and is more efficient
-            let identifiers = trackGroupsSection.map { NSNumber(longLong: Int64(identifier(for: $0))) }
+            let identifiers = trackGroupsSection.map { identifier(for: $0) }
             
-            let predicate = NSPredicate(format: "id IN %@", identifiers)
+            //let predicate = NSPredicate(format: "id IN %@", identifiers)
+            let predicate: Predicate = (#keyPath(TrackGroupManagedObject.id)).in(identifiers)
             
             let trackGroups = try! context.managedObjects(TrackGroup.self, predicate: predicate, sortDescriptors: TrackGroup.ManagedObject.sortDescriptors)
             
@@ -134,9 +136,10 @@ final class GeneralScheduleFilterViewController: UITableViewController {
         if let venuesSection = scheduleFilter.allFilters[.venue] {
             
             // fetch from CoreData because it caches fetch request results and is more efficient
-            let identifiers = venuesSection.map { NSNumber(longLong: Int64(identifier(for: $0))) }
+            let identifiers = venuesSection.map { identifier(for: $0) }
             
-            let predicate = NSPredicate(format: "id IN %@", identifiers)
+            //let predicate = NSPredicate(format: "id IN %@", identifiers)
+            let predicate: Predicate = (#keyPath(VenueManagedObject.id)).in(identifiers)
             
             let venues = try! context.managedObjects(Venue.self, predicate: predicate, sortDescriptors: Venue.ManagedObject.sortDescriptors)
             
@@ -146,30 +149,30 @@ final class GeneralScheduleFilterViewController: UITableViewController {
         }
     }
     
-    private subscript (indexPath: NSIndexPath) -> Item {
+    private subscript (indexPath: IndexPath) -> Item {
         
         let section = self.filters[indexPath.section]
         
         return section.items[indexPath.row]
     }
     
-    private func configure(cell cell: GeneralScheduleFilterTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: GeneralScheduleFilterTableViewCell, at indexPath: IndexPath) {
         
         let item = self[indexPath]
         
         cell.nameLabel.text = item.name
-        cell.enabledSwitch.on = item.enabled
+        cell.enabledSwitch.isOn = item.enabled
         
         if let colorHex = item.color,
             let color = UIColor(hexString: colorHex) {
             
-            cell.circleContainerView.hidden = false
+            cell.circleContainerView.isHidden = false
             cell.circleView.backgroundColor = color
             
         } else {
             
-            cell.circleContainerView.hidden = true
-            cell.circleView.backgroundColor = .clearColor()
+            cell.circleContainerView.isHidden = true
+            cell.circleView.backgroundColor = .clear
         }
     }
     
@@ -191,30 +194,30 @@ final class GeneralScheduleFilterViewController: UITableViewController {
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return filters.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let section = self.filters[section]
         
         return section.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.generalScheduleFilterTableViewCell, forIndexPath: indexPath)!
+        let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.generalScheduleFilterTableViewCell, for: indexPath)!
         
         configure(cell: cell, at: indexPath)
         
         return cell
     }
     
-    override func tableView(tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
-        let headerView = tableView.dequeueReusableHeaderFooterViewWithIdentifier(TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
+        let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
         
         configure(header: headerView, for: section)
         
diff --git a/OpenStack Summit/OpenStack Summit/GeneralScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/GeneralScheduleViewController.swift
index 458e1ff5..fb56e3f5 100755
--- a/OpenStack Summit/OpenStack Summit/GeneralScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/GeneralScheduleViewController.swift	
@@ -9,16 +9,16 @@
 
 import UIKit
 import XLPagerTabStrip
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 final class GeneralScheduleViewController: ScheduleViewController, RevealViewController, IndicatorInfoProvider {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var noConnectivityView: UIView!
+    @IBOutlet private(set) weak var noConnectivityView: UIView!
     
-    @IBOutlet weak var retryButton: UIButton!
+    @IBOutlet private(set) weak var retryButton: UIButton!
     
     // MARK: - Properties
     
@@ -28,9 +28,9 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         
         didSet {
             
-            filterButton?.tintColor = activeFilterIndicator ? UIColor(hexString: "#F8E71C") : UIColor.whiteColor()
+            filterButton?.tintColor = activeFilterIndicator ? UIColor(hexString: "#F8E71C") : UIColor.white
             navigationController?.toolbar.barTintColor = UIColor(hexString: "#F8E71C")
-            navigationController?.toolbar.translucent = false
+            navigationController?.toolbar.isTranslucent = false
             navigationController?.setToolbarHidden(!activeFilterIndicator, animated: !activeFilterIndicator)
         }
     }
@@ -54,32 +54,32 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         filterButton = UIBarButtonItem()
         filterButton.target = self
         filterButton.action = #selector(showFilters)
-        filterButton.image = R.image.filter()!
+        filterButton.image = #imageLiteral(resourceName: "filter")
         
         navigationItem.rightBarButtonItem = filterButton
         
         let message = UIBarButtonItem()
         message.title = "CLEAR ACTIVE FILTERS"
-        message.style = .Plain
+        message.style = .plain
         message.target = self
         message.action = #selector(clearFilters)
         message.tintColor = UIColor(hexString: "#4A4A4A")
-        message.setTitleTextAttributes([NSFontAttributeName: UIFont.systemFontOfSize(15)], forState: .Normal)
+        message.setTitleTextAttributes([NSFontAttributeName: UIFont.systemFont(ofSize: 15)], for: UIControlState())
         
-        let spacer = UIBarButtonItem(barButtonSystemItem: .FlexibleSpace, target: self, action: #selector(clearFilters))
+        let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: #selector(clearFilters))
         
         let clear = UIBarButtonItem()
         clear.target = self
         clear.action = #selector(clearFilters)
-        clear.image = R.image.cancel()!
-        clear.tintColor = UIColor.blackColor()
+        clear.image = #imageLiteral(resourceName: "cancel")
+        clear.tintColor = UIColor.black
         
         toolbarItems = [message, spacer, clear]
         
         filterObserver = FilterManager.shared.filter.observe(filterChanged)
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         activeFilterIndicator = FilterManager.shared.filter.value.active
@@ -87,26 +87,26 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         userActivity?.becomeCurrent()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
-        navigationController?.toolbarHidden = true
+        navigationController?.isToolbarHidden = true
         
         userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.events.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - Actions
     
-    @IBAction func showFilters(sender: UIBarButtonItem) {
+    @IBAction func showFilters(_ sender: UIBarButtonItem) {
         
         guard isDataLoaded else {
             
@@ -116,36 +116,36 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         
         let generalScheduleFilterViewController = R.storyboard.scheduleFilter.generalScheduleFilterViewController()!
         let navigationController = UINavigationController(rootViewController: generalScheduleFilterViewController)
-        navigationController.modalPresentationStyle = .FormSheet
+        navigationController.modalPresentationStyle = .formSheet
         
-        self.presentViewController(navigationController, animated: true, completion: nil)
+        self.present(navigationController, animated: true, completion: nil)
     }
     
-    @IBAction func clearFilters(sender: UIBarButtonItem) {
+    @IBAction func clearFilters(_ sender: UIBarButtonItem) {
         
         FilterManager.shared.filter.value.clear()
     }
     
-    @IBAction func retryButtonPressed(sender: UIButton) {
+    @IBAction func retryButtonPressed(_ sender: UIButton) {
         
         loadData()
     }
     
     // MARK: - Methods
     
-    override func toggleEventList(show: Bool) {
+    override func toggleEventList(_ show: Bool) {
         
-        scheduleView!.hidden = !show
+        scheduleView!.isHidden = !show
     }
     
-    override func toggleNoConnectivityMessage(show: Bool) {
+    override func toggleNoConnectivityMessage(_ show: Bool) {
         
-        noConnectivityView!.hidden = !show
+        noConnectivityView!.isHidden = !show
     }
     
     internal override func loadData() {
         
-        if try! Store.shared.managedObjectContext.managedObjects(Summit).isEmpty
+        if self.isDataLoaded == false
             && Reachability.connected == false {
             
             self.toggleNoConnectivityMessage(true)
@@ -158,7 +158,7 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
             // set user activity for handoff
             let userActivity = NSUserActivity(activityType: AppActivity.screen.rawValue)
             userActivity.title = "Summit Schedule"
-            userActivity.webpageURL = NSURL(string: summit.webpageURL + "/summit-schedule")
+            userActivity.webpageURL = Foundation.URL(string: summit.webpageURL + "/summit-schedule")
             userActivity.userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.events.rawValue]
             userActivity.requiredUserInfoKeys = [AppActivityUserInfo.screen.rawValue]
             
@@ -171,33 +171,33 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         super.loadData()
     }
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
         
         var trackGroups = [Identifier]()
         var venues = [Identifier]()
-        var levels = [String]()
+        var levels = [Level]()
         
         for filter in scheduleFilter.activeFilters {
             
             switch filter {
             case let .trackGroup(identifier): trackGroups.append(identifier)
             case let .venue(identifier): venues.append(identifier)
-            case let .level(name): levels.append(name)
+            case let .level(level): levels.append(level)
             case .activeTalks: break
             }
         }
         
-        let date = DateFilter.interval(start: Date(foundation: startDate), end: Date(foundation: endDate))
+        let date = DateFilter.interval(start: startDate, end: endDate)
         
-        let events = try! EventManagedObject.filter(date, tracks: nil, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
+        let events = try! EventManagedObject.filter(date, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -206,33 +206,33 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
         
         var trackGroups = [Identifier]()
         var venues = [Identifier]()
-        var levels = [String]()
+        var levels = [Level]()
         
         for filter in scheduleFilter.activeFilters {
             
             switch filter {
             case let .trackGroup(identifier): trackGroups.append(identifier)
             case let .venue(identifier): venues.append(identifier)
-            case let .level(name): levels.append(name)
+            case let .level(level): levels.append(level)
             case .activeTalks: break
             }
         }
         
-        let events = try! EventManagedObject.filter(filter, tracks: nil, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
+        let events = try! EventManagedObject.filter(filter, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
         
         return ScheduleItem.from(managedObjects: events)
     }
     
     // MARK: - Private Methods
     
-    private func filterChanged(filter: ScheduleFilter, oldValue: ScheduleFilter) {
+    private func filterChanged(_ filter: ScheduleFilter, oldValue: ScheduleFilter) {
         
         if self.navigationController?.topViewController === self {
             
@@ -242,7 +242,7 @@ final class GeneralScheduleViewController: ScheduleViewController, RevealViewCon
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Schedule")
     }
diff --git a/OpenStack Summit/OpenStack Summit/HanekeInputSource.swift b/OpenStack Summit/OpenStack Summit/HanekeInputSource.swift
index f0424ff2..d7f06d61 100755
--- a/OpenStack Summit/OpenStack Summit/HanekeInputSource.swift	
+++ b/OpenStack Summit/OpenStack Summit/HanekeInputSource.swift	
@@ -9,23 +9,26 @@
 import Haneke
 import ImageSlideshow
 
-public final class HanekeInputSource: InputSource {
+final class HanekeInputSource: InputSource {
     
-    public let url: NSURL
+    let url: URL
     
-    public init(url: NSURL) {
-        self.url = url
-    }
-    
-    public init?(urlString: String) {
-        
-        guard let url = NSURL(string: urlString)
-            else { return nil }
+    init(url: URL) {
         
         self.url = url
     }
     
-    @objc public func setToImageView(imageView: UIImageView) {
-        imageView.hnk_setImageFromURL(url, format: Format<UIImage>(name: "original"))
+    /**
+     Load image from the source to image view.
+     - parameter imageView: The image view to load the image into.
+     - parameter callback: Callback called after the image was set to the image view.
+     - parameter image: Image that was set to the image view.
+     */
+    func load(to imageView: UIImageView, with callback: @escaping (UIImage?) -> Void) {
+        
+        imageView.hnk_setImageFromURL(url.environmentScheme,
+                                      format: Format<UIImage>(name: "original"),
+                                      failure: { _ in callback(nil) },
+                                      success: { callback($0) })
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStack Summit/InboxViewController.swift b/OpenStack Summit/OpenStack Summit/InboxViewController.swift
index c00d9ae4..568d193d 100644
--- a/OpenStack Summit/OpenStack Summit/InboxViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/InboxViewController.swift	
@@ -28,7 +28,7 @@ final class InboxViewController: RevealTabStripViewController, RevealViewControl
         addMenuButton()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         reloadPagerTabStripView()
@@ -36,18 +36,18 @@ final class InboxViewController: RevealTabStripViewController, RevealViewControl
     
     // MARK: - RevealTabStripViewController
     
-    override func viewControllersForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
+    override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
         
         var childViewControllers = [UIViewController]()
         
-        let notificationsVC = R.storyboard.notifications.initialViewController()!
+        let notificationsVC = R.storyboard.notifications.instantiateInitialViewController()!
         
         childViewControllers.append(notificationsVC)
         
         #if DEBUG
         if Store.shared.authenticatedMember != nil {
             
-            let teamsVC = R.storyboard.teams.initialViewController()!
+            let teamsVC = R.storyboard.teams.instantiateInitialViewController()!
             
             childViewControllers.append(teamsVC)
         }
diff --git a/OpenStack Summit/OpenStack Summit/Info.plist b/OpenStack Summit/OpenStack Summit/Info.plist
index 8273ecf1..f1c965f4 100644
--- a/OpenStack Summit/OpenStack Summit/Info.plist	
+++ b/OpenStack Summit/OpenStack Summit/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.3</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -65,6 +65,19 @@
 	</array>
 	<key>SummitEnvironment</key>
 	<string>$(CORESUMMIT_ENVIRONMENT)</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>OpenSans-Bold.ttf</string>
+		<string>OpenSans-BoldItalic.ttf</string>
+		<string>OpenSans-ExtraBold.ttf</string>
+		<string>OpenSans-ExtraBoldItalic.ttf</string>
+		<string>OpenSans-Italic.ttf</string>
+		<string>OpenSans-Light.ttf</string>
+		<string>OpenSans-LightItalic.ttf</string>
+		<string>OpenSans-Regular.ttf</string>
+		<string>OpenSans-Semibold.ttf</string>
+		<string>OpenSans-SemiboldItalic.ttf</string>
+	</array>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>
diff --git a/OpenStack Summit/OpenStack Summit/InternalVenueListTableViewCell.swift b/OpenStack Summit/OpenStack Summit/InternalVenueListTableViewCell.swift
index 437b9d25..f73a7372 100755
--- a/OpenStack Summit/OpenStack Summit/InternalVenueListTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/InternalVenueListTableViewCell.swift	
@@ -29,20 +29,16 @@ final class InternalVenueListTableViewCell: UITableViewCell, VenueListTableViewC
         set { addressLabel.text = newValue }
     }
     
-    var backgroundImageURL: String = "" {
+    var backgroundImage: URL? {
+        
         didSet {
-            if backgroundImageURL.isEmpty {
-                backgroundImageView.image = nil
+            if let url = backgroundImage {
+                
+                backgroundImageView.hnk_setImageFromURL(url.environmentScheme)
             }
             else {
-
-                #if DEBUG
-                    let picUrl = backgroundImageURL.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
-                #else
-                    let picUrl = backgroundImageURL
-                #endif
                 
-                backgroundImageView.hnk_setImageFromURL(NSURL(string: picUrl)!)
+                backgroundImageView.image = nil
             }
         }
     }
@@ -52,6 +48,6 @@ final class InternalVenueListTableViewCell: UITableViewCell, VenueListTableViewC
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        backgroundImageView.contentMode = .ScaleAspectFill
+        backgroundImageView.contentMode = .scaleAspectFill
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift b/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift
index 0734af82..8532fae4 100644
--- a/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift	
@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 import CoreSummit
 
-final class LaunchScreenViewController: UIViewController, MessageEnabledViewController {
+final class LaunchScreenViewController: UIViewController, MessageEnabledViewController, SummitActivityHandlingViewController {
     
     // MARK: - IB Outlets
     
@@ -32,7 +32,7 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
     
     // MARK: - Properties
     
-    private(set) var willTransition = false  {
+    private var willTransition = false  {
         
         didSet { configureView() }
     }
@@ -49,51 +49,46 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.summitsButton.enabled = AppEnvironment == .Staging
+        self.summitsButton.isEnabled = AppEnvironment == .staging
         
         configureView()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         if Store.shared.isLoggedIn {
             
-            guard self.willTransition == false else { return }
-            
             self.willTransition = true
             
-            let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(1 * Double(NSEC_PER_SEC)))
-            
-            dispatch_after(delayTime, dispatch_get_main_queue()) { [weak self] in
-                
-                guard let controller = self else { return }
-                
-                controller.showRevealController()
-            }
-            
         } else {
             
             self.loadSummits()
         }
     }
     
-    override func preferredStatusBarStyle() -> UIStatusBarStyle {
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         
-        return .LightContent
+        if Store.shared.isLoggedIn {
+            
+            showRevealController()
+        }
+    }
+    
+    override var preferredStatusBarStyle : UIStatusBarStyle {
+        
+        return .lightContent
     }
     
     // MARK: - Actions
     
-    @IBAction func login(sender: UIButton) {
+    @IBAction func login(_ sender: UIButton) {
         
-        showRevealController(sender) {
-            
-            AppDelegate.shared.menuViewController.login(sender)
-        }
+        showRevealController(sender) { $0.menuViewController.login(sender) }
     }
     
-    @IBAction func continueAsGuest(sender: UIButton) {
+    @IBAction func continueAsGuest(_ sender: UIButton) {
         
         showRevealController(sender)
     }
@@ -108,49 +103,49 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
             
         case .loadingSummits:
             
-            self.summitView.hidden = true
-            self.summitActivityIndicatorView.hidden = false
+            self.summitView.isHidden = true
+            self.summitActivityIndicatorView.isHidden = false
             self.summitActivityIndicatorView.startAnimating()
             
-            self.guestButton.hidden = self.isDataLoaded == false || self.willTransition
-            self.loginButton.hidden = self.isDataLoaded == false || self.willTransition
+            self.guestButton.isHidden = self.isDataLoaded == false || self.willTransition
+            self.loginButton.isHidden = self.isDataLoaded == false || self.willTransition
             
-            self.dataLoadedActivityIndicatorView.hidden = true
+            self.dataLoadedActivityIndicatorView.isHidden = true
             self.dataLoadedActivityIndicatorView.stopAnimating()
             
         case .loadingData:
             
             assert(self.summit != nil, "Invalid State")
             
-            self.summitView.hidden = false
-            self.summitActivityIndicatorView.hidden = true
+            self.summitView.isHidden = false
+            self.summitActivityIndicatorView.isHidden = true
             self.summitActivityIndicatorView.stopAnimating()
             
-            self.guestButton.hidden = true
-            self.loginButton.hidden = true
+            self.guestButton.isHidden = true
+            self.loginButton.isHidden = true
             
-            self.dataLoadedActivityIndicatorView.hidden = false
+            self.dataLoadedActivityIndicatorView.isHidden = false
             self.dataLoadedActivityIndicatorView.startAnimating()
             
         case .dataLoaded:
             
             assert(self.isDataLoaded, "Invalid State")
             
-            self.summitView.hidden = false
-            self.summitActivityIndicatorView.hidden = true
+            self.summitView.isHidden = false
+            self.summitActivityIndicatorView.isHidden = true
             self.summitActivityIndicatorView.stopAnimating()
             
-            self.guestButton.hidden = false
-            self.loginButton.hidden = false
+            self.guestButton.isHidden = false
+            self.loginButton.isHidden = false
             
-            self.dataLoadedActivityIndicatorView.hidden = true
+            self.dataLoadedActivityIndicatorView.isHidden = true
             self.dataLoadedActivityIndicatorView.stopAnimating()
         }
         
         // show current summit info
         if let summit = self.summit {
             
-            self.summitNameLabel.text = summit.name.uppercaseString
+            self.summitNameLabel.text = summit.name.uppercased()
             
             if let datesLabel = summit.datesLabel {
                 
@@ -158,62 +153,32 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
             }
             else {
                 
-                let dateFormatter = NSDateFormatter()
-                dateFormatter.timeZone = NSTimeZone(name: summit.timeZone.name)
+                let dateFormatter = DateFormatter()
+                dateFormatter.timeZone = TimeZone(identifier: summit.timeZone.name)
                 dateFormatter.dateFormat = "MMMM d-"
-                let stringDateFrom = dateFormatter.stringFromDate(summit.start.toFoundation())
+                let stringDateFrom = dateFormatter.string(from: summit.start)
                 
                 dateFormatter.dateFormat = "d, yyyy"
-                let stringDateTo = dateFormatter.stringFromDate(summit.end.toFoundation())
+                let stringDateTo = dateFormatter.string(from: summit.end)
                 
                 self.summitDateLabel.text = stringDateFrom + stringDateTo
             }
         }
     }
     
-    func showRevealController(sender: AnyObject? = nil, completion: (() -> ())? = nil) {
+    private func showRevealController(_ sender: AnyObject? = nil, completion: ((MainRevealViewController) -> ())? = nil) {
         
         self.willTransition = true
         
-        // load summit
-        if isDataLoaded == false {
-            
-            /*
-            let summit = SummitManager.shared.summit.value
-            
-            self.showActivityIndicator()
-            
-            Store.shared.summit(summit) { [weak self] (response) in
-                
-                NSOperationQueue.mainQueue().addOperationWithBlock {
-                    
-                    guard let controller = self else { return }
-                    
-                    controller.dismissActivityIndicator()
-                    
-                    switch response {
-                        
-                    case let .Error(error):
-                        
-                        controller.showErrorMessage(error)
-                        
-                    case .Value:
-                        
-                        controller.showRevealController(sender, completion: completion)
-                    }
-                }
-            }
-            
-            return */
-        }
+        let revealViewController = MainRevealViewController()
         
-        let revealViewController = AppDelegate.shared.revealViewController
+        self.show(revealViewController, sender: sender)
         
-        self.showViewController(revealViewController, sender: sender)
+        self.willTransition = false;
         
-        let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(2 * Double(NSEC_PER_SEC)))
+        let delayTime = DispatchTime.now() + Double(Int64(2 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
         
-        dispatch_after(delayTime, dispatch_get_main_queue()) { self.willTransition = false; completion?() }
+        DispatchQueue.main.asyncAfter(deadline: delayTime) { completion?(revealViewController) }
     }
     
     private func loadSummits() {
@@ -224,20 +189,20 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
         
         Store.shared.summits { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     print("Error getting summits: \(error)")
                     
                     // try again
                     controller.loadSummits()
                     
-                case let .Value(page):
+                case let .value(page):
                     
                     guard let latestSummit = page.items.last
                         else { fatalError("No summits") }
@@ -253,11 +218,11 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
                     
                     switch AppEnvironment {
                         
-                    case .Staging:
+                    case .staging:
                         
                         break
                         
-                    case .Production:
+                    case .production:
                         
                         SummitManager.shared.summit.value = latestSummit.identifier
                     }
@@ -281,20 +246,20 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
         
         Store.shared.summit(summitID) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     print("Error loading summit \(summitID): \(error)")
                     
                     // try again
                     controller.loadData()
                     
-                case let .Value(summit):
+                case let .value(summit):
                     
                     assert(controller.isDataLoaded)
                     
@@ -306,17 +271,36 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
         }
     }
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    // MARK: - SummitActivityHandlingViewController
+    
+    func view(data: AppActivitySummitDataType, identifier: Identifier) {
+        
+        showRevealController(self) { $0.view(data: data, identifier: identifier) }
+    }
+    
+    func view(screen: AppActivityScreen) {
+        
+        showRevealController(self) { $0.view(screen: screen) }
+    }
+    
+    func search(_ searchTerm: String) {
+        
+        showRevealController(self) { $0.search(searchTerm) }
+    }
+    
+    // MARK: - Segue
+    
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case R.segue.launchScreenViewController.showSummits.identifier:
             
-            let navigationController = segue.destinationViewController as! UINavigationController
+            let navigationController = segue.destination as! UINavigationController
             
             let summitsViewController = navigationController.topViewController as! SummitsViewController
             
-            summitsViewController.didFinish = { [weak self] in $0.dismissViewControllerAnimated(true) { self?.loadSummits() } }
+            summitsViewController.didFinish = { [weak self] in $0.dismiss(animated: true) { self?.loadSummits() } }
             
         default: fatalError()
         }
diff --git a/OpenStack Summit/OpenStack Summit/LevelScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/LevelScheduleViewController.swift
index fda7d3a2..5d86385f 100755
--- a/OpenStack Summit/OpenStack Summit/LevelScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/LevelScheduleViewController.swift	
@@ -7,14 +7,14 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 final class LevelScheduleViewController: ScheduleViewController {
     
     // MARK: - Properties
     
-    var level: String!
+    var level: Level!
     
     // MARK: - Loading
     
@@ -23,12 +23,12 @@ final class LevelScheduleViewController: ScheduleViewController {
         
         assert(level != nil, "Level not set")
         
-        self.title = level.uppercaseString
+        self.title = level.rawValue.uppercased()
     }
     
     // MARK: - Methods
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
@@ -47,14 +47,14 @@ final class LevelScheduleViewController: ScheduleViewController {
             }
         }
         
-        let date = DateFilter.interval(start: Date(foundation: startDate), end: Date(foundation: endDate))
+        let date = DateFilter.interval(start: startDate, end: endDate)
         
-        let events = try! EventManagedObject.filter(date, tracks: nil, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
+        let events = try! EventManagedObject.filter(date, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -63,7 +63,7 @@ final class LevelScheduleViewController: ScheduleViewController {
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
@@ -82,7 +82,7 @@ final class LevelScheduleViewController: ScheduleViewController {
             }
         }
         
-        let events = try! EventManagedObject.filter(filter, tracks: nil, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
+        let events = try! EventManagedObject.filter(filter, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
         
         return ScheduleItem.from(managedObjects: events)
     }
diff --git a/OpenStack Summit/OpenStack Summit/LevelTableViewCell.swift b/OpenStack Summit/OpenStack Summit/LevelTableViewCell.swift
index e160bb99..d4f4f86c 100755
--- a/OpenStack Summit/OpenStack Summit/LevelTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/LevelTableViewCell.swift	
@@ -10,5 +10,5 @@ import UIKit
 
 final class LevelTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var nameLabel: UILabel!
-}
\ No newline at end of file
+    @IBOutlet private(set) weak var nameLabel: UILabel!
+}
diff --git a/OpenStack Summit/OpenStack Summit/LoadingTableViewCell.swift b/OpenStack Summit/OpenStack Summit/LoadingTableViewCell.swift
index 8e3e7e3b..cdbcdbf1 100644
--- a/OpenStack Summit/OpenStack Summit/LoadingTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/LoadingTableViewCell.swift	
@@ -11,5 +11,5 @@ import UIKit
 
 final class LoadingTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
+    @IBOutlet private(set) weak var activityIndicator: UIActivityIndicatorView!
 }
diff --git a/OpenStack Summit/OpenStack Summit/MainRevealViewController.swift b/OpenStack Summit/OpenStack Summit/MainRevealViewController.swift
new file mode 100644
index 00000000..a8a23a1d
--- /dev/null
+++ b/OpenStack Summit/OpenStack Summit/MainRevealViewController.swift	
@@ -0,0 +1,65 @@
+//
+//  MainRevealViewController.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/8/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import typealias CoreSummit.Identifier
+
+final class MainRevealViewController: SWRevealViewController, SummitActivityHandlingViewController {
+    
+    // MARK: - Properties
+    
+    var menuViewController: MenuViewController { return rearViewController as! MenuViewController }
+    
+    // MARK: - Initialization
+    
+    init() {
+        
+        let menuViewController = R.storyboard.menu.menuViewController()!
+        
+        let frontViewController = UINavigationController(rootViewController: menuViewController.generalScheduleViewController)
+        
+        super.init(rearViewController: menuViewController, frontViewController: frontViewController)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        
+        super.init(coder: aDecoder)
+    }
+    
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
+    
+    // MARK: - SummitActivityHandling
+    
+    func view(data: AppActivitySummitDataType, identifier: Identifier) {
+        
+        // change to menu item section first
+        switch data {
+        case .event: menuViewController.showEvents()
+        case .speaker: menuViewController.showSpeakers()
+        case .venue, .venueRoom: menuViewController.showVenues()
+        case .video: break
+        }
+        
+        // show detail view controller
+        frontViewController.show(data: data, identifier: identifier)
+    }
+    
+    func view(screen: AppActivityScreen) {
+        
+        menuViewController.view(screen: screen)
+    }
+    
+    func search(_ searchTerm: String) {
+        
+        menuViewController.search(searchTerm)
+    }
+}
diff --git a/OpenStack Summit/OpenStack Summit/MemberProfileViewController.swift b/OpenStack Summit/OpenStack Summit/MemberProfileViewController.swift
index 18327a01..02cfb14d 100644
--- a/OpenStack Summit/OpenStack Summit/MemberProfileViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/MemberProfileViewController.swift	
@@ -54,14 +54,14 @@ final class MemberProfileViewController: RevealTabStripViewController, ContextMe
             
             if let person = try! Speaker.find(identifier, context: Store.shared.managedObjectContext) {
                 
-                self.title = person.name.uppercaseString
+                self.title = person.name.uppercased()
             }
             
         case let .member(identifier):
             
             if let person = try! Member.find(identifier, context: Store.shared.managedObjectContext) {
                 
-                self.title = person.name.uppercaseString
+                self.title = person.name.uppercased()
             }
             
         case .currentUser:
@@ -74,7 +74,7 @@ final class MemberProfileViewController: RevealTabStripViewController, ContextMe
         addContextMenuBarButtonItem()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         reloadPagerTabStripView()
@@ -82,7 +82,7 @@ final class MemberProfileViewController: RevealTabStripViewController, ContextMe
     
     // MARK: - RevealTabStripViewController
     
-    override func viewControllersForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
+    override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
         
         var childViewControllers = [UIViewController]()
         
diff --git a/OpenStack Summit/OpenStack Summit/MenuViewController.swift b/OpenStack Summit/OpenStack Summit/MenuViewController.swift
old mode 100755
new mode 100644
index 9d96c36e..9ffb010c
--- a/OpenStack Summit/OpenStack Summit/MenuViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/MenuViewController.swift	
@@ -16,19 +16,19 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var searchTextView: UITextField!
-    @IBOutlet weak var pictureImageView: UIImageView!
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var loginButton: UIButton!
-    
-    @IBOutlet weak var eventsButton: UIButton!
-    @IBOutlet weak var venuesButton: UIButton!
-    @IBOutlet weak var peopleButton: UIButton!
-    @IBOutlet weak var myProfileButton: UIButton!
-    @IBOutlet weak var aboutButton: UIButton!
-    @IBOutlet weak var inboxButton: UIButton!
-    @IBOutlet weak var inboxCounterView: UIView!
-    @IBOutlet weak var inboxCounterLabel: UILabel!
+    @IBOutlet private(set) weak var searchTextView: UITextField!
+    @IBOutlet private(set) weak var pictureImageView: UIImageView!
+    @IBOutlet private(set) weak var nameLabel: UILabel!
+    @IBOutlet private(set) weak var loginButton: UIButton!
+    
+    @IBOutlet private(set) weak var eventsButton: UIButton!
+    @IBOutlet private(set) weak var venuesButton: UIButton!
+    @IBOutlet private(set) weak var peopleButton: UIButton!
+    @IBOutlet private(set) weak var myProfileButton: UIButton!
+    @IBOutlet private(set) weak var aboutButton: UIButton!
+    @IBOutlet private(set) weak var inboxButton: UIButton!
+    @IBOutlet private(set) weak var inboxCounterView: UIView!
+    @IBOutlet private(set) weak var inboxCounterLabel: UILabel!
     
     // MARK: - Properties
     
@@ -40,7 +40,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     private var unreadNotificationsObserver: Int?
     private var unreadTeamMessagesObserver: Int?
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Accessors
     
@@ -54,30 +54,23 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         }
     }
     
-    private(set) var pictureURL: String = "" {
+    private(set) var picture: URL? {
         
         didSet {
             
-            let picURLInternal: String
+            let placeholder = #imageLiteral(resourceName: "generic-user-avatar")
             
-            if AppEnvironment == .Staging {
+            if let url = picture {
                 
-                picURLInternal = pictureURL.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
+                pictureImageView.hnk_setImageFromURL(url.environmentScheme, placeholder: placeholder)
                 
             } else {
                 
-                picURLInternal = pictureURL
-            }
-
-            if picURLInternal.isEmpty == false {
-                pictureImageView.hnk_setImageFromURL(NSURL(string: picURLInternal)!)
-            }
-            else {
-                pictureImageView.image = R.image.genericUserAvatar()!
+                pictureImageView.image = #imageLiteral(resourceName: "generic-user-avatar")
             }
             
             pictureImageView.layer.borderWidth = 0.88;
-            pictureImageView.layer.borderColor = UIColor(red: 215/255, green: 226/255, blue: 235/255, alpha: 1.0).CGColor
+            pictureImageView.layer.borderColor = UIColor(red: 215/255, green: 226/255, blue: 235/255, alpha: 1.0).cgColor
             pictureImageView.layer.cornerRadius = pictureImageView.frame.size.width / 2
             pictureImageView.clipsToBounds = true;
         }
@@ -85,8 +78,8 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     // MARK: - Loading
     
-    override func preferredStatusBarStyle() -> UIStatusBarStyle {
-        return .LightContent
+    override var preferredStatusBarStyle : UIStatusBarStyle {
+        return .lightContent
     }
     
     deinit {
@@ -101,7 +94,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             PushNotificationManager.shared.unreadNotifications.remove(observer)
         }
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
     
     override func viewDidLoad() {
@@ -116,12 +109,14 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         revealViewController().view.addGestureRecognizer(revealViewController().panGestureRecognizer())
         
         // session notifications
-        NSNotificationCenter.defaultCenter().removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(
+        /*
+        NotificationCenter.default.removeObserver(self, name: OAuth2Module.revokeNotification, object: nil)
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(MenuViewController.revokedAccess(_:)),
             name: OAuth2Module.revokeNotification,
             object: nil)
+        */
         
         // observe unread notifications
         unreadTeamMessagesObserver = PushNotificationManager.shared.unreadTeamMessages
@@ -130,7 +125,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             .observe { [weak self] _ in self?.reloadInboxCounter() }
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         self.showUserProfile()
@@ -140,7 +135,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     // MARK: - Actions
     
-    @IBAction func toggleMenuSelection(sender: UIButton) {
+    @IBAction func toggleMenuSelection(_ sender: UIButton) {
         
         let item: MenuItem
         
@@ -148,27 +143,27 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             
         case eventsButton:
             showEvents()
-            item = .Events
+            item = .events
             
         case venuesButton:
             showVenues()
-            item = .Venues
+            item = .venues
             
         case peopleButton:
             showSpeakers()
-            item = .People
+            item = .people
             
         case myProfileButton:
             showMyProfile()
-            item = .MyProfile
+            item = .myProfile
             
         case aboutButton:
             showAbout()
-            item = .About
+            item = .about
             
         case inboxButton:
             showInbox()
-            item = .Inbox
+            item = .inbox
             
         default: fatalError("Invalid sender \(sender)")
         }
@@ -176,12 +171,12 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         highlight(item)
     }
     
-    @IBAction func login(sender: UIButton) {
+    @IBAction func login(_ sender: UIButton) {
         
-        if (hasAccess(to: .Login)) {
+        if (hasAccess(to: .login)) {
             login()
-            let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(2 * Double(NSEC_PER_SEC)))
-            dispatch_after(delayTime, dispatch_get_main_queue()) {
+            let delayTime = DispatchTime.now() + Double(Int64(2 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+            DispatchQueue.main.asyncAfter(deadline: delayTime) {
                 self.dismissActivityIndicator()
             }
         } else {
@@ -196,9 +191,9 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         let currentMemberRole = Store.shared.memberRole
         
         switch (menuItem) {
-        case .MyProfile:
+        case .myProfile:
             return currentMemberRole != .anonymous
-        case .Login:
+        case .login:
             return currentMemberRole == .anonymous
         default:
             return true
@@ -215,28 +210,28 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         inboxButton.alpha = 0.5
     }
     
-    private func highlight(item: MenuItem) {
+    private func highlight(_ item: MenuItem) {
         
         let _ = self.view
         
         unselectMenuItems()
         
         switch item {
-        case .Events:
+        case .events:
             eventsButton.alpha = 1
-        case .Venues:
+        case .venues:
             venuesButton.alpha = 1
-        case .People:
+        case .people:
             peopleButton.alpha = 1
-        case .MyProfile:
+        case .myProfile:
             myProfileButton.alpha = 1
-        case .About:
+        case .about:
             aboutButton.alpha = 1
-        case .Inbox:
+        case .inbox:
             inboxButton.alpha = 1
             
         // not applicable
-        case .Login: break
+        case .login: break
         }
     }
     
@@ -247,19 +242,19 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     private func reloadMenu() {
         
-        let loginTitle = hasAccess(to: .Login) ? "LOG IN" : "LOG OUT"
-        loginButton.setTitle(loginTitle, forState: .Normal)
+        let loginTitle = hasAccess(to: .login) ? "LOG IN" : "LOG OUT"
+        loginButton.setTitle(loginTitle, for: UIControlState())
         
-        peopleButton.setTitle("SPEAKERS", forState: .Normal)
+        peopleButton.setTitle("SPEAKERS", for: UIControlState())
         
-        myProfileButton.hidden = hasAccess(to: .MyProfile) == false
+        myProfileButton.isHidden = hasAccess(to: .myProfile) == false
     }
     
     private func reloadInboxCounter() {
         
         let unreadCount = PushNotificationManager.shared.unreadCount
         
-        inboxCounterView.hidden = unreadCount == 0
+        inboxCounterView.isHidden = unreadCount == 0
         inboxCounterView.layer.cornerRadius = inboxCounterView.frame.size.width / 2
         inboxCounterLabel.text = "\(unreadCount)"
     }
@@ -281,45 +276,45 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             if let speaker = currentMember.speakerRole {
                 
                 name = speaker.name
-                pictureURL = speaker.pictureURL
+                picture = speaker.picture
                 
             } else {
                 
                 name = currentMember.name
-                pictureURL = currentMember.pictureURL
+                picture = currentMember.picture
             }
             
         } else {
             
             name = ""
-            pictureURL = ""
+            picture = nil
         }
     }
     
     func showSpeakers() {
         
-        highlight(.People)
+        highlight(.people)
         
         show(speakersViewController)
     }
     
     func showEvents() {
         
-        highlight(.Events)
+        highlight(.events)
         
         show(generalScheduleViewController)
     }
     
     func showVenues() {
         
-        highlight(.Venues)
+        highlight(.venues)
         
         show(venuesViewController)
     }
     
     func showAbout() {
         
-        highlight(.About)
+        highlight(.about)
         
         let aboutViewController = R.storyboard.menu.aboutViewController()!
         
@@ -328,38 +323,30 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     func showInbox() {
         
-        highlight(.Inbox)
+        highlight(.inbox)
         
         let teamsViewController = InboxViewController()
         
         show(teamsViewController)
     }
-    
-    func showSearch(for term: String) {
-        
-        let searchViewController = R.storyboard.menu.searchViewController()!
-        searchViewController.searchTerm = term
-        
-        show(searchViewController)
-    }
         
     private func showMyProfile() {
         
         guard Store.shared.isLoggedIn else { return }
         
-        highlight(.MyProfile)
+        highlight(.myProfile)
         
         let myProfileViewController = MyProfileViewController()
         
         show(myProfileViewController)
     }
     
-    private func show(viewController: UIViewController) {
+    private func show(_ viewController: UIViewController) {
         
-        let revealViewController = AppDelegate.shared.revealViewController
+        let revealViewController = self.revealViewController()
         let navigationController = UINavigationController(rootViewController: viewController)
         
-        revealViewController.pushFrontViewController(navigationController, animated: true)
+        revealViewController?.pushFrontViewController(navigationController, animated: true)
     }
     
     // MARK: Login / Logout
@@ -378,7 +365,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         Store.shared.login(summit, loginCallback: {
             
             // return from SafariVC
-            dispatch_async(dispatch_get_main_queue(), {
+            DispatchQueue.main.async(execute: {
                 
                 self.showActivityIndicator()
             })
@@ -387,7 +374,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             
             guard let controller = self else { return }
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 controller.hideMenu()
                 
@@ -395,11 +382,11 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
                 
                 switch response {
                     
-                case let .Some(error):
+                case let .some(error):
                     
                     controller.showErrorMessage(error as NSError)
                     
-                case .None:
+                case .none:
                     
                     controller.showUserProfile()
                     controller.reloadMenu()
@@ -415,31 +402,30 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
                         
                         controller.showMyProfile()
                         
-                        let revealViewController = AppDelegate.shared.revealViewController
+                        let revealViewController = controller.revealViewController()
                         
                         // show a popup asking user if they are going to the summit
-                        let alert = UIAlertController(title: "Eventbrite Order", message: "Are you a summit attendee?", preferredStyle: .Alert)
+                        let alert = UIAlertController(title: "Eventbrite Order", message: "Are you a summit attendee?", preferredStyle: .alert)
                         
-                        alert.addAction(UIAlertAction(title: "No", style: .Default) { (action) in
+                        alert.addAction(UIAlertAction(title: "No", style: .default) { (action) in
                             
                             Preference.goingToSummit = false
                         })
                         
-                        alert.addAction(UIAlertAction(title: "Yes", style: .Default) { (action) in
+                        alert.addAction(UIAlertAction(title: "Yes", style: .default) { (action) in
                             
                             Preference.goingToSummit = true
                             
                             let viewController = R.storyboard.member.attendeeConfirmNavigationController()!
                             
-                            revealViewController.presentViewController(viewController, animated: true) { controller.showMyProfile() }
+                            revealViewController!.present(viewController, animated: true) { controller.showMyProfile() }
                         })
                         
-                        revealViewController.presentViewController(alert, animated: true) { }
+                        revealViewController?.present(alert, animated: true) { }
                     }
                     
                     // log user email
-                    if let userID = Store.shared.authenticatedMember?.identifier
-                        where AppEnvironment == .Staging {
+                    if let userID = Store.shared.authenticatedMember?.id, AppEnvironment == .staging {
                         
                         Crashlytics.sharedInstance().setUserIdentifier("\(userID)")
                     }
@@ -453,7 +439,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         Store.shared.logout()
         
         // log user email
-        if AppEnvironment == .Staging {
+        if AppEnvironment == .staging {
             
             Crashlytics.sharedInstance().setUserIdentifier(nil)
         }
@@ -467,18 +453,18 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     // MARK: - SWRevealViewControllerDelegate
     
-    func revealController(revealController: SWRevealViewController, willMoveToPosition position: FrontViewPosition) {
+    func revealController(_ revealController: SWRevealViewController, willMoveTo position: FrontViewPosition) {
         
         if let navigationController = revealController.frontViewController {
             if let viewController = navigationController.childViewControllers.first {
-                viewController.view.userInteractionEnabled = position != FrontViewPosition.Right
+                viewController.view.isUserInteractionEnabled = position != FrontViewPosition.right
             }
         }
     }
     
     // MARK: - UITextFieldDelegate
     
-    func textFieldShouldReturn(textField: UITextField) -> Bool {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         
         searchTextView.resignFirstResponder()
         
@@ -488,7 +474,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             
             unselectMenuItems()
             
-            guard try! Store.shared.managedObjectContext.managedObjects(SummitManagedObject).count > 0 else {
+            guard try! Store.shared.managedObjectContext.managedObjects(SummitManagedObject.self).count > 0 else {
                 
                 showInfoMessage("Info", message: "No summit data available")
                 return true
@@ -496,24 +482,45 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
             
             defer {
                 
-                let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(2 * Double(NSEC_PER_SEC)))
-                dispatch_after(delayTime, dispatch_get_main_queue()) {
+                let delayTime = DispatchTime.now() + Double(Int64(2 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+                DispatchQueue.main.asyncAfter(deadline: delayTime) {
                     self.searchTextView.text = ""
                 }
             }
             
-            let sanitizedTerm = term.stringByTrimmingCharactersInSet(.whitespaceAndNewlineCharacterSet())
+            let sanitizedTerm = term.trimmingCharacters(in: .whitespacesAndNewlines)
             
             // show Search VC
-            showSearch(for: sanitizedTerm)
+            search(sanitizedTerm)
         }
         
         return true
     }
     
+    // MARK: - SummitActivityHandling
+    
+    func view(screen: AppActivityScreen) {
+        
+        switch screen {
+        case .venues: showVenues()
+        case .events: showEvents()
+        case .speakers: showSpeakers()
+        case .about: showAbout()
+        case .inbox: showInbox()
+        }
+    }
+    
+    func search(_ searchTerm: String) {
+        
+        let searchViewController = R.storyboard.menu.searchViewController()!
+        searchViewController.searchTerm = searchTerm
+        
+        show(searchViewController)
+    }
+    
     // MARK: - Notifications
     
-    @objc private func revokedAccess(notification: NSNotification) {
+    @objc private func revokedAccess(_ notification: Foundation.Notification) {
         
         // logout in case its not cleared
         Store.shared.session.clear()
@@ -532,11 +539,11 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
 
 enum MenuItem {
     
-    case Login
-    case Events
-    case Venues
-    case People
-    case About
-    case Inbox
-    case MyProfile
+    case login
+    case events
+    case venues
+    case people
+    case about
+    case inbox
+    case myProfile
 }
diff --git a/OpenStack Summit/OpenStack Summit/MessageEnabledViewController.swift b/OpenStack Summit/OpenStack Summit/MessageEnabledViewController.swift
index ae6f21a6..da553ba6 100755
--- a/OpenStack Summit/OpenStack Summit/MessageEnabledViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/MessageEnabledViewController.swift	
@@ -14,33 +14,33 @@
 
 protocol MessageEnabledViewController: class {
 
-    func showInfoMessage(title: String, message: String)
+    func showInfoMessage(_ title: String, message: String)
     
-    func showErrorMessage(error: ErrorType, fileName: String, lineNumber: Int)
+    func showErrorMessage(_ error: Swift.Error, fileName: String, lineNumber: Int)
 }
 
 #if os(iOS) || os(tvOS)
 
 extension MessageEnabledViewController {
     
-    func showInfoMessage(title: String, message: String) {
+    func showInfoMessage(_ title: String, message: String) {
         
         guard let viewController = self as? UIViewController
             else { fatalError("Not a view controller") }
         
         let alert = UIAlertController(title: title,
                                       message: message,
-                                      preferredStyle: .Alert)
+                                      preferredStyle: .alert)
         
-        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: .Default, handler: { (UIAlertAction) -> () in
+        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: .default, handler: { (UIAlertAction) -> () in
             
-            alert.dismissViewControllerAnimated(true, completion: nil)
+            alert.dismiss(animated: true, completion: nil)
         }))
         
-        viewController.presentViewController(alert, animated: true, completion: nil)
+        viewController.present(alert, animated: true, completion: nil)
     }
     
-    func showErrorMessage(error: ErrorType,
+    func showErrorMessage(_ error: Swift.Error,
                           fileName: String = #file,
                           lineNumber: Int = #line) {
         
@@ -49,7 +49,7 @@ extension MessageEnabledViewController {
         
         print("Error at \(fileName):\(lineNumber)\n\(error)")
         
-        if AppEnvironment == .Staging {
+        if AppEnvironment == .staging {
             
             showInfoMessage(NSLocalizedString("Error", comment: "Error"), message: message)
         }
@@ -64,16 +64,16 @@ extension MessageEnabledViewController {
     
 extension MessageEnabledViewController {
 
-    func showInfoMessage(title: String, message: String) {
+    func showInfoMessage(_ title: String, message: String) {
         
         let alert = NSAlert()
         alert.messageText = title
         alert.informativeText = message
-        alert.alertStyle = .Informational
+        alert.alertStyle = .informational
         alert.runModal()
     }
     
-    func showErrorMessage(error: ErrorType,
+    func showErrorMessage(_ error: Error,
                           fileName: String = #file,
                           lineNumber: Int = #line) {
         
diff --git a/OpenStack Summit/OpenStack Summit/MyProfileViewController.swift b/OpenStack Summit/OpenStack Summit/MyProfileViewController.swift
index a0d0f0d8..9b3aa28d 100755
--- a/OpenStack Summit/OpenStack Summit/MyProfileViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/MyProfileViewController.swift	
@@ -45,6 +45,8 @@ final class MyProfileViewController: RevealTabStripViewController {
     
     private func updateButtonBarViewLayout() {
         
+        guard buttonBarView != nil else { return }
+        
         if collectionViewFlowLayout == nil {
             
             collectionViewFlowLayout = buttonBarView.collectionViewLayout
@@ -62,14 +64,14 @@ final class MyProfileViewController: RevealTabStripViewController {
     
     // MARK: - PagerTabStripViewControllerDataSource
     
-    override func viewControllersForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
+    override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
         
         var childViewControllers: [UIViewController] = [personDetailViewController]
         
         if let speaker = Store.shared.authenticatedMember?.speakerRole {
             
             let speakerPresentationsViewController = R.storyboard.schedule.speakerPresentationsViewController()!
-            speakerPresentationsViewController.speaker = speaker.identifier
+            speakerPresentationsViewController.speaker = speaker.id
             childViewControllers.append(speakerPresentationsViewController)
         }
         
diff --git a/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift b/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift
index bc2fdd88..8dd75eb6 100644
--- a/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift	
@@ -14,17 +14,17 @@ final class NotificationDetailViewController: UITableViewController {
     
     // MARK: - Properties
     
-    var notification: Notification!
+    var notification: CoreSummit.Notification!
     
     private var data = [[Data]]()
     
-    private lazy var dateFormatter: NSDateFormatter = {
+    private lazy var dateFormatter: DateFormatter = {
         
-        let dateFormatter = NSDateFormatter()
+        let dateFormatter = DateFormatter()
         
-        dateFormatter.dateStyle = .LongStyle
+        dateFormatter.dateStyle = .long
         
-        dateFormatter.timeStyle = .MediumStyle
+        dateFormatter.timeStyle = .medium
         
         return dateFormatter
     }()
@@ -42,7 +42,7 @@ final class NotificationDetailViewController: UITableViewController {
     
     // MARK: - Actions
     
-    @IBAction func deleteAction(sender: UIBarButtonItem) {
+    @IBAction func deleteAction(_ sender: UIBarButtonItem) {
         
         let context = Store.shared.privateQueueManagedObjectContext
         
@@ -50,20 +50,20 @@ final class NotificationDetailViewController: UITableViewController {
         
         func closeViewController() {
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
-                controller.navigationController?.popViewControllerAnimated(true)
+                controller.navigationController?.popViewController(animated: true)
             }
         }
                 
-        context.performBlock {
+        context.perform {
             
             guard let notificationManagedObject = try! NotificationManagedObject.find(identifier, context: context)
                 else { closeViewController(); return }
             
-            context.deleteObject(notificationManagedObject)
+            context.delete(notificationManagedObject)
             
             try! context.save()
             
@@ -75,7 +75,7 @@ final class NotificationDetailViewController: UITableViewController {
     
     private func configureView() {
         
-        assert(isViewLoaded(), "View must be loaded")
+        assert(isViewLoaded, "View must be loaded")
         
         assert(self.notification != nil, "\(self) not configured with notification")
         
@@ -87,7 +87,7 @@ final class NotificationDetailViewController: UITableViewController {
             data.append([.event(event)])
         }
         
-        let date = dateFormatter.stringFromDate(notification.created.toFoundation())
+        let date = dateFormatter.string(from: notification.created)
         
         let text = notification.body
         
@@ -99,19 +99,19 @@ final class NotificationDetailViewController: UITableViewController {
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return data.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let section = data[section]
         
         return section.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = self.data[indexPath.section][indexPath.row]
         
@@ -119,7 +119,7 @@ final class NotificationDetailViewController: UITableViewController {
             
         case let .event(event):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.notificationDetailEventCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.notificationDetailEventCell, for: indexPath)!
             
             cell.textLabel!.text = event.name
             
@@ -127,7 +127,7 @@ final class NotificationDetailViewController: UITableViewController {
             
         case let .date(date):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.notificationDetailDateCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.notificationDetailDateCell, for: indexPath)!
             
             cell.textLabel!.text = date
             
@@ -135,7 +135,7 @@ final class NotificationDetailViewController: UITableViewController {
             
         case let .text(text):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.notificationDetailTextCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.notificationDetailTextCell, for: indexPath)!
             
             cell.textLabel!.text = text
             
@@ -145,7 +145,7 @@ final class NotificationDetailViewController: UITableViewController {
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -154,7 +154,7 @@ final class NotificationDetailViewController: UITableViewController {
             guard let event = self.notification?.event
                 else { fatalError("No event for notification") }
             
-            let eventViewController = segue.destinationViewController as! EventDetailViewController
+            let eventViewController = segue.destination as! EventDetailViewController
             
             eventViewController.event = event
             
diff --git a/OpenStack Summit/OpenStack Summit/NotificationsViewController.swift b/OpenStack Summit/OpenStack Summit/NotificationsViewController.swift
index 3bd011ea..e2a141bc 100644
--- a/OpenStack Summit/OpenStack Summit/NotificationsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/NotificationsViewController.swift	
@@ -16,13 +16,13 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
     
     // MARK: - Properties
     
-    private lazy var dateFormatter: NSDateFormatter = {
+    private lazy var dateFormatter: DateFormatter = {
        
-        let dateFormatter = NSDateFormatter()
+        let dateFormatter = DateFormatter()
         
-        dateFormatter.dateStyle = .ShortStyle
+        dateFormatter.dateStyle = .short
         
-        dateFormatter.timeStyle = .MediumStyle
+        dateFormatter.timeStyle = .medium
         
         return dateFormatter
     }()
@@ -50,13 +50,13 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
         configureView()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
                 
-        self.navigationController?.setToolbarHidden(!self.editing, animated: animated)
+        self.navigationController?.setToolbarHidden(!self.isEditing, animated: animated)
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
         self.navigationController?.setToolbarHidden(true, animated: animated)
@@ -64,38 +64,38 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
     
     // MARK: - Actions
     
-    @IBAction func toggleEdit(sender: UIBarButtonItem) {
+    @IBAction func toggleEdit(_ sender: UIBarButtonItem) {
         
-        let willEdit = !self.editing
+        let willEdit = !self.isEditing
         
         self.setEditing(willEdit, animated: true)
         
         self.navigationController?.setToolbarHidden(!willEdit, animated: true)
     }
     
-    @IBAction func deleteItems(sender: UIBarButtonItem) {
+    @IBAction func deleteItems(_ sender: UIBarButtonItem) {
         
         let selectedIndexPaths = self.tableView.indexPathsForSelectedRows ?? []
         
-        let selectedItems = selectedIndexPaths.map { self.fetchedResultsController.objectAtIndexPath($0) as! NotificationManagedObject }
+        let selectedItems = selectedIndexPaths.map { self.fetchedResultsController.object(at: $0) as! NotificationManagedObject }
         
         let context = Store.shared.privateQueueManagedObjectContext
         
-        context.performBlock {
+        context.perform {
             
-            let managedObjects = selectedItems.map { context.objectWithID($0.objectID) }
+            let managedObjects = selectedItems.map { context.object(with: $0.objectID) }
             
-            managedObjects.forEach { context.deleteObject($0) }
+            managedObjects.forEach { context.delete($0) }
             
             try! context.save()
         }
     }
     
-    @IBAction func markAll(sender: UIBarButtonItem) {
+    @IBAction func markAll(_ sender: UIBarButtonItem) {
         
-        let indexPaths = (self.fetchedResultsController.fetchedObjects ?? []).map { self.fetchedResultsController.indexPathForObject($0) }
+        let indexPaths = (self.fetchedResultsController.fetchedObjects ?? []).map { self.fetchedResultsController.indexPath(forObject: $0) }
         
-        indexPaths.forEach { self.tableView.selectRowAtIndexPath($0, animated: true, scrollPosition: .None) }
+        indexPaths.forEach { self.tableView.selectRow(at: $0, animated: true, scrollPosition: .none) }
     }
     
     // MARK: - Private Methods
@@ -104,26 +104,26 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
         
         let sort = [NSSortDescriptor(key: "channel", ascending: true), NSSortDescriptor(key: "id", ascending: false)]
         
-        self.fetchedResultsController = NSFetchedResultsController(Notification.self,
+        self.fetchedResultsController = NSFetchedResultsController(CoreSummit.Notification.self,
                                                                    delegate: self,
                                                                    predicate: nil,
                                                                    sortDescriptors: sort,
                                                                    sectionNameKeyPath: "channel",
-                                                                   context: Store.shared.managedObjectContext)
+                                                                   context: Store.shared.managedObjectContext) as! NSFetchedResultsController<NSManagedObject>
         
         try! self.fetchedResultsController.performFetch()
         
         self.tableView.reloadData()
     }
     
-    private subscript (indexPath: NSIndexPath) -> Notification {
+    private subscript (indexPath: IndexPath) -> CoreSummit.Notification {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! Notification.ManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! CoreSummit.Notification.ManagedObject
         
         return Notification(managedObject: managedObject)
     }
     
-    private func configure(cell cell: NotificationTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: NotificationTableViewCell, at indexPath: IndexPath) {
         
         let notification = self[indexPath]
         
@@ -131,38 +131,38 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
         
         let unread = PushNotificationManager.shared.unreadNotifications.value.contains(notification.identifier)
         
-        cell.notificationLabel.font = unread ? UIFont.boldSystemFontOfSize(17) : UIFont.systemFontOfSize(17)
+        cell.notificationLabel.font = unread ? UIFont.boldSystemFont(ofSize: 17) : UIFont.systemFont(ofSize: 17)
         
-        cell.dateLabel.text = self.dateFormatter.stringFromDate(notification.created.toFoundation())
+        cell.dateLabel.text = self.dateFormatter.string(from: notification.created)
     }
     
-    private func unreadNotificationsChanged(newValue: Set<Identifier>, _ oldValue: Set<Identifier>) {
+    private func unreadNotificationsChanged(_ newValue: Set<Identifier>, _ oldValue: Set<Identifier>) {
         
         let managedObjects = (self.fetchedResultsController.fetchedObjects ?? []) as! [NotificationManagedObject]
         
-        let changedNotifications = managedObjects.filter({ newValue.contains($0.identifier) })
+        let changedNotifications = managedObjects.filter { newValue.contains($0.id) } 
         
-        let indexPaths = changedNotifications.map { fetchedResultsController.indexPathForObject($0)! }
+        let indexPaths = changedNotifications.map { fetchedResultsController.indexPath(forObject: $0)! }
         
         tableView.beginUpdates()
         
-        tableView.reloadRowsAtIndexPaths(indexPaths, withRowAnimation: .None)
+        tableView.reloadRows(at: indexPaths, with: .none)
         
         tableView.endUpdates()
     }
     
     // MARK: - UITableViewDataSource
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.notificationCell)!
+        let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.notificationCell)!
         
         configure(cell: cell, at: indexPath)
         
         return cell
     }
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         guard let channelString = self.fetchedResultsController.sections?[section].name,
             let channel = Notification.Channel(rawValue: channelString)
@@ -181,33 +181,33 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
     
     // MARK: - UITableViewDataSource
     
-    override func tableView(tableView: UITableView, editingStyleForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCellEditingStyle {
+    override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle {
         
         return UITableViewCellEditingStyle(rawValue: 3)!
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Notifications")
     }
     
     // MARK: - Segue
     
-    override func shouldPerformSegueWithIdentifier(identifier: String, sender: AnyObject?) -> Bool {
+    override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         
         switch identifier {
             
         case R.segue.notificationsViewController.showNotification.identifier:
             
-            return editing == false
+            return isEditing == false
             
         default: fatalError()
         }
     }
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -215,7 +215,7 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
             
             let notification = self[tableView.indexPathForSelectedRow!]
             
-            let notificationViewController = segue.destinationViewController as! NotificationDetailViewController
+            let notificationViewController = segue.destination as! NotificationDetailViewController
             
             notificationViewController.notification = notification
             
@@ -228,7 +228,7 @@ final class NotificationsViewController: TableViewController, IndicatorInfoProvi
 
 final class NotificationTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var notificationLabel: UILabel!
+    @IBOutlet private(set) weak var notificationLabel: UILabel!
     
-    @IBOutlet weak var dateLabel: UILabel!
+    @IBOutlet private(set) weak var dateLabel: UILabel!
 }
diff --git a/OpenStack Summit/OpenStack Summit/Observable.swift b/OpenStack Summit/OpenStack Summit/Observable.swift
index e43a29cf..2a3d0bf5 100644
--- a/OpenStack Summit/OpenStack Summit/Observable.swift	
+++ b/OpenStack Summit/OpenStack Summit/Observable.swift	
@@ -36,7 +36,7 @@ public final class Observable<Value: Equatable> {
     
     // MARK: - Methods
     
-    public func observe(observer: (new: Value, old: Value) -> ()) -> Int {
+    public func observe(_ observer: @escaping (_ new: Value, _ old: Value) -> ()) -> Int {
         
         let identifier = nextID
         
@@ -52,18 +52,19 @@ public final class Observable<Value: Equatable> {
         return identifier
     }
     
-    public func remove(observer: Int) -> Bool {
+    @discardableResult
+    public func remove(_ observer: Int) -> Bool {
         
-        guard let index = observers.indexOf({ $0.identifier == observer })
+        guard let index = observers.index(where: { $0.identifier == observer })
             else { return false }
         
-        observers.removeAtIndex(index)
+        observers.remove(at: index)
         
         return true
     }
 }
 
-public extension Observable where Value: NilLiteralConvertible {
+public extension Observable where Value: ExpressibleByNilLiteral {
     
     convenience init() { self.init(nil) }
 }
@@ -74,7 +75,7 @@ private struct Observer<Value> {
     
     let callback: (Value, Value) -> ()
     
-    init(identifier: Int, callback: (Value, Value) -> ()) {
+    init(identifier: Int, callback: @escaping (Value, Value) -> ()) {
         
         self.identifier = identifier
         self.callback = callback
diff --git a/OpenStack Summit/OpenStack Summit/PagingTableViewController.swift b/OpenStack Summit/OpenStack Summit/PagingTableViewController.swift
index 2eba8bcc..8ec4386b 100644
--- a/OpenStack Summit/OpenStack Summit/PagingTableViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/PagingTableViewController.swift	
@@ -29,7 +29,7 @@ protocol PagingTableViewController: class, UITableViewDataSource, UITableViewDel
     
     func willLoadData()
     
-    func didLoadNextPage(response: ErrorValue<[PageControllerChange]>)
+    func didLoadNextPage(_ response: ErrorValue<[PageControllerChange]>)
 }
 
 extension PagingTableViewController {
@@ -42,9 +42,9 @@ extension PagingTableViewController {
         }
     }
     
-    func didLoadNextPage(response: ErrorValue<[PageControllerChange]>) {
+    func didLoadNextPage(_ response: ErrorValue<[PageControllerChange]>) {
         
-        dismissActivityIndicator(animated: true)
+        dismissActivityIndicator(true)
         
         #if os(iOS)
         refreshControl?.endRefreshing()
@@ -52,11 +52,11 @@ extension PagingTableViewController {
         
         switch response {
             
-        case let .Error(error):
+        case let .error(error):
             
             showErrorMessage(error, fileName: #file, lineNumber: #line)
             
-        case let .Value(changes):
+        case let .value(changes):
             
             let wasCached = pageController.cached != nil && pageController.pages.count == 1
             
@@ -72,21 +72,21 @@ extension PagingTableViewController {
                 
                 for change in changes {
                     
-                    let indexPath = NSIndexPath(forRow: change.index, inSection: 0)
+                    let indexPath = IndexPath(row: change.index, section: 0)
                     
                     switch change.change {
                         
                     case .delete:
                         
-                        tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
+                        tableView.deleteRows(at: [indexPath], with: .fade)
                         
                     case .insert:
                         
-                        tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
+                        tableView.insertRows(at: [indexPath], with: .fade)
                         
                     case .update:
                         
-                        tableView.reloadRowsAtIndexPaths([indexPath], withRowAnimation: .None)
+                        tableView.reloadRows(at: [indexPath], with: .none)
                     }
                 }
                 
@@ -94,22 +94,22 @@ extension PagingTableViewController {
                                         
                     for change in changes {
                         
-                         let indexSet = NSIndexSet(index: change.index)
+                        let indexSet = NSIndexSet(index: change.index) as IndexSet
                         
                         switch change.change {
                             
                         case .delete:
                             
-                            tableView.removeRowsAtIndexes(indexSet, withAnimation: .EffectFade)
+                            tableView.removeRows(at: indexSet, withAnimation: .effectFade)
                             
                         case .insert:
                             
-                            tableView.insertRowsAtIndexes(indexSet, withAnimation: .EffectFade)
+                            tableView.insertRows(at: indexSet, withAnimation: .effectFade)
                             
                         case .update:
                             
-                            tableView.removeRowsAtIndexes(indexSet, withAnimation: .EffectNone)
-                            tableView.insertRowsAtIndexes(indexSet, withAnimation: .EffectNone)
+                            tableView.removeRows(at: indexSet, withAnimation: [])
+                            tableView.insertRows(at: indexSet, withAnimation: [])
                         }
                     }
                     
diff --git a/OpenStack Summit/OpenStack Summit/PeopleTableViewCell.swift b/OpenStack Summit/OpenStack Summit/PeopleTableViewCell.swift
index 959d8e51..141f5fa9 100755
--- a/OpenStack Summit/OpenStack Summit/PeopleTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/PeopleTableViewCell.swift	
@@ -28,7 +28,7 @@ final class PeopleTableViewCell: UITableViewCell {
     
     // MARK: - Selection
     
-    override func setSelected(selected: Bool, animated: Bool) {
+    override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
         
         // Configure the view for the selected state
@@ -38,10 +38,10 @@ final class PeopleTableViewCell: UITableViewCell {
     
     var isModerator: Bool {
         get {
-            return !moderatorLabel.hidden
+            return !moderatorLabel.isHidden
         }
         set {
-            moderatorLabel.hidden = !newValue
+            moderatorLabel.isHidden = !newValue
         }
     }
     
@@ -54,33 +54,33 @@ final class PeopleTableViewCell: UITableViewCell {
         }
     }
     
-    var title: String!{
-        get {
-            return titleLabel.text
-        }
+    var title: String {
+        
+        get { return titleLabel.text ?? "" }
+        
         set {
             titleLabel.text = newValue
-            titleLabel.hidden = (newValue ?? "").isEmpty
+            titleLabel.isHidden = newValue.isEmpty
         }
     }
     
-    var pictureURL: String = "" {
+    var picture: URL? {
         
         didSet {
             
-            let picUrlInternal: String
+            let placeholder = #imageLiteral(resourceName: "generic-user-avatar")
             
-            picUrlInternal = pictureURL.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
-            
-            if (!picUrlInternal.isEmpty) {
-                let placeholder = R.image.genericUserAvatar()!
-                pictureImageView.hnk_setImageFromURL(NSURL(string: picUrlInternal)!, placeholder: placeholder)
-            }
-            else {
-                pictureImageView.image = R.image.genericUserAvatar()!
+            if let url = self.picture {
+                
+                pictureImageView.hnk_setImageFromURL(url.environmentScheme, placeholder: placeholder)
+                
+            } else {
+                
+                pictureImageView.image = placeholder
             }
+            
             pictureImageView.layer.cornerRadius = pictureImageView.frame.size.width / 2
-            pictureImageView.clipsToBounds = true;
+            pictureImageView.clipsToBounds = true
         }
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/PersonDetailViewController.swift b/OpenStack Summit/OpenStack Summit/PersonDetailViewController.swift
index 32019181..c8c523de 100644
--- a/OpenStack Summit/OpenStack Summit/PersonDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/PersonDetailViewController.swift	
@@ -21,12 +21,12 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
     
     var profile: PersonIdentifier = .currentUser {
         
-        didSet { configureView() }
+        didSet { if isViewLoaded { configureView() } }
     }
     
     var contextMenu: ContextMenu {
         
-        var items = [AnyObject]()
+        var items = [Any]()
         
         if let url = self.userActivity?.webpageURL {
             
@@ -81,10 +81,10 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         setupToolbar()
         
         // configure UI
-        configureView()
+        OperationQueue.main.addOperation { [weak self] in self?.configureView() }
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         // handoff
@@ -94,14 +94,14 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         self.navigationController?.setToolbarHidden(!showNonConfirmedWarning, animated: animated)
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         // setup after animation finished to prevent lag
         configureView()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
         // handoff
@@ -111,16 +111,16 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         self.navigationController?.setToolbarHidden(true, animated: animated)
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         switch profile {
             
         case let .speaker(identifier):
             
             let userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.speaker.rawValue,
-                            AppActivityUserInfo.identifier.rawValue: identifier]
+                            AppActivityUserInfo.identifier.rawValue: identifier] as [String : Any]
             
-            userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+            userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
             
         default: break
         }
@@ -130,14 +130,14 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
     
     // MARK: - Actions
     
-    @IBAction func nonConfirmedWarningTapped(sender: AnyObject? = nil) {
+    @IBAction func nonConfirmedWarningTapped(_ sender: AnyObject? = nil) {
         
-        self.performSegueWithIdentifier(R.segue.personDetailViewController.showAttendeeConfirm, sender: self)
+        self.performSegue(withIdentifier: R.segue.personDetailViewController.showAttendeeConfirm, sender: self)
     }
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         configureView()
     }
@@ -194,13 +194,8 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         
         headerView.nameLabel.text = person.name
         headerView.titleLabel.text = person.title ?? ""
-        headerView.titleLabel.hidden = (person.title ?? "").isEmpty
-        headerView.imageView.image = R.image.genericUserAvatar()!
-        
-        if let imageURL = NSURL(string: person.pictureURL) {
-            
-            headerView.imageView.hnk_setImageFromURL(imageURL)
-        }
+        headerView.titleLabel.isHidden = (person.title ?? "").isEmpty
+        headerView.imageView.hnk_setImageFromURL(person.picture.environmentScheme, placeholder: #imageLiteral(resourceName: "generic-user-avatar"))
         
         // configure cells
         
@@ -231,12 +226,12 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         }
         
         if let biography = person.biography,
-            let data = biography.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: false),
+            let data = biography.data(using: String.Encoding.unicode, allowLossyConversion: false),
             let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil) {
             
             let range = NSMakeRange(0, attributedString.length)
             
-            attributedString.addAttribute(NSFontAttributeName, value: UIFont.systemFontOfSize(14), range: range)
+            attributedString.addAttribute(NSFontAttributeName, value: UIFont.systemFont(ofSize: 14), range: range)
             
             self.data.append(.biography(attributedString))
         }
@@ -247,8 +242,6 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
         
         // set user activity for handoff
         
-        let personURL: NSURL?
-        
         if let speaker = person as? Speaker,
             let summitManagedObject = self.currentSummit {
             
@@ -256,8 +249,7 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
             
             let userActivity = NSUserActivity(activityType: AppActivity.view.rawValue)
             userActivity.title = speaker.name
-            personURL = NSURL(string: speaker.toWebpageURL(summit))
-            userActivity.webpageURL = personURL
+            userActivity.webpageURL = speaker.webpage(for: summit)
             
             userActivity.userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.speaker.rawValue, AppActivityUserInfo.identifier.rawValue: speaker.identifier]
             userActivity.requiredUserInfoKeys = [AppActivityUserInfo.type.rawValue, AppActivityUserInfo.identifier.rawValue]
@@ -275,47 +267,47 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
     private func setupToolbar() {
         
         navigationController?.toolbar.barTintColor = UIColor(hexString: "#FAD438")!
-        navigationController?.toolbar.translucent = false
+        navigationController?.toolbar.isTranslucent = false
         
         let action = #selector(nonConfirmedWarningTapped)
         
         let imageBarButtonItem = UIBarButtonItem()
         imageBarButtonItem.target = self
         imageBarButtonItem.action = action
-        imageBarButtonItem.image = R.image.messageWarning()!
+        imageBarButtonItem.image = #imageLiteral(resourceName: "messageWarning")
         imageBarButtonItem.tintColor = UIColor(hexString: "#4A4A4A")
         
         let textBarButtonItem = UIBarButtonItem()
         textBarButtonItem.title = "Don't forget to add your EventBrite Order #"
-        textBarButtonItem.style = .Plain
+        textBarButtonItem.style = .plain
         textBarButtonItem.target = self
         textBarButtonItem.action = action
         textBarButtonItem.tintColor = UIColor(hexString: "#4A4A4A")
-        textBarButtonItem.setTitleTextAttributes([NSFontAttributeName: UIFont(name: "OpenSans", size: 13)!], forState: .Normal)
+        textBarButtonItem.setTitleTextAttributes([NSFontAttributeName: UIFont(name: "OpenSans", size: 13)!], for: UIControlState())
         
         toolbarItems = [imageBarButtonItem, textBarButtonItem]
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Profile")
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return data.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         // WebKit or UIKit is causing the tableview cell to refresh without reloading.
         // http://stackoverflow.com/questions/23926541/how-can-initializing-nsattributedstring-in-tableviewheightforrowatindexpath-be
@@ -332,51 +324,51 @@ final class PersonDetailViewController: UITableViewController, IndicatorInfoProv
             
             if confirmed {
                 
-                return tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.personDetailConfirmedAttendeeCell)!
+                return tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.personDetailConfirmedAttendeeCell)!
                 
             } else {
                 
-                return tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.personDetailNonConfirmedAttendeeCell)!
+                return tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.personDetailNonConfirmedAttendeeCell)!
             }
             
         case let .links(links):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.personDetailLinksCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.personDetailLinksCell)!
             
-            cell.twitterView.hidden = links.twitter.isEmpty
+            cell.twitterView.isHidden = links.twitter.isEmpty
             cell.twitterView.label.text = links.twitter
             
-            cell.ircView.hidden = links.irc.isEmpty
+            cell.ircView.isHidden = links.irc.isEmpty
             cell.ircView.label.text = links.irc
             
-            cell.linkedInView.hidden = links.linkedIn.isEmpty
+            cell.linkedInView.isHidden = links.linkedIn.isEmpty
             cell.linkedInView.label.text = links.linkedIn
             
             return cell
             
         case let .biography(text):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.personDetailDescriptionCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.personDetailDescriptionCell)!
             
             cell.textView.attributedText = text
-            cell.textView.textContainerInset = UIEdgeInsetsZero
+            cell.textView.textContainerInset = UIEdgeInsets.zero
             cell.textView.sizeToFit()
             
             return cell
         }
     }
     
-    override func tableView(tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         return headerView
     }
     
-    override func tableView(tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
         
         return 128
     }
     
-    override func tableView(tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+    override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         
         return UITableViewAutomaticDimension
     }
diff --git a/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift
old mode 100755
new mode 100644
index 93fc01c2..565cc6d6
--- a/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift	
@@ -9,7 +9,7 @@
 import UIKit
 import XLPagerTabStrip
 import CoreSummit
-import SwiftFoundation
+import Foundation
 
 final class PersonalScheduleViewController: ScheduleViewController, IndicatorInfoProvider {
     
@@ -23,20 +23,19 @@ final class PersonalScheduleViewController: ScheduleViewController, IndicatorInf
     
     // MARK: - Methods
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         guard let attendeeRole = Store.shared.authenticatedMember?.attendeeRole
             else { return [] }
         
         let events = attendeeRole.schedule
-            .filter({ Date(foundation: $0.start) >= Date(foundation: startDate)
-                && Date(foundation: $0.end) <= Date(foundation: endDate) })
-            .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
+            .filter({ $0.start >= startDate && $0.end <= endDate })
+            .sorted(by: { $0.0.start < $0.1.start })
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -45,23 +44,23 @@ final class PersonalScheduleViewController: ScheduleViewController, IndicatorInf
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         guard let attendeeRole = Store.shared.authenticatedMember?.attendeeRole,
             case .interval(let interval) = filter
             else { return [] }
         
         let events = attendeeRole.schedule
-            .filter({ Date(foundation: $0.start) >= interval.start
-                && Date(foundation: $0.end) <= interval.end })
-            .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
+            .filter({ $0.start >= interval.start
+                && $0.end <= interval.end })
+            .sorted(by: { $0.0.start < $0.1.start })
         
         return ScheduleItem.from(managedObjects: events)
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Schedule")
     }
diff --git a/OpenStack Summit/OpenStack Summit/Preference.swift b/OpenStack Summit/OpenStack Summit/Preference.swift
index 9fd353dc..63c59973 100644
--- a/OpenStack Summit/OpenStack Summit/Preference.swift	
+++ b/OpenStack Summit/OpenStack Summit/Preference.swift	
@@ -10,28 +10,55 @@ import Foundation
 
 struct Preference {
     
+    // MARK: - Properties
+    
     static var appBuild: Int {
         
-        get { return NSUserDefaults.standardUserDefaults().integerForKey(Key.appBuild.rawValue) }
+        get { return object(for: .appBuild) as? Int ?? 0 }
         
-        set { NSUserDefaults.standardUserDefaults().setInteger(newValue, forKey: Key.appBuild.rawValue) }
+        set { set(object: newValue, for: .appBuild) }
     }
     
     static var goingToSummit: Bool {
         
-        get { return NSUserDefaults.standardUserDefaults().boolForKey(Key.goingToSummit.rawValue)}
+        get { return object(for: .goingToSummit) as? Bool ?? false }
+        
+        set { set(object: newValue, for: .goingToSummit) }
+    }
+    
+    /// Last time user has offered to review the app.
+    static var lastAppReview: Date? {
+        
+        get { return object(for: .lastAppReview) as? Date }
+        
+        set { set(object: newValue, for: .lastAppReview) }
+    }
+    
+    // MARK: - Private Methods
+    
+    @inline(__always)
+    static func object(for key: Key) -> Any? {
+        
+        return UserDefaults.standard.object(forKey: key.rawValue)
+    }
+    
+    @inline(__always)
+    static func set(object: Any?, for key: Key) {
+        
+        UserDefaults.standard.set(object, forKey: key.rawValue)
         
-        set { NSUserDefaults.standardUserDefaults().setBool(newValue, forKey: Key.goingToSummit.rawValue) }
+        UserDefaults.standard.synchronize()
     }
 }
 
 // MARK: - Keys
 
-private extension Preference {
+extension Preference {
     
     enum Key: String {
         
         case appBuild
         case goingToSummit
+        case lastAppReview
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/PresentPopover.swift b/OpenStack Summit/OpenStack Summit/PresentPopover.swift
index e37dfaf2..925d1876 100644
--- a/OpenStack Summit/OpenStack Summit/PresentPopover.swift	
+++ b/OpenStack Summit/OpenStack Summit/PresentPopover.swift	
@@ -11,7 +11,7 @@ import UIKit
 
 extension UIViewController {
     
-    func present(viewController viewController: UIViewController, animated: Bool = true, completion: (() -> Void)? = nil, sender: PopoverPresentingView) {
+    func present(viewController: UIViewController, animated: Bool = true, completion: (() -> Void)? = nil, sender: PopoverPresentingView) {
         
         switch sender {
             
@@ -25,7 +25,7 @@ extension UIViewController {
             viewController.popoverPresentationController?.barButtonItem = tabBarItem
         }
         
-        self.presentViewController(viewController, animated: animated, completion: completion)
+        self.present(viewController, animated: animated, completion: completion)
     }
 }
 
diff --git a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift
index b58dddfa..c7452e4f 100644
--- a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
+++ b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
@@ -8,10 +8,11 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import FirebaseCore
 import FirebaseMessaging
+import Predicate
 
 public final class PushNotificationManager: NSObject, NSFetchedResultsControllerDelegate, FIRMessagingDelegate {
     
@@ -24,38 +25,38 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     // Alerts for messages belonging to this team will be excluded.
     public var teamMessageAlertFilter: Identifier?
     
+    public var unreadCount: Int { return unreadNotifications.value.count + unreadTeamMessages.value.count }
+    
+    public lazy var unreadNotifications: Observable<Set<Identifier>> = self.initUnreadNotifications(.unreadNotifications)
+    
+    public lazy var unreadTeamMessages: Observable<Set<Identifier>> = self.initUnreadNotifications(.unreadTeamMessages)
+    
     private var summitObserver: Int!
     
-    private var teamsFetchedResultsController: NSFetchedResultsController?
+    private var teamsFetchedResultsController: NSFetchedResultsController<TeamManagedObject>?
     
     private var teams: Set<Identifier> {
         
-        return (teamsFetchedResultsController?.fetchedObjects as? [Entity] ?? []).identifiers
+        return (teamsFetchedResultsController?.fetchedObjects ?? []).identifiers
     }
     
-    private var eventsFetchedResultsController: NSFetchedResultsController?
+    private var eventsFetchedResultsController: NSFetchedResultsController<EventManagedObject>?
     
     private var events: Set<Identifier> {
         
-        return (eventsFetchedResultsController?.fetchedObjects as? [Entity] ?? []).identifiers
+        return (eventsFetchedResultsController?.fetchedObjects ?? []).identifiers
     }
     
-    private var notificationsFetchedResultsController: NSFetchedResultsController!
+    private var notificationsFetchedResultsController: NSFetchedResultsController<NotificationManagedObject>!
     
     private var notifications: Set<Identifier> {
         
-        return (notificationsFetchedResultsController?.fetchedObjects as? [Entity] ?? []).identifiers
+        return (notificationsFetchedResultsController?.fetchedObjects ?? []).identifiers
     }
     
-    private(set) var subscribedTopics = Set<Notification.Topic>()
-    
-    private let userDefaults = NSUserDefaults.standardUserDefaults()
-    
-    var unreadCount: Int { return unreadNotifications.value.count + unreadTeamMessages.value.count }
+    private(set) var subscribedTopics = Set<CoreSummit.Notification.Topic>()
     
-    lazy var unreadNotifications: Observable<Set<Identifier>> = self.initUnreadNotifications(.unreadNotifications)
-    
-    lazy var unreadTeamMessages: Observable<Set<Identifier>> = self.initUnreadNotifications(.unreadTeamMessages)
+    private let userDefaults = UserDefaults.standard
     
     // MARK: - Initialization
     
@@ -63,7 +64,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         
         SummitManager.shared.summit.remove(summitObserver)
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        NotificationCenter.default.removeObserver(self)
     }
     
     private init(store: Store = Store.shared) {
@@ -74,13 +75,25 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         
         self.summitObserver = SummitManager.shared.summit.observe(summitChanged)
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(loggedIn), name: Store.Notification.LoggedIn.rawValue, object: self.store)
-        
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(loggedOut), name: Store.Notification.LoggedOut.rawValue, object: self.store)
-        
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(forcedLoggedOut), name: Store.Notification.ForcedLoggedOut.rawValue, object: self.store)
-        
-        self.notificationsFetchedResultsController = NSFetchedResultsController.init(Notification.self,
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(loggedIn),
+            name: Store.Notification.loggedIn,
+            object: self.store)
+        
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(loggedOut),
+            name: Store.Notification.loggedOut,
+            object: self.store)
+        
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(forcedLoggedOut),
+            name: Store.Notification.forcedLoggedOut,
+            object: self.store)
+        
+        self.notificationsFetchedResultsController = NSFetchedResultsController(Notification.self,
                                                                                 delegate: self,
                                                                                 context: Store.shared.managedObjectContext)
         
@@ -89,7 +102,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     
     // MARK: - Methods
     
-    public func setupNotifications(application: UIApplication) {
+    public func setupNotifications(_ application: UIApplication) {
         
         var notificationCategories = Set<UIMutableUserNotificationCategory>()
         
@@ -98,32 +111,32 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             let replyAction = UIMutableUserNotificationAction()
             replyAction.identifier = TeamMessageNotificationAction.reply.rawValue
             replyAction.title = "Reply"
-            replyAction.activationMode = .Background
-            replyAction.authenticationRequired = true
-            replyAction.destructive = false
-            replyAction.behavior = .TextInput
+            replyAction.activationMode = .background
+            replyAction.isAuthenticationRequired = true
+            replyAction.isDestructive = false
+            replyAction.behavior = .textInput
             
             let notificationCategory = UIMutableUserNotificationCategory()
             notificationCategory.identifier = TeamMessageNotificationAction.category.rawValue
-            notificationCategory.setActions([replyAction], forContext: .Default)
-            notificationCategory.setActions([replyAction], forContext: .Minimal)
+            notificationCategory.setActions([replyAction], for: .default)
+            notificationCategory.setActions([replyAction], for: .minimal)
             notificationCategories.insert(notificationCategory)
         }
         
         // Register for remote notifications. This shows a permission dialog on first run, to
         // show the dialog at a more appropriate time move this registration accordingly.
-        let settings = UIUserNotificationSettings(forTypes: [.Alert, .Badge, .Sound], categories: notificationCategories)
+        let settings = UIUserNotificationSettings(types: [.alert, .badge, .sound], categories: notificationCategories)
         
         application.registerUserNotificationSettings(settings)
         
         application.registerForRemoteNotifications()
     }
     
-    public func process(pushNotification: [String: AnyObject], unread: Bool = true) {
+    public func process(pushNotification: [String: Any], unread: Bool = true) {
         
         let notification: PushNotification?
         
-        let backgroundState = UIApplication.sharedApplication().applicationState == .Background
+        let backgroundState = UIApplication.shared.applicationState == .background
         
         let context = store.privateQueueManagedObjectContext
         
@@ -136,14 +149,14 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             let teamMessage = TeamMessage(notification: teamMessageNotification)
             
             // cache
-            context.performBlock {
+            context.perform {
                 
-                try! teamMessage.save(context)
+                let _ = try! teamMessage.save(context)
                 
                 try! context.save()
             }
             
-            let incomingMessage = teamMessage.from.identifier != store.authenticatedMember?.identifier
+            let incomingMessage = teamMessage.from.identifier != store.authenticatedMember?.id
             
             if incomingMessage {
                 
@@ -160,14 +173,14 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                     userNotification.userInfo = [UserNotificationUserInfo.topic.rawValue: Notification.Topic.team(teamMessage.team.identifier).rawValue, UserNotificationUserInfo.identifier.rawValue : teamMessage.identifier]
                     userNotification.alertTitle = alertTitle
                     userNotification.alertBody = alertBody
-                    userNotification.fireDate = NSDate()
+                    userNotification.fireDate = Date()
                     userNotification.category = TeamMessageNotificationAction.category.rawValue
                     
-                    UIApplication.sharedApplication().scheduleLocalNotification(userNotification)
+                    UIApplication.shared.scheduleLocalNotification(userNotification)
                     
                 } else if teamMessageAlertFilter != teamMessageNotification.team {
                     
-                    SweetAlert().showAlert(alertTitle, subTitle: alertBody, style: .None)
+                    SweetAlert().showAlert(alertTitle, subTitle: alertBody, style: .none)
                 }
             }
             
@@ -196,9 +209,9 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             let encodable = Notification(notification: generalNotification)
             
             // cache
-            context.performBlock {
+            context.perform {
                 
-                try! encodable.save(context)
+                let _ = try! encodable.save(context)
                 
                 try! context.save()
             }
@@ -214,7 +227,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                     
                     let alertTitle = generalNotification.event?.title ?? "Notification"
                     
-                    SweetAlert().showAlert(alertTitle, subTitle: generalNotification.body, style: .None)
+                    SweetAlert().showAlert(alertTitle, subTitle: generalNotification.body, style: .none)
                 }
             }
             
@@ -250,7 +263,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                 guard let topicString = notification.userInfo?[UserNotificationUserInfo.topic.rawValue] as? String,
                     let topic = Notification.Topic(rawValue: topicString),
                     case let .team(team) = topic,
-                    let messageIdentifier = notification.userInfo?[UserNotificationUserInfo.identifier.rawValue] as? Int
+                    let messageIdentifier = notification.userInfo?[UserNotificationUserInfo.identifier.rawValue] as? Identifier
                     else { completion(); return }
                 
                 // mark message as read
@@ -262,11 +275,11 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                         
                         switch response {
                             
-                        case let .Error(error):
+                        case let .error(error):
                             
                             self?.log?("Could not send message from local notification: \(error)")
                             
-                        case let .Value(newMessage):
+                        case let .value(newMessage):
                             
                             self?.log?("Sent message from local notification: \(newMessage)")
                         }
@@ -306,9 +319,9 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     }
     
     @inline(__always)
-    private func subscribe(to topic: Notification.Topic) {
+    private func subscribe(to topic: CoreSummit.Notification.Topic) {
         
-        FIRMessaging.messaging().subscribeToTopic(topic.rawValue)
+        FIRMessaging.messaging().subscribe(toTopic: topic.rawValue)
         
         subscribedTopics.insert(topic)
         
@@ -316,9 +329,9 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     }
     
     @inline(__always)
-    private func unsubscribe(from topic: Notification.Topic) {
+    private func unsubscribe(from topic: CoreSummit.Notification.Topic) {
         
-        FIRMessaging.messaging().unsubscribeFromTopic(topic.rawValue)
+        FIRMessaging.messaging().unsubscribe(fromTopic: topic.rawValue)
         
         subscribedTopics.remove(topic)
         
@@ -343,11 +356,17 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             return
         }
         
-        let predicate = NSPredicate(format: "owner == %@ || members.member CONTAINS %@", member, member)
+        //let predicate = NSPredicate(format: "owner == %@ || members.member CONTAINS %@", member, member)
+        let predicate: Predicate = #keyPath(TeamManagedObject.owner.id) == member.id
+            || (#keyPath(TeamManagedObject.members.member.id)).compare(.contains, .value(.int64(member.id)))
         
-        let sort = [NSSortDescriptor(key: "id", ascending: true)]
+        let sort = [NSSortDescriptor(key: #keyPath(TeamManagedObject.id), ascending: true)]
         
-        teamsFetchedResultsController = NSFetchedResultsController(Team.self, delegate: self, predicate: predicate, sortDescriptors: sort, sectionNameKeyPath: nil, context: store.managedObjectContext)
+        teamsFetchedResultsController = NSFetchedResultsController(Team.self,
+                                                                   delegate: self,
+                                                                   predicate: predicate,
+                                                                   sortDescriptors: sort,
+                                                                   context: store.managedObjectContext)
         
         try! teamsFetchedResultsController!.performFetch()
         
@@ -358,7 +377,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         
         let member = self.store.authenticatedMember
         
-        if let memberID = member?.identifier {
+        if let memberID = member?.id {
             
             subscribe(to: .member(memberID))
         }
@@ -372,11 +391,13 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             
             subscribe(to: .attendees)
             
-            let predicate = NSPredicate(format: "attendees CONTAINS %@", attendeeRole)
-            
-            let sort = [NSSortDescriptor(key: "id", ascending: true)]
+            //let predicate = NSPredicate(format: "attendees CONTAINS %@", attendeeRole)
+            let predicate: Predicate = (#keyPath(EventManagedObject.attendees.id)).compare(.contains, .value(.int64(attendeeRole.id)))
             
-            eventsFetchedResultsController = NSFetchedResultsController(Event.self, delegate: self, predicate: predicate, sortDescriptors: sort, sectionNameKeyPath: nil, context: store.managedObjectContext)
+            eventsFetchedResultsController = NSFetchedResultsController(Event.self,
+                                                                        delegate: self,
+                                                                        predicate: predicate,
+                                                                        context: store.managedObjectContext)
             
             try! eventsFetchedResultsController!.performFetch()
             
@@ -388,27 +409,27 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         }
     }
     
-    private func summitChanged(newValue: Identifier, oldValue: Identifier) {
+    private func summitChanged(_ newValue: Identifier, oldValue: Identifier) {
         
         unsubscribe(from: .summit(oldValue))
         subscribe(to: .summit(newValue))
     }
     
     @inline(__always)
-    private func initUnreadNotifications(preferenceKey: PreferenceKey) -> Observable<Set<Identifier>> {
+    private func initUnreadNotifications(_ preferenceKey: PreferenceKey) -> Observable<Set<Identifier>> {
         
-        let storedValue = userDefaults.objectForKey(preferenceKey.rawValue) as? [Int] ?? []
+        let storedValue = userDefaults.object(forKey: preferenceKey.rawValue) as? [Identifier] ?? []
         
         let observable = Observable<Set<Identifier>>(Set(storedValue))
         
-        observable.observe { [weak self] in self?.unreadNotificationsChanged(new: $0.0, old: $0.1, key: preferenceKey) }
+        let _ = observable.observe { [weak self] in self?.unreadNotificationsChanged(new: $0.0, old: $0.1, key: preferenceKey) }
         
         return observable
     }
     
     private func unreadNotificationsChanged(new newValue: Set<Identifier>, old oldValue: Set<Identifier>, key preferenceKey: PreferenceKey) {
         
-        userDefaults.setObject(Array(newValue), forKey: preferenceKey.rawValue)
+        userDefaults.set(Array(newValue), forKey: preferenceKey.rawValue)
         userDefaults.synchronize()
         
         updateAppBadge()
@@ -417,7 +438,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     @inline(__always)
     public func updateAppBadge() {
         
-        UIApplication.sharedApplication().applicationIconBadgeNumber = unreadCount
+        UIApplication.shared.applicationIconBadgeNumber = unreadCount
     }
     
     @inline(__always)
@@ -434,28 +455,29 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         let unreadTeamMessages = Array(self.unreadTeamMessages.value)
         
         //NSPredicate(format: "team.id == %@ AND id IN %@", NSNumber(longLong: Int64(team)), unreadTeamMessages)
-        let predicate: CoreSummit.Predicate = "team.id" == Int64(team) &&& "id".`in`(unreadTeamMessages)
+        let predicate: Predicate = #keyPath(TeamMessageManagedObject.team.id) == team
+            && (#keyPath(TeamMessageManagedObject.id)).in(unreadTeamMessages)
         
         return try context.count(TeamMessageManagedObject.self, predicate: predicate)
     }
     
     // MARK: - FIRMessagingDelegate
     
-    public func applicationReceivedRemoteMessage(remoteMessage: FIRMessagingRemoteMessage) {
+    public func applicationReceivedRemoteMessage(_ remoteMessage: FIRMessagingRemoteMessage) {
         
-        process(remoteMessage.appData as! [String: AnyObject])
+        process(pushNotification: remoteMessage.appData as! [String: Any])
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    public func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    public func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
-        let identifier = (anObject as! Entity).identifier
+        let identifier = (anObject as! Entity).id
         
         if controller == teamsFetchedResultsController
             || controller == eventsFetchedResultsController {
             
-            let topic: Notification.Topic
+            let topic: CoreSummit.Notification.Topic
             
             if controller === teamsFetchedResultsController {
                 
@@ -472,18 +494,18 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             
             switch type {
                 
-            case .Insert: subscribe(to: topic)
+            case .insert: subscribe(to: topic)
                 
-            case .Delete: unsubscribe(from: topic)
+            case .delete: unsubscribe(from: topic)
                 
-            case .Move, .Update: break
+            case .move, .update: break
             }
             
         } else if controller == notificationsFetchedResultsController {
             
             switch type {
                 
-            case .Delete:
+            case .delete:
                 
                 // remove unread notification from set since it was deleted
                 if unreadNotifications.value.contains(identifier) {
@@ -491,7 +513,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                     unreadNotifications.value.remove(identifier)
                 }
                 
-            case .Insert, .Move, .Update: break
+            case .insert, .move, .update: break
             }
             
         } else {
@@ -502,19 +524,19 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     
     // MARK: - Notifications
     
-    @objc private func loggedIn(notification: NSNotification) {
+    @objc private func loggedIn(_ notification: Foundation.Notification) {
         
         resetUnreadNotifications()
         reloadSubscriptions()
     }
     
-    @objc private func loggedOut(notification: NSNotification) {
+    @objc private func loggedOut(_ notification: Foundation.Notification) {
         
         resetUnreadNotifications()
         reloadSubscriptions()
     }
     
-    @objc private func forcedLoggedOut(notification: NSNotification) {
+    @objc private func forcedLoggedOut(_ notification: Foundation.Notification) {
         
         resetUnreadNotifications()
         reloadSubscriptions()
@@ -567,7 +589,7 @@ public protocol PushNotification {
     
     var created: Date { get }
     
-    init?(pushNotification: [String: AnyObject])
+    init?(pushNotification: [String: Any])
 }
 
 public struct TeamMessageNotification: PushNotification {
@@ -589,7 +611,7 @@ public struct TeamMessageNotification: PushNotification {
     
     public let from: (idenfitier: Identifier, firstName: String, lastName: String)
     
-    public init?(pushNotification: [String: AnyObject]) {
+    public init?(pushNotification: [String: Any]) {
         
         guard let topicString = pushNotification[Key.from.rawValue] as? String,
             let topic = Notification.Topic(rawValue: topicString),
@@ -605,15 +627,15 @@ public struct TeamMessageNotification: PushNotification {
             let fromIDString = pushNotification[Key.from_id.rawValue] as? String,
             let fromID = Int(fromIDString),
             let fromFirstName = pushNotification[Key.from_first_name.rawValue] as? String,
-            let fromLastName = pushNotification[Key.from_last_name.rawValue] as? String
-            where type == self.dynamicType.type
+            let fromLastName = pushNotification[Key.from_last_name.rawValue] as? String,
+            type == type(of: self).type
             else { return nil }
         
-        self.identifier = identifier
+        self.identifier = Identifier(identifier)
         self.team = team
         self.body = body
         self.created = Date(timeIntervalSince1970: TimeInterval(created))
-        self.from = (fromID, fromFirstName, fromLastName)
+        self.from = (Identifier(fromID), fromFirstName, fromLastName)
     }
 }
 
@@ -644,15 +666,15 @@ public struct GeneralNotification: PushNotification {
     
     public let created: Date
     
-    public let from: Notification.Topic
+    public let from: CoreSummit.Notification.Topic
     
     public let summit: Identifier
     
-    public let channel: Notification.Channel
+    public let channel: CoreSummit.Notification.Channel
     
     public let event: (identifier: Identifier, title: String)?
     
-    public init?(pushNotification: [String: AnyObject]) {
+    public init?(pushNotification: [String: Any]) {
         
         guard let topicString = pushNotification[Key.from.rawValue] as? String ?? pushNotification[Key.to.rawValue] as? String,
             let topic = Notification.Topic(rawValue: topicString),
@@ -666,15 +688,15 @@ public struct GeneralNotification: PushNotification {
             let summitIDString = pushNotification[Key.summit_id.rawValue] as? String,
             let summitID = Int(summitIDString),
             let channelString = pushNotification[Key.channel.rawValue] as? String,
-            let channel = Notification.Channel(rawValue: channelString)
-            where type == self.dynamicType.type
+            let channel = Notification.Channel(rawValue: channelString),
+            type == type(of: self).type
             else { return nil }
         
-        self.identifier = identifier
+        self.identifier = Identifier(identifier)
         self.from = topic
         self.body = body
         self.created = Date(timeIntervalSince1970: TimeInterval(created))
-        self.summit = summitID
+        self.summit = Identifier(summitID)
         self.channel = channel
         
         switch channel {
@@ -682,7 +704,7 @@ public struct GeneralNotification: PushNotification {
         case .event:
             
             guard let eventIDString = pushNotification[Key.event_id.rawValue] as? String,
-                let eventID = Int(eventIDString),
+                let eventID = Identifier(eventIDString),
                 let eventTitle = pushNotification[Key.title.rawValue] as? String
                 else { return nil }
             
@@ -695,7 +717,7 @@ public struct GeneralNotification: PushNotification {
     }
 }
 
-extension Notification {
+extension CoreSummit.Notification {
     
     init(notification: GeneralNotification) {
         
diff --git a/OpenStack Summit/OpenStack Summit/RevealTabStripViewController.swift b/OpenStack Summit/OpenStack Summit/RevealTabStripViewController.swift
index b3914053..d62dc26f 100755
--- a/OpenStack Summit/OpenStack Summit/RevealTabStripViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/RevealTabStripViewController.swift	
@@ -17,7 +17,7 @@ class RevealTabStripViewController: ButtonBarPagerTabStripViewController {
     
     override func viewDidLoad() {
         
-        settings.style.buttonBarItemFont = UIFont.systemFontOfSize(17)
+        settings.style.buttonBarItemFont = UIFont.systemFont(ofSize: 17)
         settings.style.buttonBarItemBackgroundColor = UIColor(hexString: "#14273D")
         settings.style.buttonBarItemsShouldFillAvailiableWidth = false
         settings.style.buttonBarBackgroundColor = UIColor(hexString: "#14273D")
@@ -29,7 +29,7 @@ class RevealTabStripViewController: ButtonBarPagerTabStripViewController {
             guard changeCurrentIndex == true else { return }
             
             oldCell?.label.textColor = UIColor(white: 1, alpha: 0.6)
-            newCell?.label.textColor = .whiteColor()
+            newCell?.label.textColor = .white
         }
         
         super.viewDidLoad()
@@ -39,7 +39,7 @@ class RevealTabStripViewController: ButtonBarPagerTabStripViewController {
             let menuButton = UIBarButtonItem()
             menuButton.target = revealViewController()
             menuButton.action = #selector(SWRevealViewController.revealToggle(_:))
-            menuButton.image = R.image.menu()!
+            menuButton.image = #imageLiteral(resourceName: "menu")
             
             navigationItem.leftBarButtonItem = menuButton
             self.menuButton = menuButton
@@ -47,7 +47,7 @@ class RevealTabStripViewController: ButtonBarPagerTabStripViewController {
         
         setBlankBackBarButtonItem()
         
-        edgesForExtendedLayout = UIRectEdge.Top
+        edgesForExtendedLayout = UIRectEdge.top
         
         view.backgroundColor = UIColor(hexString: "#E5E5E5")
         
@@ -69,9 +69,9 @@ class RevealTabStripViewController: ButtonBarPagerTabStripViewController {
         self.toolbarItems = topChild.toolbarItems
     }
     
-    override func pagerTabStripViewController(pagerTabStripViewController: PagerTabStripViewController, updateIndicatorFromIndex fromIndex: Int, toIndex: Int, withProgressPercentage progressPercentage: CGFloat, indexWasChanged: Bool) {
+    override func updateIndicator(for viewController: PagerTabStripViewController, fromIndex: Int, toIndex: Int, withProgressPercentage progressPercentage: CGFloat, indexWasChanged: Bool) {
         
-        super.pagerTabStripViewController(pagerTabStripViewController, updateIndicatorFromIndex: fromIndex, toIndex: toIndex, withProgressPercentage: progressPercentage, indexWasChanged: indexWasChanged)
+        super.updateIndicator(for: viewController, fromIndex: fromIndex, toIndex: toIndex, withProgressPercentage: progressPercentage, indexWasChanged: indexWasChanged)
         
         reloadBarButtonItems()
     }
diff --git a/OpenStack Summit/OpenStack Summit/RevealViewController.swift b/OpenStack Summit/OpenStack Summit/RevealViewController.swift
index cfcae081..c1a9496e 100755
--- a/OpenStack Summit/OpenStack Summit/RevealViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/RevealViewController.swift	
@@ -33,8 +33,8 @@ extension RevealViewController {
         let menuButton = UIBarButtonItem()
         menuButton.target = viewController.revealViewController()
         menuButton.action = #selector(SWRevealViewController.revealToggle(_:))
-        menuButton.image = R.image.menu()!
+        menuButton.image = #imageLiteral(resourceName: "menu")
         
         viewController.navigationItem.leftBarButtonItem = menuButton
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStack Summit/ScheduleItem.swift b/OpenStack Summit/OpenStack Summit/ScheduleItem.swift
index 87cae3b4..2964af08 100644
--- a/OpenStack Summit/OpenStack Summit/ScheduleItem.swift	
+++ b/OpenStack Summit/OpenStack Summit/ScheduleItem.swift	
@@ -9,7 +9,7 @@
 import Foundation
 import CoreSummit
 import CoreData
-import struct SwiftFoundation.Date
+import struct Foundation.Date
 
 public struct ScheduleItem: CoreDataDecodable {
     
@@ -32,11 +32,11 @@ public struct ScheduleItem: CoreDataDecodable {
     
     public init(managedObject event: EventManagedObject) {
         
-        self.identifier = event.identifier
+        self.identifier = event.id
         self.name = event.name
-        self.summit = event.summit.identifier
-        self.start = Date(foundation: event.start)
-        self.end = Date(foundation: event.end)
+        self.summit = event.summit.id
+        self.start = event.start
+        self.end = event.end
         self.eventType = event.eventType.name
         self.location = ScheduleItem.getLocation(event)
         self.dateTime = ScheduleItem.getDateTime(event)
@@ -51,11 +51,11 @@ public struct ScheduleItem: CoreDataDecodable {
 
 public extension ScheduleItem {
     
-    static func search(searchTerm: String, context: NSManagedObjectContext) throws -> [ScheduleItem] {
+    static func search(_ searchTerm: String, context: NSManagedObjectContext) throws -> [ScheduleItem] {
         
-        let predicate = NSPredicate(format: "name CONTAINS [c] %@ OR ANY presentation.speakers.firstName CONTAINS [c] %@ OR ANY presentation.speakers.lastName CONTAINS [c] %@ OR presentation.level CONTAINS [c] %@ OR ANY tags.name CONTAINS [c] %@ OR eventType.name CONTAINS [c] %@", searchTerm, searchTerm, searchTerm, searchTerm, searchTerm, searchTerm)
+        let managedObjects = try EventManagedObject.search(searchTerm, context: context)
         
-        return try context.managedObjects(self, predicate: predicate, sortDescriptors: ManagedObject.sortDescriptors)
+        return ScheduleItem.from(managedObjects: managedObjects)
     }
 }
 
@@ -63,7 +63,7 @@ public extension ScheduleItem {
 
 internal extension ScheduleItem {
     
-    static func getSponsors(event: EventManagedObject) -> String {
+    static func getSponsors(_ event: EventManagedObject) -> String {
         
         guard event.sponsors.isEmpty == false
             else { return "" }
@@ -78,50 +78,50 @@ internal extension ScheduleItem {
         return sponsors
     }
     
-    static func getTime(event: EventManagedObject) -> String {
+    static func getTime(_ event: EventManagedObject) -> String {
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: event.summit.timeZone);
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: event.summit.timeZone)
         dateFormatter.dateFormat = "hh:mm a"
-        dateFormatter.AMSymbol = "am"
-        dateFormatter.PMSymbol = "pm"
-        let stringDateFrom = dateFormatter.stringFromDate(event.start)
+        dateFormatter.amSymbol = "am"
+        dateFormatter.pmSymbol = "pm"
+        let stringDateFrom = dateFormatter.string(from: event.start)
         
         dateFormatter.dateFormat = "hh:mm a"
-        let stringDateTo = dateFormatter.stringFromDate(event.end)
+        let stringDateTo = dateFormatter.string(from: event.end)
         
         return "\(stringDateFrom) - \(stringDateTo)"
     }
     
-    static func getDay(event: EventManagedObject) -> String {
+    static func getDay(_ event: EventManagedObject) -> String {
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: event.summit.timeZone);
-        dateFormatter.dateStyle = .MediumStyle
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: event.summit.timeZone)
+        dateFormatter.dateStyle = .medium
         
-        return dateFormatter.stringFromDate(event.start)
+        return dateFormatter.string(from: event.start)
     }
     
-    static func getDateTime(event: EventManagedObject) -> String {
+    static func getDateTime(_ event: EventManagedObject) -> String {
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: event.summit.timeZone);
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: event.summit.timeZone);
         dateFormatter.dateFormat = "EEEE dd MMMM hh:mm a"
-        dateFormatter.AMSymbol = "am"
-        dateFormatter.PMSymbol = "pm"
-        let stringDateFrom = dateFormatter.stringFromDate(event.start)
+        dateFormatter.amSymbol = "am"
+        dateFormatter.pmSymbol = "pm"
+        let stringDateFrom = dateFormatter.string(from: event.start)
         
         dateFormatter.dateFormat = "hh:mm a"
-        let stringDateTo = dateFormatter.stringFromDate(event.end)
+        let stringDateTo = dateFormatter.string(from: event.end)
         
         return "\(stringDateFrom) / \(stringDateTo)"
     }
     
-    static func getLocation(event: EventManagedObject) -> String {
+    static func getLocation(_ event: EventManagedObject) -> String {
         
         // only show after date
-        guard let startShowingVenues = event.summit.startShowingVenues
-            where NSDate().mt_isAfter(startShowingVenues)
+        guard let startShowingVenues = event.summit.startShowingVenues,
+            NSDate().mt_is(after: startShowingVenues)
             else { return "" }
         
         var location = ""
@@ -130,8 +130,7 @@ internal extension ScheduleItem {
             
             location = room.venue.name
             
-            if let floorName = room.floor?.name
-                where floorName.isEmpty == false {
+            if let floorName = room.floor?.name, floorName.isEmpty == false {
                 
                 location += " - " + floorName
             }
@@ -150,19 +149,19 @@ internal extension ScheduleItem {
     }
     
     @inline(__always)
-    static func getTrack(event: EventManagedObject) -> String {
+    static func getTrack(_ event: EventManagedObject) -> String {
         
         return event.track?.name ?? ""
     }
     
     @inline(__always)
-    static func getTrackGroupColor(event: EventManagedObject) -> String {
+    static func getTrackGroupColor(_ event: EventManagedObject) -> String {
         
-        guard let track = event.track
-            where track.groups.isEmpty == false
+        guard let track = event.track,
+            track.groups.isEmpty == false
             else { return "" }
         
-        let trackGroups = track.groups.sort { $0.0.id < $0.1.id }
+        let trackGroups = track.groups.sorted { $0.0.id < $0.1.id }
         
         return trackGroups[0].color
     }
diff --git a/OpenStack Summit/OpenStack Summit/ScheduleTableViewCell.swift b/OpenStack Summit/OpenStack Summit/ScheduleTableViewCell.swift
index 1c7ce7e5..454816b2 100644
--- a/OpenStack Summit/OpenStack Summit/ScheduleTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/ScheduleTableViewCell.swift	
@@ -18,13 +18,13 @@ final class ScheduleTableViewCell: UITableViewCell {
     @IBOutlet private(set) weak var statusImageView: UIImageView!
     @IBOutlet private(set) weak var contextMenuButton: UIButton!
     
-    override func setSelected(selected: Bool, animated: Bool) {
+    override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
         
         
     }
     
-    override func setHighlighted(highlighted: Bool, animated: Bool) {
+    override func setHighlighted(_ highlighted: Bool, animated: Bool) {
         super.setHighlighted(highlighted, animated: animated)
         
         
diff --git a/OpenStack Summit/OpenStack Summit/ScheduleView.swift b/OpenStack Summit/OpenStack Summit/ScheduleView.swift
index e63d783a..8abada8f 100644
--- a/OpenStack Summit/OpenStack Summit/ScheduleView.swift	
+++ b/OpenStack Summit/OpenStack Summit/ScheduleView.swift	
@@ -12,10 +12,10 @@ import AFHorizontalDayPicker
 final class ScheduleView: UIView {
     
     @IBOutlet var view: UIView!
-    @IBOutlet weak var dayPicker: AFHorizontalDayPicker!
-    @IBOutlet weak var tableView: UITableView!
-    @IBOutlet weak var noEventsLabel: UILabel!
-    @IBOutlet weak var nowButton: UIButton!
+    @IBOutlet private(set) weak var dayPicker: AFHorizontalDayPicker!
+    @IBOutlet private(set) weak var tableView: UITableView!
+    @IBOutlet private(set) weak var noEventsLabel: UILabel!
+    @IBOutlet private(set) weak var nowButton: UIButton!
     @IBOutlet private weak var nowWidthConstraint: NSLayoutConstraint!
     
     var nowButtonEnabled: Bool = true {
@@ -23,18 +23,18 @@ final class ScheduleView: UIView {
         didSet {
             
             self.nowWidthConstraint.constant = nowButtonEnabled ? 60 : 0
-            self.nowButton.hidden = nowButtonEnabled == false
+            self.nowButton.isHidden = nowButtonEnabled == false
             
             self.needsUpdateConstraints()
         }
     }
     
-    var activeDates: [NSDate] = []
+    var activeDates: [Date] = []
     
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         
-        NSBundle.mainBundle().loadNibNamed("ScheduleView", owner: self, options: nil)
+        Bundle.main.loadNibNamed("ScheduleView", owner: self, options: nil)
         
         dayPicker.backgroundColor = UIColor(hexString: "#E5E5E5")
         
@@ -42,17 +42,17 @@ final class ScheduleView: UIView {
         dayPicker.dayNumberInactiveColor = UIColor(hexString: "#9B9B9B")
         dayPicker.dayNumberSelectedColor = UIColor(hexString: "#FFFFFF")
         
-        dayPicker.dayNumberActiveFont = UIFont.systemFontOfSize(13)
-        dayPicker.dayNumberInactiveFont = UIFont.systemFontOfSize(13)
-        dayPicker.dayNumberSelectedFont = UIFont.systemFontOfSize(13)
+        dayPicker.dayNumberActiveFont = UIFont.systemFont(ofSize: 13)
+        dayPicker.dayNumberInactiveFont = UIFont.systemFont(ofSize: 13)
+        dayPicker.dayNumberSelectedFont = UIFont.systemFont(ofSize: 13)
         
         dayPicker.dayNameActiveColor = UIColor(hexString: "#4A4A4A")
         dayPicker.dayNameInactiveColor = UIColor(hexString: "#9B9B9B")
         dayPicker.dayNameSelectedColor = UIColor(hexString: "#FFFFFF")
         
-        dayPicker.dayNameActiveFont = UIFont.systemFontOfSize(13)
-        dayPicker.dayNameInactiveFont = UIFont.systemFontOfSize(13)
-        dayPicker.dayNameSelectedFont = UIFont.systemFontOfSize(13)
+        dayPicker.dayNameActiveFont = UIFont.systemFont(ofSize: 13)
+        dayPicker.dayNameInactiveFont = UIFont.systemFont(ofSize: 13)
+        dayPicker.dayNameSelectedFont = UIFont.systemFont(ofSize: 13)
         
         dayPicker.backgroundActiveColor = UIColor(hexString: "#E5E5E5")
         dayPicker.backgroundInactiveColor = UIColor(hexString: "#E5E5E5")
@@ -61,52 +61,52 @@ final class ScheduleView: UIView {
         addSubview(self.view)
     }
     
-    func setInactiveAppearanceWithCell(cell: AFDayCell) {
+    func setInactiveAppearanceWithCell(_ cell: AFDayCell) {
         cell.dayNumber.font = dayPicker.dayNumberInactiveFont
         cell.dayNumber.textColor = dayPicker.dayNumberInactiveColor
         cell.dayName.font = dayPicker.dayNameInactiveFont
         cell.dayName.textColor = dayPicker.dayNameInactiveColor
         cell.contentView.backgroundColor = dayPicker.backgroundInactiveColor
-        cell.userInteractionEnabled = false
+        cell.isUserInteractionEnabled = false
     }
     
-    func setSelectedAppearanceWithCell(cell: AFDayCell) {
+    func setSelectedAppearanceWithCell(_ cell: AFDayCell) {
         cell.dayNumber.font = dayPicker.dayNumberSelectedFont
         cell.dayNumber.textColor = dayPicker.dayNumberSelectedColor
         cell.dayName.font = dayPicker.dayNameSelectedFont
         cell.dayName.textColor = dayPicker.dayNameSelectedColor
         cell.contentView.backgroundColor = dayPicker.backgroundSelectedColor
-        cell.userInteractionEnabled = true
+        cell.isUserInteractionEnabled = true
     }
     
-    func setActiveAppearanceWithCell(cell: AFDayCell) {
+    func setActiveAppearanceWithCell(_ cell: AFDayCell) {
         cell.dayNumber.font = dayPicker.dayNumberActiveFont
         cell.dayNumber.textColor = dayPicker.dayNumberActiveColor
         cell.dayName.font = dayPicker.dayNameActiveFont
         cell.dayName.textColor = dayPicker.dayNameActiveColor
         cell.contentView.backgroundColor =  dayPicker.backgroundActiveColor
-        cell.userInteractionEnabled = true
+        cell.isUserInteractionEnabled = true
     }
     
-    func horizontalDayPicker(picker: AFHorizontalDayPicker, widthForItemWithDate date: NSDate) -> CGFloat {
+    func horizontalDayPicker(_ picker: AFHorizontalDayPicker, widthForItemWithDate date: Date) -> CGFloat {
         let width: CGFloat = 56
         return width
     }
     
-    func horizontalDayPicker(picker: AFHorizontalDayPicker!, requestCustomizedCellFromCell cell: AFDayCell!) -> AFDayCell! {
+    func horizontalDayPicker(_ picker: AFHorizontalDayPicker!, requestCustomizedCellFromCell cell: AFDayCell!) -> AFDayCell! {
         cell.contentView.subviews.forEach { $0.removeFromSuperview() }
         
         // configure day number (example: 23 or 1 or 45)
-        let dayNumber = UILabel(frame: CGRectMake(0.0, cell.contentView.frame.size.height / 3 * 2 - cell.contentView.frame.size.height / 6, cell.contentView.frame.size.width, cell.contentView.frame.size.height / 3))
-        dayNumber.textAlignment = .Center
-        dayNumber.text = "\(cell.date.mt_dayOfMonth())"
+        let dayNumber = UILabel(frame: CGRect(x: 0.0, y: cell.contentView.frame.size.height / 3 * 2 - cell.contentView.frame.size.height / 6, width: cell.contentView.frame.size.width, height: cell.contentView.frame.size.height / 3))
+        dayNumber.textAlignment = .center
+        dayNumber.text = "\((cell.date as NSDate).mt_dayOfMonth())"
         cell.dayNumber = dayNumber
         cell.contentView.addSubview(dayNumber)
         
         // configure day name  (example: Thu, Чт)
-        let dayName = UILabel(frame: CGRectMake(0.0, 0.0, cell.contentView.frame.size.width, cell.contentView.frame.size.height / 3 * 2))
-        dayName.textAlignment = .Center
-        dayName.text = cell.date.mt_stringFromDateWithFormat("EEE", localized: true).uppercaseString
+        let dayName = UILabel(frame: CGRect(x: 0.0, y: 0.0, width: cell.contentView.frame.size.width, height: cell.contentView.frame.size.height / 3 * 2))
+        dayName.textAlignment = .center
+        dayName.text = (cell.date as NSDate).mt_stringFromDate(withFormat: "EEE", localized: true).uppercased()
         cell.dayName = dayName
         cell.contentView.addSubview(dayName)
         
diff --git a/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift
index 0e380c42..b871191d 100644
--- a/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2015 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import UIKit
 import AFHorizontalDayPicker
 import CoreSummit
@@ -20,7 +20,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: - IBOutlet
     
-    @IBOutlet weak var scheduleView: ScheduleView!
+    @IBOutlet private(set) weak var scheduleView: ScheduleView!
     
     // MARK: - Properties
     
@@ -28,7 +28,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     final lazy var eventStore: EKEventStore = EKEventStore()
     
-    final lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    final lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     final private(set) var summitTimeZoneOffset: Int = 0
     
@@ -42,7 +42,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: - Accessors
     
-    var startDate: NSDate! {
+    var startDate: Date! {
         get {
             return scheduleView.dayPicker.startDate
         }
@@ -52,7 +52,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         }
     }
     
-    var endDate: NSDate! {
+    var endDate: Date! {
         get {
             return scheduleView.dayPicker.endDate
         }
@@ -62,16 +62,16 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         }
     }
     
-    var selectedDate: NSDate! {
+    var selectedDate: Date! {
         get {
             return scheduleView.dayPicker.selectedDate
         }
         set {
-            scheduleView.dayPicker.selectDate(newValue, animated: false)
+            scheduleView.dayPicker.select(newValue, animated: false)
         }
     }
     
-    var availableDates: [NSDate]! {
+    var availableDates: [Date]! {
         get {
             return scheduleView.activeDates
         }
@@ -96,9 +96,9 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         setBlankBackBarButtonItem()
         
         scheduleView.dayPicker.delegate = self
-        scheduleView.nowButton.addTarget(self, action: #selector(nowTapped), forControlEvents: .TouchUpInside)
+        scheduleView.nowButton.addTarget(self, action: #selector(nowTapped), for: .touchUpInside)
         
-        scheduleView.tableView.registerNib(R.nib.scheduleTableViewCell)
+        scheduleView.tableView.register(R.nib.scheduleTableViewCell)
         scheduleView.tableView.delegate = self
         scheduleView.tableView.dataSource = self
         scheduleView.tableView.estimatedRowHeight = 188
@@ -116,14 +116,14 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: - Actions
     
-    @IBAction func nowTapped(sender: AnyObject? = nil) {
+    @IBAction func nowTapped(_ sender: AnyObject? = nil) {
         
-        let now = NSDate()
+        let now = Date()
         
-        guard let today = self.availableDates.firstMatching({ $0.mt_isWithinSameDay(now) })
+        guard let today = self.availableDates.first(where: { ($0 as NSDate).mt_is(withinSameDay: now) })
             else { return }
         
-        (self.scheduleView.dayPicker.valueForKey("daysCollectionView") as! UICollectionView).reloadData()
+        (self.scheduleView.dayPicker.value(forKey: "daysCollectionView") as! UICollectionView).reloadData()
         
         self.nowSelected = true
         
@@ -145,11 +145,11 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         }
     }
     
-    @IBAction func showEventContextMenu(sender: UIButton) {
+    @IBAction func showEventContextMenu(_ sender: UIButton) {
         
-        let tableView = scheduleView.tableView
-        let buttonOrigin = sender.convertPoint(.zero, toView: tableView)
-        let indexPath = tableView.indexPathForRowAtPoint(buttonOrigin)!
+        let tableView = scheduleView.tableView!
+        let buttonOrigin = sender.convert(CGPoint.zero, to: tableView)
+        let indexPath = tableView.indexPathForRow(at: buttonOrigin)!
         //let cell = tableView.cellForRowAtIndexPath(indexPath) as! ScheduleTableViewCell
         let scheduleItem = dayEvents[indexPath.row]
         
@@ -165,16 +165,16 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: - Methods
     
-    func toggleEventList(show: Bool) {} // override
+    func toggleEventList(_ show: Bool) {} // override
     
-    func toggleNoConnectivityMessage(show: Bool) {} // override
+    func toggleNoConnectivityMessage(_ show: Bool) {} // override
     
-    func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         fatalError("You must override this method")
     }
     
-    func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         fatalError("You must override this method")
     }
@@ -199,14 +199,14 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error as NSError)
                     
                     controller.toggleNoConnectivityMessage(true)
                     controller.toggleEventList(false)
                     
-                case let .Value(value):
+                case let .value(value):
                     
                     controller.updateUI(value)
                 }
@@ -216,26 +216,26 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: Private Methods
     
-    private func updateUI(summit: Summit) {
+    private func updateUI(_ summit: Summit) {
         
         let scheduleFilter = FilterManager.shared.filter.value
                 
-        let timeZone = NSTimeZone(name: summit.timeZone)!
+        let timeZone = TimeZone(identifier: summit.timeZone)!
         
         NSDate.mt_setTimeZone(timeZone)
         
-        self.summitTimeZoneOffset = timeZone.secondsFromGMT
+        self.summitTimeZoneOffset = timeZone.secondsFromGMT()
         
-        self.startDate = summit.start.toFoundation().mt_dateSecondsAfter(self.summitTimeZoneOffset).mt_startOfCurrentDay()
-        self.endDate = summit.end.toFoundation().mt_dateSecondsAfter(self.summitTimeZoneOffset).mt_dateDaysAfter(1)
+        self.startDate = ((summit.start as NSDate).mt_dateSeconds(after: self.summitTimeZoneOffset) as NSDate).mt_startOfCurrentDay()
+        self.endDate = ((summit.end as NSDate).mt_dateSeconds(after: self.summitTimeZoneOffset) as NSDate).mt_dateDays(after: 1)
         
-        let today = NSDate()
+        let today = Date()
         
         let shoudHidePastTalks = scheduleFilter.activeFilters.contains(.activeTalks)
         
         self.availableDates = self.scheduleAvailableDates(from: shoudHidePastTalks ? today : self.startDate, to: self.endDate)
         
-        let summitActive = today.mt_isBetweenDate(self.startDate, andDate: self.endDate)
+        let summitActive = (today as NSDate).mt_isBetweenDate(self.startDate, andDate: self.endDate)
         
         self.scheduleView.nowButtonEnabled = summitActive
         
@@ -243,15 +243,15 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         let oldSelectedDate = self.selectedDate
         
-        if  let defaultStart = summit.defaultStart?.toFoundation(),
-            let defaultDay = self.availableDates.firstMatching({ $0.mt_isWithinSameDay(defaultStart) })
-            where summitActive == false && self.didSelectDate == false {
+        if  let defaultStart = summit.defaultStart,
+            let defaultDay = self.availableDates.first(where: { ($0 as NSDate).mt_is(withinSameDay: defaultStart) }),
+            summitActive == false && self.didSelectDate == false {
             
             self.selectedDate = defaultDay
             
         } else if self.didSelectDate == false || self.availableDates.contains(self.selectedDate) == false {
             
-            self.selectedDate = self.availableDates.firstMatching({ $0.mt_isWithinSameDay(today) }) ?? self.availableDates.first
+            self.selectedDate = self.availableDates.first(where: { ($0 as NSDate).mt_is(withinSameDay: today) }) ?? self.availableDates.first
             
         } else {
             
@@ -273,35 +273,35 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         // fetch new events
         
-        let offsetLocalTimeZone = NSTimeZone.localTimeZone().secondsFromGMT
+        let offsetLocalTimeZone = Foundation.NSTimeZone.local.secondsFromGMT()
         
-        let startDate = self.selectedDate.mt_dateSecondsAfter(offsetLocalTimeZone - self.summitTimeZoneOffset)
-        let endDate = self.selectedDate.mt_endOfCurrentDay().mt_dateSecondsAfter(offsetLocalTimeZone - self.summitTimeZoneOffset)
+        let startDate = (self.selectedDate! as NSDate).mt_dateSeconds(after: offsetLocalTimeZone - self.summitTimeZoneOffset)!
+        let endDate = ((self.selectedDate! as NSDate).mt_endOfCurrentDay() as NSDate).mt_dateSeconds(after: offsetLocalTimeZone - self.summitTimeZoneOffset)!
         
-        let today = NSDate()
+        let today = Date()
         
         let shoudHidePastTalks = scheduleFilter.activeFilters.contains(.activeTalks)
         
-        let dailyScheduleStartDate: NSDate
+        let dailyScheduleStartDate: Date
         
         if shoudHidePastTalks {
             
-            dailyScheduleStartDate = startDate.mt_isAfter(today) ? startDate : today
+            dailyScheduleStartDate = (startDate as NSDate).mt_is(after: today) ? startDate : today
             
         } else {
             
             dailyScheduleStartDate = startDate
         }
         
-        self.dayEvents = self.scheduledEvents(.interval(start: Date(foundation: dailyScheduleStartDate), end: Date(foundation: endDate)))
+        self.dayEvents = self.scheduledEvents(.interval(start: dailyScheduleStartDate, end: endDate))
         
         // reload table view
         
         if oldSchedule.isEmpty {
             
-            tableView.reloadData()
+            tableView?.reloadData()
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 // jump to NOW
                 if self.scheduleView.nowButtonEnabled {
@@ -312,22 +312,22 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
             
         } else {
             
-            tableView.beginUpdates()
+            tableView?.beginUpdates()
             
-            defer { tableView.endUpdates() }
+            defer { tableView?.endUpdates() }
             
             // update new schedule with animation
             
-            for (index, event) in self.dayEvents.enumerate() {
+            for (index, event) in self.dayEvents.enumerated() {
                 
-                let indexPath = NSIndexPath(forRow: index, inSection: 0)
+                let indexPath = IndexPath(row: index, section: 0)
                 
                 // add new item
                 guard index < oldSchedule.count else {
                     
-                    tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+                    tableView?.insertRows(at: [indexPath], with: .automatic)
                     
-                    if let cell = tableView.cellForRowAtIndexPath(indexPath) as? ScheduleTableViewCell {
+                    if let cell = tableView?.cellForRow(at: indexPath) as? ScheduleTableViewCell {
                         
                         configure(cell: cell, at: indexPath)
                     }
@@ -340,11 +340,11 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
                 // delete and insert cell (cell represents different event)
                 guard event.identifier == oldEvent.identifier else {
                     
-                    tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+                    tableView?.deleteRows(at: [indexPath], with: .automatic)
                     
-                    tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+                    tableView?.insertRows(at: [indexPath], with: .automatic)
                     
-                    if let cell = tableView.cellForRowAtIndexPath(indexPath) as? ScheduleTableViewCell {
+                    if let cell = tableView?.cellForRow(at: indexPath) as? ScheduleTableViewCell {
                         
                         configure(cell: cell, at: indexPath)
                     }
@@ -354,7 +354,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
                 
                 // update existing cell
                 
-                if let cell = tableView.cellForRowAtIndexPath(indexPath) as? ScheduleTableViewCell {
+                if let cell = tableView?.cellForRow(at: indexPath) as? ScheduleTableViewCell {
                     
                     configure(cell: cell, at: indexPath)
                 }
@@ -363,14 +363,14 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
             // remove old items
             if dayEvents.count < oldSchedule.count {
                 
-                let deletedIndexPaths = (dayEvents.count ..< oldSchedule.count).map { NSIndexPath(forRow: $0, inSection: 0) }
+                let deletedIndexPaths = (dayEvents.count ..< oldSchedule.count).map { IndexPath(row: $0, section: 0) }
                 
-                tableView.deleteRowsAtIndexPaths(deletedIndexPaths, withRowAnimation: .Automatic)
+                tableView?.deleteRows(at: deletedIndexPaths, with: .automatic)
             }
         }
     }
     
-    private func configure(cell cell: ScheduleTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: ScheduleTableViewCell, at indexPath: IndexPath) {
         
         let index = indexPath.row
         let event = dayEvents[index]
@@ -379,7 +379,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         cell.nameLabel.text = event.name
         cell.dateTimeLabel.text = event.location.isEmpty ? event.time : event.time + " / " + event.location
         cell.trackLabel.text = event.track
-        cell.trackLabel.hidden = event.track.isEmpty
+        cell.trackLabel.isHidden = event.track.isEmpty
         cell.trackLabel.textColor = UIColor(hexString: event.trackGroupColor) ?? UIColor(hexString: "#9B9B9B")
         
         // set image
@@ -388,23 +388,23 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         if isScheduled {
             
-            cell.statusImageView.hidden = false
-            cell.statusImageView.image = R.image.contextMenuScheduleAdd()!
+            cell.statusImageView.isHidden = false
+            cell.statusImageView.image = #imageLiteral(resourceName: "ContextMenuScheduleAdd")
             
         } else if isFavorite {
             
-            cell.statusImageView.hidden = false
-            cell.statusImageView.image = R.image.contextMenuWatchListAdd()!
+            cell.statusImageView.isHidden = false
+            cell.statusImageView.image = #imageLiteral(resourceName: "ContextMenuWatchListAdd")
             
         } else {
             
-            cell.statusImageView.hidden = true
+            cell.statusImageView.isHidden = true
             cell.statusImageView.image = nil
             
         }
         
         // configure button
-        cell.contextMenuButton.addTarget(self, action: #selector(showEventContextMenu), forControlEvents: .TouchUpInside)
+        cell.contextMenuButton.addTarget(self, action: #selector(showEventContextMenu), for: .touchUpInside)
     }
     
     private func filterUpdated() {
@@ -420,22 +420,22 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         let now = Date()
         
-        return self.dayEvents.indexOf({ $0.end >= now && $0.track != "General" })
+        return self.dayEvents.index(where: { $0.end >= now && $0.track != "General" })
     }
     
     // MARK: - AFHorizontalDayPickerDelegate
     
-    func horizontalDayPicker(picker: AFHorizontalDayPicker, widthForItemWithDate date: NSDate) -> CGFloat {
+    func horizontalDayPicker(_ picker: AFHorizontalDayPicker, widthForItemWith date: Date) -> CGFloat {
         
         return scheduleView.horizontalDayPicker(picker, widthForItemWithDate: date)
     }
     
-    func horizontalDayPicker(picker: AFHorizontalDayPicker!, requestCustomizedCellFromCell cell: AFDayCell!) -> AFDayCell! {
+    func horizontalDayPicker(_ picker: AFHorizontalDayPicker!, requestCustomizedCellFrom cell: AFDayCell!) -> AFDayCell! {
         
         return scheduleView.horizontalDayPicker(picker, requestCustomizedCellFromCell: cell)
     }
     
-    func horizontalDayPicker(picker: AFHorizontalDayPicker, didSelectDate date: NSDate) {
+    func horizontalDayPicker(_ picker: AFHorizontalDayPicker, didSelect date: Date) {
         
         self.didSelectDate = true
         
@@ -443,44 +443,44 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         if dayEvents.isEmpty == false {
             
-            let indexPath: NSIndexPath
+            let indexPath: IndexPath
             
             if nowSelected {
                 
                 let currentEventIndex = nowEventIndex() ?? 0
                 
-                indexPath = NSIndexPath(forRow: currentEventIndex, inSection: 0)
+                indexPath = IndexPath(row: currentEventIndex, section: 0)
                 
             } else {
                 
                 // scroll to top
-                indexPath = NSIndexPath(forRow: 0, inSection: 0)
+                indexPath = IndexPath(row: 0, section: 0)
             }
             
-            self.scheduleView.tableView.scrollToRowAtIndexPath(indexPath, atScrollPosition: .Top, animated: true)
+            self.scheduleView.tableView.scrollToRow(at: indexPath, at: .top, animated: true)
         }
     }
     
     // MARK: - UITableViewDataSource
     
-    func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let eventCount = dayEvents.count
         
-        scheduleView.tableView.hidden = eventCount == 0
-        scheduleView.noEventsLabel.hidden = eventCount > 0
+        scheduleView.tableView.isHidden = eventCount == 0
+        scheduleView.noEventsLabel.isHidden = eventCount > 0
         
         return eventCount
     }
     
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.scheduleTableViewCell)!
+        let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.scheduleTableViewCell)!
         
         configure(cell: cell, at: indexPath)
         
@@ -489,9 +489,9 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     // MARK: - UITableViewDelegate
     
-    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         let scheduleItem = dayEvents[indexPath.row]
         
@@ -501,7 +501,7 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
             
             eventDetailVC.event = scheduleItem.identifier
             
-            self.showViewController(eventDetailVC, sender: self)
+            self.show(eventDetailVC, sender: self)
             
         } else {
             
@@ -514,42 +514,42 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
     
     private func registerNotifications() {
         
-        NSNotificationCenter.defaultCenter().addObserver(
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(loggedIn),
-            name: Store.Notification.LoggedIn.rawValue,
+            name: Store.Notification.loggedIn,
             object: nil)
         
-        NSNotificationCenter.defaultCenter().addObserver(
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(loggedOut),
-            name: Store.Notification.LoggedOut.rawValue,
+            name: Store.Notification.loggedOut,
             object: nil)
         
-        NSNotificationCenter.defaultCenter().addObserver(
+        NotificationCenter.default.addObserver(
             self,
             selector: #selector(managedObjectContextObjectsDidChange),
-            name: NSManagedObjectContextObjectsDidChangeNotification,
+            name: Notification.Name.NSManagedObjectContextObjectsDidChange,
             object: Store.shared.managedObjectContext)
     }
     
     private func stopNotifications() {
         
-        NSNotificationCenter.defaultCenter().removeObserver(self, name: Store.Notification.LoggedIn.rawValue, object: nil)
-        NSNotificationCenter.defaultCenter().removeObserver(self, name: Store.Notification.LoggedOut.rawValue, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Store.Notification.loggedIn, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Store.Notification.loggedOut, object: nil)
     }
     
-    @objc private func loggedIn(notification: NSNotification) {
+    @objc private func loggedIn(_ notification: Foundation.Notification) {
         
         self.scheduleView.tableView.reloadData()
     }
     
-    @objc private func loggedOut(notification: NSNotification) {
+    @objc private func loggedOut(_ notification: Foundation.Notification) {
         
         self.scheduleView.tableView.reloadData()
     }
     
-    @objc private func managedObjectContextObjectsDidChange(notification: NSNotification) {
+    @objc private func managedObjectContextObjectsDidChange(_ notification: Foundation.Notification) {
         
         self.reloadSchedule()
     }
diff --git a/OpenStack Summit/OpenStack Summit/SearchMembersViewController.swift b/OpenStack Summit/OpenStack Summit/SearchMembersViewController.swift
index 089e3b66..cb9b411d 100644
--- a/OpenStack Summit/OpenStack Summit/SearchMembersViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SearchMembersViewController.swift	
@@ -8,7 +8,7 @@
 
 import Foundation
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import JGProgressHUD
 
@@ -37,7 +37,7 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     lazy var pageController: PageController<Member> = PageController(fetch: self.fetch)
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
@@ -46,7 +46,7 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
         
         tableView.estimatedRowHeight = 98
         tableView.rowHeight = UITableViewAutomaticDimension
-        tableView.registerNib(R.nib.loadingTableViewCell)
+        tableView.register(R.nib.loadingTableViewCell)
         
         pageController.callback.reloadData = { [weak self] in self?.tableView.reloadData() }
         
@@ -61,23 +61,24 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     // MARK: - Actions
     
-    @IBAction func search(sender: AnyObject? = nil) {
+    @IBAction func search(_ sender: AnyObject? = nil) {
         
         pageController.refresh()
     }
     
-    @IBAction func cancel(sender: AnyObject? = nil) {
+    @IBAction func cancel(_ sender: AnyObject? = nil) {
         
         self.didCancel?(self)
     }
     
     // MARK: - Private Methods
     
-    private func fetch(page: Int, perPage: Int, completion: (ErrorValue<Page<Member>>) -> ()) {
+    private func fetch(page: Int, perPage: Int, completion: @escaping (ErrorValue<Page<Member>>) -> ()) {
         
         // dont make request for empty search filter
-        guard let searchText = self.searchBar.text where searchText.isEmpty == false
-            else { completion(.Value(.empty)); return }
+        guard let searchText = self.searchBar.text,
+            searchText.isEmpty == false
+            else { completion(.value(.empty)); return }
         
         let filter = MemberListRequest.Filter(value: searchText, property: scope)
         
@@ -94,24 +95,24 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
         }
     }
     
-    private func configure(cell cell: PeopleTableViewCell, with member: Member) {
+    private func configure(cell: PeopleTableViewCell, with member: Member) {
         
         cell.name = member.name
-        cell.pictureURL = member.pictureURL
+        cell.picture = member.picture
         
         switch self.scope {
             
         case .twitter:
             
-            cell.title = member.twitter
+            cell.title = member.twitter ?? ""
             
         case .irc:
             
-            cell.title = member.irc
+            cell.title = member.irc ?? ""
             
         case .firstName, .lastName:
             
-            cell.title = member.title
+            cell.title = member.title ?? ""
         }
     }
     
@@ -122,17 +123,17 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return pageController.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = self.pageController.items[indexPath.row]
         
@@ -140,7 +141,7 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
             
         case let .item(item):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell, for: indexPath)!
             
             configure(cell: cell, with: item)
             
@@ -150,9 +151,9 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
             
             pageController.loadNextPage()
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.loadingTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.loadingTableViewCell, for: indexPath)!
             
-            cell.activityIndicator.hidden = false
+            cell.activityIndicator.isHidden = false
             
             cell.activityIndicator.startAnimating()
             
@@ -162,7 +163,7 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let data = self.pageController.items[indexPath.row]
         
@@ -178,12 +179,12 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     // MARK: - UISearchBarDelegate
     
-    func searchBarSearchButtonClicked(searchBar: UISearchBar) {
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         
         self.search()
     }
     
-    func searchBar(searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
+    func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
         
         self.scope = Scope(scopeIndex: selectedScope)!
         
@@ -192,19 +193,19 @@ final class SearchMembersViewController: UITableViewController, UISearchBarDeleg
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case R.segue.searchMembersViewController.showMemberDetail.identifier:
             
-            let indexPath = self.tableView.indexPathForCell(sender as! UITableViewCell)!
+            let indexPath = self.tableView.indexPath(for: sender as! UITableViewCell)!
             
             let data = self.pageController.items[indexPath.row]
             
             guard case let .item(member) = data else { fatalError("Invalid cell") }
             
-            let memberProfileDetailViewController = segue.destinationViewController as! PersonDetailViewController
+            let memberProfileDetailViewController = segue.destination as! PersonDetailViewController
             
             memberProfileDetailViewController.profile = .member(member.identifier)
             
diff --git a/OpenStack Summit/OpenStack Summit/SearchViewController.swift b/OpenStack Summit/OpenStack Summit/SearchViewController.swift
index b5c89e73..f36e3d89 100644
--- a/OpenStack Summit/OpenStack Summit/SearchViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SearchViewController.swift	
@@ -10,8 +10,8 @@ import Foundation
 import UIKit
 import CoreData
 import EventKit
-import SwiftFoundation
 import CoreSummit
+import Predicate
 
 final class SearchViewController: UITableViewController, EventViewController, RevealViewController, UISearchBarDelegate {
     
@@ -63,9 +63,9 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedSectionHeaderHeight = 60
         tableView.sectionHeaderHeight = UITableViewAutomaticDimension
-        tableView.registerNib(R.nib.scheduleTableViewCell)
+        tableView.register(R.nib.scheduleTableViewCell)
         // https://github.com/mac-cain13/R.swift/issues/144
-        tableView.registerNib(R.nib.searchTableViewHeaderView(), forHeaderFooterViewReuseIdentifier: SearchTableViewHeaderView.reuseIdentifier)
+        tableView.register(R.nib.searchTableViewHeaderView(), forHeaderFooterViewReuseIdentifier: SearchTableViewHeaderView.reuseIdentifier)
         
         // execute search
         searchTermChanged()
@@ -73,10 +73,10 @@ final class SearchViewController: UITableViewController, EventViewController, Re
     
     // MARK: - Actions
     
-    @IBAction func showEventContextMenu(sender: UIButton) {
+    @IBAction func showEventContextMenu(_ sender: UIButton) {
         
-        let buttonOrigin = sender.convertPoint(.zero, toView: tableView)
-        let indexPath = tableView.indexPathForRowAtPoint(buttonOrigin)!
+        let buttonOrigin = sender.convert(CGPoint.zero, to: tableView)
+        let indexPath = tableView.indexPathForRow(at: buttonOrigin)!
         let item = self[indexPath]
         
         guard case let .event(scheduleItem) = item
@@ -92,7 +92,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         self.show(contextMenu: contextMenu, sender: .view(sender))
     }
     
-    @IBAction func showMore(sender: Button) {
+    @IBAction func showMore(_ sender: Button) {
         
         switch self.data {
             
@@ -145,7 +145,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
             var sections = [SearchResult]()
             
-            func search<T: SearchViewControllerItem>(type: T.Type, entity: Entity) throws {
+            func search<T: SearchViewControllerItem>(_ type: T.Type, entity: Entity) throws {
                 
                 let (items, extend) = try self.search(type, searchTerm: searchTerm, all: false)
                 
@@ -177,9 +177,9 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         tableView.reloadData()
         
         // scroll to top
-        if tableView.numberOfSections > 0 && tableView.numberOfRowsInSection(0) > 0 {
+        if tableView.numberOfSections > 0 && tableView.numberOfRows(inSection: 0) > 0 {
             
-            tableView.scrollToRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0), atScrollPosition: .Top, animated: false)
+            tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
         }
         
         let tableFooterView: UIView
@@ -200,7 +200,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         tableView.tableFooterView = tableFooterView
     }
     
-    private func search<T: SearchViewControllerItem>(type: T.Type, searchTerm: String, all: Bool) throws -> ([Item], Extend) {
+    private func search<T: SearchViewControllerItem>(_ type: T.Type, searchTerm: String, all: Bool) throws -> ([Item], Extend) {
         
         let context = Store.shared.managedObjectContext
         
@@ -237,7 +237,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         return (items, extend)
     }
     
-    private subscript(indexPath: NSIndexPath) -> Item {
+    private subscript(indexPath: IndexPath) -> Item {
         
         let section: SearchResult
         
@@ -265,13 +265,13 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         return section
     }
     
-    private func configure(cell cell: ScheduleTableViewCell, with event: ScheduleItem) {
+    private func configure(cell: ScheduleTableViewCell, with event: ScheduleItem) {
         
         // set text
         cell.nameLabel.text = event.name
         cell.dateTimeLabel.text = event.dateTime
         cell.trackLabel.text = event.track
-        cell.trackLabel.hidden = event.track.isEmpty
+        cell.trackLabel.isHidden = event.track.isEmpty
         cell.trackLabel.textColor = UIColor(hexString: event.trackGroupColor) ?? UIColor(hexString: "#9B9B9B")
         
         // set image
@@ -280,40 +280,40 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         
         if isScheduled {
             
-            cell.statusImageView.hidden = false
-            cell.statusImageView.image = R.image.contextMenuScheduleAdd()!
+            cell.statusImageView.isHidden = false
+            cell.statusImageView.image = #imageLiteral(resourceName: "ContextMenuScheduleAdd")
             
         } else if isFavorite {
             
-            cell.statusImageView.hidden = false
-            cell.statusImageView.image = R.image.contextMenuWatchListAdd()!
+            cell.statusImageView.isHidden = false
+            cell.statusImageView.image = #imageLiteral(resourceName: "ContextMenuWatchListAdd")
             
         } else {
             
-            cell.statusImageView.hidden = true
+            cell.statusImageView.isHidden = true
             cell.statusImageView.image = nil
             
         }
         
         // configure button
-        cell.contextMenuButton.addTarget(self, action: #selector(showEventContextMenu), forControlEvents: .TouchUpInside)
+        cell.contextMenuButton.addTarget(self, action: #selector(showEventContextMenu), for: .touchUpInside)
     }
     
-    private func configure(cell cell: PeopleTableViewCell, with speaker: Speaker) {
+    private func configure(cell: PeopleTableViewCell, with speaker: Speaker) {
         
         cell.name = speaker.name
-        cell.title = speaker.title
-        cell.pictureURL = speaker.pictureURL
+        cell.title = speaker.title ?? ""
+        cell.picture = speaker.picture
     }
     
-    private func configure(cell cell: SearchResultTableViewCell, with track: Track) {
+    private func configure(cell: SearchResultTableViewCell, with track: Track) {
         
         cell.itemLabel.text = track.name
     }
     
     // MARK: - UISearchBarDelegate
     
-    func searchBarSearchButtonClicked(searchBar: UISearchBar) {
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         
         let text = searchBar.text ?? ""
         
@@ -327,7 +327,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         switch data {
         case .none: return 0
@@ -336,14 +336,14 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         }
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection sectionIndex: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection sectionIndex: Int) -> Int {
         
         let section = self[section: sectionIndex]
         
         return section.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let item = self[indexPath]
         
@@ -351,7 +351,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
         case let .event(event):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.scheduleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.scheduleTableViewCell, for: indexPath)!
             
             configure(cell: cell, with: event)
             
@@ -359,7 +359,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
         case let .speaker(speaker):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell, for: indexPath)!
             
             configure(cell: cell, with: speaker)
             
@@ -367,7 +367,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
         case let .track(track):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.searchResultTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.searchResultTableViewCell, for: indexPath)!
             
             configure(cell: cell, with: track)
             
@@ -375,7 +375,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         }
     }
     
-    override func tableView(tableView: UITableView, viewForHeaderInSection sectionIndex: Int) -> UIView? {
+    override func tableView(_ tableView: UITableView, viewForHeaderInSection sectionIndex: Int) -> UIView? {
         
         let section = self[section: sectionIndex]
         
@@ -387,7 +387,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         case .track: sectionTitle = "TRACKS"
         }
         
-        let headerView = tableView.dequeueReusableHeaderFooterViewWithIdentifier(SearchTableViewHeaderView.reuseIdentifier) as! SearchTableViewHeaderView
+        let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: SearchTableViewHeaderView.reuseIdentifier) as! SearchTableViewHeaderView
         
         headerView.titleLabel.text = sectionTitle
         
@@ -398,25 +398,25 @@ final class SearchViewController: UITableViewController, EventViewController, Re
         case .entity: buttonText = "See All"
         }
         
-        headerView.moreButton.setTitle(buttonText, forState: .Normal)
+        headerView.moreButton.setTitle(buttonText, for: UIControlState())
         
-        if headerView.moreButton.allTargets().isEmpty {
+        if headerView.moreButton.allTargets.isEmpty {
             
-            headerView.moreButton.addTarget(self, action: #selector(showMore), forControlEvents: .TouchUpInside)
+            headerView.moreButton.addTarget(self, action: #selector(showMore), for: .touchUpInside)
         }
         
         headerView.moreButton.tag = sectionIndex
         
-        headerView.moreButton.hidden = section.extend == .none
+        headerView.moreButton.isHidden = section.extend == .none
         
         return headerView
     }
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         let item = self[indexPath]
         
@@ -428,13 +428,13 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
             eventDetailViewController.event = event.identifier
             
-            showViewController(eventDetailViewController, sender: self)
+            self.show(eventDetailViewController, sender: self)
             
         case let .speaker(speaker):
             
             let memberProfileViewController = MemberProfileViewController(profile: PersonIdentifier(speaker: speaker))
             
-            showViewController(memberProfileViewController, sender: self)
+            show(memberProfileViewController, sender: self)
             
         case let .track(track):
             
@@ -442,7 +442,7 @@ final class SearchViewController: UITableViewController, EventViewController, Re
             
             trackScheduleViewController.track = track
             
-            showViewController(trackScheduleViewController, sender: self)
+            self.show(trackScheduleViewController, sender: self)
         }
     }
 }
@@ -495,36 +495,54 @@ private protocol SearchViewControllerItem: CoreDataDecodable {
     
     func toItem() -> SearchViewController.Item
     
-    static func predicate(for searchTerm: String, summit: Identifier) -> NSPredicate
+    static func predicate(for searchTerm: String, summit: Identifier) -> Predicate
 }
 
 extension ScheduleItem: SearchViewControllerItem {
     
-    private func toItem() -> SearchViewController.Item { return .event(self) }
+    fileprivate func toItem() -> SearchViewController.Item { return .event(self) }
     
-    private static func predicate(for searchTerm: String, summit: Identifier) -> NSPredicate {
+    fileprivate static func predicate(for searchTerm: String, summit: Identifier) -> Predicate {
         
-        return NSPredicate(format: "summit.id == %@ AND (name CONTAINS[c] %@ OR sponsors.name CONTAINS[c] %@)", NSNumber(longLong: Int64(summit)), searchTerm, searchTerm)
+        let value: Expression = .value(.string(searchTerm))
+        
+        // NSPredicate(format: "summit.id == %@ AND (name CONTAINS[c] %@ OR sponsors.name CONTAINS[c] %@)", NSNumber(value: Int64(summit)), searchTerm, searchTerm)
+        return #keyPath(EventManagedObject.summit.id) == summit
+            && ((#keyPath(EventManagedObject.name)).compare(.contains, [.caseInsensitive], value)
+            || (#keyPath(EventManagedObject.sponsors.name)).compare(.contains, [.caseInsensitive], value))
     }
 }
 
 extension Speaker: SearchViewControllerItem {
     
-    private func toItem() -> SearchViewController.Item { return .speaker(self) }
+    fileprivate func toItem() -> SearchViewController.Item { return .speaker(self) }
     
-    private static func predicate(for searchTerm: String, summit: Identifier) -> NSPredicate {
+    fileprivate static func predicate(for searchTerm: String, summit: Identifier) -> Predicate {
+        
+        let value: Expression = .value(.string(searchTerm))
+        
+        //return NSPredicate(format: "summits.id CONTAINS %@ AND (firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@ OR affiliations.organization.name CONTAINS[c] %@)", NSNumber(value: Int64(summit)), searchTerm, searchTerm, searchTerm)
         
-        return NSPredicate(format: "summits.id CONTAINS %@ AND (firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@ OR affiliations.organization.name CONTAINS[c] %@)", NSNumber(longLong: Int64(summit)), searchTerm, searchTerm, searchTerm)
+        return (#keyPath(SpeakerManagedObject.summits.id)).compare(.contains, .value(.int64(summit)))
+            && ((#keyPath(SpeakerManagedObject.firstName)).compare(.contains, [.caseInsensitive], value)
+            || (#keyPath(SpeakerManagedObject.lastName)).compare(.contains, [.caseInsensitive], value)
+            || (#keyPath(SpeakerManagedObject.affiliations.organization.name)).compare(.contains, [.caseInsensitive], value))
     }
 }
 
 extension Track: SearchViewControllerItem {
     
-    private func toItem() -> SearchViewController.Item { return .track(self) }
+    fileprivate func toItem() -> SearchViewController.Item { return .track(self) }
     
-    private static func predicate(for searchTerm: String, summit: Identifier) -> NSPredicate {
+    fileprivate static func predicate(for searchTerm: String, summit: Identifier) -> Predicate {
+        
+        let value: Expression = .value(.string(searchTerm))
+        
+        //return NSPredicate(format: "summits.id CONTAINS %@ AND name CONTAINS[c] %@", NSNumber(value: Int64(summit)), searchTerm)
+        
+        return (#keyPath(TrackManagedObject.summits.id)).compare(.contains, .value(.int64(summit)))
+            && (#keyPath(TrackManagedObject.name)).compare(.contains, [.caseInsensitive], value)
         
-        return NSPredicate(format: "summits.id CONTAINS %@ AND name CONTAINS[c] %@", NSNumber(longLong: Int64(summit)), searchTerm)
     }
 }
 
diff --git a/OpenStack Summit/OpenStack Summit/ShowVenueDetail.swift b/OpenStack Summit/OpenStack Summit/ShowVenueDetail.swift
index 8d24ad01..4b7ec094 100644
--- a/OpenStack Summit/OpenStack Summit/ShowVenueDetail.swift	
+++ b/OpenStack Summit/OpenStack Summit/ShowVenueDetail.swift	
@@ -13,27 +13,27 @@ import CoreSummit
 extension UIViewController {
     
     /// Shows the approriate Venue detail VC for the specified venue.
-    func showLocationDetail(location: Identifier) {
+    func show(location: Identifier) {
         
         let venue: Identifier
         
-        if let realmVenue = try! VenueManagedObject.find(location, context: Store.shared.managedObjectContext) {
+        if let venueManagedObject = try! VenueManagedObject.find(location, context: Store.shared.managedObjectContext) {
             
-            venue = realmVenue.identifier
+            venue = venueManagedObject.id
             
-        } else if let realmVenueRoom = try! VenueRoomManagedObject.find(location, context: Store.shared.managedObjectContext) {
+        } else if let venueRoomManagedObject = try! VenueRoomManagedObject.find(location, context: Store.shared.managedObjectContext) {
             
-            venue = realmVenueRoom.venue.identifier
+            venue = venueRoomManagedObject.venue.id
             
         } else {
             
             fatalError("Invalid location \(location)")
         }
         
-        let venueDetailVC = R.storyboard.venue.venueDetailViewController()!
+        let venueDetailViewController = R.storyboard.venue.venueDetailViewController()!
         
-        venueDetailVC.venue = venue
+        venueDetailViewController.venue = venue
         
-        self.showViewController(venueDetailVC, sender: self)
+        self.show(venueDetailViewController, sender: self)
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStack Summit/ShowVideo.swift b/OpenStack Summit/OpenStack Summit/ShowVideo.swift
index df82c584..7d0ec302 100644
--- a/OpenStack Summit/OpenStack Summit/ShowVideo.swift	
+++ b/OpenStack Summit/OpenStack Summit/ShowVideo.swift	
@@ -13,7 +13,7 @@ import CoreSummit
 
 extension UIViewController {
     
-    func playVideo(video: Video) {
+    func play(video: Video) {
         
         let videoPlayer = XCDYouTubeVideoPlayerViewController(videoIdentifier: video.youtube)
         self.presentMoviePlayerViewControllerAnimated(videoPlayer)
@@ -21,7 +21,7 @@ extension UIViewController {
         // set user activity for handoff
         let userActivity = NSUserActivity(activityType: AppActivity.view.rawValue)
         
-        userActivity.webpageURL = NSURL(string: "https://www.youtube.com/watch?v=" + video.youtube)
+        userActivity.webpageURL = URL(string: "https://www.youtube.com/watch?v=" + video.youtube)
         
         userActivity.userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.video.rawValue, AppActivityUserInfo.identifier.rawValue: video.identifier]
         userActivity.requiredUserInfoKeys = [AppActivityUserInfo.type.rawValue, AppActivityUserInfo.identifier.rawValue]
@@ -31,11 +31,13 @@ extension UIViewController {
         
         // listen to when the video stops playing
         var observer: AnyObject!
-        observer = NSNotificationCenter.defaultCenter().addObserverForName(MPMoviePlayerPlaybackDidFinishNotification, object: videoPlayer.moviePlayer, queue: nil) { (notification) in
+        observer = NotificationCenter.default.addObserver(forName: Notification.Name.MPMoviePlayerPlaybackDidFinish, object: videoPlayer.moviePlayer, queue: nil) { [weak self] (notification) in
             
             userActivity.invalidate()
             
-            NSNotificationCenter.defaultCenter().removeObserver(observer)
+            NotificationCenter.default.removeObserver(observer)
+            
+            self?.requestAppReview()
         }
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/SpeakerPresentationsViewController.swift b/OpenStack Summit/OpenStack Summit/SpeakerPresentationsViewController.swift
index d4a7ee5c..2b531362 100644
--- a/OpenStack Summit/OpenStack Summit/SpeakerPresentationsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SpeakerPresentationsViewController.swift	
@@ -27,16 +27,16 @@ final class SpeakerPresentationsViewController: ScheduleViewController, Indicato
     
     // MARK: - Methods
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         let summit = SummitManager.shared.summit.value
         
-        let events = try! EventManagedObject.speakerPresentations(speaker, startDate: startDate, endDate: endDate, summit: summit, context: Store.shared.managedObjectContext)
+        let events = try! EventManagedObject.presentations(for: speaker, start: startDate, end: endDate, summit: summit, context: Store.shared.managedObjectContext)
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -45,18 +45,21 @@ final class SpeakerPresentationsViewController: ScheduleViewController, Indicato
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
+        
+        guard case .interval(let interval) = filter
+            else { return [] }
         
         let summit = SummitManager.shared.summit.value
         
-        let managedObjects = try! EventManagedObject.speakerPresentations(speaker, startDate: startDate, endDate: endDate, summit: summit, context: Store.shared.managedObjectContext)
+        let managedObjects = try! EventManagedObject.presentations(for: speaker, start: interval.start, end: interval.end, summit: summit, context: Store.shared.managedObjectContext)
         
         return ScheduleItem.from(managedObjects: managedObjects)
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Sessions")
     }
diff --git a/OpenStack Summit/OpenStack Summit/SpeakersViewController.swift b/OpenStack Summit/OpenStack Summit/SpeakersViewController.swift
index c920f04c..6c37582b 100644
--- a/OpenStack Summit/OpenStack Summit/SpeakersViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SpeakersViewController.swift	
@@ -29,9 +29,9 @@ final class SpeakersViewController: TableViewController, RevealViewController, I
         // configure fetched results controller
         self.fetchedResultsController = NSFetchedResultsController(Speaker.self,
                                                                    delegate: self,
-                                                                   sortDescriptors: Speaker.ManagedObject.sortDescriptors,
-                                                                   sectionNameKeyPath: Speaker.ManagedObject.Property.addressBookSectionName.rawValue,
-                                                                   context: Store.shared.managedObjectContext)
+                                                                   sortDescriptors: SpeakerManagedObject.sortDescriptors,
+                                                                   sectionNameKeyPath: #keyPath(SpeakerManagedObject.addressBookSectionName),
+                                                                   context: Store.shared.managedObjectContext) as! NSFetchedResultsController<NSManagedObject>
         
         self.fetchedResultsController.fetchRequest.fetchBatchSize = 30
         try! self.fetchedResultsController.performFetch()
@@ -46,38 +46,38 @@ final class SpeakersViewController: TableViewController, RevealViewController, I
         self.userActivity = userActivity
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.speakers.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - Private Methods
     
-    private subscript (indexPath: NSIndexPath) -> Speaker {
+    private subscript (indexPath: IndexPath) -> Speaker {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! Speaker.ManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! Speaker.ManagedObject
         
         return Speaker(managedObject: managedObject)
     }
     
-    private func configure(cell cell: PeopleTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: PeopleTableViewCell, at indexPath: IndexPath) {
         
         let person = self[indexPath]
         
         cell.name = person.name
-        cell.title = person.title
-        cell.pictureURL = person.pictureURL
+        cell.title = person.title ?? ""
+        cell.picture = person.picture
     }
     
     // MARK: - UITableViewDataSource
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell)!
+        let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell)!
         
         configure(cell: cell, at: indexPath)
         
@@ -86,30 +86,30 @@ final class SpeakersViewController: TableViewController, RevealViewController, I
     
     // MARK: - UITableViewDataSource
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let person = self[indexPath]
         
         let memberProfileVC = MemberProfileViewController(profile: PersonIdentifier(speaker: person))
         
-        showViewController(memberProfileVC, sender: self)
+        show(memberProfileVC, sender: self)
     }
     
-    override func sectionIndexTitlesForTableView(tableView: UITableView) -> [String]? {
+    override func sectionIndexTitles(for tableView: UITableView) -> [String]? {
         
         return self.fetchedResultsController.sectionIndexTitles
     }
     
     // MARK: - NSFetchedResultsControllerDataSource
     
-    func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String) -> String? {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String) -> String? {
         
         return sectionName
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Speakers")
     }
diff --git a/OpenStack Summit/OpenStack Summit/Store.swift b/OpenStack Summit/OpenStack Summit/Store.swift
index f611f31e..f2627b35 100644
--- a/OpenStack Summit/OpenStack Summit/Store.swift	
+++ b/OpenStack Summit/OpenStack Summit/Store.swift	
@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-import SwiftFoundation
 import CoreSummit
 
 extension Store {
@@ -33,38 +32,53 @@ extension Store {
         return store
     }
     
-    static let fileURL: NSURL = {
+    static let fileURL: URL = {
         
-        let fileManager = NSFileManager.defaultManager()
+        let fileManager = FileManager.default
+        
+        // get cache folder
         
         #if os(iOS) || os(watchOS) || os(OSX)
-        let folderURL = try! fileManager.URLForDirectory(NSSearchPathDirectory.CachesDirectory,
-                                                         inDomain: NSSearchPathDomainMask.UserDomainMask,
-                                                         appropriateForURL: nil,
-                                                         create: false)
+        let cacheURL = try! fileManager.url(for: .cachesDirectory,
+                                             in: .userDomainMask,
+                                             appropriateFor: nil,
+                                             create: false)
+        
         #elseif os(tvOS)
             
-        let containerURL = NSFileManager.defaultManager().containerURLForSecurityApplicationGroupIdentifier(AppGroup)!
+        let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: AppGroup)!
             
-        let folderURL = containerURL
-            .URLByAppendingPathComponent("Library", isDirectory: true)!
-            .URLByAppendingPathComponent("Caches", isDirectory: true)!
+        let cacheURL = containerURL
+            .appendingPathComponent("Library", isDirectory: true)
+            .appendingPathComponent("Caches", isDirectory: true)
             
         #endif
         
-        let fileURL = folderURL.URLByAppendingPathComponent("data.sqlite", isDirectory: false)!
+        // get app folder
+        let bundleIdentifier = Bundle.main.bundleIdentifier!
+        let folderURL = cacheURL.appendingPathComponent(bundleIdentifier, isDirectory: true)
+        
+        // create folder if doesnt exist
+        var folderExists: ObjCBool = false
+        if fileManager.fileExists(atPath: folderURL.path, isDirectory: &folderExists) == false
+            || folderExists.boolValue == false {
+            
+            try! fileManager.createDirectory(at: folderURL, withIntermediateDirectories: true)
+        }
+        
+        let fileURL = folderURL.appendingPathComponent("data.sqlite", isDirectory: false)
         
         return fileURL
     }()
     
-    static func createPersistentStore(coordinator: NSPersistentStoreCoordinator) throws -> NSPersistentStore {
+    static func createPersistentStore(_ coordinator: NSPersistentStoreCoordinator) throws -> NSPersistentStore {
         
         func createStore() throws -> NSPersistentStore {
             
-            return try coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
-                                                              configuration: nil,
-                                                              URL: Store.fileURL,
-                                                              options: nil)
+            return try coordinator.addPersistentStore(ofType: NSSQLiteStoreType,
+                                                      configurationName: nil,
+                                                      at: Store.fileURL,
+                                                      options: nil)
         }
         
         var store: NSPersistentStore!
@@ -83,19 +97,19 @@ extension Store {
         return store
     }
     
-    static func deletePersistentStore(store: (NSPersistentStoreCoordinator, NSPersistentStore)? = nil) throws {
+    static func deletePersistentStore(_ store: (NSPersistentStoreCoordinator, NSPersistentStore)? = nil) throws {
         
         let url = self.fileURL
         
-        if NSFileManager.defaultManager().fileExistsAtPath(url.path!) {
+        if FileManager.default.fileExists(atPath: url.path) {
             
             // delete file
-            try NSFileManager.defaultManager().removeItemAtURL(url)
+            try FileManager.default.removeItem(at: url)
         }
         
         if let (psc, persistentStore) = store {
             
-            try psc.removePersistentStore(persistentStore)
+            try psc.remove(persistentStore)
         }
     }
     
diff --git a/OpenStack Summit/OpenStack Summit/SummitActivityHandling.swift b/OpenStack Summit/OpenStack Summit/SummitActivityHandling.swift
index b4d94496..68a02ac0 100644
--- a/OpenStack Summit/OpenStack Summit/SummitActivityHandling.swift	
+++ b/OpenStack Summit/OpenStack Summit/SummitActivityHandling.swift	
@@ -6,66 +6,88 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 protocol SummitActivityHandling {
     
-    func view(data: AppActivitySummitDataType, identifier: Identifier) -> Bool
+    func view(data: AppActivitySummitDataType, identifier: Identifier)
     
     func view(screen: AppActivityScreen)
     
-    func search(searchTerm: String)
+    func search(_ searchTerm: String)
 }
 
 extension SummitActivityHandling {
     
     /// Opens URL of universal domain.
-    func openWebURL(url: NSURL) -> Bool {
+    func openWeb(url: URL) -> Bool {
         
         // perform search
-        if url.pathComponents?.last == "global-search",
-            let urlComponents = NSURLComponents(URL: url, resolvingAgainstBaseURL: false),
-            let searchQuery = urlComponents.queryItems?.firstMatching({ $0.name == "t" && ($0.value ?? "").isEmpty == false }),
+        if url.pathComponents.last == "global-search",
+            let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false),
+            let searchQuery = urlComponents.queryItems?.first(where: { $0.name == "t" && ($0.value ?? "").isEmpty == false }),
             let searchTerm = searchQuery.value {
             
             self.search(searchTerm)
             return true
         }
         
+        let components = url.pathComponents
+        
         // show data
-        guard let components = url.pathComponents
-            where components.count >= 6
+        guard components.count >= 6
             else { return false }
         
         let typeString = components[4]
         let identifierString = components[5]
         
-        guard let identifier = Int(identifierString),
+        guard let identifier = Identifier(identifierString),
             let type = WebPathComponent(rawValue: typeString)
             else { return false }
         
         let dataType = AppActivitySummitDataType(webPathComponent: type)
         
-        return self.view(dataType, identifier: identifier)
+        guard self.canView(data: dataType, identifier: identifier)
+            else { return false }
+        
+        self.view(data: dataType, identifier: identifier)
+        
+        return true
     }
     
     /// Opens URL of custom scheme.
-    func openSchemeURL(url: NSURL) -> Bool {
+    func openScheme(url: URL) -> Bool {
+        
+        let components = url.pathComponents
         
-        guard let typeString = url.host, let components = url.pathComponents
-            where components.count >= 2
+        guard let typeString = url.host,
+            components.count >= 2
             else { return false }
         
         let identifierString = components[1]
         
-        guard let identifier = Int(identifierString),
+        guard let identifier = Identifier(identifierString),
             let type = WebPathComponent(rawValue: typeString)
             else { return false }
         
         let dataType = AppActivitySummitDataType(webPathComponent: type)
         
-        return self.view(dataType, identifier: identifier)
+        guard self.canView(data: dataType, identifier: identifier)
+            else { return false }
+        
+        self.view(data: dataType, identifier: identifier)
+        
+        return true
+    }
+    
+    func canView(data: AppActivitySummitDataType, identifier: Identifier) -> Bool {
+        
+        // find in cache
+        guard let _ = try! data.managedObject.find(identifier, context: Store.shared.managedObjectContext)
+            else { return false }
+        
+        return true
     }
 }
 
@@ -73,60 +95,60 @@ extension SummitActivityHandling {
 
 // MARK: - View Controller
 
-protocol SummitActivityHandlingViewController: class, SummitActivityHandling {
+protocol SummitActivityHandlingViewController: class, SummitActivityHandling { }
+
+extension SummitActivityHandlingViewController {
     
-    func showViewController(vc: UIViewController, sender: AnyObject?)
+    func view(data: AppActivitySummitDataType, identifier: Identifier) {
+        
+        guard let viewController = self as? UIViewController
+            else { fatalError() }
+        
+        viewController.show(data: data, identifier: identifier)
+    }
     
-    func playVideo(video: Video)
+    func view(screen: AppActivityScreen) {
+        
+        AppDelegate.shared.view(screen: screen)
+    }
     
-    func showLocationDetail(location: Identifier)
+    func search(_ searchTerm: String) {
+        
+        AppDelegate.shared.search(searchTerm)
+    }
 }
-
-extension SummitActivityHandlingViewController {
     
-    func view(data: AppActivitySummitDataType, identifier: Identifier) -> Bool  {
+extension UIViewController {
+    
+    func show(data: AppActivitySummitDataType, identifier: Identifier) {
         
         let context = Store.shared.managedObjectContext
         
-        // find in cache
-        guard let managedObject = try! data.managedObject.find(identifier, context: context)
-            else { return false }
-        
         switch data {
             
         case .event:
             
-            let eventDetailVC = R.storyboard.event.eventDetailViewController()!
-            eventDetailVC.event = identifier
-            self.showViewController(eventDetailVC, sender: nil)
+            let eventDetailViewController = R.storyboard.event.eventDetailViewController()!
+            eventDetailViewController.event = identifier
+            self.show(eventDetailViewController, sender: nil)
             
         case .speaker:
             
-            let memberProfileVC = MemberProfileViewController(profile: .speaker(identifier))
-            self.showViewController(memberProfileVC, sender: nil)
+            let MmmberProfileViewController = MemberProfileViewController(profile: .speaker(identifier))
+            self.show(MmmberProfileViewController, sender: nil)
             
         case .video:
             
-            let video = Video(managedObject: managedObject as! VideoManagedObject)
+            // find in cache
+            guard let video = try! Video.find(identifier, context: context)
+                else { return }
             
-            self.playVideo(video)
+            self.play(video: video)
             
         case .venue, .venueRoom:
             
-            self.showLocationDetail(identifier)
+            self.show(location: identifier)
         }
-        
-        return true
-    }
-    
-    func view(screen: AppActivityScreen) {
-        
-        AppDelegate.shared.view(screen)
-    }
-    
-    func search(searchTerm: String) {
-        
-        AppDelegate.shared.search(searchTerm)
     }
 }
 
diff --git a/OpenStack Summit/OpenStack Summit/SummitManager.swift b/OpenStack Summit/OpenStack Summit/SummitManager.swift
index a37eb36a..ed38cfef 100644
--- a/OpenStack Summit/OpenStack Summit/SummitManager.swift	
+++ b/OpenStack Summit/OpenStack Summit/SummitManager.swift	
@@ -24,11 +24,11 @@ final class SummitManager {
     
     lazy var summit: Observable<Identifier> = self.initSummit()
     
-    private let userDefaults: NSUserDefaults
+    private let userDefaults: UserDefaults
     
     // MARK: - Initialization
     
-    private init(userDefaults: NSUserDefaults = NSUserDefaults.standardUserDefaults()) {
+    private init(userDefaults: UserDefaults = UserDefaults.standard) {
         
         self.userDefaults = userDefaults
     }
@@ -38,19 +38,19 @@ final class SummitManager {
     @inline(__always)
     private func initSummit() -> Observable<Identifier> {
         
-        let summit = userDefaults.integerForKey(PreferenceKey.summit.rawValue)
+        let summit = userDefaults.object(forKey: PreferenceKey.summit.rawValue) as? Int64 ?? 0
         
         let observable = Observable<Identifier>(summit)
         
-        observable.observe(summitChanged)
+        let _ = observable.observe(summitChanged)
         
         return observable
     }
     
     @inline(__always)
-    private func summitChanged(newValue: Identifier, oldValue: Identifier) {
+    private func summitChanged(_ newValue: Identifier, oldValue: Identifier) {
         
-        userDefaults.setObject(newValue, forKey: PreferenceKey.summit.rawValue)
+        userDefaults.set(newValue, forKey: PreferenceKey.summit.rawValue)
         userDefaults.synchronize()
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/SummitsViewController.swift b/OpenStack Summit/OpenStack Summit/SummitsViewController.swift
index 027768cb..87be6c1e 100644
--- a/OpenStack Summit/OpenStack Summit/SummitsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SummitsViewController.swift	
@@ -29,7 +29,7 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
     
     lazy var pageController: PageController<Summit> = PageController(fetch: Store.shared.summits)
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
@@ -38,7 +38,7 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
         
         tableView.estimatedRowHeight = 44
         tableView.rowHeight = UITableViewAutomaticDimension
-        tableView.registerNib(R.nib.loadingTableViewCell)
+        tableView.register(R.nib.loadingTableViewCell)
         
         pageController.callback.reloadData = { [weak self] in self?.tableView.reloadData() }
         
@@ -54,17 +54,17 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        self.view.bringSubviewToFront(progressHUD)
+        self.view.bringSubview(toFront: progressHUD)
     }
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         pageController.refresh()
     }
     
-    @IBAction func done(sender: AnyObject? = nil) {
+    @IBAction func done(_ sender: AnyObject? = nil) {
         
         self.didFinish?(self)
     }
@@ -76,38 +76,38 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
         self.navigationItem.rightBarButtonItem = didFinish != nil ? doneButton : nil
     }
     
-    private func configure(cell cell: UITableViewCell, with summit: Summit) {
+    private func configure(cell: UITableViewCell, with summit: Summit) {
         
         cell.textLabel!.text = summit.name
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: summit.timeZone.name)
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: summit.timeZone.name)
         dateFormatter.dateFormat = "MMMM dd-"
-        let stringDateFrom = dateFormatter.stringFromDate(summit.start.toFoundation())
+        let stringDateFrom = dateFormatter.string(from: summit.start)
         
         dateFormatter.dateFormat = "dd, yyyy"
-        let stringDateTo = dateFormatter.stringFromDate(summit.end.toFoundation())
+        let stringDateTo = dateFormatter.string(from: summit.end)
         
         cell.detailTextLabel!.text = stringDateFrom + stringDateTo
         
         let isCurrentSummit = SummitManager.shared.summit.value == summit.identifier
         
-        cell.accessoryType = isCurrentSummit ? .Checkmark : .None
+        cell.accessoryType = isCurrentSummit ? .checkmark : .none
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return pageController.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = self.pageController.items[indexPath.row]
         
@@ -115,7 +115,7 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
             
         case let .item(item):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.summitCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.summitCell, for: indexPath)!
             
             configure(cell: cell, with: item)
             
@@ -125,9 +125,9 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
             
             pageController.loadNextPage()
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.loadingTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.loadingTableViewCell, for: indexPath)!
             
-            cell.activityIndicator.hidden = false
+            cell.activityIndicator.isHidden = false
             
             cell.activityIndicator.startAnimating()
             
@@ -137,9 +137,9 @@ final class SummitsViewController: UITableViewController, PagingTableViewControl
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         let data = self.pageController.items[indexPath.row]
         
diff --git a/OpenStack Summit/OpenStack Summit/SweetAlert.swift b/OpenStack Summit/OpenStack Summit/SweetAlert.swift
index 01dbee20..e86e5141 100755
--- a/OpenStack Summit/OpenStack Summit/SweetAlert.swift	
+++ b/OpenStack Summit/OpenStack Summit/SweetAlert.swift	
@@ -11,11 +11,11 @@ import UIKit
 import QuartzCore
 
 public enum AlertStyle {
-    case Success,Error,Warning,None
-    case CustomImag(imageFile:String)
+    case success,error,warning,none
+    case customImag(imageFile:String)
 }
 
-public class SweetAlert: UIViewController {
+open class SweetAlert: UIViewController {
     let kBakcgroundTansperancy: CGFloat = 0.7
     let kHeightMargin: CGFloat = 10.0
     let KTopMargin: CGFloat = 20.0
@@ -33,13 +33,13 @@ public class SweetAlert: UIViewController {
     var animatedView: AnimatableView?
     var imageView:UIImageView?
     var subTitleTextView = UITextView()
-    var userAction:((isOtherButton: Bool) -> Void)? = nil
+    var userAction:((_ isOtherButton: Bool) -> Void)? = nil
     let kFont = "Helvetica"
     
     init() {
         super.init(nibName: nil, bundle: nil)
-        self.view.frame = UIScreen.mainScreen().bounds
-        self.view.autoresizingMask = [UIViewAutoresizing.FlexibleHeight, UIViewAutoresizing.FlexibleWidth]
+        self.view.frame = UIScreen.main.bounds
+        self.view.autoresizingMask = [UIViewAutoresizing.flexibleHeight, UIViewAutoresizing.flexibleWidth]
         self.view.backgroundColor = UIColor(red:0, green:0, blue:0, alpha:kBakcgroundTansperancy)
         self.view.addSubview(contentView)
         
@@ -59,28 +59,28 @@ public class SweetAlert: UIViewController {
         contentView.addSubview(titleLabel)
         contentView.addSubview(subTitleTextView)
         contentView.backgroundColor = UIColor.colorFromRGB(0xFFFFFF)
-        contentView.layer.borderColor = UIColor.colorFromRGB(0xCCCCCC).CGColor
+        contentView.layer.borderColor = UIColor.colorFromRGB(0xCCCCCC).cgColor
         view.addSubview(contentView)
     }
     
     private func setupTitleLabel() {
         titleLabel.text = ""
         titleLabel.numberOfLines = 1
-        titleLabel.textAlignment = .Center
+        titleLabel.textAlignment = .center
         titleLabel.font = UIFont(name: kFont, size:25)
         titleLabel.textColor = UIColor.colorFromRGB(0x575757)
     }
     
     private func setupSubtitleTextView() {
         subTitleTextView.text = ""
-        subTitleTextView.textAlignment = .Center
+        subTitleTextView.textAlignment = .center
         subTitleTextView.font = UIFont(name: kFont, size:16)
         subTitleTextView.textColor = UIColor.colorFromRGB(0x797979)
-        subTitleTextView.editable = false
+        subTitleTextView.isEditable = false
     }
     
     private func resizeAndRelayout() {
-        let mainScreenBounds = UIScreen.mainScreen().bounds
+        let mainScreenBounds = UIScreen.main.bounds
         self.view.frame.size = mainScreenBounds.size
         let x: CGFloat = kWidthMargin
         var y: CGFloat = KTopMargin
@@ -108,7 +108,7 @@ public class SweetAlert: UIViewController {
         // Subtitle
         if self.subTitleTextView.text.isEmpty == false {
             let subtitleString = subTitleTextView.text! as NSString
-            let rect = subtitleString.boundingRectWithSize(CGSize(width: width, height: 0.0), options: NSStringDrawingOptions.UsesLineFragmentOrigin, attributes: [NSFontAttributeName:subTitleTextView.font!], context: nil)
+            let rect = subtitleString.boundingRect(with: CGSize(width: width, height: 0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes: [NSFontAttributeName:subTitleTextView.font!], context: nil)
             textViewHeight = ceil(rect.size.height) + 10.0
             subTitleTextView.frame = CGRect(x: x, y: y, width: width, height: textViewHeight)
             contentView.addSubview(subTitleTextView)
@@ -117,8 +117,8 @@ public class SweetAlert: UIViewController {
         
         var buttonRect:[CGRect] = []
         for button in buttons {
-            let string = button.titleForState(UIControlState.Normal)! as NSString
-            buttonRect.append(string.boundingRectWithSize(CGSize(width: width, height:0.0), options: NSStringDrawingOptions.UsesLineFragmentOrigin, attributes:[NSFontAttributeName:button.titleLabel!.font], context:nil))
+            let string = button.title(for: UIControlState())! as NSString
+            buttonRect.append(string.boundingRect(with: CGSize(width: width, height:0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes:[NSFontAttributeName:button.titleLabel!.font], context:nil))
         }
         
         var totalWidth: CGFloat = 0.0
@@ -136,7 +136,7 @@ public class SweetAlert: UIViewController {
             buttonX = buttons[i].frame.origin.x + kWidthMargin + buttonRect[i].size.width + 20.0
             buttons[i].layer.cornerRadius = 5.0
             self.contentView.addSubview(buttons[i])
-            buttons[i].addTarget(self, action: #selector(SweetAlert.pressed(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+            buttons[i].addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControlEvents.touchUpInside)
             
         }
         y += kHeightMargin + buttonRect[0].size.height + 10.0
@@ -157,18 +157,18 @@ public class SweetAlert: UIViewController {
         contentView.clipsToBounds = true
     }
     
-    public func pressed(sender: UIButton!) {
+    open func pressed(_ sender: UIButton!) {
         self.closeAlert(sender.tag)
     }
     
-    public override func viewWillLayoutSubviews() {
+    open override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
-        var sz = UIScreen.mainScreen().bounds.size
-        let sver = UIDevice.currentDevice().systemVersion as NSString
+        var sz = UIScreen.main.bounds.size
+        let sver = UIDevice.current.systemVersion as NSString
         let ver = sver.floatValue
         if ver < 8.0 {
             // iOS versions before 7.0 did not switch the width and height on device roration
-            if UIInterfaceOrientationIsLandscape(UIApplication.sharedApplication().statusBarOrientation) {
+            if UIInterfaceOrientationIsLandscape(UIApplication.shared.statusBarOrientation) {
                 let ssz = sz
                 sz = CGSize(width:ssz.height, height:ssz.width)
             }
@@ -176,15 +176,15 @@ public class SweetAlert: UIViewController {
         self.resizeAndRelayout()
     }
     
-    func closeAlert(buttonIndex:Int){
+    func closeAlert(_ buttonIndex:Int){
         if userAction !=  nil {
             let isOtherButton = buttonIndex == 0 ? true: false
             SweetAlertContext.shouldNotAnimate = true
-            userAction!(isOtherButton: isOtherButton)
+            userAction!(isOtherButton)
             SweetAlertContext.shouldNotAnimate = false
         }
         
-        UIView.animateWithDuration(0.5, delay: 0.0, options: UIViewAnimationOptions.CurveEaseOut, animations: { () -> Void in
+        UIView.animate(withDuration: 0.5, delay: 0.0, options: UIViewAnimationOptions.curveEaseOut, animations: { () -> Void in
             self.view.alpha = 0.0
             }) { (Bool) -> Void in
                 self.view.removeFromSuperview()
@@ -205,64 +205,69 @@ public class SweetAlert: UIViewController {
         self.contentView = UIView()
     }
     
-    public func showAlert(title: String) -> SweetAlert {
-        self.showAlert(title, subTitle: nil, style: .None)
+    @discardableResult
+    open func showAlert(_ title: String) -> SweetAlert {
+        self.showAlert(title, subTitle: nil, style: .none)
         return self
     }
     
-    public func showAlert(title: String, subTitle: String?, style: AlertStyle = .None) -> SweetAlert {
+    @discardableResult
+    open func showAlert(_ title: String, subTitle: String?, style: AlertStyle = .none) -> SweetAlert {
         self.showAlert(title, subTitle: subTitle, style: style, buttonTitle: "OK")
         return self
         
     }
     
-    public func showAlert(title: String, subTitle: String?, style: AlertStyle,buttonTitle: String, action: ((isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
+    @discardableResult
+    open func showAlert(_ title: String, subTitle: String?, style: AlertStyle,buttonTitle: String, action: ((_ isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
         self.showAlert(title, subTitle: subTitle, style: style, buttonTitle: buttonTitle,buttonColor: UIColor.colorFromRGB(0xAEDEF4))
         userAction = action
         return self
     }
     
-    public func showAlert(title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,action: ((isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
+    @discardableResult
+    open func showAlert(_ title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,action: ((_ isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
         self.showAlert(title, subTitle: subTitle, style: style, buttonTitle: buttonTitle,buttonColor: buttonColor,otherButtonTitle:
             nil)
         userAction = action
         return self
     }
     
-    public func showAlert(title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,otherButtonTitle:
-        String?, action: ((isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
+    @discardableResult
+    open func showAlert(_ title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,otherButtonTitle:
+        String?, action: ((_ isOtherButton: Bool) -> Void)? = nil) -> SweetAlert {
             self.showAlert(title, subTitle: subTitle, style: style, buttonTitle: buttonTitle,buttonColor: buttonColor,otherButtonTitle:
-                otherButtonTitle,otherButtonColor: UIColor.redColor())
+                otherButtonTitle,otherButtonColor: UIColor.red)
             userAction = action
             return self
     }
     
-    public func showAlert(title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,otherButtonTitle:
-        String?, otherButtonColor: UIColor?,action: ((isOtherButton: Bool) -> Void)? = nil) {
+    open func showAlert(_ title: String, subTitle: String?, style: AlertStyle,buttonTitle: String,buttonColor: UIColor,otherButtonTitle:
+        String?, otherButtonColor: UIColor?,action: ((_ isOtherButton: Bool) -> Void)? = nil) {
             userAction = action
-            let window: UIWindow = UIApplication.sharedApplication().keyWindow!
+            let window: UIWindow = UIApplication.shared.keyWindow!
             window.addSubview(view)
-            window.bringSubviewToFront(view)
+            window.bringSubview(toFront: view)
             view.frame = window.bounds
             self.setupContentView()
             self.setupTitleLabel()
             self.setupSubtitleTextView()
             
             switch style {
-            case .Success:
+            case .success:
                 self.animatedView = SuccessAnimatedView()
                 
-            case .Error:
+            case .error:
                 self.animatedView = CancelAnimatedView()
                 
-            case .Warning:
+            case .warning:
                 self.animatedView = InfoAnimatedView()
                 
-            case let .CustomImag(imageFile):
+            case let .customImag(imageFile):
                 if let image = UIImage(named: imageFile) {
                     self.imageView = UIImageView(image: image)
                 }
-            case .None:
+            case .none:
                 self.animatedView = nil
             }
             
@@ -272,19 +277,19 @@ public class SweetAlert: UIViewController {
             }
             buttons = []
             if buttonTitle.isEmpty == false {
-                let button: UIButton = UIButton(type: UIButtonType.Custom)
-                button.setTitle(buttonTitle, forState: UIControlState.Normal)
+                let button: UIButton = UIButton(type: UIButtonType.custom)
+                button.setTitle(buttonTitle, for: UIControlState())
                 button.backgroundColor = buttonColor
-                button.userInteractionEnabled = true
+                button.isUserInteractionEnabled = true
                 button.tag = 0
                 buttons.append(button)
             }
             
             if otherButtonTitle != nil && otherButtonTitle!.isEmpty == false {
-                let button: UIButton = UIButton(type: UIButtonType.Custom)
-                button.setTitle(otherButtonTitle, forState: UIControlState.Normal)
+                let button: UIButton = UIButton(type: UIButtonType.custom)
+                button.setTitle(otherButtonTitle, for: UIControlState())
                 button.backgroundColor = otherButtonColor
-                button.addTarget(self, action: #selector(SweetAlert.pressed(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+                button.addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControlEvents.touchUpInside)
                 button.tag = 1
                 buttons.append(button)
             }
@@ -304,30 +309,30 @@ public class SweetAlert: UIViewController {
     func animateAlert() {
         
         view.alpha = 0;
-        UIView.animateWithDuration(0.1, animations: { () -> Void in
+        UIView.animate(withDuration: 0.1, animations: { () -> Void in
             self.view.alpha = 1.0;
         })
         
         let previousTransform = self.contentView.transform
         self.contentView.layer.transform = CATransform3DMakeScale(0.9, 0.9, 0.0);
-        UIView.animateWithDuration(0.2, animations: { () -> Void in
+        UIView.animate(withDuration: 0.2, animations: { () -> Void in
             self.contentView.layer.transform = CATransform3DMakeScale(1.1, 1.1, 0.0);
-            }) { (Bool) -> Void in
-                UIView.animateWithDuration(0.1, animations: { () -> Void in
+            }, completion: { (Bool) -> Void in
+                UIView.animate(withDuration: 0.1, animations: { () -> Void in
                     self.contentView.layer.transform = CATransform3DMakeScale(0.9, 0.9, 0.0);
-                    }) { (Bool) -> Void in
-                        UIView.animateWithDuration(0.1, animations: { () -> Void in
+                    }, completion: { (Bool) -> Void in
+                        UIView.animate(withDuration: 0.1, animations: { () -> Void in
                             self.contentView.layer.transform = CATransform3DMakeScale(1.0, 1.0, 0.0);
                             if self.animatedView != nil {
                                 self.animatedView!.animate()
                             }
                             
-                            }) { (Bool) -> Void in
+                            }, completion: { (Bool) -> Void in
                                 
                                 self.contentView.transform = previousTransform
-                        }
-                }
-        }
+                        }) 
+                }) 
+        }) 
     }
     
     private struct SweetAlertContext {
@@ -355,7 +360,7 @@ class CancelAnimatedView: AnimatableView {
         setupLayers()
         var t = CATransform3DIdentity;
         t.m34 = 1.0 / -500.0;
-        t = CATransform3DRotate(t, CGFloat(90.0 * M_PI / 180.0), 1, 0, 0);
+        t = CATransform3DRotate(t, CGFloat(90.0 * .pi / 180.0), 1, 0, 0);
         circleLayer.transform = t
         crossPathLayer.opacity = 0.0
     }
@@ -370,28 +375,28 @@ class CancelAnimatedView: AnimatableView {
     
     private var outlineCircle: CGPath  {
         let path = UIBezierPath()
-        let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI)  //0
-        let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI)   //360
-        path.addArcWithCenter(CGPointMake(self.frame.size.width/2.0, self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
+        let startAngle: CGFloat = CGFloat((0) / 180.0 * .pi)  //0
+        let endAngle: CGFloat = CGFloat((360) / 180.0 * .pi)   //360
+        path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
         
-        return path.CGPath
+        return path.cgPath
     }
     
     private var crossPath: CGPath  {
         let path = UIBezierPath()
         let factor:CGFloat = self.frame.size.width / 5.0
-        path.moveToPoint(CGPoint(x: self.frame.size.height/2.0-factor,y: self.frame.size.height/2.0-factor))
-        path.addLineToPoint(CGPoint(x: self.frame.size.height/2.0+factor,y: self.frame.size.height/2.0+factor))
-        path.moveToPoint(CGPoint(x: self.frame.size.height/2.0+factor,y: self.frame.size.height/2.0-factor))
-        path.addLineToPoint(CGPoint(x: self.frame.size.height/2.0-factor,y: self.frame.size.height/2.0+factor))
+        path.move(to: CGPoint(x: self.frame.size.height/2.0-factor,y: self.frame.size.height/2.0-factor))
+        path.addLine(to: CGPoint(x: self.frame.size.height/2.0+factor,y: self.frame.size.height/2.0+factor))
+        path.move(to: CGPoint(x: self.frame.size.height/2.0+factor,y: self.frame.size.height/2.0-factor))
+        path.addLine(to: CGPoint(x: self.frame.size.height/2.0-factor,y: self.frame.size.height/2.0+factor))
         
-        return path.CGPath
+        return path.cgPath
     }
     
     private func setupLayers() {
         circleLayer.path = outlineCircle
-        circleLayer.fillColor = UIColor.clearColor().CGColor;
-        circleLayer.strokeColor = UIColor.colorFromRGB(0xF27474).CGColor;
+        circleLayer.fillColor = UIColor.clear.cgColor;
+        circleLayer.strokeColor = UIColor.colorFromRGB(0xF27474).cgColor;
         circleLayer.lineCap = kCALineCapRound
         circleLayer.lineWidth = 4;
         circleLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height)
@@ -399,8 +404,8 @@ class CancelAnimatedView: AnimatableView {
         self.layer.addSublayer(circleLayer)
         
         crossPathLayer.path = crossPath
-        crossPathLayer.fillColor = UIColor.clearColor().CGColor;
-        crossPathLayer.strokeColor = UIColor.colorFromRGB(0xF27474).CGColor;
+        crossPathLayer.fillColor = UIColor.clear.cgColor;
+        crossPathLayer.strokeColor = UIColor.colorFromRGB(0xF27474).cgColor;
         crossPathLayer.lineCap = kCALineCapRound
         crossPathLayer.lineWidth = 4;
         crossPathLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height)
@@ -412,20 +417,20 @@ class CancelAnimatedView: AnimatableView {
     override func animate() {
         var t = CATransform3DIdentity;
         t.m34 = 1.0 / -500.0;
-        t = CATransform3DRotate(t, CGFloat(90.0 * M_PI / 180.0), 1, 0, 0);
+        t = CATransform3DRotate(t, CGFloat(90.0 * .pi / 180.0), 1, 0, 0);
         
         var t2 = CATransform3DIdentity;
         t2.m34 = 1.0 / -500.0;
-        t2 = CATransform3DRotate(t2, CGFloat(-M_PI), 1, 0, 0);
+        t2 = CATransform3DRotate(t2, CGFloat(-Double.pi), 1, 0, 0);
         
         let animation = CABasicAnimation(keyPath: "transform")
         let time = 0.3
         animation.duration = time;
-        animation.fromValue = NSValue(CATransform3D: t)
-        animation.toValue = NSValue(CATransform3D:t2)
-        animation.removedOnCompletion = false
+        animation.fromValue = NSValue(caTransform3D: t)
+        animation.toValue = NSValue(caTransform3D:t2)
+        animation.isRemovedOnCompletion = false
         animation.fillMode = kCAFillModeForwards
-        self.circleLayer.addAnimation(animation, forKey: "transform")
+        self.circleLayer.add(animation, forKey: "transform")
         
         
         var scale = CATransform3DIdentity;
@@ -435,19 +440,19 @@ class CancelAnimatedView: AnimatableView {
         let crossAnimation = CABasicAnimation(keyPath: "transform")
         crossAnimation.duration = 0.3;
         crossAnimation.beginTime = CACurrentMediaTime() + time
-        crossAnimation.fromValue = NSValue(CATransform3D: scale)
+        crossAnimation.fromValue = NSValue(caTransform3D: scale)
         crossAnimation.timingFunction = CAMediaTimingFunction(controlPoints: 0.25, 0.8, 0.7, 2.0)
-        crossAnimation.toValue = NSValue(CATransform3D:CATransform3DIdentity)
-        self.crossPathLayer.addAnimation(crossAnimation, forKey: "scale")
+        crossAnimation.toValue = NSValue(caTransform3D:CATransform3DIdentity)
+        self.crossPathLayer.add(crossAnimation, forKey: "scale")
         
         let fadeInAnimation = CABasicAnimation(keyPath: "opacity")
         fadeInAnimation.duration = 0.3;
         fadeInAnimation.beginTime = CACurrentMediaTime() + time
         fadeInAnimation.fromValue = 0.3
         fadeInAnimation.toValue = 1.0
-        fadeInAnimation.removedOnCompletion = false
+        fadeInAnimation.isRemovedOnCompletion = false
         fadeInAnimation.fillMode = kCAFillModeForwards
-        self.crossPathLayer.addAnimation(fadeInAnimation, forKey: "opacity")
+        self.crossPathLayer.add(fadeInAnimation, forKey: "opacity")
     }
     
 }
@@ -472,23 +477,23 @@ class InfoAnimatedView: AnimatableView {
     
     var outlineCircle: CGPath  {
         let path = UIBezierPath()
-        let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI)  //0
-        let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI)   //360
-        path.addArcWithCenter(CGPointMake(self.frame.size.width/2.0, self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
+        let startAngle: CGFloat = CGFloat((0) / 180.0 * .pi)  //0
+        let endAngle: CGFloat = CGFloat((360) / 180.0 * .pi)   //360
+        path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
         
         let factor:CGFloat = self.frame.size.width / 1.5
-        path.moveToPoint(CGPoint(x: self.frame.size.width/2.0 , y: 15.0))
-        path.addLineToPoint(CGPoint(x: self.frame.size.width/2.0,y: factor))
-        path.moveToPoint(CGPoint(x: self.frame.size.width/2.0,y: factor + 10.0))
-        path.addArcWithCenter(CGPoint(x: self.frame.size.width/2.0,y: factor + 10.0), radius: 1.0, startAngle: startAngle, endAngle: endAngle, clockwise: true)
+        path.move(to: CGPoint(x: self.frame.size.width/2.0 , y: 15.0))
+        path.addLine(to: CGPoint(x: self.frame.size.width/2.0,y: factor))
+        path.move(to: CGPoint(x: self.frame.size.width/2.0,y: factor + 10.0))
+        path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0,y: factor + 10.0), radius: 1.0, startAngle: startAngle, endAngle: endAngle, clockwise: true)
         
-        return path.CGPath
+        return path.cgPath
     }
     
     func setupLayers() {
         circleLayer.path = outlineCircle
-        circleLayer.fillColor = UIColor.clearColor().CGColor;
-        circleLayer.strokeColor = UIColor.colorFromRGB(0xF8D486).CGColor;
+        circleLayer.fillColor = UIColor.clear.cgColor;
+        circleLayer.strokeColor = UIColor.colorFromRGB(0xF8D486).cgColor;
         circleLayer.lineCap = kCALineCapRound
         circleLayer.lineWidth = 4;
         circleLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height)
@@ -503,9 +508,9 @@ class InfoAnimatedView: AnimatableView {
         colorAnimation.repeatCount = HUGE
         colorAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
         colorAnimation.autoreverses = true
-        colorAnimation.fromValue = UIColor.colorFromRGB(0xF7D58B).CGColor
-        colorAnimation.toValue = UIColor.colorFromRGB(0xF2A665).CGColor
-        circleLayer.addAnimation(colorAnimation, forKey: "strokeColor")
+        colorAnimation.fromValue = UIColor.colorFromRGB(0xF7D58B).cgColor
+        colorAnimation.toValue = UIColor.colorFromRGB(0xF2A665).cgColor
+        circleLayer.add(colorAnimation, forKey: "strokeColor")
     }
 }
 
@@ -533,40 +538,40 @@ class SuccessAnimatedView: AnimatableView {
     
     var outlineCircle: CGPath {
         let path = UIBezierPath()
-        let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI)  //0
-        let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI)   //360
-        path.addArcWithCenter(CGPointMake(self.frame.size.width/2.0, self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
-        return path.CGPath
+        let startAngle: CGFloat = CGFloat((0) / 180.0 * .pi)  //0
+        let endAngle: CGFloat = CGFloat((360) / 180.0 * .pi)   //360
+        path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
+        return path.cgPath
     }
     
     var path: CGPath {
         let path = UIBezierPath()
-        let startAngle:CGFloat = CGFloat((60) / 180.0 * M_PI) //60
-        let endAngle:CGFloat = CGFloat((200) / 180.0 * M_PI)  //190
-        path.addArcWithCenter(CGPointMake(self.frame.size.width/2.0, self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
-        path.addLineToPoint(CGPoint(x: 36.0 - 10.0 ,y: 60.0 - 10.0))
-        path.addLineToPoint(CGPoint(x: 85.0 - 20.0, y: 30.0 - 20.0))
-        return path.CGPath
+        let startAngle:CGFloat = CGFloat((60) / 180.0 * .pi) //60
+        let endAngle:CGFloat = CGFloat((200) / 180.0 * .pi)  //190
+        path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
+        path.addLine(to: CGPoint(x: 36.0 - 10.0 ,y: 60.0 - 10.0))
+        path.addLine(to: CGPoint(x: 85.0 - 20.0, y: 30.0 - 20.0))
+        return path.cgPath
     }
     
     
     func setupLayers() {
         
-        outlineLayer.position = CGPointMake(0,
-            0);
+        outlineLayer.position = CGPoint(x: 0,
+            y: 0);
         outlineLayer.path = outlineCircle
-        outlineLayer.fillColor = UIColor.clearColor().CGColor;
-        outlineLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).CGColor;
+        outlineLayer.fillColor = UIColor.clear.cgColor;
+        outlineLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).cgColor;
         outlineLayer.lineCap = kCALineCapRound
         outlineLayer.lineWidth = 4;
         outlineLayer.opacity = 0.1
         self.layer.addSublayer(outlineLayer)
         
-        circleLayer.position = CGPointMake(0,
-            0);
+        circleLayer.position = CGPoint(x: 0,
+            y: 0);
         circleLayer.path = path
-        circleLayer.fillColor = UIColor.clearColor().CGColor;
-        circleLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).CGColor;
+        circleLayer.fillColor = UIColor.clear.cgColor;
+        circleLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).cgColor;
         circleLayer.lineCap = kCALineCapRound
         circleLayer.lineWidth = 4;
         circleLayer.actions = [
@@ -595,14 +600,14 @@ class SuccessAnimatedView: AnimatableView {
         strokeStart.timingFunction = timing
         circleLayer.strokeStart = 0.68
         circleLayer.strokeEnd = 0.93
-        self.circleLayer.addAnimation(strokeEnd, forKey: "strokeEnd")
-        self.circleLayer.addAnimation(strokeStart, forKey: "strokeStart")
+        self.circleLayer.add(strokeEnd, forKey: "strokeEnd")
+        self.circleLayer.add(strokeStart, forKey: "strokeStart")
     }
     
 }
 
 extension UIColor {
-    class func colorFromRGB(rgbValue: UInt) -> UIColor {
+    class func colorFromRGB(_ rgbValue: UInt) -> UIColor {
         return UIColor(
             red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
             green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0,
diff --git a/OpenStack Summit/OpenStack Summit/TableViewController.swift b/OpenStack Summit/OpenStack Summit/TableViewController.swift
index 7592b1ae..8edc08e7 100644
--- a/OpenStack Summit/OpenStack Summit/TableViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TableViewController.swift	
@@ -14,21 +14,21 @@ class TableViewController: UITableViewController, NSFetchedResultsControllerDele
     
     // MARK: - Properties
     
-    final var fetchedResultsController: NSFetchedResultsController!
+    final var fetchedResultsController: NSFetchedResultsController<NSManagedObject>!
     
     // MARK: - UITableViewDataSource
     
-    final override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    final override func numberOfSections(in tableView: UITableView) -> Int {
         
         return self.fetchedResultsController?.sections?.count ?? 0
     }
     
-    final override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    final override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.fetchedResultsController.sections?[section].numberOfObjects ?? 0
     }
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         guard let sections = self.fetchedResultsController.sections
             else { return nil }
@@ -37,66 +37,66 @@ class TableViewController: UITableViewController, NSFetchedResultsControllerDele
     }
     
     #if os(iOS)
-    override func tableView(tableView: UITableView, sectionForSectionIndexTitle title: String, atIndex index: Int) -> Int {
+    override func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int {
         
-        return self.fetchedResultsController.sectionForSectionIndexTitle(title, atIndex: index)
+        return self.fetchedResultsController.section(forSectionIndexTitle: title, at: index)
     }
     #endif
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    final func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    final func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.beginUpdates()
     }
     
-    final func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    final func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.endUpdates()
     }
     
-    final func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    final func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         switch type {
-        case .Insert:
+        case .insert:
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
-        case .Delete:
+        case .delete:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
-        case .Update:
+        case .update:
             if let updateIndexPath = indexPath,
-                let _ = self.tableView.cellForRowAtIndexPath(updateIndexPath) {
+                let _ = self.tableView.cellForRow(at: updateIndexPath) {
                 
-                self.tableView.reloadRowsAtIndexPaths([updateIndexPath], withRowAnimation: .None)
+                self.tableView.reloadRows(at: [updateIndexPath], with: .none)
             }
-        case .Move:
+        case .move:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
         }
     }
     
-    final func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
+    final func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
         
         switch type {
             
-        case .Insert:
+        case .insert:
             
-            self.tableView.insertSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+            self.tableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
             
-        case .Delete:
+        case .delete:
             
-            self.tableView.deleteSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+            self.tableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
             
         default: break
         }
diff --git a/OpenStack Summit/OpenStack Summit/TeamDetailViewController.swift b/OpenStack Summit/OpenStack Summit/TeamDetailViewController.swift
index 7f3eb734..ef2613ac 100644
--- a/OpenStack Summit/OpenStack Summit/TeamDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TeamDetailViewController.swift	
@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 import CoreData
 import CoreSummit
-import SwiftFoundation
+import Foundation
 import JGProgressHUD
 
 final class TeamDetailViewController: UITableViewController, NSFetchedResultsControllerDelegate, UITextFieldDelegate, MessageEnabledViewController, ActivityViewController {
@@ -33,17 +33,17 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     
     private var data = [(Section, [Cell])]()
     
-    private static let dateFormatter: NSDateFormatter = {
+    private static let dateFormatter: DateFormatter = {
         
-        let formatter = NSDateFormatter()
+        let formatter = DateFormatter()
         
-        formatter.dateStyle = .MediumStyle
-        formatter.timeStyle = .ShortStyle
+        formatter.dateStyle = .medium
+        formatter.timeStyle = .short
         
         return formatter
     }()
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
@@ -51,7 +51,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         super.viewDidLoad()
         
         // setup table view
-        tableView.registerNib(R.nib.peopleTableViewCell)
+        tableView.register(R.nib.peopleTableViewCell)
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 44
         
@@ -67,7 +67,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         entityController.enabled = true
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         // fetch from server
@@ -79,11 +79,11 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         Store.shared.fetch(team: team) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -91,11 +91,11 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error as NSError)
                     
-                case .Value: break // entity controller will update
+                case .value: break // entity controller will update
                 }
             }
         }
@@ -103,9 +103,9 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     
     // MARK: - Private Methods
     
-    private func configureView(team: Team) {
+    private func configureView(_ team: Team) {
         
-        guard let memberID = Store.shared.authenticatedMember?.identifier
+        guard let memberID = Store.shared.authenticatedMember?.id
             else { fatalError("Not logged in") }
         
         let userPermission = team.permission(for: memberID)
@@ -116,7 +116,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         
         self.nameTextField.text = team.name
         
-        self.nameTextField.userInteractionEnabled = canEdit
+        self.nameTextField.isUserInteractionEnabled = canEdit
         
         self.navigationItem.rightBarButtonItem = canEdit ? addMemberBarButtonItem : nil
         
@@ -140,7 +140,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         
         // members
         let members = team.members
-            .sort()
+            .sorted()
             .filter { $0.member.identifier != team.owner.identifier }
             .map { Cell.member($0) }
         
@@ -150,7 +150,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         }
         
         let invitations = team.invitations
-            .sort()
+            .sorted()
             .filter { $0.invitee.identifier != memberID }
             .map { Cell.invitation($0) }
         
@@ -167,7 +167,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         self.tableView.reloadData()
     }
     
-    private subscript (indexPath: NSIndexPath) -> Cell {
+    private subscript (indexPath: IndexPath) -> Cell {
         
         let section = self.data[indexPath.section]
         
@@ -179,45 +179,45 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     private func wasDeleted() {
         
         /** Presents an alert controller with the specified completion handlers.  */
-        func showAlert(localizedText: String, okHandler: (() -> ())? = nil, retryHandler: (()-> ())? = nil) {
+        func showAlert(_ localizedText: String, okHandler: (() -> ())? = nil, retryHandler: (()-> ())? = nil) {
             
             let alert = UIAlertController(title: nil,
                                           message: localizedText,
-                                          preferredStyle: UIAlertControllerStyle.Alert)
+                                          preferredStyle: UIAlertControllerStyle.alert)
             
-            alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: UIAlertActionStyle.Default, handler: { (UIAlertAction) -> Void in
+            alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: UIAlertActionStyle.default, handler: { (UIAlertAction) -> Void in
                 
                 okHandler?()
                 
-                alert.dismissViewControllerAnimated(true, completion: nil)
+                alert.dismiss(animated: true, completion: nil)
             }))
             
             // optionally add retry button
             
             if retryHandler != nil {
                 
-                alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: "Retry"), style: UIAlertActionStyle.Default, handler: { (UIAlertAction) -> Void in
+                alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: "Retry"), style: UIAlertActionStyle.default, handler: { (UIAlertAction) -> Void in
                     
                     retryHandler!()
                     
-                    alert.dismissViewControllerAnimated(true, completion: nil)
+                    alert.dismiss(animated: true, completion: nil)
                 }))
             }
             
-            self.presentViewController(alert, animated: true, completion: nil)
+            self.present(alert, animated: true, completion: nil)
         }
         
-        showAlert("Team was deleted", okHandler: { self.navigationController?.popToRootViewControllerAnimated(true) })
+        showAlert("Team was deleted", okHandler: { self.navigationController?.popToRootViewController(animated: true) })
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return self.data.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let section = self.data[section]
         
@@ -226,7 +226,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         return rows.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let cellData = self[indexPath]
         
@@ -234,75 +234,75 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
         case let .description(description):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamDetailTextFieldTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamDetailTextFieldTableViewCell, for: indexPath)!
             
             cell.textField.placeholder = "Description"
             
             cell.textField.text = description
             
-            cell.userInteractionEnabled = canEdit
+            cell.isUserInteractionEnabled = canEdit
             
             return cell
             
         case let .created(created):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamDetailLabelTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamDetailLabelTableViewCell, for: indexPath)!
             
             cell.textLabel!.text = "Created"
             
-            cell.detailTextLabel!.text = TeamDetailViewController.dateFormatter.stringFromDate(created.toFoundation())
+            cell.detailTextLabel!.text = TeamDetailViewController.dateFormatter.string(from: created)
             
             return cell
             
         case let .updated(updated):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamDetailLabelTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamDetailLabelTableViewCell, for: indexPath)!
             
             cell.textLabel!.text = "Last Modified"
             
-            cell.detailTextLabel!.text = TeamDetailViewController.dateFormatter.stringFromDate(updated.toFoundation())
+            cell.detailTextLabel!.text = TeamDetailViewController.dateFormatter.string(from: updated)
             
             return cell
             
         case let .member(teamMember):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell, for: indexPath)!
             
             cell.name = teamMember.member.name
-            cell.pictureURL = teamMember.member.pictureURL
-            cell.title = teamMember.permission.rawValue.lowercaseString.capitalizedString
+            cell.picture = teamMember.member.picture
+            cell.title = teamMember.permission.rawValue.lowercased().capitalized
             
             return cell
             
         case let .owner(member):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell, for: indexPath)!
             
             cell.name = member.name
-            cell.pictureURL = member.pictureURL
-            cell.title = member.title ?? member.twitter ?? member.irc
+            cell.picture = member.picture
+            cell.title = member.title ?? member.twitter ?? member.irc ?? ""
             
             return cell
             
         case let .invitation(invitation):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.peopleTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.peopleTableViewCell, for: indexPath)!
             
             cell.name = invitation.invitee.name
-            cell.pictureURL = invitation.invitee.pictureURL
-            cell.title = invitation.permission.rawValue.lowercaseString.capitalizedString
+            cell.picture = invitation.invitee.picture
+            cell.title = invitation.permission.rawValue.lowercased().capitalized
             
             return cell
             
         case .delete:
             
-            return tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamDetailDeleteTableViewCell, forIndexPath: indexPath)!
+            return tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamDetailDeleteTableViewCell, for: indexPath)!
         }
     }
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         let section = self.data[section].0
         
@@ -320,9 +320,9 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         }
     }
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         let cellData = self[indexPath]
         
@@ -334,7 +334,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
             memberProfileDetailVC.profile = .member(teamMember.member.identifier)
             
-            showViewController(memberProfileDetailVC, sender: self)
+            self.show(memberProfileDetailVC, sender: self)
             
         case let .owner(member):
             
@@ -342,7 +342,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
             memberProfileDetailVC.profile = .member(member.identifier)
             
-            showViewController(memberProfileDetailVC, sender: self)
+            self.show(memberProfileDetailVC, sender: self)
             
         case let .invitation(invitation):
             
@@ -350,7 +350,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
             memberProfileDetailVC.profile = .member(invitation.invitee.identifier)
             
-            showViewController(memberProfileDetailVC, sender: self)
+            self.show(memberProfileDetailVC, sender: self)
             
         case .delete:
             
@@ -358,7 +358,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
             Store.shared.delete(team: team) { (response) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                OperationQueue.main.addOperation { [weak self] in
                     
                     guard let controller = self else { return }
                     
@@ -375,7 +375,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         }
     }
     
-    override func tableView(tableView: UITableView, editingStyleForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCellEditingStyle {
+    override func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle {
         
         let cellData = self[indexPath]
         
@@ -383,19 +383,19 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
         case .member:
             
-            return canEdit ? .Delete : .None
+            return canEdit ? .delete : .none
             
         default:
             
-            return .None
+            return .none
         }
     }
     
-    override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
         
         let cellData = self[indexPath]
         
-        if editingStyle == .Delete {
+        if editingStyle == .delete {
             
             switch cellData {
                 
@@ -405,7 +405,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
                 
                 Store.shared.remove(member: teamMember.identifier, from: team) { (response) in
                     
-                    NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                    OperationQueue.main.addOperation { [weak self] in
                         
                         guard let controller = self else { return }
                         
@@ -426,7 +426,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     
     // MARK: - UITextFieldDelegate
     
-    func textFieldShouldReturn(textField: UITextField) -> Bool {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         
         if textField === self.nameTextField {
             
@@ -438,7 +438,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
             
             Store.shared.update(team: team, name: newName, description: description) { (response) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                OperationQueue.main.addOperation { [weak self] in
                     
                     guard let controller = self else { return }
                     
@@ -456,8 +456,8 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
         }
         
         // table view cell text field
-        let pointInTable = textField.convertPoint(textField.bounds.origin, toView: self.tableView)
-        if let indexPath = self.tableView.indexPathForRowAtPoint(pointInTable) {
+        let pointInTable = textField.convert(textField.bounds.origin, to: self.tableView)
+        if let indexPath = self.tableView.indexPathForRow(at: pointInTable) {
             
             let cellData = self[indexPath]
             
@@ -473,7 +473,7 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
                 
                 Store.shared.update(team: team, name: name, description: newDescription) { (response) in
                     
-                    NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                    OperationQueue.main.addOperation { [weak self] in
                         
                         guard let controller = self else { return }
                         
@@ -497,13 +497,13 @@ final class TeamDetailViewController: UITableViewController, NSFetchedResultsCon
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case R.segue.teamDetailViewController.addMember.identifier:
             
-            let navigationController = segue.destinationViewController as! UINavigationController
+            let navigationController = segue.destination as! UINavigationController
             
             let addTeamMemberViewController = navigationController.topViewController as! AddTeamMemberViewController
             
@@ -541,5 +541,5 @@ private extension TeamDetailViewController {
 
 final class TeamDetailTextFieldTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var textField: UITextField!
+    @IBOutlet private(set) weak var textField: UITextField!
 }
diff --git a/OpenStack Summit/OpenStack Summit/TeamInvitationsViewController.swift b/OpenStack Summit/OpenStack Summit/TeamInvitationsViewController.swift
index 9fe1114c..13e7b36a 100644
--- a/OpenStack Summit/OpenStack Summit/TeamInvitationsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TeamInvitationsViewController.swift	
@@ -9,7 +9,7 @@
 import Foundation
 import CoreData
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import JGProgressHUD
 
@@ -21,15 +21,15 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
     
     var completion: ((TeamInvitationsViewController) -> ())?
     
-    lazy var pageController = PageController<Invitation>(fetch: { Store.shared.invitations($0.0, perPage: $0.1, filter: .pending, completion: $0.2) })
+    lazy var pageController: PageController<Invitation> = PageController(fetch: { Store.shared.invitations($0.0, perPage: $0.1, filter: .pending, completion: $0.2) })
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
-    private lazy var dateFormatter: NSDateFormatter = {
+    private lazy var dateFormatter: DateFormatter = {
         
-        let formatter = NSDateFormatter()
-        formatter.dateStyle = .MediumStyle
-        formatter.timeStyle = .ShortStyle
+        let formatter = DateFormatter()
+        formatter.dateStyle = .medium
+        formatter.timeStyle = .short
         return formatter
     }()
     
@@ -40,7 +40,7 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
         
         tableView.estimatedRowHeight = 98
         tableView.rowHeight = UITableViewAutomaticDimension
-        tableView.registerNib(R.nib.loadingTableViewCell)
+        tableView.register(R.nib.loadingTableViewCell)
         
         pageController.callback.reloadData = { [weak self] in self?.tableView.reloadData() }
         
@@ -53,34 +53,34 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         pageController.refresh()
     }
         
-    @IBAction func cancel(sender: AnyObject? = nil) {
+    @IBAction func cancel(_ sender: AnyObject? = nil) {
         
         self.completion?(self)
     }
     
     // MARK: - Private Methods
     
-    private func configure(cell cell: TeamInvitationTableViewCell, with invitation: Invitation) {
+    private func configure(cell: TeamInvitationTableViewCell, with invitation: Invitation) {
         
         cell.teamLabel.text = invitation.team.name
         
         cell.inviterLabel.text = "Invited by: " + invitation.inviter.name
         
-        cell.dateLabel.text = dateFormatter.stringFromDate(invitation.created.toFoundation())
+        cell.dateLabel.text = dateFormatter.string(from: invitation.created)
     }
     
-    private func accept(invitation: Invitation) {
+    private func accept(_ invitation: Invitation) {
         
         showActivityIndicator()
         
         Store.shared.accept(invitation: invitation.identifier) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -94,7 +94,7 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
                     
                     Store.shared.fetch(team: invitation.team.identifier) { [weak self] (response) in
                         
-                        NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                        OperationQueue.main.addOperation { [weak self] in
                             
                             guard let controller = self else { return }
                             
@@ -102,11 +102,11 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
                             
                             switch response {
                                 
-                            case let .Error(error):
+                            case let .error(error):
                                 
                                 controller.showErrorMessage(error)
                                 
-                            case .Value:
+                            case .value:
                                 
                                 controller.refresh()
                             }
@@ -117,13 +117,13 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
         }
     }
     
-    private func decline(invitation: Invitation) {
+    private func decline(_ invitation: Invitation) {
         
         showActivityIndicator()
         
         Store.shared.decline(invitation: invitation.identifier) { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -143,17 +143,17 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return pageController.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = pageController.items[indexPath.row]
         
@@ -161,7 +161,7 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
             
         case let .item(item):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamInvitationCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamInvitationCell)!
             
             configure(cell: cell, with: item)
             
@@ -171,9 +171,9 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
             
             pageController.loadNextPage()
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.loadingTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.loadingTableViewCell, for: indexPath)!
             
-            cell.activityIndicator.hidden = false
+            cell.activityIndicator.isHidden = false
             
             cell.activityIndicator.startAnimating()
             
@@ -183,7 +183,7 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, editActionsForRowAtIndexPath indexPath: NSIndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
         
         let data = pageController.items[indexPath.row]
         
@@ -191,9 +191,9 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
             
         case let .item(item):
             
-            let accept = UITableViewRowAction(style: .Normal, title: "Accept") { [weak self] (_,_) in self?.accept(item) }
+            let accept = UITableViewRowAction(style: .normal, title: "Accept") { [weak self] (_,_) in self?.accept(item) }
             
-            let decline = UITableViewRowAction(style: .Destructive, title: "Decline") { [weak self] (_,_) in self?.decline(item)  }
+            let decline = UITableViewRowAction(style: .destructive, title: "Decline") { [weak self] (_,_) in self?.decline(item)  }
             
             return [decline, accept]
             
@@ -208,9 +208,9 @@ final class TeamInvitationsViewController: UITableViewController, PagingTableVie
 
 final class TeamInvitationTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var teamLabel: UILabel!
+    @IBOutlet private(set) weak var teamLabel: UILabel!
     
-    @IBOutlet weak var inviterLabel: UILabel!
+    @IBOutlet private(set) weak var inviterLabel: UILabel!
     
-    @IBOutlet weak var dateLabel: UILabel!
+    @IBOutlet private(set) weak var dateLabel: UILabel!
 }
diff --git a/OpenStack Summit/OpenStack Summit/TeamMessagesViewController.swift b/OpenStack Summit/OpenStack Summit/TeamMessagesViewController.swift
index e7c64c86..7564fd21 100644
--- a/OpenStack Summit/OpenStack Summit/TeamMessagesViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TeamMessagesViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 import CoreData
 import CoreSummit
+import Predicate
 import Haneke
 import SlackTextViewController
 
@@ -19,16 +20,16 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
     
     var team: Identifier! {
         
-        didSet { if isViewLoaded() { configureView() } }
+        didSet { if isViewLoaded { configureView() } }
     }
     
     // MARK: - Properties
     
     private(set) var sending = false
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<TeamMessageManagedObject>!
     
-    private lazy var placeholderMemberImage = R.image.genericUserAvatar()!
+    private lazy var placeholderMemberImage = #imageLiteral(resourceName: "generic-user-avatar")
     
     // MARK: - Loading
     
@@ -43,25 +44,25 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         registerNotifications()
         
         self.shouldScrollToBottomAfterKeyboardShows = false
-        self.inverted = true
+        self.isInverted = true
         self.textInputbar.autoHideRightButton = true
         self.textInputbar.maxCharCount = 256
-        self.textInputbar.counterStyle = .Split
-        self.textInputbar.counterPosition = .Top
+        self.textInputbar.counterStyle = .split
+        self.textInputbar.counterPosition = .top
         self.textView.placeholder = "Message"
-        self.tableView!.separatorStyle = .None
-        self.tableView!.registerClass(MessageTableViewCell.classForCoder(), forCellReuseIdentifier: MessengerCellIdentifier)
+        self.tableView!.separatorStyle = .none
+        self.tableView!.register(MessageTableViewCell.classForCoder(), forCellReuseIdentifier: MessengerCellIdentifier)
         
         configureView()
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         PushNotificationManager.shared.teamMessageAlertFilter = team
     }
     
-    override func viewDidDisappear(animated: Bool) {
+    override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
         PushNotificationManager.shared.teamMessageAlertFilter = nil
@@ -71,20 +72,23 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
     
     private func configureView() {
         
-        guard let teamManagedObject = try! TeamManagedObject.find(team, context: Store.shared.managedObjectContext)
+        guard let teamID = self.team
+            else { fatalError("View controller not configured") }
+        
+        guard let teamManagedObject = try! TeamManagedObject.find(teamID, context: Store.shared.managedObjectContext)
             else { fatalError("Team not in cache") }
         
         self.title = teamManagedObject.name
         
-        let predicate = NSPredicate(format: "team == %@", teamManagedObject)
+        //let predicate = NSPredicate(format: "team == %@", teamManagedObject)
+        let predicate: Predicate = #keyPath(TeamMessageManagedObject.team.id) == teamID
         
-        let sortDescriptors = [NSSortDescriptor(key: "id", ascending: false)]
+        let sortDescriptors = [NSSortDescriptor(key: #keyPath(TeamMessageManagedObject.id), ascending: false)]
         
         self.fetchedResultsController = NSFetchedResultsController(TeamMessage.self,
                                                                    delegate: self,
                                                                    predicate: predicate,
                                                                    sortDescriptors: sortDescriptors,
-                                                                   sectionNameKeyPath: nil,
                                                                    context: Store.shared.managedObjectContext)
         
         try! self.fetchedResultsController!.performFetch()
@@ -92,20 +96,20 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         self.tableView!.reloadData()
     }
     
-    private subscript (indexPath: NSIndexPath) -> TeamMessage {
+    private subscript (indexPath: IndexPath) -> TeamMessage {
         
-        let managedObject = self.fetchedResultsController!.objectAtIndexPath(indexPath) as! TeamMessageManagedObject
+        let managedObject = self.fetchedResultsController!.object(at: indexPath)
         
         return TeamMessage(managedObject: managedObject)
     }
     
-    private subscript (data indexPath: NSIndexPath) -> (name: String, body: String, image: NSURL?) {
+    private subscript (data indexPath: IndexPath) -> (name: String, body: String, image: URL?) {
         
         let message = self[indexPath]
         
         let name: String
         
-        let imageURL: NSURL?
+        let imageURL: URL?
         
         switch message.from {
             
@@ -119,15 +123,15 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
             
             name = member.name
             
-            imageURL = NSURL(string: member.pictureURL.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil))
+            imageURL = member.picture
         }
         
         return (name, message.body, imageURL)
     }
     
-    private func configure(cell cell: MessageTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: MessageTableViewCell, at indexPath: IndexPath) {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath)
+        let managedObject = self.fetchedResultsController.object(at: indexPath)
         
         let messageData = self[data: indexPath]
         
@@ -141,14 +145,14 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         
         if let url = messageData.image {
             
-            Shared.imageCache.fetch(URL: url, failure: nil, success: { [weak self] (image) in
+            let _ = Shared.imageCache.fetch(URL: url, failure: nil, success: { [weak self] (image) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                OperationQueue.main.addOperation { [weak self] in
                     
                     guard let controller = self else { return }
                     
                     // cell hasnt changed
-                    guard indexPath == controller.fetchedResultsController.indexPathForObject(managedObject)
+                    guard indexPath == controller.fetchedResultsController.indexPath(forObject: managedObject)
                         && controller[data: indexPath].image == url
                         else { return }
                     
@@ -162,7 +166,7 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         cell.transform = self.tableView!.transform
     }
     
-    @objc private func textInputbarDidMove(notification: NSNotification) {
+    @objc private func textInputbarDidMove(_ notification: Foundation.Notification) {
         
         
     }
@@ -171,32 +175,32 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
     
     private func registerNotifications() {
         
-        NSNotificationCenter.defaultCenter().addObserver(self.tableView!, selector: #selector(UITableView.reloadData), name: UIContentSizeCategoryDidChangeNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(textInputbarDidMove), name: SLKTextInputbarDidMoveNotification, object: nil)
+        NotificationCenter.default.addObserver(self.tableView!, selector: #selector(UITableView.reloadData), name: NSNotification.Name.UIContentSizeCategoryDidChange, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(textInputbarDidMove), name: NSNotification.Name.SLKTextInputbarDidMove, object: nil)
     }
     
     private func stopNotifications() {
         
-        NSNotificationCenter.defaultCenter().removeObserver(self)
-        NSNotificationCenter.defaultCenter().removeObserver(self.tableView!)
+        NotificationCenter.default.removeObserver(self)
+        NotificationCenter.default.removeObserver(self.tableView!)
     }
     
     // MARK: - Overriden Methods
     
-    override class func tableViewStyleForCoder(decoder: NSCoder) -> UITableViewStyle {
+    override class func tableViewStyle(for decoder: NSCoder) -> UITableViewStyle {
         
-        return .Plain
+        return .plain
     }
     
     override func ignoreTextInputbarAdjustment() -> Bool {
         return super.ignoreTextInputbarAdjustment()
     }
     
-    override func forceTextInputbarAdjustmentForResponder(responder: UIResponder?) -> Bool {
+    override func forceTextInputbarAdjustment(for responder: UIResponder?) -> Bool {
         
         guard let _ = responder as? UIAlertController else {
             // On iOS 9, returning YES helps keeping the input view visible when the keyboard if presented from another app when using multi-tasking on iPad.
-            return UIDevice.currentDevice().userInterfaceIdiom == .Pad
+            return UIDevice.current.userInterfaceIdiom == .pad
         }
         return true
     }
@@ -206,13 +210,13 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         return sending == false
     }
     
-    override func didPressRightButton(sender: AnyObject?) {
+    override func didPressRightButton(_ sender: Any?) {
         
         self.sending = true
         
         Store.shared.send(self.textView.text, to: team) { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
@@ -220,11 +224,13 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error)
                     
-                case .Value: break
+                case .value:
+                    
+                    break
                 }
             }
         }
@@ -234,19 +240,19 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.fetchedResultsController?.fetchedObjects?.count ?? 0
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(MessengerCellIdentifier, forIndexPath: indexPath) as! MessageTableViewCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: MessengerCellIdentifier, for: indexPath) as! MessageTableViewCell
         
         configure(cell: cell, at: indexPath)
         
@@ -258,27 +264,27 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
         return cell
     }
     
-    override func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         
         let messageData = self[data: indexPath]
         
         let paragraphStyle = NSMutableParagraphStyle()
-        paragraphStyle.lineBreakMode = .ByWordWrapping
-        paragraphStyle.alignment = .Left
+        paragraphStyle.lineBreakMode = .byWordWrapping
+        paragraphStyle.alignment = .left
         
         let pointSize = MessageTableViewCell.defaultFontSize()
         
         let attributes = [
-            NSFontAttributeName : UIFont.systemFontOfSize(pointSize),
+            NSFontAttributeName : UIFont.systemFont(ofSize: pointSize),
             NSParagraphStyleAttributeName : paragraphStyle
         ]
         
         var width = tableView.frame.width-kMessageTableViewCellAvatarHeight
         width -= 25.0
         
-        let titleBounds = (messageData.name as NSString).boundingRectWithSize(CGSize(width: width, height: CGFloat.max), options: .UsesLineFragmentOrigin, attributes: attributes, context: nil)
+        let titleBounds = (messageData.name as NSString).boundingRect(with: CGSize(width: width, height: CGFloat.greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil)
         
-        let bodyBounds = messageData.body.boundingRectWithSize(CGSize(width: width, height: CGFloat.max), options: .UsesLineFragmentOrigin, attributes: attributes, context: nil)
+        let bodyBounds = messageData.body.boundingRect(with: CGSize(width: width, height: CGFloat.greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil)
         
         if messageData.body.characters.count == 0 {
             return 0
@@ -297,43 +303,43 @@ final class TeamMessagesViewController: SLKTextViewController, NSFetchedResultsC
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView!.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView!.endUpdates()
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         switch type {
-        case .Insert:
+        case .insert:
             
             if let insertIndexPath = newIndexPath {
-                self.tableView!.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView!.insertRows(at: [insertIndexPath], with: .fade)
             }
-        case .Delete:
+        case .delete:
             
             if let deleteIndexPath = indexPath {
-                self.tableView!.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView!.deleteRows(at: [deleteIndexPath], with: .fade)
             }
-        case .Update:
+        case .update:
             if let updateIndexPath = indexPath,
-                let cell = self.tableView!.cellForRowAtIndexPath(updateIndexPath) as! MessageTableViewCell? {
+                let cell = self.tableView!.cellForRow(at: updateIndexPath) as! MessageTableViewCell? {
                 
                 self.configure(cell: cell, at: updateIndexPath)
             }
-        case .Move:
+        case .move:
             
             if let deleteIndexPath = indexPath {
-                self.tableView!.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView!.deleteRows(at: [deleteIndexPath], with: .fade)
             }
             
             if let insertIndexPath = newIndexPath {
-                self.tableView!.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView!.insertRows(at: [insertIndexPath], with: .fade)
             }
         }
     }
diff --git a/OpenStack Summit/OpenStack Summit/TeamsViewController.swift b/OpenStack Summit/OpenStack Summit/TeamsViewController.swift
index 85062d1c..77cfa649 100644
--- a/OpenStack Summit/OpenStack Summit/TeamsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TeamsViewController.swift	
@@ -17,11 +17,11 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
     
     // MARK: - Properties
     
-    lazy var pageController = PageController<Team>(fetch: { Store.shared.teams(page: $0.0, perPage: $0.1, completion: $0.2) })
+    lazy var pageController: PageController<Team> = PageController(fetch: { Store.shared.teams(page: $0.0, perPage: $0.1, completion: $0.2) })
     
     lazy var contextMenu: ContextMenu = {
         
-        let createTeam = ContextMenu.Action(activityType: "\(self.dynamicType).CreateTeam", image: nil, title: "Create Team", handler: .modal({ [weak self] (didComplete) -> UIViewController in
+        let createTeam = ContextMenu.Action(activityType: "\(type(of: self)).CreateTeam", image: nil, title: "Create Team", handler: .modal({ [weak self] (didComplete) -> UIViewController in
             
             let createTeamViewController = R.storyboard.teams.createTeamViewController()!
             
@@ -32,12 +32,12 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
             
             let navigationController = UINavigationController(rootViewController: createTeamViewController)
             
-            navigationController.modalPresentationStyle = .Popover
+            navigationController.modalPresentationStyle = .popover
             
             return navigationController
             }))
         
-        let viewInvitations = ContextMenu.Action(activityType: "\(self.dynamicType).TeamInvitations", image: nil, title: "View Invitations", handler: .modal({ [weak self] (didComplete) -> UIViewController in
+        let viewInvitations = ContextMenu.Action(activityType: "\(type(of: self)).TeamInvitations", image: nil, title: "View Invitations", handler: .modal({ [weak self] (didComplete) -> UIViewController in
             
             let teamInvitationsViewController = R.storyboard.teams.teamInvitationsViewController()!
             
@@ -45,7 +45,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
             
             let navigationController = UINavigationController(rootViewController: teamInvitationsViewController)
             
-            navigationController.modalPresentationStyle = .PageSheet
+            navigationController.modalPresentationStyle = .pageSheet
             
             return navigationController
             }))
@@ -55,7 +55,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
     
     private var unreadTeamMessagesObserver: Int?
     
-    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .Dark)
+    lazy var progressHUD: JGProgressHUD = JGProgressHUD(style: .dark)
     
     // MARK: - Loading
     
@@ -74,7 +74,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
         
         tableView.estimatedRowHeight = 44
         tableView.rowHeight = UITableViewAutomaticDimension
-        tableView.registerNib(R.nib.loadingTableViewCell)
+        tableView.register(R.nib.loadingTableViewCell)
         
         pageController.callback.reloadData = { [weak self] in self?.tableView.reloadData() }
         
@@ -93,12 +93,12 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        self.view.bringSubviewToFront(progressHUD)
+        self.view.bringSubview(toFront: progressHUD)
     }
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         pageController.refresh()
     }
@@ -111,7 +111,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
     }
     
     @inline(__always)
-    private func configure(cell cell: TeamCell, with team: Team) {
+    private func configure(cell: TeamCell, with team: Team) {
         
         cell.nameLabel.text = team.name
         
@@ -119,30 +119,30 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
         
         let unreadCount = try! PushNotificationManager.shared.unreadMessages(in: team.identifier, context: Store.shared.managedObjectContext)
         
-        cell.unreadView.hidden = unreadCount == 0
+        cell.unreadView.isHidden = unreadCount == 0
         cell.unreadLabel.text = "\(unreadCount)"
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         
         return IndicatorInfo(title: "Teams")
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return pageController.items.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = pageController.items[indexPath.row]
         
@@ -150,7 +150,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
             
         case let .item(item):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.teamCell)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.teamCell)!
             
             configure(cell: cell, with: item)
             
@@ -160,9 +160,9 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
             
             pageController.loadNextPage()
             
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.loadingTableViewCell, forIndexPath: indexPath)!
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.loadingTableViewCell, for: indexPath)!
             
-            cell.activityIndicator.hidden = false
+            cell.activityIndicator.isHidden = false
             
             cell.activityIndicator.startAnimating()
             
@@ -172,7 +172,7 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -181,16 +181,16 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
             guard case let .item(selectedItem) = self.pageController.items[tableView.indexPathForSelectedRow!.row]
                 else { fatalError("Invalid row") }
             
-            let viewController = segue.destinationViewController as! TeamMessagesViewController
+            let viewController = segue.destination as! TeamMessagesViewController
             
             viewController.team = selectedItem.identifier
             
         case R.segue.teamsViewController.showTeamDetail.identifier:
             
-            guard case let .item(selectedItem) = self.pageController.items[tableView.indexPathForCell(sender as! UITableViewCell)!.row]
+            guard case let .item(selectedItem) = self.pageController.items[tableView.indexPath(for: sender as! UITableViewCell)!.row]
                 else { fatalError("Invalid row") }
             
-            let viewController = segue.destinationViewController as! TeamDetailViewController
+            let viewController = segue.destination as! TeamDetailViewController
             
             viewController.team = selectedItem.identifier
             
@@ -203,11 +203,11 @@ final class TeamsViewController: UITableViewController, PagingTableViewControlle
 
 final class TeamCell: UITableViewCell {
     
-    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet private(set) weak var nameLabel: UILabel!
     
-    @IBOutlet weak var descriptionLabel: UILabel!
+    @IBOutlet private(set) weak var descriptionLabel: UILabel!
     
-    @IBOutlet weak var unreadView: UIView!
+    @IBOutlet private(set) weak var unreadView: UIView!
     
-    @IBOutlet weak var unreadLabel: UILabel!
+    @IBOutlet private(set) weak var unreadLabel: UILabel!
 }
diff --git a/OpenStack Summit/OpenStack Summit/TextViewController.swift b/OpenStack Summit/OpenStack Summit/TextViewController.swift
index ecaec6fa..3e839a18 100644
--- a/OpenStack Summit/OpenStack Summit/TextViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TextViewController.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import UIKit
 import CoreSummit
 
@@ -15,11 +15,11 @@ protocol TextViewController: class, UITextViewDelegate, SummitActivityHandlingVi
 
 extension TextViewController {
     
-    func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
+    func textView(_ textView: UITextView, shouldInteractWithURL URL: Foundation.URL, inRange characterRange: NSRange) -> Bool {
         
-        guard self.openWebURL(URL)
+        guard self.openWeb(url: URL)
             else { return true }
         
         return false
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStack Summit/TrackScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/TrackScheduleViewController.swift
index 1cee8b35..0b9157f3 100755
--- a/OpenStack Summit/OpenStack Summit/TrackScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/TrackScheduleViewController.swift	
@@ -7,14 +7,14 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 final class TrackScheduleViewController: ScheduleViewController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var trackLabel: UILabel!
+    @IBOutlet private(set) weak var trackLabel: UILabel!
     
     // MARK: - Properties
     
@@ -31,7 +31,7 @@ final class TrackScheduleViewController: ScheduleViewController {
         self.scheduleView.tableView.contentInset = UIEdgeInsetsMake(0, 0, 88, 0);
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         trackLabel.text = track.name
@@ -39,7 +39,7 @@ final class TrackScheduleViewController: ScheduleViewController {
     
     // MARK: - Methods
     
-    override func scheduleAvailableDates(from startDate: NSDate, to endDate: NSDate) -> [NSDate] {
+    override func scheduleAvailableDates(from startDate: Date, to endDate: Date) -> [Date] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
@@ -47,26 +47,26 @@ final class TrackScheduleViewController: ScheduleViewController {
         let tracks = [self.track.identifier]
         var trackGroups = [Identifier]()
         var venues = [Identifier]()
-        var levels = [String]()
+        var levels = [Level]()
         
         for filter in scheduleFilter.activeFilters {
             
             switch filter {
             case let .trackGroup(identifier): trackGroups.append(identifier)
             case let .venue(identifier): venues.append(identifier)
-            case let .level(name): levels.append(name)
+            case let .level(level): levels.append(level)
             case .activeTalks: break
             }
         }
         
-        let date = DateFilter.interval(start: Date(foundation: startDate), end: Date(foundation: endDate))
+        let date = DateFilter.interval(start: startDate, end: endDate)
         
         let events = try! EventManagedObject.filter(date, tracks: tracks, trackGroups: trackGroups, levels: levels, venues: venues, summit: summit, context: Store.shared.managedObjectContext)
         
-        var activeDates: [NSDate] = []
+        var activeDates: [Date] = []
         for event in events {
-            let timeZone = NSTimeZone(name: event.summit.timeZone)!
-            let startDate = event.start.mt_dateSecondsAfter(timeZone.secondsFromGMT).mt_startOfCurrentDay()
+            let timeZone = TimeZone(identifier: event.summit.timeZone)!
+            let startDate = ((event.start as NSDate).mt_dateSeconds(after: timeZone.secondsFromGMT()) as NSDate).mt_startOfCurrentDay()!
             if !activeDates.contains(startDate) {
                 activeDates.append(startDate)
             }
@@ -75,7 +75,7 @@ final class TrackScheduleViewController: ScheduleViewController {
         return activeDates
     }
     
-    override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
+    override func scheduledEvents(_ filter: DateFilter) -> [ScheduleItem] {
         
         let scheduleFilter = FilterManager.shared.filter.value
         let summit = SummitManager.shared.summit.value
@@ -83,14 +83,14 @@ final class TrackScheduleViewController: ScheduleViewController {
         let tracks = [self.track.identifier]
         var trackGroups = [Identifier]()
         var venues = [Identifier]()
-        var levels = [String]()
+        var levels = [Level]()
         
         for filter in scheduleFilter.activeFilters {
             
             switch filter {
             case let .trackGroup(identifier): trackGroups.append(identifier)
             case let .venue(identifier): venues.append(identifier)
-            case let .level(name): levels.append(name)
+            case let .level(level): levels.append(level)
             case .activeTalks: break
             }
         }
diff --git a/OpenStack Summit/OpenStack Summit/TrackTableViewCell.swift b/OpenStack Summit/OpenStack Summit/TrackTableViewCell.swift
index 520c4a38..f2f8c586 100644
--- a/OpenStack Summit/OpenStack Summit/TrackTableViewCell.swift	
+++ b/OpenStack Summit/OpenStack Summit/TrackTableViewCell.swift	
@@ -10,5 +10,5 @@ import UIKit
 
 final class TrackTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var nameLabel : UILabel!
-}
\ No newline at end of file
+    @IBOutlet private(set) weak var nameLabel : UILabel!
+}
diff --git a/OpenStack Summit/OpenStack Summit/UIView+Border.swift b/OpenStack Summit/OpenStack Summit/UIView+Border.swift
index 34eb6474..926cf854 100755
--- a/OpenStack Summit/OpenStack Summit/UIView+Border.swift	
+++ b/OpenStack Summit/OpenStack Summit/UIView+Border.swift	
@@ -9,31 +9,31 @@
 import UIKit
 
 extension UIView {
-    func addTopBorderWithColor(color: UIColor, width: CGFloat) {
+    func addTopBorderWithColor(_ color: UIColor, width: CGFloat) {
         let border = CALayer()
-        border.backgroundColor = color.CGColor
-        border.frame = CGRectMake(0, 0, self.frame.size.width, width)
+        border.backgroundColor = color.cgColor
+        border.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: width)
         self.layer.addSublayer(border)
     }
     
-    func addRightBorderWithColor(color: UIColor, width: CGFloat) {
+    func addRightBorderWithColor(_ color: UIColor, width: CGFloat) {
         let border = CALayer()
-        border.backgroundColor = color.CGColor
-        border.frame = CGRectMake(self.frame.size.width - width, 0, width, self.frame.size.height)
+        border.backgroundColor = color.cgColor
+        border.frame = CGRect(x: self.frame.size.width - width, y: 0, width: width, height: self.frame.size.height)
         self.layer.addSublayer(border)
     }
     
-    func addBottomBorderWithColor(color: UIColor, width: CGFloat) {
+    func addBottomBorderWithColor(_ color: UIColor, width: CGFloat) {
         let border = CALayer()
-        border.backgroundColor = color.CGColor
-        border.frame = CGRectMake(0, self.frame.size.height - width, self.frame.size.width, width)
+        border.backgroundColor = color.cgColor
+        border.frame = CGRect(x: 0, y: self.frame.size.height - width, width: self.frame.size.width, height: width)
         self.layer.addSublayer(border)
     }
     
-    func addLeftBorderWithColor(color: UIColor, width: CGFloat) {
+    func addLeftBorderWithColor(_ color: UIColor, width: CGFloat) {
         let border = CALayer()
-        border.backgroundColor = color.CGColor
-        border.frame = CGRectMake(0, 0, width, self.frame.size.height)
+        border.backgroundColor = color.cgColor
+        border.frame = CGRect(x: 0, y: 0, width: width, height: self.frame.size.height)
         self.layer.addSublayer(border)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/URLExtensions.swift b/OpenStack Summit/OpenStack Summit/URLExtensions.swift
new file mode 100644
index 00000000..d8acb065
--- /dev/null
+++ b/OpenStack Summit/OpenStack Summit/URLExtensions.swift	
@@ -0,0 +1,31 @@
+//
+//  URLExtensions.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/13/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import struct Foundation.URL
+
+extension URL {
+    
+    /// Fixes the scheme (e.g. https/http) according to environment.
+    var environmentScheme: URL {
+        
+        switch AppEnvironment {
+            
+        case .staging:
+            
+            var urlComponents = URLComponents(url: self, resolvingAgainstBaseURL: false)!
+            
+            urlComponents.scheme = "http"
+            
+            return urlComponents.url!
+            
+        case .production:
+            
+            return self
+        }
+    }
+}
diff --git a/OpenStack Summit/OpenStack Summit/UserActivity.swift b/OpenStack Summit/OpenStack Summit/UserActivity.swift
index ef9bccbb..14f3cd3b 100644
--- a/OpenStack Summit/OpenStack Summit/UserActivity.swift	
+++ b/OpenStack Summit/OpenStack Summit/UserActivity.swift	
@@ -62,6 +62,7 @@ enum AppActivityScreen: String {
     case events
     case speakers
     case about
+    case inbox
 }
 
 // MARK: - Model Extensions
diff --git a/OpenStack Summit/OpenStack Summit/VenueDetailViewController.swift b/OpenStack Summit/OpenStack Summit/VenueDetailViewController.swift
index 2354f7f0..cdbed516 100755
--- a/OpenStack Summit/OpenStack Summit/VenueDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenueDetailViewController.swift	
@@ -15,14 +15,14 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var scrollView: UIScrollView!
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var locationLabel: UILabel!
-    @IBOutlet weak var arrowImageView: UIImageView!
-    @IBOutlet weak var imagesSlideshow: ImageSlideshow!
-    @IBOutlet weak var imagesSlideshowHeightConstraint: NSLayoutConstraint!
-    @IBOutlet weak var mapsSlideshow: ImageSlideshow!
-    @IBOutlet weak var mapView: GMSMapView!
+    @IBOutlet private(set) weak var scrollView: UIScrollView!
+    @IBOutlet private(set) weak var nameLabel: UILabel!
+    @IBOutlet private(set) weak var locationLabel: UILabel!
+    @IBOutlet private(set) weak var arrowImageView: UIImageView!
+    @IBOutlet private(set) weak var imagesSlideshow: ImageSlideshow!
+    @IBOutlet private(set) weak var imagesSlideshowHeightConstraint: NSLayoutConstraint!
+    @IBOutlet private(set) weak var mapsSlideshow: ImageSlideshow!
+    @IBOutlet private(set) weak var mapView: GMSMapView!
     
     // MARK: - Accessors
     
@@ -44,42 +44,12 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
         }
     }
     
-    private(set) var images = [String]() {
-        didSet {
-            var imageInputs: [HanekeInputSource] = []		
-            
-            for image in images {
-                
-                #if DEBUG
-                    let url = image.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
-                #else
-                    let url = image
-                #endif
-                
-                imageInputs.append(HanekeInputSource(urlString: url)!)
-            }
-            
-            imagesSlideshow.setImageInputs(imageInputs)
-        }
+    private(set) var images = [URL]() {
+        didSet { configure(slideshow: imagesSlideshow, with: images) }
     }
     
-    private(set) var maps = [String]() {
-       didSet {
-            var imageInputs: [HanekeInputSource] = []
-        
-            for map in maps {
-                
-                #if DEBUG
-                    let url = map.stringByReplacingOccurrencesOfString("https", withString: "http", options: NSStringCompareOptions.LiteralSearch, range: nil)
-                #else
-                    let url = map
-                #endif
-                
-                imageInputs.append(HanekeInputSource(urlString: url)!)
-            }
-            
-            mapsSlideshow.setImageInputs(imageInputs)
-        }
+    private(set) var maps = [URL]() {
+        didSet { configure(slideshow: mapsSlideshow, with: maps) }
     }
     
     // MARK: - Properties
@@ -93,10 +63,10 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        imagesSlideshow.contentScaleMode = .ScaleAspectFill
-        mapsSlideshow.contentScaleMode = .ScaleAspectFill
+        imagesSlideshow.contentScaleMode = .scaleAspectFill
+        mapsSlideshow.contentScaleMode = .scaleAspectFill
         
-        mapView.myLocationEnabled = true
+        mapView.isMyLocationEnabled = true
         mapView.delegate = self
         
         navigationItem.title = "VENUE"
@@ -106,7 +76,7 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
     
     // MARK: - Action
     
-    @IBAction func openInFullScreen(sender: UITapGestureRecognizer) {
+    @IBAction func openInFullScreen(_ sender: UITapGestureRecognizer) {
         let slideshow = sender.view as! ImageSlideshow
         
         let ctr = FullScreenSlideshowViewController()
@@ -114,24 +84,24 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
             slideshow.setScrollViewPage(page, animated: false)
         }
         
-        ctr.initialImageIndex = slideshow.scrollViewPage
+        //ctr.initialImageIndex = slideshow.scrollViewPage
         ctr.inputs = slideshow.images
         self.transitionDelegate = ZoomAnimatedTransitioningDelegate.init(slideshowView: slideshow, slideshowController: ctr)
         ctr.transitioningDelegate = self.transitionDelegate!
-        self.presentViewController(ctr, animated: true, completion: nil)
+        self.present(ctr, animated: true, completion: nil)
         
-        ctr.closeButton.setImage(UIImage(named: "close"), forState: .Normal)
+        ctr.closeButton.setImage(#imageLiteral(resourceName: "close"), for: UIControlState())
     }
     
-    @IBAction func navigateToVenueLocationDetail(sender: UITapGestureRecognizer) {
+    @IBAction func navigateToVenueLocationDetail(_ sender: UITapGestureRecognizer) {
         
-        if !arrowImageView.hidden {
+        if !arrowImageView.isHidden {
             
             let venueLocationDetailVC = R.storyboard.venue.venueLocationDetailViewController()!
             
             venueLocationDetailVC.venue = venue
             
-            self.showViewController(venueLocationDetailVC, sender: self)
+            self.show(venueLocationDetailVC, sender: self)
         }
     }
     
@@ -148,9 +118,7 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
         self.location = venue.address
         
         self.toggleImagesGallery(venue.images.count > 0)
-        if venue.images.count > 0 {
-            self.images = venue.images
-        }
+        self.images = venue.images
         
         self.toggleMapNavigation(venue.maps.count > 0)
         self.toggleMapsGallery(venue.maps.count > 0)
@@ -166,35 +134,43 @@ final class VenueDetailViewController: UIViewController, GMSMapViewDelegate {
             marker.position = location
             marker.map = mapView
             marker.title = venue.name
-            marker.icon = R.image.map_pin()!
+            marker.icon = #imageLiteral(resourceName: "map_pin")
             bounds = bounds.includingCoordinate(marker.position)
             mapView.selectedMarker = marker
             
-            let update = GMSCameraUpdate.fitBounds(bounds)
+            let update = GMSCameraUpdate.fit(bounds)
             mapView.moveCamera(update)
-            mapView.animateToZoom(mapView.camera.zoom - 6)
+            mapView.animate(toZoom: mapView.camera.zoom - 6)
         }
     }
     
     @inline(__always)
-    func toggleMap(visible: Bool) {
-        mapView.hidden = !visible
+    private func toggleMap(_ visible: Bool) {
+        mapView.isHidden = !visible
     }
     
     @inline(__always)
-    func toggleMapsGallery(visible: Bool) {
-        mapsSlideshow.hidden = !visible
+    private func toggleMapsGallery(_ visible: Bool) {
+        mapsSlideshow.isHidden = !visible
     }
     
     @inline(__always)
-    func toggleImagesGallery(visible: Bool) {
-        imagesSlideshow.hidden = !visible
+    private func toggleImagesGallery(_ visible: Bool) {
+        imagesSlideshow.isHidden = !visible
         imagesSlideshowHeightConstraint.constant = visible ? 220 : 0
         imagesSlideshow.updateConstraints()
     }
     
     @inline(__always)
-    func toggleMapNavigation(visible: Bool) {
-        arrowImageView.hidden = !visible
+    private func toggleMapNavigation(_ visible: Bool) {
+        arrowImageView.isHidden = !visible
+    }
+    
+    @inline(__always)
+    private func configure(slideshow: ImageSlideshow, with imageURLs: [URL]) {
+        
+        let imageInputs = imageURLs.map { HanekeInputSource(url: $0) }
+        
+        slideshow.setImageInputs(imageInputs)
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/VenueListItem.swift b/OpenStack Summit/OpenStack Summit/VenueListItem.swift
index a0230aa4..80453bdf 100644
--- a/OpenStack Summit/OpenStack Summit/VenueListItem.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenueListItem.swift	
@@ -6,11 +6,12 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import CoreSummit
 import Foundation
-import CoreLocation
+import CoreSummit
+import struct CoreLocation.CLLocationCoordinate2D
+import func CoreLocation.CLLocationCoordinate2DMake
 
-public struct VenueListItem: Named, CoreDataDecodable {
+public struct VenueListItem: Named {
         
     public let identifier: Identifier
     
@@ -22,31 +23,39 @@ public struct VenueListItem: Named, CoreDataDecodable {
     
     public let location: CLLocationCoordinate2D?
     
-    public let backgroundImageURL: String?
+    public let backgroundImage: URL?
     
-    public let maps: [String]
+    public let maps: [URL]
     
-    public let images: [String]
+    public let images: [URL]
     
     public let isInternal: Bool
+}
+
+// MARK: - CoreDataDecodable
+
+extension VenueListItem: CoreDataDecodable {
     
     public init(managedObject venue: VenueManagedObject) {
         
         assert(venue.name != "", "Empty venue: \(venue)")
         
-        self.identifier = venue.identifier
+        self.identifier = venue.id
         self.name = venue.name
         self.descriptionText = venue.descriptionText ?? ""
-        self.address = VenueListItem.getAddress(venue)
-        self.backgroundImageURL = venue.images.first?.url
+        self.address = VenueListItem.address(for: venue)
+        self.backgroundImage = Image.from(managedObjects: venue.images).sorted().first?.url
         self.isInternal = venue.locationType == Venue.LocationType.Internal.rawValue
         
-        let floors = venue.floors.sort { $0.number < $1.number }
-        var maps = venue.maps.map { $0.url }
-        maps.appendContentsOf(floors.map { $0.imageURL ?? "" }.filter { $0.isEmpty == false })
-        self.maps = maps
+        var floorImages = [URL]()
         
-        self.images = venue.images.map { $0.url }
+        venue.floors
+            .sorted(by: { $0.number < $1.number })
+            .map { VenueFloor(managedObject: $0) }
+            .forEach { if let url = $0.image { floorImages.append(url) } }
+        
+        self.maps = Image.from(managedObjects: venue.maps).map { $0.url } + floorImages
+        self.images = Image.from(managedObjects: venue.images).map { $0.url }
         
         // location
         if let latitude = Double(venue.latitude ?? ""),
@@ -59,27 +68,8 @@ public struct VenueListItem: Named, CoreDataDecodable {
             self.location = nil
         }
     }
-}
-
-// MARK: - Comparable
-
-public func == (lhs: VenueListItem, rhs: VenueListItem) -> Bool {
-    
-    return lhs.identifier == rhs.identifier
-        && lhs.name == rhs.name
-        && lhs.descriptionText == rhs.descriptionText
-        && lhs.address == rhs.address
-        && lhs.location?.latitude == rhs.location?.latitude
-        && lhs.location?.longitude == rhs.location?.longitude
-        && lhs.backgroundImageURL == rhs.backgroundImageURL
-        && lhs.maps == rhs.maps
-}
-
-// MARK: - Private
-
-private extension VenueListItem {
     
-    static func getAddress(venue: VenueManagedObject) -> String {
+    static func address(for venue: VenueManagedObject) -> String {
         
         var fullAddress = venue.address ?? ""
         
@@ -105,4 +95,18 @@ private extension VenueListItem {
         
         return fullAddress
     }
-}
\ No newline at end of file
+}
+
+// MARK: - Equatable
+
+public func == (lhs: VenueListItem, rhs: VenueListItem) -> Bool {
+    
+    return lhs.identifier == rhs.identifier
+        && lhs.name == rhs.name
+        && lhs.descriptionText == rhs.descriptionText
+        && lhs.address == rhs.address
+        && lhs.location?.latitude == rhs.location?.latitude
+        && lhs.location?.longitude == rhs.location?.longitude
+        && lhs.backgroundImage == rhs.backgroundImage
+        && lhs.maps == rhs.maps
+}
diff --git a/OpenStack Summit/OpenStack Summit/VenueListViewController.swift b/OpenStack Summit/OpenStack Summit/VenueListViewController.swift
index 399b4963..ece59a30 100755
--- a/OpenStack Summit/OpenStack Summit/VenueListViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenueListViewController.swift	
@@ -9,12 +9,13 @@
 import UIKit
 import XLPagerTabStrip
 import CoreSummit
+import Predicate
 
 final class VenueListViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, MessageEnabledViewController, IndicatorInfoProvider {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet private(set) weak var tableView: UITableView!
     
     // MARK: - Properties
     
@@ -28,7 +29,7 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
         
         tableView.delegate = self
         tableView.dataSource = self
-        tableView.registerNib(R.nib.tableViewHeaderViewDark(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
+        tableView.register(R.nib.tableViewHeaderViewDark(), forHeaderFooterViewReuseIdentifier: TableViewHeaderView.reuseIdentifier)
         
         reloadData()
     }
@@ -39,7 +40,7 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
         
         let summit = SummitManager.shared.summit.value
         
-        let venues = try! VenueListItem.filter("summit.id" == summit, context: Store.shared.managedObjectContext)
+        let venues = try! VenueListItem.filter(#keyPath(VenueManagedObject.summit.id) == summit, context: Store.shared.managedObjectContext)
         
         internalVenueList = venues.filter({ $0.isInternal == true })
         externalVenueList = venues.filter({ $0.isInternal == false })
@@ -47,67 +48,67 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
         tableView.reloadData()
     }
     
-    private func configure(cell cell: VenueListTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: VenueListTableViewCell, at indexPath: IndexPath) {
         
         let venue = externalVenueList[indexPath.row]
         cell.name = venue.name
         cell.address = venue.address
     }
     
-    private func configure(cell cell: InternalVenueListTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: InternalVenueListTableViewCell, at indexPath: IndexPath) {
         
         let venue = internalVenueList[indexPath.row]
         cell.name = venue.name
         cell.address = venue.address
-        cell.backgroundImageURL = venue.backgroundImageURL ?? ""
+        cell.backgroundImage = venue.backgroundImage
     }
     
     // MARK: - UITableViewDataSource
     
-    func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    func numberOfSections(in tableView: UITableView) -> Int {
         return 2
     }
     
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         var count = 0
-        if section == VenueListSectionType.Internal.rawValue {
+        if section == VenueListSectionType.internal.rawValue {
             count = internalVenueList.count
         }
-        else if section == VenueListSectionType.External.rawValue {
+        else if section == VenueListSectionType.external.rawValue {
             count = externalVenueList.count
         }
         return count
     }
     
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        if indexPath.section == VenueListSectionType.Internal.rawValue {
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.internalVenuesTableViewCell)!
+        if indexPath.section == VenueListSectionType.internal.rawValue {
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.internalVenuesTableViewCell)!
             configure(cell: cell, at: indexPath)
-            cell.separatorInset = UIEdgeInsetsZero
-            cell.layoutMargins = UIEdgeInsetsZero
+            cell.separatorInset = UIEdgeInsets.zero
+            cell.layoutMargins = UIEdgeInsets.zero
             return cell
         }
-        else if indexPath.section == VenueListSectionType.External.rawValue {
-            let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.externalVenuesTableViewCell)!
+        else if indexPath.section == VenueListSectionType.external.rawValue {
+            let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.externalVenuesTableViewCell)!
             configure(cell: cell, at: indexPath)
-            cell.separatorInset = UIEdgeInsetsZero
-            cell.layoutMargins = UIEdgeInsetsZero
+            cell.separatorInset = UIEdgeInsets.zero
+            cell.layoutMargins = UIEdgeInsets.zero
             return cell
         }
 
         return UITableViewCell()
     }
     
-    func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         var height = 88
-        if indexPath.section == VenueListSectionType.Internal.rawValue {
+        if indexPath.section == VenueListSectionType.internal.rawValue {
             height *= 2
         }
         return CGFloat(height)
     }
     
-    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let venue: VenueListItem
         
@@ -115,30 +116,30 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
             else { fatalError("Invalid section \(indexPath.section)") }
         
         switch section {
-        case .Internal: venue = internalVenueList[indexPath.row]
-        case .External: venue = externalVenueList[indexPath.row]
+        case .internal: venue = internalVenueList[indexPath.row]
+        case .external: venue = externalVenueList[indexPath.row]
         }
         
-        showLocationDetail(venue.identifier)
+        show(location: venue.identifier)
     }
     
-    func tableView(tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         var height = 0.01
-        if section == VenueListSectionType.External.rawValue && externalVenueList.count > 0 {
+        if section == VenueListSectionType.external.rawValue && externalVenueList.count > 0 {
             height = 45
         }
         return CGFloat(height)
     }
     
-    func tableView(tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         return CGFloat(0.01)
     }
     
-    func tableView(tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
-        if section == VenueListSectionType.External.rawValue {
+        if section == VenueListSectionType.external.rawValue {
             
-            let headerView = self.tableView.dequeueReusableHeaderFooterViewWithIdentifier(TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
+            let headerView = self.tableView.dequeueReusableHeaderFooterView(withIdentifier: TableViewHeaderView.reuseIdentifier) as! TableViewHeaderView
             
             headerView.titleLabel.text = "EXTERNAL VENUES"
             
@@ -148,13 +149,13 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
         return nil
     }
     
-    func tableView(tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         return nil
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         return IndicatorInfo(title: "Directory")
     }
 }
@@ -163,5 +164,5 @@ final class VenueListViewController: UIViewController, UITableViewDataSource, UI
 
 public enum VenueListSectionType: Int {
     
-    case Internal, External
+    case `internal`, external
 }
diff --git a/OpenStack Summit/OpenStack Summit/VenueLocationDetailViewController.swift b/OpenStack Summit/OpenStack Summit/VenueLocationDetailViewController.swift
index e2542fc3..e5730142 100755
--- a/OpenStack Summit/OpenStack Summit/VenueLocationDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenueLocationDetailViewController.swift	
@@ -14,7 +14,7 @@ final class VenueLocationDetailViewController: UIViewController, GMSMapViewDeleg
     
     // MARK: - IB Outlets
 
-    @IBOutlet weak var mapView: GMSMapView!
+    @IBOutlet private(set) weak var mapView: GMSMapView!
     
     // MARK: - Properties
     
@@ -25,7 +25,7 @@ final class VenueLocationDetailViewController: UIViewController, GMSMapViewDeleg
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        mapView.myLocationEnabled = true
+        mapView.isMyLocationEnabled = true
         mapView.delegate = self
         
         updateUI()
@@ -48,9 +48,9 @@ final class VenueLocationDetailViewController: UIViewController, GMSMapViewDeleg
         marker.position = location
         marker.map = mapView
         marker.title = venue.name
-        marker.icon = R.image.map_pin()!
+        marker.icon = #imageLiteral(resourceName: "map_pin")
         bounds = bounds.includingCoordinate(marker.position)
         mapView.selectedMarker = marker
-        mapView.animateWithCameraUpdate(GMSCameraUpdate.fitBounds(bounds))
+        mapView.animate(with: GMSCameraUpdate.fit(bounds))
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/VenueRoomDetailViewController.swift b/OpenStack Summit/OpenStack Summit/VenueRoomDetailViewController.swift
index a4d0f54c..c8adbb6c 100755
--- a/OpenStack Summit/OpenStack Summit/VenueRoomDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenueRoomDetailViewController.swift	
@@ -13,9 +13,9 @@ final class VenueRoomDetailViewController: UIViewController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var capacityLabel: UILabel!
-    @IBOutlet weak var pictureImageView: UIImageView!
+    @IBOutlet private(set) weak var nameLabel: UILabel!
+    @IBOutlet private(set) weak var capacityLabel: UILabel!
+    @IBOutlet private(set) weak var pictureImageView: UIImageView!
     
     // MARK: - Properties
     
@@ -41,13 +41,12 @@ final class VenueRoomDetailViewController: UIViewController {
         }
     }
     
-    private(set) var pictureURL: String = "" {
+    private(set) var picture: URL? {
         
         didSet {
             
-            let picUrlInternal = pictureURL
-            if (!picUrlInternal.isEmpty) {
-                pictureImageView.hnk_setImageFromURL(NSURL(string: picUrlInternal)!)
+            if let url = picture {
+                pictureImageView.hnk_setImageFromURL(url.environmentScheme)
             }
             else {
                 pictureImageView.image = nil
diff --git a/OpenStack Summit/OpenStack Summit/VenuesMapViewController.swift b/OpenStack Summit/OpenStack Summit/VenuesMapViewController.swift
index a97ea3cd..f1310bd4 100755
--- a/OpenStack Summit/OpenStack Summit/VenuesMapViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenuesMapViewController.swift	
@@ -10,13 +10,14 @@ import UIKit
 import XLPagerTabStrip
 //import GoogleMaps
 import CoreSummit
+import Predicate
 
 final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, IndicatorInfoProvider {
     
     // MARK: - Properties
     
     var mapView: GMSMapView!
-    private(set) var dictionary = [GMSMarker: Int]()
+    private(set) var dictionary = [GMSMarker: Identifier]()
     
     // MARK: - Loading
     
@@ -24,11 +25,11 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
         super.viewDidLoad()
         mapView = GMSMapView(frame: self.view.bounds)
         mapView.delegate = self
-        mapView.myLocationEnabled = true
+        mapView.isMyLocationEnabled = true
         view = mapView
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         self.updateUI()
@@ -42,10 +43,10 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
         
         let summit = SummitManager.shared.summit.value
         
-        let predicate: Predicate = "summit.id" == summit
-            &&& "locationType" == Venue.LocationType.Internal.rawValue
-            &&& .keyPath("latitude") != .value(.null)
-            &&& .keyPath("longitude") != .value(.null)
+        let predicate: Predicate = #keyPath(VenueManagedObject.summit.id) == summit
+            && "locationType" == Venue.LocationType.Internal.rawValue
+            && .keyPath("latitude") != .value(.null)
+            && .keyPath("longitude") != .value(.null)
         
         let venues = try! VenueListItem.filter(predicate, context: Store.shared.managedObjectContext)
         
@@ -57,7 +58,7 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
                 else { fatalError("Cannot show venue with no coordinates: \(venue)") }
             
             let marker = GMSMarker()
-            marker.icon = R.image.map_pin()!
+            marker.icon = #imageLiteral(resourceName: "map_pin")
             marker.position = location
             marker.title = venue.name
             marker.map = mapView
@@ -67,26 +68,27 @@ final class VenuesMapViewController: UIViewController, GMSMapViewDelegate, Indic
             dictionary[marker] = venue.identifier
         }
         
-        let update = GMSCameraUpdate.fitBounds(bounds)
+        let update = GMSCameraUpdate.fit(bounds)
         mapView.moveCamera(update)
-        mapView.animateToZoom(mapView.camera.zoom - 1)
+        mapView.animate(toZoom: mapView.camera.zoom - 1)
     }
     
     // MARK: - GMSMapViewDelegate
     
-    func mapView(mapView: GMSMapView, didTapMarker marker: GMSMarker) -> Bool {
+    func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
         
         guard let venue = dictionary[marker]
             else { return false }
         
-        showLocationDetail(venue)
+        self.show(location: venue)
         
         return true
     }
     
     // MARK: - IndicatorInfoProvider
     
-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+        
         return IndicatorInfo(title: "Map")
     }
 }
diff --git a/OpenStack Summit/OpenStack Summit/VenuesViewController.swift b/OpenStack Summit/OpenStack Summit/VenuesViewController.swift
index e2559800..a67aefab 100755
--- a/OpenStack Summit/OpenStack Summit/VenuesViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/VenuesViewController.swift	
@@ -32,7 +32,7 @@ final class VenuesViewController: RevealTabStripViewController {
             // set user activity for handoff
             let userActivity = NSUserActivity(activityType: AppActivity.screen.rawValue)
             userActivity.title = "Venues"
-            userActivity.webpageURL = NSURL(string: summit.webpageURL + "/travel")
+            userActivity.webpageURL = summit.webpage.appendingPathComponent("travel")
             userActivity.userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue]
             userActivity.requiredUserInfoKeys = [AppActivityUserInfo.screen.rawValue]
             userActivity.becomeCurrent()
@@ -41,30 +41,30 @@ final class VenuesViewController: RevealTabStripViewController {
         }
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         userActivity?.becomeCurrent()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
         userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - PagerTabStripViewControllerDelegate
     
-    override func viewControllersForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
+    override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
         
         return [venuesMapViewController, venueListViewController]
     }
diff --git a/OpenStack Summit/OpenStack Summit/YouTubeThumbnail.swift b/OpenStack Summit/OpenStack Summit/YouTubeThumbnail.swift
index d71b225d..dce6924d 100644
--- a/OpenStack Summit/OpenStack Summit/YouTubeThumbnail.swift	
+++ b/OpenStack Summit/OpenStack Summit/YouTubeThumbnail.swift	
@@ -8,10 +8,10 @@
 
 import Foundation
 
-public extension NSURL {
+public extension URL {
     
     /// Initializes an URL for the thumbnail of a YouTube video based on its ID.
-    convenience init?(youtubeThumbnail identifier: String) {
+    init?(youtubeThumbnail identifier: String) {
         
         self.init(string: "https://img.youtube.com/vi/" + identifier + "/maxresdefault.jpg")
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/AppDelegate.swift b/OpenStack Summit/OpenStackSummit macOS/AppDelegate.swift
index acf98421..6290c689 100644
--- a/OpenStack Summit/OpenStackSummit macOS/AppDelegate.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/AppDelegate.swift	
@@ -16,11 +16,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     
     // MARK: - Properties
     
-    lazy var mainWindowController: MainWindowController = NSApp.windows.firstMatching({ $0.windowController is MainWindowController })!.windowController as! MainWindowController
+    lazy var mainWindowController: MainWindowController = NSApp.windows.first(where: { $0.windowController is MainWindowController })!.windowController as! MainWindowController
     
     // MARK: - NSApplicationDelegate
 
-    func applicationDidFinishLaunching(notification: NSNotification) {
+    func applicationDidFinishLaunching(_ notification: Foundation.Notification) {
         // Insert code here to initialize your application
         
         // print app info
@@ -33,20 +33,15 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         
         DataUpdatePoller.shared.start()
         
-        //#if DEBUG
-        //SummitManager.shared.summit.value = 0
-        //try! Store.shared.clear()
-        //#endif
-        
     }
 
-    func applicationWillTerminate(notification: NSNotification) {
+    func applicationWillTerminate(_ notification: Foundation.Notification) {
         // Insert code here to tear down your application
         
         
     }
     
-    func applicationShouldHandleReopen(application: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+    func applicationShouldHandleReopen(_ application: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
         
         application.windows
             .filter { $0.className != NSPopover.windowClassName }
@@ -55,12 +50,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         return true
     }
     
-    func applicationShouldTerminateAfterLastWindowClosed(sender: NSApplication) -> Bool {
+    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
         
         return false
     }
     
-    func application(application: NSApplication, continueUserActivity userActivity: NSUserActivity, restorationHandler: ([AnyObject]) -> Void) -> Bool {
+    func application(_ application: NSApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]) -> Void) -> Bool {
         
         print("Continue activity \(userActivity.activityType)\n\(userActivity.webpageURL?.description ?? "")\n\(userActivity.userInfo?.description ?? "")")
         
@@ -70,17 +65,20 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             guard let url = userActivity.webpageURL
                 else { return false }
             
-            guard mainWindowController.openWebURL(url)
-                else { NSWorkspace.sharedWorkspace().openURL(url); return false }
+            guard mainWindowController.openWeb(url: url)
+                else { NSWorkspace.shared().open(url); return false }
             
         } else if userActivity.activityType == AppActivity.view.rawValue {
             
             guard let typeString = userActivity.userInfo?[AppActivityUserInfo.type.rawValue] as? String,
                 let dataType = AppActivitySummitDataType(rawValue: typeString),
-                let identifier = userActivity.userInfo?[AppActivityUserInfo.identifier.rawValue] as? Int
+                let identifier = userActivity.userInfo?[AppActivityUserInfo.identifier.rawValue] as? Identifier
+                else { return false }
+            
+            guard self.canView(data: dataType, identifier: identifier)
                 else { return false }
             
-            return mainWindowController.view(dataType, identifier: identifier)
+            self.view(data: dataType, identifier: identifier)
             
         } else if userActivity.activityType == AppActivity.screen.rawValue {
             
@@ -88,9 +86,29 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 let screen = AppActivityScreen(rawValue: screenString)
                 else { return false }
             
-            mainWindowController.view(screen)
+            self.view(screen: screen)
         }
         
         return false
     }
 }
+
+// MARK: - SummitActivityHandling
+
+extension AppDelegate: SummitActivityHandling {
+    
+    func view(data: AppActivitySummitDataType, identifier: Identifier) {
+        
+        mainWindowController.view(data: data, identifier: identifier)
+    }
+    
+    func view(screen: AppActivityScreen) {
+        
+        mainWindowController.view(screen: screen)
+    }
+    
+    func search(_ searchTerm: String) {
+        
+        mainWindowController.search(searchTerm)
+    }
+}
diff --git a/OpenStack Summit/OpenStackSummit macOS/ContentBackgroundView.swift b/OpenStack Summit/OpenStackSummit macOS/ContentBackgroundView.swift
index 59f0cc65..2d1c71a4 100644
--- a/OpenStack Summit/OpenStackSummit macOS/ContentBackgroundView.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/ContentBackgroundView.swift	
@@ -10,15 +10,15 @@ import Cocoa
 
 @IBDesignable final class ContentBackgroundView: NSView {
 
-    @IBInspectable var backgroundColor = NSColor.blackColor() {
+    @IBInspectable var backgroundColor = NSColor.black {
         
         didSet {
-            setNeedsDisplayInRect(bounds)
+            setNeedsDisplay(bounds)
         }
     }
     
-    override func drawRect(dirtyRect: NSRect) {
-        super.drawRect(dirtyRect)
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
         
         backgroundColor.set()
         NSRectFill(dirtyRect)
diff --git a/OpenStack Summit/OpenStackSummit macOS/EventDatesViewController.swift b/OpenStack Summit/OpenStackSummit macOS/EventDatesViewController.swift
index 5c379302..b7f6f8b8 100644
--- a/OpenStack Summit/OpenStackSummit macOS/EventDatesViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/EventDatesViewController.swift	
@@ -20,11 +20,11 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
     
     weak var delegate: EventDatesViewControllerDelegate?
     
-    private var summitCache: (start: NSDate, end: NSDate, timeZone: NSTimeZone, name: String)?
+    private var summitCache: (start: Date, end: Date, timeZone: Foundation.TimeZone, name: String)?
     
-    private lazy var dateFormatter: NSDateFormatter = {
+    private lazy var dateFormatter: DateFormatter = {
         
-        let dateFormatter = NSDateFormatter()
+        let dateFormatter = DateFormatter()
         
         dateFormatter.dateFormat = "MMMM d"
         
@@ -53,12 +53,12 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
     
     // MARK: - Actions
     
-    @IBAction func tableViewClick(sender: AnyObject? = nil) {
+    @IBAction func tableViewClick(_ sender: AnyObject? = nil) {
                 
         guard tableView.selectedRow >= 0
             else { return }
         
-        let selectedDate = summitCache!.start.mt_dateDaysAfter(tableView.selectedRow)
+        let selectedDate = (summitCache!.start as NSDate).mt_dateDays(after: tableView.selectedRow)!
         
         delegate?.eventDatesViewController(self, didSelect: selectedDate)
     }
@@ -69,11 +69,11 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
         
         if let summit = self.currentSummit {
             
-            let start = summit.start.mt_startOfCurrentDay()
+            let start = (summit.start as NSDate).mt_startOfCurrentDay()!
             
-            let end = summit.end.mt_dateDaysAfter(1)
+            let end = (summit.end as NSDate).mt_dateDays(after: 1)!
             
-            let timeZone = NSTimeZone(name: summit.timeZone)!
+            let timeZone = TimeZone(identifier: summit.timeZone)!
             
             self.summitCache = (start: start, end: end, timeZone: timeZone, name: summit.name)
             
@@ -85,11 +85,11 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
         self.tableView.reloadData()
         
         // select first row
-        NSOperationQueue.mainQueue().addOperationWithBlock {
+        OperationQueue.main.addOperation {
             
             if self.tableView.numberOfRows > 0 {
                 
-                self.tableView.selectRowIndexes(NSIndexSet(index: 0), byExtendingSelection: false)
+                self.tableView.selectRowIndexes(IndexSet(integer: 0), byExtendingSelection: false)
                 
                 self.tableViewClick()
             }
@@ -98,23 +98,23 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
     
     // MARK: - NSTableViewDataSource
     
-    func numberOfRowsInTableView(tableView: NSTableView) -> Int {
+    func numberOfRows(in tableView: NSTableView) -> Int {
         
         guard let summit = summitCache
             else { return 0 }
         
-        return summit.end.mt_daysSinceDate(summit.start)
+        return (summit.end as NSDate).mt_days(since: summit.start)
     }
     
     // MARK: - NSTableViewDelegate
     
-    func tableView(tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
+    func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         
-        let cell = tableView.makeViewWithIdentifier(tableColumn!.identifier, owner: nil) as! NSTableCellView
+        let cell = tableView.make(withIdentifier: tableColumn!.identifier, owner: nil) as! NSTableCellView
         
-        let date = summitCache!.start.mt_dateDaysAfter(row)
+        let date = (summitCache!.start as NSDate).mt_dateDays(after: row)!
         
-        cell.textField?.stringValue = dateFormatter.stringFromDate(date)
+        cell.textField?.stringValue = dateFormatter.string(from: date)
         
         return cell
     }
@@ -124,5 +124,5 @@ final class EventDatesViewController: NSViewController, NSTableViewDataSource, N
 
 @objc protocol EventDatesViewControllerDelegate: class {
     
-    func eventDatesViewController(controller: EventDatesViewController, didSelect date: NSDate)
+    func eventDatesViewController(_ controller: EventDatesViewController, didSelect date: Date)
 }
diff --git a/OpenStack Summit/OpenStackSummit macOS/EventDetailViewController.swift b/OpenStack Summit/OpenStackSummit macOS/EventDetailViewController.swift
index cf13bb77..c466b285 100644
--- a/OpenStack Summit/OpenStackSummit macOS/EventDetailViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/EventDetailViewController.swift	
@@ -11,6 +11,7 @@ import AppKit
 import CoreData
 import CoreSummit
 import EventKit
+import Predicate
 
 @objc(OSSEventDetailViewController)
 final class EventDetailViewController: NSViewController, ContentController, MessageEnabledViewController, NSTableViewDataSource, NSTableViewDelegate, NSSharingServicePickerDelegate, NSSharingServiceDelegate, NSTextViewDelegate  {
@@ -73,7 +74,7 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        shareButton.sendActionOn(.LeftMouseDown)
+        shareButton.sendAction(on: .leftMouseDown)
     }
     
     override func viewDidAppear() {
@@ -88,43 +89,43 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
         userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue,
-                        AppActivityUserInfo.identifier.rawValue: self.contentIdentifier]
+                        AppActivityUserInfo.identifier.rawValue: self.contentIdentifier] as [String : Any]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
     
     // MARK: - Actions
     
-    @IBAction func playVideo(sender: NSButton) {
+    @IBAction func playVideo(_ sender: NSButton) {
         
         guard let video = eventDetail.video
             else { fatalError("Event has no video") }
         
-        if let url = NSURL(string: "https://www.youtube.com/watch?v=" + video.youtube) {
+        if let url = URL(string: "https://www.youtube.com/watch?v=" + video.youtube) {
             
-            NSWorkspace.sharedWorkspace().openURL(url)
+            NSWorkspace.shared().open(url)
         }
     }
     
-    @IBAction func share(sender: NSButton) {
+    @IBAction func share(_ sender: NSButton) {
         
         let message = "Check out this #OpenStack session I’m attending at the #OpenStackSummit!"
         
-        let items = [message, eventDetail.webpageURL]
+        let items = [message, eventDetail.webpage] as [Any]
         
         let sharingServicePicker = NSSharingServicePicker(items: items)
         
         sharingServicePicker.delegate = self
         
-        sharingServicePicker.showRelativeToRect(sender.bounds, ofView: sender, preferredEdge: NSRectEdge.MinY)
+        sharingServicePicker.show(relativeTo: sender.bounds, of: sender, preferredEdge: .minY)
     }
     
-    @IBAction func showLevel(sender: NSButton) {
+    @IBAction func showLevel(_ sender: NSButton) {
         
         
     }
@@ -141,68 +142,68 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
         
         entityController.event.updated = { [weak self] in self?.configureView($0) }
         
-        entityController.event.deleted = { [weak self] _ in self?.dismissController(nil) }
+        entityController.event.deleted = { [weak self] _ in self?.dismiss(nil) }
         
         entityController.enabled = true
         
         self.entityController = entityController
     }
     
-    private func configureView(event: EventDetail) {
+    private func configureView(_ event: EventDetail) {
         
         self.eventDetail = event
         
         self.nameLabel.stringValue = event.name
         
         self.trackLabel.stringValue = event.track
-        self.trackLabel.hidden = event.track.isEmpty
+        self.trackLabel.isHidden = event.track.isEmpty
         
         self.dateTimeLabel.stringValue = event.dateTime
         
-        self.playVideoButton.hidden = event.video == nil
+        self.playVideoButton.isHidden = event.video == nil
         
         self.descriptionTextView.string = ""
         
         let htmlString = event.eventDescription
         
-        if let data = htmlString.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: false),
+        if let data = htmlString.data(using: String.Encoding.unicode, allowLossyConversion: false),
             let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil) {
             
-            self.descriptionView.hidden = false
+            self.descriptionView.isHidden = false
             
             let range = NSMakeRange(0, attributedString.length)
             
-            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFontOfSize(14), range: range)
+            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFont(ofSize: 14), range: range)
             
             self.descriptionLabel.attributedStringValue = attributedString
             
-            self.descriptionTextView.textStorage?.appendAttributedString(attributedString)
+            self.descriptionTextView.textStorage?.append(attributedString)
             
         } else {
             
-            self.descriptionView.hidden = true
+            self.descriptionView.isHidden = true
             self.descriptionLabel.stringValue = ""
         }
         
-        self.locationView.hidden = event.location.isEmpty
+        self.locationView.isHidden = event.location.isEmpty
         self.locationButton.title = event.location
         
-        self.levelView.hidden = event.level.isEmpty
+        self.levelView.isHidden = event.level.isEmpty
         self.levelButton.title = event.level
         
-        self.tagView.hidden = event.tags.isEmpty
+        self.tagView.isHidden = event.tags.isEmpty
         self.tagLabel.stringValue = event.tags
         
-        self.speakersView.hidden = event.speakers.isEmpty
+        self.speakersView.isHidden = event.speakers.isEmpty
         self.speakersButton.title = "\(event.speakers.count) speakers"
         
-        self.reviewsView.hidden = true
+        self.reviewsView.isHidden = true
         
         // set user activity for handoff
         let userActivity = NSUserActivity(activityType: AppActivity.view.rawValue)
         userActivity.requiredUserInfoKeys = [AppActivityUserInfo.type.rawValue, AppActivityUserInfo.identifier.rawValue]
         userActivity.title = eventDetail.name
-        userActivity.webpageURL = eventDetail.webpageURL
+        userActivity.webpageURL = eventDetail.webpage
         userActivity.userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue, AppActivityUserInfo.identifier.rawValue: self.contentIdentifier]
         
         
@@ -211,25 +212,26 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
     
     func addToCalendar() {
         
-        let event = eventDetail
+        guard let event = eventDetail
+            else { fatalError("No Event") }
         
-        let status = EKEventStore.authorizationStatusForEntityType(.Event)
+        let status = EKEventStore.authorizationStatus(for: .event)
         
         switch status {
             
-        case .Restricted, .Denied:
+        case .restricted, .denied:
             
             break
             
-        case .NotDetermined:
+        case .notDetermined:
             
-            calendarEventStore.requestAccessToEntityType(.Event) { [weak self] (granted, error) in
+            calendarEventStore.requestAccess(to: .event) { [weak self] (granted, error) in
                 
                 // retry
                 self?.addToCalendar()
             }
             
-        case .Authorized:
+        case .authorized:
             
             let calendarListTitle = "OpenStack Summit"
             
@@ -237,13 +239,13 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
             
             let calendar: EKCalendar
             
-            if let existingCalendar = calendarEventStore.calendarsForEntityType(.Event).firstMatching({ $0.title == calendarListTitle }) {
+            if let existingCalendar = calendarEventStore.calendars(for: .event).first(where: { $0.title == calendarListTitle }) {
                 
                 calendar = existingCalendar
                 
             } else {
                 
-                calendar = EKCalendar(forEntityType: .Event, eventStore: calendarEventStore)
+                calendar = EKCalendar(for: .event, eventStore: calendarEventStore)
                 
                 calendar.title = calendarListTitle
                 
@@ -264,19 +266,19 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
             
             calendarEvent.calendar = calendar
             calendarEvent.title = event.name
-            calendarEvent.startDate = event.start.toFoundation()
-            calendarEvent.endDate = event.end.toFoundation()
-            calendarEvent.timeZone = NSTimeZone(name: event.timeZone)
-            calendarEvent.URL = event.webpageURL
+            calendarEvent.startDate = event.start
+            calendarEvent.endDate = event.end
+            calendarEvent.timeZone = TimeZone(identifier: event.timeZone)
+            calendarEvent.url = event.webpage
             calendarEvent.location = event.location
             
-            if let data = event.eventDescription.dataUsingEncoding(NSUTF8StringEncoding),
-                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            if let data = event.eventDescription.data(using: String.Encoding.utf8),
+                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                 
                 calendarEvent.notes = attributedString.string
             }
             
-            do { try calendarEventStore.saveEvent(calendarEvent, span: .ThisEvent, commit: true) }
+            do { try calendarEventStore.save(calendarEvent, span: .thisEvent, commit: true) }
                 
             catch { showErrorMessage(error) }
         }
@@ -284,17 +286,17 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
     
     // MARK: - NSTextFieldDelegate
     
-    func textView(textView: NSTextView, clickedOnLink link: AnyObject, atIndex charIndex: Int) -> Bool {
+    func textView(_ textView: NSTextView, clickedOnLink link: Any, at charIndex: Int) -> Bool {
         
-        guard let url = link as? NSURL
+        guard let url = link as? URL
             else { return false }
         
-        return AppDelegate.shared.mainWindowController.openWebURL(url)
+        return AppDelegate.shared.mainWindowController.openWeb(url: url)
     }
     
     // MARK: - NSSharingServicePickerDelegate
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [AnyObject], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [Any], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
         
         var customItems = [NSSharingService]()
         
@@ -308,14 +310,16 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
             customItems.append(safariReadList)
         }
         
-        if let url = eventDetail.webpageURL.absoluteString {
+        do {
+            
+            let url = eventDetail.webpage.absoluteString
             
             let copyLink = NSSharingService(copyLink: url)
             
             customItems.append(copyLink)
         }
         
-        let calendarIcon = NSWorkspace.sharedWorkspace().iconForFile("/Applications/Calendar.app")
+        let calendarIcon = NSWorkspace.shared().icon(forFile: "/Applications/Calendar.app")
         
         let addToCalendar = NSSharingService(title: "Save to Calendar",
                                              image: calendarIcon,
@@ -327,21 +331,21 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
         return customItems + proposedServices
     }
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, delegateForSharingService sharingService: NSSharingService) -> NSSharingServiceDelegate? {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, delegateFor sharingService: NSSharingService) -> NSSharingServiceDelegate? {
         
         return self
     }
     
     // MARK: - NSSharingServiceDelegate
     
-    func sharingService(sharingService: NSSharingService, willShareItems items: [AnyObject]) {
+    func sharingService(_ sharingService: NSSharingService, willShareItems items: [Any]) {
         
         sharingService.subject = eventDetail.name
     }
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: NSStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: NSStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -355,9 +359,11 @@ final class EventDetailViewController: NSViewController, ContentController, Mess
             
             let speakersViewController = segue.destinationController as! SpeakersTableViewController
             
-            let eventID = NSNumber(longLong: Int64(eventDetail.identifier))
+            let eventID = Expression.value(.int64(eventDetail.identifier))
             
-            speakersViewController.predicate = NSPredicate(format: "presentationModerator.event.id CONTAINS %@ OR presentationSpeaker.event.id CONTAINS %@", eventID, eventID)
+            //speakersViewController.predicate = NSPredicate(format: "presentationModerator.event.id CONTAINS %@ OR presentationSpeaker.event.id CONTAINS %@", eventID, eventID)
+            speakersViewController.predicate = (#keyPath(SpeakerManagedObject.presentationModerator.event.id)).compare(.contains, eventID)
+                || (#keyPath(SpeakerManagedObject.presentationSpeaker.event.id)).compare(.contains, eventID)
             
             let speakerCount = speakersViewController.fetchedResultsController.fetchedObjects?.count ?? 0
             
diff --git a/OpenStack Summit/OpenStackSummit macOS/EventWindowController.swift b/OpenStack Summit/OpenStackSummit macOS/EventWindowController.swift
index 9db38c57..0e009617 100644
--- a/OpenStack Summit/OpenStackSummit macOS/EventWindowController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/EventWindowController.swift	
@@ -40,8 +40,8 @@ final class EventWindowController: NSWindowController, ContentController {
                 view.wantsLayer = true
             }
             
-            window.styleMask.insert(.FullSizeContentView)
-            window.titleVisibility = .Hidden
+            window.styleMask.insert(.fullSizeContentView)
+            window.titleVisibility = .hidden
             window.titlebarAppearsTransparent = true
         }
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/Events.storyboard b/OpenStack Summit/OpenStackSummit macOS/Events.storyboard
index 31ccfb3d..54d159fe 100644
--- a/OpenStack Summit/OpenStackSummit macOS/Events.storyboard	
+++ b/OpenStack Summit/OpenStackSummit macOS/Events.storyboard	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="ce5-Zs-Y8C">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="ce5-Zs-Y8C">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -50,7 +50,7 @@
                                                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="AFM-Rm-ouE">
                                                                     <rect key="frame" x="0.0" y="0.0" width="200" height="37"/>
                                                                     <subviews>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="eN0-yO-bjO">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eN0-yO-bjO">
                                                                             <rect key="frame" x="14" y="8" width="180" height="21"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="April 26" id="VKu-YQ-IiI">
                                                                                 <font key="font" metaFont="system" size="17"/>
@@ -182,7 +182,7 @@
                                                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="wlm-Bn-AJ9">
                                                                     <rect key="frame" x="0.0" y="0.0" width="521" height="149"/>
                                                                     <subviews>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="M60-sn-LQH">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M60-sn-LQH">
                                                                             <rect key="frame" x="42" y="114" width="473" height="19"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Date Time" id="jgO-ks-Oxe">
                                                                                 <font key="font" metaFont="system" size="15"/>
@@ -218,7 +218,7 @@
                                                                             </constraints>
                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="time" id="7Ol-6j-spN"/>
                                                                         </imageView>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="our-dh-LgZ">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="our-dh-LgZ">
                                                                             <rect key="frame" x="14" y="81" width="501" height="24"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Event Name" id="a8U-Wo-a2q">
                                                                                 <font key="font" metaFont="system" size="20"/>
@@ -234,7 +234,7 @@
                                                                             </constraints>
                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="map_pin" id="BGm-Bz-6Cq"/>
                                                                         </imageView>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="9qT-X4-tmE">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9qT-X4-tmE">
                                                                             <rect key="frame" x="42" y="35" width="473" height="38"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" id="fvL-Sr-AeS">
                                                                                 <font key="font" metaFont="system" size="15"/>
@@ -244,7 +244,7 @@ Room 1</string>
                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                             </textFieldCell>
                                                                         </textField>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="bmP-Yg-bjq">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bmP-Yg-bjq">
                                                                             <rect key="frame" x="14" y="8" width="43" height="19"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Track" id="JfK-3z-NvL">
                                                                                 <font key="font" metaFont="system" size="15"/>
@@ -252,7 +252,7 @@ Room 1</string>
                                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                             </textFieldCell>
                                                                         </textField>
-                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IjL-hZ-lDy">
+                                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IjL-hZ-lDy">
                                                                             <rect key="frame" x="435" y="8" width="80" height="19"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="Event Type" id="vdF-1J-JIf">
                                                                                 <font key="font" metaFont="system" size="15"/>
@@ -373,7 +373,7 @@ Room 1</string>
                                     <stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="joy-q3-Frf">
                                         <rect key="frame" x="20" y="20" width="760" height="51"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="FkT-2J-KVU">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FkT-2J-KVU">
                                                 <rect key="frame" x="-2" y="27" width="764" height="24"/>
                                                 <textFieldCell key="cell" controlSize="mini" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Event Name" id="xDf-qS-8mz">
                                                     <font key="font" metaFont="systemBold" size="20"/>
@@ -381,7 +381,7 @@ Room 1</string>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="x6t-ys-acv">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x6t-ys-acv">
                                                 <rect key="frame" x="-2" y="0.0" width="764" height="19"/>
                                                 <textFieldCell key="cell" controlSize="mini" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Track" id="dKX-b8-EPk">
                                                     <font key="font" metaFont="system" size="15"/>
@@ -434,7 +434,7 @@ Room 1</string>
                                                         </constraints>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="time" id="Knz-x7-DS1"/>
                                                     </imageView>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="0aV-5Z-wYa">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0aV-5Z-wYa">
                                                         <rect key="frame" x="22" y="0.0" width="692" height="17"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" title="May 8, 2017  9:00 am - 10:00 am" id="GFo-ks-SCX">
                                                             <font key="font" metaFont="system"/>
@@ -520,7 +520,7 @@ Room 1</string>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="MXF-GN-YgN">
                                                 <rect key="frame" x="16" y="8" width="768" height="85"/>
                                                 <subviews>
-                                                    <textField hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2Jb-cE-um3">
+                                                    <textField hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Jb-cE-um3">
                                                         <rect key="frame" x="-2" y="0.0" width="772" height="85"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" relation="lessThanOrEqual" constant="400" id="i9p-Rd-kwn"/>
@@ -687,7 +687,7 @@ Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ip
                                                 </constraints>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="tag" id="O78-kG-1Kc"/>
                                             </imageView>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="1aP-g3-8U7">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1aP-g3-8U7">
                                                 <rect key="frame" x="38" y="8" width="102" height="16"/>
                                                 <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="ios, swift, xcode" id="kwF-tt-zzq">
                                                     <font key="font" metaFont="system"/>
diff --git a/OpenStack Summit/OpenStackSummit macOS/EventsSplitViewController.swift b/OpenStack Summit/OpenStackSummit macOS/EventsSplitViewController.swift
index 5e334402..0fd5e092 100644
--- a/OpenStack Summit/OpenStackSummit macOS/EventsSplitViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/EventsSplitViewController.swift	
@@ -8,6 +8,8 @@
 
 import Foundation
 import AppKit
+import CoreSummit
+import Predicate
 
 final class EventsSplitViewController: NSSplitViewController, SearchableController, EventDatesViewControllerDelegate {
     
@@ -18,7 +20,7 @@ final class EventsSplitViewController: NSSplitViewController, SearchableControll
         didSet { configureView() }
     }
     
-    private(set) var selectedDate: NSDate? {
+    private(set) var selectedDate: Date? {
         
         didSet { configureView() }
     }
@@ -45,35 +47,38 @@ final class EventsSplitViewController: NSSplitViewController, SearchableControll
     
     private func configureView() {
         
-        let predicate: NSPredicate
+        let predicate: Predicate
         
         if searchTerm.isEmpty == false {
             
             // show events for search term
             
-            predicate = NSPredicate(format: "name CONTAINS[c] %@", searchTerm)
+            //predicate = NSPredicate(format: "name CONTAINS[c] %@", searchTerm)
+            predicate = (#keyPath(EventManagedObject.name)).compare(.contains, [.caseInsensitive], .value(.string(searchTerm)))
             
         } else if let selectedDate = self.selectedDate  {
             
             // show events for date
             
-            let endDate = selectedDate.mt_endOfCurrentDay()
+            let endDate = (selectedDate as NSDate).mt_endOfCurrentDay()!
             
-            predicate = NSPredicate(format: "start >= %@ AND end <= %@", selectedDate, endDate)
+            //predicate = NSPredicate(format: "start >= %@ AND end <= %@", selectedDate as NSDate, endDate as NSDate)
+            predicate = #keyPath(EventManagedObject.start) >= selectedDate
+                && #keyPath(EventManagedObject.end) <= endDate
             
         } else {
             
             // show no events
-            predicate = NSPredicate(value: false)
+            predicate = .value(false)
         }
         
         let collapseSidebar = searchTerm.isEmpty == false
         
         // collapse sidebar
-        if collapseSidebar != splitViewItems[0].collapsed {
+        if collapseSidebar != splitViewItems[0].isCollapsed {
             
             splitViewItems[0].canCollapse = true
-            splitViewItems[0].animator().collapsed = collapseSidebar
+            splitViewItems[0].animator().isCollapsed = collapseSidebar
             splitViewItems[0].canCollapse = false
         }
         
@@ -82,7 +87,7 @@ final class EventsSplitViewController: NSSplitViewController, SearchableControll
     
     // MARK: - EventDatesViewControllerDelegate
     
-    func eventDatesViewController(controller: EventDatesViewController, didSelect selectedDate: NSDate) {
+    func eventDatesViewController(_ controller: EventDatesViewController, didSelect selectedDate: Date) {
         
         self.selectedDate = selectedDate
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/EventsViewController.swift b/OpenStack Summit/OpenStackSummit macOS/EventsViewController.swift
index 222de189..7102f951 100644
--- a/OpenStack Summit/OpenStackSummit macOS/EventsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/EventsViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 
 final class EventsViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate, NSFetchedResultsControllerDelegate {
     
@@ -19,14 +20,14 @@ final class EventsViewController: NSViewController, NSTableViewDataSource, NSTab
     
     // MARK: - Properties
     
-    var predicate = NSPredicate(value: false) {
+    var predicate = Predicate.value(false) {
         
         didSet { configureView() }
     }
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<EventManagedObject>!
     
-    private lazy var cachedPredicate = NSPredicate(format: "cached != nil")
+    private lazy var cachedPredicate: Predicate = (.keyPath(#keyPath(Entity.cached)) != .value(.null))
     
     // MARK: - Loading
     
@@ -38,27 +39,26 @@ final class EventsViewController: NSViewController, NSTableViewDataSource, NSTab
     
     // MARK: - Actions
     
-    @IBAction func tableViewClick(sender: AnyObject) {
+    @IBAction func tableViewClick(_ sender: AnyObject) {
         
         guard tableView.selectedRow >= 0
             else { return }
         
         defer { tableView.deselectAll(sender) }
         
-        let event = fetchedResultsController.fetchedObjects![tableView.selectedRow] as! EventManagedObject
+        let event = fetchedResultsController.fetchedObjects![tableView.selectedRow]
         
-        AppDelegate.shared.mainWindowController.view(.event, identifier: event.identifier)
+        AppDelegate.shared.mainWindowController.view(data: .event, identifier: event.id)
     }
     
     // MARK: - Private Methods
     
     private func configureView() {
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
+        //let summitPredicate = NSPredicate(format: "summit.id == %@", summitID)
+        let summitPredicate: Predicate = #keyPath(EventManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitPredicate = NSPredicate(format: "summit.id == %@", summitID)
-        
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [self.predicate, summitPredicate, cachedPredicate])
+        let predicate: Predicate = .compound(.and([self.predicate, summitPredicate, cachedPredicate]))
         
         self.fetchedResultsController = NSFetchedResultsController(Event.self,
                                                                    delegate: self,
@@ -79,9 +79,9 @@ final class EventsViewController: NSViewController, NSTableViewDataSource, NSTab
         }
     }
     
-    private func configure(cell cell: EventTableViewCell, at row: Int) {
+    private func configure(cell: EventTableViewCell, at row: Int) {
         
-        let eventManagedObject = self.fetchedResultsController.fetchedObjects![row] as! EventManagedObject
+        let eventManagedObject = self.fetchedResultsController.fetchedObjects![row]
         
         let eventDetail = ScheduleItem(managedObject: eventManagedObject)
         
@@ -90,19 +90,19 @@ final class EventsViewController: NSViewController, NSTableViewDataSource, NSTab
         cell.locationLabel.stringValue = eventDetail.location
         cell.trackLabel.stringValue = eventDetail.track
         cell.typeLabel.stringValue = eventDetail.eventType
-        cell.trackGroupColorView.fillColor = NSColor(hexString: eventDetail.trackGroupColor) ?? NSColor.clearColor()
+        cell.trackGroupColorView.fillColor = NSColor(hexString: eventDetail.trackGroupColor) ?? NSColor.clear
     }
     
     // MARK: - NSTableViewDataSource
     
-    func numberOfRowsInTableView(tableView: NSTableView) -> Int {
+    func numberOfRows(in tableView: NSTableView) -> Int {
         
         return self.fetchedResultsController?.fetchedObjects?.count ?? 0
     }
     
-    func tableView(tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
+    func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         
-        let cell = tableView.makeViewWithIdentifier(tableColumn!.identifier, owner: nil) as! EventTableViewCell
+        let cell = tableView.make(withIdentifier: tableColumn!.identifier, owner: nil) as! EventTableViewCell
         
         configure(cell: cell, at: row)
         
@@ -111,12 +111,12 @@ final class EventsViewController: NSViewController, NSTableViewDataSource, NSTab
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.endUpdates()
         
diff --git a/OpenStack Summit/OpenStackSummit macOS/ImageCell.swift b/OpenStack Summit/OpenStackSummit macOS/ImageCell.swift
index 57acc49d..f0ecc2c4 100644
--- a/OpenStack Summit/OpenStackSummit macOS/ImageCell.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/ImageCell.swift	
@@ -15,12 +15,12 @@ protocol ImageCell: class {
     
     var placeholderImage: NSImage? { get set }
     
-    var imageURL: NSURL? { get set }
+    var imageURL: URL? { get set }
 }
 
 private extension ImageCell {
     
-    private func configureView(newValue: NSURL?, _ oldValue: NSURL?) {
+    func configureView(_ newValue: URL?, _ oldValue: URL?) {
         
         if imageURL != oldValue {
             
@@ -30,6 +30,10 @@ private extension ImageCell {
                 
                 imageView?.loadCached(url)
             }
+            
+        } else if newValue == nil && oldValue == nil {
+            
+            imageView?.image = placeholderImage
         }
     }
 }
@@ -38,7 +42,7 @@ class ImageTableViewCell: NSTableCellView, ImageCell {
     
     var placeholderImage: NSImage?
     
-    var imageURL: NSURL? {
+    var imageURL: URL? {
         
         didSet { configureView(imageURL, oldValue) }
     }
@@ -48,7 +52,7 @@ class ImageCollectionViewItem: NSCollectionViewItem, ImageCell {
     
     var placeholderImage: NSImage?
     
-    var imageURL: NSURL? {
+    var imageURL: URL? {
         
         didSet { configureView(imageURL, oldValue) }
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/Info.plist b/OpenStack Summit/OpenStackSummit macOS/Info.plist
index 5bd5dbad..b893b6a3 100644
--- a/OpenStack Summit/OpenStackSummit macOS/Info.plist	
+++ b/OpenStack Summit/OpenStackSummit macOS/Info.plist	
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>GitVersion</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/OpenStack Summit/OpenStackSummit macOS/MainWindowController.swift b/OpenStack Summit/OpenStackSummit macOS/MainWindowController.swift
index 3ac83a6d..c878ff06 100644
--- a/OpenStack Summit/OpenStackSummit macOS/MainWindowController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/MainWindowController.swift	
@@ -49,7 +49,7 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
     override func windowDidLoad() {
         super.windowDidLoad()
         
-        window!.titleVisibility = .Hidden
+        window!.titleVisibility = .hidden
         
         summitObserver = SummitManager.shared.summit.observe { [weak self] _ in self?.configureView() }
         
@@ -57,9 +57,9 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
         
         // Show preferences
         
-        let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(1 * Double(NSEC_PER_SEC)))
+        let delayTime = DispatchTime.now() + Double(Int64(1 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
         
-        dispatch_after(delayTime, dispatch_get_main_queue()) { [weak self] in
+        DispatchQueue.main.asyncAfter(deadline: delayTime) { [weak self] in
             
             if try! Summit.find(SummitManager.shared.summit.value, context: Store.shared.managedObjectContext) == nil {
                 
@@ -70,20 +70,20 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
     
     // MARK: - Actions
     
-    @IBAction func contentTabChanged(sender: NSSegmentedControl) {
+    @IBAction func contentTabChanged(_ sender: NSSegmentedControl) {
         
         self.currentContent = Content(rawValue: sender.selectedSegment)!
     }
     
-    @IBAction func searchTermChanged(sender: NSSearchField) {
+    @IBAction func searchTermChanged(_ sender: NSSearchField) {
         
         self.searchTerm = sender.stringValue
     }
     
-    @IBAction func showPreferences(sender: AnyObject? = nil) {
+    @IBAction func showPreferences(_ sender: AnyObject? = nil) {
         
         preferencesWindowController = NSStoryboard(name: "Main", bundle: nil)
-            .instantiateControllerWithIdentifier("Preferences") as? NSWindowController
+            .instantiateController(withIdentifier: "Preferences") as? NSWindowController
         
         preferencesWindowController?.showWindow(sender)
     }
@@ -92,7 +92,7 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
     
     private func configureView() {
         
-        assert(windowLoaded)
+        assert(isWindowLoaded)
         
         // set window name
         
@@ -164,8 +164,8 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
         
         // try to get existing window
         if let existingController = childContentWindowControllers
-            .firstMatching({ ($0 as? ContentController)?.contentIdentifier == identifier
-                && ($0 as? ContentController)?.dynamicType.contentType == contentType }) {
+            .first(where: { ($0 as? ContentController)?.contentIdentifier == identifier
+                && (type(of: $0) as? ContentController.Type)?.contentType == contentType }) {
             
             windowController = existingController
             
@@ -176,11 +176,11 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
                 
             case is Event.Type:
                 
-                windowController = NSStoryboard(name: "Events", bundle: nil).instantiateControllerWithIdentifier("EventWindowController") as! NSWindowController
+                windowController = NSStoryboard(name: "Events", bundle: nil).instantiateController(withIdentifier: "EventWindowController") as! NSWindowController
                 
             case is Speaker.Type:
                 
-                windowController = NSStoryboard(name: "Speakers", bundle: nil).instantiateControllerWithIdentifier("SpeakerWindowController") as! NSWindowController
+                windowController = NSStoryboard(name: "Speakers", bundle: nil).instantiateController(withIdentifier: "SpeakerWindowController") as! NSWindowController
                 
             default:
                 
@@ -199,9 +199,9 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
             let window = windowController.window!
             
             // release when closed
-            NSNotificationCenter.defaultCenter().addObserver(self,
+            NotificationCenter.default.addObserver(self,
                                                              selector: #selector(windowWillClose),
-                                                             name: NSWindowWillCloseNotification,
+                                                             name: NSNotification.Name.NSWindowWillClose,
                                                              object: window)
         }
         
@@ -211,23 +211,23 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
     
     // MARK: - NSSearchFieldDelegate
     
-    func searchFieldDidStartSearching(sender: NSSearchField) {
+    func searchFieldDidStartSearching(_ sender: NSSearchField) {
         
         
     }
     
-    func searchFieldDidEndSearching(sender: NSSearchField) {
+    func searchFieldDidEndSearching(_ sender: NSSearchField) {
         
         
     }
     
     // MARK: - SummitActivityHandling
     
-    func view(data: AppActivitySummitDataType, identifier: Identifier) -> Bool  {
+    func view(data: AppActivitySummitDataType, identifier: Identifier)  {
         
          // find in cache
          guard let managedObject = try! data.managedObject.find(identifier, context: Store.shared.managedObjectContext)
-         else { return false }
+            else { return }
          
          switch data {
          
@@ -243,10 +243,10 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
          
             let video = Video(managedObject: managedObject as! VideoManagedObject)
             
-            guard let url = NSURL(string: "https://www.youtube.com/watch?v=" + video.youtube)
-                else { return false }
+            guard let url = URL(string: "https://www.youtube.com/watch?v=" + video.youtube)
+                else { return }
          
-            return NSWorkspace.sharedWorkspace().openURL(url)
+            NSWorkspace.shared().open(url)
          
          case .venue:
             
@@ -256,8 +256,6 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
             
             break
          }
- 
-        return true
     }
     
     func view(screen: AppActivityScreen) {
@@ -281,30 +279,34 @@ final class MainWindowController: NSWindowController, SearchableController, NSSe
             
         case .about:
             
-            showPreferences()
+            self.showPreferences()
+            
+        case .inbox:
+            
+            break
         }
     }
     
-    func search(searchTerm: String) {
+    func search(_ searchTerm: String) {
         
         self.searchTerm = searchTerm
     }
     
     // MARK: - Notifications
     
-    @objc private func windowWillClose(notification: NSNotification) {
+    @objc private func windowWillClose(_ notification: Foundation.Notification) {
         
         let window = notification.object as! NSWindow
         
-        NSNotificationCenter.defaultCenter().removeObserver(self,
-                                                            name: NSWindowWillCloseNotification,
+        NotificationCenter.default.removeObserver(self,
+                                                            name: NSNotification.Name.NSWindowWillClose,
                                                             object: window)
         
-        guard let controllerIndex = childContentWindowControllers.indexOf({ $0.window === window })
+        guard let controllerIndex = childContentWindowControllers.index(where: { $0.window === window })
             else { fatalError("Invalid notification: \(notification)") }
         
         // will release controller, and window
-        childContentWindowControllers.removeAtIndex(controllerIndex)
+        childContentWindowControllers.remove(at: controllerIndex)
     }
 }
 
diff --git a/OpenStack Summit/OpenStackSummit macOS/MemberProfileViewController.swift b/OpenStack Summit/OpenStackSummit macOS/MemberProfileViewController.swift
index 25f14064..e573a999 100644
--- a/OpenStack Summit/OpenStackSummit macOS/MemberProfileViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/MemberProfileViewController.swift	
@@ -51,7 +51,7 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        shareButton.sendActionOn(.LeftMouseDown)
+        shareButton.sendAction(on: .leftMouseDown)
     }
     
     override func viewDidAppear() {
@@ -66,14 +66,14 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
         userActivity?.resignCurrent()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         if case let .speaker(speaker) = profile {
             
             let userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.speaker.rawValue,
-                            AppActivityUserInfo.identifier.rawValue: speaker]
+                            AppActivityUserInfo.identifier.rawValue: speaker] as [String : Any]
             
-            userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject: AnyObject])
+            userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         }
         
         super.updateUserActivityState(userActivity)
@@ -81,13 +81,13 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
     
     // MARK: - Actions
     
-    @IBAction func share(sender: NSButton) {
+    @IBAction func share(_ sender: NSButton) {
         
-        var items = [AnyObject]()
+        var items = [Any]()
         
-        items.append(self.nameLabel.stringValue ?? "")
+        items.append(self.nameLabel.stringValue)
         
-        items.append(self.titleLabel.stringValue ?? "")
+        items.append(self.titleLabel.stringValue)
         
         if descriptionLabel.attributedStringValue.string.isEmpty == false {
             
@@ -105,7 +105,7 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
         
         sharingServicePicker.delegate = self
         
-        sharingServicePicker.showRelativeToRect(sender.bounds, ofView: sender, preferredEdge: NSRectEdge.MinY)
+        sharingServicePicker.show(relativeTo: sender.bounds, of: sender, preferredEdge: NSRectEdge.minY)
     }
     
     // MARK: - Private Methods
@@ -154,7 +154,7 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
                 let userActivity = NSUserActivity(activityType: AppActivity.view.rawValue)
                  userActivity.requiredUserInfoKeys = [AppActivityUserInfo.type.rawValue, AppActivityUserInfo.identifier.rawValue]
                 userActivity.title = self.title
-                userActivity.webpageURL = NSURL(string: speaker.toWebpageURL(summit))
+                userActivity.webpageURL = speaker.webpage(for: summit)
                 userActivity.userInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.speaker.rawValue, AppActivityUserInfo.identifier.rawValue: identifier]
                 
                 userActivity.becomeCurrent()
@@ -171,54 +171,50 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
         }
     }
     
-    private func configureView<T: Person>(person: T) {
+    private func configureView<T: Person>(_ person: T) {
         
         let _ = self.view
         
-        assert(viewLoaded)
+        assert(isViewLoaded)
         
         self.nameLabel.stringValue = person.name
         self.titleLabel.stringValue = person.title ?? ""
         
-        self.imageView.image = NSImage(named: "generic-user-avatar")
-        
-        if let imageURL = NSURL(string: person.pictureURL) {
-            
-            self.imageView.loadCached(imageURL)
-        }
+        self.imageView.image = #imageLiteral(resourceName: "generic-user-avatar")
+        self.imageView.loadCached(person.picture)
         
         // set description
         if let htmlString = person.biography,
-            let data = htmlString.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: false),
-            let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil)
-            where attributedString.string.isEmpty == false {
+            let data = htmlString.data(using: String.Encoding.unicode, allowLossyConversion: false),
+            let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil),
+            attributedString.string.isEmpty == false {
             
-            self.descriptionView.hidden = false
+            self.descriptionView.isHidden = false
             
             let range = NSMakeRange(0, attributedString.length)
             
-            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFontOfSize(14), range: range)
+            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFont(ofSize: 14), range: range)
             
             self.descriptionLabel.attributedStringValue = attributedString
             
         } else {
             
-            self.descriptionView.hidden = true
+            self.descriptionView.isHidden = true
             self.descriptionLabel.stringValue = ""
         }
         
-        locationView.hidden = true
+        locationView.isHidden = true
         
-        twitterView.hidden = person.twitter == nil
+        twitterView.isHidden = person.twitter == nil
         twitterLabel.stringValue = person.twitter ?? ""
         
-        ircView.hidden = person.irc == nil
+        ircView.isHidden = person.irc == nil
         ircLabel.stringValue = person.irc ?? ""
     }
     
     // MARK: - NSSharingServicePickerDelegate
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [AnyObject], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [Any], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
         
         var customItems = [NSSharingService]()
         
@@ -242,14 +238,14 @@ final class MemberProfileViewController: NSViewController, NSSharingServicePicke
         return customItems + proposedServices
     }
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, delegateForSharingService sharingService: NSSharingService) -> NSSharingServiceDelegate? {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, delegateFor sharingService: NSSharingService) -> NSSharingServiceDelegate? {
         
         return self
     }
     
     // MARK: - NSSharingServiceDelegate
     
-    func sharingService(sharingService: NSSharingService, willShareItems items: [AnyObject]) {
+    func sharingService(_ sharingService: NSSharingService, willShareItems items: [Any]) {
         
         sharingService.subject = nameLabel.stringValue
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/SharingService.swift b/OpenStack Summit/OpenStackSummit macOS/SharingService.swift
index 519ba22e..c5e905e0 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SharingService.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SharingService.swift	
@@ -15,7 +15,7 @@ extension NSSharingService {
         
         self.init(title: title, image: NSImage(named: "copyLink")!, alternateImage: nil) {
             
-            let pasteboard = NSPasteboard.generalPasteboard()
+            let pasteboard = NSPasteboard.general()
             
             pasteboard.declareTypes([NSPasteboardTypeString], owner: nil)
             
diff --git a/OpenStack Summit/OpenStackSummit macOS/SpeakerViewController.swift b/OpenStack Summit/OpenStackSummit macOS/SpeakerViewController.swift
index 3ad96074..40d48b05 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SpeakerViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SpeakerViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 
 final class SpeakerViewController: NSViewController {
     
@@ -39,7 +40,7 @@ final class SpeakerViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        eventsViewController.tableView.selectionHighlightStyle = .Regular
+        eventsViewController.tableView.selectionHighlightStyle = .regular
         
         configureView()
     }
@@ -54,17 +55,15 @@ final class SpeakerViewController: NSViewController {
             
             memberProfileViewController.profile = .speaker(speaker)
             
-            let speakerID = NSNumber(longLong: Int64(speaker))
-            
-            let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-            
-            eventsViewController.predicate = NSPredicate(format: "ANY presentation.speakers.id == %@ && summit.id == %@", speakerID, summitID)
+            //eventsViewController.predicate = NSPredicate(format: "ANY presentation.speakers.id == %@ && summit.id == %@", speakerID, summitID)
+            eventsViewController.predicate = (#keyPath(EventManagedObject.presentation.speakers.id)).any(in: [speaker])
+            && #keyPath(EventManagedObject.summit.id) == SummitManager.shared.summit.value
             
         } else {
             
             memberProfileViewController.profile = .currentUser
             
-            eventsViewController.predicate = NSPredicate(value: false)
+            eventsViewController.predicate = .value(false)
         }
     }
 }
diff --git a/OpenStack Summit/OpenStackSummit macOS/SpeakerWindowController.swift b/OpenStack Summit/OpenStackSummit macOS/SpeakerWindowController.swift
index 1520996a..458283d6 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SpeakerWindowController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SpeakerWindowController.swift	
@@ -38,8 +38,8 @@ final class SpeakerWindowController: NSWindowController, ContentController {
                 view.wantsLayer = true
             }
             
-            window.styleMask.insert(.FullSizeContentView)
-            window.titleVisibility = .Hidden
+            window.styleMask.insert(.fullSizeContentView)
+            window.titleVisibility = .hidden
             window.titlebarAppearsTransparent = true
         }
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/SpeakersTableViewController.swift b/OpenStack Summit/OpenStackSummit macOS/SpeakersTableViewController.swift
index bf34d2dc..dd27d1a3 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SpeakersTableViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SpeakersTableViewController.swift	
@@ -10,17 +10,18 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 
 final class SpeakersTableViewController: TableViewController {
     
     // MARK: - Properties
     
-    var predicate = NSPredicate(value: false) {
+    var predicate = Predicate.value(false) {
         
         didSet { configureView() }
     }
     
-    private lazy var cachedPredicate = NSPredicate(format: "cached != nil")
+    private lazy var cachedPredicate: Predicate = (.keyPath(#keyPath(Entity.cached)) != .value(.null))
     
     // MARK: - Loading
     
@@ -32,7 +33,7 @@ final class SpeakersTableViewController: TableViewController {
     
     // MARK: - Actions
     
-    @IBAction func tableViewClick(sender: AnyObject) {
+    @IBAction func tableViewClick(_ sender: AnyObject) {
         
         guard tableView.selectedRow >= 0
             else { return }
@@ -41,7 +42,7 @@ final class SpeakersTableViewController: TableViewController {
         
         let speaker = fetchedResultsController.fetchedObjects![tableView.selectedRow] as! SpeakerManagedObject
         
-        AppDelegate.shared.mainWindowController.view(.speaker, identifier: speaker.identifier)
+        AppDelegate.shared.mainWindowController.view(data: .speaker, identifier: speaker.id)
     }
     
     // MARK: - Private Methods
@@ -50,15 +51,15 @@ final class SpeakersTableViewController: TableViewController {
         
         let _ = self.view
         
-        assert(viewLoaded)
+        assert(isViewLoaded)
         
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [self.predicate, cachedPredicate])
+        let predicate: Predicate = .compound(.and([self.predicate, cachedPredicate]))
         
         self.fetchedResultsController = NSFetchedResultsController(Speaker.self,
                                                                    delegate: self,
                                                                    predicate: predicate,
                                                                    sortDescriptors: SpeakerManagedObject.sortDescriptors,
-                                                                   context: Store.shared.managedObjectContext)
+                                                                   context: Store.shared.managedObjectContext) as! NSFetchedResultsController<Entity>
         
         self.fetchedResultsController.fetchRequest.fetchBatchSize = 10
         
@@ -73,7 +74,7 @@ final class SpeakersTableViewController: TableViewController {
         }
     }
     
-    private func configure(cell cell: SpeakerTableViewCell, at row: Int) {
+    private func configure(cell: SpeakerTableViewCell, at row: Int) {
         
         let managedObject = self.fetchedResultsController.fetchedObjects![row] as! SpeakerManagedObject
         
@@ -81,22 +82,19 @@ final class SpeakersTableViewController: TableViewController {
         
         cell.nameLabel.stringValue = speaker.name
         
-        cell.titleLabel.hidden = speaker.title == nil
+        cell.titleLabel.isHidden = speaker.title == nil
         cell.titleLabel.stringValue = speaker.title ?? ""
         
-        cell.imageView!.image = NSImage(named: "generic-user-avatar")
+        cell.imageView!.image = #imageLiteral(resourceName: "generic-user-avatar")
         
-        if let url = NSURL(string: speaker.pictureURL) {
-            
-            cell.imageView!.loadCached(url)
-        }
+        cell.imageView!.loadCached(speaker.picture)
     }
     
     // MARK: - NSTableViewDataSource
     
-    func tableView(tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
+    func tableView(_ tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
         
-        let cell = tableView.makeViewWithIdentifier(tableColumn!.identifier, owner: nil) as! SpeakerTableViewCell
+        let cell = tableView.make(withIdentifier: tableColumn!.identifier, owner: nil) as! SpeakerTableViewCell
         
         configure(cell: cell, at: row)
         
diff --git a/OpenStack Summit/OpenStackSummit macOS/SpeakersViewController.swift b/OpenStack Summit/OpenStackSummit macOS/SpeakersViewController.swift
index 81845458..d9671678 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SpeakersViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SpeakersViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 
 final class SpeakersViewController: NSViewController, NSFetchedResultsControllerDelegate, NSCollectionViewDataSource, NSCollectionViewDelegate, SearchableController {
     
@@ -26,11 +27,11 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
         didSet { configureView() }
     }
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<SpeakerManagedObject>!
     
     private var summitObserver: Int?
     
-    private lazy var placeholderImage: NSImage = NSImage(named: "generic-user-avatar")!
+    private lazy var placeholderImage: NSImage = #imageLiteral(resourceName: "generic-user-avatar")
     
     // MARK: - Loading
     
@@ -59,11 +60,11 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
         self.userActivity = userActivity
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.speakers.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
@@ -72,22 +73,27 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
     
     private func configureView() {
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
+        let summitID = Expression.value(.int64(SummitManager.shared.summit.value))
         
-        let summitPredicate = NSPredicate(format: "summits.id CONTAINS %@", summitID)
+        //let summitPredicate = NSPredicate(format: "summits.id CONTAINS %@", summitID)
+        let summitPredicate: Predicate = (#keyPath(SpeakerManagedObject.summits.id)).compare(.contains, summitID)
         
-        let searchPredicate: NSPredicate
+        let searchPredicate: Predicate
         
         if searchTerm.isEmpty {
             
-            searchPredicate = NSPredicate(value: true)
+            searchPredicate = .value(true)
             
         } else {
             
-            searchPredicate = NSPredicate(format: "firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@", searchTerm, searchTerm)
+            let value = Expression.value(.string(searchTerm))
+            
+            //searchPredicate = NSPredicate(format: "firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@", searchTerm, searchTerm)
+            searchPredicate = (#keyPath(SpeakerManagedObject.firstName)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(SpeakerManagedObject.lastName)).compare(.contains, [.caseInsensitive], value)
         }
         
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [searchPredicate, summitPredicate])
+        let predicate: Predicate = .compound(.and([searchPredicate, summitPredicate]))
         
         self.fetchedResultsController = NSFetchedResultsController(Speaker.self,
                                                                    delegate: self,
@@ -100,9 +106,9 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
         self.collectionView.reloadData()
     }
     
-    private func configure(item item: CollectionViewItem, at indexPath: NSIndexPath) {
+    private func configure(item: CollectionViewItem, at indexPath: IndexPath) {
         
-        let managedObject = fetchedResultsController.objectAtIndexPath(indexPath) as! SpeakerManagedObject
+        let managedObject = fetchedResultsController.object(at: indexPath)
         
         let speaker = Speaker(managedObject: managedObject)
         
@@ -110,24 +116,24 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
         
         item.placeholderImage = self.placeholderImage
         
-        item.imageURL = NSURL(string: speaker.pictureURL)
+        item.imageURL = speaker.picture
     }
     
     // MARK: - NSCollectionViewDataSource
     
-    func numberOfSectionsInCollectionView(collectionView: NSCollectionView) -> Int {
+    func numberOfSections(in collectionView: NSCollectionView) -> Int {
         
         return fetchedResultsController.sections?.count ?? 0
     }
     
-    func collectionView(collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
+    func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
         
         return self.fetchedResultsController.sections?[section].numberOfObjects ?? 0
     }
     
-    func collectionView(collectionView: NSCollectionView, itemForRepresentedObjectAtIndexPath indexPath: NSIndexPath) -> NSCollectionViewItem {
+    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
         
-        let item = collectionView.makeItemWithIdentifier("PersonCollectionViewItem", forIndexPath: indexPath) as! CollectionViewItem
+        let item = collectionView.makeItem(withIdentifier: "PersonCollectionViewItem", for: indexPath) as! CollectionViewItem
         
         configure(item: item, at: indexPath)
         
@@ -136,25 +142,25 @@ final class SpeakersViewController: NSViewController, NSFetchedResultsController
     
     // MARK: - NSCollectionViewDelegate
     
-    func collectionView(collectionView: NSCollectionView, didSelectItemsAtIndexPaths indexPaths: Set<NSIndexPath>) {
+    func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         
-        defer { collectionView.deselectItemsAtIndexPaths(indexPaths) }
+        defer { collectionView.deselectItems(at: indexPaths) }
         
         let indexPath = indexPaths.first!
         
-        let speaker = fetchedResultsController.objectAtIndexPath(indexPath) as! SpeakerManagedObject
+        let speaker = fetchedResultsController.object(at: indexPath) 
         
-        AppDelegate.shared.mainWindowController.view(.speaker, identifier: speaker.identifier)
+        AppDelegate.shared.mainWindowController.view(data: .speaker, identifier: speaker.id)
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.endUpdates()
         
diff --git a/OpenStack Summit/OpenStackSummit macOS/SummitViewController.swift b/OpenStack Summit/OpenStackSummit macOS/SummitViewController.swift
index f795beec..dc73c0fd 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SummitViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SummitViewController.swift	
@@ -15,20 +15,22 @@ final class SummitViewController: NSViewController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var contentView: NSView!
+    @IBOutlet private(set) weak var contentView: NSView!
     
-    @IBOutlet weak var emptyView: NSView!
+    @IBOutlet private(set) weak var emptyView: NSView!
     
-    @IBOutlet weak var nameLabel: NSTextField!
+    @IBOutlet private(set) weak var nameLabel: NSTextField!
     
-    @IBOutlet weak var dateLabel: NSTextField!
+    @IBOutlet private(set) weak var dateLabel: NSTextField!
     
-    @IBOutlet weak var wirelessNetworkButton: NSButton!
+    @IBOutlet private(set) weak var wirelessNetworkButton: NSButton!
     
     // MARK: - Properties
     
     private var summitObserver: Int?
     
+    private var entityController: EntityController<Summit>?
+    
     // MARK: - Loading
     
     deinit {
@@ -42,38 +44,59 @@ final class SummitViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        summitObserver = SummitManager.shared.summit.observe { [weak self] _ in self?.configureView() }
+        summitObserver = SummitManager.shared.summit.observe { [weak self] _ in self?.setupController() }
         
-        configureView()
+        setupController()
     }
     
     // MARK: - Private Methods
     
-    private func configureView() {
+    private func setupController() {
+        
+        let summitID = SummitManager.shared.summit.value
+        
+        guard summitID > 0 else { self.entityController = nil; return }
+        
+        let entityController = EntityController<Summit>(identifier: summitID,
+                                                        entity: Summit.ManagedObject.self,
+                                                        context: Store.shared.managedObjectContext)
+        
+        entityController.event.inserted = { [weak self] in self?.configureView($0) }
+        
+        entityController.event.updated = { [weak self] in self?.configureView($0) }
+        
+        entityController.event.deleted = { [weak self] _ in self?.configureView(nil) }
+        
+        entityController.enabled = true
+        
+        self.entityController = entityController
+    }
+    
+    private func configureView(_ summit: Summit?) {
         
-        self.contentView.hidden = self.currentSummit == nil
-        self.emptyView.hidden = self.currentSummit != nil
+        self.contentView.isHidden = summit == nil
+        self.emptyView.isHidden = summit != nil
         
-        if let summit = self.currentSummit {
+        if let summit = summit {
             
             nameLabel.stringValue = summit.name
             
-            let dateFormatter = NSDateFormatter()
-            dateFormatter.timeZone = NSTimeZone(name: summit.timeZone)
+            let dateFormatter = DateFormatter()
+            dateFormatter.timeZone = TimeZone(identifier: summit.timeZone)
             dateFormatter.dateFormat = "MMMM dd-"
-            let stringDateFrom = dateFormatter.stringFromDate(summit.start)
+            let stringDateFrom = dateFormatter.string(from: summit.start)
             
             dateFormatter.dateFormat = "dd, yyyy"
-            let stringDateTo = dateFormatter.stringFromDate(summit.end)
+            let stringDateTo = dateFormatter.string(from: summit.end)
             
             dateLabel.stringValue = stringDateFrom + stringDateTo
             
-            let today = NSDate()
+            let today = Date()
             
-            let summitActive = today.mt_isBetweenDate(summit.start, andDate: summit.end)
+            let summitActive = (today as NSDate).mt_isBetweenDate(summit.start, andDate: summit.end)
             
             #if !DEBUG // never hide for debug builds
-            wirelessNetworkButton.hidden = summitActive == false
+            wirelessNetworkButton.isHidden = summitActive == false
             #endif
         }
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/SummitsViewController.swift b/OpenStack Summit/OpenStackSummit macOS/SummitsViewController.swift
index 3ca7a27d..8513dc6f 100644
--- a/OpenStack Summit/OpenStackSummit macOS/SummitsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/SummitsViewController.swift	
@@ -23,7 +23,7 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
     
     // MARK: - Properties
     
-    lazy var pageController = PageController<Summit>(fetch: Store.shared.summits)
+    lazy var pageController: PageController<Summit> = PageController(fetch: Store.shared.summits)
     
     // MARK: - Loading
 
@@ -41,12 +41,12 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         pageController.refresh()
     }
     
-    @IBAction func tableViewClick(sender: AnyObject) {
+    @IBAction func tableViewClick(_ sender: AnyObject) {
         
         defer { tableView.deselectAll(sender) }
         
@@ -58,7 +58,7 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
         
         Store.shared.summit(item.identifier) { [weak self] (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 guard let controller = self else { return }
                 
@@ -66,11 +66,11 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorMessage(error)
                     
-                case .Value:
+                case .value:
                     
                     // set summit
                     SummitManager.shared.summit.value = item.identifier
@@ -85,9 +85,9 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
     // MARK: - Private Methods
     
     @inline(__always)
-    private func configure(cell cell: SummitTableViewCell, with summit: Summit) {
+    private func configure(cell: SummitTableViewCell, with summit: Summit) {
         
-        let currentSummit = SummitManager.shared.summit.value == summit.identifier
+        let currentSummit = SummitManager.shared.summit.value == summit.identifier && self.currentSummit != nil
         
         if currentSummit {
             
@@ -100,13 +100,13 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
         
         cell.nameLabel!.stringValue = summit.name
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: summit.timeZone.name)
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: summit.timeZone.name)
         dateFormatter.dateFormat = "MMMM dd-"
-        let stringDateFrom = dateFormatter.stringFromDate(summit.start.toFoundation())
+        let stringDateFrom = dateFormatter.string(from: summit.start)
         
         dateFormatter.dateFormat = "dd, yyyy"
-        let stringDateTo = dateFormatter.stringFromDate(summit.end.toFoundation())
+        let stringDateTo = dateFormatter.string(from: summit.end)
         
         cell.dateLabel!.stringValue = stringDateFrom + stringDateTo
     }
@@ -115,30 +115,30 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
     
     func showActivityIndicator() {
         
-        refreshButton.hidden = true
-        tableView.hidden = true
-        activityIndicator.hidden = false
+        refreshButton.isHidden = true
+        tableView.isHidden = true
+        activityIndicator.isHidden = false
         activityIndicator.startAnimation(nil)
     }
     
-    func dismissActivityIndicator(animated animated: Bool = true) {
+    func dismissActivityIndicator(_ animated: Bool = true) {
         
-        refreshButton.hidden = false
-        tableView.hidden = false
-        activityIndicator.hidden = true
+        refreshButton.isHidden = false
+        tableView.isHidden = false
+        activityIndicator.isHidden = true
         activityIndicator.stopAnimation(nil)
     }
 
     // MARK: - NSTableViewDataSource
     
-    func numberOfRowsInTableView(tableView: NSTableView) -> Int {
+    func numberOfRows(in tableView: NSTableView) -> Int {
         
         return pageController.items.count
     }
     
     // MARK: - NSTableViewDelegate
     
-    func tableView(tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
+    func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         
         let data = pageController.items[row]
         
@@ -146,7 +146,7 @@ final class SummitsViewController: NSViewController, PagingTableViewController {
             
         case let .item(item):
             
-            let cell = tableView.makeViewWithIdentifier(SummitTableViewCell.identifier, owner: nil) as! SummitTableViewCell
+            let cell = tableView.make(withIdentifier: SummitTableViewCell.identifier, owner: nil) as! SummitTableViewCell
             
             configure(cell: cell, with: item)
             
diff --git a/OpenStack Summit/OpenStackSummit macOS/TableViewController.swift b/OpenStack Summit/OpenStackSummit macOS/TableViewController.swift
index 190f2211..a11e36fe 100644
--- a/OpenStack Summit/OpenStackSummit macOS/TableViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/TableViewController.swift	
@@ -9,6 +9,7 @@
 import Foundation
 import AppKit
 import CoreData
+import CoreSummit
 
 class TableViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate, NSFetchedResultsControllerDelegate {
     
@@ -18,23 +19,23 @@ class TableViewController: NSViewController, NSTableViewDataSource, NSTableViewD
     
     // MARK: - Properties
     
-    final var fetchedResultsController: NSFetchedResultsController!
+    final var fetchedResultsController: NSFetchedResultsController<CoreSummit.Entity>!
     
     // MARK: - UITableViewDataSource
     
-    final func numberOfRowsInTableView(tableView: NSTableView) -> Int {
+    final func numberOfRows(in tableView: NSTableView) -> Int {
         
         return self.fetchedResultsController?.fetchedObjects?.count ?? 0
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    final func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    final func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.beginUpdates()
     }
     
-    final func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    final func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.endUpdates()
         
diff --git a/OpenStack Summit/OpenStackSummit macOS/UXKit.swift b/OpenStack Summit/OpenStackSummit macOS/UXKit.swift
index 5a9b9699..6800807e 100644
--- a/OpenStack Summit/OpenStackSummit macOS/UXKit.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/UXKit.swift	
@@ -17,12 +17,12 @@ public typealias UITableViewDelegate = NSTableViewDelegate
 public typealias UITableView = NSTableView
 public typealias UITableViewCell = NSTableCellView
 
-public extension NSIndexPath {
+public extension IndexPath {
     
     @inline(__always)
-    convenience init(forRow row: Int, inSection section: Int) {
+    init(forRow row: Int, inSection section: Int) {
         
-        self.init(forItem: row, inSection: section)
+        self.init(item: row, section: section)
     }
 }
 
diff --git a/OpenStack Summit/OpenStackSummit macOS/VenueDetailViewController.swift b/OpenStack Summit/OpenStackSummit macOS/VenueDetailViewController.swift
index 30c82503..5da9d615 100644
--- a/OpenStack Summit/OpenStackSummit macOS/VenueDetailViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/VenueDetailViewController.swift	
@@ -56,25 +56,25 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        shareButton.sendActionOn(.LeftMouseDown)
+        shareButton.sendAction(on: .leftMouseDown)
     }
     
     // MARK: - Actions
     
-    @IBAction func share(sender: NSButton) {
+    @IBAction func share(_ sender: NSButton) {
         
         var items = [AnyObject]()
         
-        items.append(venueCache.name)
+        items.append(venueCache.name as AnyObject)
         
-        items.append(venueCache.address)
+        items.append(venueCache.address as AnyObject)
         
         if descriptionLabel.attributedStringValue.string.isEmpty == false {
             
             items.append(descriptionLabel.attributedStringValue)
         }
         
-        if let _ = venueCache.backgroundImageURL,
+        if let _ = venueCache.backgroundImage,
             let venueImage = self.venueImageView.image {
             
             items.append(venueImage)
@@ -84,9 +84,9 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         
         sharingServicePicker.delegate = self
         
-        sharingServicePicker.showRelativeToRect(sender.bounds,
-                                                ofView: sender,
-                                                preferredEdge: .MinY)
+        sharingServicePicker.show(relativeTo: sender.bounds,
+                                                of: sender,
+                                                preferredEdge: .minY)
     }
     
     // MARK: - Private Methods
@@ -95,7 +95,7 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         
         let _ = self.view
         
-        assert(viewLoaded)
+        assert(isViewLoaded)
         
         entityController = EntityController(identifier: venue,
                                             entity: VenueManagedObject.self,
@@ -103,12 +103,12 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         
         entityController.event.updated = { [weak self] in self?.configureView($0) }
         
-        entityController.event.deleted = { [weak self] _ in self?.dismissController(nil) }
+        entityController.event.deleted = { [weak self] _ in self?.dismiss(nil) }
         
         entityController.enabled = true
     }
     
-    private func configureView(venue: VenueListItem) {
+    private func configureView(_ venue: VenueListItem) {
         
         venueCache = venue
         
@@ -118,27 +118,27 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         // set description
         let htmlString = venue.descriptionText
         
-        if let data = htmlString.dataUsingEncoding(NSUnicodeStringEncoding, allowLossyConversion: false),
-            let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil)
-            where attributedString.string.isEmpty == false {
+        if let data = htmlString.data(using: String.Encoding.unicode, allowLossyConversion: false),
+            let attributedString = try? NSMutableAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil),
+            attributedString.string.isEmpty == false {
             
-            self.descriptionView.hidden = false
+            self.descriptionView.isHidden = false
             
             let range = NSMakeRange(0, attributedString.length)
             
-            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFontOfSize(14), range: range)
+            attributedString.addAttribute(NSFontAttributeName, value: NSFont.systemFont(ofSize: 14), range: range)
             
             self.descriptionLabel.attributedStringValue = attributedString
             
         } else {
             
-            self.descriptionView.hidden = true
+            self.descriptionView.isHidden = true
             self.descriptionLabel.stringValue = ""
         }
         
         // TEMP
-        imagesView.hidden = true
-        mapImagesView.hidden = true
+        imagesView.isHidden = true
+        mapImagesView.isHidden = true
         
         //imagesView.hidden = venue.images.isEmpty
         //imagesCollectionView.reloadData()
@@ -148,12 +148,11 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         
         venueImageView.image = nil
         
-        if let urlString = venue.backgroundImageURL,
-            let imageURL = NSURL(string: urlString) {
+        if let imageURL = venue.backgroundImage {
             
-            venueImageViewContainer.hidden = false
+            venueImageViewContainer.isHidden = false
             
-            venueImageActivityIndicator.hidden = false
+            venueImageActivityIndicator.isHidden = false
             venueImageActivityIndicator.startAnimation(self)
             
             venueImageView.loadCached(imageURL) { [weak self] _ in
@@ -161,68 +160,65 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
                 if self?.venueImageView.image != nil {
                     
                     self?.venueImageActivityIndicator.stopAnimation(nil)
-                    self?.venueImageActivityIndicator.hidden = true
+                    self?.venueImageActivityIndicator.isHidden = true
                     
                 } else {
                     
-                    self?.venueImageViewContainer.hidden = true
+                    self?.venueImageViewContainer.isHidden = true
                 }
             }
             
         } else {
             
-            venueImageViewContainer.hidden = true
-            venueImageActivityIndicator.hidden = true
+            venueImageViewContainer.isHidden = true
+            venueImageActivityIndicator.isHidden = true
         }
     }
     
-    private func configure(item item: VenueImageCollectionViewItem, at indexPath: NSIndexPath, collectionView: NSCollectionView) {
+    private func configure(item: VenueImageCollectionViewItem, at indexPath: IndexPath, collectionView: NSCollectionView) {
         
-        let urlString: String
+        let url: URL
         
         switch collectionView {
-        case imagesCollectionView: urlString = venueCache.images[indexPath.item]
-        case mapImagesCollectionView: urlString = venueCache.maps[indexPath.item]
-        default: fatalError()
+        case imagesCollectionView: url = venueCache.images[indexPath.item]
+        case mapImagesCollectionView: url = venueCache.maps[indexPath.item]
+        default: fatalError("Invalid collection view \(collectionView)")
         }
         
         item.imageView!.image = nil
         
-        item.activityIndicator.hidden = false
+        item.activityIndicator.isHidden = false
         item.activityIndicator.startAnimation(nil)
         
-        if let imageURL = NSURL(string: urlString) {
+        item.imageView!.loadCached(url) { _ in
             
-            item.imageView!.loadCached(imageURL) { _ in
+            if let _ = item.imageView?.image {
                 
-                if let _ = item.imageView?.image {
-                    
-                    item.activityIndicator.hidden = true
-                    item.activityIndicator.stopAnimation(nil)
-                }
+                item.activityIndicator.isHidden = true
+                item.activityIndicator.stopAnimation(nil)
             }
         }
     }
     
     // MARK: - NSCollectionViewDataSource
     
-    func numberOfSectionsInCollectionView(collectionView: NSCollectionView) -> Int {
+    func numberOfSections(in collectionView: NSCollectionView) -> Int {
         
         return 1
     }
     
-    func collectionView(collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
+    func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
         
         switch collectionView {
         case imagesCollectionView: return venueCache.images.count
         case mapImagesCollectionView: return venueCache.maps.count
-        default: fatalError()
+        default: fatalError("Invalid collection view \(collectionView)")
         }
     }
     
-    func collectionView(collectionView: NSCollectionView, itemForRepresentedObjectAtIndexPath indexPath: NSIndexPath) -> NSCollectionViewItem {
+    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
         
-        let item = collectionView.makeItemWithIdentifier("VenueImageCollectionViewItem", forIndexPath: indexPath) as! VenueImageCollectionViewItem
+        let item = collectionView.makeItem(withIdentifier: "VenueImageCollectionViewItem", for: indexPath) as! VenueImageCollectionViewItem
         
         configure(item: item, at: indexPath, collectionView: collectionView)
         
@@ -231,29 +227,26 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
     
     // MARK: - NSCollectionViewDelegate
     
-    func collectionView(collectionView: NSCollectionView, didSelectItemsAtIndexPaths indexPaths: Set<NSIndexPath>) {
+    func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         
-        defer { collectionView.deselectItemsAtIndexPaths(indexPaths) }
+        defer { collectionView.deselectItems(at: indexPaths) }
         
         let indexPath = indexPaths.first!
         
-        let imageString: String
+        let imageURL: URL
         
         switch collectionView {
-        case imagesCollectionView: imageString = venueCache.images[indexPath.item]
-        case mapImagesCollectionView: imageString = venueCache.maps[indexPath.item]
+        case imagesCollectionView: imageURL = venueCache.images[indexPath.item]
+        case mapImagesCollectionView: imageURL = venueCache.maps[indexPath.item]
         default: fatalError()
         }
         
-        if let url = NSURL(string: imageString) {
-            
-            NSWorkspace.sharedWorkspace().openURL(url)
-        }
+        NSWorkspace.shared().open(imageURL)
     }
     
     // MARK: - NSSharingServicePickerDelegate
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [AnyObject], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [Any], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
         
         var customItems = [NSSharingService]()
         
@@ -271,27 +264,27 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         return customItems + proposedServices
     }
     
-    func sharingServicePicker(sharingServicePicker: NSSharingServicePicker, delegateForSharingService sharingService: NSSharingService) -> NSSharingServiceDelegate? {
+    func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, delegateFor sharingService: NSSharingService) -> NSSharingServiceDelegate? {
         
         return self
     }
     
     // MARK: - NSSharingServiceDelegate
     
-    func sharingService(sharingService: NSSharingService, willShareItems items: [AnyObject]) {
+    func sharingService(_ sharingService: NSSharingService, willShareItems items: [Any]) {
         
         sharingService.subject = nameLabel.stringValue
     }
     
-    func sharingService(sharingService: NSSharingService, sourceFrameOnScreenForShareItem item: AnyObject) -> NSRect {
+    func sharingService(_ sharingService: NSSharingService, sourceFrameOnScreenForShareItem item: Any) -> NSRect {
         
-        if let image = item as? NSImage where image == self.venueImageView.image {
+        if let image = item as? NSImage, image == self.venueImageView.image {
             
             let imageView = self.venueImageView
             
-            var frame = imageView.convertRect(imageView.bounds, toView: nil)
-            frame = imageView.window!.convertRectToScreen(frame)
-            return frame
+            var frame = imageView?.convert((imageView?.bounds)!, to: nil)
+            frame = imageView?.window!.convertToScreen(frame!)
+            return frame!
             
         } else {
             
@@ -299,11 +292,11 @@ final class VenueDetailViewController: NSViewController, NSCollectionViewDataSou
         }
     }
     
-    func sharingService(sharingService: NSSharingService, sourceWindowForShareItems items: [AnyObject], sharingContentScope: UnsafeMutablePointer<NSSharingContentScope>) -> NSWindow? {
+    func sharingService(_ sharingService: NSSharingService, sourceWindowForShareItems items: [Any], sharingContentScope: UnsafeMutablePointer<NSSharingContentScope>) -> NSWindow? {
         
         if self.view.window?.className == NSPopover.windowClassName {
             
-            return presentingViewController?.view.window
+            return presenting?.view.window
             
         } else {
             
diff --git a/OpenStack Summit/OpenStackSummit macOS/VenueDirectoryViewController.swift b/OpenStack Summit/OpenStackSummit macOS/VenueDirectoryViewController.swift
index a89c9642..cf53e521 100644
--- a/OpenStack Summit/OpenStackSummit macOS/VenueDirectoryViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/VenueDirectoryViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 
 final class VenueDirectoryViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate, NSFetchedResultsControllerDelegate {
     
@@ -19,14 +20,14 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
     
     // MARK: - Properties
     
-    var predicate = NSPredicate(value: true) {
+    var predicate = Predicate.value(true) {
         
         didSet { configureView() }
     }
     
     weak var delegate: VenueDirectoryViewControllerDelegate?
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<VenueManagedObject>!
     
     private var summitObserver: Int?
     
@@ -50,7 +51,7 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
     
     // MARK: - Actions
     
-    @IBAction func tableViewClick(sender: AnyObject? = nil) {
+    @IBAction func tableViewClick(_ sender: AnyObject? = nil) {
         
         guard tableView.selectedRow >= 0
             else { return }
@@ -59,20 +60,19 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
         
         // get selected venue
         
-        let venue = self.fetchedResultsController.fetchedObjects![tableView.selectedRow] as! VenueManagedObject
+        let venue = self.fetchedResultsController.fetchedObjects![tableView.selectedRow]
         
-        delegate?.venueDirectoryViewController(self, didSelect: venue.identifier)
+        delegate?.venueDirectoryViewController(self, didSelect: venue.id)
     }
     
     // MARK: - Private Methods
     
     private func configureView() {
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
+        //let summitPredicate = NSPredicate(format: "summit.id == %@", summitID)
+        let summitPredicate: Predicate = #keyPath(VenueManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitPredicate = NSPredicate(format: "summit.id == %@", summitID)
-        
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [self.predicate, summitPredicate])
+        let predicate: Predicate = .compound(.and([self.predicate, summitPredicate]))
         
         let sort = [NSSortDescriptor(key: "name", ascending: true)]
         
@@ -87,32 +87,32 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
         self.tableView.reloadData()
     }
     
-    private func configure(cell cell: VenueTableViewCell, at row: Int) {
+    private func configure(cell: VenueTableViewCell, at row: Int) {
         
         assert(fetchedResultsController.fetchedObjects != nil)
         
-        let venueManagedObject = fetchedResultsController.fetchedObjects![row] as! VenueManagedObject
+        let venueManagedObject = fetchedResultsController.fetchedObjects![row]
         
         let venue = VenueListItem(managedObject: venueManagedObject)
         
         cell.venueNameLabel.stringValue = venue.name
         cell.venueAddressLabel.stringValue = venue.address
         
-        cell.imageURL = NSURL(string: venue.backgroundImageURL ?? "")
+        cell.imageURL = venue.backgroundImage
     }
     
     // MARK: - NSTableViewDataSource
     
-    func numberOfRowsInTableView(tableView: NSTableView) -> Int {
+    func numberOfRows(in tableView: NSTableView) -> Int {
         
         return self.fetchedResultsController?.fetchedObjects?.count ?? 0
     }
     
     // MARK: - NSTableViewDelegate
     
-    func tableView(tableView: NSTableView, viewForTableColumn tableColumn: NSTableColumn?, row: Int) -> NSView? {
+    func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         
-        let cell = tableView.makeViewWithIdentifier(tableColumn!.identifier, owner: nil) as! VenueTableViewCell
+        let cell = tableView.make(withIdentifier: tableColumn!.identifier, owner: nil) as! VenueTableViewCell
         
         configure(cell: cell, at: row)
         
@@ -121,12 +121,12 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.endUpdates()
         
@@ -186,7 +186,7 @@ final class VenueDirectoryViewController: NSViewController, NSTableViewDataSourc
 
 @objc protocol VenueDirectoryViewControllerDelegate: class {
     
-    func venueDirectoryViewController(controller: VenueDirectoryViewController, didSelect venue: Identifier)
+    func venueDirectoryViewController(_ controller: VenueDirectoryViewController, didSelect venue: Identifier)
 }
 
 final class VenueTableViewCell: ImageTableViewCell {
diff --git a/OpenStack Summit/OpenStackSummit macOS/VenuesMapViewController.swift b/OpenStack Summit/OpenStackSummit macOS/VenuesMapViewController.swift
index 5e018d2b..1f0ef8a6 100644
--- a/OpenStack Summit/OpenStackSummit macOS/VenuesMapViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/VenuesMapViewController.swift	
@@ -12,6 +12,7 @@ import MapKit
 import CoreLocation
 import CoreData
 import CoreSummit
+import Predicate
 
 final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetchedResultsControllerDelegate {
     
@@ -21,17 +22,17 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
     
     // MARK: - Properties
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<VenueManagedObject>!
     
     private var summitObserver: Int?
     
     private lazy var popover: (NSPopover, VenueDetailViewController) = {
         
-        let venueDetailViewController = self.storyboard!.instantiateControllerWithIdentifier("VenueDetailViewController") as! VenueDetailViewController
+        let venueDetailViewController = self.storyboard!.instantiateController(withIdentifier: "VenueDetailViewController") as! VenueDetailViewController
         self.addChildViewController(venueDetailViewController)
         
         let popover = NSPopover()
-        popover.behavior = .Transient
+        popover.behavior = .transient
         popover.animates = true
         popover.contentViewController = venueDetailViewController
         
@@ -65,21 +66,27 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
     // MARK: - Private Methods
     
     private func configureView() {
+                
+        //let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
+        let predicate: Predicate = .keyPath(#keyPath(VenueManagedObject.latitude)) != .value(.null)
+            && .keyPath(#keyPath(VenueManagedObject.longitude)) != .value(.null)
+            && #keyPath(VenueManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-        
-        let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
-        
-        let sort = [NSSortDescriptor(key: "venueType", ascending: true), NSSortDescriptor(key: "name", ascending: true)]
+        let sort = [NSSortDescriptor(key: #keyPath(VenueManagedObject.venueType), ascending: true),
+                    NSSortDescriptor(key: #keyPath(VenueManagedObject.name), ascending: true)]
         
-        self.fetchedResultsController = NSFetchedResultsController(Venue.self, delegate: self, predicate: predicate, sortDescriptors: sort, context: Store.shared.managedObjectContext)
+        self.fetchedResultsController = NSFetchedResultsController(Venue.self,
+                                                                   delegate: self,
+                                                                   predicate: predicate,
+                                                                   sortDescriptors: sort,
+                                                                   context: Store.shared.managedObjectContext)
         
         try! self.fetchedResultsController.performFetch()
         
         // reload mapview
         self.mapView.removeAnnotations(self.mapView.annotations)
         
-        for venue in Venue.from(managedObjects: (self.fetchedResultsController.fetchedObjects as! [VenueManagedObject])) {
+        for venue in Venue.from(managedObjects: (self.fetchedResultsController.fetchedObjects ?? [])) {
             
             let annotation = VenueAnnotation(venue: venue)!
             
@@ -89,13 +96,13 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
         showSelectedVenue(nil)
     }
     
-    func showSelectedVenue(venue: Identifier?) {
+    func showSelectedVenue(_ venue: Identifier?) {
         
         mapView.showAnnotations(mapView.annotations, animated: true)
         
         if let venueID = venue,
             let venue = try! Venue.find(venueID, context: Store.shared.managedObjectContext),
-            let selectedAnnotation = mapView.annotations.firstMatching({ $0.coordinate.latitude == Double(venue.latitude ?? "") && $0.coordinate.longitude == Double(venue.longitude ?? "") }) {
+            let selectedAnnotation = mapView.annotations.first(where: { $0.coordinate.latitude == Double(venue.latitude ?? "") && $0.coordinate.longitude == Double(venue.longitude ?? "") }) {
             
             mapView.selectAnnotation(selectedAnnotation, animated: true)
         }
@@ -103,7 +110,7 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
     
     // MARK: - MKMapViewDelegate
     
-    func mapView(mapView: MKMapView, viewForAnnotation annotation: MKAnnotation) -> MKAnnotationView? {
+    func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
         
         if annotation is VenueAnnotation {
             
@@ -111,7 +118,7 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
             
             let annotationView: MKAnnotationView
             
-            if let dequeuedView = mapView.dequeueReusableAnnotationViewWithIdentifier(reuseIdentifier) as? MKPinAnnotationView {
+            if let dequeuedView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseIdentifier) as? MKPinAnnotationView {
                 
                 annotationView = dequeuedView
                 
@@ -120,7 +127,7 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
                 let newAnnotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseIdentifier)
                 
                 newAnnotationView.canShowCallout = true
-                newAnnotationView.pinTintColor = .redColor()
+                newAnnotationView.pinTintColor = .red
                 
                 annotationView = newAnnotationView
             }
@@ -131,7 +138,7 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
         return nil
     }
     
-    func mapView(mapView: MKMapView, didSelectAnnotationView annotationView: MKAnnotationView) {
+    func mapView(_ mapView: MKMapView, didSelect annotationView: MKAnnotationView) {
         
         if let venueAnnotation = annotationView.annotation as? VenueAnnotation {
             
@@ -139,15 +146,15 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
             
             popover.1.venue = venueAnnotation.venue
             
-            popover.0.showRelativeToRect(annotationView.bounds,
-                                         ofView: annotationView,
-                                         preferredEdge: .MinX)
+            popover.0.show(relativeTo: annotationView.bounds,
+                                         of: annotationView,
+                                         preferredEdge: .minX)
         }
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         let managedObject = anObject as! VenueManagedObject
         
@@ -158,22 +165,22 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
         
         switch type {
             
-        case .Insert:
+        case .insert:
             
             let annotation = VenueAnnotation(venue: venue)!
             
             mapView.addAnnotation(annotation)
             
-        case .Delete:
+        case .delete:
             
-            guard let annotation = mapView.annotations.firstMatching({ ($0 as? VenueAnnotation)?.venue == venue.identifier })
+            guard let annotation = mapView.annotations.first(where: { ($0 as? VenueAnnotation)?.venue == venue.identifier })
                 else { return }
             
             mapView.removeAnnotation(annotation)
             
-        case .Update:
+        case .update:
             
-            guard let annotation = mapView.annotations.firstMatching({ ($0 as? VenueAnnotation)?.venue == venue.identifier }) as? VenueAnnotation
+            guard let annotation = mapView.annotations.first(where: { ($0 as? VenueAnnotation)?.venue == venue.identifier }) as? VenueAnnotation
                 else { return }
             
             if annotation.coordinate.latitude == location.latitude
@@ -191,7 +198,7 @@ final class VenueMapViewController: NSViewController, MKMapViewDelegate, NSFetch
                 mapView.addAnnotation(newAnnotation)
             }
             
-        case .Move: break
+        case .move: break
         }
     }
 }
@@ -204,9 +211,9 @@ final class VenueAnnotation: NSObject, MKAnnotation {
     
     let coordinate: CLLocationCoordinate2D
     
-    private(set) var title: String?
+    fileprivate(set) var title: String?
     
-    private(set) var subtitle: String?
+    fileprivate(set) var subtitle: String?
     
     init?(venue: Venue) {
         
diff --git a/OpenStack Summit/OpenStackSummit macOS/VenuesSplitViewController.swift b/OpenStack Summit/OpenStackSummit macOS/VenuesSplitViewController.swift
index a56cc7be..c2e0333b 100644
--- a/OpenStack Summit/OpenStackSummit macOS/VenuesSplitViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/VenuesSplitViewController.swift	
@@ -9,6 +9,7 @@
 import Foundation
 import AppKit
 import CoreSummit
+import Predicate
 
 final class VenuesSplitViewController: NSSplitViewController, SearchableController, VenueDirectoryViewControllerDelegate {
     
@@ -39,11 +40,11 @@ final class VenuesSplitViewController: NSSplitViewController, SearchableControll
         configureView()
     }
     
-    override func updateUserActivityState(userActivity: NSUserActivity) {
+    override func updateUserActivityState(_ userActivity: NSUserActivity) {
         
         let userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue]
         
-        userActivity.addUserInfoEntriesFromDictionary(userInfo as [NSObject : AnyObject])
+        userActivity.addUserInfoEntries(from: userInfo as [AnyHashable: Any])
         
         super.updateUserActivityState(userActivity)
     }
@@ -52,20 +53,31 @@ final class VenuesSplitViewController: NSSplitViewController, SearchableControll
     
     private func configureView() {
         
-        let searchPredicate: NSPredicate
+        let searchPredicate: Predicate
         
         if searchTerm.isEmpty {
             
-            searchPredicate = NSPredicate(value: true)
+            searchPredicate = .value(true)
             
         } else {
             
-            searchPredicate = NSPredicate(format: "name CONTAINS[c] %@ OR address CONTAINS[c] %@ OR city CONTAINS[c] %@ OR state CONTAINS[c] %@ OR country CONTAINS[c] %@ OR zipCode CONTAINS[c] %@", searchTerm, searchTerm, searchTerm, searchTerm, searchTerm, searchTerm)
+            let value = Expression.value(.string(searchTerm))
+            
+            //searchPredicate = NSPredicate(format: "name CONTAINS[c] %@ OR address CONTAINS[c] %@ OR city CONTAINS[c] %@ OR state CONTAINS[c] %@ OR country CONTAINS[c] %@ OR zipCode CONTAINS[c] %@", searchTerm, searchTerm, searchTerm, searchTerm, searchTerm, searchTerm)
+            
+            searchPredicate = (#keyPath(VenueManagedObject.name)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(VenueManagedObject.address)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(VenueManagedObject.city)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(VenueManagedObject.state)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(VenueManagedObject.country)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(VenueManagedObject.zipCode)).compare(.contains, [.caseInsensitive], value)
         }
         
-        let mapVenuesPredicate = NSPredicate(format: "latitude != nil AND longitude != nil")
+        //let mapVenuesPredicate = NSPredicate(format: "latitude != nil AND longitude != nil")
+        let mapVenuesPredicate: Predicate = .keyPath(#keyPath(VenueManagedObject.latitude)) != .value(.null)
+            && .keyPath(#keyPath(VenueManagedObject.longitude)) != .value(.null)
         
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [mapVenuesPredicate, searchPredicate])
+        let predicate: Predicate = .compound(.and([mapVenuesPredicate, searchPredicate]))
         
         venueDirectoryViewController.predicate = predicate
         
@@ -77,7 +89,7 @@ final class VenuesSplitViewController: NSSplitViewController, SearchableControll
             // set user activity for handoff
             let userActivity = NSUserActivity(activityType: AppActivity.screen.rawValue)
             userActivity.title = "Venues"
-            userActivity.webpageURL = NSURL(string: summit.webpageURL + "/travel")
+            userActivity.webpageURL = summit.webpage.appendingPathComponent("travel")
             userActivity.userInfo = [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue]
             userActivity.requiredUserInfoKeys = [AppActivityUserInfo.screen.rawValue]
             userActivity.becomeCurrent()
@@ -88,7 +100,7 @@ final class VenuesSplitViewController: NSSplitViewController, SearchableControll
     
     // MARK: - VenueDirectoryViewControllerDelegate
     
-    func venueDirectoryViewController(controller: VenueDirectoryViewController, didSelect venue: Identifier) {
+    func venueDirectoryViewController(_ controller: VenueDirectoryViewController, didSelect venue: Identifier) {
         
         venueMapViewController.showSelectedVenue(venue)
     }
diff --git a/OpenStack Summit/OpenStackSummit macOS/VideosViewController.swift b/OpenStack Summit/OpenStackSummit macOS/VideosViewController.swift
index edcdd94a..c17a13fa 100644
--- a/OpenStack Summit/OpenStackSummit macOS/VideosViewController.swift	
+++ b/OpenStack Summit/OpenStackSummit macOS/VideosViewController.swift	
@@ -10,6 +10,7 @@ import Foundation
 import AppKit
 import CoreData
 import CoreSummit
+import Predicate
 import XCDYouTubeKit
 
 final class VideosViewController: NSViewController, NSFetchedResultsControllerDelegate, NSCollectionViewDataSource, NSCollectionViewDelegate, SearchableController {
@@ -27,7 +28,7 @@ final class VideosViewController: NSViewController, NSFetchedResultsControllerDe
         didSet { configureView() }
     }
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<VideoManagedObject>!
     
     private var summitObserver: Int?
     
@@ -53,22 +54,22 @@ final class VideosViewController: NSViewController, NSFetchedResultsControllerDe
     
     private func configureView() {
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
+        //let summitPredicate = NSPredicate(format: "event.summit.id == %@", summitID)
+        let summitPredicate: Predicate = #keyPath(VideoManagedObject.event.summit.id) == SummitManager.shared.summit.value
         
-        let summitPredicate = NSPredicate(format: "event.summit.id == %@", summitID)
-        
-        let searchPredicate: NSPredicate
+        let searchPredicate: Predicate
         
         if searchTerm.isEmpty {
             
-            searchPredicate = NSPredicate(value: true)
+            searchPredicate = .value(true)
             
         } else {
             
-            searchPredicate = NSPredicate(format: "event.name CONTAINS[c] %@", searchTerm)
+            //searchPredicate = NSPredicate(format: "event.name CONTAINS[c] %@", searchTerm)
+            searchPredicate = (#keyPath(VideoManagedObject.event.name)).compare(.contains, [.caseInsensitive], .value(.string(searchTerm)))
         }
         
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [searchPredicate, summitPredicate])
+        let predicate: Predicate = .compound(.and([searchPredicate, summitPredicate]))
         
         let sort = [NSSortDescriptor(key: "event.name", ascending: true)]
         
@@ -83,30 +84,30 @@ final class VideosViewController: NSViewController, NSFetchedResultsControllerDe
         self.collectionView.reloadData()
     }
     
-    private func configure(item item: CollectionViewItem, at indexPath: NSIndexPath) {
+    private func configure(item: CollectionViewItem, at indexPath: IndexPath) {
         
-        let video = fetchedResultsController.objectAtIndexPath(indexPath) as! VideoManagedObject
+        let video = fetchedResultsController.object(at: indexPath)
                 
         item.textField!.stringValue = video.event.name
         
-        item.imageURL = NSURL(youtubeThumbnail: video.youtube)
+        item.imageURL = URL(youtubeThumbnail: video.youtube)
     }
     
     // MARK: - NSCollectionViewDataSource
     
-    func numberOfSectionsInCollectionView(collectionView: NSCollectionView) -> Int {
+    func numberOfSections(in collectionView: NSCollectionView) -> Int {
         
         return fetchedResultsController.sections?.count ?? 0
     }
     
-    func collectionView(collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
+    func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
         
         return self.fetchedResultsController.sections?[section].numberOfObjects ?? 0
     }
     
-    func collectionView(collectionView: NSCollectionView, itemForRepresentedObjectAtIndexPath indexPath: NSIndexPath) -> NSCollectionViewItem {
+    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
         
-        let item = collectionView.makeItemWithIdentifier("VideoCollectionViewItem", forIndexPath: indexPath) as! CollectionViewItem
+        let item = collectionView.makeItem(withIdentifier: "VideoCollectionViewItem", for: indexPath) as! CollectionViewItem
         
         configure(item: item, at: indexPath)
         
@@ -115,26 +116,26 @@ final class VideosViewController: NSViewController, NSFetchedResultsControllerDe
     
     // MARK: - NSCollectionViewDelegate
     
-    func collectionView(collectionView: NSCollectionView, didSelectItemsAtIndexPaths indexPaths: Set<NSIndexPath>) {
+    func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         
-        defer { collectionView.deselectItemsAtIndexPaths(indexPaths) }
+        defer { collectionView.deselectItems(at: indexPaths) }
         
         indexPaths.forEach {
                         
-            let video = fetchedResultsController.objectAtIndexPath($0) as! VideoManagedObject
+            let video = fetchedResultsController.object(at: $0)
             
-            AppDelegate.shared.mainWindowController.view(.video, identifier: video.identifier)
+            AppDelegate.shared.mainWindowController.view(data: .video, identifier: video.id)
         }
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         //self.tableView.endUpdates()
         
diff --git a/OpenStack Summit/OpenStackSummitTV/AppDelegate.swift b/OpenStack Summit/OpenStackSummitTV/AppDelegate.swift
index 3b030f1d..ecd899f2 100644
--- a/OpenStack Summit/OpenStackSummitTV/AppDelegate.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/AppDelegate.swift	
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 @UIApplicationMain
@@ -15,7 +15,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
     
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         
         // print app info
@@ -25,39 +25,46 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         // set appearance
         SetAppearance()
         
+        #if DEBUG
+        DataUpdatePoller.shared.log = { print("DataUpdatePoller: " + $0) }
+        #endif
+        
+        // start data poller
+        DataUpdatePoller.shared.start()
+        
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-    func application(app: UIApplication, openURL url: NSURL, options: [String : AnyObject]) -> Bool {
+    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
         
         return open(url: url)
     }
     
     // MARK: - Private Methods
     
-    private func open(url url: NSURL) -> Bool {
+    private func open(url: URL) -> Bool {
         
         print("App should open URL: \(url)")
         
diff --git a/OpenStack Summit/OpenStackSummitTV/Appearance.swift b/OpenStack Summit/OpenStackSummitTV/Appearance.swift
index e77a544b..038edf9f 100644
--- a/OpenStack Summit/OpenStackSummitTV/Appearance.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/Appearance.swift	
@@ -10,6 +10,6 @@ import UIKit
 
 func SetAppearance() {
     
-    UINavigationBar.appearance().translucent = true
+    UINavigationBar.appearance().isTranslucent = true
     UINavigationBar.appearance().tintColor = UIColor(hexString: "#214065")
 }
diff --git a/OpenStack Summit/OpenStackSummitTV/EventDatesViewController.swift b/OpenStack Summit/OpenStackSummitTV/EventDatesViewController.swift
index 06c1919f..9d9a4051 100644
--- a/OpenStack Summit/OpenStackSummitTV/EventDatesViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/EventDatesViewController.swift	
@@ -7,8 +7,9 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
+import Predicate
 
 @objc(OSSTVEventDatesViewController)
 final class EventDatesViewController: UITableViewController {
@@ -20,20 +21,20 @@ final class EventDatesViewController: UITableViewController {
         didSet { updateUI() }
     }
     
-    private static let dateFormatter: NSDateFormatter = {
+    private static let dateFormatter: DateFormatter = {
        
-        let dateFormatter = NSDateFormatter()
+        let dateFormatter = DateFormatter()
         
         dateFormatter.dateFormat = "MMMM d"
         
         return dateFormatter
     }()
     
-    private static let performSegueDelay: NSTimeInterval = 0.1
+    private static let performSegueDelay: TimeInterval = 0.1
     
-    private var lastSelectedIndexPath: NSIndexPath?
+    private var lastSelectedIndexPath: IndexPath?
     
-    private let delayedSeguesOperationQueue = NSOperationQueue()
+    private let delayedSeguesOperationQueue = OperationQueue()
     
     // MARK: - Loading
     
@@ -60,7 +61,7 @@ final class EventDatesViewController: UITableViewController {
     
     // MARK: - Actions
     
-    @IBAction func loadData(sender: AnyObject? = nil) {
+    @IBAction func loadData(_ sender: AnyObject? = nil) {
         
         state = .loading
         
@@ -78,15 +79,15 @@ final class EventDatesViewController: UITableViewController {
                 
                 guard let controller = self else { return }
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock {
+                OperationQueue.main.addOperation {
                     
                     switch response {
                         
-                    case let .Error(error):
+                    case let .error(error):
                         
                         controller.state = .error(error)
                         
-                    case let .Value(summit):
+                    case let .value(summit):
                         
                         controller.state = State(summit: summit)
                     }
@@ -118,8 +119,8 @@ final class EventDatesViewController: UITableViewController {
             
             NSDate.mt_setTimeZone(timeZone)
             
-            self.tableView.selectRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0), animated: true, scrollPosition: .None)
-            self.performSegueWithIdentifier("showDayEvents", sender: self)
+            self.tableView.selectRow(at: IndexPath(row: 0, section: 0), animated: true, scrollPosition: .none)
+            self.performSegue(withIdentifier: "showDayEvents", sender: self)
         }
         
         tableView.reloadData()
@@ -127,62 +128,62 @@ final class EventDatesViewController: UITableViewController {
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         guard case let .summit(start, end, _, _) = state
             else { return 0 }
         
-        return end.mt_daysSinceDate(start)
+        return (end as NSDate).mt_days(since: start)
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("EventDayTableViewCell")!
+        let cell = tableView.dequeueReusableCell(withIdentifier: "EventDayTableViewCell")!
         
         guard case let .summit(start, _, _, _) = state
             else { fatalError("Invalid state") }
         
-        let date = start.mt_dateDaysAfter(indexPath.row)
+        let date = (start as NSDate).mt_dateDays(after: indexPath.row)!
         
-        cell.textLabel?.text = EventDatesViewController.dateFormatter.stringFromDate(date)
+        cell.textLabel?.text = EventDatesViewController.dateFormatter.string(from: date)
         
         return cell
     }
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didUpdateFocusInContext context: UITableViewFocusUpdateContext, withAnimationCoordinator coordinator: UIFocusAnimationCoordinator) {
+    override func tableView(_ tableView: UITableView, didUpdateFocusIn context: UITableViewFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
         // Check that the next focus view is a child of the table view.
-        guard let nextFocusedView = context.nextFocusedView where nextFocusedView.isDescendantOfView(tableView) else { return }
+        guard let nextFocusedView = context.nextFocusedView, nextFocusedView.isDescendant(of: tableView) else { return }
         guard let indexPath = context.nextFocusedIndexPath else { return }
         
         // Cancel any previously queued segues.
         delayedSeguesOperationQueue.cancelAllOperations()
         
         // Create an `NSBlockOperation` to perform the detail segue after a delay.
-        let performSegueOperation = NSBlockOperation()
+        let performSegueOperation = BlockOperation()
         
         performSegueOperation.addExecutionBlock { [weak self, unowned performSegueOperation] in
             
             guard let controller = self else { return }
             
             // Pause the block so the segue isn't immediately performed.
-            NSThread.sleepForTimeInterval(0.1)
+            Thread.sleep(forTimeInterval: 0.1)
             
             /*
              Check that the operation wasn't cancelled and that the segue identifier
              is different to the last performed segue identifier.
              */
-            guard performSegueOperation.cancelled == false
+            guard performSegueOperation.isCancelled == false
                 && indexPath != controller.lastSelectedIndexPath
                 else { return }
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 // Record the last performed segue identifier.
                 controller.lastSelectedIndexPath = indexPath
@@ -191,8 +192,8 @@ final class EventDatesViewController: UITableViewController {
                  Select the focused cell so that the table view visibly reflects
                  which detail view is being shown.
                  */
-                controller.tableView.selectRowAtIndexPath(indexPath, animated: true, scrollPosition: .None)
-                controller.performSegueWithIdentifier("showDayEvents", sender: self)
+                controller.tableView.selectRow(at: indexPath, animated: true, scrollPosition: .none)
+                controller.performSegue(withIdentifier: "showDayEvents", sender: self)
             }
         }
         
@@ -201,7 +202,7 @@ final class EventDatesViewController: UITableViewController {
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -212,13 +213,15 @@ final class EventDatesViewController: UITableViewController {
             
             let indexPath = tableView.indexPathForSelectedRow!
             
-            let selectedDate = start.mt_dateDaysAfter(indexPath.row)
+            let selectedDate = (start as NSDate).mt_dateDays(after: indexPath.row)!
             
-            let endDate = selectedDate.mt_endOfCurrentDay()
+            let endDate = (selectedDate as NSDate).mt_endOfCurrentDay()!
             
-            let predicate = NSPredicate(format: "start >= %@ AND end <= %@", selectedDate, endDate)
+            //let predicate = NSPredicate(format: "start >= %@ AND end <= %@", selectedDate, endDate)
+            let predicate: Predicate = #keyPath(EventManagedObject.start) >= selectedDate
+                && #keyPath(EventManagedObject.end) <= endDate
             
-            let destinationViewController = segue.destinationViewController as! UINavigationController
+            let destinationViewController = segue.destination as! UINavigationController
             
             let eventsViewController = destinationViewController.topViewController as! EventsViewController
             
@@ -240,16 +243,16 @@ extension EventDatesViewController {
     enum State {
         
         case loading
-        case error(ErrorType)
-        case summit(start: NSDate, end: NSDate, name: String, timeZone: NSTimeZone)
+        case error(Error)
+        case summit(start: Date, end: Date, name: String, timeZone: Foundation.TimeZone)
         
         init(summit: Summit) {
             
-            let start = summit.start.toFoundation().mt_startOfCurrentDay()
+            let start = (summit.start as NSDate).mt_startOfCurrentDay()!
             
-            let end = summit.end.toFoundation().mt_dateDaysAfter(1)
+            let end = (summit.end as NSDate).mt_dateDays(after: 1)!
             
-            let timeZone = NSTimeZone(name: summit.timeZone)!
+            let timeZone = TimeZone(identifier: summit.timeZone)!
             
             self = .summit(start: start, end: end, name: summit.name, timeZone: timeZone)
         }
diff --git a/OpenStack Summit/OpenStackSummitTV/EventDetail.storyboard b/OpenStack Summit/OpenStackSummitTV/EventDetail.storyboard
index 3b037855..a69380e4 100644
--- a/OpenStack Summit/OpenStackSummitTV/EventDetail.storyboard	
+++ b/OpenStack Summit/OpenStackSummitTV/EventDetail.storyboard	
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="10117" systemVersion="16A313a" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" initialViewController="p6J-ZT-cbq">
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="p6J-ZT-cbq">
+    <device id="appleTV" orientation="landscape">
+        <adaptation id="light"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <deployment identifier="tvOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Event-->
@@ -15,7 +20,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventNameCell" textLabel="MGk-bD-dbm" rowHeight="100" style="IBUITableViewCellStyleDefault" id="wAT-Fx-ao6">
-                                <rect key="frame" x="0.0" y="199" width="1920" height="100"/>
+                                <rect key="frame" x="0.0" y="40" width="1920" height="100"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wAT-Fx-ao6" id="MNp-BB-WOH">
                                     <rect key="frame" x="0.0" y="0.0" width="1904" height="100"/>
@@ -25,14 +30,14 @@
                                             <rect key="frame" x="20" y="0.0" width="1864" height="100"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                 </tableViewCellContentView>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="EventTrackCell" textLabel="9WN-Rg-rVr" rowHeight="100" style="IBUITableViewCellStyleDefault" id="UWh-as-80j">
-                                <rect key="frame" x="0.0" y="313" width="1920" height="100"/>
+                                <rect key="frame" x="0.0" y="154" width="1920" height="100"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UWh-as-80j" id="M6c-FI-y09">
                                     <rect key="frame" x="0.0" y="0.0" width="1844" height="100"/>
@@ -42,7 +47,7 @@
                                             <rect key="frame" x="20" y="0.0" width="1824" height="100"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
-                                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -51,14 +56,14 @@
                                     <segue destination="FD6-bu-Rpe" kind="show" identifier="showTrackEvents" id="FuB-Gw-jrh"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EventVideoCell" rowHeight="500" id="qok-Ya-SkY" customClass="VideoPlayerTableViewCell" customModule="OpenStackSummitTV" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="427" width="1920" height="500"/>
+                            <tableViewCell contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="EventVideoCell" rowHeight="500" id="qok-Ya-SkY" customClass="VideoPlayerTableViewCell" customModule="OpenStackSummitTV" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="268" width="1920" height="500"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qok-Ya-SkY" id="rtb-QA-y5V">
                                     <rect key="frame" x="0.0" y="0.0" width="1904" height="500"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="crP-mC-Cr5">
+                                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="crP-mC-Cr5">
                                             <rect key="frame" x="928" y="218" width="64" height="64"/>
                                         </activityIndicatorView>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Zo7-M0-Kvu">
@@ -73,8 +78,10 @@
                                     </subviews>
                                     <constraints>
                                         <constraint firstAttribute="trailing" secondItem="Zo7-M0-Kvu" secondAttribute="trailing" constant="20" id="5u7-Ha-LfM"/>
+                                        <constraint firstItem="crP-mC-Cr5" firstAttribute="centerY" secondItem="rtb-QA-y5V" secondAttribute="centerY" id="8PH-tA-XRe"/>
                                         <constraint firstItem="Zo7-M0-Kvu" firstAttribute="top" secondItem="rtb-QA-y5V" secondAttribute="top" constant="20" id="Jnr-6R-JXJ"/>
                                         <constraint firstAttribute="bottom" secondItem="Zo7-M0-Kvu" secondAttribute="bottom" constant="20" id="L9c-pe-aVI"/>
+                                        <constraint firstItem="crP-mC-Cr5" firstAttribute="centerX" secondItem="rtb-QA-y5V" secondAttribute="centerX" id="Owr-ih-0U4"/>
                                         <constraint firstItem="ZqP-Cm-skb" firstAttribute="centerY" secondItem="rtb-QA-y5V" secondAttribute="centerY" id="Yxv-zf-mNa"/>
                                         <constraint firstItem="ZqP-Cm-skb" firstAttribute="centerX" secondItem="rtb-QA-y5V" secondAttribute="centerX" id="tRW-F6-DRz"/>
                                         <constraint firstItem="Zo7-M0-Kvu" firstAttribute="leading" secondItem="rtb-QA-y5V" secondAttribute="leading" constant="20" id="thb-iY-Ia1"/>
@@ -87,7 +94,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventTimeCell" rowHeight="80" id="PSI-Ha-JwH" customClass="DetailImageTableViewCell" customModule="OpenStackSummitTV" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="941" width="1920" height="80"/>
+                                <rect key="frame" x="0.0" y="782" width="1920" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PSI-Ha-JwH" id="lTj-k5-zSV">
                                     <rect key="frame" x="0.0" y="0.0" width="1904" height="80"/>
@@ -102,7 +109,7 @@
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date and Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pTD-8Q-B5N">
                                             <rect key="frame" x="92" y="20" width="1800" height="40"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="38"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -123,7 +130,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="EventLocationCell" rowHeight="80" id="Jqm-Sh-GcQ" customClass="DetailImageTableViewCell" customModule="OpenStackSummitTV" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="1035" width="1920" height="80"/>
+                                <rect key="frame" x="0.0" y="876" width="1920" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Jqm-Sh-GcQ" id="Fvm-yK-nBA">
                                     <rect key="frame" x="0.0" y="0.0" width="1844" height="80"/>
@@ -138,7 +145,7 @@
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" semanticContentAttribute="playback" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Marriot" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rcP-lf-vS2">
                                             <rect key="frame" x="92" y="20" width="121" height="40"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="38"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -160,7 +167,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventDescriptionCell" textLabel="PO5-ig-3yy" rowHeight="100" style="IBUITableViewCellStyleDefault" id="p9x-au-rk5">
-                                <rect key="frame" x="0.0" y="1129" width="1920" height="100"/>
+                                <rect key="frame" x="0.0" y="970" width="1920" height="100"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="p9x-au-rk5" id="9lF-lR-HUX">
                                     <rect key="frame" x="0.0" y="0.0" width="1904" height="100"/>
@@ -170,7 +177,7 @@
                                             <rect key="frame" x="20" y="0.0" width="1864" height="100"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -231,4 +238,9 @@
         <image name="play" width="121" height="121"/>
         <image name="time" width="30" height="30"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <nil key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/OpenStack Summit/OpenStackSummitTV/EventDetailViewController.swift b/OpenStack Summit/OpenStackSummitTV/EventDetailViewController.swift
index bb2e578f..c03985a8 100644
--- a/OpenStack Summit/OpenStackSummitTV/EventDetailViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/EventDetailViewController.swift	
@@ -11,6 +11,7 @@ import UIKit
 import CoreSummit
 import Haneke
 import XCDYouTubeKit
+import Predicate
 
 @objc(OSSTVEventDetailViewController)
 final class EventDetailViewController: UITableViewController {
@@ -25,6 +26,8 @@ final class EventDetailViewController: UITableViewController {
     
     private var data = [Detail]()
     
+    private var videoImage: UIImage?
+    
     // MARK: - Loading
     
     override func viewDidLoad() {
@@ -49,6 +52,7 @@ final class EventDetailViewController: UITableViewController {
         
         self.eventCache = Event(managedObject: managedObject)
         self.eventDetail = EventDetail(managedObject: managedObject)
+        self.videoImage = nil
         
         self.data = [Detail]()
         
@@ -74,17 +78,17 @@ final class EventDetailViewController: UITableViewController {
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return data.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let detail = self.data[indexPath.row]
         
@@ -92,7 +96,7 @@ final class EventDetailViewController: UITableViewController {
             
         case .name:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventNameCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventNameCell", for: indexPath)
             
             cell.textLabel!.text = eventDetail.name
             
@@ -100,10 +104,10 @@ final class EventDetailViewController: UITableViewController {
             
         case .description:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventDescriptionCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventDescriptionCell", for: indexPath)
             
-            if let data = eventDetail.eventDescription.dataUsingEncoding(NSUTF8StringEncoding),
-                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            if let data = eventDetail.eventDescription.data(using: String.Encoding.utf8),
+                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                 
                 cell.textLabel!.text = attributedString.string
                 
@@ -116,7 +120,7 @@ final class EventDetailViewController: UITableViewController {
             
         case .track:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventTrackCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventTrackCell", for: indexPath)
             
             cell.textLabel!.text = eventDetail.track
             
@@ -124,7 +128,7 @@ final class EventDetailViewController: UITableViewController {
             
         case .time:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventTimeCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventTimeCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel!.text = eventDetail.dateTime
             
@@ -132,19 +136,20 @@ final class EventDetailViewController: UITableViewController {
             
         case .video:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventVideoCell", forIndexPath: indexPath) as! VideoPlayerTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventVideoCell", for: indexPath) as! VideoPlayerTableViewCell
             
-            cell.playImageView.hidden = true
-            cell.activityIndicator.hidden = false
+            cell.playImageView.isHidden = true
+            cell.activityIndicator.isHidden = false
             
-            if let thumbnailURL = NSURL(youtubeThumbnail: eventDetail.video!.youtube) {
+            if let thumbnailURL = URL(youtubeThumbnail: eventDetail.video!.youtube) {
                 
-                cell.videoImageView.hnk_setImageFromURL(thumbnailURL, placeholder: nil, format: nil, failure: nil, success: { (image) in
+                cell.videoImageView.hnk_setImageFromURL(thumbnailURL, placeholder: nil, format: nil, failure: nil, success: { [weak self, cell] (image) in
                     
                     cell.videoImageView.image = image
-                    cell.playImageView.hidden = false
+                    cell.playImageView.isHidden = false
                     cell.activityIndicator.stopAnimating()
                     cell.setNeedsDisplay()
+                    self?.videoImage = image
                 })
             }
             
@@ -152,7 +157,7 @@ final class EventDetailViewController: UITableViewController {
             
         case .location:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("EventLocationCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "EventLocationCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel!.text = eventDetail.location
             
@@ -160,7 +165,7 @@ final class EventDetailViewController: UITableViewController {
         }
     }
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let data = self.data[indexPath.row]
         
@@ -168,7 +173,7 @@ final class EventDetailViewController: UITableViewController {
             
         case .video:
             
-            self.play(video: eventDetail.video!)
+            self.play(video: eventDetail.video!, cachedImage: videoImage)
             
         default: break
         }
@@ -176,15 +181,16 @@ final class EventDetailViewController: UITableViewController {
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case "showTrackEvents":
             
-            let predicate = NSPredicate(format: "track.id == %@", eventCache.track! as NSNumber)
+            //let predicate = NSPredicate(format: "track.id == %@", eventCache.track! as NSNumber)
+            let predicate: Predicate = #keyPath(EventManagedObject.track.id) == eventCache.track!
             
-            let eventsViewController = segue.destinationViewController as! EventsViewController
+            let eventsViewController = segue.destination as! EventsViewController
             
             eventsViewController.predicate = predicate
             
@@ -197,7 +203,7 @@ final class EventDetailViewController: UITableViewController {
             
             let location = try! Location.find(locationID, context: Store.shared.managedObjectContext)
             
-            let venueDetailViewController = segue.destinationViewController as! VenueDetailViewController
+            let venueDetailViewController = segue.destination as! VenueDetailViewController
             
             venueDetailViewController.location = location
             
@@ -223,7 +229,7 @@ private extension EventDetailViewController {
 
 final class VideoPlayerTableViewCell: UITableViewCell {
     
-    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
-    @IBOutlet weak var playImageView: UIImageView!
-    @IBOutlet weak var videoImageView: UIImageView!
+    @IBOutlet private(set) weak var activityIndicator: UIActivityIndicatorView!
+    @IBOutlet private(set) weak var playImageView: UIImageView!
+    @IBOutlet private(set) weak var videoImageView: UIImageView!
 }
diff --git a/OpenStack Summit/OpenStackSummitTV/EventsViewController.swift b/OpenStack Summit/OpenStackSummitTV/EventsViewController.swift
index 40895973..9433876b 100644
--- a/OpenStack Summit/OpenStackSummitTV/EventsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/EventsViewController.swift	
@@ -7,23 +7,24 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import CoreData
+import Predicate
 
 @objc(OSSTVEventsViewController)
 final class EventsViewController: UITableViewController, NSFetchedResultsControllerDelegate {
     
     // MARK: - Properties
     
-    var predicate = NSPredicate(value: false) {
+    var predicate = Predicate.value(false) {
         
-        didSet { if isViewLoaded() { updateUI() } }
+        didSet { if isViewLoaded { updateUI() } }
     }
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<EventManagedObject>!
     
-    private static let cachedPredicate = NSPredicate(format: "cached != nil")
+    private static let cachedPredicate: Predicate = (.keyPath(#keyPath(Entity.cached)) != .value(.null))
     
     // MARK: - Loading
     
@@ -40,11 +41,10 @@ final class EventsViewController: UITableViewController, NSFetchedResultsControl
     
     private func updateUI() {
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
+        // NSPredicate(format: "summit.id == %@", summitID)
+        let summitPredicate: Predicate = #keyPath(EventManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitPredicate = NSPredicate(format: "summit.id == %@", summitID)
-        
-        let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [self.predicate, summitPredicate, EventsViewController.cachedPredicate])
+        let predicate: Predicate = .compound(.and([self.predicate, summitPredicate, EventsViewController.cachedPredicate]))
         
         self.fetchedResultsController = NSFetchedResultsController(Event.self,
                                                                    delegate: self,
@@ -59,35 +59,35 @@ final class EventsViewController: UITableViewController, NSFetchedResultsControl
         tableView.reloadData()
     }
     
-    private func configure(cell cell: UITableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: UITableViewCell, at indexPath: IndexPath) {
         
         let event = self[indexPath]
         
         cell.textLabel!.text = event.name
     }
     
-    private subscript (indexPath: NSIndexPath) -> Event {
+    private subscript (indexPath: IndexPath) -> Event {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! EventManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! EventManagedObject
         
         return Event(managedObject: managedObject)
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.fetchedResultsController?.fetchedObjects?.count ?? 0
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("EventTableViewCell", forIndexPath: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: "EventTableViewCell", for: indexPath)
         
         configure(cell: cell, at: indexPath)
         
@@ -96,50 +96,50 @@ final class EventsViewController: UITableViewController, NSFetchedResultsControl
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.endUpdates()
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         switch type {
-        case .Insert:
+        case .insert:
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
-        case .Delete:
+        case .delete:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
-        case .Update:
+        case .update:
             if let updateIndexPath = indexPath,
-                let cell = self.tableView.cellForRowAtIndexPath(updateIndexPath) {
+                let cell = self.tableView.cellForRow(at: updateIndexPath) {
                 
                 self.configure(cell: cell, at: updateIndexPath)
             }
-        case .Move:
+        case .move:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
         }
     }
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -147,7 +147,7 @@ final class EventsViewController: UITableViewController, NSFetchedResultsControl
             
             let event = self[tableView.indexPathForSelectedRow!]
             
-            let navigationController = segue.destinationViewController as! UINavigationController
+            let navigationController = segue.destination as! UINavigationController
             
             let eventDetailViewController = navigationController.topViewController as! EventDetailViewController
             
diff --git a/OpenStack Summit/OpenStackSummitTV/Info.plist b/OpenStack Summit/OpenStackSummitTV/Info.plist
index 8cc4c1f8..42b56e50 100644
--- a/OpenStack Summit/OpenStackSummitTV/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitTV/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/OpenStack Summit/OpenStackSummitTV/PlayVideo.swift b/OpenStack Summit/OpenStackSummitTV/PlayVideo.swift
index 2ff5a46a..a4cb30ca 100644
--- a/OpenStack Summit/OpenStackSummitTV/PlayVideo.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/PlayVideo.swift	
@@ -13,7 +13,7 @@ import XCDYouTubeKit
 
 extension UIViewController {
     
-    func play(video video: Video) {
+    func play(video: Video, cachedImage: UIImage? = nil) {
         
         // add to recently played
         
@@ -21,19 +21,22 @@ extension UIViewController {
         
         // load video
         
-        XCDYouTubeClient.defaultClient().getVideoWithIdentifier(video.youtube) { [weak self] (youtubeVideo, error) in
+        XCDYouTubeClient.default().getVideoWithIdentifier(video.youtube) { [weak self] (youtubeVideo, error) in
             
             guard let controller = self else { return }
             
             guard error == nil
                 else { controller.showErrorAlert(error!.localizedDescription); return }
             
-            guard let streamURL = youtubeVideo!.streamURLs[XCDYouTubeVideoQuality.HD720.rawValue as NSNumber]
-                ?? youtubeVideo!.streamURLs[XCDYouTubeVideoQuality.Medium360.rawValue as NSNumber]
-                ?? youtubeVideo!.streamURLs[XCDYouTubeVideoQuality.Small240.rawValue as NSNumber]
+            guard let streamURLs = youtubeVideo?.streamURLs as? [UInt: URL],
+                let highestResolution = streamURLs.keys.sorted().last,
+                let streamURL = streamURLs[XCDYouTubeVideoQuality.HD720.rawValue]
+                ?? streamURLs[XCDYouTubeVideoQuality.medium360.rawValue]
+                ?? streamURLs[XCDYouTubeVideoQuality.small240.rawValue]
+                ?? streamURLs[highestResolution]
                 else { controller.showErrorAlert("YouTube API Error"); return }
             
-            let asset = AVAsset(URL: streamURL)
+            let asset = AVAsset(url: streamURL)
             let playerItem = AVPlayerItem(asset: asset)
             playerItem.externalMetadata = {
                 
@@ -41,22 +44,23 @@ extension UIViewController {
                
                 let titleItem = AVMutableMetadataItem()
                 titleItem.identifier = AVMetadataCommonIdentifierTitle
-                titleItem.value = video.name
+                titleItem.value = video.name as NSCopying & NSObjectProtocol
                 titleItem.extendedLanguageTag = "und"
                 metadata.append(titleItem)
                 
-                if let data = video.descriptionText?.dataUsingEncoding(NSUTF8StringEncoding),
-                    let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+                if let event = try! Event.find(video.event, context: Store.shared.managedObjectContext),
+                    let descriptionText = video.descriptionText ?? event.descriptionText,
+                    let data = descriptionText.data(using: String.Encoding.utf8),
+                    let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                     
                     let descriptionItem = AVMutableMetadataItem()
                     descriptionItem.identifier = AVMetadataCommonIdentifierDescription
-                    descriptionItem.value = attributedString.string
+                    descriptionItem.value = attributedString.string as NSCopying & NSObjectProtocol
                     descriptionItem.extendedLanguageTag = "und"
                     metadata.append(descriptionItem)
                 }
                 
-                if let thumbnailURL = NSURL(youtubeThumbnail: video.youtube),
-                    let data = NSData(contentsOfURL: thumbnailURL) {
+                func setImage(data: NSData) {
                     
                     let item = AVMutableMetadataItem()
                     item.identifier = AVMetadataCommonIdentifierArtwork
@@ -66,6 +70,17 @@ extension UIViewController {
                     metadata.append(item)
                 }
                 
+                if let image = cachedImage,
+                    let data = UIImagePNGRepresentation(image) as NSData? {
+                    
+                    setImage(data: data)
+                    
+                } else if let thumbnailURL = URL(youtubeThumbnail: video.youtube),
+                    let data = NSData(contentsOf: thumbnailURL) {
+                    
+                    setImage(data: data)
+                }
+                
                 return metadata
             }()
             
@@ -73,7 +88,7 @@ extension UIViewController {
             let player = AVPlayer(playerItem: playerItem)
             playerViewController.player = player
             
-            controller.presentViewController(playerViewController, animated: true) { player.play() }
+            controller.present(playerViewController, animated: true) { player.play() }
         }
     }
 }
diff --git a/OpenStack Summit/OpenStackSummitTV/Preferences.swift b/OpenStack Summit/OpenStackSummitTV/Preferences.swift
index a1dde18d..b0cc2392 100644
--- a/OpenStack Summit/OpenStackSummitTV/Preferences.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/Preferences.swift	
@@ -13,25 +13,25 @@ final class Preferences {
     
     static let shared = Preferences()
     
-    private let userDefaults: NSUserDefaults
+    private let userDefaults: UserDefaults
     
     private init() {
         
-        self.userDefaults = NSUserDefaults(suiteName: AppGroup)!
+        self.userDefaults = UserDefaults(suiteName: AppGroup)!
     }
     
     // MARK: - Accessors
     
     private(set) var recentlyPlayed: [Identifier] {
         
-        get { return self[.recentlyPlayed] as? [Int] ?? [] }
+        get { return self[.recentlyPlayed] as! [Identifier]? ?? [] }
         
-        set { self[.recentlyPlayed] = newValue as [NSNumber] }
+        set { self[.recentlyPlayed] = newValue }
     }
     
     // MARK: - Methods
     
-    func addRecentlyPlayed(video: Identifier) {
+    func addRecentlyPlayed(_ video: Identifier) {
         
         let limit = 10
         
@@ -41,9 +41,9 @@ final class Preferences {
         var didRemovePrevious = false
         repeat {
             
-            if let previousIndex = recentlyPlayed.indexOf(video) {
+            if let previousIndex = recentlyPlayed.index(of: video) {
                 
-                recentlyPlayed.removeAtIndex(previousIndex)
+                recentlyPlayed.remove(at: previousIndex)
                 didRemovePrevious = true
                 
             } else {
@@ -60,7 +60,7 @@ final class Preferences {
             
         } else {
             
-            recentlyPlayed.insert(video, atIndex: 0)
+            recentlyPlayed.insert(video, at: 0)
         }
         
         // trim
@@ -72,13 +72,13 @@ final class Preferences {
     
     // MARK: - Private Methods
     
-    private subscript (key: Key) -> AnyObject? {
+    private subscript (key: Key) -> Any? {
         
-        get { return userDefaults.objectForKey(key.rawValue) }
+        get { return userDefaults.object(forKey: key.rawValue) as Any? }
         
         set {
             
-            userDefaults.setObject(newValue, forKey: key.rawValue)
+            userDefaults.set(newValue, forKey: key.rawValue)
             userDefaults.synchronize()
         }
     }
diff --git a/OpenStack Summit/OpenStackSummitTV/SpeakerDetailViewController.swift b/OpenStack Summit/OpenStackSummitTV/SpeakerDetailViewController.swift
index f3bf2a38..16a9b270 100644
--- a/OpenStack Summit/OpenStackSummitTV/SpeakerDetailViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/SpeakerDetailViewController.swift	
@@ -10,15 +10,16 @@ import Foundation
 import UIKit
 import CoreSummit
 import Haneke
+import Predicate
 
 @objc(OSSTVSpeakerDetailViewController)
 final class SpeakerDetailViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet private(set) weak var tableView: UITableView!
     
-    @IBOutlet weak var pictureImageView: UIImageView!
+    @IBOutlet private(set) weak var pictureImageView: UIImageView!
     
     // MARK: - Properties
     
@@ -30,7 +31,7 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
     
     private var data = [Detail]()
     
-    private var eventsPredicate: NSPredicate!
+    private var eventsPredicate: Predicate!
     
     // MARK: - Loading
     
@@ -60,7 +61,8 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
         
         self.entityController.event.updated = updateUI
         
-        eventsPredicate = NSPredicate(format: "ANY presentation.speakers.id == %@", NSNumber(longLong: Int64(self.speaker)))
+        //eventsPredicate = NSPredicate(format: "ANY presentation.speakers.id == %@", NSNumber(value: Int64(self.speaker)))
+        eventsPredicate = (#keyPath(EventManagedObject.presentation.speakers.id)).any(in: [self.speaker])
         
         guard let speaker = try! Speaker.find(self.speaker, context: context)
             else { fatalError("Invalid Speaker \(self.speaker)") }
@@ -68,13 +70,13 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
         self.updateUI(speaker)
     }
     
-    private func updateUI(speaker: Speaker) {
+    private func updateUI(_ speaker: Speaker) {
         
         self.title = speaker.name
         
         self.speakerCache = speaker
         
-        pictureImageView.hnk_setImageFromURL(NSURL(string: speaker.pictureURL)!, placeholder: UIImage(named: "generic-user-avatar"))
+        pictureImageView.hnk_setImageFromURL(speaker.picture.environmentScheme, placeholder: #imageLiteral(resourceName: "generic-user-avatar"))
         
         data = []
         
@@ -102,17 +104,17 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
     
     // MARK: - UITableViewDataSource
     
-    func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return data.count
     }
     
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = self.data[indexPath.row]
         
@@ -120,7 +122,7 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
             
         case .twitter:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("SpeakerTwitterCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "SpeakerTwitterCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel.text = speakerCache.twitter
             
@@ -128,7 +130,7 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
             
         case .irc:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("SpeakerIRCCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "SpeakerIRCCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel.text = speakerCache.irc
             
@@ -136,10 +138,10 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
             
         case .biography:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("SpeakerBiographyCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "SpeakerBiographyCell", for: indexPath)
             
-            if let data = speakerCache.biography?.dataUsingEncoding(NSUTF8StringEncoding),
-                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            if let data = speakerCache.biography?.data(using: String.Encoding.utf8),
+                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                 
                 cell.textLabel!.text = attributedString.string
                 
@@ -152,7 +154,7 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
             
         case let .sessions(eventCount):
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("SpeakerEventsCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "SpeakerEventsCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel.text = "\(eventCount) " + "\(eventCount == 1 ? "session" : "sessions")"
             
@@ -162,13 +164,13 @@ final class SpeakerDetailViewController: UIViewController, UITableViewDataSource
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case "showSpeakerEvents":
             
-            let eventsViewController = segue.destinationViewController as! EventsViewController
+            let eventsViewController = segue.destination as! EventsViewController
             
             eventsViewController.predicate = eventsPredicate
             
diff --git a/OpenStack Summit/OpenStackSummitTV/SpeakerSearchResultsViewController.swift b/OpenStack Summit/OpenStackSummitTV/SpeakerSearchResultsViewController.swift
index db5785e7..d7d57e56 100644
--- a/OpenStack Summit/OpenStackSummitTV/SpeakerSearchResultsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/SpeakerSearchResultsViewController.swift	
@@ -11,6 +11,7 @@ import UIKit
 import CoreSummit
 import Haneke
 import CoreData
+import Predicate
 
 final class SpeakerSearchResultsViewController: TableViewController, UISearchResultsUpdating {
     
@@ -21,7 +22,7 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
         didSet {
             
             // Return if the filter string hasn't changed.
-            guard filterString != oldValue && isViewLoaded() else { return }
+            guard filterString != oldValue && isViewLoaded else { return }
             
             filterChanged()
         }
@@ -44,38 +45,28 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
     
     private func filterChanged() {
         
-        var predicates = [NSPredicate]()
+        let summitID = SummitManager.shared.summit.value
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-        
-        let summitPredicate = NSPredicate(format: "%@ IN summits.id", summitID)
-        
-        predicates.append(summitPredicate)
+        //let summitPredicate = NSPredicate(format: "%@ IN summits.id", summitID)
+        var predicate: Predicate = (#keyPath(SpeakerManagedObject.summits.id)).in([summitID])
         
         if filterString.isEmpty == false {
             
-            let filterPredicate = NSPredicate(format: "firstName CONTAINS [c] %@ or lastName CONTAINS [c] %@", filterString, filterString)
-            
-            predicates.append(filterPredicate)
-        }
-        
-        let predicate: NSPredicate?
-        
-        if predicates.count > 0 {
-            
-            predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
+            let value: Expression = .value(.string(filterString))
             
-        } else {
+            //let filterPredicate = NSPredicate(format: "firstName CONTAINS [c] %@ or lastName CONTAINS [c] %@", filterString, filterString)
+            let filterPredicate: Predicate = (#keyPath(SpeakerManagedObject.firstName)).compare(.contains, [.caseInsensitive], value)
+                || (#keyPath(SpeakerManagedObject.lastName)).compare(.contains, [.caseInsensitive], value)
             
-            predicate = predicates.first
+            predicate = predicate && filterPredicate
         }
-        
+                
         self.fetchedResultsController = NSFetchedResultsController(Speaker.self,
                                                                    delegate: self,
                                                                    predicate: predicate,
                                                                    sortDescriptors: SpeakerManagedObject.sortDescriptors,
                                                                    sectionNameKeyPath: nil,
-                                                                   context: Store.shared.managedObjectContext)
+                                                                   context: Store.shared.managedObjectContext) as! NSFetchedResultsController<NSManagedObject>
         
         self.fetchedResultsController.fetchRequest.fetchBatchSize = 20
         
@@ -85,27 +76,27 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
     }
     
     @inline(__always)
-    private func configure(cell cell: SpeakerTableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: SpeakerTableViewCell, at indexPath: IndexPath) {
         
         let speaker = self[indexPath]
         
         cell.nameLabel.text = speaker.name
         cell.titleLabel.text = speaker.title ?? ""
-        cell.speakerImageView.hnk_setImageFromURL(NSURL(string: speaker.pictureURL)!, placeholder: UIImage(named: "generic-user-avatar"))
+        cell.speakerImageView.hnk_setImageFromURL(speaker.picture.environmentScheme, placeholder: #imageLiteral(resourceName: "generic-user-avatar"))
         cell.speakerImageView.layer.cornerRadius = cell.speakerImageView.frame.size.width / 2
         cell.speakerImageView.clipsToBounds = true
     }
     
-    private subscript (indexPath: NSIndexPath) -> Speaker {
+    private subscript (indexPath: IndexPath) -> Speaker {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! SpeakerManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! SpeakerManagedObject
         
         return Speaker(managedObject: managedObject)
     }
     
     // MARK: - UISearchResultsUpdating
     
-    func updateSearchResultsForSearchController(searchController: UISearchController) {
+    func updateSearchResults(for searchController: UISearchController) {
         
         // update filter string
         filterString = searchController.searchBar.text ?? ""
@@ -113,9 +104,9 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
     
     // MARK: - UITableViewDataSource
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(SpeakerTableViewCell.identifier, forIndexPath: indexPath) as! SpeakerTableViewCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: SpeakerTableViewCell.identifier, for: indexPath) as! SpeakerTableViewCell
         
         configure(cell: cell, at: indexPath)
         
@@ -124,7 +115,7 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
@@ -132,7 +123,7 @@ final class SpeakerSearchResultsViewController: TableViewController, UISearchRes
             
             let speaker = self[tableView.indexPathForSelectedRow!]
             
-            let navigationController = segue.destinationViewController as! UINavigationController
+            let navigationController = segue.destination as! UINavigationController
             
             let speakerDetailViewController = navigationController.topViewController as! SpeakerDetailViewController
             
@@ -150,9 +141,9 @@ final class SpeakerTableViewCell: UITableViewCell {
     
     static let identifier = "SpeakerTableViewCell"
     
-    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet private(set) weak var nameLabel: UILabel!
     
-    @IBOutlet weak var titleLabel: UILabel!
+    @IBOutlet private(set) weak var titleLabel: UILabel!
     
-    @IBOutlet weak var speakerImageView: UIImageView!
+    @IBOutlet private(set) weak var speakerImageView: UIImageView!
 }
diff --git a/OpenStack Summit/OpenStackSummitTV/SpeakersViewController.swift b/OpenStack Summit/OpenStackSummitTV/SpeakersViewController.swift
index a3763b3f..814b1ee2 100644
--- a/OpenStack Summit/OpenStackSummitTV/SpeakersViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/SpeakersViewController.swift	
@@ -19,7 +19,7 @@ final class SpeakersViewController: UINavigationController {
         super.viewDidLoad()
         
         let storyboard = UIStoryboard(name: "Speakers", bundle: nil)
-        let searchResultsController = storyboard.instantiateViewControllerWithIdentifier("SpeakerSearchResults") as! SpeakerSearchResultsViewController
+        let searchResultsController = storyboard.instantiateViewController(withIdentifier: "SpeakerSearchResults") as! SpeakerSearchResultsViewController
         
         /*
          Create a UISearchController, passing the `searchResultsController` to
diff --git a/OpenStack Summit/OpenStackSummitTV/SummitsViewController.swift b/OpenStack Summit/OpenStackSummitTV/SummitsViewController.swift
index a05e9a19..a446e3f7 100644
--- a/OpenStack Summit/OpenStackSummitTV/SummitsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/SummitsViewController.swift	
@@ -38,7 +38,7 @@ final class SummitsViewController: UITableViewController {
         tableView.layoutMargins.right = 90
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         self.refresh()
@@ -46,13 +46,13 @@ final class SummitsViewController: UITableViewController {
     
     // MARK: - Actions
     
-    @IBAction func refresh(sender: AnyObject? = nil) {
+    @IBAction func refresh(_ sender: AnyObject? = nil) {
         
         self.loading = true
         
         Store.shared.summits { (response) in
             
-            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+            OperationQueue.main.addOperation { [weak self] in
                 
                 guard let controller = self else { return }
                 
@@ -60,13 +60,13 @@ final class SummitsViewController: UITableViewController {
                 
                 switch response {
                     
-                case let .Error(error):
+                case let .error(error):
                     
                     controller.showErrorAlert((error as NSError).localizedDescription, retryHandler: { controller.refresh() })
                     
-                case let .Value(value):
+                case let .value(value):
                     
-                    controller.summits = value.items.sort { $0.0.start > $0.1.start }
+                    controller.summits = value.items.sorted { $0.0.start > $0.1.start }
                 }
             }
         }
@@ -89,24 +89,24 @@ final class SummitsViewController: UITableViewController {
     }
     
     @inline(__always)
-    private func configure(cell cell: UITableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: UITableViewCell, at indexPath: IndexPath) {
         
         let summit = self[indexPath]
         
         cell.textLabel?.text = summit.name
         
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: summit.timeZone.name)
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: summit.timeZone.name)
         dateFormatter.dateFormat = "MMMM dd-"
-        let stringDateFrom = dateFormatter.stringFromDate(summit.start.toFoundation())
+        let stringDateFrom = dateFormatter.string(from: summit.start)
         
         dateFormatter.dateFormat = "dd, yyyy"
-        let stringDateTo = dateFormatter.stringFromDate(summit.end.toFoundation())
+        let stringDateTo = dateFormatter.string(from: summit.end)
         
         cell.detailTextLabel?.text = stringDateFrom + stringDateTo
     }
     
-    private subscript (indexPath: NSIndexPath) -> Summit {
+    private subscript (indexPath: IndexPath) -> Summit {
         
         return self.summits[indexPath.row]
     }
@@ -117,24 +117,24 @@ final class SummitsViewController: UITableViewController {
         
         assert(self.currentSummit != nil, "Summit must already be loaded")
         
-        self.performSegueWithIdentifier(Segue.presentSummit.rawValue, sender: self)
+        self.performSegue(withIdentifier: Segue.presentSummit.rawValue, sender: self)
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.summits.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("SummitTableViewCell", forIndexPath: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: "SummitTableViewCell", for: indexPath)
         
         configure(cell: cell, at: indexPath)
         
@@ -143,7 +143,7 @@ final class SummitsViewController: UITableViewController {
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let selectedSummit = self[indexPath]
         
@@ -155,17 +155,17 @@ final class SummitsViewController: UITableViewController {
             
             Store.shared.summit(selectedSummit.identifier) { [weak self] (response) in
                 
-                NSOperationQueue.mainQueue().addOperationWithBlock {
+                OperationQueue.main.addOperation {
                     
                     guard let controller = self else { return }
                     
                     switch response {
                         
-                    case let .Error(error):
+                    case let .error(error):
                         
                         controller.showErrorAlert((error as NSError).localizedDescription)
                         
-                    case .Value:
+                    case .value:
                         
                         controller.select(summit: selectedSummit.identifier)
                     }
@@ -176,7 +176,7 @@ final class SummitsViewController: UITableViewController {
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         let segueIdentifier = Segue(rawValue: segue.identifier!)!
         
diff --git a/OpenStack Summit/OpenStackSummitTV/VenueDetailViewController.swift b/OpenStack Summit/OpenStackSummitTV/VenueDetailViewController.swift
index bfa4f080..3569ac19 100644
--- a/OpenStack Summit/OpenStackSummitTV/VenueDetailViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VenueDetailViewController.swift	
@@ -102,17 +102,17 @@ final class VenueDetailViewController: UITableViewController {
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return 1
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return data.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let data = self.data[indexPath.row]
         
@@ -120,19 +120,19 @@ final class VenueDetailViewController: UITableViewController {
             
         case .room:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("VenueTextCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "VenueTextCell", for: indexPath)
             
             let room = location.rawValue as! VenueRoom
             
             cell.textLabel!.text = room.name
             
-            cell.accessoryType = .None
+            cell.accessoryType = .none
             
             return cell
             
         case .address:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("VenueLocationCell", forIndexPath: indexPath) as! DetailImageTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "VenueLocationCell", for: indexPath) as! DetailImageTableViewCell
             
             cell.titleLabel.text = venue.fullAddress
             
@@ -140,33 +140,33 @@ final class VenueDetailViewController: UITableViewController {
             
         case .images:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("VenueTextCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "VenueTextCell", for: indexPath)
             
             cell.textLabel!.text = venue.images.count == 1 ? "View Image" : "\(venue.images.count) images"
             
-            cell.accessoryType = .DisclosureIndicator
+            cell.accessoryType = .disclosureIndicator
             
             return cell
             
         case .mapImages:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("VenueTextCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "VenueTextCell", for: indexPath)
             
             cell.textLabel!.text = venue.maps.count == 1 ? "View Map Image" : "\(venue.images.count) map images"
             
-            cell.accessoryType = canShowMap ? .DisclosureIndicator : .None
+            cell.accessoryType = canShowMap ? .disclosureIndicator : .none
             
             return cell
             
         case .description:
             
-            let cell = tableView.dequeueReusableCellWithIdentifier("VenueTextCell", forIndexPath: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: "VenueTextCell", for: indexPath)
             
             let text: String
             
             if let descriptionText = venue.descriptionText,
-                let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+                let data = descriptionText.data(using: String.Encoding.utf8),
+                let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
                 
                 text = attributedString.string
                 
@@ -177,7 +177,7 @@ final class VenueDetailViewController: UITableViewController {
             
             cell.textLabel!.text = text
             
-            cell.accessoryType = .None
+            cell.accessoryType = .none
             
             return cell
         }
@@ -185,7 +185,7 @@ final class VenueDetailViewController: UITableViewController {
     
     // MARK: - Segue
     
-    override func shouldPerformSegueWithIdentifier(identifier: String, sender: AnyObject?) -> Bool {
+    override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         
         switch identifier {
             
@@ -195,13 +195,13 @@ final class VenueDetailViewController: UITableViewController {
         }
     }
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case "venueDetailShowMap":
             
-            let venueMapViewController = segue.destinationViewController as! VenueMapViewController
+            let venueMapViewController = segue.destination as! VenueMapViewController
             
             venueMapViewController.selectedVenue = venue.identifier
             
diff --git a/OpenStack Summit/OpenStackSummitTV/VenueDirectoryViewController.swift b/OpenStack Summit/OpenStackSummitTV/VenueDirectoryViewController.swift
index 76e2290a..1b327535 100644
--- a/OpenStack Summit/OpenStackSummitTV/VenueDirectoryViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VenueDirectoryViewController.swift	
@@ -7,22 +7,23 @@
 //
 
 import UIKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 import CoreData
+import Predicate
 
 @objc(OSSTVVenueDirectoryViewController)
 final class VenueDirectoryViewController: UITableViewController, NSFetchedResultsControllerDelegate {
     
     // MARK: - Properties
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<VenueManagedObject>!
     
     private var mapViewController: VenueMapViewController!
     
-    private var lastSelectedIndexPath: NSIndexPath?
+    private var lastSelectedIndexPath: IndexPath?
     
-    private let delayedSeguesOperationQueue = NSOperationQueue()
+    private let delayedSeguesOperationQueue = OperationQueue()
     
     // MARK: - Loading
     
@@ -44,24 +45,31 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
         tableView.layoutMargins.right = 20
         
         // show map view controller
-        performSegueWithIdentifier("showVenueMap", sender: self)
+        performSegue(withIdentifier: "showVenueMap", sender: self)
         
         // setup fetched results controller
+                
+        //let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
+        let predicate: Predicate = .keyPath(#keyPath(VenueManagedObject.latitude)) != .value(.null)
+            && .keyPath(#keyPath(VenueManagedObject.longitude)) != .value(.null)
+            && #keyPath(VenueManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-        
-        let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
-        
-        let sort = [NSSortDescriptor(key: "venueType", ascending: true), NSSortDescriptor(key: "name", ascending: true)]
+        let sort = [NSSortDescriptor(key: #keyPath(VenueManagedObject.venueType), ascending: true),
+                    NSSortDescriptor(key: #keyPath(VenueManagedObject.name), ascending: true)]
         
-        self.fetchedResultsController = NSFetchedResultsController(Venue.self, delegate: self, predicate: predicate, sortDescriptors: sort, sectionNameKeyPath: "venueType", context: Store.shared.managedObjectContext)
+        self.fetchedResultsController = NSFetchedResultsController(Venue.self,
+                                                                   delegate: self,
+                                                                   predicate: predicate,
+                                                                   sortDescriptors: sort,
+                                                                   sectionNameKeyPath: #keyPath(VenueManagedObject.venueType),
+                                                                   context: Store.shared.managedObjectContext)
         
         try! self.fetchedResultsController.performFetch()
         
         self.tableView.reloadData()
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         self.updateUI()
@@ -74,37 +82,37 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
         self.title = self.isDataLoaded ? "Venues" : "Loading..."
     }
     
-    private func configure(cell cell: UITableViewCell, at indexPath: NSIndexPath) {
+    private func configure(cell: UITableViewCell, at indexPath: IndexPath) {
         
         let venue = self[indexPath]
         
         cell.textLabel!.text = venue.name
     }
     
-    private subscript (indexPath: NSIndexPath) -> Venue {
+    private subscript (indexPath: IndexPath) -> Venue {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! VenueManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! VenueManagedObject
         
         return Venue(managedObject: managedObject)
     }
     
     // MARK: - UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return self.fetchedResultsController?.sections?.count ?? 0
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         let section = self.fetchedResultsController.sections![section]
         
         return section.numberOfObjects
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("VenueTableViewCell", forIndexPath: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: "VenueTableViewCell", for: indexPath)
         
         configure(cell: cell, at: indexPath)
         
@@ -113,7 +121,7 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
     
     // MARK: - UITableViewDelegate
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         guard let sectionString = self.fetchedResultsController.sections?[section].name,
             let locationType = Venue.LocationType(rawValue: sectionString)
@@ -126,33 +134,33 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
         }
     }
         
-    override func tableView(tableView: UITableView, didUpdateFocusInContext context: UITableViewFocusUpdateContext, withAnimationCoordinator coordinator: UIFocusAnimationCoordinator) {
+    override func tableView(_ tableView: UITableView, didUpdateFocusIn context: UITableViewFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
         // Check that the next focus view is a child of the table view.
-        guard let nextFocusedView = context.nextFocusedView where nextFocusedView.isDescendantOfView(tableView) else { return }
+        guard let nextFocusedView = context.nextFocusedView, nextFocusedView.isDescendant(of: tableView) else { return }
         guard let indexPath = context.nextFocusedIndexPath else { return }
         
         // Cancel any previously queued segues.
         delayedSeguesOperationQueue.cancelAllOperations()
         
         // Create an `NSBlockOperation` to perform the detail segue after a delay.
-        let performSegueOperation = NSBlockOperation()
+        let performSegueOperation = BlockOperation()
         
         performSegueOperation.addExecutionBlock { [weak self, unowned performSegueOperation] in
             
             guard let controller = self else { return }
             
             // Pause the block so the segue isn't immediately performed.
-            NSThread.sleepForTimeInterval(0.1)
+            Thread.sleep(forTimeInterval: 0.1)
             
             /*
              Check that the operation wasn't cancelled and that the segue identifier
              is different to the last performed segue identifier.
              */
-            guard performSegueOperation.cancelled == false
+            guard performSegueOperation.isCancelled == false
                 && indexPath != controller.lastSelectedIndexPath
                 else { return }
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
                 // Record the last performed segue identifier.
                 controller.lastSelectedIndexPath = indexPath
@@ -175,60 +183,60 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.beginUpdates()
     }
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         self.tableView.endUpdates()
         
         self.updateUI()
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         switch type {
-        case .Insert:
+        case .insert:
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
-        case .Delete:
+        case .delete:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
-        case .Update:
+        case .update:
             if let updateIndexPath = indexPath,
-                let cell = self.tableView.cellForRowAtIndexPath(updateIndexPath) {
+                let cell = self.tableView.cellForRow(at: updateIndexPath) {
                 
                 self.configure(cell: cell, at: updateIndexPath)
             }
-        case .Move:
+        case .move:
             
             if let deleteIndexPath = indexPath {
-                self.tableView.deleteRowsAtIndexPaths([deleteIndexPath], withRowAnimation: .Fade)
+                self.tableView.deleteRows(at: [deleteIndexPath], with: .fade)
             }
             
             if let insertIndexPath = newIndexPath {
-                self.tableView.insertRowsAtIndexPaths([insertIndexPath], withRowAnimation: .Fade)
+                self.tableView.insertRows(at: [insertIndexPath], with: .fade)
             }
         }
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
         
         switch type {
             
-        case .Insert:
+        case .insert:
             
-            self.tableView.insertSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+            self.tableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
             
-        case .Delete:
+        case .delete:
             
-            self.tableView.deleteSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+            self.tableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
             
         default: break
         }
@@ -236,19 +244,19 @@ final class VenueDirectoryViewController: UITableViewController, NSFetchedResult
     
     // MARK: - Segue
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
         switch segue.identifier! {
             
         case "showVenueMap":
             
-            self.mapViewController = segue.destinationViewController as! VenueMapViewController
+            self.mapViewController = segue.destination as! VenueMapViewController
             
         case "showVenueDetail":
             
             let venue = self[tableView.indexPathForSelectedRow!]
             
-            let navigationController = segue.destinationViewController as! UINavigationController
+            let navigationController = segue.destination as! UINavigationController
             
             let venueDetailViewController = navigationController.topViewController as! VenueDetailViewController
             
diff --git a/OpenStack Summit/OpenStackSummitTV/VenueMapViewController.swift b/OpenStack Summit/OpenStackSummitTV/VenueMapViewController.swift
index bf044b07..a969abfe 100644
--- a/OpenStack Summit/OpenStackSummitTV/VenueMapViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VenueMapViewController.swift	
@@ -8,17 +8,18 @@
 
 import Foundation
 import UIKit
+import CoreData
 import CoreLocation
 import MapKit
 import CoreSummit
-import CoreData
+import Predicate
 
 @objc(OSSTVVenueMapViewController)
 final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetchedResultsControllerDelegate {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var mapView: MKMapView!
+    @IBOutlet private(set) weak var mapView: MKMapView!
     
     // MARK: - Properties
     
@@ -26,28 +27,35 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
     
     var selectedVenue: Identifier? {
         
-        didSet { if isViewLoaded() { showSelectedVenue() } }
+        didSet { if isViewLoaded { showSelectedVenue() } }
     }
     
-    private var fetchedResultsController: NSFetchedResultsController!
+    private var fetchedResultsController: NSFetchedResultsController<VenueManagedObject>!
     
     // MARK: - Loading
     
     override func viewDidLoad() {
         super.viewDidLoad()
+                
+        //let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
+        let predicate: Predicate = .keyPath(#keyPath(VenueManagedObject.latitude)) != .value(.null)
+            && .keyPath(#keyPath(VenueManagedObject.longitude)) != .value(.null)
+            && #keyPath(VenueManagedObject.summit.id) == SummitManager.shared.summit.value
         
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-        
-        let predicate = NSPredicate(format: "(latitude != nil AND longitude != nil) AND summit.id == %@", summitID)
-        
-        let sort = [NSSortDescriptor(key: "venueType", ascending: true), NSSortDescriptor(key: "name", ascending: true)]
+        let sort = [NSSortDescriptor(key: #keyPath(VenueManagedObject.venueType), ascending: true),
+                    NSSortDescriptor(key: #keyPath(VenueManagedObject.name), ascending: true)]
         
-        self.fetchedResultsController = NSFetchedResultsController(Venue.self, delegate: self, predicate: predicate, sortDescriptors: sort, sectionNameKeyPath: "venueType", context: Store.shared.managedObjectContext)
+        self.fetchedResultsController = NSFetchedResultsController(Venue.self,
+                                                                   delegate: self,
+                                                                   predicate: predicate,
+                                                                   sortDescriptors: sort,
+                                                                   sectionNameKeyPath: #keyPath(VenueManagedObject.venueType),
+                                                                   context: Store.shared.managedObjectContext)
         
         try! self.fetchedResultsController.performFetch()
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
          updateUI()
@@ -64,7 +72,7 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
             // reload map view if empty but shouldnt be
             if self.fetchedResultsController.fetchedObjects?.isEmpty == false && self.mapView.annotations.isEmpty {
                 
-                for venue in Venue.from(managedObjects: (self.fetchedResultsController.fetchedObjects as! [VenueManagedObject])) {
+                for venue in Venue.from(managedObjects: (self.fetchedResultsController.fetchedObjects ?? [])) {
                     
                     let annotation = VenueAnnotation(venue: venue)!
                     
@@ -86,7 +94,7 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
         
         if let venueID = self.selectedVenue,
             let venue = try! Venue.find(venueID, context: Store.shared.managedObjectContext),
-            let selectedAnnotation = mapView.annotations.firstMatching({ $0.coordinate.latitude == Double(venue.latitude ?? "") && $0.coordinate.longitude == Double(venue.longitude ?? "") }) {
+            let selectedAnnotation = mapView.annotations.first(where: { $0.coordinate.latitude == Double(venue.latitude ?? "") && $0.coordinate.longitude == Double(venue.longitude ?? "") }) {
             
             mapView.selectAnnotation(selectedAnnotation, animated: true)
         }
@@ -94,7 +102,7 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
     
     // MARK: - MKMapViewDelegate
     
-    func mapView(mapView: MKMapView, didSelectAnnotationView view: MKAnnotationView) {
+    func mapView(_ mapView: MKMapView, didSelect view: MKAnnotationView) {
         
         let annotation = view.annotation as! VenueAnnotation
         
@@ -103,12 +111,12 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
     
     // MARK: - NSFetchedResultsControllerDelegate
     
-    func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         
         updateUI()
     }
     
-    func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         
         let managedObject = anObject as! VenueManagedObject
         
@@ -119,22 +127,22 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
         
         switch type {
             
-        case .Insert:
+        case .insert:
             
             let annotation = VenueAnnotation(venue: venue)!
             
             mapView.addAnnotation(annotation)
             
-        case .Delete:
+        case .delete:
             
-            guard let annotation = mapView.annotations.firstMatching({ ($0 as? VenueAnnotation)?.venue == venue.identifier })
+            guard let annotation = mapView.annotations.first(where: { ($0 as? VenueAnnotation)?.venue == venue.identifier })
                 else { return }
             
             mapView.removeAnnotation(annotation)
             
-        case .Update:
+        case .update:
             
-            guard let annotation = mapView.annotations.firstMatching({ ($0 as? VenueAnnotation)?.venue == venue.identifier }) as? VenueAnnotation
+            guard let annotation = mapView.annotations.first(where: { ($0 as? VenueAnnotation)?.venue == venue.identifier }) as? VenueAnnotation
                 else { return }
             
             if annotation.coordinate.latitude == location.latitude
@@ -152,7 +160,7 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
                 mapView.addAnnotation(newAnnotation)
             }
             
-        case .Move: break
+        case .move: break
         }
     }
 }
@@ -162,7 +170,7 @@ final class VenueMapViewController: UIViewController, MKMapViewDelegate, NSFetch
 protocol VenueMapViewControllerDelegate: class {
     
     /// Informs the delegate that the venue selection has changed via the Map interface.
-    func venueMapViewController(controller: VenueMapViewController, didSelectVenue venue: Identifier)
+    func venueMapViewController(_ controller: VenueMapViewController, didSelectVenue venue: Identifier)
 }
 
 final class VenueAnnotation: NSObject, MKAnnotation {
diff --git a/OpenStack Summit/OpenStackSummitTV/VideoCell.swift b/OpenStack Summit/OpenStackSummitTV/VideoCell.swift
index ca574386..d1301d0b 100644
--- a/OpenStack Summit/OpenStackSummitTV/VideoCell.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VideoCell.swift	
@@ -13,9 +13,9 @@ import UIKit
 @objc(OSSTVVideoCell)
 final class VideoCell: UICollectionViewCell {
     
-    @IBOutlet weak var label: UILabel!
+    @IBOutlet private(set) weak var label: UILabel!
     
-    @IBOutlet weak var imageView: UIImageView!
+    @IBOutlet private(set) weak var imageView: UIImageView!
     
     // MARK: Initialization
     
@@ -40,14 +40,14 @@ final class VideoCell: UICollectionViewCell {
     
     // MARK: UIFocusEnvironment
     
-    override func didUpdateFocusInContext(context: UIFocusUpdateContext, withAnimationCoordinator coordinator: UIFocusAnimationCoordinator) {
+    override func didUpdateFocus(in context: UIFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
         /*
          Update the label's alpha value using the `UIFocusAnimationCoordinator`.
          This will ensure all animations run alongside each other when the focus
          changes.
          */
         coordinator.addCoordinatedAnimations({
-            if self.focused {
+            if self.isFocused {
                 self.label.alpha = 1.0
             }
             else {
diff --git a/OpenStack Summit/OpenStackSummitTV/VideoSearchResultsViewController.swift b/OpenStack Summit/OpenStackSummitTV/VideoSearchResultsViewController.swift
index 62414568..088cdbc3 100644
--- a/OpenStack Summit/OpenStackSummitTV/VideoSearchResultsViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VideoSearchResultsViewController.swift	
@@ -11,6 +11,8 @@ import UIKit
 import CoreData
 import CoreSummit
 import Haneke
+import Predicate
+import func TVServices.TVTopShelfImageSize
 
 @objc(OSSTVVideoSearchResultsViewController)
 final class VideoSearchResultsViewController: CollectionViewController, UISearchResultsUpdating {
@@ -22,7 +24,7 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
         didSet {
             
             // Return if the filter string hasn't changed.
-            guard filterString != oldValue && isViewLoaded() else { return }
+            guard filterString != oldValue && isViewLoaded else { return }
             
             filterChanged()
         }
@@ -34,9 +36,13 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
         super.viewDidLoad()
         
         filterChanged()
+        
+        // setup collection view
+        let collectionViewLayout = self.collectionViewLayout as! UICollectionViewFlowLayout
+        collectionViewLayout.itemSize = TVTopShelfImageSize(shape: .HDTV, style: .sectioned)
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         resetScrollPosition()
@@ -48,36 +54,21 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
         
         let sort: [NSSortDescriptor]
         
-        var predicates = [NSPredicate]()
-        
-        let summitID = NSNumber(longLong: Int64(SummitManager.shared.summit.value))
-        
-        let summitPredicate = NSPredicate(format: "event.summit.id == %@", summitID)
-        
-        predicates.append(summitPredicate)
+        //let summitPredicate = NSPredicate(format: "event.summit.id == %@", summitID)
+        var predicate: Predicate = #keyPath(VideoManagedObject.event.summit.id) == SummitManager.shared.summit.value
         
         if filterString.isEmpty {
             
-           sort = [NSSortDescriptor(key: "event.start", ascending: true)]
+           sort = [NSSortDescriptor(key: #keyPath(VideoManagedObject.event.start), ascending: true)]
             
         } else {
             
-            sort = [NSSortDescriptor(key: "event.name", ascending: true)]
-            
-            let filterPredicate = NSPredicate(format: "event.name CONTAINS[c] %@", filterString)
-            
-            predicates.append(filterPredicate)
-        }
-        
-        let predicate: NSPredicate?
-        
-        if predicates.count > 0 {
+            sort = [NSSortDescriptor(key: #keyPath(VideoManagedObject.event.name), ascending: true)]
             
-            predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
+            //let filterPredicate = NSPredicate(format: "event.name CONTAINS[c] %@", filterString)
+            let filter: Predicate = (#keyPath(VideoManagedObject.event.name)).compare(.contains, [.caseInsensitive], .value(.string(filterString)))
             
-        } else {
-            
-            predicate = predicates.first
+            predicate = predicate && filter
         }
         
         self.fetchedResultsController = NSFetchedResultsController(Video.self,
@@ -85,7 +76,7 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
                                                                    predicate: predicate,
                                                                    sortDescriptors: sort,
                                                                    sectionNameKeyPath: nil,
-                                                                   context: Store.shared.managedObjectContext)
+                                                                   context: Store.shared.managedObjectContext) as! NSFetchedResultsController<NSFetchRequestResult>
         
         self.fetchedResultsController.fetchRequest.fetchBatchSize = 20
         
@@ -101,15 +92,15 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
         self.collectionView!.setContentOffset(.zero, animated: true)
     }
     
-    private func configure(cell cell: VideoCell, at indexPath: NSIndexPath) {
+    private func configure(cell: VideoCell, at indexPath: IndexPath) {
         
-        let video = self.fetchedResultsController.objectAtIndexPath(indexPath) as! Video.ManagedObject
+        let video = self.fetchedResultsController.object(at: indexPath) as! Video.ManagedObject
         
         cell.label.text = video.event.name
         
         cell.imageView.image = nil
         
-        if let thumbnailURL = NSURL(youtubeThumbnail: video.youtube) {
+        if let thumbnailURL = URL(youtubeThumbnail: video.youtube) {
             
             cell.imageView.hnk_setImageFromURL(thumbnailURL, placeholder: nil, format: nil, failure: nil, success: { (image) in
                 
@@ -120,7 +111,7 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
     
     // MARK: - UISearchResultsUpdating
     
-    func updateSearchResultsForSearchController(searchController: UISearchController) {
+    func updateSearchResults(for searchController: UISearchController) {
         
         // update filter string
         filterString = searchController.searchBar.text ?? ""
@@ -128,9 +119,9 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
     
     // MARK: - UICollectionViewDataSource
     
-    override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier("VideoCell", forIndexPath: indexPath) as! VideoCell
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "VideoCell", for: indexPath) as! VideoCell
         
         configure(cell: cell, at: indexPath)
         
@@ -139,12 +130,14 @@ final class VideoSearchResultsViewController: CollectionViewController, UISearch
     
     // MARK: - UICollectionViewDelegate
     
-    override func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         
-        let managedObject = self.fetchedResultsController.objectAtIndexPath(indexPath) as! Video.ManagedObject
+        let managedObject = self.fetchedResultsController.object(at: indexPath) as! Video.ManagedObject
         
         let video = Video(managedObject: managedObject)
         
-        self.play(video: video)
+        let cell = collectionView.cellForItem(at: indexPath) as! VideoCell
+        
+        self.play(video: video, cachedImage: cell.imageView?.image)
     }
 }
diff --git a/OpenStack Summit/OpenStackSummitTV/Videos.storyboard b/OpenStack Summit/OpenStackSummitTV/Videos.storyboard
index 6c91966d..d4cfee0d 100644
--- a/OpenStack Summit/OpenStackSummitTV/Videos.storyboard	
+++ b/OpenStack Summit/OpenStackSummitTV/Videos.storyboard	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="11542" systemVersion="16C67" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="FKd-S3-AVa">
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="FKd-S3-AVa">
     <device id="appleTV" orientation="landscape">
         <adaptation id="light"/>
     </device>
     <dependencies>
         <deployment identifier="tvOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -43,20 +43,27 @@
                                     <rect key="frame" x="0.0" y="0.0" width="500" height="570"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <imageView opaque="NO" multipleTouchEnabled="YES" contentMode="scaleAspectFit" semanticContentAttribute="spatial" fixedFrame="YES" adjustsImageWhenAncestorFocused="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i3m-3R-cOa">
+                                        <imageView opaque="NO" multipleTouchEnabled="YES" contentMode="scaleAspectFit" semanticContentAttribute="spatial" adjustsImageWhenAncestorFocused="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i3m-3R-cOa">
                                             <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" red="0.17642489450000001" green="0.60687987239999996" blue="0.82575757579999998" alpha="1" colorSpace="calibratedRGB"/>
                                         </imageView>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ynh-6N-X51">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Video Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ynh-6N-X51">
                                             <rect key="frame" x="0.0" y="535" width="500" height="35"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                 </view>
+                                <constraints>
+                                    <constraint firstItem="i3m-3R-cOa" firstAttribute="leading" secondItem="O2e-p5-iw0" secondAttribute="leading" id="CAv-FF-V9n"/>
+                                    <constraint firstAttribute="bottom" secondItem="Ynh-6N-X51" secondAttribute="bottom" id="FBf-qt-w1o"/>
+                                    <constraint firstAttribute="trailing" secondItem="Ynh-6N-X51" secondAttribute="trailing" id="U9b-YB-bHB"/>
+                                    <constraint firstAttribute="trailing" secondItem="i3m-3R-cOa" secondAttribute="trailing" id="VSz-aO-rYL"/>
+                                    <constraint firstItem="Ynh-6N-X51" firstAttribute="top" secondItem="i3m-3R-cOa" secondAttribute="bottom" constant="35" id="X4t-Ha-U1H"/>
+                                    <constraint firstItem="i3m-3R-cOa" firstAttribute="top" secondItem="O2e-p5-iw0" secondAttribute="top" id="ZAs-VF-Rb3"/>
+                                    <constraint firstItem="Ynh-6N-X51" firstAttribute="leading" secondItem="O2e-p5-iw0" secondAttribute="leading" id="xYi-Ll-uPP"/>
+                                </constraints>
                                 <connections>
                                     <outlet property="imageView" destination="i3m-3R-cOa" id="EjJ-Vw-Mt4"/>
                                     <outlet property="label" destination="Ynh-6N-X51" id="ATM-Wo-sRr"/>
diff --git a/OpenStack Summit/OpenStackSummitTV/VideosViewController.swift b/OpenStack Summit/OpenStackSummitTV/VideosViewController.swift
index e06df5c4..3e51b2b7 100644
--- a/OpenStack Summit/OpenStackSummitTV/VideosViewController.swift	
+++ b/OpenStack Summit/OpenStackSummitTV/VideosViewController.swift	
@@ -25,7 +25,7 @@ final class VideosViewController: UINavigationController {
         super.viewDidLoad()
         
         let storyboard = UIStoryboard(name: "Videos", bundle: nil)
-        searchResultsController = storyboard.instantiateViewControllerWithIdentifier("VideoSearchResults") as! VideoSearchResultsViewController
+        searchResultsController = storyboard.instantiateViewController(withIdentifier: "VideoSearchResults") as! VideoSearchResultsViewController
         
         /*
          Create a UISearchController, passing the `searchResultsController` to
@@ -43,7 +43,7 @@ final class VideosViewController: UINavigationController {
         self.setViewControllers([searchContainer], animated: false)
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         self.searchController.searchBar.becomeFirstResponder()
diff --git a/OpenStack Summit/OpenStackSummitTVService/Info.plist b/OpenStack Summit/OpenStackSummitTVService/Info.plist
index 221cd268..2c166dc3 100644
--- a/OpenStack Summit/OpenStackSummitTVService/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitTVService/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>GitVersion</string>
 	<key>NSExtension</key>
@@ -34,11 +34,11 @@
 		<key>NSExtensionPrincipalClass</key>
 		<string>$(PRODUCT_MODULE_NAME).ServiceProvider</string>
 	</dict>
+	<key>SummitEnvironment</key>
+	<string>$(CORESUMMIT_ENVIRONMENT)</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>arm64</string>
 	</array>
-	<key>SummitEnvironment</key>
-	<string>$(CORESUMMIT_ENVIRONMENT)</string>
 </dict>
 </plist>
diff --git a/OpenStack Summit/OpenStackSummitTVService/ServiceProvider.swift b/OpenStack Summit/OpenStackSummitTVService/ServiceProvider.swift
index c70e38b0..cb0a596c 100644
--- a/OpenStack Summit/OpenStackSummitTVService/ServiceProvider.swift	
+++ b/OpenStack Summit/OpenStackSummitTVService/ServiceProvider.swift	
@@ -6,9 +6,10 @@
 //  Copyright © 2017 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import TVServices
 import CoreSummit
+import Predicate
 
 final class ServiceProvider: NSObject, TVTopShelfProvider {
 
@@ -21,28 +22,25 @@ final class ServiceProvider: NSObject, TVTopShelfProvider {
 
     // MARK: - TVTopShelfProvider
 
-    let topShelfStyle: TVTopShelfContentStyle = .Sectioned
+    let topShelfStyle: TVTopShelfContentStyle = .sectioned
 
     var topShelfItems: [TVContentItem] {
         
         print("Get Top Shelf Items")
         
-        return [Section.recentlyPlayed.toContentItem("Recently Played", items: recentlyPlayedItems)]
+        return [Section.recentlyPlayed.toContentItem(title: "Recently Played", items: recentlyPlayedItems)]
     }
     
     var recentlyPlayedItems: [TVContentItem] {
         
         let context = Store.shared.managedObjectContext
         
-        let recentlyPlayed = Preferences.shared.recentlyPlayed as [NSNumber]
+        let recentlyPlayed = Preferences.shared.recentlyPlayed
         
         print("Recently played videos: \(recentlyPlayed)")
         
         // fetch all videos from CoreData at once. Will be sorted by `id`.
-        let fetchedVideos = try! context.managedObjects(VideoManagedObject.self,predicate: NSPredicate(format: "id IN %@", recentlyPlayed))
-        
-        // sort videos
-        let videos = recentlyPlayed.map { playedVideo in fetchedVideos.firstMatching({ $0.identifier == playedVideo })! }
+        let videos = try! context.managedObjects(VideoManagedObject.self, predicate: (#keyPath(VideoManagedObject.id)).in(recentlyPlayed))
         
         return videos.map { $0.toContentItem() }
     }
@@ -75,9 +73,9 @@ extension VideoManagedObject {
     
     func toContentItem() -> TVContentItem {
         
-        let serviceURL = ServiceURL(identifier: self.identifier).url
+        let serviceURL = ServiceURL(identifier: self.id).url
         
-        let identifier = TVContentIdentifier(identifier: serviceURL.absoluteString!, container: nil)!
+        let identifier = TVContentIdentifier(identifier: serviceURL.absoluteString, container: nil)!
         
         let contentItem = TVContentItem(contentIdentifier: identifier)!
         
@@ -85,9 +83,9 @@ extension VideoManagedObject {
         
         contentItem.creationDate = event.start
         
-        contentItem.imageURL = NSURL(youtubeThumbnail: youtube)
+        contentItem.imageURL = URL(youtubeThumbnail: youtube)
         
-        contentItem.imageShape = .Square
+        contentItem.imageShape = .HDTV
         
         contentItem.displayURL = serviceURL
         
diff --git a/OpenStack Summit/OpenStackSummitTVService/ServiceURL.swift b/OpenStack Summit/OpenStackSummitTVService/ServiceURL.swift
index 872cf665..bdccec1d 100644
--- a/OpenStack Summit/OpenStackSummitTVService/ServiceURL.swift	
+++ b/OpenStack Summit/OpenStackSummitTVService/ServiceURL.swift	
@@ -20,25 +20,25 @@ struct ServiceURL {
         self.identifier = identifier
     }
     
-    init?(url: NSURL) {
+    init?(url: URL) {
         
-        guard let components = NSURLComponents(URL: url, resolvingAgainstBaseURL: false),
-            let identifierString = components.queryItems?.firstMatching({ $0.name == QueryItem.identifier.rawValue })?.value,
-            let identifier = Int(identifierString)
+        guard let components = URLComponents(url: url as URL, resolvingAgainstBaseURL: false),
+            let identifierString = components.queryItems?.first(where: { $0.name == QueryItem.identifier.rawValue })?.value,
+            let identifier = Identifier(identifierString)
             else { return nil }
         
         self.identifier = identifier
     }
     
-    var url: NSURL {
+    var url: URL {
         
-        let components = NSURLComponents()
+        var components = URLComponents()
         
-        components.scheme = self.dynamicType.scheme
+        components.scheme = type(of: self).scheme
         
-        components.queryItems = [NSURLQueryItem(name: QueryItem.identifier.rawValue, value: "\(identifier)")]
+        components.queryItems = [URLQueryItem(name: QueryItem.identifier.rawValue, value: "\(identifier)") as URLQueryItem]
         
-        return components.URL!
+        return components.url!
     }
 }
 
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/AboutInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/AboutInterfaceController.swift
index 18670cac..621d0fd4 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/AboutInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/AboutInterfaceController.swift	
@@ -7,7 +7,7 @@
 //
 
 import WatchKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 final class AboutInterfaceController: WKInterfaceController {
@@ -16,14 +16,14 @@ final class AboutInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var summitNameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var summitNameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var versionLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var versionLabel: WKInterfaceLabel!
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         updateUI()
     }
@@ -32,18 +32,9 @@ final class AboutInterfaceController: WKInterfaceController {
         // This method is called when watch view controller is about to be visible to user
         super.willActivate()
         
-        let webpageURL: NSURL
+        let webpage = Store.shared.cache?.webpage ?? AppEnvironment.configuration.webpage
         
-        if let summit = Store.shared.cache {
-            
-             webpageURL = NSURL(string: summit.webpageURL)!
-            
-        } else {
-            
-            webpageURL = NSURL(string: AppEnvironment.configuration.webpageURL)!
-        }
-        
-        updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.about.rawValue], webpageURL: webpageURL)
+        updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.about.rawValue], webpageURL: webpage)
     }
     
     override func didDeactivate() {
@@ -55,7 +46,7 @@ final class AboutInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func refreshData(sender: AnyObject? = nil) {
+    @IBAction func refreshData(_ sender: AnyObject? = nil) {
         
         try! Store.shared.clear()
         
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/ComplicationController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/ComplicationController.swift
index c1f3c12d..1e10f40c 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/ComplicationController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/ComplicationController.swift	
@@ -8,7 +8,7 @@
 
 import WatchKit
 import ClockKit
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 final class ComplicationController: NSObject, CLKComplicationDataSource {
@@ -16,24 +16,24 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     override init() {
         super.init()
         
-        print("Initialized \(self.dynamicType)")
+        print("Initialized \(type(of: self))")
         
         #if DEBUG
-        WKInterfaceDevice.currentDevice().playHaptic(WKHapticType.Click) // haptic only for debugging
+        WKInterfaceDevice.current().play(.click) // haptic only for debugging
         #endif
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(complicationServerActiveComplicationsDidChange), name: CLKComplicationServerActiveComplicationsDidChangeNotification, object: self)
+        NotificationCenter.default.addObserver(self, selector: #selector(complicationServerActiveComplicationsDidChange), name: NSNotification.Name.CLKComplicationServerActiveComplicationsDidChange, object: self)
     }
     
     static func reloadComplications() {
         if let complications: [CLKComplication] = CLKComplicationServer.sharedInstance().activeComplications {
             if complications.count > 0 {
                 for complication in complications {
-                    CLKComplicationServer.sharedInstance().reloadTimelineForComplication(complication)
+                    CLKComplicationServer.sharedInstance().reloadTimeline(for: complication)
                     print("Reloading complication \(complication.description)...")
                 }
                 #if DEBUG
-                WKInterfaceDevice.currentDevice().playHaptic(WKHapticType.Click) // haptic only for debugging
+                WKInterfaceDevice.current().play(.click) // haptic only for debugging
                 #endif
             }
         }
@@ -41,45 +41,45 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     
     // MARK: - CLKComplicationDataSource
     
-    func getSupportedTimeTravelDirectionsForComplication(complication: CLKComplication, withHandler handler: (CLKComplicationTimeTravelDirections) -> Void) {
+    func getSupportedTimeTravelDirections(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimeTravelDirections) -> Void) {
         
         if Store.shared.cache != nil {
             
-            handler([.Backward, .Forward])
+            handler([.backward, .forward])
             
         } else {
             
-            handler(.None)
+            handler(CLKComplicationTimeTravelDirections())
         }
     }
     
-    func getPrivacyBehaviorForComplication(complication: CLKComplication, withHandler handler: (CLKComplicationPrivacyBehavior) -> Void) {
+    func getPrivacyBehavior(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationPrivacyBehavior) -> Void) {
         
-        handler(.ShowOnLockScreen)
+        handler(.showOnLockScreen)
     }
     
-    func getNextRequestedUpdateDateWithHandler(handler: (NSDate?) -> Void) {
+    func getNextRequestedUpdateDate(handler: @escaping (Date?) -> Void) {
         
         let entry = self.entry(for: Date())
         
-        let date: NSDate
+        let date: Date
         
         switch entry {
             
         case .none:
             
             // Update hourly by default
-            date = NSDate(timeIntervalSinceNow: 60*60)
+            date = Date(timeIntervalSinceNow: 60*60)
             
         case let .multiple(_, _, end, _):
             
             // when current timeframe ends
-            date = end.toFoundation()
+            date = end
             
         case let .event(event):
             
             // when current event ends
-            date = event.end.toFoundation()
+            date = event.end
         }
         
         print("Next complication update date: \(date)")
@@ -87,13 +87,13 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         handler(date)
     }
     
-    func getPlaceholderTemplateForComplication(complication: CLKComplication, withHandler handler: (CLKComplicationTemplate?) -> Void) {
+    func getPlaceholderTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
         
         let template = self.template(for: complication, with: .none)
         handler(template)
     }
         
-    func getCurrentTimelineEntryForComplication(complication: CLKComplication, withHandler handler: (CLKComplicationTimelineEntry?) -> Void) {
+    func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void) {
         
         let entry = self.entry(for: Date())
         
@@ -101,17 +101,17 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         
         let template = self.template(for: complication, with: entry)
         
-        let complicationEntry = CLKComplicationTimelineEntry(date: entry.start?.toFoundation() ?? NSDate(), complicationTemplate: template)
+        let complicationEntry = CLKComplicationTimelineEntry(date: entry.start ?? Date(), complicationTemplate: template)
         
         handler(complicationEntry)
     }
     
-    func getTimelineEntriesForComplication(complication: CLKComplication, beforeDate: NSDate, limit: Int, withHandler handler: ([CLKComplicationTimelineEntry]?) -> Void) {
+    func getTimelineEntries(for complication: CLKComplication, before beforeDate: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
         
         guard let summit = Store.shared.cache
             else { handler(nil); return }
         
-        let date = Date(foundation: beforeDate)
+        let date = beforeDate
         
         let dates = summit.dates(before: date, limit: limit)
         
@@ -119,19 +119,19 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         
         print("Requesting \(limit) entries before \(beforeDate))")
         
-        entries.forEach { print($0.0.toFoundation().description, $0.1) }
+        entries.forEach { print($0.0.description, $0.1) }
         
-        let complicationEntries = entries.map { CLKComplicationTimelineEntry(date: $0.0.toFoundation(), complicationTemplate: self.template(for: complication, with: $0.1)) }
+        let complicationEntries = entries.map { CLKComplicationTimelineEntry(date: $0.0, complicationTemplate: self.template(for: complication, with: $0.1)) }
         
         handler(complicationEntries)
     }
     
-    func getTimelineEntriesForComplication(complication: CLKComplication, afterDate: NSDate, limit: Int, withHandler handler: ([CLKComplicationTimelineEntry]?) -> Void) {
+    func getTimelineEntries(for complication: CLKComplication, after afterDate: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
         
         guard let summit = Store.shared.cache
             else { handler(nil); return }
         
-        let date = Date(foundation: afterDate)
+        let date = afterDate
         
         let dates = summit.dates(after: date, limit: limit)
         
@@ -139,27 +139,27 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         
         print("Requesting \(limit) entries after \(afterDate))")
         
-        entries.forEach { print($0.0.toFoundation().description, $0.1) }
+        entries.forEach { print($0.0.description, $0.1) }
         
-        let complicationEntries = entries.map { CLKComplicationTimelineEntry(date: $0.0.toFoundation(), complicationTemplate: self.template(for: complication, with: $0.1)) }
+        let complicationEntries = entries.map { CLKComplicationTimelineEntry(date: $0.0, complicationTemplate: self.template(for: complication, with: $0.1)) }
         
         handler(complicationEntries)
     }
     
-    func getTimelineStartDateForComplication(complication: CLKComplication, withHandler handler: (NSDate?) -> Void) {
+    func getTimelineStartDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
         
-        let date = Store.shared.cache?.schedule.sort({ $0.0.start < $0.1.start }).first?.start.toFoundation()
+        let date = Store.shared.cache?.schedule.sorted(by: { $0.0.start < $0.1.start }).first?.start
         
-        print("Timeline Start Date: \(date)")
+        print("Timeline Start Date: \(date?.description ?? "none")")
         
         handler(date)
     }
     
-    func getTimelineEndDateForComplication(complication: CLKComplication, withHandler handler: (NSDate?) -> Void) {
+    func getTimelineEndDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
         
-        let date = Store.shared.cache?.schedule.sort({ $0.0.start > $0.1.start }).first?.end.toFoundation()
+        let date = Store.shared.cache?.schedule.sorted(by: { $0.0.start > $0.1.start }).first?.end
         
-        print("Timeline End Date: \(date)")
+        print("Timeline End Date: \(date?.description ?? "none")")
         
         handler(date)
     }
@@ -170,7 +170,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         
         switch complication.family {
             
-        case .UtilitarianLarge:
+        case .utilitarianLarge:
             
             let complicationTemplate = CLKComplicationTemplateUtilitarianLargeFlat()
             
@@ -183,19 +183,19 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
             case let .multiple(events, start, end, timeZone):
                 
                 struct Static {
-                    static let dateFormatter: NSDateFormatter = {
-                        let formatter = NSDateFormatter()
-                        formatter.dateStyle = .NoStyle
-                        formatter.timeStyle = .ShortStyle
+                    static let dateFormatter: DateFormatter = {
+                        let formatter = DateFormatter()
+                        formatter.dateStyle = .none
+                        formatter.timeStyle = .short
                         return formatter
                     }()
                 }
                 
-                Static.dateFormatter.timeZone = NSTimeZone(name: timeZone)
+                Static.dateFormatter.timeZone = TimeZone(identifier: timeZone)
                 
-                let startDateText = Static.dateFormatter.stringFromDate(start.toFoundation())
+                let startDateText = Static.dateFormatter.string(from: start)
                 
-                let endDateText = Static.dateFormatter.stringFromDate(end.toFoundation())
+                let endDateText = Static.dateFormatter.string(from: end)
                 
                 textProvider.text = "\(startDateText) - \(endDateText) \(events) events"
                 
@@ -208,7 +208,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
             
             return complicationTemplate
             
-        case .ModularLarge:
+        case .modularLarge:
             
             switch entry {
                 
@@ -226,7 +226,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
                 
                 let complicationTemplate = CLKComplicationTemplateModularLargeTallBody()
                 
-                complicationTemplate.headerTextProvider = CLKTimeIntervalTextProvider(startDate: start.toFoundation(), endDate: end.toFoundation(), timeZone: NSTimeZone(name: timeZone))
+                complicationTemplate.headerTextProvider = CLKTimeIntervalTextProvider(start: start, end: end, timeZone: TimeZone(identifier: timeZone))
                 
                 complicationTemplate.bodyTextProvider = CLKSimpleTextProvider(text: "\(count) events")
                 
@@ -236,7 +236,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
                 
                 let complicationTemplate = CLKComplicationTemplateModularLargeStandardBody()
                 
-                complicationTemplate.headerTextProvider = CLKTimeIntervalTextProvider(startDate: event.start.toFoundation(), endDate: event.end.toFoundation(), timeZone: NSTimeZone(name: event.timeZone))
+                complicationTemplate.headerTextProvider = CLKTimeIntervalTextProvider(start: event.start, end: event.end, timeZone: TimeZone(identifier: event.timeZone))
                 
                 complicationTemplate.body1TextProvider = CLKSimpleTextProvider(text: event.name)
                 
@@ -261,14 +261,14 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         // get sorted events
         var events = summit.schedule
             .filter({ $0.start >= date }) // only events that start after the specified date
-            .sort({ $0.0.start < $0.1.start })
+            .sorted(by: { $0.0.start < $0.1.start })
         
         guard events.isEmpty == false
             else { return .none }
         
         // timeframe smallest and closest to requested date
         let startDate = events.first!.start
-        let endDate = events.sort({ $0.0.end < $0.1.end }).first!.end
+        let endDate = events.sorted(by: { $0.0.end < $0.1.end }).first!.end
         
         // get events that are within the timeframe
         events = summit.schedule.filter { $0.start <= startDate && $0.end >= endDate }
@@ -287,7 +287,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     
     // MARK: - Notifications
     
-    @objc private func complicationServerActiveComplicationsDidChange(notification: NSNotification) {
+    @objc private func complicationServerActiveComplicationsDidChange(_ notification: Foundation.Notification) {
         
         ComplicationController.reloadComplications()
     }
@@ -343,7 +343,7 @@ extension Summit {
     
     var timelineDates: [Date] {
         
-        return schedule.reduce([Date](), combine: {
+        return schedule.reduce([Date](), {
             
             var newDates = $0.0
             
@@ -359,29 +359,29 @@ extension Summit {
             
             return newDates
         })
-        .sort()
+        .sorted()
     }
     
     func dates(after date: Date, limit: Int = Int.max) -> [Date] {
         
-        var dates = self.schedule.reduce([Date](), combine: { $0.0 + [$0.1.start, $0.1.end] })
+        var dates = self.schedule.reduce([Date](), { $0.0 + [$0.1.start, $0.1.end] })
             .filter({ $0 > date })
         
-        dates = dates.reduce([Date](), combine: { $0.0.contains($0.1) ? $0.0 : $0.0 + [$0.1] }) // remove duplicates
+        dates = dates.reduce([Date](), { $0.0.contains($0.1) ? $0.0 : $0.0 + [$0.1] }) // remove duplicates
             .prefix(limit)
-            .sort({ $0.0 > $0.1 })
+            .sorted(by: { $0.0 > $0.1 })
         
         return dates
     }
     
     func dates(before date: Date, limit: Int = Int.max) -> [Date] {
         
-        var dates = self.schedule.reduce([Date](), combine: { $0.0 + [$0.1.start, $0.1.end] })
+        var dates = self.schedule.reduce([Date](), { $0.0 + [$0.1.start, $0.1.end] })
             .filter({ $0 < date })
         
-        dates = dates.reduce([Date](), combine: { $0.0.contains($0.1) ? $0.0 : $0.0 + [$0.1] }) // remove duplicates
+        dates = dates.reduce([Date](), { $0.0.contains($0.1) ? $0.0 : $0.0 + [$0.1] }) // remove duplicates
             .prefix(limit)
-            .sort({ $0.0 < $0.1 })
+            .sorted(by: { $0.0 < $0.1 })
         
         return dates
     }
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/EventDatesInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/EventDatesInterfaceController.swift
index f49c4291..e1f1ecc9 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/EventDatesInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/EventDatesInterfaceController.swift	
@@ -16,15 +16,15 @@ final class EventDatesInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-     @IBOutlet weak var tableView: WKInterfaceTable!
+     @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
     // MARK: - Properties
     
-    private(set) var dates = [NSDate]()
+    private(set) var dates = [Date]()
     
-    private static let dateFormatter: NSDateFormatter = {
+    private static let dateFormatter: DateFormatter = {
         
-        let dateFormatter = NSDateFormatter()
+        let dateFormatter = DateFormatter()
         
         dateFormatter.dateFormat = "MMMM d"
         
@@ -33,8 +33,8 @@ final class EventDatesInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         updateUI()
     }
@@ -61,13 +61,13 @@ final class EventDatesInterfaceController: WKInterfaceController {
         
         let summit = Store.shared.cache!
         
-        let dayCount = summit.end.toFoundation().mt_daysSinceDate(summit.start.toFoundation())
+        let dayCount = (summit.end as NSDate).mt_days(since: summit.start)
         
-        self.dates = [NSDate]()
+        self.dates = [Date]()
         
         for index in 0 ..< dayCount {
             
-            let date = summit.start.toFoundation().mt_dateDaysAfter(index)
+            let date = (summit.start as NSDate).mt_dateDays(after: index) as Date
             
             dates.append(date)
         }
@@ -76,11 +76,11 @@ final class EventDatesInterfaceController: WKInterfaceController {
         
         tableView.setNumberOfRows(dates.count, withRowType: LabelCellController.identifier)
         
-        for (index, date) in dates.enumerate() {
+        for (index, date) in dates.enumerated() {
             
-            let cell = tableView.rowControllerAtIndex(index) as! LabelCellController
+            let cell = tableView.rowController(at: index) as! LabelCellController
             
-            let dateText = EventDatesInterfaceController.dateFormatter.stringFromDate(date)
+            let dateText = EventDatesInterfaceController.dateFormatter.string(from: date)
             
             cell.textLabel.setText(dateText)
         }
@@ -88,7 +88,7 @@ final class EventDatesInterfaceController: WKInterfaceController {
     
     // MARK: - Segue
     
-    override func contextForSegueWithIdentifier(segueIdentifier: String, inTable table: WKInterfaceTable, rowIndex: Int) -> AnyObject? {
+    override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
         
         // get value for selected row
         
@@ -96,14 +96,14 @@ final class EventDatesInterfaceController: WKInterfaceController {
         
         // get events for date
         
-        let startDate = selectedDate.mt_startOfCurrentDay()
-        let endDate = selectedDate.mt_endOfCurrentDay()
+        let startDate = (selectedDate as NSDate).mt_startOfCurrentDay()
+        let endDate = (selectedDate as NSDate).mt_endOfCurrentDay()
         
         let events = Store.shared.cache?.schedule.filter({
             
-            return $0.start.toFoundation().mt_isBetweenDate(startDate, andDate: endDate)
+            return ($0.start as NSDate).mt_isBetweenDate(startDate, andDate: endDate)
         })
         
         return Context(events)
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/EventDetail.swift b/OpenStack Summit/OpenStackSummitWatch Extension/EventDetail.swift
index fb0bea7a..913aa394 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/EventDetail.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/EventDetail.swift	
@@ -6,7 +6,7 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-import SwiftFoundation
+import Foundation
 import CoreSummit
 
 public struct EventDetail {
@@ -33,7 +33,7 @@ public struct EventDetail {
     public let level: String
     public let averageFeedback: Double
     public let video: Video?
-    public let webpageURL: NSURL
+    public let webpageURL: URL
     
     // MARK: - Initialization
     
@@ -41,7 +41,7 @@ public struct EventDetail {
         
         self.identifier = event.identifier
         self.name = event.name
-        self.eventType = summit.eventTypes.firstMatching({ $0.identifier == event.type })!.name
+        self.eventType = summit.eventTypes.first(where: { $0.identifier == event.type })!.name
         self.location = EventDetail.getLocation(event, summit: summit)
         self.dateTime = EventDetail.getDateTime(event, summit: summit)
         self.time = EventDetail.getTime(event, summit: summit)
@@ -72,7 +72,7 @@ public struct EventDetail {
         
         for speakerID in event.presentation.speakers {
             
-            let speaker = summit.speakers.firstMatching({ $0.identifier == speakerID })!
+            let speaker = summit.speakers.first(where: { $0.identifier == speakerID })!
             
             // HACK: dismiss speakers with empty name
             if speaker.firstName.isEmpty && speaker.lastName.isEmpty {
@@ -82,9 +82,9 @@ public struct EventDetail {
             speakers.append(speaker)
         }
         
-        if let moderator = event.presentation.moderator where moderator != 0 {
+        if let moderator = event.presentation.moderator, moderator != 0 {
             
-            moderatorSpeaker = summit.speakers.firstMatching({ $0.identifier == moderator })!
+            moderatorSpeaker = summit.speakers.first(where: { $0.identifier == moderator })!
         }
         
         self.speakers = speakers
@@ -92,7 +92,7 @@ public struct EventDetail {
         
         self.video = event.videos.first
         
-        self.webpageURL = NSURL(string: event.toWebpageURL(summit))!
+        self.webpageURL = event.webpage(for: summit)
     }
 }
 
@@ -100,7 +100,7 @@ public struct EventDetail {
 
 internal extension EventDetail {
     
-    static func getSponsors(event: Event, summit: Summit) -> String {
+    static func getSponsors(_ event: Event, summit: Summit) -> String {
         
         guard event.sponsors.isEmpty == false
             else { return "" }
@@ -108,7 +108,7 @@ internal extension EventDetail {
         var sponsors = "Sponsored by "
         var separator = ""
         for sponsorID in event.sponsors {
-            let sponsor = summit.sponsors.firstMatching({ sponsorID == $0.identifier })!
+            let sponsor = summit.sponsors.first(where: { sponsorID == $0.identifier })!
             sponsors += separator + sponsor.name
             separator = ", "
             assert(sponsor.name.isEmpty == false, "Empty sponsor name")
@@ -116,47 +116,46 @@ internal extension EventDetail {
         return sponsors
     }
     
-    static func getTime(event: Event, summit: Summit) -> String {
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: summit.timeZone);
+    static func getTime(_ event: Event, summit: Summit) -> String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: summit.timeZone);
         dateFormatter.dateFormat = "hh:mm a"
-        dateFormatter.AMSymbol = "am"
-        dateFormatter.PMSymbol = "pm"
-        let stringDateFrom = dateFormatter.stringFromDate(event.start.toFoundation())
+        dateFormatter.amSymbol = "am"
+        dateFormatter.pmSymbol = "pm"
+        let stringDateFrom = dateFormatter.string(from: event.start)
         
         dateFormatter.dateFormat = "hh:mm a"
-        let stringDateTo = dateFormatter.stringFromDate(event.end.toFoundation())
+        let stringDateTo = dateFormatter.string(from: event.end)
         
         return "\(stringDateFrom) / \(stringDateTo)"
     }
     
-    static func getDateTime(event: Event, summit: Summit) -> String {
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: summit.timeZone);
+    static func getDateTime(_ event: Event, summit: Summit) -> String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: summit.timeZone);
         dateFormatter.dateFormat = "EEEE dd MMMM hh:mm a"
-        dateFormatter.AMSymbol = "am"
-        dateFormatter.PMSymbol = "pm"
-        let stringDateFrom = dateFormatter.stringFromDate(event.start.toFoundation())
+        dateFormatter.amSymbol = "am"
+        dateFormatter.pmSymbol = "pm"
+        let stringDateFrom = dateFormatter.string(from: event.start)
         
         dateFormatter.dateFormat = "hh:mm a"
-        let stringDateTo = dateFormatter.stringFromDate(event.end.toFoundation())
+        let stringDateTo = dateFormatter.string(from: event.end)
         
         return "\(stringDateFrom) / \(stringDateTo)"
     }
     
-    static func getLocation(event: Event, summit: Summit) -> String {
+    static func getLocation(_ event: Event, summit: Summit) -> String {
         
-        guard let locationID = event.location
-            where locationID != 0
+        guard let locationID = event.location, locationID != 0
             else { return "" }
         
-        let location = summit.locations.firstMatching({ $0.identifier == locationID })!
+        let location = summit.locations.first(where: { $0.identifier == locationID })!
         
         switch location {
             
         case let .room(room):
             
-            guard let venueLocation = summit.locations.firstMatching({ $0.identifier == room.venue }),
+            guard let venueLocation = summit.locations.first(where: { $0.identifier == room.venue }),
                 case let .venue(venue) = venueLocation
                 else { fatalError("No venue") }
             
@@ -168,20 +167,20 @@ internal extension EventDetail {
         }
     }
     
-    static func getTrack(event: Event, summit: Summit) -> String {
+    static func getTrack(_ event: Event, summit: Summit) -> String {
         
         guard let trackID = event.track
             else { return "" }
         
-        return summit.tracks.firstMatching({ $0.identifier == trackID })!.name
+        return summit.tracks.first(where: { $0.identifier == trackID })!.name
     }
     
-    static func getTrackGroupColor(event: Event, summit: Summit) -> String {
+    static func getTrackGroupColor(_ event: Event, summit: Summit) -> String {
         
         guard let trackID = event.track,
-            let track = summit.tracks.firstMatching({ $0.identifier == trackID }),
+            let track = summit.tracks.first(where: { $0.identifier == trackID }),
             let trackGroupID = track.groups.first,
-            let trackGroup = summit.trackGroups.firstMatching({ $0.identifier == trackGroupID })
+            let trackGroup = summit.trackGroups.first(where: { $0.identifier == trackGroupID })
             else { return "" }
         
         return trackGroup.color
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/EventDetailInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/EventDetailInterfaceController.swift
index d8a71b85..b7a40b35 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/EventDetailInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/EventDetailInterfaceController.swift	
@@ -16,37 +16,37 @@ final class EventDetailInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var moviePlayer: WKInterfaceMovie!
+    @IBOutlet private(set) weak var moviePlayer: WKInterfaceMovie!
     
-    @IBOutlet weak var dateLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var dateLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var locationLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var locationLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var locationSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var locationSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var locationButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var locationButton: WKInterfaceButton!
     
-    @IBOutlet weak var tagsLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var tagsLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var tagsGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var tagsGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var tagsSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var tagsSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var speakersLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var speakersLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var speakersButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var speakersButton: WKInterfaceButton!
     
-    @IBOutlet weak var speakersSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var speakersSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var levelLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var levelLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var levelGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var levelGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var levelSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var levelSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var descriptionLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var descriptionLabel: WKInterfaceLabel!
     
     // MARK: - Properties
     
@@ -56,8 +56,8 @@ final class EventDetailInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         guard let event = (context as? Context<Event>)?.value
             else { fatalError("Invalid context") }
@@ -73,10 +73,10 @@ final class EventDetailInterfaceController: WKInterfaceController {
         super.willActivate()
         
         /// set user activity
-        let activityUserInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue,
+        let activityUserInfo: [String: Any] = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.event.rawValue,
                                 AppActivityUserInfo.identifier.rawValue: eventDetail.identifier]
         
-        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo as [NSObject : AnyObject], webpageURL: eventDetail.webpageURL)
+        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo, webpageURL: eventDetail.webpageURL)
     }
     
     override func didDeactivate() {
@@ -88,21 +88,21 @@ final class EventDetailInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func showSpeakers(sender: AnyObject? = nil) {
+    @IBAction func showSpeakers(_ sender: AnyObject? = nil) {
         
         if eventDetail.speakers.count == 1 {
             
             let speaker = eventDetail.speakers[0]
             
-            pushControllerWithName(SpeakerDetailInterfaceController.identifier, context: Context(speaker))
+            pushController(withName: SpeakerDetailInterfaceController.identifier, context: Context(speaker))
             
         } else {
             
-            pushControllerWithName(SpeakersInterfaceController.identifier, context: Context(eventDetail.speakers))
+            pushController(withName: SpeakersInterfaceController.identifier, context: Context(eventDetail.speakers))
         }
     }
     
-    @IBAction func showLocation(sender: AnyObject? = nil) {
+    @IBAction func showLocation(_ sender: AnyObject? = nil) {
         
         guard let summit = Store.shared.cache,
             let locationID = event.location
@@ -111,7 +111,7 @@ final class EventDetailInterfaceController: WKInterfaceController {
         guard let location = summit.locations.with(locationID)
             else { fatalError("Invalid location \(locationID)") }
         
-        self.pushControllerWithName(VenueDetailInterfaceController.identifier, context: Context(location))
+        self.pushController(withName: VenueDetailInterfaceController.identifier, context: Context(location))
     }
     
     // MARK: - Private Methods
@@ -146,8 +146,8 @@ final class EventDetailInterfaceController: WKInterfaceController {
         levelSeparator.setHidden(eventDetail.level.isEmpty)
         
         if let descriptionText = eventDetail.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             descriptionLabel.setText(attributedString.string)
             
@@ -159,7 +159,7 @@ final class EventDetailInterfaceController: WKInterfaceController {
         }
         
         if let video = eventDetail.video,
-            let url = NSURL(string: "https://img.youtube.com/vi/" + video.youtube + "/default.jpg") {
+            let url = URL(string: "https://img.youtube.com/vi/" + video.youtube + "/default.jpg") {
             
             moviePlayer.setHidden(false)
             moviePlayer.loadCached(url)
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/EventFiltersInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/EventFiltersInterfaceController.swift
index 7f5a51f1..6a0a6168 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/EventFiltersInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/EventFiltersInterfaceController.swift	
@@ -16,7 +16,7 @@ final class EventFiltersInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: WKInterfaceTable!
+    @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
     // MARK: - Properties
     
@@ -38,9 +38,9 @@ final class EventFiltersInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func search(sender: AnyObject? = nil) {
+    @IBAction func search(_ sender: AnyObject? = nil) {
         
-        presentTextInputControllerWithSuggestionsForLanguage({ self.autosuggestions(for: $0) }, allowedInputMode: .Plain) { (input) in
+        presentTextInputControllerWithSuggestions(forLanguage: { self.autosuggestions(for: $0) }, allowedInputMode: .plain) { (input) in
             
             guard let inputText = input as? [String]
                 else { return }
@@ -49,7 +49,7 @@ final class EventFiltersInterfaceController: WKInterfaceController {
                 
                 for string in inputText {
                     
-                    if $0.name.localizedCaseInsensitiveContainsString(string) {
+                    if $0.name.localizedCaseInsensitiveContains(string) {
                         
                         return true
                     }
@@ -59,7 +59,7 @@ final class EventFiltersInterfaceController: WKInterfaceController {
                 
             })
             
-            self.pushControllerWithName(EventsInterfaceController.identifier, context: Context(filteredEvents))
+            self.pushController(withName: EventsInterfaceController.identifier, context: Context(filteredEvents))
         }
     }
     
@@ -84,4 +84,4 @@ final class EventFiltersInterfaceController: WKInterfaceController {
             
         #endif
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/EventsInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/EventsInterfaceController.swift
index 750a2a58..b117af2e 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/EventsInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/EventsInterfaceController.swift	
@@ -16,28 +16,28 @@ final class EventsInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: WKInterfaceTable!
+    @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
     // MARK: - Properties
     
     private(set) var events = [Event]()
     
-    private static let dateFormatter: NSDateFormatter = {
+    private static let dateFormatter: DateFormatter = {
        
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeZone = NSTimeZone(name: Store.shared.cache!.timeZone)
-        dateFormatter.dateStyle = .ShortStyle
-        dateFormatter.timeStyle = .ShortStyle
+        let dateFormatter = DateFormatter()
+        dateFormatter.timeZone = TimeZone(identifier: Store.shared.cache!.timeZone)
+        dateFormatter.dateStyle = .short
+        dateFormatter.timeStyle = .short
         
         return dateFormatter
     }()
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
-        events = (context as? Context<[Event]?>)?.value ?? Store.shared.cache!.schedule.sort()
+        events = (context as? Context<[Event]?>)?.value ?? Store.shared.cache!.schedule.sorted()
         
         updateUI()
     }
@@ -49,7 +49,7 @@ final class EventsInterfaceController: WKInterfaceController {
         /// set user activity
         if let summit = Store.shared.cache {
             
-            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.events.rawValue], webpageURL: NSURL(string: summit.webpageURL + "/summit-schedule"))
+            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.events.rawValue], webpageURL: summit.webpage.appendingPathComponent("summit-schedule"))
         }
     }
     
@@ -68,11 +68,11 @@ final class EventsInterfaceController: WKInterfaceController {
         
         tableView.setNumberOfRows(events.count, withRowType: EventCellController.identifier)
         
-        for (index, event) in events.enumerate() {
+        for (index, event) in events.enumerated() {
             
-            let cell = tableView.rowControllerAtIndex(index) as! EventCellController
+            let cell = tableView.rowController(at: index) as! EventCellController
             
-            let dateText = EventsInterfaceController.dateFormatter.stringFromDate(event.start.toFoundation())
+            let dateText = EventsInterfaceController.dateFormatter.string(from: event.start)
             let locationText = EventDetail.getLocation(event, summit: Store.shared.cache!)
             
             cell.nameLabel.setText(event.name)
@@ -84,7 +84,7 @@ final class EventsInterfaceController: WKInterfaceController {
     
     // MARK: - Segue
     
-    override func contextForSegueWithIdentifier(segueIdentifier: String, inTable table: WKInterfaceTable, rowIndex: Int) -> AnyObject? {
+    override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
         
         let event = events[rowIndex]
         
@@ -98,8 +98,8 @@ final class EventCellController: NSObject {
     
     static let identifier = "EventCell"
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
-    @IBOutlet weak var dateLabel: WKInterfaceLabel!
-    @IBOutlet weak var locationLabel: WKInterfaceLabel!
-    @IBOutlet weak var locationGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var dateLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var locationLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var locationGroup: WKInterfaceGroup!
 }
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/ImageCache.swift b/OpenStack Summit/OpenStackSummitWatch Extension/ImageCache.swift
index 48797f03..6b01ff22 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/ImageCache.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/ImageCache.swift	
@@ -16,9 +16,9 @@ public final class ImageCache {
     
     // MARK: - Properties
     
-    private let internalCache = NSCache()
+    private let internalCache = NSCache<NSString, NSData>()
     
-    public var urlSession = NSURLSession.sharedSession()
+    public var urlSession = URLSession.shared
     
     // MARK: - Accessors
     
@@ -43,26 +43,26 @@ public final class ImageCache {
         internalCache.removeAllObjects()
     }
     
-    public func load(url: NSURL, completion: Response -> ()) {
+    public func load(_ url: URL, completion: @escaping (Response) -> ()) {
         
         // attempt to get from cache first
         if let cachedImageData = self[url] {
             
-            completion(.Data(cachedImageData))
+            completion(.data(cachedImageData))
             return
         }
         
-        let task = urlSession.dataTaskWithURL(url) { (data, response, error) in
+        let task = urlSession.dataTask(with: url, completionHandler: { (data, response, error) in
             
             guard error == nil else {
                 
-                completion(.Error(error!))
+                completion(.error(error!))
                 return
             }
             
             guard let data = data else {
                 
-                completion(.NoData(response!))
+                completion(.noData(response!))
                 return
             }
             
@@ -70,24 +70,26 @@ public final class ImageCache {
             self[url] = data
             
             // success!
-            completion(.Data(data))
-        }
+            completion(.data(data))
+        }) 
         
         task.resume()
     }
     
     // MARK: - Subscripting
     
-    public subscript (url: NSURL) -> NSData? {
+    public subscript (url: URL) -> Data? {
         
-        get { return internalCache.objectForKey(url.absoluteString!) as? NSData }
+        get { return internalCache.object(forKey: url.absoluteString as NSString) as Data? }
         
         set {
             
+            let key = url.absoluteString as NSString
+            
             guard let newData = newValue
-                else { internalCache.removeObjectForKey(url.absoluteString!); return }
+                else { internalCache.removeObject(forKey: key); return }
             
-            internalCache.setObject(newData, forKey: url.absoluteString!)
+            internalCache.setObject(newData as NSData, forKey: key)
         }
     }
 }
@@ -98,30 +100,30 @@ public extension ImageCache {
     
     public enum Response {
         
-        case Error(ErrorType)
-        case NoData(NSURLResponse)
-        case Data(NSData)
+        case error(Swift.Error)
+        case noData(URLResponse)
+        case data(Foundation.Data)
     }
 }
 
 public protocol ImageCacheView: class, Hashable {
     
-    func loadCached(url: NSURL, placeholder: UIImage?, cache: ImageCache, completion: (ImageCache.Response -> ())?)
+    func loadCached(_ url: URL, placeholder: UIImage?, cache: ImageCache, completion: ((ImageCache.Response) -> ())?)
     
     #if os(watchOS)
-    func setImage(image: UIImage?)
+    func setImage(_ image: UIImage?)
     #else
     var image: UIImage? { get set }
     #endif
     
-    func setImageData(imageData: NSData?)
+    func setImageData(_ imageData: Data?)
 }
 
-private var InProgressCache = [Int: NSURL]()
+private var InProgressCache = [Int: URL]()
 
 public extension ImageCacheView {
     
-    public func loadCached(url: NSURL, placeholder: UIImage? = nil, cache: ImageCache = ImageCache.shared, completion: (ImageCache.Response -> ())? = nil) {
+    public func loadCached(_ url: URL, placeholder: UIImage? = nil, cache: ImageCache = ImageCache.shared, completion: ((ImageCache.Response) -> ())? = nil) {
         
         // set placeholder
         if let placeholder = placeholder {
@@ -148,9 +150,9 @@ public extension ImageCacheView {
             // remove from cache
             InProgressCache[hash] = nil
             
-            NSOperationQueue.mainQueue().addOperationWithBlock {
+            OperationQueue.main.addOperation {
                 
-                if case let .Data(data) = response {
+                if case let .data(data) = response {
                     
                     view.setImageData(data)
                 }
@@ -174,12 +176,12 @@ extension WKInterfaceImage: ImageCacheView { }
 
 extension WKInterfaceGroup: ImageCacheView {
     
-    public func setImage(image: UIImage?) {
+    public func setImage(_ image: UIImage?) {
         
         setBackgroundImage(image)
     }
     
-    public func setImageData(imageData: NSData?) {
+    public func setImageData(_ imageData: Data?) {
         
         setBackgroundImageData(imageData)
     }
@@ -187,7 +189,7 @@ extension WKInterfaceGroup: ImageCacheView {
 
 extension WKInterfaceMovie: ImageCacheView {
     
-    public func setImage(image: UIImage?) {
+    public func setImage(_ image: UIImage?) {
         
         let watchImage: WKImage?
         
@@ -203,7 +205,7 @@ extension WKInterfaceMovie: ImageCacheView {
         setPosterImage(watchImage)
     }
     
-    public func setImageData(imageData: NSData?) {
+    public func setImageData(_ imageData: Data?) {
         
         let watchImage: WKImage?
         
@@ -226,7 +228,7 @@ import AppKit
 
 extension NSImageView: ImageCacheView {
     
-    public func setImageData(imageData: NSData?) {
+    public func setImageData(_ imageData: Data?) {
         
         if let data = imageData {
             
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/ImageInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/ImageInterfaceController.swift
index 12655173..10f0d62a 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/ImageInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/ImageInterfaceController.swift	
@@ -16,9 +16,9 @@ final class ImageInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var imageView: WKInterfaceImage!
+    @IBOutlet private(set) weak var imageView: WKInterfaceImage!
     
-    @IBOutlet weak var activityIndicator: WKInterfaceImage!
+    @IBOutlet private(set) weak var activityIndicator: WKInterfaceImage!
     
     // MARK: - Properties
     
@@ -26,8 +26,8 @@ final class ImageInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         guard let image = (context as? Context<Image>)?.value
             else { fatalError("Invalid context") }
@@ -41,10 +41,7 @@ final class ImageInterfaceController: WKInterfaceController {
         // This method is called when watch view controller is about to be visible to user
         super.willActivate()
         
-        if let imageURL = NSURL(string: image.url) {
-            
-            updateUserActivity(NSUserActivityTypeBrowsingWeb, userInfo: nil, webpageURL: imageURL)
-        }
+        updateUserActivity(NSUserActivityTypeBrowsingWeb, userInfo: nil, webpageURL: image.url)
     }
     
     override func didDeactivate() {
@@ -58,17 +55,14 @@ final class ImageInterfaceController: WKInterfaceController {
     
     private func updateUI() {
         
-        guard let imageURL = NSURL(string: image.url)
-            else { return }
-        
         // show activity indicator
         activityIndicator.setImageNamed("Activity")
-        activityIndicator.startAnimatingWithImagesInRange(NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
+        activityIndicator.startAnimatingWithImages(in: NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
         activityIndicator.setHidden(false)
         imageView.setHidden(true)
         
         // load image
-        imageView.loadCached(imageURL) { [weak self] (response) in
+        imageView.loadCached(image.url) { [weak self] (response) in
             
             guard let controller = self else { return }
             
@@ -78,11 +72,11 @@ final class ImageInterfaceController: WKInterfaceController {
             
             // show alert image
             
-            guard case .Data = response else {
+            guard case .data = response else {
                 
                 controller.imageView.setImageNamed("alert")
                 return
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist b/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist
index a0a43e71..5541d60b 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.3</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/LabelCellController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/LabelCellController.swift
index abb52d37..c652cd58 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/LabelCellController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/LabelCellController.swift	
@@ -13,5 +13,5 @@ final class LabelCellController: NSObject {
     
     static let identifier = "LabelCell"
     
-    @IBOutlet weak var textLabel: WKInterfaceLabel!
-}
\ No newline at end of file
+    @IBOutlet private(set) weak var textLabel: WKInterfaceLabel!
+}
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/MenuInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/MenuInterfaceController.swift
index 7c118071..c4c80877 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/MenuInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/MenuInterfaceController.swift	
@@ -16,9 +16,9 @@ final class MenuInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: WKInterfaceTable!
+    @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
-    @IBOutlet weak var loadingImageView: WKInterfaceImage!
+    @IBOutlet private(set) weak var loadingImageView: WKInterfaceImage!
     
     // MARK: - Properties
     
@@ -37,16 +37,16 @@ final class MenuInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         // load static menu table view
         
         tableView.setNumberOfRows(menuItems.count, withRowType: MenuCellController.identifier)
         
-        for (index, menuItem) in menuItems.enumerate() {
+        for (index, menuItem) in menuItems.enumerated() {
             
-            let cell = tableView.rowControllerAtIndex(index) as! MenuCellController
+            let cell = tableView.rowController(at: index) as! MenuCellController
             
             cell.menuLabel.setText(menuItem.name)
             cell.imageView.setImageNamed(menuItem.image)
@@ -54,7 +54,7 @@ final class MenuInterfaceController: WKInterfaceController {
         
         // configure activity indicator
         loadingImageView.setImageNamed("Activity")
-        loadingImageView.startAnimatingWithImagesInRange(NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
+        loadingImageView.startAnimatingWithImages(in: NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
     }
     
     override func willActivate() {
@@ -72,11 +72,11 @@ final class MenuInterfaceController: WKInterfaceController {
     
     // MARK: - Table View Selection
     
-    override func table(table: WKInterfaceTable, didSelectRowAtIndex rowIndex: Int) {
+    override func table(_ table: WKInterfaceTable, didSelectRowAt rowIndex: Int) {
         
         let menuItem = menuItems[rowIndex]
         
-        self.pushControllerWithName(menuItem.controller, context: nil)
+        self.pushController(withName: menuItem.controller, context: nil)
     }
     
     // MARK: - Private Methods
@@ -109,22 +109,22 @@ final class MenuInterfaceController: WKInterfaceController {
             
             switch response {
                 
-            case let .Error(error):
+            case let .error(error):
                 
                 print("Error loading summit: ", error)
                 
-                controller.presentAlertControllerWithTitle("Could not load summit data",
+                controller.presentAlert(withTitle: "Could not load summit data",
                     message: (error as NSError).localizedFailureReason ?? (error as NSError).localizedDescription,
                     preferredStyle:
-                    .Alert,
+                    .alert,
                     actions: [WKAlertAction(title: "Try again", style:
-                        .Cancel, handler: {
+                        .cancel, handler: {
                             
                             // attempt to reload data
                             controller.loadData()
                 })])
                 
-            case let .Value(summit):
+            case let .value(summit):
                 
                 print("Fetched \(summit.name) summit")
                 
@@ -143,9 +143,9 @@ final class MenuCellController: NSObject {
     
     static let identifier = "MenuCell"
     
-    @IBOutlet weak var menuLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var menuLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var imageView: WKInterfaceImage!
+    @IBOutlet private(set) weak var imageView: WKInterfaceImage!
 }
 
 struct MenuItem {
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/SpeakerDetailInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/SpeakerDetailInterfaceController.swift
index bbe4265f..7d9ee6f7 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/SpeakerDetailInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/SpeakerDetailInterfaceController.swift	
@@ -16,44 +16,44 @@ final class SpeakerDetailInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var titleLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var titleLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var imageView: WKInterfaceImage!
+    @IBOutlet private(set) weak var imageView: WKInterfaceImage!
     
-    @IBOutlet weak var twitterLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var twitterLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var twitterGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var twitterGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var twitterSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var twitterSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var ircLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var ircLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var ircGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var ircGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var ircSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var ircSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var eventsSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var eventsSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var eventsButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var eventsButton: WKInterfaceButton!
     
-    @IBOutlet weak var eventsLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var eventsLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var biographyLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var biographyLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var biographySeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var biographySeparator: WKInterfaceSeparator!
     
     // MARK: - Properties
     
     private(set) var speaker: Speaker!
     
-    private lazy var events: [Event] = Store.shared.cache?.schedule.filter({ $0.presentation.speakers.contains(self.speaker.identifier) ?? false }) ?? []
+    private lazy var events: [Event] = Store.shared.cache?.schedule.filter({ $0.presentation.speakers.contains(self.speaker.identifier)}) ?? []
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         guard let speaker = (context as? Context<Speaker>)?.value
             else { fatalError("Invalid context") }
@@ -69,11 +69,11 @@ final class SpeakerDetailInterfaceController: WKInterfaceController {
         
         /// set user activity
         let activityUserInfo = [AppActivityUserInfo.type.rawValue: AppActivitySummitDataType.speaker.rawValue,
-                                AppActivityUserInfo.identifier.rawValue: speaker.identifier]
+                                AppActivityUserInfo.identifier.rawValue: speaker.identifier] as [String : Any]
         
-        let webpageURL = NSURL(string: speaker.toWebpageURL(Store.shared.cache!))!
+        let webpageURL = speaker.webpage(for: Store.shared.cache!)
         
-        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo as [NSObject : AnyObject], webpageURL: webpageURL)
+        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo as [AnyHashable: Any], webpageURL: webpageURL)
     }
     
     override func didDeactivate() {
@@ -85,17 +85,17 @@ final class SpeakerDetailInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func showEvents(sender: AnyObject? = nil) {
+    @IBAction func showEvents(_ sender: AnyObject? = nil) {
         
         if events.count == 1 {
             
             let event = events[0]
             
-            pushControllerWithName(EventDetailInterfaceController.identifier, context: Context(event))
+            pushController(withName: EventDetailInterfaceController.identifier, context: Context(event))
             
         } else {
             
-            pushControllerWithName(EventsInterfaceController.identifier, context: Context(events))
+            pushController(withName: EventsInterfaceController.identifier, context: Context(events))
         }
     }
     
@@ -108,10 +108,7 @@ final class SpeakerDetailInterfaceController: WKInterfaceController {
         titleLabel.setText(speaker.title)
         titleLabel.setHidden(speaker.title == nil)
         
-        if let url = NSURL(string: speaker.pictureURL) {
-            
-            imageView.loadCached(url)
-        }
+        imageView.loadCached(speaker.picture)
         
         twitterLabel.setText(speaker.twitter)
         twitterGroup.setHidden(speaker.twitter == nil)
@@ -130,8 +127,8 @@ final class SpeakerDetailInterfaceController: WKInterfaceController {
         biographySeparator.setHidden(speaker.biography == nil)
         
         if let descriptionText = speaker.biography,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             biographyLabel.setText(attributedString.string)
             
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/SpeakersInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/SpeakersInterfaceController.swift
index 12d4b316..67e7cb6b 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/SpeakersInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/SpeakersInterfaceController.swift	
@@ -16,11 +16,11 @@ final class SpeakersInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var searchButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var searchButton: WKInterfaceButton!
     
-    @IBOutlet weak var tableView: WKInterfaceTable!
+    @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
-    @IBOutlet weak var emptyLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var emptyLabel: WKInterfaceLabel!
     
     // MARK: - Properties
     
@@ -31,8 +31,8 @@ final class SpeakersInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         // disable speaker search for selected speakers
         if let speakers = (context as? Context<[Speaker]>)?.value {
@@ -59,9 +59,9 @@ final class SpeakersInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func search(sender: WKInterfaceButton) {
+    @IBAction func search(_ sender: WKInterfaceButton) {
         
-        presentTextInputControllerWithSuggestionsForLanguage({ self.autosuggestions(for: $0) }, allowedInputMode: .Plain) { (input) in
+        presentTextInputControllerWithSuggestions(forLanguage: { self.autosuggestions(for: $0) }, allowedInputMode: .plain) { (input) in
             
             guard let inputText = input as? [String]
                 else { return }
@@ -71,7 +71,7 @@ final class SpeakersInterfaceController: WKInterfaceController {
                 
                 for string in inputText {
                     
-                    if $0.name.containsString(string) {
+                    if $0.name.contains(string) {
                         
                         return true
                     }
@@ -84,7 +84,7 @@ final class SpeakersInterfaceController: WKInterfaceController {
     
     // MARK: - Segue
     
-    override func contextForSegueWithIdentifier(segueIdentifier: String, inTable table: WKInterfaceTable, rowIndex: Int) -> AnyObject? {
+    override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
         
         let speaker = speakers[rowIndex]
         
@@ -99,9 +99,9 @@ final class SpeakersInterfaceController: WKInterfaceController {
         
         tableView.setNumberOfRows(speakers.count, withRowType: SpeakerCellController.identifier)
         
-        for (index, speaker) in speakers.enumerate() {
+        for (index, speaker) in speakers.enumerated() {
             
-            let cell = tableView.rowControllerAtIndex(index) as! SpeakerCellController
+            let cell = tableView.rowController(at: index) as! SpeakerCellController
             
             cell.nameLabel.setText(speaker.name)
             cell.titleLabel.setText(speaker.title)
@@ -135,7 +135,7 @@ final class SpeakerCellController: NSObject {
     
     static let identifier = "SpeakerCell"
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var titleLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var titleLabel: WKInterfaceLabel!
 }
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/VenueDetailInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/VenueDetailInterfaceController.swift
index 969ebeaf..681a4130 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/VenueDetailInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/VenueDetailInterfaceController.swift	
@@ -16,35 +16,35 @@ final class VenueDetailInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var addressLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var addressLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var descriptionSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var descriptionSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var descriptionLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var descriptionLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var capacityLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var capacityLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var capacitySeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var capacitySeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var roomLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var roomLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var roomSeparator: WKInterfaceSeparator!
+    @IBOutlet private(set) weak var roomSeparator: WKInterfaceSeparator!
     
-    @IBOutlet weak var mapView: WKInterfaceMap!
+    @IBOutlet private(set) weak var mapView: WKInterfaceMap!
     
-    @IBOutlet weak var imagesButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var imagesButton: WKInterfaceButton!
     
-    @IBOutlet weak var imagesView: WKInterfaceImage!
+    @IBOutlet private(set) weak var imagesView: WKInterfaceImage!
     
-    @IBOutlet weak var imagesActivityIndicator: WKInterfaceImage!
+    @IBOutlet private(set) weak var imagesActivityIndicator: WKInterfaceImage!
     
-    @IBOutlet weak var mapImagesButton: WKInterfaceButton!
+    @IBOutlet private(set) weak var mapImagesButton: WKInterfaceButton!
     
-    @IBOutlet weak var mapImagesView: WKInterfaceImage!
+    @IBOutlet private(set) weak var mapImagesView: WKInterfaceImage!
     
-    @IBOutlet weak var mapImagesActivityIndicator: WKInterfaceImage!
+    @IBOutlet private(set) weak var mapImagesActivityIndicator: WKInterfaceImage!
     
     // MARK: - Properties
     
@@ -67,8 +67,8 @@ final class VenueDetailInterfaceController: WKInterfaceController {
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         guard let location = (context as? Context<Location>)?.value
             else { fatalError("Invalid context") }
@@ -91,9 +91,9 @@ final class VenueDetailInterfaceController: WKInterfaceController {
         
         /// set user activity
         let activityUserInfo = [AppActivityUserInfo.type.rawValue: type.rawValue,
-                                AppActivityUserInfo.identifier.rawValue: location.identifier]
+                                AppActivityUserInfo.identifier.rawValue: location.identifier] as [String : Any]
         
-        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo as [NSObject : AnyObject], webpageURL: nil)
+        updateUserActivity(AppActivity.view.rawValue, userInfo: activityUserInfo as [AnyHashable: Any], webpageURL: nil)
     }
     
     override func didDeactivate() {
@@ -105,25 +105,25 @@ final class VenueDetailInterfaceController: WKInterfaceController {
     
     // MARK: - Actions
     
-    @IBAction func showVenueImages(sender: AnyObject? = nil) {
+    @IBAction func showVenueImages(_ sender: AnyObject? = nil) {
         
-        showImages(venue.images.sort())
+        showImages(venue.images.sorted())
     }
     
-    @IBAction func showMapImages(sender: AnyObject? = nil) {
+    @IBAction func showMapImages(_ sender: AnyObject? = nil) {
         
-        showImages(venue.maps.sort())
+        showImages(venue.maps.sorted())
     }
         
     // MARK: - Private Methods
     
-    private func showImages(images: [Image]) {
+    private func showImages(_ images: [Image]) {
         
-        let names = [String](count: images.count, repeatedValue: ImageInterfaceController.identifier)
+        let names = [String](repeating: ImageInterfaceController.identifier, count: images.count)
         
         let contexts = images.map { Context($0) }
         
-        presentControllerWithNames(names, contexts: contexts)
+        presentController(withNames: names, contexts: contexts)
     }
     
     private func updateUI() {
@@ -153,8 +153,8 @@ final class VenueDetailInterfaceController: WKInterfaceController {
         descriptionSeparator.setHidden(venue.descriptionText == nil)
         
         if let descriptionText = venue.descriptionText,
-            let data = descriptionText.dataUsingEncoding(NSUTF8StringEncoding),
-            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute:NSUTF8StringEncoding], documentAttributes: nil) {
+            let data = descriptionText.data(using: String.Encoding.utf8),
+            let attributedString = try? NSAttributedString(data: data, options: [NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType,NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil) {
             
             descriptionLabel.setText(attributedString.string)
             descriptionLabel.setHidden(false)
@@ -184,12 +184,11 @@ final class VenueDetailInterfaceController: WKInterfaceController {
         roomSeparator.setHidden(room?.name == nil)
         
         // set images
-        if let image = venue.images.first,
-            let imageURL = NSURL(string: image.url) {
+        if let imageURL = venue.images.sorted().first?.url {
             
             // show activity indicator
             imagesActivityIndicator.setImageNamed("Activity")
-            imagesActivityIndicator.startAnimatingWithImagesInRange(NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
+            imagesActivityIndicator.startAnimatingWithImages(in: NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
             imagesActivityIndicator.setHidden(false)
             imagesView.setHidden(true)
             
@@ -202,7 +201,7 @@ final class VenueDetailInterfaceController: WKInterfaceController {
                 controller.imagesActivityIndicator.setHidden(true)
                 
                 // hide image view if no image
-                guard case .Data = response else {
+                guard case .data = response else {
                     
                     controller.imagesView.setHidden(true)
                     return
@@ -217,12 +216,11 @@ final class VenueDetailInterfaceController: WKInterfaceController {
         }
         
         // set map images
-        if let image = venue.maps.first,
-            let imageURL = NSURL(string: image.url) {
+        if let imageURL = venue.maps.sorted().first?.url {
             
             // show activity indicator
             mapImagesActivityIndicator.setImageNamed("Activity")
-            mapImagesActivityIndicator.startAnimatingWithImagesInRange(NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
+            mapImagesActivityIndicator.startAnimatingWithImages(in: NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
             mapImagesActivityIndicator.setHidden(false)
             mapImagesView.setHidden(true)
             
@@ -235,7 +233,7 @@ final class VenueDetailInterfaceController: WKInterfaceController {
                 controller.mapImagesActivityIndicator.setHidden(true)
                 
                 // hide image view if no image
-                guard case .Data = response else {
+                guard case .data = response else {
                     
                     controller.mapImagesView.setHidden(true)
                     return
@@ -257,7 +255,7 @@ final class VenueDetailInterfaceController: WKInterfaceController {
             
             mapView.setHidden(false)
             mapView.removeAllAnnotations()
-            mapView.addAnnotation(center, withPinColor: .Red)
+            mapView.addAnnotation(center, with: .red)
             mapView.setRegion(region)
             
         } else {
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/VenuesInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/VenuesInterfaceController.swift
index d9146ca5..8e432123 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/VenuesInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/VenuesInterfaceController.swift	
@@ -16,13 +16,13 @@ final class VenuesInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var tableView: WKInterfaceTable!
+    @IBOutlet private(set) weak var tableView: WKInterfaceTable!
     
     // MARK: - Properties
     
     let venues: [Venue] = {
         
-        let allVenues = Store.shared.cache?.locations.reduce([Venue](), combine: {
+        let allVenues = Store.shared.cache?.locations.reduce([Venue](), {
             
             guard case let .venue(venue) = $1
                 else { return $0 }
@@ -34,17 +34,17 @@ final class VenuesInterfaceController: WKInterfaceController {
             
         }) ?? []
         
-        let internalVenues = allVenues.filter({ $0.isInternal }).sort { $0.0.name > $0.1.name }
+        let internalVenues = allVenues.filter({ $0.isInternal }).sorted { $0.0.name > $0.1.name }
         
-        let externalVenues = allVenues.filter({ $0.isInternal == false }).sort { $0.0.name > $0.1.name }
+        let externalVenues = allVenues.filter({ $0.isInternal == false }).sorted { $0.0.name > $0.1.name }
         
         return internalVenues + externalVenues
     }()
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         updateUI()
     }
@@ -56,7 +56,7 @@ final class VenuesInterfaceController: WKInterfaceController {
         /// set user activity
         if let summit = Store.shared.cache {
             
-            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue], webpageURL: NSURL(string: summit.webpageURL + "/travel"))
+            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue], webpageURL: summit.webpage.appendingPathComponent("travel"))
         }
     }
     
@@ -69,7 +69,7 @@ final class VenuesInterfaceController: WKInterfaceController {
     
     // MARK: - Segue
     
-    override func contextForSegueWithIdentifier(segueIdentifier: String, inTable table: WKInterfaceTable, rowIndex: Int) -> AnyObject? {
+    override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
         
         let venue = venues[rowIndex]
         
@@ -82,21 +82,20 @@ final class VenuesInterfaceController: WKInterfaceController {
         
         tableView.setNumberOfRows(venues.count, withRowType: VenueCellController.identifier)
         
-        for (index, venue) in venues.enumerate() {
+        for (index, venue) in venues.enumerated() {
             
-            let cell = tableView.rowControllerAtIndex(index) as! VenueCellController
+            let cell = tableView.rowController(at: index) as! VenueCellController
             
             // set content
             
             cell.nameLabel.setText(venue.name)
             cell.addressLabel.setText(venue.fullAddress)
             
-            if let image = venue.images.first,
-                let imageURL = NSURL(string: image.url) {
+            if let imageURL = venue.images.sorted().first?.url {
                 
                 // show activity indicator
                 cell.activityIndicator.setImageNamed("Activity")
-                cell.activityIndicator.startAnimatingWithImagesInRange(NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
+                cell.activityIndicator.startAnimatingWithImages(in: NSRange(location: 0, length: 30), duration: 1.0, repeatCount: 0)
                 cell.activityIndicator.setHidden(false)
                 cell.imageView.setHidden(true)
                 
@@ -107,7 +106,7 @@ final class VenuesInterfaceController: WKInterfaceController {
                     cell.activityIndicator.setHidden(true)
                     
                     // hide image view if no image
-                    guard case .Data = response else {
+                    guard case .data = response else {
                         
                         cell.imageView.setHidden(true)
                         return
@@ -135,15 +134,15 @@ final class VenueCellController: NSObject {
     
     static let identifier = "VenueCell"
     
-    @IBOutlet weak var headerGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var headerGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var contentGroup: WKInterfaceGroup!
+    @IBOutlet private(set) weak var contentGroup: WKInterfaceGroup!
     
-    @IBOutlet weak var nameLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var nameLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var addressLabel: WKInterfaceLabel!
+    @IBOutlet private(set) weak var addressLabel: WKInterfaceLabel!
     
-    @IBOutlet weak var imageView: WKInterfaceImage!
+    @IBOutlet private(set) weak var imageView: WKInterfaceImage!
     
-    @IBOutlet weak var activityIndicator: WKInterfaceImage!
+    @IBOutlet private(set) weak var activityIndicator: WKInterfaceImage!
 }
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/VenuesMapInterfaceController.swift b/OpenStack Summit/OpenStackSummitWatch Extension/VenuesMapInterfaceController.swift
index b658c83e..cf280c1b 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/VenuesMapInterfaceController.swift	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/VenuesMapInterfaceController.swift	
@@ -16,14 +16,14 @@ final class VenuesMapInterfaceController: WKInterfaceController {
     
     // MARK: - IB Outlets
     
-    @IBOutlet weak var mapView: WKInterfaceMap!
+    @IBOutlet private(set) weak var mapView: WKInterfaceMap!
     
     // MARK: - Properties
     
     // MARK: - Loading
     
-    override func awakeWithContext(context: AnyObject?) {
-        super.awakeWithContext(context)
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
         
         updateUI()
     }
@@ -35,7 +35,7 @@ final class VenuesMapInterfaceController: WKInterfaceController {
         /// set user activity
         if let summit = Store.shared.cache {
             
-            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue], webpageURL: NSURL(string: summit.webpageURL + "/travel"))
+            updateUserActivity(AppActivity.screen.rawValue, userInfo: [AppActivityUserInfo.screen.rawValue: AppActivityScreen.venues.rawValue], webpageURL: summit.webpage.appendingPathComponent("travel"))
         }
     }
     
@@ -73,6 +73,6 @@ final class VenuesMapInterfaceController: WKInterfaceController {
         }
         
         // add locations to Map
-        locations.forEach { mapView.addAnnotation($0, withPinColor: .Red) }
+        locations.forEach { mapView.addAnnotation($0, with: .red) }
     }
 }
diff --git a/OpenStack Summit/OpenStackSummitWatch/Info.plist b/OpenStack Summit/OpenStackSummitWatch/Info.plist
index 4f4bafb1..59bfd480 100644
--- a/OpenStack Summit/OpenStackSummitWatch/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitWatch/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.3</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/OpenStack Summit/rswift b/OpenStack Summit/rswift
index c8aeefa5..0b8571f8 100755
Binary files a/OpenStack Summit/rswift and b/OpenStack Summit/rswift differ