Merge pull request #23 from pvzig/feature/client-improvements

Feature/client-improvements
Readme updates
2016-03-22 21:44:20 -04:00 · 2016-03-22 21:38:17 -04:00 · 2016-03-22 21:34:45 -04:00 · 2016-03-22 21:29:16 -04:00 · 2016-03-22 20:56:10 -04:00 · 2016-03-22 20:50:29 -04:00
33 changed files with 3572 additions and 917 deletions
@@ -16,6 +16,8 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+.build
+Packages/

 # CocoaPods
 #
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 Peter Zignego
+Copyright (c) 2016 Peter Zignego

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -0,0 +1,40 @@
+//
+//  AppDelegate.swift
+//  OSX-Sample
+//
+//  Created by Peter Zignego on 2/18/16.
+//  Copyright © 2016 Launch Software LLC. All rights reserved.
+//
+
+import Cocoa
+import SlackKit
+
+@NSApplicationMain
+class AppDelegate: NSObject, NSApplicationDelegate, SlackEventsDelegate {
+
+    @IBOutlet weak var window: NSWindow!
+
+    let client = Client(apiToken: "")
+    
+    func applicationDidFinishLaunching(aNotification: NSNotification) {
+        client.connect()
+        client.slackEventsDelegate = self
+    }
+    
+    func applicationWillTerminate(aNotification: NSNotification) {
+        // Insert code here to tear down your application
+    }
+    
+    func clientConnected() {
+        
+    }
+    
+    func clientDisconnected() {}
+    func preferenceChanged(preference: String, value: AnyObject) {}
+    func userChanged(user: User) {}
+    func presenceChanged(user: User?, presence: String?) {}
+    func manualPresenceChanged(user: User?, presence: String?) {}
+    func botEvent(bot: Bot) {}
+
+}
+
@@ -0,0 +1,58 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6233" systemVersion="14A329f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6233"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target">
+            <connections>
+                <outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+            <items>
+                <menuItem title="OSX-Sample" id="1Xt-HY-uBw">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="OSX-Sample" systemMenu="apple" id="uQy-DD-JDr">
+                        <items>
+                            <menuItem title="About OSX-Sample" id="5kV-Vb-QxS">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
+                            <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
+                            <menuItem title="Services" id="NMo-om-nkz">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
+                            <menuItem title="Hide OSX-Sample" keyEquivalent="h" id="Olw-nP-bQN">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="Kd2-mp-pUS">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
+                            <menuItem title="Quit OSX-Sample" keyEquivalent="q" id="4sb-4s-VLi">
+                                <connections>
+                                    <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="dMs-cI-mzQ">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="File" id="bib-Uj-vzu">
+                        <items>
+                            <menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
+                                <connections>
+                                    <action selector="newDocument:" target="-1" id="4Si-XN-c54"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="bVn-NM-KNZ"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="tXI-mr-wws">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="vNY-rz-j42">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="Daa-9d-B3U"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
+                            <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="HmO-Ls-i7Q"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
+                                <connections>
+                                    <action selector="saveDocument:" target="-1" id="teZ-XB-qJY"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
+                                <connections>
+                                    <action selector="saveDocumentAs:" target="-1" id="mDf-zr-I0C"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Revert to Saved" id="KaW-ft-85H">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="revertDocumentToSaved:" target="-1" id="iJ3-Pv-kwq"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
+                            <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="runPageLayout:" target="-1" id="Din-rz-gC5"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
+                                <connections>
+                                    <action selector="print:" target="-1" id="qaZ-4w-aoO"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="5QF-Oa-p0T">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Edit" id="W48-6f-4Dl">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="M6e-cu-g7V"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
+                                <connections>
+                                    <action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
+                            <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="YJe-68-I9s"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="G1f-GL-Joy"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="pa3-QI-u2k">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
+                            <menuItem title="Find" id="4EN-yA-p0u">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Find" id="1b7-l0-nxx">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
+                                    <items>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
+                                        <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="9ic-FL-obx">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
+                                    <items>
+                                        <menuItem title="Show Substitutions" id="z6F-FW-3nz">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
+                                        <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" id="hQb-2v-fYv">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Dashes" id="rgM-f4-ycn">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" id="cwL-P1-jid">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Data Detectors" id="tRr-pd-1PS">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Text Replacement" id="HFQ-gK-NFA">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Transformations" id="2oI-Rn-ZJC">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
+                                    <items>
+                                        <menuItem title="Make Upper Case" id="vmV-6d-7jI">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Make Lower Case" id="d9M-CD-aMd">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Capitalize" id="UEZ-Bs-lqG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="xrE-MZ-jX0">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Format" id="jxT-CU-nIS">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Format" id="GEO-Iw-cKr">
+                        <items>
+                            <menuItem title="Font" id="Gi5-1S-RQB">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
+                                    <items>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
+                                            <connections>
+                                                <action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
+                                            <connections>
+                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
+                                            <connections>
+                                                <action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
+                                            <connections>
+                                                <action selector="underline:" target="-1" id="FYS-2b-JAY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
+                                            <connections>
+                                                <action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
+                                            <connections>
+                                                <action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
+                                        <menuItem title="Kern" id="jBQ-r6-VK2">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Kern" id="tlD-Oa-oAM">
+                                                <items>
+                                                    <menuItem title="Use Default" id="GUa-eO-cwY">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardKerning:" target="-1" id="6dk-9l-Ckg"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="cDB-IK-hbR">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffKerning:" target="-1" id="U8a-gz-Maa"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Tighten" id="46P-cB-AYj">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="tightenKerning:" target="-1" id="hr7-Nz-8ro"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Loosen" id="ogc-rX-tC1">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="loosenKerning:" target="-1" id="8i4-f9-FKE"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Ligatures" id="o6e-r0-MWq">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
+                                                <items>
+                                                    <menuItem title="Use Default" id="agt-UL-0e3">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardLigatures:" target="-1" id="7uR-wd-Dx6"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="J7y-lM-qPV">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffLigatures:" target="-1" id="iX2-gA-Ilz"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use All" id="xQD-1f-W4t">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useAllLigatures:" target="-1" id="KcB-kA-TuK"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Baseline" id="OaQ-X3-Vso">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Baseline" id="ijk-EB-dga">
+                                                <items>
+                                                    <menuItem title="Use Default" id="3Om-Ey-2VK">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="unscript:" target="-1" id="0vZ-95-Ywn"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Superscript" id="Rqc-34-cIF">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="superscript:" target="-1" id="3qV-fo-wpU"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Subscript" id="I0S-gh-46l">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="subscript:" target="-1" id="Q6W-4W-IGz"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Raise" id="2h7-ER-AoG">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="raiseBaseline:" target="-1" id="4sk-31-7Q9"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Lower" id="1tx-W0-xDw">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowerBaseline:" target="-1" id="OF1-bc-KW4"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
+                                            <connections>
+                                                <action selector="orderFrontColorPanel:" target="-1" id="mSX-Xz-DV3"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
+                                        <menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyFont:" target="-1" id="GJO-xA-L4q"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteFont:" target="-1" id="JfD-CL-leO"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Text" id="Fal-I4-PZk">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Text" id="d9c-me-L2H">
+                                    <items>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
+                                            <connections>
+                                                <action selector="alignLeft:" target="-1" id="zUv-R1-uAa"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
+                                            <connections>
+                                                <action selector="alignCenter:" target="-1" id="spX-mk-kcS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Justify" id="J5U-5w-g23">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="alignJustified:" target="-1" id="ljL-7U-jND"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
+                                            <connections>
+                                                <action selector="alignRight:" target="-1" id="r48-bG-YeY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
+                                        <menuItem title="Writing Direction" id="H1b-Si-o9J">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
+                                                <items>
+                                                    <menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem id="YGs-j5-SAR">
+                                                        <string key="title">	Default</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="qtV-5e-UBP"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem id="Lbh-J2-qVU">
+                                                        <string key="title">	Left to Right</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="S0X-9S-QSf"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem id="jFq-tB-4Kx">
+                                                        <string key="title">	Right to Left</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="5fk-qB-AqJ"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
+                                                    <menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem id="Nop-cj-93Q">
+                                                        <string key="title">	Default</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="lPI-Se-ZHp"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem id="BgM-ve-c93">
+                                                        <string key="title">	Left to Right</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="caW-Bv-w94"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem id="RB4-Sm-HuC">
+                                                        <string key="title">	Right to Left</string>
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="EXD-6r-ZUu"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
+                                        <menuItem title="Show Ruler" id="vLm-3I-IUL">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleRuler:" target="-1" id="FOx-HJ-KwY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyRuler:" target="-1" id="71i-fW-3W2"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteRuler:" target="-1" id="cSh-wd-qM2"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="H8h-7b-M4v">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="View" id="HyV-fh-RgO">
+                        <items>
+                            <menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleToolbarShown:" target="-1" id="BXY-wc-z0C"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="pQI-g3-MTW"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="aUF-d1-5bR">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="R4o-n2-Eq4">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
+                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="wpr-3q-Mcd">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
+                        <items>
+                            <menuItem title="OSX-Sample Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="OSX-Sample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="480" height="360"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+            <view key="contentView" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
+    </objects>
+</document>
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Launch Software LLC. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
@@ -0,0 +1,33 @@
+//
+// Package.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import PackageDescription
+
+let package = Package(
+    name: "SlackKit",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/Starscream.git",
+            majorVersion: 1),
+    ]
+)
@@ -1,10 +1,10 @@
 PODS:
-  - Starscream (1.0.2)
+  - Starscream (1.1.2)

 DEPENDENCIES:
  - Starscream

 SPEC CHECKSUMS:
-  Starscream: 40e2c4c1c770d811f24116b8b7dbeb4542c56767
+  Starscream: 58a12fd35a3cb6aaa105716c2d42765f7c1c732f

 COCOAPODS: 0.39.0
@@ -1,9 +1,24 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
 ##iOS/OS X Slack Client Library
 ###Description
-This is a Slack client library for iOS and OS X written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm).
+This is a Slack client library for iOS and OS X written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible by [bot users](https://api.slack.com/bot-users).

 ###Installation
+####Swift Package Manager
+Add SlackKit to your Package.swift
+
+```swift
+import PackageDescription
+
+let package = Package(
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0)
+    ]
+)
+```
+
+Run `swift-build` on your application’s main directory.
+
 ####CocoaPods
 Add the pod to your podfile:
 ```
@@ -22,17 +37,96 @@ import SlackKit
 ###Usage
 To use SlackKit you'll need a bearer token which identifies a single user. You can generate a [full access token or create one using OAuth 2](https://api.slack.com/web).

-Once you have a token, give it to the Client:
+Once you have a token, initialize a client instance using it:
 ```swift
-Client.sharedInstance.setAuthToken("YOUR_SLACK_AUTH_TOKEN")
+let client = Client(apiToken: "YOUR_SLACK_API_TOKEN")
+
 ```
-and connect:
+
+If you want to receive messages from the Slack RTM API, connect to it.
 ```swift
-Client.sharedInstance.connect()
+client.connect()
 ```
+
+You can also set options for a ping/pong interval, timeout interval, and automatic reconnection:
+```swift
+client.connect(pingInterval: 2, timeout: 10, reconnect: false)
+```
+
 Once connected, the client will begin to consume any messages sent by the Slack RTM API.

+####Web API Methods
+SlackKit currently supports the a subset of the Slack Web APIs that are available to bot users:
+
+- api.test
+- auth.test
+- channels.history
+- channels.info
+- channels.list
+- channels.mark
+- channels.setPurpose
+- channels.setTopic
+- chat.delete
+- chat.postMessage
+- chat.update
+- emoji.list
+- files.comments.add
+- files.comments.edit
+- files.comments.delete
+- files.delete
+- files.upload
+- groups.close
+- groups.history
+- groups.info
+- groups.list
+- groups.mark
+- groups.open
+- groups.setPurpose
+- groups.setTopic
+- im.close
+- im.history
+- im.list
+- im.mark
+- im.open
+- mpim.close
+- mpim.history
+- mpim.list
+- mpim.mark
+- mpim.open
+- pins.add
+- pins.list
+- pins.remove
+- reactions.add
+- reactions.get
+- reactions.list
+- reactions.remove
+- rtm.start
+- stars.add
+- stars.remove
+- team.info
+- users.getPresence
+- users.info
+- users.list
+- users.setActive
+- users.setPresence
+
+They can be accessed through a Client object’s `webAPI` property:
+```swift
+client.webAPI.authenticationTest({
+(authenticated) -> Void in
+		print(authenticated)
+	}){(error) -> Void in
+	    print(error)
+}
+```
+
 ####Delegate methods
+
+To receive delegate callbacks for certain events, register an object as the delegate for those events:
+```swift
+client.slackEventsDelegate = self
+```
+
 There are a number of delegates that you can set to receive callbacks for certain events.

 #####SlackEventsDelegate
@@ -101,8 +195,8 @@ func itemStarred(item: Item, star: Bool)

 #####ReactionEventsDelegate
 ```swift
-func reactionAdded(reaction: String?, item: Item?)
-func reactionRemoved(reaction: String?, item: Item?)
+func reactionAdded(reaction: String?, item: Item?, itemUser: String?)
+func reactionRemoved(reaction: String?, item: Item?, itemUser: String?)
 ```

 #####TeamEventsDelegate
@@ -123,18 +217,6 @@ func subteamSelfAdded(subteamID: String)
 func subteamSelfRemoved(subteamID: String)
 ```

-###Examples
-####Sending a Message:
-```swift
-Client.sharedInstance.sendMessage(message: "Hello, world!", channelID: "CHANNEL_ID")
-```
-
-####Print a List of Users in a Channel:
-```swift
-let users = Client.sharedInstance.channels?["CHANNEL_ID"]?.members
-print(users)
-```
-
 ###Get In Touch
 [@pvzig](https://twitter.com/pvzig)

@@ -1,7 +1,7 @@
 //
 // SlackKit.h
 //
-// Copyright © 2015 Peter Zignego. All rights reserved.
+// Copyright © 2016 Peter Zignego. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = "SlackKit"
-  s.version          = "0.9.5"
+  s.version          = "0.9.9"
  s.summary          = "a Slack client library for iOS and OS X written in Swift"
  s.homepage         = "https://github.com/pvzig/SlackKit"
  s.license          = 'MIT'
@@ -10,7 +10,8 @@ Pod::Spec.new do |s|
  s.ios.deployment_target = '8.0'
  s.osx.deployment_target = '10.9'
  s.requires_arc = true
-  s.source_files = 'SlackKit/*.swift'  
+  s.source_files = 'SlackKit/Sources/*.swift'  
  s.frameworks = 'Foundation'
-  s.dependency 'Starscream', '~> 1.0.2'
+  s.dependency 'Starscream', '~> 1.1.2'
 end
+
@@ -7,45 +7,70 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		2661A68F1BBF60E60026F67B /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6821BBF60E60026F67B /* Bot.swift */; };
-		2661A6901BBF60E60026F67B /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6831BBF60E60026F67B /* Channel.swift */; };
-		2661A6911BBF60E60026F67B /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6841BBF60E60026F67B /* Client.swift */; };
-		2661A6921BBF60E60026F67B /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6851BBF60E60026F67B /* Event.swift */; };
-		2661A6931BBF60E60026F67B /* EventDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6861BBF60E60026F67B /* EventDispatcher.swift */; };
-		2661A6941BBF60E60026F67B /* EventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6871BBF60E60026F67B /* EventHandler.swift */; };
-		2661A6951BBF60E60026F67B /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6881BBF60E60026F67B /* File.swift */; };
-		2661A6971BBF60E60026F67B /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68A1BBF60E60026F67B /* Message.swift */; };
-		2661A6991BBF60E60026F67B /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68C1BBF60E60026F67B /* Team.swift */; };
-		2661A69A1BBF60E60026F67B /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68D1BBF60E60026F67B /* Types.swift */; };
-		2661A69B1BBF60E60026F67B /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68E1BBF60E60026F67B /* User.swift */; };
-		26EB95961C285CEE00BD1F13 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EB95951C285CEE00BD1F13 /* EventDelegate.swift */; };
-		26EB959D1C2F10CA00BD1F13 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */; };
+		2601D61B1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */; };
+		2601D6271C7688610012BF22 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D6261C7688610012BF22 /* AppDelegate.swift */; };
+		2601D6291C7688610012BF22 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2601D6281C7688610012BF22 /* Assets.xcassets */; };
+		2601D62C1C7688610012BF22 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2601D62A1C7688610012BF22 /* MainMenu.xib */; };
+		260EC2331C4DC61D0093B253 /* ClientExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2301C4DC61D0093B253 /* ClientExtensions.swift */; };
+		260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2311C4DC61D0093B253 /* NetworkInterface.swift */; };
+		260EC2351C4DC61D0093B253 /* SlackWebAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */; };
+		26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
+		26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
+		26BBA1961C398E3C00BF7225 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
+		26BBA1971C398E3C00BF7225 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18A1C398E3C00BF7225 /* Event.swift */; };
+		26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */; };
+		26BBA1991C398E3C00BF7225 /* EventDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */; };
+		26BBA19A1C398E3C00BF7225 /* EventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18D1C398E3C00BF7225 /* EventHandler.swift */; };
+		26BBA19B1C398E3C00BF7225 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18E1C398E3C00BF7225 /* File.swift */; };
+		26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18F1C398E3C00BF7225 /* Message.swift */; };
+		26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1901C398E3C00BF7225 /* Team.swift */; };
+		26BBA19E1C398E3C00BF7225 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1911C398E3C00BF7225 /* Types.swift */; };
+		26BBA19F1C398E3C00BF7225 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1921C398E3C00BF7225 /* User.swift */; };
+		26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1931C398E3C00BF7225 /* UserGroup.swift */; };
+		26DF40351C7A0FA300E19241 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26DF40341C7A0FA300E19241 /* Attachment.swift */; };
 		FFE3AC870D1C42EF276CCA2D /* Pods_SlackKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 407A2ABFC0611867E2BE34D0 /* Pods_SlackKit.framework */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
