diff --git a/OpenStack Summit/CoreSummit/CoreDataExtensions.swift b/OpenStack Summit/CoreSummit/CoreDataExtensions.swift
index be1b5dfd..e8085650 100644
--- a/OpenStack Summit/CoreSummit/CoreDataExtensions.swift	
+++ b/OpenStack Summit/CoreSummit/CoreDataExtensions.swift	
@@ -119,6 +119,12 @@ public extension NSManagedObjectContext {
         return (try self.executeFetchRequest(fetchRequest) as! [NSNumber]).first!.integerValue
     }
     
+    @inline(__always)
+    func count<ManagedObject: NSManagedObject>(managedObjectType: ManagedObject.Type, predicate: CoreSummit.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 {
         
diff --git a/OpenStack Summit/CoreSummit/DataUpdate.swift b/OpenStack Summit/CoreSummit/DataUpdate.swift
index 979be2ff..6da0646d 100644
--- a/OpenStack Summit/CoreSummit/DataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/DataUpdate.swift	
@@ -91,7 +91,10 @@ public extension DataUpdate {
             case .PresentationCategoryGroup, .PrivatePresentationCategoryGroup: return CoreSummit.TrackGroupDataUpdate.self
             case .SummitLocationMap, .SummitLocationImage: return CoreSummit.Image.self
             case .SummitWIFIConnection: return CoreSummit.WirelessNetwork.self
-            
+            case .PresentationVideo: return CoreSummit.Video.self
+            case .PresentationSlide: return CoreSummit.Slide.self
+            case .PresentationLink: return CoreSummit.Link.self
+                
             default: return nil
             }
         }
@@ -315,3 +318,6 @@ extension TrackGroupDataUpdate: Updatable { }
 extension Image: Updatable { }
 extension GroupEventDataUpdate: Updatable { }
 extension WirelessNetwork: Updatable { }
+extension Video: Updatable { }
+extension Slide: Updatable { }
+extension Link: Updatable { }
diff --git a/OpenStack Summit/CoreSummit/Event.swift b/OpenStack Summit/CoreSummit/Event.swift
index 4aa4bfb9..3ae0a166 100644
--- a/OpenStack Summit/CoreSummit/Event.swift	
+++ b/OpenStack Summit/CoreSummit/Event.swift	
@@ -50,6 +50,10 @@ public struct Event: Named {
     
     public var videos: Set<Video>
     
+    public var slides: Set<Slide>
+    
+    public var links: Set<Link>
+    
     public var groups: Set<Group>
 }
 
@@ -78,4 +82,6 @@ public func == (lhs: Event, rhs: Event) -> Bool {
         && lhs.groups == rhs.groups
         && lhs.externalRSVP == rhs.externalRSVP
         && lhs.willRecord == rhs.willRecord
+        && lhs.slides == rhs.slides
+        && lhs.links == rhs.links
 }
diff --git a/OpenStack Summit/CoreSummit/EventDataUpdate.swift b/OpenStack Summit/CoreSummit/EventDataUpdate.swift
index c9548b6a..a120cd72 100644
--- a/OpenStack Summit/CoreSummit/EventDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/EventDataUpdate.swift	
@@ -41,6 +41,10 @@ public struct EventDataUpdate: Named {
     
     public let videos: Set<Video>
     
+    public let slides: Set<Slide>
+    
+    public let links: Set<Link>
+    
     public let rsvp: String?
     
     public let attachment: String?
@@ -66,4 +70,7 @@ public func == (lhs: EventDataUpdate, rhs: EventDataUpdate) -> Bool {
         && lhs.presentation == rhs.presentation
         && lhs.videos == rhs.videos
         && lhs.rsvp == rhs.rsvp
+        && lhs.attachment == rhs.attachment
+        && lhs.slides == rhs.slides
+        && lhs.links == rhs.links
 }
diff --git a/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift
index bb3d4257..1af3cc5a 100644
--- a/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/EventDataUpdateJSON.swift	
@@ -62,6 +62,7 @@ extension EventDataUpdate: 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
         
         if let track = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int
             where track > 0 {
@@ -95,18 +96,28 @@ extension EventDataUpdate: JSONDecodable {
             self.videos = []
         }
         
-        if let attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String {
+        if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            self.attachment = attachment
+            guard let slides = Slide.fromJSON(slidesJSONArray)
+                else { return nil }
+            
+            self.slides = Set(slides)
+            
+        } else {
             
-        } else if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue,
-            let slides = String.fromJSON(slidesJSONArray) {
+            self.slides = []
+        }
+        
+        if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
+            
+            guard let links = Link.fromJSON(linksJSONArray)
+                else { return nil }
             
-            self.attachment = slides.first
+            self.links = Set(links)
             
         } else {
             
-            self.attachment = nil
+            self.links = []
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/EventJSON.swift b/OpenStack Summit/CoreSummit/EventJSON.swift
index 39e730c0..bf538c2a 100644
--- a/OpenStack Summit/CoreSummit/EventJSON.swift	
+++ b/OpenStack Summit/CoreSummit/EventJSON.swift	
@@ -12,7 +12,7 @@ internal extension Event {
     
     enum JSONKey: String {
         
-        case id, summit_id, title, description, social_description, start_date, end_date, allow_feedback, avg_feedback_rate, type_id, type, sponsors, speakers, location_id, location, tags, track_id, track, videos, rsvp_link, groups, rsvp_external, to_record, attachment, slides
+        case id, summit_id, title, description, social_description, start_date, end_date, allow_feedback, avg_feedback_rate, type_id, type, sponsors, speakers, location_id, location, tags, track_id, track, videos, rsvp_link, groups, rsvp_external, to_record, attachment, slides, links
     }
 }
 
@@ -66,6 +66,7 @@ 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
         
         if let track = JSONObject[JSONKey.track_id.rawValue]?.rawValue as? Int where track > 0 {
             
@@ -98,18 +99,28 @@ extension Event: JSONParametrizedDecodable {
             self.videos = []
         }
         
-        if let attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String {
+        if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            self.attachment = attachment
+            guard let slides = Slide.fromJSON(slidesJSONArray)
+                else { return nil }
+            
+            self.slides = Set(slides)
+            
+        } else {
             
-        } else if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue,
-            let slides = String.fromJSON(slidesJSONArray) {
+            self.slides = []
+        }
+        
+        if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
+            
+            guard let links = Link.fromJSON(linksJSONArray)
+                else { return nil }
             
-            self.attachment = slides.first
+            self.links = Set(links)
             
         } else {
             
-            self.attachment = nil
+            self.links = []
         }
         
         // should never come in this JSON response
@@ -173,6 +184,7 @@ 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
         
         if let trackJSON = JSONObject[JSONKey.track.rawValue] {
             
@@ -210,18 +222,28 @@ extension MemberResponse.Event: JSONDecodable {
             self.videos = []
         }
         
-        if let attachment = JSONObject[JSONKey.attachment.rawValue]?.rawValue as? String {
+        if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue {
             
-            self.attachment = attachment
+            guard let slides = Slide.fromJSON(slidesJSONArray)
+                else { return nil }
+            
+            self.slides = slides
+            
+        } else {
             
-        } else if let slidesJSONArray = JSONObject[JSONKey.slides.rawValue]?.arrayValue,
-            let slides = String.fromJSON(slidesJSONArray) {
+            self.slides = []
+        }
+        
+        if let linksJSONArray = JSONObject[JSONKey.links.rawValue]?.arrayValue {
+            
+            guard let links = Link.fromJSON(linksJSONArray)
+                else { return nil }
             
-            self.attachment = slides.first
+            self.links = links
             
         } else {
             
-            self.attachment = nil
+            self.links = []
         }
     }
 }
diff --git a/OpenStack Summit/CoreSummit/EventManagedObject.swift b/OpenStack Summit/CoreSummit/EventManagedObject.swift
index 22653a25..da788ef2 100644
--- a/OpenStack Summit/CoreSummit/EventManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/EventManagedObject.swift	
@@ -48,6 +48,10 @@ public final class EventManagedObject: Entity {
     
     @NSManaged public var videos: Set<VideoManagedObject>
     
+    @NSManaged public var slides: Set<SlideManagedObject>
+    
+    @NSManaged public var links: Set<LinkManagedObject>
+    
     @NSManaged public var groups: Set<GroupManagedObject>
     
     @NSManaged public var summit: SummitManagedObject
@@ -79,6 +83,8 @@ extension Event: CoreDataDecodable {
         self.location = managedObject.location?.identifier
         self.presentation = Presentation(managedObject: managedObject.presentation)
         self.videos = Video.from(managedObjects: managedObject.videos)
+        self.slides = Slide.from(managedObjects: managedObject.slides)
+        self.links = Link.from(managedObjects: managedObject.links)
         self.groups = Group.from(managedObjects: managedObject.groups)
     }
 }
@@ -109,6 +115,8 @@ extension Event: CoreDataEncodable {
         managedObject.location = try context.relationshipFault(location)
         managedObject.presentation = try context.relationshipFault(presentation)
         managedObject.videos = try context.relationshipFault(videos)
+        managedObject.slides = try context.relationshipFault(slides)
+        managedObject.links = try context.relationshipFault(links)
         managedObject.groups = try context.relationshipFault(groups)
         
         managedObject.didCache()
@@ -143,6 +151,8 @@ extension MemberResponse.Event: CoreDataEncodable {
         managedObject.location = try context.relationshipFault(location)
         managedObject.presentation = try context.relationshipFault(presentation)
         managedObject.videos = try context.relationshipFault(Set(videos))
+        managedObject.slides = try context.relationshipFault(Set(slides))
+        managedObject.links = try context.relationshipFault(Set(links))
         managedObject.groups = try context.relationshipFault(Set(groups))
         
         managedObject.didCache()
diff --git a/OpenStack Summit/CoreSummit/Link.swift b/OpenStack Summit/CoreSummit/Link.swift
new file mode 100644
index 00000000..f46c747f
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/Link.swift	
@@ -0,0 +1,40 @@
+//
+//  Link.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+public struct Link: PresentationMaterial {
+    
+    public let identifier: Identifier
+    
+    public var name: String
+    
+    public var descriptionText: String?
+    
+    public var displayOnSite: Bool
+    
+    public var featured: Bool
+    
+    public var order: Int
+    
+    public var link: String
+    
+    public var event: Identifier
+}
+
+// MARK: - Equatable
+
+public func == (lhs: Link, rhs: Link) -> Bool {
+    
+    return lhs.identifier == rhs.identifier
+        && lhs.name == rhs.name
+        && lhs.descriptionText == rhs.descriptionText
+        && lhs.displayOnSite == rhs.displayOnSite
+        && lhs.featured == rhs.featured
+        && lhs.order == rhs.order
+        && lhs.link == rhs.link
+        && lhs.event == rhs.event
+}
diff --git a/OpenStack Summit/CoreSummit/LinkJSON.swift b/OpenStack Summit/CoreSummit/LinkJSON.swift
new file mode 100644
index 00000000..29f0fe30
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/LinkJSON.swift	
@@ -0,0 +1,52 @@
+//
+//  LinkJSON.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import SwiftFoundation
+
+public extension Link {
+    
+    enum JSONKey: String {
+        
+        case id, name, description, display_on_site, featured, order, presentation_id, link
+    }
+}
+
+extension Link: JSONDecodable {
+    
+    public init?(JSONValue: JSON.Value) {
+        
+        guard let JSONObject = JSONValue.objectValue,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            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
+            else { return nil }
+        
+        self.identifier = identifier
+        self.featured = featured
+        self.displayOnSite = displayOnSite
+        self.event = presentation
+        self.order = order
+        self.link = link
+        
+        // optional
+        self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
+        
+        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
+            where descriptionText.isEmpty == false {
+            
+            self.descriptionText = descriptionText
+            
+        } else {
+            
+            self.descriptionText = nil
+        }
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/LinkManagedObject.swift b/OpenStack Summit/CoreSummit/LinkManagedObject.swift
new file mode 100644
index 00000000..bb3b7898
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/LinkManagedObject.swift	
@@ -0,0 +1,62 @@
+//
+//  LinkManagedObject.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+public final class LinkManagedObject: Entity {
+    
+    @NSManaged public var name: String
+    
+    @NSManaged public var descriptionText: String?
+    
+    @NSManaged public var displayOnSite: Bool
+    
+    @NSManaged public var featured: Bool
+    
+    @NSManaged public var order: Int64
+    
+    @NSManaged public var link: String
+    
+    @NSManaged public var event: EventManagedObject
+}
+
+extension Link: CoreDataDecodable {
+    
+    public init(managedObject: LinkManagedObject) {
+        
+        self.identifier = managedObject.identifier
+        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)
+    }
+}
+
+extension Link: CoreDataEncodable {
+    
+    public func save(context: NSManagedObjectContext) throws -> LinkManagedObject {
+        
+        let managedObject = try cached(context)
+        
+        managedObject.name = name
+        managedObject.descriptionText = descriptionText
+        managedObject.displayOnSite = displayOnSite
+        managedObject.featured = featured
+        managedObject.link = link
+        managedObject.order = Int64(order)
+        managedObject.event = try context.relationshipFault(event)
+        
+        managedObject.didCache()
+        
+        return managedObject
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/Login.swift b/OpenStack Summit/CoreSummit/Login.swift
index 78c13f48..fb56222b 100644
--- a/OpenStack Summit/CoreSummit/Login.swift	
+++ b/OpenStack Summit/CoreSummit/Login.swift	
@@ -17,15 +17,21 @@ public extension Store {
         
         let context = privateQueueManagedObjectContext
         
-        // remove member from cache
+        // remove member-specific data from cache
         try! context.performErrorBlockAndWait {
             
+            // delete member
             if let member = try self.authenticatedMember(context) {
                 
                 context.deleteObject(member)
-                
-                try context.validateAndSave()
             }
+            
+            // delete all notifications except 'EVERYBODY' type
+            let notifications = try context.managedObjects(NotificationManagedObject.self, predicate: "channel" != CoreSummit.Notification.Channel.everyone.rawValue)
+            
+            notifications.forEach { context.deleteObject($0) }
+            
+            try context.validateAndSave()
         }
         
         session.clear()
@@ -53,7 +59,6 @@ public extension Store {
                     
                 case let .Value(member):
                     
-                    self.session.name = member.name
                     self.session.member = member.identifier
                     
                     completion(nil)
diff --git a/OpenStack Summit/CoreSummit/MemberRequest.swift b/OpenStack Summit/CoreSummit/MemberRequest.swift
index 4520ec80..0ca93ca9 100644
--- a/OpenStack Summit/CoreSummit/MemberRequest.swift	
+++ b/OpenStack Summit/CoreSummit/MemberRequest.swift	
@@ -127,6 +127,10 @@ public struct MemberResponse {
         
         public let videos: [Video]
         
+        public let slides: [Slide]
+        
+        public let links: [Link]
+        
         public let groups: [Group]
     }
     
@@ -187,6 +191,8 @@ public func == (lhs: MemberResponse.Event, rhs: MemberResponse.Event) -> Bool {
         && lhs.groups == rhs.groups
         && lhs.externalRSVP == rhs.externalRSVP
         && lhs.willRecord == rhs.willRecord
+        && lhs.slides == rhs.slides
+        && lhs.links == rhs.links
 }
 
 public func == (lhs: MemberResponse.Member, rhs: MemberResponse.Member) -> Bool {
diff --git a/OpenStack Summit/CoreSummit/Model.xcdatamodeld/Model.xcdatamodel/contents b/OpenStack Summit/CoreSummit/Model.xcdatamodeld/Model.xcdatamodel/contents
index 26fef091..ca73e228 100644
--- a/OpenStack Summit/CoreSummit/Model.xcdatamodeld/Model.xcdatamodel/contents	
+++ b/OpenStack Summit/CoreSummit/Model.xcdatamodeld/Model.xcdatamodel/contents	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11542" systemVersion="16D32" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11542" systemVersion="16E195" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="Affiliation" representedClassName=".AffiliationManagedObject" syncable="YES">
         <attribute name="cached" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="end" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -50,9 +50,11 @@
         <relationship name="feedback" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Feedback" inverseName="event" inverseEntity="Feedback" syncable="YES"/>
         <relationship name="groupMembers" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Member" inverseName="groupEvents" inverseEntity="Member" syncable="YES"/>
         <relationship name="groups" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Group" inverseName="events" inverseEntity="Group" syncable="YES"/>
+        <relationship name="links" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Link" inverseName="event" inverseEntity="Link" syncable="YES"/>
         <relationship name="location" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Location" inverseName="events" inverseEntity="Location" syncable="YES"/>
         <relationship name="notifications" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Notification" inverseName="event" inverseEntity="Notification" syncable="YES"/>
         <relationship name="presentation" maxCount="1" deletionRule="Cascade" destinationEntity="Presentation" inverseName="event" inverseEntity="Presentation" syncable="YES"/>
+        <relationship name="slides" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Slide" inverseName="event" inverseEntity="Slide" syncable="YES"/>
         <relationship name="sponsors" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Company" inverseName="events" inverseEntity="Company" syncable="YES"/>
         <relationship name="summit" maxCount="1" deletionRule="Nullify" destinationEntity="Summit" inverseName="schedule" inverseEntity="Summit" syncable="YES"/>
         <relationship name="tags" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Tag" inverseName="events" inverseEntity="Tag" syncable="YES"/>
@@ -93,6 +95,17 @@
         <relationship name="venueImage" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Venue" inverseName="images" inverseEntity="Venue" syncable="YES"/>
         <relationship name="venueMap" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Venue" inverseName="maps" inverseEntity="Venue" syncable="YES"/>
     </entity>
+    <entity name="Link" representedClassName=".LinkManagedObject" syncable="YES">
+        <attribute name="cached" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="descriptionText" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="displayOnSite" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="featured" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="link" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="order" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="event" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Event" inverseName="links" inverseEntity="Event" syncable="YES"/>
+    </entity>
     <entity name="Location" representedClassName=".LocationManagedObject" isAbstract="YES" syncable="YES">
         <attribute name="cached" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="descriptionText" optional="YES" attributeType="String" syncable="YES"/>
@@ -143,6 +156,17 @@
         <relationship name="moderator" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Speaker" inverseName="presentationSpeaker" inverseEntity="Speaker" syncable="YES"/>
         <relationship name="speakers" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Speaker" inverseName="presentationModerator" inverseEntity="Speaker" syncable="YES"/>
     </entity>
+    <entity name="Slide" representedClassName=".SlideManagedObject" syncable="YES">
+        <attribute name="cached" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="descriptionText" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="displayOnSite" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="featured" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="link" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="order" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="event" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Event" inverseName="slides" inverseEntity="Event" syncable="YES"/>
+    </entity>
     <entity name="Speaker" representedClassName=".SpeakerManagedObject" syncable="YES">
         <attribute name="addressBookSectionName" attributeType="String" syncable="YES"/>
         <attribute name="biography" optional="YES" attributeType="String" syncable="YES"/>
@@ -291,11 +315,15 @@
     </entity>
     <entity name="Video" representedClassName=".VideoManagedObject" syncable="YES">
         <attribute name="cached" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="dataUploaded" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="descriptionText" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="displayOnSite" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="featured" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="highlighted" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="order" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="views" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="youtube" attributeType="String" syncable="YES"/>
         <relationship name="event" maxCount="1" deletionRule="Nullify" destinationEntity="Event" inverseName="videos" inverseEntity="Event" syncable="YES"/>
     </entity>
@@ -308,9 +336,11 @@
         <relationship name="summit" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Summit" inverseName="wirelessNetworks" inverseEntity="Summit" syncable="YES"/>
     </entity>
     <elements>
+        <element name="Affiliation" positionX="-9" positionY="135" width="128" height="165"/>
+        <element name="AffiliationOrganization" positionX="0" positionY="144" width="128" height="105"/>
         <element name="Attendee" positionX="-9" positionY="135" width="128" height="120"/>
         <element name="Company" positionX="-36" positionY="18" width="128" height="120"/>
-        <element name="Event" positionX="-54" positionY="0" width="128" height="450"/>
+        <element name="Event" positionX="-54" positionY="0" width="128" height="480"/>
         <element name="EventType" positionX="-18" positionY="81" width="128" height="30"/>
         <element name="Feedback" positionX="-9" positionY="135" width="128" height="150"/>
         <element name="Group" positionX="-9" positionY="135" width="128" height="150"/>
@@ -333,9 +363,9 @@
         <element name="Venue" positionX="27" positionY="153" width="128" height="240"/>
         <element name="VenueFloor" positionX="27" positionY="180" width="128" height="165"/>
         <element name="VenueRoom" positionX="-27" positionY="99" width="128" height="90"/>
-        <element name="Video" positionX="0" positionY="126" width="128" height="165"/>
+        <element name="Video" positionX="0" positionY="126" width="128" height="225"/>
         <element name="WirelessNetwork" positionX="-9" positionY="135" width="128" height="135"/>
-        <element name="Affiliation" positionX="-9" positionY="135" width="128" height="165"/>
-        <element name="AffiliationOrganization" positionX="0" positionY="144" width="128" height="105"/>
+        <element name="Slide" positionX="-9" positionY="135" width="128" height="180"/>
+        <element name="Link" positionX="0" positionY="144" width="128" height="180"/>
     </elements>
-</model>
+</model>
\ No newline at end of file
diff --git a/OpenStack Summit/CoreSummit/Notification.swift b/OpenStack Summit/CoreSummit/Notification.swift
index de7ea6d3..054e2b7e 100644
--- a/OpenStack Summit/CoreSummit/Notification.swift	
+++ b/OpenStack Summit/CoreSummit/Notification.swift	
@@ -108,15 +108,19 @@ public extension Notification {
             }
         }
         
-        public init?(rawValue: String) {
+        private static func parse(string: String, with prefix: String) -> Notification.Topic? {
+            
+            let rawValue = string
+            
+            let topicPrefixString = prefix
             
             struct Cache {
-                static var prefixRegularExpressions = [Prefix: NSRegularExpression]()
+                static var prefixRegularExpressions = [String: [Prefix: NSRegularExpression]]()
             }
             
             func parseIdentifier(prefix: Prefix) -> Identifier? {
                 
-                let prefixString = "/topics/" + prefix.rawValue + "_"
+                let prefixString = topicPrefixString + prefix.rawValue + "_"
                 
                 guard rawValue.containsString(prefixString) else { return nil }
                 
@@ -124,7 +128,21 @@ public extension Notification {
                 
                 let regularExpression: NSRegularExpression
                 
-                if let cached = Cache.prefixRegularExpressions[prefix] {
+                let regularExpressionsForPrefix: [Prefix: NSRegularExpression]
+                
+                if let cached = Cache.prefixRegularExpressions[topicPrefixString] {
+                    
+                    regularExpressionsForPrefix = cached
+                    
+                } else {
+                    
+                    regularExpressionsForPrefix = [Prefix: NSRegularExpression]()
+                    
+                    // create new cache for prefix
+                    Cache.prefixRegularExpressions[topicPrefixString] = regularExpressionsForPrefix
+                }
+                
+                if let cached = regularExpressionsForPrefix[prefix] {
                     
                     regularExpression = cached
                     
@@ -132,7 +150,8 @@ public extension Notification {
                     
                     regularExpression = try! NSRegularExpression(pattern: prefixString + "(\\d+)", options: [])
                     
-                    Cache.prefixRegularExpressions[prefix] = regularExpression
+                    // add to cache
+                    Cache.prefixRegularExpressions[topicPrefixString]![prefix] = regularExpression
                 }
                 
                 // run regex
@@ -156,7 +175,7 @@ public extension Notification {
             
             func parseCollection() -> Topic? {
                 
-                let prefixString = rawValue.stringByReplacingOccurrencesOfString("/topics/", withString: "")
+                let prefixString = rawValue.stringByReplacingOccurrencesOfString(topicPrefixString, withString: "")
                 
                 guard let prefix = Prefix(rawValue: prefixString)
                     else { return nil }
@@ -173,23 +192,35 @@ public extension Notification {
             
             if let collectionTopic = parseCollection() {
                 
-                self = collectionTopic
+                return collectionTopic
                 
             } else if let identifier = parseIdentifier(.summit) {
                 
-                self = .summit(identifier)
+                return .summit(identifier)
                 
             } else if let identifier = parseIdentifier(.member) {
                 
-                self = .member(identifier)
+                return .member(identifier)
                 
             } else if let identifier = parseIdentifier(.event) {
                 
-                self = .event(identifier)
+                return .event(identifier)
                 
             } else if let identifier = parseIdentifier(.team) {
                 
-                self = .team(identifier)
+                return .team(identifier)
+                
+            } else {
+                
+                return nil
+            }
+        }
+        
+        public init?(rawValue: String) {
+            
+            if let topic = Topic.parse(rawValue, with: "/topics/ios_") ?? Topic.parse(rawValue, with: "/topics/") {
+                
+                self = topic
                 
             } else {
                 
@@ -199,7 +230,7 @@ public extension Notification {
         
         public var rawValue: String {
             
-            var stringValue = "/topics/" + Prefix(self).rawValue
+            var stringValue = "/topics/ios_" + Prefix(self).rawValue
             
             if let identifier = self.identifier {
                 
diff --git a/OpenStack Summit/CoreSummit/PresentationMaterial.swift b/OpenStack Summit/CoreSummit/PresentationMaterial.swift
new file mode 100644
index 00000000..a2ec381c
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/PresentationMaterial.swift	
@@ -0,0 +1,30 @@
+//
+//  PresentationMaterial.swift
+//  OpenStack Summit
+//
+//  Created by Gabriel Horacio Cutrini on 4/28/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+public protocol PresentationMaterial: Named {
+        
+    var descriptionText: String? { get }
+    
+    var displayOnSite: Bool { get }
+    
+    var featured: Bool { get }
+    
+    var order: Int { get }
+    
+    var event: Identifier { get }
+}
+
+// MARK: - Extensions
+
+public extension CollectionType where Generator.Element: PresentationMaterial {
+    
+    func ordered() -> [Generator.Element] {
+        
+        return self.sort { $0.0.order < $0.1.order }
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/Session.swift b/OpenStack Summit/CoreSummit/Session.swift
index 7b2c68ed..baa9d8cd 100644
--- a/OpenStack Summit/CoreSummit/Session.swift	
+++ b/OpenStack Summit/CoreSummit/Session.swift	
@@ -9,9 +9,6 @@
 /// Provides the storage for session values
 public protocol SessionStorage {
     
-    /// The name of the authenticated user.
-    var name: String? { get set }
-    
     /// The authenticated member.
     var member: Identifier?  { get set }
     
@@ -24,7 +21,6 @@ public extension SessionStorage {
     /// Resets the session storage.
     mutating func clear() {
         
-        self.name = nil
         self.member = nil
     }
 }
@@ -55,21 +51,6 @@ public final class UserDefaultsSessionStorage: SessionStorage {
         }
     }
     
-    public var name: String? {
-        
-        get { return userDefaults.stringForKey(Key.name.rawValue) }
-        
-        set {
-            
-            guard let stringValue = newValue
-                else { userDefaults.removeObjectForKey(Key.name.rawValue); return }
-            
-            userDefaults.setObject(stringValue as NSString, forKey: Key.name.rawValue)
-            
-            userDefaults.synchronize()
-        }
-    }
-    
     public var hadPasscode: Bool {
         
         get { return userDefaults.boolForKey(Key.hadPasscode.rawValue) }
@@ -80,7 +61,6 @@ public final class UserDefaultsSessionStorage: SessionStorage {
     private enum Key: String {
         
         case member = "CoreSummit.UserDefaultsSessionStorage.Key.Member"
-        case name = "CoreSummit.UserDefaultsSessionStorage.Key.Name"
         case hadPasscode = "CoreSummit.UserDefaultsSessionStorage.Key.HadPasscode"
     }
 }
diff --git a/OpenStack Summit/CoreSummit/Slide.swift b/OpenStack Summit/CoreSummit/Slide.swift
new file mode 100644
index 00000000..ade7485f
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/Slide.swift	
@@ -0,0 +1,40 @@
+//
+//  Slide.swift
+//  OpenStack Summit
+//
+//  Created by Gabriel Horacio Cutrini on 4/28/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+public struct Slide: PresentationMaterial {
+    
+    public let identifier: Identifier
+    
+    public var name: String
+    
+    public var descriptionText: String?
+    
+    public var displayOnSite: Bool
+    
+    public var featured: Bool
+    
+    public var order: Int
+    
+    public var link: String
+    
+    public var event: Identifier
+}
+
+// MARK: - Equatable
+
+public func == (lhs: Slide, rhs: Slide) -> Bool {
+    
+    return lhs.identifier == rhs.identifier
+        && lhs.name == rhs.name
+        && lhs.descriptionText == rhs.descriptionText
+        && lhs.displayOnSite == rhs.displayOnSite
+        && lhs.featured == rhs.featured
+        && lhs.order == rhs.order
+        && lhs.link == rhs.link
+        && lhs.event == rhs.event
+}
diff --git a/OpenStack Summit/CoreSummit/SlideJSON.swift b/OpenStack Summit/CoreSummit/SlideJSON.swift
new file mode 100644
index 00000000..456bc9d1
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/SlideJSON.swift	
@@ -0,0 +1,52 @@
+//
+//  SlideJSON.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import SwiftFoundation
+
+public extension Slide {
+    
+    enum JSONKey: String {
+        
+        case id, name, description, display_on_site, featured, order, presentation_id, link
+    }
+}
+
+extension Slide: JSONDecodable {
+    
+    public init?(JSONValue: JSON.Value) {
+        
+        guard let JSONObject = JSONValue.objectValue,
+            let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
+            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
+            else { return nil }
+        
+        self.identifier = identifier
+        self.featured = featured
+        self.displayOnSite = displayOnSite
+        self.event = presentation
+        self.order = order
+        self.link = link
+        
+        // optional
+        self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
+        
+        if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
+            where descriptionText.isEmpty == false {
+            
+            self.descriptionText = descriptionText
+            
+        } else {
+            
+            self.descriptionText = nil
+        }
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/SlideManagedObject.swift b/OpenStack Summit/CoreSummit/SlideManagedObject.swift
new file mode 100644
index 00000000..4a0a4ccd
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/SlideManagedObject.swift	
@@ -0,0 +1,62 @@
+//
+//  SlideManagedObject.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+public final class SlideManagedObject: Entity {
+    
+    @NSManaged public var name: String
+    
+    @NSManaged public var descriptionText: String?
+    
+    @NSManaged public var displayOnSite: Bool
+    
+    @NSManaged public var featured: Bool
+    
+    @NSManaged public var order: Int64
+    
+    @NSManaged public var link: String
+    
+    @NSManaged public var event: EventManagedObject
+}
+
+extension Slide: CoreDataDecodable {
+    
+    public init(managedObject: SlideManagedObject) {
+        
+        self.identifier = managedObject.identifier
+        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)
+    }
+}
+
+extension Slide: CoreDataEncodable {
+    
+    public func save(context: NSManagedObjectContext) throws -> SlideManagedObject {
+        
+        let managedObject = try cached(context)
+        
+        managedObject.name = name
+        managedObject.descriptionText = descriptionText
+        managedObject.displayOnSite = displayOnSite
+        managedObject.featured = featured
+        managedObject.link = link
+        managedObject.order = Int64(order)
+        managedObject.event = try context.relationshipFault(event)
+        
+        managedObject.didCache()
+        
+        return managedObject
+    }
+}
diff --git a/OpenStack Summit/CoreSummit/Video.swift b/OpenStack Summit/CoreSummit/Video.swift
index 9951738b..f033236d 100644
--- a/OpenStack Summit/CoreSummit/Video.swift	
+++ b/OpenStack Summit/CoreSummit/Video.swift	
@@ -6,7 +6,9 @@
 //  Copyright © 2016 OpenStack. All rights reserved.
 //
 
-public struct Video: Named, Equatable {
+import struct SwiftFoundation.Date
+
+public struct Video: PresentationMaterial {
     
     public let identifier: Identifier
     
@@ -17,8 +19,18 @@ public struct Video: Named, Equatable {
     public var displayOnSite: Bool
     
     public var featured: Bool
+    
+    public var highlighted: Bool
         
     public var youtube: String
+    
+    public var dataUploaded: Date
+    
+    public var order: Int
+    
+    public var views: Int
+    
+    public var event: Identifier
 }
 
 // MARK: - Equatable
@@ -31,4 +43,9 @@ public func == (lhs: Video, rhs: Video) -> Bool {
         && lhs.displayOnSite == rhs.displayOnSite
         && lhs.featured == rhs.featured
         && lhs.youtube == rhs.youtube
-}
\ No newline at end of file
+        && lhs.highlighted == rhs.highlighted
+        && lhs.dataUploaded == rhs.dataUploaded
+        && lhs.order == rhs.order
+        && lhs.views == rhs.views
+        && lhs.event == rhs.event
+}
diff --git a/OpenStack Summit/CoreSummit/VideoJSON.swift b/OpenStack Summit/CoreSummit/VideoJSON.swift
index 04da8a08..01377423 100644
--- a/OpenStack Summit/CoreSummit/VideoJSON.swift	
+++ b/OpenStack Summit/CoreSummit/VideoJSON.swift	
@@ -12,7 +12,7 @@ public extension Video {
     
     enum JSONKey: String {
         
-        case id, name, description, display_on_site, featured, presentation_id, youtube_id
+        case id, name, description, display_on_site, featured, presentation_id, youtube_id, data_uploaded, highlighted, views, order
     }
 }
 
@@ -22,19 +22,28 @@ extension Video: JSONDecodable {
         
         guard let JSONObject = JSONValue.objectValue,
             let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
-            let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String,
             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? Int, */
-            let youtube = JSONObject[JSONKey.youtube_id.rawValue]?.rawValue as? String
+            let presentation = JSONObject[JSONKey.presentation_id.rawValue]?.rawValue as? Identifier,
+            let youtube = JSONObject[JSONKey.youtube_id.rawValue]?.rawValue as? String,
+            let dataUploaded = JSONObject[JSONKey.data_uploaded.rawValue]?.rawValue as? Int,
+            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
             else { return nil }
         
         self.identifier = identifier
-        self.name = name
         self.featured = featured
         self.displayOnSite = displayOnSite
-        //self.presentation = presentation
+        self.event = presentation
         self.youtube = youtube
+        self.dataUploaded = Date(timeIntervalSince1970: TimeInterval(dataUploaded))
+        self.highlighted = highlighted
+        self.views = views
+        self.order = order
+        
+        // optional
+        self.name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String ?? ""
         
         if let descriptionText = JSONObject[JSONKey.description.rawValue]?.rawValue as? String
             where descriptionText.isEmpty == false {
diff --git a/OpenStack Summit/CoreSummit/VideoManagedObject.swift b/OpenStack Summit/CoreSummit/VideoManagedObject.swift
index 8201de15..a381b0eb 100644
--- a/OpenStack Summit/CoreSummit/VideoManagedObject.swift	
+++ b/OpenStack Summit/CoreSummit/VideoManagedObject.swift	
@@ -8,6 +8,7 @@
 
 import Foundation
 import CoreData
+import struct SwiftFoundation.Date
 
 public final class VideoManagedObject: Entity {
     
@@ -21,10 +22,15 @@ public final class VideoManagedObject: Entity {
     
     @NSManaged public var youtube: String
     
-    // Inverse Relationships
+    @NSManaged public var order: Int64
     
-    @NSManaged public var event: EventManagedObject
+    @NSManaged public var views: Int64
+    
+    @NSManaged public var highlighted: Bool
     
+    @NSManaged public var dataUploaded: NSDate
+    
+    @NSManaged public var event: EventManagedObject
 }
 
 extension Video: CoreDataDecodable {
@@ -37,6 +43,11 @@ extension Video: CoreDataDecodable {
         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.highlighted = managedObject.highlighted
+        self.dataUploaded = Date(foundation: managedObject.dataUploaded)
     }
 }
 
@@ -51,6 +62,11 @@ extension Video: CoreDataEncodable {
         managedObject.displayOnSite = displayOnSite
         managedObject.featured = featured
         managedObject.youtube = youtube
+        managedObject.order = Int64(order)
+        managedObject.views = Int64(views)
+        managedObject.highlighted = highlighted
+        managedObject.dataUploaded = dataUploaded.toFoundation()
+        managedObject.event = try context.relationshipFault(event)
         
         managedObject.didCache()
         
diff --git a/OpenStack Summit/CoreSummitTests/JSON/DataUpdates13.json b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates13.json
new file mode 100644
index 00000000..8aa60bbe
--- /dev/null
+++ b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates13.json	
@@ -0,0 +1,20 @@
+{
+	"id": 742698,
+	"entity_id": 36845,
+	"class_name": "PresentationVideo",
+	"created": 1493912955,
+	"type": "INSERT",
+	"entity": {
+		"id": 36845,
+		"name": null,
+		"description": "<p>OpenstackId Workshop</p>",
+		"display_on_site": false,
+		"featured": false,
+		"order": 1,
+		"presentation_id": 18632,
+		"youtube_id": "5EWnmg3OUsk",
+		"data_uploaded": 1493930955,
+		"highlighted": false,
+		"views": 0
+	}
+}
diff --git a/OpenStack Summit/CoreSummitTests/JSON/DataUpdates14.json b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates14.json
new file mode 100644
index 00000000..52e7569c
--- /dev/null
+++ b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates14.json	
@@ -0,0 +1,17 @@
+{
+	"id": 742714,
+	"entity_id": 36849,
+	"class_name": "PresentationSlide",
+	"created": 1493970043,
+	"type": "INSERT",
+	"entity": {
+		"id": 36849,
+		"name": "Slide 1",
+		"description": "<p>Have you ever been curious as to how much of a workload the OpenStack control plane can handle before needing to scale horizontally?  Based on the load how will the API performance adjust?  How much overhead will load on the OpenStack API’s add to my application deployment timeline?  What behavior should I look for to determine its time to add more control plane resources?</p>\n<p><span style=\"font-size: 12.0pt;\">These are just a few questions I have been asked and/or have come to my mind while operating OpenStack clouds.  While performing API benchmarking can be measured in so many different ways, it does feel like a good idea to have some high level frame of reference.  I will start off stating that there are about a million ways to measure performance.  Your approach may differ from what I have done and that is actually expected.  The tests conducted are meant to provide a starting reference for you to possibly build upon</span>.</p>",
+		"display_on_site": false,
+		"featured": false,
+		"order": 3,
+		"presentation_id": 17459,
+		"link": "colemancda.github.io"
+	}
+}
diff --git a/OpenStack Summit/CoreSummitTests/JSON/DataUpdates15.json b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates15.json
new file mode 100644
index 00000000..c30f2b09
--- /dev/null
+++ b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates15.json	
@@ -0,0 +1,17 @@
+{
+	"id": 742715,
+	"entity_id": 33694,
+	"class_name": "PresentationLink",
+	"created": 1493974522,
+	"type": "UPDATE",
+	"entity": {
+		"id": 33694,
+		"name": "Blog entry",
+		"description": null,
+		"display_on_site": true,
+		"featured": false,
+		"order": 1,
+		"presentation_id": 17459,
+		"link": "https://osic.org/blogs/pushing-boundaries-openstack-%E2%80%93-wait-what-are-they-again"
+	}
+}
diff --git a/OpenStack Summit/CoreSummitTests/JSON/DataUpdates16.json b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates16.json
new file mode 100644
index 00000000..a183a0ae
--- /dev/null
+++ b/OpenStack Summit/CoreSummitTests/JSON/DataUpdates16.json	
@@ -0,0 +1,148 @@
+{
+	"id": 742717,
+	"entity_id": 17459,
+	"class_name": "Presentation",
+	"created": 1493977032,
+	"type": "UPDATE",
+	"entity": {
+		"id": 17459,
+		"title": "Pushing the Boundaries of OpenStack – Wait, what are they again?",
+		"description": "<p>Have you ever been curious as to how much of a workload the OpenStack control plane can handle before needing to scale horizontally?  Based on the load how will the API performance adjust?  How much overhead will load on the OpenStack API’s add to my application deployment timeline?  What behavior should I look for to determine its time to add more control plane resources?</p>\n<p><span style=\"font-size: 12.0pt;\">These are just a few questions I have been asked and/or have come to my mind while operating OpenStack clouds.  While performing API benchmarking can be measured in so many different ways, it does feel like a good idea to have some high level frame of reference.  I will start off stating that there are about a million ways to measure performance.  Your approach may differ from what I have done and that is actually expected.  The tests conducted are meant to provide a starting reference for you to possibly build upon</span>.</p>\n<p> </p>\n<p>Test</p>",
+		"social_description": "Test the boundaries of OpenStack by conducting a series of test against the OpenStack API's.",
+		"start_date": 1494526800,
+		"end_date": 1494529200,
+		"location_id": 260,
+		"summit_id": 22,
+		"type_id": 101,
+		"class_name": "Presentation",
+		"allow_feedback": true,
+		"avg_feedback_rate": 0,
+		"is_published": true,
+		"head_count": 0,
+		"rsvp_link": null,
+		"rsvp_external": false,
+		"track_id": 113,
+		"level": "Intermediate",
+		"moderator_speaker_id": 0,
+		"problem_addressed": null,
+		"attendees_expected_learnt": "<ul><li>Learn how to create OpenStack API test scripts</li>\n<li>Determined what metrics matter the most</li>\n<li>Possible tools you can use to run your tests</li>\n<li>Finally share my results from the tests run earlier</li>\n</ul>",
+		"to_record": false,
+		"sponsors": [
+
+		],
+		"tags": [
+			{
+				"id": 3353,
+				"tag": "Architect"
+			},
+			{
+				"id": 12,
+				"tag": "Enterprise"
+			},
+			{
+				"id": 976,
+				"tag": "Ops"
+			},
+			{
+				"id": 1339,
+				"tag": "infra"
+			},
+			{
+				"id": 1069,
+				"tag": "operator"
+			}
+		],
+		"speakers": [
+			{
+				"id": 513,
+				"first_name": "Walter",
+				"last_name": "Bentley",
+				"title": "Senior Technical Marketing Engineer",
+				"bio": "<p><span style=\"font-family: 'Helvetica Neue'; font-size: 14px;\">Walter Bentley is a Rackspace Private Cloud Technical Marketing Engineer and author with a diverse background in production systems administration and solutions architecture. He has more than 15 years of experience in sectors such as online marketing, financial, insurance, aviation, the food industry, education and now in technology. In the past, he was typically the requestor, consumer and advisor to companies tin the use of technologies such as OpenStack. Today he&rsquo;s an OpenStack promoter and cloud educator. In his current role, Walter helps customers build, design and deploy private clouds built on OpenStack. That includes professional services engagements around operating OpenStack clouds and DevOps engagements creating playbooks/roles with Ansible. He presents and speaks regularly at OpenStack Summits, AnsibleFest and other technology conferences, plus webinars, blog posts and technical reviews. His first book, &lsquo;OpenStack Administration with Ansible&rsquo; was released in 2016.</span></p>",
+				"irc": null,
+				"twitter": "djstayflypro",
+				"presentations": {
+					"7": 7062,
+					"8": 7069,
+					"10": 10869,
+					"11": 14651,
+					"12": 14888,
+					"13": 15185,
+					"14": 15188,
+					"15": 15427,
+					"16": 17459,
+					"17": 17471,
+					"18": 17612
+				},
+				"moderated_presentations": [
+
+				],
+				"pic": "https://www.openstack.org/profile_images/speakers/513",
+				"gender": "Male",
+				"member_id": 20015,
+				"affiliations": [
+					{
+						"id": 64482,
+						"start_date": 1404172800,
+						"end_date": null,
+						"owner_id": 20015,
+						"is_current": true,
+						"organization": {
+							"id": 1,
+							"name": "Rackspace"
+						}
+					}
+				]
+			}
+		],
+		"slides": [
+			{
+				"id": 36849,
+				"name": "Slide 1",
+				"description": "<p>Have you ever been curious as to how much of a workload the OpenStack control plane can handle before needing to scale horizontally?  Based on the load how will the API performance adjust?  How much overhead will load on the OpenStack API’s add to my application deployment timeline?  What behavior should I look for to determine its time to add more control plane resources?</p>\n<p><span style=\"font-size: 12.0pt;\">These are just a few questions I have been asked and/or have come to my mind while operating OpenStack clouds.  While performing API benchmarking can be measured in so many different ways, it does feel like a good idea to have some high level frame of reference.  I will start off stating that there are about a million ways to measure performance.  Your approach may differ from what I have done and that is actually expected.  The tests conducted are meant to provide a starting reference for you to possibly build upon</span>.</p>",
+				"display_on_site": false,
+				"featured": false,
+				"order": 3,
+				"presentation_id": 17459,
+				"link": "colemancda.github.io"
+			}
+		],
+		"links": [
+			{
+				"id": 33694,
+				"name": "Blog entry",
+				"description": null,
+				"display_on_site": true,
+				"featured": false,
+				"order": 1,
+				"presentation_id": 17459,
+				"link": "https://osic.org/blogs/pushing-boundaries-openstack-%E2%80%93-wait-what-are-they-again"
+			},
+			{
+				"id": 33695,
+				"name": "http://blog.rackspace.com/openstack-api-benchmarking-and-scaling-3-test-cases",
+				"description": null,
+				"display_on_site": false,
+				"featured": false,
+				"order": 2,
+				"presentation_id": 17459,
+				"link": "http://blog.rackspace.com/openstack-api-benchmarking-and-scaling-3-test-cases"
+			}
+		],
+		"videos": [
+			{
+				"id": 36850,
+				"name": "Test video",
+				"description": "<p>Have you ever been curious as to how much of a workload the OpenStack control plane can handle before needing to scale horizontally?  Based on the load how will the API performance adjust?  How much overhead will load on the OpenStack API’s add to my application deployment timeline?  What behavior should I look for to determine its time to add more control plane resources?</p>\n<p><span style=\"font-size: 12.0pt;\">These are just a few questions I have been asked and/or have come to my mind while operating OpenStack clouds.  While performing API benchmarking can be measured in so many different ways, it does feel like a good idea to have some high level frame of reference.  I will start off stating that there are about a million ways to measure performance.  Your approach may differ from what I have done and that is actually expected.  The tests conducted are meant to provide a starting reference for you to possibly build upon</span>.</p>",
+				"display_on_site": true,
+				"featured": true,
+				"order": 4,
+				"presentation_id": 17459,
+				"youtube_id": "2S5W0ZGfYek",
+				"data_uploaded": 1493993083,
+				"highlighted": true,
+				"views": 0
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/OpenStack Summit/CoreSummitTests/JSONTests.swift b/OpenStack Summit/CoreSummitTests/JSONTests.swift
index 0b6451e3..5384a416 100644
--- a/OpenStack Summit/CoreSummitTests/JSONTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/JSONTests.swift	
@@ -269,4 +269,48 @@ final class JSONTests: XCTestCase {
             let _ = TrackGroupDataUpdate(JSONValue: .Object(entityJSON))
             else { XCTFail("Could not decode from JSON"); return }
     }
+    
+    func testDataUpdates13() {
+        
+        let testJSON = loadJSON("DataUpdates13")
+        
+        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+            let dataUpdateEntity = dataUpdate.entity,
+            case let .JSON(entityJSON) = dataUpdateEntity,
+            let _ = Video(JSONValue: .Object(entityJSON))
+            else { XCTFail("Could not decode from JSON"); return }
+    }
+    
+    func testDataUpdates14() {
+        
+        let testJSON = loadJSON("DataUpdates14")
+        
+        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+            let dataUpdateEntity = dataUpdate.entity,
+            case let .JSON(entityJSON) = dataUpdateEntity,
+            let _ = Slide(JSONValue: .Object(entityJSON))
+            else { XCTFail("Could not decode from JSON"); return }
+    }
+    
+    func testDataUpdates15() {
+        
+        let testJSON = loadJSON("DataUpdates15")
+        
+        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+            let dataUpdateEntity = dataUpdate.entity,
+            case let .JSON(entityJSON) = dataUpdateEntity,
+            let _ = Link(JSONValue: .Object(entityJSON))
+            else { XCTFail("Could not decode from JSON"); return }
+    }
+    
+    func testDataUpdates16() {
+        
+        let testJSON = loadJSON("DataUpdates16")
+        
+        guard let dataUpdate = DataUpdate(JSONValue: testJSON),
+            let dataUpdateEntity = dataUpdate.entity,
+            case let .JSON(entityJSON) = dataUpdateEntity,
+            let _ = EventDataUpdate(JSONValue: .Object(entityJSON))
+            else { XCTFail("Could not decode from JSON"); return }
+    }
 }
diff --git a/OpenStack Summit/CoreSummitTests/ModelTests.swift b/OpenStack Summit/CoreSummitTests/ModelTests.swift
new file mode 100644
index 00000000..500e60d7
--- /dev/null
+++ b/OpenStack Summit/CoreSummitTests/ModelTests.swift	
@@ -0,0 +1,33 @@
+//
+//  ModelTests.swift
+//  OpenStack Summit
+//
+//  Created by Alsey Coleman Miller on 5/5/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+import XCTest
+import SwiftFoundation
+@testable import CoreSummit
+
+final class ModelTests: XCTestCase {
+
+    func testNotificationTopicParse() {
+        
+        // Valid strings
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_everyone") == Notification.Topic.everyone)
+        XCTAssert(Notification.Topic(rawValue: "/topics/everyone") == Notification.Topic.everyone)
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_member_1") == Notification.Topic.member(1))
+        XCTAssert(Notification.Topic(rawValue: "/topics/member_1") == Notification.Topic.member(1))
+        
+        // Invalid Strings
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/fakeTopic") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_fakeTopic") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_member_") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_member_a") == nil)
+        XCTAssert(Notification.Topic(rawValue: "/topics/ios_member") == nil)
+    }
+}
diff --git a/OpenStack Summit/CoreSummitTests/StoreTests.swift b/OpenStack Summit/CoreSummitTests/StoreTests.swift
index 370c16f2..31832a2b 100644
--- a/OpenStack Summit/CoreSummitTests/StoreTests.swift	
+++ b/OpenStack Summit/CoreSummitTests/StoreTests.swift	
@@ -101,7 +101,7 @@ final class StoreTests: XCTestCase {
         
         let store = try! createStore()
         
-        let summitID = 7  // Barcelona
+        let summitID = 22  // Boston 2017
         
         let date = Date() - (60*60*24*30) // last month
         
@@ -115,9 +115,9 @@ final class StoreTests: XCTestCase {
                 
                 XCTFail("\(error)");
                 
-            case let .Value(value):
+            case .Value:
                 
-                XCTAssert(value.isEmpty == false)
+                break
             }
             
             expectation.fulfill()
diff --git a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj
index c05073e8..f534b73c 100644
--- a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
+++ b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
@@ -176,6 +176,10 @@
 		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 */; };
@@ -427,6 +431,42 @@
 		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 */; };
+		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 */; };
+		6E55B4E91EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */; };
+		6E55B4F51EBCB025003AAFE6 /* SlideJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */; };
+		6E55B4F61EBCB025003AAFE6 /* SlideJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */; };
+		6E55B4F71EBCB025003AAFE6 /* SlideJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */; };
+		6E55B4F81EBCB025003AAFE6 /* SlideJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */; };
+		6E55B4FA1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */; };
+		6E55B4FB1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */; };
+		6E55B4FC1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */; };
+		6E55B4FD1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */; };
+		6E55B4FF1EBCB704003AAFE6 /* DataUpdates14.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */; };
+		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 */; };
+		6E55B5171EBCBFCA003AAFE6 /* DataUpdates15.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */; };
+		6E55B5181EBCBFCB003AAFE6 /* DataUpdates15.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */; };
+		6E55B5191EBCBFCC003AAFE6 /* DataUpdates15.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */; };
+		6E55B51A1EBCBFCD003AAFE6 /* DataUpdates15.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */; };
+		6E55B51C1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */; };
+		6E55B51D1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */; };
+		6E55B51E1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */; };
+		6E55B51F1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */; };
 		6E570A311D676A3800189992 /* DataUpdates2.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E570A301D676A3800189992 /* DataUpdates2.json */; };
 		6E570A341D6771CF00189992 /* EventDataUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E570A331D6771CF00189992 /* EventDataUpdate.swift */; };
 		6E570A361D67753D00189992 /* PresentationDataUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E570A351D67753D00189992 /* PresentationDataUpdate.swift */; };
@@ -1074,6 +1114,14 @@
 		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 */; };
 		9DEF130D1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
 		9DEF130E1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
 		9DEF130F1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
@@ -1486,6 +1534,16 @@
 		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>"; };
+		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>"; };
+		6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates14.json; sourceTree = "<group>"; };
+		6E55B5031EBCBCD6003AAFE6 /* Link.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Link.swift; sourceTree = "<group>"; };
+		6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkJSON.swift; sourceTree = "<group>"; };
+		6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkManagedObject.swift; sourceTree = "<group>"; };
+		6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates15.json; sourceTree = "<group>"; };
+		6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates16.json; sourceTree = "<group>"; };
+		6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModelTests.swift; sourceTree = "<group>"; };
 		6E570A301D676A3800189992 /* DataUpdates2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates2.json; sourceTree = "<group>"; };
 		6E570A331D6771CF00189992 /* EventDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDataUpdate.swift; sourceTree = "<group>"; };
 		6E570A351D67753D00189992 /* PresentationDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationDataUpdate.swift; sourceTree = "<group>"; };
@@ -1775,6 +1833,8 @@
 		9D6AADA81DBE4ABE0057888E /* DataUpdates6.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates6.json; sourceTree = "<group>"; };
 		9D6AADAB1DBE563A0057888E /* VenueRoomDataUpdateJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdateJSON.swift; sourceTree = "<group>"; };
 		9D6AADAD1DBE56CB0057888E /* VenueRoomDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdate.swift; sourceTree = "<group>"; };
+		9DE1C8EA1EAFA20B0007D89A /* Slide.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Slide.swift; sourceTree = "<group>"; };
+		9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationMaterial.swift; sourceTree = "<group>"; };
 		9DEF130C1EA67153001798D4 /* Level.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Level.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -2059,6 +2119,7 @@
 			children = (
 				6E10A5151D106741008CBD0C /* JSON */,
 				6E10A50F1D10672D008CBD0C /* JSONTests.swift */,
+				6E55B5201EBCCB2C003AAFE6 /* ModelTests.swift */,
 				6E10A5101D10672D008CBD0C /* CoreDataTests.swift */,
 				6E0FD0AF1E92A7DB000C6DBA /* PredicateTests.swift */,
 				6E52FCBA1D130553006A7302 /* StoreTests.swift */,
@@ -2084,6 +2145,10 @@
 				6E4885DB1E563807002C87D2 /* DataUpdates10.json */,
 				6E4C1F501E72EE7700DBBC9F /* DataUpdates11.json */,
 				6EC8CB301E8572710028270F /* DataUpdates12.json */,
+				6E55B4E41EBBD0F9003AAFE6 /* DataUpdates13.json */,
+				6E55B4FE1EBCB704003AAFE6 /* DataUpdates14.json */,
+				6E55B5121EBCBF2D003AAFE6 /* DataUpdates15.json */,
+				6E55B51B1EBCC68E003AAFE6 /* DataUpdates16.json */,
 				6E020FB91D6B55D200DF2BCD /* Member1.json */,
 				6E586FBE1DC29083001DE605 /* Member2.json */,
 				6E931FE81E5164ED00762B74 /* Member3.json */,
@@ -2113,6 +2178,7 @@
 				6E10A52B1D10675C008CBD0C /* NonConfirmedAttendee.swift */,
 				6E10A52D1D10675C008CBD0C /* Person.swift */,
 				6E10A52E1D10675C008CBD0C /* Presentation.swift */,
+				9DE1C8EF1EB018630007D89A /* PresentationMaterial.swift */,
 				9DEF130C1EA67153001798D4 /* Level.swift */,
 				6E10A5301D10675C008CBD0C /* Speaker.swift */,
 				6E10A5481D10675C008CBD0C /* Summit.swift */,
@@ -2128,6 +2194,8 @@
 				6E10A55B1D10675D008CBD0C /* VenueRoom.swift */,
 				9D1CE1051DA43DCF0064B3B1 /* VenueFloor.swift */,
 				6E2BB3A71D63A57E0085C876 /* Video.swift */,
+				9DE1C8EA1EAFA20B0007D89A /* Slide.swift */,
+				6E55B5031EBCBCD6003AAFE6 /* Link.swift */,
 				6E730B8C1DA2E254005E486B /* Page.swift */,
 				6E8D10981DF87F3B00A0BBDC /* Team.swift */,
 				6E3D4CFE1E12D44A00D542CD /* TeamMember.swift */,
@@ -2169,6 +2237,8 @@
 				9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */,
 				6E10A55C1D10675D008CBD0C /* VenueRoomJSON.swift */,
 				6E2BB3A91D63A6050085C876 /* VideoJSON.swift */,
+				6E55B4F41EBCB025003AAFE6 /* SlideJSON.swift */,
+				6E55B5081EBCBD0C003AAFE6 /* LinkJSON.swift */,
 				6E730B8E1DA2E405005E486B /* PageJSON.swift */,
 				6EBC48F61E1309790077806B /* FaultJSON.swift */,
 				6EBC48FA1E138EB20077806B /* TeamJSON.swift */,
@@ -2631,6 +2701,8 @@
 				6E2D9FE11DC9A5960015C588 /* TicketTypeManagedObject.swift */,
 				6E2D9FE91DC9B0D40015C588 /* TagManagedObject.swift */,
 				6E2D9FED1DC9B0F50015C588 /* VideoManagedObject.swift */,
+				6E55B4F91EBCB4C2003AAFE6 /* SlideManagedObject.swift */,
+				6E55B50D1EBCBD46003AAFE6 /* LinkManagedObject.swift */,
 				6E2D9FF11DC9CC820015C588 /* MemberManagedObject.swift */,
 				6E2D9FF51DC9D2FE0015C588 /* AttendeeManagedObject.swift */,
 				6E2D9FF91DC9D4320015C588 /* FeedbackManagedObject.swift */,
@@ -3401,8 +3473,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E55B51A1EBCBFCD003AAFE6 /* DataUpdates15.json in Resources */,
 				6E0B5F2B1D77C8AB0005F6CE /* Member1.json in Resources */,
 				6EE74DE91DBF8E5800616BEA /* DataUpdates6.json in Resources */,
+				6E55B4E91EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */,
 				6E8221101E48E9D70025FE58 /* DataUpdates9.json in Resources */,
 				6EC8CB341E8572710028270F /* DataUpdates12.json in Resources */,
 				6E2827D91E57740B009B784A /* Feedback.json in Resources */,
@@ -3413,12 +3487,14 @@
 				6EEBAEA61D8CD6530067B228 /* DataUpdates4.json in Resources */,
 				6E4885DE1E563807002C87D2 /* DataUpdates10.json in Resources */,
 				6E931FEB1E5164ED00762B74 /* Member3.json in Resources */,
+				6E55B51F1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */,
 				6E82210C1E48E72C0025FE58 /* ListMembers.json in Resources */,
 				6EE74DE81DBF8E5800616BEA /* DataUpdates5.json in Resources */,
 				6E8221081E48E6880025FE58 /* Summit6.json in Resources */,
 				6E0B5F2F1D77C8AB0005F6CE /* DataUpdates2.json in Resources */,
 				6E586FC21DC29083001DE605 /* Member2.json in Resources */,
 				6E8221031E48E67A0025FE58 /* Summit22.json in Resources */,
+				6E55B5021EBCB704003AAFE6 /* DataUpdates14.json in Resources */,
 				6EE74DEA1DBF8E5800616BEA /* DataUpdates7.json in Resources */,
 				6E0B5F301D77C8AB0005F6CE /* DataUpdates1.json in Resources */,
 				6E919B571E39CA4300FBF910 /* DataUpdates8.json in Resources */,
@@ -3493,8 +3569,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E55B5171EBCBFCA003AAFE6 /* DataUpdates15.json in Resources */,
 				6E020FBA1D6B55D200DF2BCD /* Member1.json in Resources */,
 				9D6AADAA1DBE4E570057888E /* DataUpdates6.json in Resources */,
+				6E55B4E61EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */,
 				6E82210E1E48E9D70025FE58 /* DataUpdates9.json in Resources */,
 				6EC8CB311E8572710028270F /* DataUpdates12.json in Resources */,
 				6E2827D71E57740B009B784A /* Feedback.json in Resources */,
@@ -3505,12 +3583,14 @@
 				6EEBAEA41D8CD6530067B228 /* DataUpdates4.json in Resources */,
 				6E4885DC1E563807002C87D2 /* DataUpdates10.json in Resources */,
 				6E931FE91E5164ED00762B74 /* Member3.json in Resources */,
+				6E55B51C1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */,
 				6E82210A1E48E72C0025FE58 /* ListMembers.json in Resources */,
 				6E586FC01DC29083001DE605 /* Member2.json in Resources */,
 				6E8221061E48E6880025FE58 /* Summit6.json in Resources */,
 				6E570A311D676A3800189992 /* DataUpdates2.json in Resources */,
 				6E25AD411D5A63F20060E7BA /* DataUpdates1.json in Resources */,
 				6E8221011E48E67A0025FE58 /* Summit22.json in Resources */,
+				6E55B4FF1EBCB704003AAFE6 /* DataUpdates14.json in Resources */,
 				6EE33F491DBF8F9500ECDDCF /* DataUpdates7.json in Resources */,
 				6E93D4411D9AEC5000E3302A /* DataUpdates5.json in Resources */,
 				6E919B551E39CA4300FBF910 /* DataUpdates8.json in Resources */,
@@ -3528,8 +3608,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E55B5191EBCBFCC003AAFE6 /* DataUpdates15.json in Resources */,
 				6E29241E1D7AF8CC00D14F0A /* Member1.json in Resources */,
 				6EE74DEC1DBF8E5A00616BEA /* DataUpdates6.json in Resources */,
+				6E55B4E81EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */,
 				6E82210F1E48E9D70025FE58 /* DataUpdates9.json in Resources */,
 				6EC8CB331E8572710028270F /* DataUpdates12.json in Resources */,
 				6E2827D81E57740B009B784A /* Feedback.json in Resources */,
@@ -3540,12 +3622,14 @@
 				6EEBAEA51D8CD6530067B228 /* DataUpdates4.json in Resources */,
 				6E4885DD1E563807002C87D2 /* DataUpdates10.json in Resources */,
 				6E931FEA1E5164ED00762B74 /* Member3.json in Resources */,
+				6E55B51E1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */,
 				6E82210B1E48E72C0025FE58 /* ListMembers.json in Resources */,
 				6EE74DEB1DBF8E5A00616BEA /* DataUpdates5.json in Resources */,
 				6E8221071E48E6880025FE58 /* Summit6.json in Resources */,
 				6E2924221D7AF8CC00D14F0A /* DataUpdates2.json in Resources */,
 				6E586FC11DC29083001DE605 /* Member2.json in Resources */,
 				6E8221021E48E67A0025FE58 /* Summit22.json in Resources */,
+				6E55B5011EBCB704003AAFE6 /* DataUpdates14.json in Resources */,
 				6EE74DED1DBF8E5A00616BEA /* DataUpdates7.json in Resources */,
 				6E2924231D7AF8CC00D14F0A /* DataUpdates1.json in Resources */,
 				6E919B561E39CA4300FBF910 /* DataUpdates8.json in Resources */,
@@ -3571,8 +3655,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				6E4C1F511E72EE7700DBBC9F /* DataUpdates11.json in Resources */,
+				6E55B51D1EBCC68E003AAFE6 /* DataUpdates16.json in Resources */,
 				6E7558501E58C4A7003B6844 /* Member1.json in Resources */,
 				6E7558511E58C4A7003B6844 /* DataUpdates6.json in Resources */,
+				6E55B5181EBCBFCB003AAFE6 /* DataUpdates15.json in Resources */,
 				6E7558521E58C4A7003B6844 /* DataUpdates9.json in Resources */,
 				6E7558531E58C4A7003B6844 /* AllSummits.json in Resources */,
 				6E7558541E58C4A7003B6844 /* Summit7.json in Resources */,
@@ -3586,6 +3672,8 @@
 				6E75585B1E58C4A7003B6844 /* Summit6.json in Resources */,
 				6E75585C1E58C4A7003B6844 /* DataUpdates2.json in Resources */,
 				6E75585D1E58C4A7003B6844 /* DataUpdates1.json in Resources */,
+				6E55B4E71EBBD0F9003AAFE6 /* DataUpdates13.json in Resources */,
+				6E55B5001EBCB704003AAFE6 /* DataUpdates14.json in Resources */,
 				6E75585E1E58C4A7003B6844 /* Summit22.json in Resources */,
 				6E75585F1E58C4A7003B6844 /* DataUpdates7.json in Resources */,
 				6E7558601E58C4A7003B6844 /* DataUpdates5.json in Resources */,
@@ -3875,6 +3963,7 @@
 				6E0B5EB71D77C8950005F6CE /* VenueRoom.swift in Sources */,
 				6EEED03F1E3BCB5E00795B3D /* NotificationManagedObject.swift in Sources */,
 				6E0B5EBA1D77C8950005F6CE /* SummitRequest.swift in Sources */,
+				6E55B5071EBCBCD6003AAFE6 /* Link.swift in Sources */,
 				6E0B5EBB1D77C8950005F6CE /* Session.swift in Sources */,
 				6E0B5EBF1D77C8950005F6CE /* ImageJSON.swift in Sources */,
 				6E3D4D011E12D44A00D542CD /* TeamMember.swift in Sources */,
@@ -3893,6 +3982,7 @@
 				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 */,
@@ -3907,6 +3997,7 @@
 				6E0B5ECE1D77C8950005F6CE /* Summit.swift in Sources */,
 				6EBC48F51E12FA1A0077806B /* Fault.swift in Sources */,
 				6E0B5ECF1D77C8950005F6CE /* TicketType.swift in Sources */,
+				9DE1C8EE1EAFA20B0007D89A /* Slide.swift in Sources */,
 				6E0B5ED01D77C8950005F6CE /* SummitTypeJSON.swift in Sources */,
 				6E0B5ED21D77C8950005F6CE /* VenueRoomJSON.swift in Sources */,
 				6E2D9FF81DC9D2FE0015C588 /* AttendeeManagedObject.swift in Sources */,
@@ -3925,6 +4016,7 @@
 				6E0B5EDE1D77C8950005F6CE /* Configuration.swift in Sources */,
 				9D4B1C371E85554700F98ECB /* AffiliationJSON.swift in Sources */,
 				6E2D9FF01DC9B0F50015C588 /* VideoManagedObject.swift in Sources */,
+				6E55B5111EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */,
 				6E0B5EDF1D77C8950005F6CE /* EventType.swift in Sources */,
 				6EF4F8671DC8D1D300D31A99 /* CoreDataExtensions.swift in Sources */,
 				6E2D9FE41DC9A5960015C588 /* TicketTypeManagedObject.swift in Sources */,
@@ -3953,6 +4045,7 @@
 				6E0B5EEA1D77C8950005F6CE /* VenueJSON.swift in Sources */,
 				6E2D9FF41DC9CC820015C588 /* MemberManagedObject.swift in Sources */,
 				6E0B5EEC1D77C8950005F6CE /* VideoJSON.swift in Sources */,
+				6E55B4FD1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */,
 				6E0B5EED1D77C8950005F6CE /* Unique.swift in Sources */,
 				6E2D9FD41DC98E330015C588 /* PresentationManagedObject.swift in Sources */,
 				6EF4F86A1DC8D1D300D31A99 /* CoreDataEncodable.swift in Sources */,
@@ -3975,6 +4068,7 @@
 				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 */,
@@ -3983,6 +4077,7 @@
 				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 */,
@@ -4019,6 +4114,7 @@
 				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 */,
 			);
@@ -4196,6 +4292,8 @@
 				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 */,
@@ -4212,6 +4310,7 @@
 				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 */,
@@ -4243,6 +4342,7 @@
 				6E10A56A1D10675D008CBD0C /* LocationJSON.swift in Sources */,
 				6E087DD01D4A5E0F00CDC935 /* Configuration.swift in Sources */,
 				6E1BCFEE1E379F4400059E94 /* GroupManagedObject.swift in Sources */,
+				6E55B4F51EBCB025003AAFE6 /* SlideJSON.swift in Sources */,
 				6EF4F8571DC8C7D600D31A99 /* CompanyManagedObject.swift in Sources */,
 				6E10A5621D10675D008CBD0C /* EventType.swift in Sources */,
 				9D4B1C2A1E84B09100F98ECB /* Affiliation.swift in Sources */,
@@ -4265,6 +4365,7 @@
 				6E2D9FE21DC9A5960015C588 /* TicketTypeManagedObject.swift in Sources */,
 				6E10A5711D10675D008CBD0C /* Presentation.swift in Sources */,
 				6E919B4D1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
+				9DE1C8EB1EAFA20B0007D89A /* Slide.swift in Sources */,
 				6EBC48EF1E12F7D50077806B /* TeamMessageManagedObject.swift in Sources */,
 				6E919B491E39C1B700FBF910 /* GroupEventDataUpdate.swift in Sources */,
 				6E8D10991DF87F3B00A0BBDC /* Team.swift in Sources */,