+		2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPIErrorDispatcher.swift; path = Sources/SlackWebAPIErrorDispatcher.swift; sourceTree = "<group>"; };
+		2601D6241C7688610012BF22 /* OSX-Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OSX-Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2601D6261C7688610012BF22 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		2601D6281C7688610012BF22 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		2601D62B1C7688610012BF22 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		2601D62D1C7688610012BF22 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		26072A341BB48B3A00CD650C /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		2661A6821BBF60E60026F67B /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bot.swift; sourceTree = "<group>"; };
-		2661A6831BBF60E60026F67B /* Channel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = "<group>"; };
-		2661A6841BBF60E60026F67B /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		2661A6851BBF60E60026F67B /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
-		2661A6861BBF60E60026F67B /* EventDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDispatcher.swift; sourceTree = "<group>"; };
-		2661A6871BBF60E60026F67B /* EventHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventHandler.swift; sourceTree = "<group>"; };
-		2661A6881BBF60E60026F67B /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
-		2661A68A1BBF60E60026F67B /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
-		2661A68C1BBF60E60026F67B /* Team.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Team.swift; sourceTree = "<group>"; };
-		2661A68D1BBF60E60026F67B /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = "<group>"; };
-		2661A68E1BBF60E60026F67B /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		260EC2301C4DC61D0093B253 /* ClientExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ClientExtensions.swift; path = Sources/ClientExtensions.swift; sourceTree = "<group>"; };
+		260EC2311C4DC61D0093B253 /* NetworkInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NetworkInterface.swift; path = Sources/NetworkInterface.swift; sourceTree = "<group>"; };
+		260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPI.swift; path = Sources/SlackWebAPI.swift; sourceTree = "<group>"; };
 		2661A6A41BBF62FF0026F67B /* SlackKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlackKit.h; sourceTree = "<group>"; };
 		266E05F01BBF780C00840D76 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		26EB95951C285CEE00BD1F13 /* EventDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDelegate.swift; sourceTree = "<group>"; };
-		26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserGroup.swift; sourceTree = "<group>"; };
+		26BBA1871C398E3C00BF7225 /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Bot.swift; path = Sources/Bot.swift; sourceTree = "<group>"; };
+		26BBA1881C398E3C00BF7225 /* Channel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Channel.swift; path = Sources/Channel.swift; sourceTree = "<group>"; };
+		26BBA1891C398E3C00BF7225 /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Client.swift; path = Sources/Client.swift; sourceTree = "<group>"; };
+		26BBA18A1C398E3C00BF7225 /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Event.swift; path = Sources/Event.swift; sourceTree = "<group>"; };
+		26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventDelegate.swift; path = Sources/EventDelegate.swift; sourceTree = "<group>"; };
+		26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventDispatcher.swift; path = Sources/EventDispatcher.swift; sourceTree = "<group>"; };
+		26BBA18D1C398E3C00BF7225 /* EventHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventHandler.swift; path = Sources/EventHandler.swift; sourceTree = "<group>"; };
+		26BBA18E1C398E3C00BF7225 /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = File.swift; path = Sources/File.swift; sourceTree = "<group>"; };
+		26BBA18F1C398E3C00BF7225 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Message.swift; path = Sources/Message.swift; sourceTree = "<group>"; };
+		26BBA1901C398E3C00BF7225 /* Team.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Team.swift; path = Sources/Team.swift; sourceTree = "<group>"; };
+		26BBA1911C398E3C00BF7225 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Types.swift; path = Sources/Types.swift; sourceTree = "<group>"; };
+		26BBA1921C398E3C00BF7225 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = Sources/User.swift; sourceTree = "<group>"; };
+		26BBA1931C398E3C00BF7225 /* UserGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserGroup.swift; path = Sources/UserGroup.swift; sourceTree = "<group>"; };
+		26DF40341C7A0FA300E19241 /* Attachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Attachment.swift; path = Sources/Attachment.swift; sourceTree = "<group>"; };
 		407A2ABFC0611867E2BE34D0 /* Pods_SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4347F92F3932C96C23B10B2A /* Pods-SlackKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlackKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-SlackKit/Pods-SlackKit.release.xcconfig"; sourceTree = "<group>"; };
 		F59B6A12F1C4C4E24C58E1BF /* Pods-SlackKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlackKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SlackKit/Pods-SlackKit.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
+		2601D6211C7688610012BF22 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		26072A301BB48B3A00CD650C /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -66,10 +91,22 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		2601D6251C7688610012BF22 /* OSX-Sample */ = {
+			isa = PBXGroup;
+			children = (
+				2601D6261C7688610012BF22 /* AppDelegate.swift */,
+				2601D6281C7688610012BF22 /* Assets.xcassets */,
+				2601D62A1C7688610012BF22 /* MainMenu.xib */,
+				2601D62D1C7688610012BF22 /* Info.plist */,
+			);
+			path = "OSX-Sample";
+			sourceTree = "<group>";
+		};
 		26072A2A1BB48B3A00CD650C = {
 			isa = PBXGroup;
 			children = (
 				2661A6811BBF60E60026F67B /* SlackKit */,
+				2601D6251C7688610012BF22 /* OSX-Sample */,
 				26072A351BB48B3A00CD650C /* Products */,
 				0C2928E508A686B69F9F0117 /* Pods */,
 				CA70A3A1A9A1A259960DFBCF /* Frameworks */,
@@ -80,6 +117,7 @@
 			isa = PBXGroup;
 			children = (
 				26072A341BB48B3A00CD650C /* SlackKit.framework */,
+				2601D6241C7688610012BF22 /* OSX-Sample.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -87,19 +125,24 @@
 		2661A6811BBF60E60026F67B /* SlackKit */ = {
 			isa = PBXGroup;
 			children = (
-				2661A6821BBF60E60026F67B /* Bot.swift */,
-				2661A6831BBF60E60026F67B /* Channel.swift */,
-				2661A6841BBF60E60026F67B /* Client.swift */,
-				2661A6851BBF60E60026F67B /* Event.swift */,
-				2661A6861BBF60E60026F67B /* EventDispatcher.swift */,
-				2661A6871BBF60E60026F67B /* EventHandler.swift */,
-				26EB95951C285CEE00BD1F13 /* EventDelegate.swift */,
-				2661A6881BBF60E60026F67B /* File.swift */,
-				2661A68A1BBF60E60026F67B /* Message.swift */,
-				2661A68C1BBF60E60026F67B /* Team.swift */,
-				2661A68D1BBF60E60026F67B /* Types.swift */,
-				2661A68E1BBF60E60026F67B /* User.swift */,
-				26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */,
+				26DF40341C7A0FA300E19241 /* Attachment.swift */,
+				26BBA1871C398E3C00BF7225 /* Bot.swift */,
+				26BBA1881C398E3C00BF7225 /* Channel.swift */,
+				26BBA1891C398E3C00BF7225 /* Client.swift */,
+				260EC2301C4DC61D0093B253 /* ClientExtensions.swift */,
+				26BBA18A1C398E3C00BF7225 /* Event.swift */,
+				26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */,
+				26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */,
+				26BBA18D1C398E3C00BF7225 /* EventHandler.swift */,
+				26BBA18E1C398E3C00BF7225 /* File.swift */,
+				26BBA18F1C398E3C00BF7225 /* Message.swift */,
+				260EC2311C4DC61D0093B253 /* NetworkInterface.swift */,
+				260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */,
+				2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */,
+				26BBA1901C398E3C00BF7225 /* Team.swift */,
+				26BBA1911C398E3C00BF7225 /* Types.swift */,
+				26BBA1921C398E3C00BF7225 /* User.swift */,
+				26BBA1931C398E3C00BF7225 /* UserGroup.swift */,
 				2661A6A41BBF62FF0026F67B /* SlackKit.h */,
 				266E05F01BBF780C00840D76 /* Info.plist */,
 			);
@@ -127,6 +170,23 @@
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
+		2601D6231C7688610012BF22 /* OSX-Sample */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2601D62E1C7688610012BF22 /* Build configuration list for PBXNativeTarget "OSX-Sample" */;
+			buildPhases = (
+				2601D6201C7688610012BF22 /* Sources */,
+				2601D6211C7688610012BF22 /* Frameworks */,
+				2601D6221C7688610012BF22 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "OSX-Sample";
+			productName = "OSX-Sample";
+			productReference = 2601D6241C7688610012BF22 /* OSX-Sample.app */;
+			productType = "com.apple.product-type.application";
+		};
 		26072A331BB48B3A00CD650C /* SlackKit */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 26072A3C1BB48B3B00CD650C /* Build configuration list for PBXNativeTarget "SlackKit" */;
@@ -153,10 +213,13 @@
 		26072A2B1BB48B3A00CD650C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0700;
+				LastSwiftUpdateCheck = 0720;
 				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Launch Software LLC";
 				TargetAttributes = {
+					2601D6231C7688610012BF22 = {
+						CreatedOnToolsVersion = 7.2.1;
+					};
 					26072A331BB48B3A00CD650C = {
 						CreatedOnToolsVersion = 7.0;
 					};
@@ -168,6 +231,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 26072A2A1BB48B3A00CD650C;
 			productRefGroup = 26072A351BB48B3A00CD650C /* Products */;
@@ -175,11 +239,21 @@
 			projectRoot = "";
 			targets = (
 				26072A331BB48B3A00CD650C /* SlackKit */,
+				2601D6231C7688610012BF22 /* OSX-Sample */,
 			);
 		};
 /* End PBXProject section */

 /* Begin PBXResourcesBuildPhase section */
+		2601D6221C7688610012BF22 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2601D6291C7688610012BF22 /* Assets.xcassets in Resources */,
+				2601D62C1C7688610012BF22 /* MainMenu.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		26072A321BB48B3A00CD650C /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -223,29 +297,79 @@
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
+		2601D6201C7688610012BF22 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2601D6271C7688610012BF22 /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		26072A2F1BB48B3A00CD650C /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2661A69A1BBF60E60026F67B /* Types.swift in Sources */,
-				2661A6901BBF60E60026F67B /* Channel.swift in Sources */,
-				2661A6921BBF60E60026F67B /* Event.swift in Sources */,
-				2661A6971BBF60E60026F67B /* Message.swift in Sources */,
-				2661A6991BBF60E60026F67B /* Team.swift in Sources */,
-				2661A69B1BBF60E60026F67B /* User.swift in Sources */,
-				2661A6951BBF60E60026F67B /* File.swift in Sources */,
-				2661A6931BBF60E60026F67B /* EventDispatcher.swift in Sources */,
-				2661A6911BBF60E60026F67B /* Client.swift in Sources */,
-				2661A6941BBF60E60026F67B /* EventHandler.swift in Sources */,
-				2661A68F1BBF60E60026F67B /* Bot.swift in Sources */,
-				26EB959D1C2F10CA00BD1F13 /* UserGroup.swift in Sources */,
-				26EB95961C285CEE00BD1F13 /* EventDelegate.swift in Sources */,
+				26BBA1991C398E3C00BF7225 /* EventDispatcher.swift in Sources */,
+				26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */,
+				26BBA19F1C398E3C00BF7225 /* User.swift in Sources */,
+				26BBA19E1C398E3C00BF7225 /* Types.swift in Sources */,
+				26BBA1961C398E3C00BF7225 /* Client.swift in Sources */,
+				26BBA19A1C398E3C00BF7225 /* EventHandler.swift in Sources */,
+				26BBA1971C398E3C00BF7225 /* Event.swift in Sources */,
+				26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */,
+				26BBA19B1C398E3C00BF7225 /* File.swift in Sources */,
+				260EC2351C4DC61D0093B253 /* SlackWebAPI.swift in Sources */,
+				26DF40351C7A0FA300E19241 /* Attachment.swift in Sources */,
+				26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */,
+				26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */,
+				260EC2331C4DC61D0093B253 /* ClientExtensions.swift in Sources */,
+				26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */,
+				2601D61B1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift in Sources */,
+				260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */,
+				26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */

+/* Begin PBXVariantGroup section */
+		2601D62A1C7688610012BF22 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2601D62B1C7688610012BF22 /* Base */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
+		2601D62F1C7688610012BF22 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "OSX-Sample/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "LS.OSX-Sample";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		2601D6301C7688610012BF22 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "OSX-Sample/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "LS.OSX-Sample";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		26072A3A1BB48B3B00CD650C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -374,6 +498,15 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
+		2601D62E1C7688610012BF22 /* Build configuration list for PBXNativeTarget "OSX-Sample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2601D62F1C7688610012BF22 /* Debug */,
+				2601D6301C7688610012BF22 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		26072A2E1BB48B3A00CD650C /* Build configuration list for PBXProject "SlackKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1,159 +0,0 @@
-//
-// EventDispatcher.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct EventDispatcher {
-    
-    static func eventDispatcher(event: [String: AnyObject]) {
-        let event = Event(event: event)
-        if let type = event.type {
-            switch type {
-            case .Hello:
-                EventHandler.connected()
-            case .Ok:
-                EventHandler.messageSent(event)
-            case .Message:
-                if (event.subtype != nil) {
-                    messageDispatcher(event)
-                } else {
-                    EventHandler.messageReceived(event)
-                }
-            case .UserTyping:
-                EventHandler.userTyping(event)
-            case .ChannelMarked, .IMMarked, .GroupMarked:
-                EventHandler.channelMarked(event)
-            case .ChannelCreated, .IMCreated:
-                EventHandler.channelCreated(event)
-            case .ChannelJoined, .GroupJoined:
-                EventHandler.channelJoined(event)
-            case .ChannelLeft, .GroupLeft:
-                EventHandler.channelLeft(event)
-            case .ChannelDeleted:
-                EventHandler.channelDeleted(event)
-            case .ChannelRenamed, .GroupRename:
-                EventHandler.channelRenamed(event)
-            case .ChannelArchive, .GroupArchive:
-                EventHandler.channelArchived(event, archived: true)
-            case .ChannelUnarchive, .GroupUnarchive:
-                EventHandler.channelArchived(event, archived: false)
-            case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
-                EventHandler.channelHistoryChanged(event)
-            case .DNDUpdated:
-                EventHandler.doNotDisturbUpdated(event)
-            case .DNDUpatedUser:
-                EventHandler.doNotDisturbUserUpdated(event)
-            case .IMOpen, .GroupOpen:
-                EventHandler.open(event, open: true)
-            case .IMClose, .GroupClose:
-                EventHandler.open(event, open: false)
-            case .FileCreated:
-                EventHandler.processFile(event)
-            case .FileShared:
-                EventHandler.processFile(event)
-            case .FileUnshared:
-                EventHandler.processFile(event)
-            case .FilePublic:
-                EventHandler.processFile(event)
-            case .FilePrivate:
-                EventHandler.filePrivate(event)
-            case .FileChanged:
-                EventHandler.processFile(event)
-            case .FileDeleted:
-                EventHandler.deleteFile(event)
-            case .FileCommentAdded:
-                EventHandler.fileCommentAdded(event)
-            case .FileCommentEdited:
-                EventHandler.fileCommentEdited(event)
-            case .FileCommentDeleted:
-                EventHandler.fileCommentDeleted(event)
-            case .PinAdded:
-                EventHandler.pinAdded(event)
-            case .PinRemoved:
-                EventHandler.pinRemoved(event)
-            case .PresenceChange:
-                EventHandler.presenceChange(event)
-            case .ManualPresenceChange:
-                EventHandler.manualPresenceChange(event)
-            case .PrefChange:
-                EventHandler.changePreference(event)
-            case .UserChange:
-                EventHandler.userChange(event)
-            case .TeamJoin:
-                EventHandler.teamJoin(event)
-            case .StarAdded:
-                EventHandler.itemStarred(event, star: true)
-            case .StarRemoved:
-                EventHandler.itemStarred(event, star: false)
-            case .ReactionAdded:
-                EventHandler.addedReaction(event)
-            case .ReactionRemoved:
-                EventHandler.removedReaction(event)
-            case .EmojiChanged:
-                EventHandler.emojiChanged(event)
-            case .CommandsChanged:
-                // Not implemented per Slack documentation.
-                break
-            case .TeamPlanChange:
-                EventHandler.teamPlanChange(event)
-            case .TeamPrefChange:
-                EventHandler.teamPreferenceChange(event)
-            case .TeamRename:
-                EventHandler.teamNameChange(event)
-            case .TeamDomainChange:
-                EventHandler.teamDomainChange(event)
-            case .EmailDomainChange:
-                EventHandler.emailDomainChange(event)
-            case .BotAdded:
-                EventHandler.bot(event)
-            case .BotChanged:
-                EventHandler.bot(event)
-            case .AccountsChanged:
-                // Not implemented per Slack documentation.
-                break
-            case .TeamMigrationStarted:
-                Client.sharedInstance.connect()
-            case .SubteamCreated, .SubteamUpdated:
-                EventHandler.subteam(event)
-            case .SubteamSelfAdded:
-                EventHandler.subteamAddedSelf(event)
-            case.SubteamSelfRemoved:
-                EventHandler.subteamRemovedSelf(event)
-            case .Error:
-                print("Error: \(event)")
-                break
-            }
-        }
-    }
-    
-    static func messageDispatcher(event:Event) {
-        let subtype = MessageSubtype(rawValue: event.subtype!)!
-        switch subtype {
-        case .MessageChanged:
-            EventHandler.messageChanged(event)
-        case .MessageDeleted:
-            EventHandler.messageDeleted(event)
-        default:
-            EventHandler.messageReceived(event)
-        }
-    }
-    
-}
@@ -1,599 +0,0 @@
-//
-// EventHandler.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-internal struct EventHandler {
-    
-    //MARK: - Initial connection
-    static func connected() {
-        Client.sharedInstance.connected = true
-        
-        if let delegate = Client.sharedInstance.slackEventsDelegate {
-            delegate.clientConnected()
-        }
-    }
-    
-    //MARK: - Messages
-    
-    static func messageSent(event: Event) {
-        if let reply = event.replyTo, message = Client.sharedInstance.sentMessages[reply], channel = message.channel, ts = message.ts {
-            message.ts = event.ts
-            message.text = event.text
-            Client.sharedInstance.channels[channel]?.messages[ts] = message
-            
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
-                delegate.messageSent(message)
-            }
-        }
-    }
-    
-    static func messageReceived(event: Event) {
-        if let channel = event.channel, message = event.message, id = channel.id, ts = message.ts {
-            Client.sharedInstance.channels[id]?.messages[ts] = message
-            
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
-                delegate.messageReceived(message)
-            }
-        }
-    }
-    
-    static func messageChanged(event: Event) {
-        if let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts {
-            Client.sharedInstance.channels[id]?.messages[ts] = nested
-            
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
-                delegate.messageChanged(nested)
-            }
-        }
-    }
-    
-    static func messageDeleted(event: Event) {
-        if let id = event.channel?.id, key = event.message?.deletedTs {
-            let message = Client.sharedInstance.channels[id]?.messages[key]
-            Client.sharedInstance.channels[id]?.messages.removeValueForKey(key)
-            
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
-                delegate.messageDeleted(message)
-            }
-        }
-    }
-    
-    //MARK: - Channels
-    static func userTyping(event: Event) {
-        if let channelID = event.channel?.id, userID = event.user?.id {
-            if let _ = Client.sharedInstance.channels[channelID] {
-                if (!Client.sharedInstance.channels[channelID]!.usersTyping.contains(userID)) {
-                    Client.sharedInstance.channels[channelID]?.usersTyping.append(userID)
-                    
-                    if let delegate = Client.sharedInstance.channelEventsDelegate {
-                        delegate.userTyping(event.channel, user: event.user)
-                    }
-                }
-            }
-            
-            let timeout = dispatch_time(DISPATCH_TIME_NOW, Int64(5.0 * Double(NSEC_PER_SEC)))
-            dispatch_after(timeout, dispatch_get_main_queue()) {
-                if let index = Client.sharedInstance.channels[channelID]?.usersTyping.indexOf(userID) {
-                    Client.sharedInstance.channels[channelID]?.usersTyping.removeAtIndex(index)
-                }
-            }
-        }
-    }
-    
-    static func channelMarked(event: Event) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.lastRead = event.ts
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelMarked(channel, timestamp: event.ts)
-            }
-        }
-        //TODO: Recalculate unreads
-    }
-    
-    static func channelCreated(event: Event) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id] = channel
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelCreated(channel)
-            }
-        }
-    }
-    
-    static func channelDeleted(event: Event) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels.removeValueForKey(id)
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelDeleted(channel)
-            }
-        }
-    }
-    
-    static func channelJoined(event: Event) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id] = event.channel
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelJoined(channel)
-            }
-        }
-    }
-    
-    static func channelLeft(event: Event) {
-        if let channel = event.channel, id = channel.id, userID = Client.sharedInstance.authenticatedUser?.id {
-            if let index = Client.sharedInstance.channels[id]?.members.indexOf(userID) {
-                Client.sharedInstance.channels[id]?.members.removeAtIndex(index)
-                
-                if let delegate = Client.sharedInstance.channelEventsDelegate {
-                    delegate.channelLeft(channel)
-                }
-            }
-        }
-    }
-    
-    static func channelRenamed(event: Event) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.name = channel.name
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelRenamed(channel)
-            }
-        }
-    }
-    
-    static func channelArchived(event: Event, archived: Bool) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.isArchived = archived
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelArchived(channel)
-            }
-        }
-    }
-    
-    static func channelHistoryChanged(event: Event) {
-        if let channel = event.channel {
-            //TODO: Reload chat history if there are any cached messages before latest
-            
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
-                delegate.channelHistoryChanged(channel)
-            }
-        }
-    }
-    
-    //MARK: - Do Not Disturb
-    static func doNotDisturbUpdated(event: Event) {
-        if let dndStatus = event.dndStatus {
-            Client.sharedInstance.authenticatedUser?.doNotDisturbStatus = dndStatus
-            
-            if let delegate = Client.sharedInstance.doNotDisturbEventsDelegate {
-                delegate.doNotDisturbUpdated(dndStatus)
-            }
-        }
-    }
-    
-    static func doNotDisturbUserUpdated(event: Event) {
-        if let dndStatus = event.dndStatus, user = event.user, id = user.id {
-            Client.sharedInstance.users[id]?.doNotDisturbStatus = dndStatus
-            
-            if let delegate = Client.sharedInstance.doNotDisturbEventsDelegate {
-                delegate.doNotDisturbUserUpdated(dndStatus, user: user)
-            }
-        }
-    }
-    
-    //MARK: - IM & Group Open/Close
-    static func open(event: Event, open: Bool) {
-        if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.isOpen = open
-            
-            if let delegate = Client.sharedInstance.groupEventsDelegate {
-                delegate.groupOpened(channel)
-            }
-        }
-    }
-    
-    //MARK: - Files
-    static func processFile(event: Event) {
-        if let file = event.file, id = file.id {
-            if let comment = file.initialComment, commentID = comment.id {
-                if Client.sharedInstance.files[id]?.comments[commentID] == nil {
-                    Client.sharedInstance.files[id]?.comments[commentID] = comment
-                }
-            }
-            
-            Client.sharedInstance.files[id] = file
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileProcessed(file)
-            }
-        }
-    }
-    
-    static func filePrivate(event: Event) {
-        if let file =  event.file, id = file.id {
-            Client.sharedInstance.files[id]?.isPublic = false
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileMadePrivate(file)
-            }
-        }
-    }
-    
-    static func deleteFile(event: Event) {
-        if let file = event.file, id = file.id {
-            if Client.sharedInstance.files[id] != nil {
-                Client.sharedInstance.files.removeValueForKey(id)
-            }
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileDeleted(file)
-            }
-        }
-    }
-    
-    static func fileCommentAdded(event: Event) {
-        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID] = comment
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileCommentAdded(file, comment: comment)
-            }
-        }
-    }
-    
-    static func fileCommentEdited(event: Event) {
-        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID]?.comment = comment.comment
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileCommentEdited(file, comment: comment)
-            }
-        }
-    }
-    
-    static func fileCommentDeleted(event: Event) {
-        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments.removeValueForKey(commentID)
-            
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
-                delegate.fileCommentDeleted(file, comment: comment)
-            }
-        }
-    }
-    
-    //MARK: - Pins
-    static func pinAdded(event: Event) {
-        if let id = event.channelID, item = event.item {
-            Client.sharedInstance.channels[id]?.pinnedItems.append(item)
-            
-            if let delegate = Client.sharedInstance.pinEventsDelegate {
-                delegate.itemPinned(item, channel: Client.sharedInstance.channels[id])
-            }
-        }
-    }
-    
-    static func pinRemoved(event: Event) {
-        if let id = event.channelID {
-            if let pins = Client.sharedInstance.channels[id]?.pinnedItems.filter({$0 != event.item}) {
-                Client.sharedInstance.channels[id]?.pinnedItems = pins
-            }
-            
-            if let delegate = Client.sharedInstance.pinEventsDelegate {
-                delegate.itemUnpinned(event.item, channel: Client.sharedInstance.channels[id])
-            }
-        }
-    }
-    
-    //MARK: - Stars
-    static func itemStarred(event: Event, star: Bool) {
-        if let item = event.item, type = item.type {
-            switch type {
-            case "message":
-                starMessage(item, star: star)
-            case "file":
-                starFile(item, star: star)
-            case "file_comment":
-                starComment(item)
-            default:
-                break
-            }
-            
-            if let delegate = Client.sharedInstance.starEventsDelegate {
-                delegate.itemStarred(item, star: star)
-            }
-        }
-    }
-    
-    static func starMessage(item: Item, star: Bool) {
-        if let message = item.message, ts = message.ts, channel = item.channel {
-            if let _ = Client.sharedInstance.channels[channel]?.messages[ts] {
-                Client.sharedInstance.channels[channel]?.messages[ts]?.isStarred = star
-            }
-        }
-    }
-    
-    static func starFile(item: Item, star: Bool) {
-        if let file = item.file, id = file.id {
-            Client.sharedInstance.files[id]?.isStarred = star
-            if let stars = Client.sharedInstance.files[id]?.stars {
-                if star == true {
-                    Client.sharedInstance.files[id]?.stars = stars + 1
-                } else {
-                    if stars > 0 {
-                        Client.sharedInstance.files[id]?.stars = stars - 1
-                    }
-                }
-            }
-        }
-    }
-    
-    static func starComment(item: Item) {
-        if let file = item.file, id = file.id, comment = item.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID] = comment
-        }
-    }
-    
-    //MARK: - Reactions
-    static func addedReaction(event: Event) {
-        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
-            switch type {
-            case "message":
-                if let channel = item.channel, ts = item.ts {
-                    if let message = Client.sharedInstance.channels[channel]?.messages[ts] {
-                        if (message.reactions[key]) == nil {
-                            message.reactions[key] = Reaction(name: event.reaction, user: userID)
-                        } else {
-                            message.reactions[key]?.users[userID] = userID
-                        }
-                    }
-                }
-            case "file":
-                if let id = item.file?.id, var file = Client.sharedInstance.files[id] {
-                    if file.reactions[key] == nil {
-                        Client.sharedInstance.files[id]?.reactions[key] = Reaction(name: event.reaction, user: userID)
-                    } else {
-                        Client.sharedInstance.files[id]?.reactions[key]?.users[userID] = userID
-                    }
-                }
-            case "file_comment":
-                if let id = item.file?.id, var file = Client.sharedInstance.files[id], let commentID = item.fileCommentID {
-                    if file.comments[commentID]?.reactions[key] == nil {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key] = Reaction(name: event.reaction, user: userID)
-                    } else {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users[userID] = userID
-                    }
-                }
-                break
-            default:
-                break
-            }
-            
-            if let delegate = Client.sharedInstance.reactionEventsDelegate {
-                delegate.reactionAdded(event.reaction, item: event.item)
-            }
-        }
-    }
-    
-    static func removedReaction(event: Event) {
-        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
-            switch type {
-            case "message":
-                if let channel = item.channel, ts = item.ts {
-                    if let message = Client.sharedInstance.channels[channel]?.messages[ts] {
-                        if (message.reactions[key]) != nil {
-                            message.reactions[key]?.users.removeValueForKey(userID)
-                        }
-                        if (message.reactions[key]?.users.count == 0) {
-                            message.reactions.removeValueForKey(key)
-                        }
-                    }
-                }
-            case "file":
-                if let itemFile = item.file, id = itemFile.id, var file = Client.sharedInstance.files[id] {
-                    if file.reactions[key] != nil {
-                        Client.sharedInstance.files[id]?.reactions[key]?.users.removeValueForKey(userID)
-                    }
-                    if Client.sharedInstance.files[id]?.reactions[key]?.users.count == 0 {
-                        Client.sharedInstance.files[id]?.reactions.removeValueForKey(key)
-                    }
-                }
-            case "file_comment":
-                if let id = item.file?.id, var file = Client.sharedInstance.files[id], let commentID = item.fileCommentID {
-                    if file.comments[commentID]?.reactions[key] != nil {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users.removeValueForKey(userID)
-                    }
-                    if Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users.count == 0 {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions.removeValueForKey(key)
-                    }
-                }
-                break
-            default:
-                break
-            }
-            
-            if let delegate = Client.sharedInstance.reactionEventsDelegate {
-                delegate.reactionAdded(event.reaction, item: event.item)
-            }
-        }
-    }
-    
-    //MARK: - Preferences
-    static func changePreference(event: Event) {
-        if let name = event.name {
-            Client.sharedInstance.authenticatedUser?.preferences?[name] = event.value
-            
-            if let delegate = Client.sharedInstance.slackEventsDelegate, value = event.value {
-                delegate.preferenceChanged(name, value: value)
-            }
-        }
-    }
-    
-    //Mark: - User Change
-    static func userChange(event: Event) {
-        if var user = event.user, let id = user.id {
-            user.preferences = Client.sharedInstance.users[id]?.preferences
-            Client.sharedInstance.users[id] = user
-            
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
-                delegate.userChanged(user)
-            }
-        }
-    }
-    
-    //MARK: - User Presence
-    static func presenceChange(event: Event) {
-        if let user = event.user, id = user.id {
-            Client.sharedInstance.users[id]?.presence = event.presence
-            
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
-                delegate.presenceChanged(user, presence: event.presence)
-            }
-        }
-    }
-    
-    //MARK: - Team
-    static func teamJoin(event: Event) {
-        if let user = event.user, id = user.id {
-            Client.sharedInstance.users[id] = user
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
-                delegate.teamJoined(user)
-            }
-        }
-    }
-    
-    static func teamPlanChange(event: Event) {
-        if let plan = event.plan {
-            Client.sharedInstance.team?.plan = plan
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
-                delegate.teamPlanChanged(plan)
-            }
-        }
-    }
-    
-    static func teamPreferenceChange(event: Event) {
-        if let name = event.name {
-            Client.sharedInstance.team?.prefs?[name] = event.value
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate, value = event.value {
-                delegate.teamPreferencesChanged(name, value: value)
-            }
-        }
-    }
-    
-    static func teamNameChange(event: Event) {
-        if let name = event.name {
-            Client.sharedInstance.team?.name = name
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
-                delegate.teamNameChanged(name)
-            }
-        }
-    }
-    
-    static func teamDomainChange(event: Event) {
-        if let domain = event.domain {
-            Client.sharedInstance.team?.domain = domain
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
-                delegate.teamDomainChanged(domain)
-            }
-        }
-    }
-    
-    static func emailDomainChange(event: Event) {
-        if let domain = event.emailDomain {
-            Client.sharedInstance.team?.emailDomain = domain
-            
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
-                delegate.teamEmailDomainChanged(domain)
-            }
-        }
-    }
-    
-    static func emojiChanged(event: Event) {
-        //TODO: Call emoji.list here
-        
-        if let delegate = Client.sharedInstance.teamEventsDelegate {
-            delegate.teamEmojiChanged()
-        }
-    }
-    
-    //MARK: - Bots
-    static func bot(event: Event) {
-        if let bot = event.bot, id = bot.id {
-            Client.sharedInstance.bots[id] = bot
-            
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
-                delegate.botEvent(bot)
-            }
-        }
-    }
-    
-    //MARK: - Subteams
-    static func subteam(event: Event) {
-        if let subteam = event.subteam, id = subteam.id {
-            Client.sharedInstance.userGroups[id] = subteam
-            
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
-                delegate.subteamEvent(subteam)
-            }
-        }
-        
-    }
-    
-    static func subteamAddedSelf(event: Event) {
-        if let subteamID = event.subteamID, _ = Client.sharedInstance.authenticatedUser?.userGroups {
-            Client.sharedInstance.authenticatedUser?.userGroups![subteamID] = subteamID
-            
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
-                delegate.subteamSelfAdded(subteamID)
-            }
-        }
-    }
-    
-    static func subteamRemovedSelf(event: Event) {
-        if let subteamID = event.subteamID {
-            Client.sharedInstance.authenticatedUser?.userGroups?.removeValueForKey(subteamID)
-            
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
-                delegate.subteamSelfRemoved(subteamID)
-            }
-        }
-    }
-    
-    //MARK: - Authenticated User
-    static func manualPresenceChange(event: Event) {
-        Client.sharedInstance.authenticatedUser?.presence = event.presence
-        
-        if let delegate = Client.sharedInstance.slackEventsDelegate {
-            delegate.manualPresenceChanged(Client.sharedInstance.authenticatedUser, presence: event.presence)
-        }
-    }
-    
-}
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.9.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -0,0 +1,88 @@
+//
+// Attachment.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+public struct Attachment {
+    
+    public let fallback: String?
+    public let color: String?
+    public let pretext: String?
+    public let authorName: String?
+    public let authorLink: String?
+    public let authorIcon: String?
+    public let title: String?
+    public let titleLink: String?
+    public let text: String?
+    public let fields: [[String: AnyObject]]?
+    public let imageURL: String?
+    public let thumbURL: String?
+
+    internal init?(attachment: [String: AnyObject]?) {
+        fallback = attachment?["fallback"] as? String
+        color = attachment?["color"] as? String
+        pretext = attachment?["pretext"] as? String
+        authorName = attachment?["author_name"] as? String
+        authorLink = attachment?["author_link"] as? String
+        authorIcon = attachment?["author_icon"] as? String
+        title = attachment?["title"] as? String
+        titleLink = attachment?["title_link"] as? String
+        text = attachment?["text"] as? String
+        fields = attachment?["fields"] as? [[String: AnyObject]]
+        imageURL = attachment?["image_url"] as? String
+        thumbURL = attachment?["thumb_url"] as? String
+    }
+    
+    public init?(fallback: String, title:String, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [[String: AnyObject]]? = nil, imageURL: String? = nil, thumbURL: String? = nil) {
+        self.fallback = fallback
+        self.color = colorHex
+        self.pretext = pretext
+        self.authorName = authorName
+        self.authorLink = authorLink
+        self.authorIcon = authorIcon
+        self.title = title
+        self.titleLink = titleLink
+        self.text = text
+        self.fields = fields
+        self.imageURL = imageURL
+        self.thumbURL = thumbURL
+    }
+    
+    internal func dictionary() -> [String: AnyObject] {
+        var attachment = [String: AnyObject]()
+        attachment["fallback"] = fallback
+        attachment["color"] = color
+        attachment["pretext"] = pretext
+        attachment["authorName"] = authorName
+        attachment["author_link"] = authorLink
+        attachment["author_icon"] = authorIcon
+        attachment["title"] = title
+        attachment["title_link"] = titleLink
+        attachment["text"] = text
+        attachment["fields"] = fields
+        attachment["image_url"] = imageURL
+        attachment["thumb_url"] = thumbURL
+        return attachment
+    }
+    
+}
@@ -43,7 +43,7 @@ public struct Channel {
    internal(set) public var unread: Int?
    internal(set) public var unreadCountDisplay: Int?
    internal(set) public var hasPins: Bool?
-    internal(set) public var members = [String]()
+    internal(set) public var members: [String]?
    // Client use
    internal(set) public var pinnedItems = [Item]()
    internal(set) public var usersTyping = [String]()
@@ -70,11 +70,7 @@ public struct Channel {
        unread = channel?["unread_count"] as? Int
        unreadCountDisplay = channel?["unread_count_display"] as? Int
        hasPins = channel?["has_pins"] as? Bool
-        
-        if let members = channel?["members"] as? [String] {
-            self.members = members
-        }
-        
+        members = channel?["members"] as? [String]
    }
    
    internal init?(id:String?) {
@@ -50,59 +50,72 @@ public class Client: WebSocketDelegate {
    public var reactionEventsDelegate: ReactionEventsDelegate?
    public var teamEventsDelegate: TeamEventsDelegate?
    public var subteamEventsDelegate: SubteamEventsDelegate?
-
-    private var token = "SLACK_AUTH_TOKEN"
+    public var teamProfileEventsDelegate: TeamProfileEventsDelegate?
+    
+    internal var token = "SLACK_AUTH_TOKEN"
+    
    public func setAuthToken(token: String) {
        self.token = token
    }
    
-    private var webSocket: WebSocket?
+    public var webAPI: SlackWebAPI {
+        return SlackWebAPI(client: self)
+    }
+
+    internal var webSocket: WebSocket?
+    internal let api = NetworkInterface()
+    private var dispatcher: EventDispatcher?
    
-    required public init() {
-        
+    private let pingPongQueue = dispatch_queue_create("com.launchsoft.SlackKit", DISPATCH_QUEUE_SERIAL)
+    internal var ping: Double?
+    internal var pong: Double?
+    
+    internal var pingInterval: NSTimeInterval?
+    internal var timeout: NSTimeInterval?
+    internal var reconnect: Bool?
+    
+    required public init(apiToken: String) {
+        self.token = apiToken
    }
    
-    public static let sharedInstance = Client()
+    public func connect(pingInterval pingInterval: NSTimeInterval? = nil, timeout: NSTimeInterval? = nil, reconnect: Bool? = nil) {
+        self.pingInterval = pingInterval
+        self.timeout = timeout
+        self.reconnect = reconnect
+        dispatcher = EventDispatcher(client: self)
+        webAPI.rtmStart(success: {
+            (response) -> Void in
+            self.initialSetup(response)
+            if let socketURL = response["url"] as? String {
+                let url = NSURL(string: socketURL)
+                self.webSocket = WebSocket(url: url!)
+                self.webSocket?.delegate = self
+                self.webSocket?.connect()
+            }
+            }, failure:nil)
+    }
    
-    //MARK: - Connection
-    public func connect() {
-        let request = NSURLRequest(URL: NSURL(string:"https://slack.com/api/rtm.start?token="+token)!)
-        NSURLConnection.sendAsynchronousRequest(request, queue: NSOperationQueue.currentQueue()!) {
-            (response, data, error) -> Void in
-            guard let data = data else {
-                return
-            }
-            do {
-                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
-                if (result["ok"] as! Bool == true) {
-                    self.initialSetup(result)
-                    let socketURL = NSURL(string: result["url"] as! String)
-                    self.webSocket = WebSocket(url: socketURL!)
-                    self.webSocket?.delegate = self
-                    self.webSocket?.connect()
-                }
-            } catch _ {
-                print(error)
-            }
-        }
+    public func disconnect() {
+        webSocket?.disconnect()
    }
    
    //MARK: - Message send
    public func sendMessage(message: String, channelID: String) {
        if (connected) {
            if let data = formatMessageToSlackJsonString(msg: message, channel: channelID) {
-                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-                self.webSocket?.writeString(string as! String)
+                if let string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
+                    webSocket?.writeString(string)
+                }
            }
        }
    }
    
    private func formatMessageToSlackJsonString(message: (msg: String, channel: String)) -> NSData? {
        let json: [String: AnyObject] = [
-            "id": NSDate().timeIntervalSince1970,
+            "id": NSDate().slackTimestamp(),
            "type": "message",
            "channel": message.channel,
-            "text": slackFormatEscaping(message.msg)
+            "text": message.msg.slackFormatEscaping()
        ]
        addSentMessage(json)
        do {
@@ -123,15 +136,54 @@ public class Client: WebSocketDelegate {
        sentMessages[ts!.stringValue] = Message(message: message)
    }
    
-    private func slackFormatEscaping(string: String) -> String {
-        var escapedString = string.stringByReplacingOccurrencesOfString("&", withString: "&amp;")
-        escapedString = escapedString.stringByReplacingOccurrencesOfString("<", withString: "&lt;")
-        escapedString = escapedString.stringByReplacingOccurrencesOfString(">", withString: "&gt;")
-        return escapedString
+    //MARK: - RTM Ping
+    private func pingRTMServerAtInterval(interval: NSTimeInterval) {
+        let delay = dispatch_time(DISPATCH_TIME_NOW, Int64(interval * Double(NSEC_PER_SEC)))
+        dispatch_after(delay, pingPongQueue, {
+            if self.connected && self.timeoutCheck() {
+                self.sendRTMPing()
+                self.pingRTMServerAtInterval(interval)
+            } else {
+                self.disconnect()
+            }
+        })
+    }
+    
+    private func sendRTMPing() {
+        if connected {
+            let json: [String: AnyObject] = [
+                "id": NSDate().slackTimestamp(),
+                "type": "ping",
+            ]
+            do {
+                let data = try NSJSONSerialization.dataWithJSONObject(json, options: NSJSONWritingOptions.PrettyPrinted)
+                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
+                if let writePing = string as? String {
+                    ping = json["id"] as? Double
+                    webSocket?.writeString(writePing)
+                }
+            }
+            catch _ {
+                
+            }
+        }
+    }
+    
+    private func timeoutCheck() -> Bool {
+        if let pong = pong, ping = ping, timeout = timeout {
+            if pong - ping < timeout {
+                return true
+            } else {
+                return false
+            }
+        // Ping-pong or timeout not configured
+        } else {
+            return true
+        }
    }
    
    //MARK: - Client setup
-    private func initialSetup(json: [String: AnyObject]) {
+    internal func initialSetup(json: [String: AnyObject]) {
        team = Team(team: json["team"] as? [String: AnyObject])
        authenticatedUser = User(user: json["self"] as? [String: AnyObject])
        authenticatedUser?.doNotDisturbStatus = DoNotDisturbStatus(status: json["dnd"] as? [String: AnyObject])
@@ -144,7 +196,7 @@ public class Client: WebSocketDelegate {
        enumerateSubteams(json["subteams"] as? [String: AnyObject])
    }
    
-    private func enumerateUsers(users: [AnyObject]?) {
+    internal func enumerateUsers(users: [AnyObject]?) {
        if let users = users {
            for user in users {
                let u = User(user: user as? [String: AnyObject])
@@ -153,7 +205,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateChannels(channels: [AnyObject]?) {
+    internal func enumerateChannels(channels: [AnyObject]?) {
        if let channels = channels {
            for channel in channels {
                let c = Channel(channel: channel as? [String: AnyObject])
@@ -162,7 +214,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateGroups(groups: [AnyObject]?) {
+    internal func enumerateGroups(groups: [AnyObject]?) {
        if let groups = groups {
            for group in groups {
                let g = Channel(channel: group as? [String: AnyObject])
@@ -171,7 +223,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateIMs(ims: [AnyObject]?) {
+    internal func enumerateIMs(ims: [AnyObject]?) {
        if let ims = ims {
            for im in ims {
                let i = Channel(channel: im as? [String: AnyObject])
@@ -180,7 +232,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateMPIMs(mpims: [AnyObject]?) {
+    internal func enumerateMPIMs(mpims: [AnyObject]?) {
        if let mpims = mpims {
            for mpim in mpims {
                let m = Channel(channel: mpim as? [String: AnyObject])
@@ -189,7 +241,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateBots(bots: [AnyObject]?) {
+    internal func enumerateBots(bots: [AnyObject]?) {
        if let bots = bots {
            for bot in bots {
                let b = Bot(bot: bot as? [String: AnyObject])
@@ -198,7 +250,7 @@ public class Client: WebSocketDelegate {
        }
    }
    
-    private func enumerateSubteams(subteams: [String: AnyObject]?) {
+    internal func enumerateSubteams(subteams: [String: AnyObject]?) {
        if let subteams = subteams {
            if let all = subteams["all"] as? [[String: AnyObject]] {
                for item in all {
@@ -217,14 +269,20 @@ public class Client: WebSocketDelegate {
    
    // MARK: - WebSocketDelegate
    public func websocketDidConnect(socket: WebSocket) {
+        if let pingInterval = pingInterval {
+            pingRTMServerAtInterval(pingInterval)
+        }
    }
    
    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
        connected = false
        authenticated = false
        webSocket = nil
-        if let delegate = slackEventsDelegate {
-            delegate.clientDisconnected()
+        dispatcher = nil
+        authenticatedUser = nil
+        slackEventsDelegate?.clientDisconnected()
+        if reconnect == true {
+            connect(pingInterval: pingInterval, timeout: timeout, reconnect: reconnect)
        }
    }
    
@@ -233,14 +291,15 @@ public class Client: WebSocketDelegate {
            return
        }
        do {
-            try EventDispatcher.eventDispatcher(NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as! [String: AnyObject])
+            if let json = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as? [String: AnyObject] {
+                dispatcher?.dispatch(json)
+            }
        }
        catch _ {
            
        }
    }
    
-    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {
-    }
+    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {}
    
 }
@@ -0,0 +1,77 @@
+//
+// ClientExtensions.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+extension Client {
+    
+    //MARK: - User & Channel
+    public func getChannelIDByName(name: String) -> String? {
+        return channels.filter{$0.1.name == stripString(name)}.first?.0
+    }
+    
+    public func getUserIDByName(name: String) -> String? {
+        return users.filter{$0.1.name == stripString(name)}.first?.0
+    }
+    
+    public func getImIDForUserWithID(id: String, success: (imID: String?)->Void, failure: (error: SlackError)->Void) {
+        let ims = channels.filter{$0.1.isIM == true}
+        let channel = ims.filter{$0.1.user == id}.first
+        if let channel = channel {
+            success(imID: channel.0)
+        } else {
+            webAPI.openIM(id, success: success, failure: failure)
+        }
+    }
+    
+    //MARK: - Utilities
+    internal func stripString(string: String) -> String? {
+        var strippedString: String?
+        if string[string.startIndex] == "@" {
+            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
+        } else if string[string.startIndex] == "#" {
+            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
+        }
+        return strippedString
+    }
+    
+}
+
+internal extension String {
+    
+    func slackFormatEscaping() -> String {
+        var escapedString = stringByReplacingOccurrencesOfString("&", withString: "&amp;")
+        escapedString = stringByReplacingOccurrencesOfString("<", withString: "&lt;")
+        escapedString = stringByReplacingOccurrencesOfString(">", withString: "&gt;")
+        return escapedString
+    }
+
+}
+
+public extension NSDate {
+    
+    func slackTimestamp() -> Double {
+        return NSNumber(double: timeIntervalSince1970).doubleValue
+    }
+
+}
@@ -62,6 +62,7 @@ internal enum EventType: String {
    case FileCommentDeleted = "file_comment_deleted"
    case PinAdded = "pin_added"
    case PinRemoved = "pin_removed"
+    case Pong = "pong"
    case PresenceChange = "presence_change"
    case ManualPresenceChange = "manual_presence_change"
    case PrefChange = "pref_change"
@@ -78,10 +79,14 @@ internal enum EventType: String {
    case TeamRename = "team_rename"
    case TeamDomainChange = "team_domain_change"
    case EmailDomainChange = "email_domain_change"
+    case TeamProfileChange = "team_profile_change"
+    case TeamProfileDelete = "team_profile_delete"
+    case TeamProfileReorder = "team_profile_reorder"
    case BotAdded = "bot_added"
    case BotChanged = "bot_changed"
    case AccountsChanged = "accounts_changed"
    case TeamMigrationStarted = "team_migration_started"
+    case ReconnectURL = "reconnect_url"
    case SubteamCreated = "subteam_created"
    case SubteamUpdated = "subteam_updated"
    case SubteamSelfAdded = "subteam_self_added"
@@ -138,7 +143,7 @@ internal struct Event {
    let domain: String?
    let emailDomain: String?
    let reaction: String?
-    let replyTo: String?
+    let replyTo: Double?
    let reactions: [[String: AnyObject]]?
    let edited: Edited?
    let bot: Bot?
@@ -148,10 +153,12 @@ internal struct Event {
    let file: File?
    let message: Message?
    let nestedMessage: Message?
+    let itemUser: String?
    let item: Item?
    let dndStatus: DoNotDisturbStatus?
    let subteam: UserGroup?
    let subteamID: String?
+    var profile: CustomProfile?
    
    init(event:[String: AnyObject]) {
        if let eventType = event["type"] as? String {
@@ -178,16 +185,18 @@ internal struct Event {
        domain = event["domain"] as? String
        emailDomain = event["email_domain"] as? String
        reaction = event["reaction"] as? String
-        replyTo = event["reply_to"] as? String
+        replyTo = event["reply_to"] as? Double
        reactions = event["reactions"] as? [[String: AnyObject]]
        bot = Bot(bot: event["bot"] as? [String: AnyObject])
        edited = Edited(edited:event["edited"] as? [String: AnyObject])
        dndStatus = DoNotDisturbStatus(status: event["dnd_status"] as? [String: AnyObject])
+        itemUser = event["item_user"] as? String
        item = Item(item: event["item"] as? [String: AnyObject])
        subteam = UserGroup(userGroup: event["subteam"] as? [String: AnyObject])
        subteamID = event["subteam_id"] as? String
        message = Message(message: event)
        nestedMessage = Message(message: event["message"] as? [String: AnyObject])
+        profile = CustomProfile(profile: event["profile"] as? [String: AnyObject])
        
        // Comment, Channel, User, and File can come across as Strings or Dictionaries
        if (Comment(comment: event["comment"] as? [String: AnyObject])?.id == nil) {
@@ -80,8 +80,8 @@ public protocol StarEventsDelegate {
 }

 public protocol ReactionEventsDelegate {
-    func reactionAdded(reaction: String?, item: Item?)
-    func reactionRemoved(reaction: String?, item: Item?)
+    func reactionAdded(reaction: String?, item: Item?, itemUser: String?)
+    func reactionRemoved(reaction: String?, item: Item?, itemUser: String?)
 }

 public protocol TeamEventsDelegate {
@@ -99,3 +99,9 @@ public protocol SubteamEventsDelegate {
    func subteamSelfAdded(subteamID: String)
    func subteamSelfRemoved(subteamID: String)
 }
+
+public protocol TeamProfileEventsDelegate {
+    func teamProfileChanged(profile: CustomProfile?)
+    func teamProfileDeleted(profile: CustomProfile?)
+    func teamProfileReordered(profile: CustomProfile?)
+}
@@ -0,0 +1,180 @@
+//
+// EventDispatcher.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+internal class EventDispatcher {
+    let client: Client
+    let handler: EventHandler
+    
+    required init(client: Client) {
+        self.client = client
+        handler = EventHandler(client: client)
+    }
+    
+    func dispatch(event: [String: AnyObject]) {
+        let event = Event(event: event)
+        if let type = event.type {
+            switch type {
+            case .Hello:
+                handler.connected()
+            case .Ok:
+                handler.messageSent(event)
+            case .Message:
+                if (event.subtype != nil) {
+                    messageDispatcher(event)
+                } else {
+                    handler.messageReceived(event)
+                }
+            case .UserTyping:
+                handler.userTyping(event)
+            case .ChannelMarked, .IMMarked, .GroupMarked:
+                handler.channelMarked(event)
+            case .ChannelCreated, .IMCreated:
+                handler.channelCreated(event)
+            case .ChannelJoined, .GroupJoined:
+                handler.channelJoined(event)
+            case .ChannelLeft, .GroupLeft:
+                handler.channelLeft(event)
+            case .ChannelDeleted:
+                handler.channelDeleted(event)
+            case .ChannelRenamed, .GroupRename:
+                handler.channelRenamed(event)
+            case .ChannelArchive, .GroupArchive:
+                handler.channelArchived(event, archived: true)
+            case .ChannelUnarchive, .GroupUnarchive:
+                handler.channelArchived(event, archived: false)
+            case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
+                handler.channelHistoryChanged(event)
+            case .DNDUpdated:
+                handler.doNotDisturbUpdated(event)
+            case .DNDUpatedUser:
+                handler.doNotDisturbUserUpdated(event)
+            case .IMOpen, .GroupOpen:
+                handler.open(event, open: true)
+            case .IMClose, .GroupClose:
+                handler.open(event, open: false)
+            case .FileCreated:
+                handler.processFile(event)
+            case .FileShared:
+                handler.processFile(event)
+            case .FileUnshared:
+                handler.processFile(event)
+            case .FilePublic:
+                handler.processFile(event)
+            case .FilePrivate:
+                handler.filePrivate(event)
+            case .FileChanged:
+                handler.processFile(event)
+            case .FileDeleted:
+                handler.deleteFile(event)
+            case .FileCommentAdded:
+                handler.fileCommentAdded(event)
+            case .FileCommentEdited:
+                handler.fileCommentEdited(event)
+            case .FileCommentDeleted:
+                handler.fileCommentDeleted(event)
+            case .PinAdded:
+                handler.pinAdded(event)
+            case .PinRemoved:
+                handler.pinRemoved(event)
+            case .Pong:
+                handler.pong(event)
+            case .PresenceChange:
+                handler.presenceChange(event)
+            case .ManualPresenceChange:
+                handler.manualPresenceChange(event)
+            case .PrefChange:
+                handler.changePreference(event)
+            case .UserChange:
+                handler.userChange(event)
+            case .TeamJoin:
+                handler.teamJoin(event)
+            case .StarAdded:
+                handler.itemStarred(event, star: true)
+            case .StarRemoved:
+                handler.itemStarred(event, star: false)
+            case .ReactionAdded:
+                handler.addedReaction(event)
+            case .ReactionRemoved:
+                handler.removedReaction(event)
+            case .EmojiChanged:
+                handler.emojiChanged(event)
+            case .CommandsChanged:
+                // This functionality is only used by our web client. 
+                // The other APIs required to support slash command metadata are currently unstable. 
+                // Until they are released other clients should ignore this event.
+                break
+            case .TeamPlanChange:
+                handler.teamPlanChange(event)
+            case .TeamPrefChange:
+                handler.teamPreferenceChange(event)
+            case .TeamRename:
+                handler.teamNameChange(event)
+            case .TeamDomainChange:
+                handler.teamDomainChange(event)
+            case .EmailDomainChange:
+                handler.emailDomainChange(event)
+            case .TeamProfileChange:
+                handler.teamProfileChange(event)
+            case .TeamProfileDelete:
+                handler.teamProfileDeleted(event)
+            case .TeamProfileReorder:
+                handler.teamProfileReordered(event)
+            case .BotAdded:
+                handler.bot(event)
+            case .BotChanged:
+                handler.bot(event)
+            case .AccountsChanged:
+                // The accounts_changed event is used by our web client to maintain a list of logged-in accounts.
+                // Other clients should ignore this event.
+                break
+            case .TeamMigrationStarted:
+                client.connect(pingInterval: client.pingInterval, timeout: client.timeout, reconnect: client.reconnect)
+            case .ReconnectURL:
+                // The reconnect_url event is currently unsupported and experimental.
+                break
+            case .SubteamCreated, .SubteamUpdated:
+                handler.subteam(event)
+            case .SubteamSelfAdded:
+                handler.subteamAddedSelf(event)
+            case.SubteamSelfRemoved:
+                handler.subteamRemovedSelf(event)
+            case .Error:
+                print("Error: \(event)")
+                break
+            }
+        }
+    }
+    
+    func messageDispatcher(event:Event) {
+        let subtype = MessageSubtype(rawValue: event.subtype!)!
+        switch subtype {
+        case .MessageChanged:
+            handler.messageChanged(event)
+        case .MessageDeleted:
+            handler.messageDeleted(event)
+        default:
+            handler.messageReceived(event)
+        }
+    }
+    
+}
@@ -0,0 +1,649 @@
+//
+// EventHandler.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+internal class EventHandler {
+    let client: Client
+    required init(client: Client) {
+        self.client = client
+    }
+    
+    //MARK: - Initial connection
+    func connected() {
+        client.connected = true
+        
+        if let delegate = client.slackEventsDelegate {
+            delegate.clientConnected()
+        }
+    }
+    
+    //MARK: - Pong
+    func pong(event: Event) {
+        client.pong = event.replyTo
+    }
+    
+    //MARK: - Messages
+    func messageSent(event: Event) {
+        if let reply = event.replyTo, message = client.sentMessages[NSNumber(double: reply).stringValue], channel = message.channel, ts = message.ts {
+            message.ts = event.ts
+            message.text = event.text
+            client.channels[channel]?.messages[ts] = message
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageSent(message)
+            }
+        }
+    }
+    
+    func messageReceived(event: Event) {
+        if let channel = event.channel, message = event.message, id = channel.id, ts = message.ts {
+            client.channels[id]?.messages[ts] = message
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageReceived(message)
+            }
+        }
+    }
+    
+    func messageChanged(event: Event) {
+        if let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts {
+            client.channels[id]?.messages[ts] = nested
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageChanged(nested)
+            }
+        }
+    }
+    
+    func messageDeleted(event: Event) {
+        if let id = event.channel?.id, key = event.message?.deletedTs {
+            let message = client.channels[id]?.messages[key]
+            client.channels[id]?.messages.removeValueForKey(key)
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageDeleted(message)
+            }
+        }
+    }
+    
+    //MARK: - Channels
+    func userTyping(event: Event) {
+        if let channelID = event.channel?.id, userID = event.user?.id {
+            if let _ = client.channels[channelID] {
+                if (!client.channels[channelID]!.usersTyping.contains(userID)) {
+                    client.channels[channelID]?.usersTyping.append(userID)
+                    
+                    if let delegate = client.channelEventsDelegate {
+                        delegate.userTyping(event.channel, user: event.user)
+                    }
+                }
+            }
+            
+            let timeout = dispatch_time(DISPATCH_TIME_NOW, Int64(5.0 * Double(NSEC_PER_SEC)))
+            dispatch_after(timeout, dispatch_get_main_queue()) {
+                if let index = self.client.channels[channelID]?.usersTyping.indexOf(userID) {
+                    self.client.channels[channelID]?.usersTyping.removeAtIndex(index)
+                }
+            }
+        }
+    }
+    
+    func channelMarked(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.lastRead = event.ts
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelMarked(channel, timestamp: event.ts)
+            }
+        }
+        //TODO: Recalculate unreads
+    }
+    
+    func channelCreated(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id] = channel
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelCreated(channel)
+            }
+        }
+    }
+    
+    func channelDeleted(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels.removeValueForKey(id)
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelDeleted(channel)
+            }
+        }
+    }
+    
+    func channelJoined(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id] = event.channel
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelJoined(channel)
+            }
+        }
+    }
+    
+    func channelLeft(event: Event) {
+        if let channel = event.channel, id = channel.id, userID = client.authenticatedUser?.id {
+            if let index = client.channels[id]?.members?.indexOf(userID) {
+                client.channels[id]?.members?.removeAtIndex(index)
+                
+                if let delegate = client.channelEventsDelegate {
+                    delegate.channelLeft(channel)
+                }
+            }
+        }
+    }
+    
+    func channelRenamed(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.name = channel.name
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelRenamed(channel)
+            }
+        }
+    }
+    
+    func channelArchived(event: Event, archived: Bool) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.isArchived = archived
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelArchived(channel)
+            }
+        }
+    }
+    
+    func channelHistoryChanged(event: Event) {
+        if let channel = event.channel {
+            //TODO: Reload chat history if there are any cached messages before latest
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelHistoryChanged(channel)
+            }
+        }
+    }
+    
+    //MARK: - Do Not Disturb
+    func doNotDisturbUpdated(event: Event) {
+        if let dndStatus = event.dndStatus {
+            client.authenticatedUser?.doNotDisturbStatus = dndStatus
+            
+            if let delegate = client.doNotDisturbEventsDelegate {
+                delegate.doNotDisturbUpdated(dndStatus)
+            }
+        }
+    }
+    
+    func doNotDisturbUserUpdated(event: Event) {
+        if let dndStatus = event.dndStatus, user = event.user, id = user.id {
+            client.users[id]?.doNotDisturbStatus = dndStatus
+            
+            if let delegate = client.doNotDisturbEventsDelegate {
+                delegate.doNotDisturbUserUpdated(dndStatus, user: user)
+            }
+        }
+    }
+    
+    //MARK: - IM & Group Open/Close
+    func open(event: Event, open: Bool) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.isOpen = open
+            
+            if let delegate = client.groupEventsDelegate {
+                delegate.groupOpened(channel)
+            }
+        }
+    }
+    
+    //MARK: - Files
+    func processFile(event: Event) {
+        if let file = event.file, id = file.id {
+            if let comment = file.initialComment, commentID = comment.id {
+                if client.files[id]?.comments[commentID] == nil {
+                    client.files[id]?.comments[commentID] = comment
+                }
+            }
+            
+            client.files[id] = file
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileProcessed(file)
+            }
+        }
+    }
+    
+    func filePrivate(event: Event) {
+        if let file =  event.file, id = file.id {
+            client.files[id]?.isPublic = false
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileMadePrivate(file)
+            }
+        }
+    }
+    
+    func deleteFile(event: Event) {
+        if let file = event.file, id = file.id {
+            if client.files[id] != nil {
+                client.files.removeValueForKey(id)
+            }
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileDeleted(file)
+            }
+        }
+    }
+    
+    func fileCommentAdded(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID] = comment
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentAdded(file, comment: comment)
+            }
+        }
+    }
+    
+    func fileCommentEdited(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID]?.comment = comment.comment
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentEdited(file, comment: comment)
+            }
+        }
+    }
+    
+    func fileCommentDeleted(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments.removeValueForKey(commentID)
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentDeleted(file, comment: comment)
+            }
+        }
+    }
+    
+    //MARK: - Pins
+    func pinAdded(event: Event) {
+        if let id = event.channelID, item = event.item {
+            client.channels[id]?.pinnedItems.append(item)
+            
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemPinned(item, channel: client.channels[id])
+            }
+        }
+    }
+    
+    func pinRemoved(event: Event) {
+        if let id = event.channelID {
+            if let pins = client.channels[id]?.pinnedItems.filter({$0 != event.item}) {
+                client.channels[id]?.pinnedItems = pins
+            }
+            
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemUnpinned(event.item, channel: client.channels[id])
+            }
+        }
+    }
+    
+    //MARK: - Stars
+    func itemStarred(event: Event, star: Bool) {
+        if let item = event.item, type = item.type {
+            switch type {
+            case "message":
+                starMessage(item, star: star)
+            case "file":
+                starFile(item, star: star)
+            case "file_comment":
+                starComment(item)
+            default:
+                break
+            }
+            
+            if let delegate = client.starEventsDelegate {
+                delegate.itemStarred(item, star: star)
+            }
+        }
+    }
+    
+    func starMessage(item: Item, star: Bool) {
+        if let message = item.message, ts = message.ts, channel = item.channel {
+            if let _ = client.channels[channel]?.messages[ts] {
+                client.channels[channel]?.messages[ts]?.isStarred = star
+            }
+        }
+    }
+    
+    func starFile(item: Item, star: Bool) {
+        if let file = item.file, id = file.id {
+            client.files[id]?.isStarred = star
+            if let stars = client.files[id]?.stars {
+                if star == true {
+                    client.files[id]?.stars = stars + 1
+                } else {
+                    if stars > 0 {
+                        client.files[id]?.stars = stars - 1
+                    }
+                }
+            }
+        }
+    }
+    
+    func starComment(item: Item) {
+        if let file = item.file, id = file.id, comment = item.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID] = comment
+        }
+    }
+    
+    //MARK: - Reactions
+    func addedReaction(event: Event) {
+        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
+            switch type {
+            case "message":
+                if let channel = item.channel, ts = item.ts {
+                    if let message = client.channels[channel]?.messages[ts] {
+                        if (message.reactions[key]) == nil {
+                            message.reactions[key] = Reaction(name: event.reaction, user: userID)
+                        } else {
+                            message.reactions[key]?.users[userID] = userID
+                        }
+                    }
+                }
+            case "file":
+                if let id = item.file?.id, file = client.files[id] {
+                    if file.reactions[key] == nil {
+                        client.files[id]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                    } else {
+                        client.files[id]?.reactions[key]?.users[userID] = userID
+                    }
+                }
+            case "file_comment":
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
+                    if file.comments[commentID]?.reactions[key] == nil {
+                        client.files[id]?.comments[commentID]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                    } else {
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users[userID] = userID
+                    }
+                }
+                break
+            default:
+                break
+            }
+            
+            if let delegate = client.reactionEventsDelegate {
+                delegate.reactionAdded(event.reaction, item: event.item, itemUser: event.itemUser)
+            }
+        }
+    }
+    
+    func removedReaction(event: Event) {
+        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
+            switch type {
+            case "message":
+                if let channel = item.channel, ts = item.ts {
+                    if let message = client.channels[channel]?.messages[ts] {
+                        if (message.reactions[key]) != nil {
+                            message.reactions[key]?.users.removeValueForKey(userID)
+                        }
+                        if (message.reactions[key]?.users.count == 0) {
+                            message.reactions.removeValueForKey(key)
+                        }
+                    }
+                }
+            case "file":
+                if let itemFile = item.file, id = itemFile.id, file = client.files[id] {
+                    if file.reactions[key] != nil {
+                        client.files[id]?.reactions[key]?.users.removeValueForKey(userID)
+                    }
+                    if client.files[id]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.reactions.removeValueForKey(key)
+                    }
+                }
+            case "file_comment":
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
+                    if file.comments[commentID]?.reactions[key] != nil {
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users.removeValueForKey(userID)
+                    }
+                    if client.files[id]?.comments[commentID]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.comments[commentID]?.reactions.removeValueForKey(key)
+                    }
+                }
+                break
+            default:
+                break
+            }
+            
+            if let delegate = client.reactionEventsDelegate {
+                delegate.reactionAdded(event.reaction, item: event.item, itemUser: event.itemUser)
+            }
+        }
+    }
+    
+    //MARK: - Preferences
+    func changePreference(event: Event) {
+        if let name = event.name {
+            client.authenticatedUser?.preferences?[name] = event.value
+            
+            if let delegate = client.slackEventsDelegate, value = event.value {
+                delegate.preferenceChanged(name, value: value)
+            }
+        }
+    }
+    
+    //Mark: - User Change
+    func userChange(event: Event) {
+        if let user = event.user, id = user.id {
+            let preferences = client.users[id]?.preferences
+            client.users[id] = user
+            client.users[id]?.preferences = preferences
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.userChanged(user)
+            }
+        }
+    }
+    
+    //MARK: - User Presence
+    func presenceChange(event: Event) {
+        if let user = event.user, id = user.id {
+            client.users[id]?.presence = event.presence
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.presenceChanged(user, presence: event.presence)
+            }
+        }
+    }
+    
+    //MARK: - Team
+    func teamJoin(event: Event) {
+        if let user = event.user, id = user.id {
+            client.users[id] = user
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamJoined(user)
+            }
+        }
+    }
+    
+    func teamPlanChange(event: Event) {
+        if let plan = event.plan {
+            client.team?.plan = plan
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamPlanChanged(plan)
+            }
+        }
+    }
+    
+    func teamPreferenceChange(event: Event) {
+        if let name = event.name {
+            client.team?.prefs?[name] = event.value
+            
+            if let delegate = client.teamEventsDelegate, value = event.value {
+                delegate.teamPreferencesChanged(name, value: value)
+            }
+        }
+    }
+    
+    func teamNameChange(event: Event) {
+        if let name = event.name {
+            client.team?.name = name
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamNameChanged(name)
+            }
+        }
+    }
+    
+    func teamDomainChange(event: Event) {
+        if let domain = event.domain {
+            client.team?.domain = domain
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamDomainChanged(domain)
+            }
+        }
+    }
+    
+    func emailDomainChange(event: Event) {
+        if let domain = event.emailDomain {
+            client.team?.emailDomain = domain
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamEmailDomainChanged(domain)
+            }
+        }
+    }
+    
+    func emojiChanged(event: Event) {
+        //TODO: Call emoji.list here
+        
+        if let delegate = client.teamEventsDelegate {
+            delegate.teamEmojiChanged()
+        }
+    }
+    
+    //MARK: - Bots
+    func bot(event: Event) {
+        if let bot = event.bot, id = bot.id {
+            client.bots[id] = bot
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.botEvent(bot)
+            }
+        }
+    }
+    
+    //MARK: - Subteams
+    func subteam(event: Event) {
+        if let subteam = event.subteam, id = subteam.id {
+            client.userGroups[id] = subteam
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamEvent(subteam)
+            }
+        }
+        
+    }
+    
+    func subteamAddedSelf(event: Event) {
+        if let subteamID = event.subteamID, _ = client.authenticatedUser?.userGroups {
+            client.authenticatedUser?.userGroups![subteamID] = subteamID
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamSelfAdded(subteamID)
+            }
+        }
+    }
+    
+    func subteamRemovedSelf(event: Event) {
+        if let subteamID = event.subteamID {
+            client.authenticatedUser?.userGroups?.removeValueForKey(subteamID)
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamSelfRemoved(subteamID)
+            }
+        }
+    }
+    
+    //MARK: - Team Profiles
+    func teamProfileChange(event: Event) {
+        for user in client.users {
+            if let fields = event.profile?.fields {
+                for key in fields.keys {
+                    client.users[user.0]?.profile?.customProfile?.fields[key]?.updateProfileField(fields[key])
+                }
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileChanged(event.profile)
+        }
+    }
+    
+    func teamProfileDeleted(event: Event) {
+        for user in client.users {
+            if let id = event.profile?.fields.first?.0 {
+                client.users[user.0]?.profile?.customProfile?.fields[id] = nil
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileDeleted(event.profile)
+        }
+    }
+    
+    func teamProfileReordered(event: Event) {
+        for user in client.users {
+            if let keys = event.profile?.fields.keys {
+                for key in keys {
+                    client.users[user.0]?.profile?.customProfile?.fields[key]?.ordering = event.profile?.fields[key]?.ordering
+                }
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileReordered(event.profile)
+        }
+    }
+    
+    //MARK: - Authenticated User
+    func manualPresenceChange(event: Event) {
+        client.authenticatedUser?.presence = event.presence
+        
+        if let delegate = client.slackEventsDelegate {
+            delegate.manualPresenceChanged(client.authenticatedUser, presence: event.presence)
+        }
+    }
+    
+}
@@ -22,7 +22,7 @@
 // THE SOFTWARE.

 public struct File {
-    
+
    public let id: String?
    public let created: Int?
    public let name: String?
@@ -36,8 +36,6 @@ public struct File {
    public let isExternal: Bool?
    public let externalType: String?
    public let size: Int?
-    public let url: String?
-    public let urlDownload: String?
    public let urlPrivate: String?
    public let urlPrivateDownload: String?
    public let thumb64: String?
@@ -64,7 +62,7 @@ public struct File {
    internal(set) public var comments = [String: Comment]()
    internal(set) public var reactions = [String: Reaction]()
    
-    init?(file:[String: AnyObject]?) {
+    public init?(file:[String: AnyObject]?) {
        id = file?["id"] as? String
        created = file?["created"] as? Int
        name = file?["name"] as? String
@@ -78,8 +76,6 @@ public struct File {
        isExternal = file?["is_external"] as? Bool
        externalType = file?["external_type"] as? String
        size = file?["size"] as? Int
-        url = file?["url"] as? String
-        urlDownload = file?["url_download"] as? String
        urlPrivate = file?["url_private"] as? String
        urlPrivateDownload = file?["url_private_download"] as? String
        thumb64 = file?["thumb_64"] as? String
@@ -109,7 +105,7 @@ public struct File {
        
    }
    
-    init?(id:String?) {
+    internal init?(id:String?) {
        self.id = id
        created = nil
        name = nil
@@ -122,8 +118,6 @@ public struct File {
        isExternal = nil
        externalType = nil
        size = nil
-        url = nil
-        urlDownload = nil
        urlPrivate = nil
        urlPrivateDownload = nil
        thumb64 = nil
@@ -53,8 +53,9 @@ public class Message {
    public let comment: Comment?
    public let file: File?
    internal(set) public var reactions = [String: Reaction]()
+    internal(set) public var attachments: [Attachment] = []
    
-    init?(message: [String: AnyObject]?) {
+    public init?(message: [String: AnyObject]?) {
        subtype = message?["subtype"] as? String
        ts = message?["ts"] as? String
        user = message?["user"] as? String
@@ -76,13 +77,34 @@ public class Message {
        pinnedTo = message?["pinned_to"] as? [String]
        comment = Comment(comment: message?["comment"] as? [String: AnyObject])
        file = File(file: message?["file"] as? [String: AnyObject])
-        if let messageReactions = message?["reactions"] as? [[String: AnyObject]] {
-            for react in messageReactions {
-                let reaction = Reaction(reaction: react)
-                self.reactions[reaction!.name!] = reaction
+        reactions = messageReactions(message?["reactions"] as? [[String: AnyObject]])
+        attachments = messageAttachments(message?["attachments"] as? [[String: AnyObject]])
+    }
+    
+    private func messageReactions(reactions: [[String: AnyObject]]?) -> [String: Reaction] {
+        var returnValue = [String: Reaction]()
+        if let r = reactions {
+            for react in r {
+                if let reaction = Reaction(reaction: react), reactionName = reaction.name {
+                    returnValue[reactionName] = reaction
+                }
            }
        }
+        return returnValue
    }
+    
+    private func messageAttachments(attachments: [[String: AnyObject]]?) -> [Attachment] {
+        var returnValue:[Attachment] = []
+        if let a = attachments {
+            for attachment in a {
+                if let attachment = Attachment(attachment: attachment) {
+                    returnValue.append(attachment)
+                }
+            }
+        }
+        return returnValue
+    }
+    
 }

 extension Message: Equatable {}
@@ -0,0 +1,131 @@
+//
+// NetworkInterface.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+internal struct NetworkInterface {
+    
+    private let apiUrl = "https://slack.com/api/"
+    
+    internal func request(endpoint: SlackAPIEndpoint, token: String, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString += requestStringFromParameters(params)
+        }
+        let request = NSURLRequest(URL: NSURL(string: requestString)!)
+        NSURLSession.sharedSession().dataTaskWithRequest(request) {
+            (data, response, internalError) -> Void in
+            guard let data = data else {
+                return
+            }
+            do {
+                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
+                if (result["ok"] as! Bool == true) {
+                    successClosure(result)
+                } else {
+                    if let errorString = result["error"] as? String {
+                        throw ErrorDispatcher.dispatch(errorString)
+                    } else {
+                        throw SlackError.UnknownError
+                    }
+                }
+            } catch let error {
+                if let slackError = error as? SlackError {
+                    errorClosure(slackError)
+                } else {
+                    errorClosure(SlackError.UnknownError)
+                }
+            }
+        }.resume()
+    }
+    
+    internal func uploadRequest(token: String, data: NSData, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(SlackAPIEndpoint.FilesUpload.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + requestStringFromParameters(params)
+        }
+        
+        let request = NSMutableURLRequest(URL: NSURL(string: requestString)!)
+        request.HTTPMethod = "POST"
+        let boundaryConstant = randomBoundary()
+        let contentType = "multipart/form-data; boundary=" + boundaryConstant
+        let boundaryStart = "--\(boundaryConstant)\r\n"
+        let boundaryEnd = "--\(boundaryConstant)--\r\n"
+        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
+        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
+
+        let requestBodyData : NSMutableData = NSMutableData()
+        requestBodyData.appendData(boundaryStart.dataUsingEncoding(NSUTF8StringEncoding)!)
+        requestBodyData.appendData(contentDispositionString.dataUsingEncoding(NSUTF8StringEncoding)!)
+        requestBodyData.appendData(contentTypeString.dataUsingEncoding(NSUTF8StringEncoding)!)
+        requestBodyData.appendData(data)
+        requestBodyData.appendData("\r\n".dataUsingEncoding(NSUTF8StringEncoding)!)
+        requestBodyData.appendData(boundaryEnd.dataUsingEncoding(NSUTF8StringEncoding)!)
+        
+        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        request.HTTPBody = requestBodyData
+
+        NSURLSession.sharedSession().dataTaskWithRequest(request) {
+            (data, response, internalError) -> Void in
+            guard let data = data else {
+                return
+            }
+            do {
+                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
+                if (result["ok"] as! Bool == true) {
+                    successClosure(result)
+                } else {
+                    if let errorString = result["error"] as? String {
+                        throw ErrorDispatcher.dispatch(errorString)
+                    } else {
+                        throw SlackError.UnknownError
+                    }
+                }
+            } catch let error {
+                if let slackError = error as? SlackError {
+                    errorClosure(slackError)
+                } else {
+                    errorClosure(SlackError.UnknownError)
+                }
+            }
+            }.resume()
+    }
+    
+    private func randomBoundary() -> String {
+        return String(format: "slackkit.boundary.%08x%08x", arc4random(), arc4random())
+    }
+    
+    private func requestStringFromParameters(parameters: [String: AnyObject]) -> String {
+        var requestString = ""
+        for key in parameters.keys {
+            if let value = parameters[key] as? String, encodedValue = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLHostAllowedCharacterSet()) {
+                requestString += "&\(key)=\(encodedValue)"
+            } else if let value = parameters[key] as? Int {
+                requestString += "&\(key)=\(value)"
+            }
+        }
+        
+        return requestString
+    }
+    
+}
@@ -0,0 +1,725 @@
+//
+// SlackWebAPI.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+internal enum SlackAPIEndpoint: String {
+    case APITest = "api.test"
+    case AuthTest = "auth.test"
+    case ChannelsHistory = "channels.history"
+    case ChannelsInfo = "channels.info"
+    case ChannelsList = "channels.list"
+    case ChannelsMark = "channels.mark"
+    case ChannelsSetPurpose = "channels.setPurpose"
+    case ChannelsSetTopic = "channels.setTopic"
+    case ChatDelete = "chat.delete"
+    case ChatPostMessage = "chat.postMessage"
+    case ChatUpdate = "chat.update"
+    case DNDInfo = "dnd.info"
+    case DNDTeamInfo = "dnd.teamInfo"
+    case EmojiList = "emoji.list"
+    case FilesCommentsAdd = "files.comments.add"
+    case FilesCommentsEdit = "files.comments.edit"
+    case FilesCommentsDelete = "files.comments.delete"
+    case FilesDelete = "files.delete"
+    case FilesUpload = "files.upload"
+    case GroupsClose = "groups.close"
+    case GroupsHistory = "groups.history"
+    case GroupsInfo = "groups.info"
+    case GroupsList = "groups.list"
+    case GroupsMark = "groups.mark"
+    case GroupsOpen = "groups.open"
+    case GroupsSetPurpose = "groups.setPurpose"
+    case GroupsSetTopic = "groups.setTopic"
+    case IMClose = "im.close"
+    case IMHistory = "im.history"
+    case IMList = "im.list"
+    case IMMark = "im.mark"
+    case IMOpen = "im.open"
+    case MPIMClose = "mpim.close"
+    case MPIMHistory = "mpim.history"
+    case MPIMList = "mpim.list"
+    case MPIMMark = "mpim.mark"
+    case MPIMOpen = "mpim.open"
+    case PinsAdd = "pins.add"
+    case PinsRemove = "pins.remove"
+    case ReactionsAdd = "reactions.add"
+    case ReactionsGet = "reactions.get"
+    case ReactionsList = "reactions.list"
+    case ReactionsRemove = "reactions.remove"
+    case RTMStart = "rtm.start"
+    case StarsAdd = "stars.add"
+    case StarsRemove = "stars.remove"
+    case TeamInfo = "team.info"
+    case UsersGetPresence = "users.getPresence"
+    case UsersInfo = "users.info"
+    case UsersList = "users.list"
+    case UsersSetActive = "users.setActive"
+    case UsersSetPresence = "users.setPresence"
+}
+
+public class SlackWebAPI {
+    
+    public typealias FailureClosure = (error: SlackError)->Void
+    
+    public enum InfoType: String {
+        case Purpose = "purpose"
+        case Topic = "topic"
+    }
+    
+    public enum ParseMode: String {
+        case Full = "full"
+        case None = "none"
+    }
+    
+    public enum Presence: String {
+        case Auto = "auto"
+        case Away = "away"
+    }
+    
+    private enum ChannelType: String {
+        case Channel = "channel"
+        case Group = "group"
+        case IM = "im"
+    }
+    
+    private let client: Client
+    
+    required public init(client: Client) {
+        self.client = client
+    }
+    
+    //MARK: - RTM
+    public func rtmStart(success success: ((response: [String: AnyObject])->Void)?, failure: FailureClosure?) {
+        client.api.request(.RTMStart, token: client.token, parameters: nil, successClosure: {
+                (response) -> Void in
+                success?(response: response)
+            }) {(error) -> Void in
+                failure?(error: error)
+            }
+    }
+    
+    //MARK: - Auth Test
+    public func authenticationTest(success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
+        client.api.request(.AuthTest, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(authenticated: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channels
+    public func channelHistory(id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(.ChannelsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
+            (history) -> Void in
+                success?(history: history)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func channelInfo(id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+        info(.ChannelsInfo, type:ChannelType.Channel, id: id, success: {
+            (channel) -> Void in
+                success?(channel: channel)
+            }) { (error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func channelsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        list(.ChannelsList, type:ChannelType.Channel, excludeArchived: excludeArchived, success: {
+            (channels) -> Void in
+                success?(channels: channels)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func markChannel(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        mark(.ChannelsMark, channel: channel, timestamp: timestamp, success: {
+            (ts) -> Void in
+                success?(ts:timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setChannelPurpose(channel: String, purpose: String, success: ((purposeSet: Bool)->Void)?, failure: FailureClosure?) {
+        setInfo(.ChannelsSetPurpose, type: .Purpose, channel: channel, text: purpose, success: {
+            (purposeSet) -> Void in
+                success?(purposeSet: purposeSet)
+            }) { (error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setChannelTopic(channel: String, topic: String, success: ((topicSet: Bool)->Void)?, failure: FailureClosure?) {
+        setInfo(.ChannelsSetTopic, type: .Topic, channel: channel, text: topic, success: {
+            (topicSet) -> Void in
+                success?(topicSet: topicSet)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Messaging
+    public func deleteMessage(channel: String, ts: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": channel, "ts": ts]
+        client.api.request(.ChatDelete, token: client.token, parameters: parameters, successClosure: { (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func sendMessage(channel: String, text: String, username: String? = nil, asUser: Bool = false, parse: ParseMode = .Full, linkNames: Bool = false, attachments: [Attachment?]? = nil, unfurlLinks: Bool = false, unfurlMedia: Bool = false, iconURL: String? = nil, iconEmoji: String? = nil, success: (((ts: String?, channel: String?))->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["channel":channel, "text":text.slackFormatEscaping(), "as_user":asUser, "parse":parse.rawValue, "link_names":linkNames, "unfurl_links":unfurlLinks, "unfurlMedia":unfurlMedia, "username":username, "attachments":encodeAttachments(attachments), "icon_url":iconURL, "icon_emoji":iconEmoji]
+        client.api.request(.ChatPostMessage, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?((ts: response["ts"] as? String, response["channel"] as? String))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func updateMessage(channel: String, ts: String, message: String, attachments: [Attachment?]? = nil, parse:ParseMode = .None, linkNames: Bool = false, success: ((updated: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["channel": channel, "ts": ts, "text": message.slackFormatEscaping(), "parse": parse.rawValue, "link_names": linkNames, "attachments":encodeAttachments(attachments)]
+        client.api.request(.ChatUpdate, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(updated: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Do Not Disturb
+    public func dndInfo(user: String? = nil, success: ((status: DoNotDisturbStatus?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["user": user]
+        client.api.request(.DNDInfo, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(status: DoNotDisturbStatus(status: response))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func dndTeamInfo(users: [String]? = nil, success: ((statuses: [String: DoNotDisturbStatus]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["users":users?.joinWithSeparator(",")]
+        client.api.request(.DNDTeamInfo, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(statuses: self.enumerateDNDStauses(response["users"] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Emoji
+    public func emojiList(success: ((emojiList: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        client.api.request(.EmojiList, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(emojiList: response["emoji"] as? [String: AnyObject])
+            }) { (error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Files
+    public func deleteFile(fileID: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters = ["file":fileID]
+        client.api.request(.FilesDelete, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func uploadFile(file: NSData, filename: String, filetype: String = "auto", title: String? = nil, initialComment: String? = nil, channels: [String]? = nil, success: ((file: File?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["file":file, "filename": filename, "filetype":filetype, "title":title, "initial_comment":initialComment, "channels":channels?.joinWithSeparator(",")]
+        client.api.uploadRequest(client.token, data: file, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(file: File(file: response["file"] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - File Comments
+    public func addFileComment(fileID: String, comment: String, success: ((comment: Comment?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["file":fileID, "comment":comment.slackFormatEscaping()]
+        client.api.request(.FilesCommentsAdd, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func editFileComment(fileID: String, commentID: String, comment: String, success: ((comment: Comment?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["file":fileID, "id":commentID, "comment":comment.slackFormatEscaping()]
+        client.api.request(.FilesCommentsEdit, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+            success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func deleteFileComment(fileID: String, commentID: String, success: ((deleted: Bool?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["file":fileID, "id": commentID]
+        client.api.request(.FilesCommentsDelete, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Groups
+    public func closeGroup(groupID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        close(.GroupsClose, channelID: groupID, success: {
+            (closed) -> Void in
+                success?(closed:closed)
+            }) {(error) -> Void in
+                failure?(error:error)
+        }
+    }
+    
+    public func groupHistory(id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(.GroupsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
+            (history) -> Void in
+                success?(history: history)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func groupInfo(id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+        info(.GroupsInfo, type:ChannelType.Group, id: id, success: {
+            (channel) -> Void in
+                success?(channel: channel)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func groupsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        list(.GroupsList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
+            (channels) -> Void in
+                success?(channels: channels)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func markGroup(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        mark(.GroupsMark, channel: channel, timestamp: timestamp, success: {
+            (ts) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func openGroup(channel: String, success: ((opened: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters = ["channel":channel]
+        client.api.request(.GroupsOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(opened: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setGroupPurpose(channel: String, purpose: String, success: ((purposeSet: Bool)->Void)?, failure: FailureClosure?) {
+        setInfo(.GroupsSetPurpose, type: .Purpose, channel: channel, text: purpose, success: {
+            (purposeSet) -> Void in
+                success?(purposeSet: purposeSet)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setGroupTopic(channel: String, topic: String, success: ((topicSet: Bool)->Void)?, failure: FailureClosure?) {
+        setInfo(.GroupsSetTopic, type: .Topic, channel: channel, text: topic, success: {
+            (topicSet) -> Void in
+                success?(topicSet: topicSet)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - IM
+    public func closeIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        close(.IMClose, channelID: channel, success: {
+            (closed) -> Void in
+                success?(closed: closed)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func imHistory(id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(.IMHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
+            (history) -> Void in
+                success?(history: history)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func imsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        list(.IMList, type:ChannelType.IM, excludeArchived: excludeArchived, success: {
+            (channels) -> Void in
+                success?(channels: channels)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func markIM(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        mark(.IMMark, channel: channel, timestamp: timestamp, success: {
+            (ts) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func openIM(userID: String, success: ((imID: String?)->Void)?, failure: FailureClosure?) {
+        let parameters = ["user":userID]
+        client.api.request(.IMOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                let group = response["channel"] as? [String: AnyObject]
+                success?(imID: group?["id"] as? String)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - MPIM
+    public func closeMPIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        close(.MPIMClose, channelID: channel, success: {
+            (closed) -> Void in
+                success?(closed: closed)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func mpimHistory(id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(.MPIMHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
+            (history) -> Void in
+                success?(history: history)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func mpimsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        list(.MPIMList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
+            (channels) -> Void in
+                success?(channels: channels)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func markMPIM(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        mark(.MPIMMark, channel: channel, timestamp: timestamp, success: {
+            (ts) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func openMPIM(userIDs: [String], success: ((mpimID: String?)->Void)?, failure: FailureClosure?) {
+        let parameters = ["users":userIDs.joinWithSeparator(",")]
+        client.api.request(.MPIMOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                let group = response["group"] as? [String: AnyObject]
+                success?(mpimID: group?["id"] as? String)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Pins
+    public func pinItem(channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((pinned: Bool)->Void)?, failure: FailureClosure?) {
+        pin(.PinsAdd, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(pinned: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func unpinItem(channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((unpinned: Bool)->Void)?, failure: FailureClosure?) {
+        pin(.PinsRemove, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(unpinned: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func pin(endpoint: SlackAPIEndpoint, channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["channel":channel, "file":file, "file_comment":fileComment, "timestamp":timestamp]
+        client.api.request(endpoint, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(ok: true)
+            }){(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Reactions
+    // One of file, file_comment, or the combination of channel and timestamp must be specified.
+    public func addReaction(name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((reacted: Bool)->Void)?, failure: FailureClosure?) {
+        react(.ReactionsAdd, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(reacted: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    // One of file, file_comment, or the combination of channel and timestamp must be specified.
+    public func removeReaction(name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((unreacted: Bool)->Void)?, failure: FailureClosure?) {
+        react(.ReactionsRemove, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(unreacted: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func react(endpoint: SlackAPIEndpoint, name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["name":name, "file":file, "file_comment":fileComment, "channel":channel, "timestamp":timestamp]
+        client.api.request(endpoint, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(ok: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Stars
+    // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
+    public func addStar(file: String? = nil, fileComment: String? = nil, channel: String?  = nil, timestamp: String? = nil, success: ((starred: Bool)->Void)?, failure: FailureClosure?) {
+        star(.StarsAdd, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(starred: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
+    public func removeStar(file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((unstarred: Bool)->Void)?, failure: FailureClosure?) {
+        star(.StarsRemove, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
+            (ok) -> Void in
+                success?(unstarred: ok)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func star(endpoint: SlackAPIEndpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["file":file, "file_comment":fileComment, "channel":channel, "timestamp":timestamp]
+        client.api.request(endpoint, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(ok: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+
+    
+    //MARK: - Team
+    public func teamInfo(success: ((info: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        client.api.request(.TeamInfo, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(info: response["team"] as? [String: AnyObject])
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Users
+    public func userPresence(user: String, success: ((presence: String?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["user":user]
+        client.api.request(.UsersGetPresence, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(presence: response["presence"] as? String)
+            }){(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func userInfo(id: String, success: ((user: User?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["user":id]
+        client.api.request(.UsersInfo, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(user: User(user: response["user"] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func usersList(includePresence: Bool = false, success: ((userList: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["presence":includePresence]
+        client.api.request(.UsersList, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(userList: response["members"] as? [[String: AnyObject]])
+            }){(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setUserActive(success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        client.api.request(.UsersSetActive, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(success: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setUserPresence(presence: Presence, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["presence":presence.rawValue]
+        client.api.request(.UsersSetPresence, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success:true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channel Utilities
+    private func close(endpoint: SlackAPIEndpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel":channelID]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(closed: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func history(endpoint: SlackAPIEndpoint, id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": id, "latest": latest, "oldest": oldest, "inclusive":inclusive, "count":count, "unreads":unreads]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(history: History(history: response))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func info(endpoint: SlackAPIEndpoint, type: ChannelType, id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": id]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(channel: Channel(channel: response[type.rawValue] as? [String: AnyObject]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func list(endpoint: SlackAPIEndpoint, type: ChannelType, excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["exclude_archived": excludeArchived]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(channels: response[type.rawValue+"s"] as? [[String: AnyObject]])
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func mark(endpoint: SlackAPIEndpoint, channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": channel, "ts": timestamp]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func setInfo(endpoint: SlackAPIEndpoint, type: InfoType, channel: String, text: String, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": channel, type.rawValue: text]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+
+    //MARK: - Filter Nil Parameters
+    private func filterNilParameters(parameters: [String: AnyObject?]) -> [String: AnyObject] {
+        var finalParameters = [String: AnyObject]()
+        for key in parameters.keys {
+            if parameters[key] != nil {
+                finalParameters[key] = parameters[key]!
+            }
+        }
+        return finalParameters
+    }
+    
+    //MARK: - Encode Attachments
+    private func encodeAttachments(attachments: [Attachment?]?) -> NSString? {
+        if let attachments = attachments {
+            var attachmentArray: [[String: AnyObject]] = []
+            for attachment in attachments {
+                if let attachment = attachment {
+                    attachmentArray.append(attachment.dictionary())
+                }
+            }
+            do {
+                let data = try NSJSONSerialization.dataWithJSONObject(attachmentArray, options: NSJSONWritingOptions.PrettyPrinted)
+                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
+                return string
+            } catch _ {
+                
+            }
+        }
+        return nil
+    }
+    
+    //MARK: - Enumerate Do Not Distrub Status
+    private func enumerateDNDStauses(statuses: [String: AnyObject]?) -> [String: DoNotDisturbStatus] {
+        var retVal = [String: DoNotDisturbStatus]()
+        if let keys = statuses?.keys {
+            for key in keys {
+                retVal[key] = DoNotDisturbStatus(status: statuses?[key] as? [String: AnyObject])
+            }
+        }
+        return retVal
+    }
+    
+}
@@ -0,0 +1,290 @@
+//
+// SlackWebAPIErrorHandling.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+public enum SlackError: ErrorType {
+    case AccountInactive
+    case AlreadyArchived
+    case AlreadyInChannel
+    case AlreadyPinned
+    case AlreadyReacted
+    case AlreadyStarred
+    case BadClientSecret
+    case BadRedirectURI
+    case BadTimeStamp
+    case CantArchiveGeneral
+    case CantDelete
+    case CantDeleteFile
+    case CantDeleteMessage
+    case CantInvite
+    case CantInviteSelf
+    case CantKickFromGeneral
+    case CantKickFromLastChannel
+    case CantKickSelf
+    case CantLeaveGeneral
+    case CantLeaveLastChannel
+    case CantUpdateMessage
+    case ChannelNotFound
+    case ComplianceExportsPreventDeletion
+    case EditWindowClosed
+    case FileCommentNotFound
+    case FileDeleted
+    case FileNotFound
+    case FileNotShared
+    case GroupContainsOthers
+    case InvalidArrayArg
+    case InvalidAuth
+    case InvalidChannel
+    case InvalidCharSet
+    case InvalidClientID
+    case InvalidCode
+    case InvalidFormData
+    case InvalidName
+    case InvalidPostType
+    case InvalidPresence
+    case InvalidTS
+    case InvalidTSLatest
+    case InvalidTSOldest
+    case IsArchived
+    case LastMember
+    case LastRAChannel
+    case MessageNotFound
+    case MessageTooLong
+    case MigrationInProgress
+    case MissingDuration
+    case MissingPostType
+    case NameTaken
+    case NoChannel
+    case NoComment
+    case NoItemSpecified
+    case NoReaction
+    case NoText
+    case NotArchived
+    case NotAuthed
+    case NotEnoughUsers
+    case NotInChannel
+    case NotInGroup
+    case NotPinned
+    case NotStarred
+    case OverPaginationLimit
+    case PaidOnly
+    case PermissionDenied
+    case PostingToGeneralChannelDenied
+    case RateLimited
+    case RequestTimeout
+    case RestrictedAction
+    case SnoozeEndFailed
+    case SnoozeFailed
+    case SnoozeNotActive
+    case TooLong
+    case TooManyEmoji
+    case TooManyReactions
+    case TooManyUsers
+    case UnknownError
+    case UnknownType
+    case UserDisabled
+    case UserDoesNotOwnChannel
+    case UserIsBot
+    case UserIsRestricted
+    case UserIsUltraRestricted
+    case UserListNotSupplied
+    case UserNotFound
+    case UserNotVisible
+}
+
+internal struct ErrorDispatcher {
+    
+    static func dispatch(error: String) -> SlackError {
+        switch error {
+        case "account_inactive":
+            return .AccountInactive
+        case "already_in_channel":
+            return .AlreadyInChannel
+        case "already_pinned":
+            return .AlreadyPinned
+        case "already_reacted":
+            return .AlreadyReacted
+        case "already_starred":
+            return .AlreadyStarred
+        case "bad_client_secret":
+            return .BadClientSecret
+        case "bad_redirect_uri":
+            return .BadRedirectURI
+        case "bad_timestamp":
+            return .BadTimeStamp
+        case "cant_delete":
+            return .CantDelete
+        case "cant_delete_file":
+            return .CantDeleteFile
+        case "cant_delete_message":
+            return .CantDeleteMessage
+        case "cant_invite":
+            return .CantInvite
+        case "cant_invite_self":
+            return .CantInviteSelf
+        case "cant_kick_from_general":
+            return .CantKickFromGeneral
+        case "cant_kick_from_last_channel":
+            return .CantKickFromLastChannel
+        case "cant_kick_self":
+            return .CantKickSelf
+        case "cant_leave_general":
+            return .CantLeaveGeneral
+        case "cant_leave_last_channel":
+            return .CantLeaveLastChannel
+        case "cant_update_message":
+            return .CantUpdateMessage
+        case "compliance_exports_prevent_deletion":
+            return .ComplianceExportsPreventDeletion
+        case "channel_not_found":
+            return .ChannelNotFound
+        case "edit_window_closed":
+            return .EditWindowClosed
+        case "file_comment_not_found":
+            return .FileCommentNotFound
+        case "file_deleted":
+            return .FileDeleted
+        case "file_not_found":
+            return .FileNotFound
+        case "file_not_shared":
+            return .FileNotShared
+        case "group_contains_others":
+            return .GroupContainsOthers
+        case "invalid_array_arg":
+            return .InvalidArrayArg
+        case "invalid_auth":
+            return .InvalidAuth
+        case "invalid_channel":
+            return .InvalidChannel
+        case "invalid_charset":
+            return .InvalidCharSet
+        case "invalid_client_id":
+            return .InvalidClientID
+        case "invalid_code":
+            return .InvalidCode
+        case "invalid_form_data":
+            return .InvalidFormData
+        case "invalid_name":
+            return .InvalidName
+        case "invalid_post_type":
+            return .InvalidPostType
+        case "invalid_presence":
+            return .InvalidPresence
+        case "invalid_timestamp":
+            return .InvalidTS
+        case "invalid_ts_latest":
+            return .InvalidTSLatest
+        case "invalid_ts_oldest":
+            return .InvalidTSOldest
+        case "is_archived":
+            return .IsArchived
+        case "last_member":
+            return .LastMember
+        case "last_ra_channel":
+            return .LastRAChannel
+        case "message_not_found":
+            return .MessageNotFound
+        case "msg_too_long":
+            return .MessageTooLong
+        case "migration_in_progress":
+            return .MigrationInProgress
+        case "missing_duration":
+            return .MissingDuration
+        case "missing_post_type":
+            return .MissingPostType
+        case "name_taken":
+            return .NameTaken
+        case "no_channel":
+            return .NoChannel
+        case "no_comment":
+            return .NoComment
+        case "no_reaction":
+            return .NoReaction
+        case "no_item_specified":
+            return .NoItemSpecified
+        case "no_text":
+            return .NoText
+        case "not_archived":
+            return .NotArchived
+        case "not_authed":
+            return .NotAuthed
+        case "not_enough_users":
+            return .NotEnoughUsers
+        case "not_in_channel":
+            return .NotInChannel
+        case "not_in_group":
+            return .NotInGroup
+        case "not_pinned":
+            return .NotPinned
+        case "not_starred":
+            return .NotStarred
+        case "over_pagination_limit":
+            return .OverPaginationLimit
+        case "paid_only":
+            return .PaidOnly
+        case "perimssion_denied":
+            return .PermissionDenied
+        case "posting_to_general_channel_denied":
+            return .PostingToGeneralChannelDenied
+        case "rate_limited":
+            return .RateLimited
+        case "request_timeout":
+            return .RequestTimeout
+        case "snooze_end_failed":
+            return .SnoozeEndFailed
+        case "snooze_failed":
+            return .SnoozeFailed
+        case "snooze_not_active":
+            return .SnoozeNotActive
+        case "too_long":
+            return .TooLong
+        case "too_many_emoji":
+            return .TooManyEmoji
+        case "too_many_reactions":
+            return .TooManyReactions
+        case "too_many_users":
+            return .TooManyUsers
+        case "unknown_type":
+            return .UnknownType
+        case "user_disabled":
+            return .UserDisabled
+        case "user_does_not_own_channel":
+            return .UserDoesNotOwnChannel
+        case "user_is_bot":
+            return .UserIsBot
+        case "user_is_restricted":
+            return .UserIsRestricted
+        case "user_is_ultra_restricted":
+            return .UserIsUltraRestricted
+        case "user_list_not_supplied":
+            return .UserListNotSupplied
+        case "user_not_found":
+            return .UserNotFound
+        case "user_not_visible":
+            return .UserNotVisible
+        default:
+            return .UnknownError
+        }
+    }
+}
@@ -25,21 +25,46 @@ public struct Team {
    
    public let id: String
    internal(set) public var name: String?
-    internal(set) public var emailDomain: String?
    internal(set) public var domain: String?
+    internal(set) public var emailDomain: String?
    internal(set) public var messageEditWindowMinutes: Int?
    internal(set) public var overStorageLimit: Bool?
    internal(set) public var prefs: [String: AnyObject]?
    internal(set) public var plan: String?
+    internal(set) public var icon: TeamIcon?
    
    internal init?(team: [String: AnyObject]?) {
        id = team?["id"] as! String
-        name = team?["id"] as? String
-        emailDomain = team?["email_domain"] as? String
+        name = team?["name"] as? String
        domain = team?["domain"] as? String
-        messageEditWindowMinutes = team?["mesg_edit_window_mins"] as? Int
+        emailDomain = team?["email_domain"] as? String
+        messageEditWindowMinutes = team?["msg_edit_window_mins"] as? Int
        overStorageLimit = team?["over_storage_limit"] as? Bool
        prefs = team?["prefs"] as? [String: AnyObject]
        plan = team?["plan"] as? String
+        icon = TeamIcon(icon: team?["icon"] as? [String: AnyObject])
    }
 }
+
+public struct TeamIcon {
+    internal(set) public var image34: String?
+    internal(set) public var image44: String?
+    internal(set) public var image68: String?
+    internal(set) public var image88: String?
+    internal(set) public var image102: String?
+    internal(set) public var image132: String?
+    internal(set) public var imageOriginal: String?
+    internal(set) public var imageDefault: Bool?
+    
+    internal init?(icon: [String: AnyObject]?) {
+        image34 = icon?["image_34"] as? String
+        image44 = icon?["image_44"] as? String
+        image68 = icon?["image_68"] as? String
+        image88 = icon?["image_88"] as? String
+        image102 = icon?["image_102"] as? String
+        image132 = icon?["image_132"] as? String
+        imageOriginal = icon?["image_original"] as? String
+        imageDefault = icon?["image_default"] as? Bool
+    }
+}
+
@@ -21,6 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

+import Foundation
+
 // MARK: - Edited
 public struct Edited {
    public let user: String?
@@ -32,6 +34,27 @@ public struct Edited {
    }
 }

+// MARK: - History
+public struct History {
+    internal(set) public var latest: NSDate?
+    internal(set) public var messages = [Message]()
+    public let hasMore: Bool?
+    
+    internal init?(history: [String: AnyObject]?) {
+        if let latestStr = history?["latest"] as? String, latestDouble = Double(latestStr) {
+            latest = NSDate(timeIntervalSince1970: NSTimeInterval(latestDouble))
+        }
+        if let msgs = history?["messages"] as? [[String: AnyObject]] {
+            for message in msgs {
+                if let message = Message(message: message) {
+                    messages.append(message)
+                }
+            }
+        }
+        hasMore = history?["has_more"] as? Bool
+    }
+}
+
 // MARK: - Reaction
 public struct Reaction {
    public let name: String?
@@ -175,3 +198,76 @@ public struct DoNotDisturbStatus {
    }
    
 }
+
+// MARK - Custom Team Profile
+public struct CustomProfile {
+    internal(set) public var fields = [String: CustomProfileField]()
+    
+    internal init?(profile: [String: AnyObject]?) {
+        if let eventFields = profile?["fields"] as? [AnyObject] {
+            for field in eventFields {
+                if let cpf = CustomProfileField(field: field as? [String: AnyObject]), id = cpf.id {
+                    fields[id] = cpf
+                } else {
+                    if let cpf = CustomProfileField(id: field as? String), id = cpf.id {
+                        fields[id] = cpf
+                    }
+                }
+            }
+        }
+    }
+    
+    internal init?(customFields: [String: AnyObject]?) {
+        if let customFields = customFields {
+            for key in customFields.keys {
+                if let cpf = CustomProfileField(field: customFields[key] as? [String: AnyObject]) {
+                    self.fields[key] = cpf
+                }
+            }
+        }
+    }
+    
+}
+
+public struct CustomProfileField {
+    internal(set) public var id: String?
+    internal(set) public var alt: String?
+    internal(set) public var value: String?
+    internal(set) public var hidden: Bool?
+    internal(set) public var hint: String?
+    internal(set) public var label: String?
+    internal(set) public var options: String?
+    internal(set) public var ordering: Int?
+    internal(set) public var possibleValues: [String]?
+    internal(set) public var type: String?
+    
+    internal init?(field: [String: AnyObject]?) {
+        id = field?["id"] as? String
+        alt = field?["alt"] as? String
+        value = field?["value"] as? String
+        hidden = field?["is_hidden"] as? Bool
+        hint = field?["hint"] as? String
+        label = field?["label"] as? String
+        options = field?["options"] as? String
+        ordering = field?["ordering"] as? Int
+        possibleValues = field?["possible_values"] as? [String]
+        type = field?["type"] as? String
+    }
+    
+    internal init?(id: String?) {
+        self.id = id
+    }
+    
+    internal mutating func updateProfileField(profile: CustomProfileField?) {
+        id = profile?.id != nil ? profile?.id : id
+        alt = profile?.alt != nil ? profile?.alt : alt
+        value = profile?.value != nil ? profile?.value : value
+        hidden = profile?.hidden != nil ? profile?.hidden : hidden
+        hint = profile?.hint != nil ? profile?.hint : hint
+        label = profile?.label != nil ? profile?.label : label
+        options = profile?.options != nil ? profile?.options : options
+        ordering = profile?.ordering != nil ? profile?.ordering : ordering
+        possibleValues = profile?.possibleValues != nil ? profile?.possibleValues : possibleValues
+        type = profile?.type != nil ? profile?.type : type
+    }
+}
@@ -35,6 +35,7 @@ public struct User {
        internal(set) public var image48: String?
        internal(set) public var image72: String?
        internal(set) public var image192: String?
+        internal(set) public var customProfile: CustomProfile?
        
        internal init?(profile: [String: AnyObject]?) {
            firstName = profile?["first_name"] as? String
@@ -48,9 +49,11 @@ public struct User {
            image48 = profile?["image_48"] as? String
            image72 = profile?["image_72"] as? String
            image192 = profile?["image_192"] as? String
+            customProfile = CustomProfile(customFields: profile?["fields"] as? [String: AnyObject])
        }
    }
    
+    
    public let id: String?
    internal(set) public var name: String?
    internal(set) public var deleted: Bool?
@@ -71,7 +74,7 @@ public struct User {
    internal(set) public var timeZoneLabel: String?
    internal(set) public var timeZoneOffSet: Int?
    internal(set) public var preferences: [String: AnyObject]?
-    // Client use
+    // Client properties
    internal(set) public var userGroups: [String: String]?
    
    internal init?(user: [String: AnyObject]?) {
@@ -100,4 +103,4 @@ public struct User {
        self.id = id
        self.isBot = nil
    }
-}
+}
Author	SHA1	Message	Date
Peter Zignego	d2037f4cc5	Merge pull request #23 from pvzig/feature/client-improvements Feature/client-improvements	2016-03-22 21:44:20 -04:00
Peter Zignego	b87232dfb5	Readme updates	2016-03-22 21:38:17 -04:00
Peter Zignego	9e5678739f	Update readme	2016-03-22 21:34:45 -04:00
Peter Zignego	5cc8582d65	Code cleanup	2016-03-22 21:29:16 -04:00
Peter Zignego	aa078934c0	File comment web api errors	2016-03-22 20:56:10 -04:00
Peter Zignego	5c157caea3	Client improvements - disconnect, ping-pong, timeout, reconnect	2016-03-22 20:50:29 -04:00
Peter Zignego	b567113b5f	Update Starscream dependency version	2016-03-22 20:44:58 -04:00
Peter Zignego	5b08fb6031	Merge pull request #21 from pvzig/feature/file-comment Add support for file comment web API calls	2016-03-19 14:21:52 -04:00
Peter Zignego	b48f33fb72	Add support for file comment web API calls	2016-03-19 14:12:04 -04:00
Peter Zignego	deccb727a1	Merge pull request #20 from pvzig/feature/reactions-itemUser Add support for the item user reaction property	2016-03-15 23:48:55 -04:00
Peter Zignego	8f1df8d138	Add support for the itemUser reaction property	2016-03-15 23:48:08 -04:00
Peter Zignego	0048710e24	Merge pull request #19 from pvzig/feature/dnd-read DND Read Scope Web API implementation	2016-03-15 23:38:08 -04:00
Peter Zignego	f6da0ddd32	DND read scope fixes	2016-03-15 23:37:33 -04:00
Peter Zignego	513485e704	DND Read Scope Web API implementation	2016-03-15 23:28:38 -04:00
Peter Zignego	fb3719c29d	Merge pull request #18 from pvzig/feature/rtm-team-profile Add support for team profile events	2016-03-15 22:48:43 -04:00
Peter Zignego	76fdc55f9e	Team profile events	2016-03-15 22:45:45 -04:00
Peter Zignego	687b57fc1f	Version bump	2016-03-01 23:08:24 -05:00
Peter Zignego	319dc9a095	Merge pull request #17 from muratayusuke/bugfix/ignore_int_param Bugfix: Do not ignore Int and Bool parameters when making requests to the web api	2016-03-01 12:47:20 -05:00
muratayusuke	64440b5c5b	Do not ignore Int/Bool param such as count	2016-03-02 02:25:37 +09:00
Peter Zignego	3efe5752cb	Merge pull request #16 from pvzig/feature/history-object Feature/history object	2016-02-28 12:41:22 -05:00
Peter Zignego	31f69e3afd	Move History struct to Types.swift, minor changes	2016-02-28 12:40:04 -05:00
muratayusuke	72b29562e5	Introduce history type	2016-02-28 12:29:12 -05:00
Peter Zignego	2b26eb35d7	Merge pull request #14 from pvzig/fix/team-object fix/team-object	2016-02-27 14:13:53 -05:00
Peter Zignego	c4c8e99c0b	Bug fixes, team icon support	2016-02-27 14:10:35 -05:00
muratayusuke	5efe222196	Add team icon	2016-02-27 14:06:24 -05:00
Peter Zignego	e56ff971b2	Merge pull request #12 from hamin/public-message-initializer Making Message struct initializer public.	2016-02-27 13:48:42 -05:00
Haris Amin	18b8a31d85	Making Message struct initializer public.	2016-02-27 13:38:52 -05:00
Peter Zignego	d386730c75	Project file update	2016-02-21 10:31:13 -05:00
Peter Zignego	bc6e94d99a	Merge pull request #11 from pvzig/feature/message-attachments Message attachment support	2016-02-21 10:27:41 -05:00
Peter Zignego	89f5e3786e	Message attachment support	2016-02-21 10:18:32 -05:00
Peter Zignego	0665ea0270	Add sample app	2016-02-18 18:21:17 -05:00
Peter Zignego	4ebc33b59a	Update podspec, project, info.plist	2016-02-18 13:38:47 -05:00
Peter Zignego	9e93806437	Merge pull request #10 from pvzig/web-api Add bot accessible Slack Web API endpoints	2016-02-18 13:29:34 -05:00
Peter Zignego	572e363717	Typo fix	2016-02-18 13:27:24 -05:00
Peter Zignego	d8c8c3cb57	Updates	2016-02-18 13:24:14 -05:00
Peter Zignego	02eff541b1	Fixes	2016-02-18 12:57:53 -05:00
Peter Zignego	92d6d833ea	Clean up	2016-02-15 20:13:10 -05:00
Peter Zignego	78b73c4c99	Bug fixes	2016-02-14 21:31:42 -05:00
Peter Zignego	dee376e1b9	Make success and failure closures optional	2016-02-14 21:09:07 -05:00
Peter Zignego	5550658d83	Encode parameters	2016-02-14 21:08:51 -05:00
Peter Zignego	82978bb963	Add additional errors	2016-02-14 20:35:03 -05:00
Peter Zignego	0a203bbc68	Web api clean up	2016-02-14 20:34:41 -05:00
Peter Zignego	38a762c60b	File upload	2016-02-14 19:44:05 -05:00
Peter Zignego	96543932af	General clean up	2016-02-14 16:35:39 -05:00
Peter Zignego	39fa80904f	WebAPI interface clean up	2016-02-14 16:35:19 -05:00
Peter Zignego	e4f0429ffb	Send message implementation	2016-02-14 14:15:04 -05:00
Peter Zignego	ab41c148cd	Make Slack message formatting a string extension	2016-02-14 14:14:37 -05:00
Peter Zignego	a74aba3c5e	Remove depreciated parameters	2016-02-14 14:14:06 -05:00
Peter Zignego	9f266fff64	WebAPI clean up	2016-02-14 12:26:53 -05:00
Peter Zignego	78d31af3f7	Move client code out of SlackWebAPI	2016-02-14 12:04:09 -05:00
Peter Zignego	1a787019ec	Add error handling	2016-02-14 11:16:07 -05:00
Peter Zignego	f2f25763e7	Move source file to Sources	2016-02-14 10:16:07 -05:00
Peter Zignego	de3cf52687	Web API partial implementation Need to update with error closures across all methods and client integration	2016-02-13 16:04:14 -05:00
Peter Zignego	49b151cd98	Merge branch 'master' into web-api # Conflicts: # SlackKit/Sources/Client.swift	2016-02-11 18:42:11 -05:00
Peter Zignego	e9fc66a68f	Merge pull request #9 from muratayusuke/feature/multi_clients Support for multiple client instances	2016-02-11 18:20:42 -05:00
muratayusuke	0e25584191	Work with many Client instances	2016-02-12 02:11:15 +09:00
Peter Zignego	074be89825	Web API scaffolding	2016-02-08 18:38:23 -05:00
Peter Zignego	12dcb791a8	Error handling scaffolding	2016-02-08 18:37:39 -05:00
Peter Zignego	de7dbfb9df	API interface improvements	2016-02-08 18:37:26 -05:00
Peter Zignego	fe49ca7b25	Update podspec	2016-02-02 09:30:40 -05:00
Peter Zignego	7888b0bbba	Message send bug fix	2016-02-02 09:21:37 -05:00
Peter Zignego	02791a4ea0	Move into sources folder	2016-01-18 20:19:33 -05:00
Peter Zignego	64a0b0e8dc	Fix networking	2016-01-18 20:11:33 -05:00
Peter Zignego	6653d934f6	Start implementing the Slack Web API	2016-01-18 17:09:31 -05:00
Peter Zignego	27f49dfc07	Update podspec	2016-01-11 14:23:16 -05:00
Peter Zignego	ce02093e20	Update podspec	2016-01-11 14:21:22 -05:00
Peter Zignego	e625acbb52	Merge pull request #5 from pvzig/swift-2.2 Swift 2.2	2016-01-11 13:28:25 -05:00
Peter Zignego	6d34ea0dab	Update readme	2016-01-11 13:27:10 -05:00
Peter Zignego	8c90da220e	Update copyrights	2016-01-11 13:26:57 -05:00
Peter Zignego	d1c4282203	Remove var binding	2016-01-05 23:20:03 -05:00
Peter Zignego	d0d2cbdc40	Update .gitignore	2016-01-05 23:07:08 -05:00
Peter Zignego	2ce1a3edde	Swift package manager support	2016-01-03 12:14:51 -05:00