@@ -4305,6 +4406,7 @@
 				6E93D4431D9AECA500E3302A /* TrackGroupDataUpdate.swift in Sources */,
 				6EA38A7C1DCB1D5E00B703CE /* TrackGroupDataUpdateManagedObject.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 */,
@@ -4319,6 +4421,7 @@
 				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 */,
@@ -4332,6 +4435,7 @@
 				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 */,
 			);
@@ -4349,6 +4453,7 @@
 				6EE9545C1E92A0BC006B1330 /* Expression.swift in Sources */,
 				6E2923A81D7AF8C900D14F0A /* Event.swift in Sources */,
 				6E2923A91D7AF8C900D14F0A /* VenueRoom.swift in Sources */,
+				6E55B4FC1EBCB4C2003AAFE6 /* SlideManagedObject.swift in Sources */,
 				6E2923AB1D7AF8C900D14F0A /* CollectionType.swift in Sources */,
 				6EF4F8541DC8C68700D31A99 /* SummitManagedObject.swift in Sources */,
 				6E2923AD1D7AF8C900D14F0A /* SummitRequest.swift in Sources */,
@@ -4397,6 +4502,7 @@
 				6E919B4E1E39C73000FBF910 /* GroupEventDataUpdateJSON.swift in Sources */,
 				6E2923C11D7AF8C900D14F0A /* Speaker.swift in Sources */,
 				6E2923C21D7AF8C900D14F0A /* Summit.swift in Sources */,
+				6E55B50B1EBCBD0C003AAFE6 /* LinkJSON.swift in Sources */,
 				6E2923C31D7AF8C900D14F0A /* TicketType.swift in Sources */,
 				6E2923C41D7AF8C900D14F0A /* SummitTypeJSON.swift in Sources */,
 				6E2923C61D7AF8C900D14F0A /* VenueRoomJSON.swift in Sources */,
@@ -4426,9 +4532,11 @@
 				6EB1FE011E1D6BB90048045D /* PageController.swift in Sources */,
 				6E3D4D001E12D44A00D542CD /* TeamMember.swift in Sources */,
 				6E2923D81D7AF8C900D14F0A /* SummitJSON.swift in Sources */,
+				9DE1C8ED1EAFA20B0007D89A /* Slide.swift in Sources */,
 				6E2923D91D7AF8C900D14F0A /* Production.swift in Sources */,
 				6E1BCFEB1E36A3B800059E94 /* GroupJSON.swift in Sources */,
 				6EBC49041E1394FE0077806B /* TeamMessageJSON.swift in Sources */,
+				6E55B4F71EBCB025003AAFE6 /* SlideJSON.swift in Sources */,
 				6E2D9FF31DC9CC820015C588 /* MemberManagedObject.swift in Sources */,
 				6E2923DA1D7AF8C900D14F0A /* WebConvertible.swift in Sources */,
 				6E2923DD1D7AF8C900D14F0A /* Presentation.swift in Sources */,
@@ -4455,6 +4563,7 @@
 				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 */,
 				6E2923EE1D7AF8C900D14F0A /* TimeZoneJSON.swift in Sources */,
 				6E2923EF1D7AF8C900D14F0A /* Feedback.swift in Sources */,
@@ -4465,6 +4574,7 @@
 				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 */,
@@ -4472,6 +4582,7 @@
 				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 */,
 				6E2923F61D7AF8C900D14F0A /* EventJSON.swift in Sources */,
 				6EF4F8581DC8C7D600D31A99 /* CompanyManagedObject.swift in Sources */,
@@ -4507,6 +4618,7 @@
 				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 */,
 			);
@@ -4562,6 +4674,8 @@
 				6E7557C01E58C48C003B6844 /* Staging.swift in Sources */,
 				6E7557C11E58C48C003B6844 /* TeamInvitation.swift in Sources */,
 				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 */,
@@ -4578,6 +4692,7 @@
 				6E7557CE1E58C48C003B6844 /* MemberJSON.swift in Sources */,
 				6E7557CF1E58C48C003B6844 /* SummitsRequest.swift in Sources */,
 				6E7557D01E58C48C003B6844 /* EventDataUpdate.swift in Sources */,
+				6E55B50F1EBCBD46003AAFE6 /* LinkManagedObject.swift in Sources */,
 				6E7557D11E58C48C003B6844 /* VenueFloorJSON.swift in Sources */,
 				6E7557D21E58C48C003B6844 /* Speaker.swift in Sources */,
 				6EE9545F1E92A0BC006B1330 /* Value.swift in Sources */,
@@ -4609,6 +4724,7 @@
 				6E7557EA1E58C48C003B6844 /* LocationJSON.swift in Sources */,
 				6E7557EB1E58C48C003B6844 /* Configuration.swift in Sources */,
 				6E7557EC1E58C48C003B6844 /* GroupManagedObject.swift in Sources */,
+				6E55B4F61EBCB025003AAFE6 /* SlideJSON.swift in Sources */,
 				6E7557ED1E58C48C003B6844 /* CompanyManagedObject.swift in Sources */,
 				6E7557EE1E58C48C003B6844 /* EventType.swift in Sources */,
 				9D4B1C2B1E84B09100F98ECB /* Affiliation.swift in Sources */,
@@ -4631,6 +4747,7 @@
 				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 */,
 				6E7558021E58C48C003B6844 /* Team.swift in Sources */,
@@ -4671,6 +4788,7 @@
 				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 */,
@@ -4685,6 +4803,7 @@
 				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 */,
@@ -4698,6 +4817,7 @@
 				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 */,
 			);
diff --git a/OpenStack Summit/OpenStack Summit/AppDelegate.swift b/OpenStack Summit/OpenStack Summit/AppDelegate.swift
index 2a85ace4..2d052cc2 100644
--- a/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
+++ b/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
@@ -110,9 +110,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         // 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.
         
-        #if !DEBUG
         FIRMessaging.messaging().disconnect()
-        #endif
     }
 
     func applicationWillEnterForeground(application: UIApplication) {
@@ -138,43 +136,53 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         
         print("APNs token retrieved: \(deviceToken)")
         
-        FIRInstanceID.instanceID().setAPNSToken(deviceToken, type: FIRInstanceIDAPNSTokenType.Sandbox)
-    }
-    
-    // HACK: implemented old delegate to make notifications work as is on iOS 10
-    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject]) {
-        
-        // Print message ID.
-        if let messageID = userInfo["gcm.message_id"] {
-            print("Message ID: \(messageID)")
-        }
-        
-        // Print full message.
-        print("Recieved remote notification: \(userInfo)")
-        
-        PushNotificationManager.shared.process(userInfo as! [String: String])
+        FIRInstanceID.instanceID().setAPNSToken(deviceToken, type: .Sandbox)
     }
     
-    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject], fetchCompletionHandler completionHandler: (UIBackgroundFetchResult) -> Void) {
-        // If you are receiving a notification message while your app is in the background,
-        // this callback will not be fired till the user taps on the notification launching the application.
-        
-        // Print message ID.
-        if let messageID = userInfo["gcm.message_id"] {
-            print("Message ID: \(messageID)")
-        }
+    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject], fetchCompletionHandler: (UIBackgroundFetchResult) -> ()) {
         
-        // Print full message.
-        print("Recieved remote notification: \(userInfo)")
-        
-        var notification = userInfo
-        notification.removeValueForKey("aps")
-        
-        if let notification = notification as? [String: String] {
-            PushNotificationManager.shared.process(notification)
+        // app was just brought from background to foreground
+        if application.applicationState == .Active {
+            
+            // called when push notification received in foreground
+            print("Recieved remote notification: \(userInfo)")
+            
+        } else {
+            
+            // called when push notification tapped
+            print("Tapped on remote notification: \(userInfo)")
+            
+            PushNotificationManager.shared.process(userInfo as! [String: AnyObject], 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()
+            }
         }
         
-        completionHandler(.NewData)
+        fetchCompletionHandler(.NoData)
     }
     
     func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [NSObject : AnyObject], completionHandler: () -> Void) {
diff --git a/OpenStack Summit/OpenStack Summit/Event.storyboard b/OpenStack Summit/OpenStack Summit/Event.storyboard
index 6ad3f77c..17d470a6 100644
--- a/OpenStack Summit/OpenStack Summit/Event.storyboard	
+++ b/OpenStack Summit/OpenStack Summit/Event.storyboard	
@@ -180,7 +180,7 @@
                                     <outlet property="willRecordImageView" destination="tEg-DK-ALl" id="k4g-M0-9r5"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventDetailDownloadAttachmentTableViewCell" rowHeight="52" id="JrI-iK-fzM">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventDetailDownloadAttachmentTableViewCell" rowHeight="52" id="JrI-iK-fzM" customClass="EventDetailDownloadAttachmentTableViewCell" customModule="OpenStackSummit" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="417" width="320" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JrI-iK-fzM" id="Eba-wQ-OPJ">
@@ -224,6 +224,9 @@
                                         <constraint firstItem="N32-5O-2A8" firstAttribute="top" secondItem="Eba-wQ-OPJ" secondAttribute="top" id="zZz-Us-Kwz"/>
                                     </constraints>
                                 </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="downloadButton" destination="jpM-DJ-szI" id="h0k-vi-iEU"/>
+                                </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EventDetailTableViewCell" rowHeight="113" id="Gie-OQ-Gj2" customClass="EventDetailTableViewCell" customModule="OpenStackSummit" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="469" width="320" height="113"/>
@@ -480,19 +483,19 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="OTu-1p-7i2">
-                            <rect key="frame" x="15" y="40" width="290" height="123"/>
+                            <rect key="frame" x="15" y="40" width="290" height="122.5"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="EvU-ad-cf6">
-                                    <rect key="frame" x="0.0" y="0.0" width="290" height="58"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="290" height="57.5"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rgm-5C-23d" customClass="CopyableLabel" customModule="OpenStackSummit" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="290" height="28"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="290" height="27.5"/>
                                             <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="20"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Track" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLH-lM-hPM" userLabel="Track" customClass="CopyableLabel" customModule="OpenStackSummit" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="36" width="290" height="22"/>
+                                            <rect key="frame" x="0.0" y="35.5" width="290" height="22"/>
                                             <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="16"/>
                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
@@ -500,13 +503,13 @@
                                     </subviews>
                                 </stackView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FET-XF-DJx">
-                                    <rect key="frame" x="0.0" y="88" width="290" height="35"/>
+                                    <rect key="frame" x="0.0" y="87.5" width="290" height="35"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="9LM-7x-arF">
                                             <rect key="frame" x="0.0" y="0.0" width="290" height="35"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YHq-I5-oVn" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="0.0" width="95" height="35"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="95.5" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="2pZ-pX-wIE"/>
                                                     </constraints>
@@ -529,7 +532,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Czs-tP-hWr" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="97" y="0.0" width="96" height="35"/>
+                                                    <rect key="frame" x="97.5" y="0.0" width="95" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="MDd-hu-Ci1"/>
                                                     </constraints>
@@ -552,7 +555,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kTd-Ix-Da9" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="195" y="0.0" width="95" height="35"/>
+                                                    <rect key="frame" x="194.5" y="0.0" width="95.5" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="Ppc-CQ-XNI"/>
                                                     </constraints>
diff --git a/OpenStack Summit/OpenStack Summit/EventDetail.swift b/OpenStack Summit/OpenStack Summit/EventDetail.swift
index d6d03ecc..1e2d953f 100644
--- a/OpenStack Summit/OpenStack Summit/EventDetail.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventDetail.swift	
@@ -66,7 +66,7 @@ public struct EventDetail: CoreDataDecodable {
         self.rsvp = event.rsvp ?? ""
         self.externalRSVP = event.externalRSVP
         self.willRecord = event.willRecord
-        self.attachment = event.attachment ?? ""
+        self.attachment = event.attachment ?? Slide.from(managedObjects: event.slides).ordered().first?.link ?? ""
         
         if let locationManagedObject = event.location {
             
diff --git a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift
index 0a887b66..4f6cccb8 100755
--- a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
@@ -524,6 +524,9 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
                 
                 let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.eventDetailDownloadAttachmentTableViewCell, forIndexPath: indexPath)!
                 
+                let title = eventDetail.eventType == "Presentation" ? "Download slides" : "Download attachment"
+                cell.downloadButton.setTitle(title, forState: .Normal)
+                
                 return cell
             }
             
@@ -782,6 +785,11 @@ final class EventDetailTableViewCell: UITableViewCell {
     @IBOutlet private(set) weak var valueLabel: UILabel!
 }
 
+final class EventDetailDownloadAttachmentTableViewCell: UITableViewCell {
+    
+    @IBOutlet private(set) weak var downloadButton: UIButton!
+}
+
 final class EventDetailFeedbackTableViewCell: UITableViewCell {
     
     @IBOutlet private(set) weak var dateLabel: UILabel!
diff --git a/OpenStack Summit/OpenStack Summit/Info.plist b/OpenStack Summit/OpenStack Summit/Info.plist
index 460c5d93..8273ecf1 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.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift b/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift
index 3432ac68..0734af82 100644
--- a/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift	
@@ -59,13 +59,17 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
         
         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
                 
-                self?.showRevealController()
+                guard let controller = self else { return }
+                
+                controller.showRevealController()
             }
             
         } else {
@@ -98,6 +102,8 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
     
     private func configureView() {
         
+        let _ = view
+        
         switch state {
             
         case .loadingSummits:
diff --git a/OpenStack Summit/OpenStack Summit/Menu.storyboard b/OpenStack Summit/OpenStack Summit/Menu.storyboard
index 0515ca36..ec5acf95 100644
--- a/OpenStack Summit/OpenStack Summit/Menu.storyboard	
+++ b/OpenStack Summit/OpenStack Summit/Menu.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -197,11 +197,11 @@
                                                 </connections>
                                             </button>
                                             <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="exc-UN-4tk">
-                                                <rect key="frame" x="203" y="168" width="35" height="35"/>
+                                                <rect key="frame" x="208" y="173" width="26" height="26"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpm-nC-RgX">
-                                                        <rect key="frame" x="4" y="7" width="27" height="21"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -209,12 +209,6 @@
                                                     </label>
                                                 </subviews>
                                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                        <integer key="value" value="5"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                </userDefinedRuntimeAttributes>
                                             </view>
                                         </subviews>
                                         <constraints>
@@ -534,7 +528,7 @@
                                             </constraints>
                                         </imageView>
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="mm5-qU-yF3">
-                                            <rect key="frame" x="91" y="23.5" width="213" height="63"/>
+                                            <rect key="frame" x="91" y="23" width="213" height="63"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KFP-fW-tpJ">
                                                     <rect key="frame" x="0.0" y="0.0" width="213" height="20"/>
diff --git a/OpenStack Summit/OpenStack Summit/MenuViewController.swift b/OpenStack Summit/OpenStack Summit/MenuViewController.swift
index ce08375f..9d96c36e 100755
--- a/OpenStack Summit/OpenStack Summit/MenuViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/MenuViewController.swift	
@@ -217,6 +217,8 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
     
     private func highlight(item: MenuItem) {
         
+        let _ = self.view
+        
         unselectMenuItems()
         
         switch item {
@@ -258,6 +260,7 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
         let unreadCount = PushNotificationManager.shared.unreadCount
         
         inboxCounterView.hidden = unreadCount == 0
+        inboxCounterView.layer.cornerRadius = inboxCounterView.frame.size.width / 2
         inboxCounterLabel.text = "\(unreadCount)"
     }
     
@@ -286,11 +289,6 @@ final class MenuViewController: UIViewController, UITextFieldDelegate, ActivityV
                 pictureURL = currentMember.pictureURL
             }
             
-        } else if Store.shared.isLoggedIn {
-            
-            name = Store.shared.session.name ?? ""
-            pictureURL = ""
-            
         } else {
             
             name = ""
diff --git a/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift b/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift
index ee4b92a2..bc2fdd88 100644
--- a/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/NotificationDetailViewController.swift	
@@ -40,6 +40,37 @@ final class NotificationDetailViewController: UITableViewController {
         configureView()
     }
     
+    // MARK: - Actions
+    
+    @IBAction func deleteAction(sender: UIBarButtonItem) {
+        
+        let context = Store.shared.privateQueueManagedObjectContext
+        
+        let identifier = self.notification.identifier
+        
+        func closeViewController() {
+            
+            NSOperationQueue.mainQueue().addOperationWithBlock { [weak self] in
+                
+                guard let controller = self else { return }
+                
+                controller.navigationController?.popViewControllerAnimated(true)
+            }
+        }
+                
+        context.performBlock {
+            
+            guard let notificationManagedObject = try! NotificationManagedObject.find(identifier, context: context)
+                else { closeViewController(); return }
+            
+            context.deleteObject(notificationManagedObject)
+            
+            try! context.save()
+            
+            closeViewController()
+        }
+    }
+    
     // MARK: - Private Methods
     
     private func configureView() {
diff --git a/OpenStack Summit/OpenStack Summit/Notifications.storyboard b/OpenStack Summit/OpenStack Summit/Notifications.storyboard
index da5ff458..09f993de 100644
--- a/OpenStack Summit/OpenStack Summit/Notifications.storyboard	
+++ b/OpenStack Summit/OpenStack Summit/Notifications.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YWj-qx-9pe">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YWj-qx-9pe">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -21,7 +21,7 @@
                                 <rect key="frame" x="0.0" y="28" width="375" height="53"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sNz-JC-ETv" id="0lv-i5-uTQ">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="342" height="52.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="10:00 am, April 24, 2017" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cSN-ug-ahm">
@@ -97,14 +97,14 @@
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="NotificationDetailEventCell" textLabel="ZuR-1w-bG5" style="IBUITableViewCellStyleDefault" id="s5n-O7-Idt">
-                                <rect key="frame" x="0.0" y="56" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s5n-O7-Idt" id="cz7-jx-NJy">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Event Name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZuR-1w-bG5">
-                                            <rect key="frame" x="15" y="0.0" width="325" height="43"/>
+                                            <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                             <nil key="textColor"/>
@@ -117,14 +117,14 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotificationDetailDateCell" textLabel="LOK-hp-b5C" style="IBUITableViewCellStyleDefault" id="YcR-lW-Qij">
-                                <rect key="frame" x="0.0" y="100" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YcR-lW-Qij" id="drO-nj-a7I">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LOK-hp-b5C">
-                                            <rect key="frame" x="15" y="0.0" width="345" height="43"/>
+                                            <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <nil key="textColor"/>
@@ -134,14 +134,14 @@
                                 </tableViewCellContentView>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotificationDetailTextCell" textLabel="qyv-Fr-Iia" style="IBUITableViewCellStyleDefault" id="kCg-PQ-1be">
-                                <rect key="frame" x="0.0" y="144" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="143.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kCg-PQ-1be" id="09i-0H-i55">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Text" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qyv-Fr-Iia">
-                                            <rect key="frame" x="15" y="0.0" width="345" height="43"/>
+                                            <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
@@ -157,10 +157,17 @@
                             <outlet property="delegate" destination="pqZ-y5-AzL" id="SQa-qY-sOR"/>
                         </connections>
                     </tableView>
+                    <toolbarItems/>
                     <navigationItem key="navigationItem" title="NOTIFICATION" id="yAJ-Ao-X2b">
                         <barButtonItem key="backBarButtonItem" title=" " id="HPz-SL-Oay"/>
+                        <barButtonItem key="rightBarButtonItem" systemItem="trash" id="ctz-Bj-vzJ">
+                            <connections>
+                                <action selector="deleteAction:" destination="pqZ-y5-AzL" id="olW-fz-iyg"/>
+                            </connections>
+                        </barButtonItem>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <nil key="simulatedBottomBarMetrics"/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ked-8P-PWr" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
diff --git a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift
index 628efb59..b58dddfa 100644
--- a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
+++ b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
@@ -40,6 +40,13 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         return (eventsFetchedResultsController?.fetchedObjects as? [Entity] ?? []).identifiers
     }
     
+    private var notificationsFetchedResultsController: NSFetchedResultsController!
+    
+    private var notifications: Set<Identifier> {
+        
+        return (notificationsFetchedResultsController?.fetchedObjects as? [Entity] ?? []).identifiers
+    }
+    
     private(set) var subscribedTopics = Set<Notification.Topic>()
     
     private let userDefaults = NSUserDefaults.standardUserDefaults()
@@ -72,6 +79,12 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         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,
+                                                                                delegate: self,
+                                                                                context: Store.shared.managedObjectContext)
+        
+        try! self.notificationsFetchedResultsController.performFetch()
     }
     
     // MARK: - Methods
@@ -106,7 +119,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         application.registerForRemoteNotifications()
     }
     
-    public func process(pushNotification: [String: String]) {
+    public func process(pushNotification: [String: AnyObject], unread: Bool = true) {
         
         let notification: PushNotification?
         
@@ -162,6 +175,9 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
             
             notification = generalNotification
             
+            guard try! NotificationManagedObject.find(generalNotification.identifier, context: context) == nil
+                else { return } // already cached
+            
             guard try! SummitManagedObject.find(generalNotification.summit, context: context) != nil else {
                 
                 log?("Invalid summit in push notification: \(generalNotification)")
@@ -187,27 +203,19 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
                 try! context.save()
             }
             
-            // set as unread
-            unreadNotifications.value.insert(generalNotification.identifier)
-            
-            // show notification
-            
-            if backgroundState {
-                
-                let userNotification = UILocalNotification()
-                userNotification.userInfo = [UserNotificationUserInfo.topic.rawValue: generalNotification.from.rawValue, UserNotificationUserInfo.identifier.rawValue : generalNotification.identifier]
-                userNotification.alertTitle = generalNotification.event?.title
-                userNotification.alertBody = generalNotification.body
-                userNotification.fireDate = NSDate()
-                userNotification.category = UserNotificationCategory.generalNotification.rawValue
-                
-                UIApplication.sharedApplication().scheduleLocalNotification(userNotification)
+            if unread {
                 
-            } else {
-                
-                let alertTitle = generalNotification.event?.title ?? "Notification"
+                // set as unread
+                unreadNotifications.value.insert(generalNotification.identifier)
                 
-                SweetAlert().showAlert(alertTitle, subTitle: generalNotification.body, style: .None)
+                // show notification if new
+                if backgroundState == false
+                    && generalNotification.created >= (Date() - 60 * 10) {
+                    
+                    let alertTitle = generalNotification.event?.title ?? "Notification"
+                    
+                    SweetAlert().showAlert(alertTitle, subTitle: generalNotification.body, style: .None)
+                }
             }
             
         } else {
@@ -425,9 +433,8 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         
         let unreadTeamMessages = Array(self.unreadTeamMessages.value)
         
-        let teamID = NSNumber(longLong: Int64(team))
-        
-        let predicate = NSPredicate(format: "team.id == %@ AND id IN %@", teamID, unreadTeamMessages)
+        //NSPredicate(format: "team.id == %@ AND id IN %@", NSNumber(longLong: Int64(team)), unreadTeamMessages)
+        let predicate: CoreSummit.Predicate = "team.id" == Int64(team) &&& "id".`in`(unreadTeamMessages)
         
         return try context.count(TeamMessageManagedObject.self, predicate: predicate)
     }
@@ -436,7 +443,7 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
     
     public func applicationReceivedRemoteMessage(remoteMessage: FIRMessagingRemoteMessage) {
         
-        process(remoteMessage.appData as! [String: String])
+        process(remoteMessage.appData as! [String: AnyObject])
     }
     
     // MARK: - NSFetchedResultsControllerDelegate
@@ -445,28 +452,51 @@ public final class PushNotificationManager: NSObject, NSFetchedResultsController
         
         let identifier = (anObject as! Entity).identifier
         
-        let topic: Notification.Topic
-        
-        if controller === teamsFetchedResultsController {
-            
-            topic = .team(identifier)
+        if controller == teamsFetchedResultsController
+            || controller == eventsFetchedResultsController {
             
-        } else if controller == eventsFetchedResultsController {
+            let topic: Notification.Topic
             
-            topic = .event(identifier)
+            if controller === teamsFetchedResultsController {
+                
+                topic = .team(identifier)
+                
+            } else if controller == eventsFetchedResultsController {
+                
+                topic = .event(identifier)
+                
+            } else {
+                
+                fatalError("Unknown fetched results controller \(controller)")
+            }
             
-        } else {
+            switch type {
+                
+            case .Insert: subscribe(to: topic)
+                
+            case .Delete: unsubscribe(from: topic)
+                
+            case .Move, .Update: break
+            }
             
-            fatalError("Unknown fetched results controller \(controller)")
-        }
-        
-        switch type {
+        } else if controller == notificationsFetchedResultsController {
             
-        case .Insert: subscribe(to: topic)
+            switch type {
+                
+            case .Delete:
+                
+                // remove unread notification from set since it was deleted
+                if unreadNotifications.value.contains(identifier) {
+                    
+                    unreadNotifications.value.remove(identifier)
+                }
+                
+            case .Insert, .Move, .Update: break
+            }
             
-        case .Delete: unsubscribe(from: topic)
+        } else {
             
-        case .Move, .Update: break
+            fatalError("Unknown fetched results controller \(controller)")
         }
     }
     
@@ -537,14 +567,14 @@ public protocol PushNotification {
     
     var created: Date { get }
     
-    init?(pushNotification: [String: String])
+    init?(pushNotification: [String: AnyObject])
 }
 
 public struct TeamMessageNotification: PushNotification {
     
     private enum Key: String {
         
-        case to, id, type, body, from_id, from_first_name, from_last_name, created_at
+        case from, id, type, body, from_id, from_first_name, from_last_name, created_at
     }
     
     public static let type = PushNotificationType.team
@@ -559,23 +589,23 @@ public struct TeamMessageNotification: PushNotification {
     
     public let from: (idenfitier: Identifier, firstName: String, lastName: String)
     
-    public init?(pushNotification: [String: String]) {
+    public init?(pushNotification: [String: AnyObject]) {
         
-        guard let topicString = pushNotification[Key.to.rawValue],
+        guard let topicString = pushNotification[Key.from.rawValue] as? String,
             let topic = Notification.Topic(rawValue: topicString),
-            let typeString = pushNotification[Key.type.rawValue],
+            let typeString = pushNotification[Key.type.rawValue] as? String,
             let type = PushNotificationType(rawValue: typeString),
             case let .team(team) = topic,
-            let identifierString = pushNotification[Key.id.rawValue],
+            let identifierString = pushNotification[Key.id.rawValue] as? String,
             let identifier = Int(identifierString),
-            let encodedBody = pushNotification[Key.body.rawValue],
+            let encodedBody = pushNotification[Key.body.rawValue] as? String,
             let body = String(openStackEncoded: encodedBody),
-            let createdString = pushNotification[Key.created_at.rawValue],
+            let createdString = pushNotification[Key.created_at.rawValue] as? String,
             let created = Int(createdString),
-            let fromIDString = pushNotification[Key.from_id.rawValue],
+            let fromIDString = pushNotification[Key.from_id.rawValue] as? String,
             let fromID = Int(fromIDString),
-            let fromFirstName = pushNotification[Key.from_first_name.rawValue],
-            let fromLastName = pushNotification[Key.from_last_name.rawValue]
+            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
             else { return nil }
         
@@ -603,7 +633,7 @@ public struct GeneralNotification: PushNotification {
     
     private enum Key: String {
         
-        case to, id, type, body, summit_id, channel, created_at, event_id, title
+        case from, to, id, type, body, summit_id, channel, created_at, event_id, title
     }
     
     public static let type = PushNotificationType.notification
@@ -622,20 +652,20 @@ public struct GeneralNotification: PushNotification {
     
     public let event: (identifier: Identifier, title: String)?
     
-    public init?(pushNotification: [String: String]) {
+    public init?(pushNotification: [String: AnyObject]) {
         
-        guard let topicString = pushNotification[Key.to.rawValue],
+        guard let topicString = pushNotification[Key.from.rawValue] as? String ?? pushNotification[Key.to.rawValue] as? String,
             let topic = Notification.Topic(rawValue: topicString),
-            let typeString = pushNotification[Key.type.rawValue],
+            let typeString = pushNotification[Key.type.rawValue] as? String,
             let type = PushNotificationType(rawValue: typeString),
-            let identifierString = pushNotification[Key.id.rawValue],
+            let identifierString = pushNotification[Key.id.rawValue] as? String,
             let identifier = Int(identifierString),
-            let body = pushNotification[Key.body.rawValue],
-            let createdString = pushNotification[Key.created_at.rawValue],
+            let body = pushNotification[Key.body.rawValue] as? String,
+            let createdString = pushNotification[Key.created_at.rawValue] as? String,
             let created = Int(createdString),
-            let summitIDString = pushNotification[Key.summit_id.rawValue],
+            let summitIDString = pushNotification[Key.summit_id.rawValue] as? String,
             let summitID = Int(summitIDString),
-            let channelString = pushNotification[Key.channel.rawValue],
+            let channelString = pushNotification[Key.channel.rawValue] as? String,
             let channel = Notification.Channel(rawValue: channelString)
             where type == self.dynamicType.type
             else { return nil }
@@ -651,9 +681,9 @@ public struct GeneralNotification: PushNotification {
             
         case .event:
             
-            guard let eventIDString = pushNotification[Key.event_id.rawValue],
+            guard let eventIDString = pushNotification[Key.event_id.rawValue] as? String,
                 let eventID = Int(eventIDString),
-                let eventTitle = pushNotification[Key.title.rawValue]
+                let eventTitle = pushNotification[Key.title.rawValue] as? String
                 else { return nil }
             
             self.event = (eventID, eventTitle)
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist b/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist
index 85cd485f..a0a43e71 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.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/OpenStack Summit/OpenStackSummitWatch/Info.plist b/OpenStack Summit/OpenStackSummitWatch/Info.plist
index a77beea8..4f4bafb1 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.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>