Bug fix

Update readme
Remove Cocoapods
2016-07-23 11:12:14 -04:00 · 2016-07-20 21:44:30 -04:00 · 2016-07-20 21:32:57 -04:00 · 2016-07-20 21:32:41 -04:00 · 2016-07-20 18:31:03 -04:00 · 2016-07-18 00:07:03 -04:00
69 changed files with 4050 additions and 3291 deletions
@@ -16,8 +16,10 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-.build
+
+# SwiftPM
 Packages/
+.build

 # CocoaPods
 #
@@ -26,10 +28,10 @@ Packages/
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 Pods/
+SlackKit.xcworkspace

 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
@@ -0,0 +1 @@
+3.0
@@ -0,0 +1,2 @@
+github "https://github.com/pvzig/swifter.git" "master"
+github "https://github.com/pvzig/Starscream.git" "swift3"
@@ -0,0 +1,2 @@
+github "pvzig/Starscream" "98d7ccea30621d51a93ee5c155b3f670e37e037b"
+github "pvzig/swifter" "8adfae89a6d34cfea1c20d53d8112d1d69e01bd0"
@@ -1,58 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,680 +0,0 @@
-<?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>
@@ -1,160 +0,0 @@
-//
-// Leaderboard.swift
-// OSX-Sample
-//
-// 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 SlackKit
-import Foundation
-
-class Leaderboard: MessageEventsDelegate {
-    
-    var leaderboard: [String: Int] = [String: Int]()
-    let atSet = NSCharacterSet(charactersInString: "@")
-
-    let client: Client
-
-    init(token: String) {
-        client = Client(apiToken: token)
-        client.messageEventsDelegate = self
-    }
-
-    enum Command: String {
-        case Leaderboard = "leaderboard"
-    }
-    
-    enum Trigger: String {
-        case PlusPlus = "++"
-        case MinusMinus = "--"
-    }
-    
-    // MARK: MessageEventsDelegate
-    func messageReceived(message: Message) {
-        listen(message)
-    }
-    
-    func messageSent(message: Message){}
-    func messageChanged(message: Message){}
-    func messageDeleted(message: Message?){}
-    
-    // MARK: Leaderboard Internal Logic
-    private func listen(message: Message) {
-        if let id = client.authenticatedUser?.id, text = message.text {
-            if text.lowercaseString.containsString(Command.Leaderboard.rawValue) && text.containsString(id) == true {
-                handleCommand(.Leaderboard, channel: message.channel)
-            }
-        }
-        if message.text?.containsString(Trigger.PlusPlus.rawValue) == true {
-            handleMessageWithTrigger(message, trigger: .PlusPlus)
-        }
-        if message.text?.containsString(Trigger.MinusMinus.rawValue) == true {
-            handleMessageWithTrigger(message, trigger: .MinusMinus)
-        }
-    }
-    
-    private func handleMessageWithTrigger(message: Message, trigger: Trigger) {
-        if let text = message.text,
-            end = text.rangeOfString(trigger.rawValue)?.startIndex.predecessor(),
-            start = text.rangeOfCharacterFromSet(atSet, options: .BackwardsSearch, range: text.startIndex..<end)?.startIndex {
-            let string = text.substringWithRange(start...end)
-            let users = client.users.values.filter{$0.id == self.userID(string)}
-            if users.count > 0 {
-                let idString = userID(string)
-                initalizationForValue(&leaderboard, value: idString)
-                scoringForValue(&leaderboard, value: idString, trigger: trigger)
-            } else {
-                initalizationForValue(&leaderboard, value: string)
-                scoringForValue(&leaderboard, value: string, trigger: trigger)
-            }
-        }
-    }
-    
-    private func handleCommand(command: Command, channel:String?) {
-        switch command {
-        case .Leaderboard:
-            if let id = channel {
-                client.webAPI.sendMessage(id, text: "", linkNames: true, attachments: [constructLeaderboardAttachment()], success: {(response) in
-                    
-                    }, failure: { (error) in
-                        print("Leaderboard failed to post due to error:\(error)")
-                })
-            }
-        }
-    }
-    
-    private func initalizationForValue(inout dictionary: [String: Int], value: String) {
-        if dictionary[value] == nil {
-            dictionary[value] = 0
-        }
-    }
-    
-    private func scoringForValue(inout dictionary: [String: Int], value: String, trigger: Trigger) {
-        switch trigger {
-        case .PlusPlus:
-            dictionary[value]?+=1
-        case .MinusMinus:
-            dictionary[value]?-=1
-        }
-    }
-    
-    // MARK: Leaderboard Interface
-    private func constructLeaderboardAttachment() -> Attachment? {
-        let 💯 = AttachmentField(title: "💯", value: swapIDsForNames(topItems(&leaderboard)), short: true)
-        let 💩 = AttachmentField(title: "💩", value: swapIDsForNames(bottomItems(&leaderboard)), short: true)
-        return Attachment(fallback: "Leaderboard", title: "Leaderboard", colorHex: AttachmentColor.Good.rawValue, text: "", fields: [💯, 💩])
-    }
-
-    private func topItems(inout dictionary: [String: Int]) -> String {
-        let sortedKeys = Array(dictionary.keys).sort({dictionary[$0] > dictionary[$1]}).filter({dictionary[$0] > 0})
-        let sortedValues = Array(dictionary.values).sort({$0 > $1}).filter({$0 > 0})
-        return leaderboardString(sortedKeys, values: sortedValues)
-    }
-    
-    private func bottomItems(inout dictionary: [String: Int]) -> String {
-        let sortedKeys = Array(dictionary.keys).sort({dictionary[$0] < dictionary[$1]}).filter({dictionary[$0] < 0})
-        let sortedValues = Array(dictionary.values).sort({$0 < $1}).filter({$0 < 0})
-        return leaderboardString(sortedKeys, values: sortedValues)
-    }
-    
-    private func leaderboardString(keys: [String], values: [Int]) -> String {
-        var returnValue = ""
-        for i in 0..<values.count {
-            returnValue += keys[i] + " (" + "\(values[i])" + ")\n"
-        }
-        return returnValue
-    }
-    
-    // MARK: - Utilities
-    private func swapIDsForNames(string: String) -> String {
-        var returnString = string
-        for key in client.users.keys {
-            if let name = client.users[key]?.name {
-                returnString = returnString.stringByReplacingOccurrencesOfString(key, withString: "@"+name, options: NSStringCompareOptions.LiteralSearch, range: returnString.startIndex..<returnString.endIndex)
-            }
-        }
-        return returnString
-    }
-    
-    private func userID(string: String) -> String {
-        return string.stringByTrimmingCharactersInSet(NSCharacterSet.alphanumericCharacterSet().invertedSet)
-    }
-    
-}
@@ -27,7 +27,9 @@ let package = Package(
    name: "SlackKit",
    targets: [],
    dependencies: [
-        .Package(url: "https://github.com/pvzig/Starscream.git",
-            majorVersion: 1),
-    ]
+        .Package(url: "https://github.com/pvzig/swifter.git",
+                 majorVersion: 1, minor: 3),
+        .Package(url: "https://github.com/pvzig/Starscream.git", majorVersion: 1, minor: 2)
+    ],
+    exclude: ["Examples", "Carthage", "Pods"]
 )
@@ -1,7 +0,0 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
-use_frameworks!
-
-target 'SlackKit' do
-	pod 'Starscream'
-end
@@ -1,10 +0,0 @@
-PODS:
-  - Starscream (1.1.2)
-
-DEPENDENCIES:
-  - Starscream
-
-SPEC CHECKSUMS:
-  Starscream: 58a12fd35a3cb6aaa105716c2d42765f7c1c732f
-
-COCOAPODS: 0.39.0
@@ -1,63 +1,133 @@
 ![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) as well as the [web APIs](https://api.slack.com/web) that are accessible by [bot users](https://api.slack.com/bot-users).
+## SlackKit: A Swift Slack Client Library
+### Description

-###Installation
-####Swift Package Manager
+This is the Swift 3 beta branch. It will continue to track the Xcode 8 beta releases until it is officially released, at which point Swift 3 will be merged down to the master branch.
+
+SlackKit also supports: [Swift 2.2](https://github.com/pvzig/SlackKit/), [Linux](https://github.com/pvzig/SlackKit/tree/linux)
+
+This is a Slack client library for OS X, iOS, and tvOS 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 to [bot users](https://api.slack.com/bot-users). SlackKit also supports Slack’s [OAuth 2.0](https://api.slack.com/docs/oauth) flow including the [Add to Slack](https://api.slack.com/docs/slack-button) and [Sign in with Slack](https://api.slack.com/docs/sign-in-with-slack) buttons, [incoming webhooks](https://api.slack.com/incoming-webhooks), [slash commands](https://api.slack.com/slash-commands), and [message buttons](https://api.slack.com/docs/message-buttons).
+
+#### Building the SlackKit Framework
+To build the SlackKit project directly, first build the dependencies using Carthage or CocoaPods. To use the framework in your application, install it in one of the following ways:
+
+### Installation
+
+#### Carthage
+
+Add SlackKit to your Cartfile:
+```
+github "https://github.com/pvzig/slackkit.git" "swift3"
+```
+and run
+```
+carthage bootstrap
+```
+**Note:** SlackKit currently takes a _long_ time for the compiler to compile with optimizations turned on. I'm currently exploring a potential fix for this issue. In the meantime, you may want to skip the waiting and build it in the debug configuration instead:
+```
+carthage bootstrap --configuration "Debug"
+```
+Drag the built `SlackKit.framework` into your Xcode project.
+
+#### 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: 1)
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 3)
    ]
 )
 ```
-
-Run `swift-build` on your application’s main directory.
-
-####CocoaPods
-Add the pod to your podfile:
-```
-pod 'SlackKit'
-```
-and run
-```
-pod install
-```
+Run `swift build` on your application’s main directory.

 To use the library in your project import it:
 ```
 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).
+### Usage

-Once you have a token, initialize a client instance using it:
+#### OAuth
+Slack has [many different oauth scopes](https://api.slack.com/docs/oauth-scopes) that can be combined in different ways. If your application does not request the proper OAuth scopes, your API calls will fail. 
+
+If you authenticate using OAuth and the Add to Slack or Sign in with Slack buttons this is handled for you.
+
+If you wish to make OAuth requests yourself, you can generate them using the `authorizeRequest` function on `SlackKit`’s `oauth` property:
 ```swift
-let client = Client(apiToken: "YOUR_SLACK_API_TOKEN")
+func authorizeRequest(scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil)
 ```

-If you want to receive messages from the Slack RTM API, connect to it.
+For local development of things like OAuth, slash commands, and message buttons that require connecting over `https`, you may want to use a tool like [ngrok](https://ngrok.com) or [localtunnel](http://localtunnel.me).
+
+#### Incoming Webhooks
+After [configuring your incoming webhook in Slack](https://my.slack.com/services/new/incoming-webhook/), initialize IncomingWebhook with the provided URL and use `postMessage` to send messages.
 ```swift
-client.connect()
+let incoming = IncomingWebhook(url: "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX")
+let message = Response(text: "Hello, World!")
+incoming.postMessage(message)
 ```

+#### Slash Commands
+After [configuring your slash command in Slack](https://my.slack.com/services/new/slash-commands) (you can also provide slash commands as part of a [Slack App](https://api.slack.com/slack-apps)), initialize a webhook server with the token for the slash command, a configured route, and a response.
+```swift
+let response = Response(text: "Hello, World!", responseType: .InChannel)
+let webhook = WebhookServer(token: "SLASH-COMMAND-TOKEN", route: "hello_world", response: response)
+webhook.start()
+```
+When a user enters that slash command, it will hit your configured route and return the response you specified.
+
+To add additional routes and responses, you can use WebhookServer’s addRoute function:
+```swift 
+func addRoute(route: String, response: Response)
+```
+
+#### Message Buttons
+If you are developing a Slack App and are authorizing using OAuth, you can use [message buttons](https://api.slack.com/docs/message-buttons).
+
+To send messages with actions, add them to an attachment:
+```swift
+let helloAction = Action(name: "hello_world", text: "Hello, World!")
+let attachment = Attachment(fallback: "Hello World Attachment", title: "Attachment with an Action Button", callbackID: "helloworld", actions: [helloAction])
+```
+
+To act on message actions, initialize an instance of the `MessageActionServer` using your app’s verification token, your specified interactive messages request URL route, and a `MessageActionResponder`:
+```swift
+let action = Action(name: "hello_world", text: "Hello, World!")
+let response = Response(text: "Hello, 🌎!", responseType: .InChannel)
+let responder = MessageActionResponder(responses: [(action, response)])
+let server = MessageActionServer(token: "SLACK-APP-VERIFICATION-TOKEN", route: "actions", responder: responder)
+server.start()
+```
+
+#### Bot Users
+To deploy a bot user using 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).
+
+Initialize a SlackKit instance using your [application’s Client ID and Client Secret](https://api.slack.com/apps) to set up SlackKit for OAuth authorization:
+```swift
+let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
+```
+
+or use a manually acquired token:
+```swift
+let bot = SlackKit(withAPIToken: "xoxp-YOUR-SLACK-API-TOKEN")
+```
+
+#### Client Connection Options
 You can also set options for a ping/pong interval, timeout interval, and automatic reconnection:
 ```swift
-client.connect(pingInterval: 2, timeout: 10, reconnect: false)
+let options = ClientOptions(pingInterval: 2, timeout: 10, reconnect: false)
+let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET", clientOptions: options)
 ```

 Once connected, the client will begin to consume any messages sent by the Slack RTM API.

-####Web API Methods
+#### Web API Methods
 SlackKit currently supports the a subset of the Slack Web APIs that are available to bot users:

 - api.test
+- auth.revoke
 - auth.test
 - channels.history
 - channels.info
@@ -93,6 +163,7 @@ SlackKit currently supports the a subset of the Slack Web APIs that are availabl
 - mpim.list
 - mpim.mark
 - mpim.open
+- oauth.access
 - pins.add
 - pins.list
 - pins.remove
@@ -112,125 +183,122 @@ SlackKit currently supports the a subset of the Slack Web APIs that are availabl

 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)
+client.webAPI.authenticationTest({ (authenticated) -> Void in
+	print(authenticated)
+}){(error) -> Void in
+	print(error)
 }
 ```

-####Delegate methods
+#### Delegate methods

-To receive delegate callbacks for certain events, register an object as the delegate for those events:
+To receive delegate callbacks for events, register an object as the delegate for those events using the `onClientInitalization` block:
 ```swift
-client.slackEventsDelegate = self
+let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
+bot.onClientInitalization = { (client: Client) in
+    dispatch_async(dispatch_get_main_queue(), {
+		client.connectionEventsDelegate = self
+	    client.messageEventsDelegate = self
+	})
+}
 ```

+Delegate callbacks contain a reference to the Client where the event occurred.
+
 There are a number of delegates that you can set to receive callbacks for certain events.

-#####SlackEventsDelegate
+##### ConnectionEventsDelegate
 ```swift
-func clientConnectionFailed(error: SlackError)
-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)
+clientConnected(client: Client)
+clientDisconnected(client: Client)
+clientConnectionFailed(client: Client, error: SlackError)
+```
+##### MessageEventsDelegate
+```swift
+messageSent(client: Client, message: Message)
+messageReceived(client: Client, message: Message)
+messageChanged(client: Client, message: Message)
+messageDeleted(client: Client, message: Message?)
+```
+##### ChannelEventsDelegate
+```swift
+userTyping(client: Client, channel: Channel, user: User)
+channelMarked(client: Client, channel: Channel, timestamp: String)
+channelCreated(client: Client, channel: Channel)
+channelDeleted(client: Client, channel: Channel)
+channelRenamed(client: Client, channel: Channel)
+channelArchived(client: Client, channel: Channel)
+channelHistoryChanged(client: Client, channel: Channel)
+channelJoined(client: Client, channel: Channel)
+channelLeft(client: Client, channel: Channel)
+```
+##### DoNotDisturbEventsDelegate
+```swift
+doNotDisturbUpdated(client: Client, dndStatus: DoNotDisturbStatus)
+doNotDisturbUserUpdated(client: Client, dndStatus: DoNotDisturbStatus, user: User)
+```
+##### GroupEventsDelegate
+```swift
+groupOpened(client: Client, group: Channel)
+```
+##### FileEventsDelegate
+```swift
+fileProcessed(client: Client, file: File)
+fileMadePrivate(client: Client, file: File)
+fileDeleted(client: Client, file: File)
+fileCommentAdded(client: Client, file: File, comment: Comment)
+fileCommentEdited(client: Client, file: File, comment: Comment)
+fileCommentDeleted(client: Client, file: File, comment: Comment)
+```
+##### PinEventsDelegate
+```swift
+itemPinned(client: Client, item: Item, channel: Channel?)
+itemUnpinned(client: Client, item: Item, channel: Channel?)
+```
+##### StarEventsDelegate
+```swift
+itemStarred(client: Client, item: Item, star: Bool)
+```
+##### ReactionEventsDelegate
+```swift
+reactionAdded(client: Client, reaction: String, item: Item, itemUser: String)
+reactionRemoved(client: Client, reaction: String, item: Item, itemUser: String)
+```
+##### SlackEventsDelegate
+```swift
+preferenceChanged(client: Client, preference: String, value: AnyObject?)
+userChanged(client: Client, user: User)
+presenceChanged(client: Client, user: User, presence: String)
+manualPresenceChanged(client: Client, user: User, presence: String)
+botEvent(client: Client, bot: Bot)
+```
+##### TeamEventsDelegate
+```swift
+teamJoined(client: Client, user: User)
+teamPlanChanged(client: Client, plan: String)
+teamPreferencesChanged(client: Client, preference: String, value: AnyObject?)
+teamNameChanged(client: Client, name: String)
+teamDomainChanged(client: Client, domain: String)
+teamEmailDomainChanged(client: Client, domain: String)
+teamEmojiChanged(client: Client)
+```
+##### SubteamEventsDelegate
+```swift
+subteamEvent(client: Client, userGroup: UserGroup)
+subteamSelfAdded(client: Client, subteamID: String)
+subteamSelfRemoved(client: Client, subteamID: String)
+```
+##### TeamProfileEventsDelegate
+```swift
+teamProfileChanged(client: Client, profile: CustomProfile)
+teamProfileDeleted(client: Client, profile: CustomProfile)
+teamProfileReordered(client: Client, profile: CustomProfile)
 ```

-#####MessageEventsDelegate
-```swift
-func messageSent(message: Message)
-func messageReceived(message: Message)
-func messageChanged(message: Message)
-func messageDeleted(message: Message?)
-```
+### Examples
+[Check out example applications here.](https://github.com/pvzig/SlackKit-examples)

-#####ChannelEventsDelegate
-```swift
-func userTyping(channel: Channel?, user: User?)
-func channelMarked(channel: Channel, timestamp: String?)
-func channelCreated(channel: Channel)
-func channelDeleted(channel: Channel)
-func channelRenamed(channel: Channel)
-func channelArchived(channel: Channel)
-func channelHistoryChanged(channel: Channel)
-func channelJoined(channel: Channel)
-func channelLeft(channel: Channel)
-```
-
-#####DoNotDisturbEventsDelegate
-```swift
-doNotDisturbUpdated(dndStatus: DoNotDisturbStatus)
-doNotDisturbUserUpdated(dndStatus: DoNotDisturbStatus, user: User?)
-```
-
-#####GroupEventsDelegate
-```swift
-func groupOpened(group: Channel)
-```
-
-#####FileEventsDelegate
-```swift
-func fileProcessed(file: File)
-func fileMadePrivate(file: File)
-func fileDeleted(file: File)
-func fileCommentAdded(file: File, comment: Comment)
-func fileCommentEdited(file: File, comment: Comment)
-func fileCommentDeleted(file: File, comment: Comment)
-```
-
-#####PinEventsDelegate
-```swift
-func itemPinned(item: Item?, channel: Channel?)
-func itemUnpinned(item: Item?, channel: Channel?)
-```
-
-#####StarEventsDelegate
-```swift
-func itemStarred(item: Item, star: Bool)
-```
-
-#####ReactionEventsDelegate
-```swift
-func reactionAdded(reaction: String?, item: Item?, itemUser: String?)
-func reactionRemoved(reaction: String?, item: Item?, itemUser: String?)
-```
-
-#####TeamEventsDelegate
-```swift
-func teamJoined(user: User)
-func teamPlanChanged(plan: String)
-func teamPreferencesChanged(preference: String, value: AnyObject)
-func teamNameChanged(name: String)
-func teamDomainChanged(domain: String)
-func teamEmailDomainChanged(domain: String)
-func teamEmojiChanged()
-```
-
-#####SubteamEventsDelegate
-```swift
-func subteamEvent(userGroup: UserGroup)
-func subteamSelfAdded(subteamID: String)
-func subteamSelfRemoved(subteamID: String)
-```
-
-###Examples
-####Leaderboard
-Included in the OSX-Sample is an example application of a bot you might make using SlackKit. It’s a basic leaderboard scoring bot, in the spirit of [PlusPlus](https://plusplus.chat).
-
-To configure it, enter your bot’s API token in `AppDelegate.swift` for the Leaderboard bot:
-
-```swift
-let learderboard = Leaderboard(token: "SLACK_AUTH_TOKEN")
-```
-
-It adds a point for every `@thing++`, subtracts a point for every `@thing--`, and shows a leaderboard when asked `@botname leaderboard`.
-
-###Get In Touch
+### Get In Touch
 [@pvzig](https://twitter.com/pvzig)

 <peter@launchsoft.co>
@@ -1,17 +0,0 @@
-Pod::Spec.new do |s|
-  s.name             = "SlackKit"
-  s.version          = "1.0.2"
-  s.summary          = "a Slack client library for iOS and OS X written in Swift"
-  s.homepage         = "https://github.com/pvzig/SlackKit"
-  s.license          = 'MIT'
-  s.author           = { "Peter Zignego" => "peter@launchsoft.co" }
-  s.source           = { :git => "https://github.com/pvzig/SlackKit.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/pvzig'
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.9'
-  s.requires_arc = true
-  s.source_files = 'SlackKit/Sources/*.swift'  
-  s.frameworks = 'Foundation'
-  s.dependency 'Starscream', '~> 1.1.2'
-end
-
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+               BuildableName = "SlackKit.framework"
+               BlueprintName = "SlackKit OS X"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit OS X"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit OS X"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "263993951CE90EE0004A6E93"
+               BuildableName = "SlackKit.framework"
+               BlueprintName = "SlackKit iOS"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "263993951CE90EE0004A6E93"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit iOS"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "263993951CE90EE0004A6E93"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit iOS"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "263993B41CE90EED004A6E93"
+               BuildableName = "SlackKit.framework"
+               BlueprintName = "SlackKit tvOS"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "263993B41CE90EED004A6E93"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit tvOS"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "263993B41CE90EED004A6E93"
+            BuildableName = "SlackKit.framework"
+            BlueprintName = "SlackKit tvOS"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:SlackKit.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>
@@ -0,0 +1,104 @@
+//
+// Action.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.
+
+public struct Action {
+    
+    public let name: String?
+    public let text: String?
+    public let type: String?
+    public let value: String?
+    public let style: ActionStyle?
+    public let confirm: Confirm?
+    
+    internal init(action:[String: AnyObject]?) {
+        name = action?["name"] as? String
+        text = action?["text"] as? String
+        type = action?["type"] as? String
+        value = action?["value"] as? String
+        style = ActionStyle(rawValue: action?["style"] as? String ?? "")
+        confirm = Confirm(confirm:action?["confirm"] as? [String: AnyObject])
+    }
+    
+    public init(name: String, text: String, style: ActionStyle = .Default, value: String? = nil, confirm: Confirm? = nil) {
+        self.type = "button"
+        self.name = name
+        self.text = text
+        self.value = value
+        self.style = style
+        self.confirm = confirm
+    }
+    
+    internal func dictionary() -> [String: AnyObject] {
+        var dict = [String: AnyObject]()
+        dict["name"] = name
+        dict["text"] = text
+        dict["type"] = type
+        dict["value"] = value
+        dict["confirm"] = confirm?.dictionary()
+        return dict
+    }
+    
+    public struct Confirm {
+        
+        public let title: String?
+        public let text: String?
+        public let okText: String?
+        public let dismissText: String?
+        
+        internal init(confirm:[String: AnyObject]?) {
+            title = confirm?["title"] as? String
+            text = confirm?["text"] as? String
+            okText = confirm?["ok_text"] as? String
+            dismissText = confirm?["dismiss_text"] as? String
+        }
+        
+        public init(text: String, title: String? = nil, okText: String? = nil, dismissText: String? = nil) {
+            self.text = text
+            self.title = title
+            self.okText = okText
+            self.dismissText = dismissText
+        }
+        
+        internal func dictionary() -> [String: AnyObject] {
+            var dict = [String: AnyObject]()
+            dict["title"] = title
+            dict["text"] = text
+            dict["ok_text"] = okText
+            dict["dismiss_text"] = dismissText
+            return dict
+        }
+        
+    }
+    
+}
+
+public enum ActionStyle: String {
+    case Default = "default"
+    case Primary = "primary"
+    case Danger = "danger"
+}
+
+public enum ResponseType: String {
+    case InChannel = "in_channel"
+    case Ephemeral = "ephemeral"
+}
@@ -21,11 +21,11 @@
 // 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 callbackID: String?
+    public let type: String?
    public let color: String?
    public let pretext: String?
    public let authorName: String?
@@ -35,11 +35,17 @@ public struct Attachment {
    public let titleLink: String?
    public let text: String?
    public let fields: [AttachmentField]?
+    public let actions: [Action]?
    public let imageURL: String?
    public let thumbURL: String?
+    public let footer: String?
+    public let footerIcon: String?
+    public let ts: Int?

-    internal init?(attachment: [String: AnyObject]?) {
+    internal init(attachment: [String: AnyObject]?) {
        fallback = attachment?["fallback"] as? String
+        callbackID = attachment?["callback_id"] as? String
+        type = attachment?["attachment_type"] as? String
        color = attachment?["color"] as? String
        pretext = attachment?["pretext"] as? String
        authorName = attachment?["author_name"] as? String
@@ -50,13 +56,17 @@ public struct Attachment {
        text = attachment?["text"] as? String
        imageURL = attachment?["image_url"] as? String
        thumbURL = attachment?["thumb_url"] as? String
-        fields = (attachment?["fields"] as? [[String: AnyObject]])?.objectArrayFromDictionaryArray({(field) -> AttachmentField? in
-            return AttachmentField(field: field)
-        })
+        footer = attachment?["footer"] as? String
+        footerIcon = attachment?["footer_icon"] as? String
+        ts = attachment?["ts"] as? Int
+        fields = (attachment?["fields"] as? [[String: AnyObject]])?.map { AttachmentField(field: $0) }
+        actions = (attachment?["actions"] as? [[String: AnyObject]])?.map { Action(action: $0) }
    }
    
-    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: [AttachmentField]? = nil, imageURL: String? = nil, thumbURL: String? = nil) {
+    public init(fallback: String, title:String, callbackID: String? = nil, type: String? = nil, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, actions: [Action]? = nil, imageURL: String? = nil, thumbURL: String? = nil, footer: String? = nil, footerIcon:String? = nil, ts:Int? = nil) {
        self.fallback = fallback
+        self.callbackID = callbackID
+        self.type = type
        self.color = colorHex
        self.pretext = pretext
        self.authorName = authorName
@@ -66,13 +76,19 @@ public struct Attachment {
        self.titleLink = titleLink
        self.text = text
        self.fields = fields
+        self.actions = actions
        self.imageURL = imageURL
        self.thumbURL = thumbURL
+        self.footer = footer
+        self.footerIcon = footerIcon
+        self.ts = ts
    }
    
    internal func dictionary() -> [String: AnyObject] {
        var attachment = [String: AnyObject]()
        attachment["fallback"] = fallback
+        attachment["callback_id"] = callbackID
+        attachment["attachment_type"] = type
        attachment["color"] = color
        attachment["pretext"] = pretext
        attachment["authorName"] = authorName
@@ -81,48 +97,20 @@ public struct Attachment {
        attachment["title"] = title
        attachment["title_link"] = titleLink
        attachment["text"] = text
-        attachment["fields"] = fieldJSONArray(fields)
+        attachment["fields"] = fields?.map{$0.dictionary()}
+        attachment["actions"] = actions?.map{$0.dictionary()}
        attachment["image_url"] = imageURL
        attachment["thumb_url"] = thumbURL
+        attachment["footer"] = footer
+        attachment["footer_icon"] = footerIcon
+        attachment["ts"] = ts
        return attachment
    }
    
-    private func fieldJSONArray(fields: [AttachmentField]?) -> [[String: AnyObject]] {
-        var returnValue = [[String: AnyObject]]()
-        if let f = fields {
-            for field in f {
-                returnValue.append(field.dictionary())
-            }
-        }
-        return returnValue
-    }
-    
 }

-public struct AttachmentField {
-    
-    public let title: String?
-    public let value: String?
-    public let short: Bool?
-    
-    internal init?(field: [String: AnyObject]?) {
-        title = field?["title"] as? String
-        value = field?["value"] as? String
-        short = field?["short"] as? Bool
-    }
-    
-    public init(title:String, value:String, short: Bool? = nil) {
-        self.title = title
-        self.value = value.slackFormatEscaping()
-        self.short = short
-    }
-    
-    internal func dictionary() -> [String: AnyObject] {
-        var field = [String: AnyObject]()
-        field["title"] = title
-        field["value"] = value
-        field["short"] = short
-        return field
-    }
-    
+public enum AttachmentColor: String {
+    case Good = "good"
+    case Warning = "warning"
+    case Danger = "danger"
 }
@@ -0,0 +1,50 @@
+//
+// AttachmentField.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.
+
+public struct AttachmentField {
+    
+    public let title: String?
+    public let value: String?
+    public let short: Bool?
+    
+    internal init(field: [String: AnyObject]?) {
+        title = field?["title"] as? String
+        value = field?["value"] as? String
+        short = field?["short"] as? Bool
+    }
+    
+    public init(title:String, value:String, short: Bool? = nil) {
+        self.title = title
+        self.value = value.slackFormatEscaping()
+        self.short = short
+    }
+    
+    internal func dictionary() -> [String: AnyObject] {
+        var field = [String: AnyObject]()
+        field["title"] = title
+        field["value"] = value
+        field["short"] = short
+        return field
+    }
+    
+}
@@ -0,0 +1,48 @@
+//
+// AuthorizeRequest.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 AuthorizeRequest {
+    
+    let clientID: String
+    let scope: [Scope]
+    let redirectURI: String
+    let state: String
+    let team: String?
+    
+    var parameters: [String: AnyObject] {
+        var json = [String : AnyObject]()
+        json["scope"] = scope.map({$0.rawValue}).joined(separator: ",")
+        json["state"] = state
+        json["team"] = team
+        return json
+    }
+    
+    init(clientID: String, scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil) {
+        self.clientID = clientID
+        self.scope = scope
+        self.redirectURI = redirectURI
+        self.state = state
+        self.team = team
+    }
+
+}
@@ -0,0 +1,36 @@
+//
+// AuthorizeResponse.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 AuthorizeResponse {
+    
+    let code: String
+    let state: String
+    
+    init?(queryParameters: [(String, String)]) {
+        guard let code = queryParameters.first?.1, let state = queryParameters.last?.1 else {
+            return nil
+        }
+        self.code = code
+        self.state = state
+    }
+}
@@ -24,13 +24,19 @@
 public struct Bot {
    
    public let id: String?
+    internal(set) public var botToken: String?
    internal(set) public var name: String?
    internal(set) public var icons: [String: AnyObject]?
    
-    internal init?(bot: [String: AnyObject]?) {
+    internal init(bot: [String: AnyObject]?) {
        id = bot?["id"] as? String
        name = bot?["name"] as? String
        icons = bot?["icons"] as? [String: AnyObject]
    }
    
+    internal init(botUser: [String: AnyObject]?) {
+        id = botUser?["bot_user_id"] as? String
+        botToken = botUser?["bot_access_token"] as? String
+    }
+    
 }
@@ -38,10 +38,10 @@ public struct Channel {
    internal(set) public var topic: Topic?
    internal(set) public var purpose: Topic?
    internal(set) public var isMember: Bool?
-    internal(set) public var lastRead: String?
+    public var lastRead: String?
    internal(set) public var latest: Message?
-    internal(set) public var unread: Int?
-    internal(set) public var unreadCountDisplay: Int?
+    public var unread: Int?
+    public var unreadCountDisplay: Int?
    internal(set) public var hasPins: Bool?
    internal(set) public var members: [String]?
    // Client use
@@ -49,7 +49,7 @@ public struct Channel {
    internal(set) public var usersTyping = [String]()
    internal(set) public var messages = [String: Message]()
    
-    internal init?(channel: [String: AnyObject]?) {
+    internal init(channel: [String: AnyObject]?) {
        id = channel?["id"] as? String
        name = channel?["name"] as? String
        created = channel?["created"] as? Int
@@ -70,15 +70,15 @@ public struct Channel {
        unreadCountDisplay = channel?["unread_count_display"] as? Int
        hasPins = channel?["has_pins"] as? Bool
        members = channel?["members"] as? [String]
-        
-        if (Message(message: channel?["latest"] as? [String: AnyObject])?.ts == nil) {
-            latest = Message(ts: channel?["latest"] as? String)
+
+        if let latestMsgDictionary = channel?["latest"] as? [String: AnyObject] {
+            latest = Message(message: latestMsgDictionary)
        } else {
-            latest = Message(message: channel?["latest"] as? [String: AnyObject])
+            latest = Message(ts: channel?["latest"] as? String)
        }
    }
    
-    internal init?(id:String?) {
+    internal init(id:String?) {
        self.id = id
        created = nil
        creator = nil
@@ -0,0 +1,177 @@
+//
+// Client+EventDispatching.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 extension Client {
+
+    func dispatch(_ event: [String: AnyObject]) {
+        let event = Event(event: event)
+        guard let type = event.type else {
+            return
+        }
+        switch type {
+        case .Hello:
+            connected = true
+            connectionEventsDelegate?.clientConnected(self)
+        case .Ok:
+            messageSent(event)
+        case .Message:
+            if (event.subtype != nil) {
+                messageDispatcher(event)
+            } else {
+                messageReceived(event)
+            }
+        case .UserTyping:
+            userTyping(event)
+        case .ChannelMarked, .IMMarked, .GroupMarked:
+            channelMarked(event)
+        case .ChannelCreated, .IMCreated:
+            channelCreated(event)
+        case .ChannelJoined, .GroupJoined:
+            channelJoined(event)
+        case .ChannelLeft, .GroupLeft:
+            channelLeft(event)
+        case .ChannelDeleted:
+            channelDeleted(event)
+        case .ChannelRenamed, .GroupRename:
+            channelRenamed(event)
+        case .ChannelArchive, .GroupArchive:
+            channelArchived(event, archived: true)
+        case .ChannelUnarchive, .GroupUnarchive:
+            channelArchived(event, archived: false)
+        case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
+            channelHistoryChanged(event)
+        case .DNDUpdated:
+            doNotDisturbUpdated(event)
+        case .DNDUpatedUser:
+            doNotDisturbUserUpdated(event)
+        case .IMOpen, .GroupOpen:
+            open(event, open: true)
+        case .IMClose, .GroupClose:
+            open(event, open: false)
+        case .FileCreated:
+            processFile(event)
+        case .FileShared:
+            processFile(event)
+        case .FileUnshared:
+            processFile(event)
+        case .FilePublic:
+            processFile(event)
+        case .FilePrivate:
+            filePrivate(event)
+        case .FileChanged:
+            processFile(event)
+        case .FileDeleted:
+            deleteFile(event)
+        case .FileCommentAdded:
+            fileCommentAdded(event)
+        case .FileCommentEdited:
+            fileCommentEdited(event)
+        case .FileCommentDeleted:
+            fileCommentDeleted(event)
+        case .PinAdded:
+            pinAdded(event)
+        case .PinRemoved:
+            pinRemoved(event)
+        case .Pong:
+            pong(event)
+        case .PresenceChange:
+            presenceChange(event)
+        case .ManualPresenceChange:
+            manualPresenceChange(event)
+        case .PrefChange:
+            changePreference(event)
+        case .UserChange:
+            userChange(event)
+        case .TeamJoin:
+            teamJoin(event)
+        case .StarAdded:
+            itemStarred(event, star: true)
+        case .StarRemoved:
+            itemStarred(event, star: false)
+        case .ReactionAdded:
+            addedReaction(event)
+        case .ReactionRemoved:
+            removedReaction(event)
+        case .EmojiChanged:
+            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:
+            teamPlanChange(event)
+        case .TeamPrefChange:
+            teamPreferenceChange(event)
+        case .TeamRename:
+            teamNameChange(event)
+        case .TeamDomainChange:
+            teamDomainChange(event)
+        case .EmailDomainChange:
+            emailDomainChange(event)
+        case .TeamProfileChange:
+            teamProfileChange(event)
+        case .TeamProfileDelete:
+            teamProfileDeleted(event)
+        case .TeamProfileReorder:
+            teamProfileReordered(event)
+        case .BotAdded:
+            bot(event)
+        case .BotChanged:
+            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:
+            connect(options: options ?? ClientOptions())
+        case .ReconnectURL:
+            // The reconnect_url event is currently unsupported and experimental.
+            break
+        case .SubteamCreated, .SubteamUpdated:
+            subteam(event)
+        case .SubteamSelfAdded:
+            subteamAddedSelf(event)
+        case.SubteamSelfRemoved:
+            subteamRemovedSelf(event)
+        case .Error:
+            print("Error: \(event)")
+            break
+        }
+    }
+    
+    func messageDispatcher(_ event:Event) {
+        guard let value = event.subtype, let subtype = MessageSubtype(rawValue:value) else {
+            return
+        }
+        switch subtype {
+        case .MessageChanged:
+            messageChanged(event)
+        case .MessageDeleted:
+            messageDeleted(event)
+        default:
+            messageReceived(event)
+        }
+    }
+    
+}
@@ -0,0 +1,563 @@
+//
+// Client+EventHandling.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 extension Client {
+
+    //MARK: - Pong
+    func pong(_ event: Event) {
+        pong = event.replyTo
+    }
+    
+    //MARK: - Messages
+    func messageSent(_ event: Event) {
+        guard let reply = event.replyTo, let message = sentMessages[NSNumber(value: reply).stringValue], let channel = message.channel, let ts = message.ts else {
+            return
+        }
+        
+        message.ts = event.ts
+        message.text = event.text
+        channels[channel]?.messages[ts] = message
+        messageEventsDelegate?.messageSent(self, message: message)
+    }
+    
+    func messageReceived(_ event: Event) {
+        guard let channel = event.channel, let message = event.message, let id = channel.id, let ts = message.ts else {
+            return
+        }
+        
+        channels[id]?.messages[ts] = message
+        messageEventsDelegate?.messageReceived(self, message: message)
+    }
+    
+    func messageChanged(_ event: Event) {
+        guard let id = event.channel?.id, let nested = event.nestedMessage, let ts = nested.ts else {
+            return
+        }
+        
+        channels[id]?.messages[ts] = nested
+        messageEventsDelegate?.messageChanged(self, message: nested)
+    }
+    
+    func messageDeleted(_ event: Event) {
+        guard let id = event.channel?.id, let key = event.message?.deletedTs, let message = channels[id]?.messages[key] else {
+            return
+        }
+        
+        _ = channels[id]?.messages.removeValue(forKey: key)
+        messageEventsDelegate?.messageDeleted(self, message: message)
+    }
+    
+    //MARK: - Channels
+    func userTyping(_ event: Event) {
+        guard let channel = event.channel, let channelID = channel.id, let user = event.user, let userID = user.id ,
+            channels.index(forKey: channelID) != nil && !channels[channelID]!.usersTyping.contains(userID) else {
+            return
+        }
+
+        channels[channelID]?.usersTyping.append(userID)
+        channelEventsDelegate?.userTyping(self, channel: channel, user: user)
+
+        let timeout = DispatchTime.now() + Double(Int64(5.0 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+        DispatchQueue.main.after(when: timeout) {
+            if let index = self.channels[channelID]?.usersTyping.index(of: userID) {
+                self.channels[channelID]?.usersTyping.remove(at: index)
+            }
+        }
+    }
+
+    func channelMarked(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id, let timestamp = event.ts else {
+            return
+        }
+        
+        channels[id]?.lastRead = event.ts
+        channelEventsDelegate?.channelMarked(self, channel: channel, timestamp: timestamp)
+    }
+    
+    func channelCreated(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels[id] = channel
+        channelEventsDelegate?.channelCreated(self, channel: channel)
+    }
+    
+    func channelDeleted(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels.removeValue(forKey: id)
+        channelEventsDelegate?.channelDeleted(self, channel: channel)
+    }
+    
+    func channelJoined(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels[id] = event.channel
+        channelEventsDelegate?.channelJoined(self, channel: channel)
+    }
+    
+    func channelLeft(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        if let userID = authenticatedUser?.id, let index = channels[id]?.members?.index(of: userID) {
+            channels[id]?.members?.remove(at: index)
+        }
+        channelEventsDelegate?.channelLeft(self, channel: channel)
+    }
+    
+    func channelRenamed(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels[id]?.name = channel.name
+        channelEventsDelegate?.channelRenamed(self, channel: channel)
+    }
+    
+    func channelArchived(_ event: Event, archived: Bool) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels[id]?.isArchived = archived
+        channelEventsDelegate?.channelArchived(self, channel: channel)
+    }
+    
+    func channelHistoryChanged(_ event: Event) {
+        guard let channel = event.channel else {
+            return
+        }
+        channelEventsDelegate?.channelHistoryChanged(self, channel: channel)
+    }
+    
+    //MARK: - Do Not Disturb
+    func doNotDisturbUpdated(_ event: Event) {
+        guard let dndStatus = event.dndStatus else {
+            return
+        }
+        
+        authenticatedUser?.doNotDisturbStatus = dndStatus
+        doNotDisturbEventsDelegate?.doNotDisturbUpdated(self, dndStatus: dndStatus)
+    }
+    
+    func doNotDisturbUserUpdated(_ event: Event) {
+        guard let dndStatus = event.dndStatus, let user = event.user, let id = user.id else {
+            return
+        }
+        
+        users[id]?.doNotDisturbStatus = dndStatus
+        doNotDisturbEventsDelegate?.doNotDisturbUserUpdated(self, dndStatus: dndStatus, user: user)
+    }
+    
+    //MARK: - IM & Group Open/Close
+    func open(_ event: Event, open: Bool) {
+        guard let channel = event.channel, let id = channel.id else {
+            return
+        }
+        
+        channels[id]?.isOpen = open
+        groupEventsDelegate?.groupOpened(self, group: channel)
+    }
+    
+    //MARK: - Files
+    func processFile(_ event: Event) {
+        guard let file = event.file, let id = file.id else {
+            return
+        }
+        if let comment = file.initialComment, let commentID = comment.id {
+            if files[id]?.comments[commentID] == nil {
+                files[id]?.comments[commentID] = comment
+            }
+        }
+            
+        files[id] = file
+        fileEventsDelegate?.fileProcessed(self, file: file)
+    }
+    
+    func filePrivate(_ event: Event) {
+        guard let file =  event.file, let id = file.id else {
+            return
+        }
+        
+        files[id]?.isPublic = false
+        fileEventsDelegate?.fileMadePrivate(self, file: file)
+    }
+    
+    func deleteFile(_ event: Event) {
+        guard let file = event.file, let id = file.id else {
+            return
+        }
+        
+        if files[id] != nil {
+            files.removeValue(forKey: id)
+        }
+        fileEventsDelegate?.fileDeleted(self, file: file)
+    }
+    
+    func fileCommentAdded(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
+            return
+        }
+        
+        files[id]?.comments[commentID] = comment
+        fileEventsDelegate?.fileCommentAdded(self, file: file, comment: comment)
+    }
+    
+    func fileCommentEdited(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
+            return
+        }
+        
+        files[id]?.comments[commentID]?.comment = comment.comment
+        fileEventsDelegate?.fileCommentEdited(self, file: file, comment: comment)
+    }
+    
+    func fileCommentDeleted(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
+            return
+        }
+        
+        _ = files[id]?.comments.removeValue(forKey: commentID)
+        fileEventsDelegate?.fileCommentDeleted(self, file: file, comment: comment)
+    }
+    
+    //MARK: - Pins
+    func pinAdded(_ event: Event) {
+        guard let id = event.channelID, let item = event.item else {
+            return
+        }
+        
+        channels[id]?.pinnedItems.append(item)
+        pinEventsDelegate?.itemPinned(self, item: item, channel: channels[id])
+    }
+    
+    func pinRemoved(_ event: Event) {
+        guard let id = event.channelID, let item = event.item else {
+            return
+        }
+
+        if let pins = channels[id]?.pinnedItems.filter({$0 != item}) {
+            channels[id]?.pinnedItems = pins
+        }
+        pinEventsDelegate?.itemUnpinned(self, item: item, channel: channels[id])
+    }
+
+    //MARK: - Stars
+    func itemStarred(_ event: Event, star: Bool) {
+        guard let item = event.item, let type = item.type else {
+            return
+        }
+        switch type {
+        case "message":
+            starMessage(item, star: star)
+        case "file":
+            starFile(item, star: star)
+        case "file_comment":
+            starComment(item)
+        default:
+            break
+        }
+            
+        starEventsDelegate?.itemStarred(self, item: item, star: star)
+    }
+    
+    func starMessage(_ item: Item, star: Bool) {
+        guard let message = item.message, let ts = message.ts, let channel = item.channel , channels[channel]?.messages[ts] != nil else {
+            return
+        }
+        channels[channel]?.messages[ts]?.isStarred = star
+    }
+    
+    func starFile(_ item: Item, star: Bool) {
+        guard let file = item.file, let id = file.id else {
+            return
+        }
+        
+        files[id]?.isStarred = star
+        if let stars = files[id]?.stars {
+            if star == true {
+                files[id]?.stars = stars + 1
+            } else {
+                if stars > 0 {
+                    files[id]?.stars = stars - 1
+                }
+            }
+        }
+    }
+    
+    func starComment(_ item: Item) {
+        guard let file = item.file, let id = file.id, let comment = item.comment, let commentID = comment.id else {
+            return
+        }
+        files[id]?.comments[commentID] = comment
+    }
+    
+    //MARK: - Reactions
+    func addedReaction(_ event: Event) {
+        guard let item = event.item, let type = item.type, let reaction = event.reaction, let userID = event.user?.id, let itemUser = event.itemUser else {
+            return
+        }
+        
+        switch type {
+        case "message":
+            guard let channel = item.channel, let ts = item.ts, let message = channels[channel]?.messages[ts] else {
+                return
+            }
+            message.reactions.append(Reaction(name: reaction, user: userID))
+        case "file":
+            guard let id = item.file?.id else {
+                return
+            }
+            files[id]?.reactions.append(Reaction(name: reaction, user: userID))
+        case "file_comment":
+            guard let id = item.file?.id, let commentID = item.fileCommentID else {
+                return
+            }
+            files[id]?.comments[commentID]?.reactions.append(Reaction(name: reaction, user: userID))
+        default:
+            break
+        }
+
+        reactionEventsDelegate?.reactionAdded(self, reaction: reaction, item: item, itemUser: itemUser)
+    }
+
+    func removedReaction(_ event: Event) {
+        guard let item = event.item, let type = item.type, let key = event.reaction, let userID = event.user?.id, let itemUser = event.itemUser else {
+            return
+        }
+
+        switch type {
+        case "message":
+            guard let channel = item.channel, let ts = item.ts, let message = channels[channel]?.messages[ts] else {
+                return
+            }
+            message.reactions = message.reactions.filter({$0.name != key && $0.user != userID})
+        case "file":
+            guard let itemFile = item.file, let id = itemFile.id else {
+                return
+            }
+            files[id]?.reactions = files[id]!.reactions.filter({$0.name != key && $0.user != userID})
+        case "file_comment":
+            guard let id = item.file?.id, let commentID = item.fileCommentID else {
+                return
+            }
+            files[id]?.comments[commentID]?.reactions = files[id]!.comments[commentID]!.reactions.filter({$0.name != key && $0.user != userID})
+        default:
+            break
+        }
+
+        reactionEventsDelegate?.reactionRemoved(self, reaction: key, item: item, itemUser: itemUser)
+    }
+
+    //MARK: - Preferences
+    func changePreference(_ event: Event) {
+        guard let name = event.name else {
+            return
+        }
+        
+        authenticatedUser?.preferences?[name] = event.value
+        slackEventsDelegate?.preferenceChanged(self, preference: name, value: event.value)
+    }
+    
+    //Mark: - User Change
+    func userChange(_ event: Event) {
+        guard let user = event.user, let id = user.id else {
+            return
+        }
+        
+        let preferences = users[id]?.preferences
+        users[id] = user
+        users[id]?.preferences = preferences
+        slackEventsDelegate?.userChanged(self, user: user)
+    }
+    
+    //MARK: - User Presence
+    func presenceChange(_ event: Event) {
+        guard let user = event.user, let id = user.id, let presence = event.presence else {
+            return
+        }
+        
+        users[id]?.presence = event.presence
+        slackEventsDelegate?.presenceChanged(self, user: user, presence: presence)
+    }
+    
+    //MARK: - Team
+    func teamJoin(_ event: Event) {
+        guard let user = event.user, let id = user.id else {
+            return
+        }
+        
+        users[id] = user
+        teamEventsDelegate?.teamJoined(self, user: user)
+    }
+    
+    func teamPlanChange(_ event: Event) {
+        guard let plan = event.plan else {
+            return
+        }
+        
+        team?.plan = plan
+        teamEventsDelegate?.teamPlanChanged(self, plan: plan)
+    }
+    
+    func teamPreferenceChange(_ event: Event) {
+        guard let name = event.name else {
+            return
+        }
+        
+        team?.prefs?[name] = event.value
+        teamEventsDelegate?.teamPreferencesChanged(self, preference: name, value: event.value)
+    }
+    
+    func teamNameChange(_ event: Event) {
+        guard let name = event.name else {
+            return
+        }
+        
+        team?.name = name
+        teamEventsDelegate?.teamNameChanged(self, name: name)
+    }
+    
+    func teamDomainChange(_ event: Event) {
+        guard let domain = event.domain else {
+            return
+        }
+        
+        team?.domain = domain
+        teamEventsDelegate?.teamDomainChanged(self, domain: domain)
+    }
+    
+    func emailDomainChange(_ event: Event) {
+        guard let domain = event.emailDomain else {
+            return
+        }
+        
+        team?.emailDomain = domain
+        teamEventsDelegate?.teamEmailDomainChanged(self, domain: domain)
+    }
+    
+    func emojiChanged(_ event: Event) {
+        teamEventsDelegate?.teamEmojiChanged(self)
+    }
+    
+    //MARK: - Bots
+    func bot(_ event: Event) {
+        guard let bot = event.bot, let id = bot.id else {
+            return
+        }
+        
+        bots[id] = bot
+        slackEventsDelegate?.botEvent(self, bot: bot)
+    }
+    
+    //MARK: - Subteams
+    func subteam(_ event: Event) {
+        guard let subteam = event.subteam, let id = subteam.id else {
+            return
+        }
+        
+        userGroups[id] = subteam
+        subteamEventsDelegate?.subteamEvent(self, userGroup: subteam)
+    }
+    
+    func subteamAddedSelf(_ event: Event) {
+        guard let subteamID = event.subteamID, let _ = authenticatedUser?.userGroups else {
+            return
+        }
+        
+        authenticatedUser?.userGroups![subteamID] = subteamID
+        subteamEventsDelegate?.subteamSelfAdded(self, subteamID: subteamID)
+    }
+    
+    func subteamRemovedSelf(_ event: Event) {
+        guard let subteamID = event.subteamID else {
+            return
+        }
+        
+        _ = authenticatedUser?.userGroups?.removeValue(forKey: subteamID)
+        subteamEventsDelegate?.subteamSelfRemoved(self, subteamID: subteamID)
+    }
+    
+    //MARK: - Team Profiles
+    func teamProfileChange(_ event: Event) {
+        guard let profile = event.profile else {
+            return
+        }
+
+        for user in users {
+            for key in profile.fields.keys {
+                users[user.0]?.profile?.customProfile?.fields[key]?.updateProfileField(profile.fields[key])
+            }
+        }
+        
+        teamProfileEventsDelegate?.teamProfileChanged(self, profile: profile)
+    }
+    
+    func teamProfileDeleted(_ event: Event) {
+        guard let profile = event.profile else {
+            return
+        }
+
+        for user in users {
+            if let id = profile.fields.first?.0 {
+                users[user.0]?.profile?.customProfile?.fields[id] = nil
+            }
+        }
+        
+        teamProfileEventsDelegate?.teamProfileDeleted(self, profile: profile)
+    }
+    
+    func teamProfileReordered(_ event: Event) {
+        guard let profile = event.profile else {
+            return
+        }
+
+        for user in users {
+            for key in profile.fields.keys {
+                users[user.0]?.profile?.customProfile?.fields[key]?.ordering = profile.fields[key]?.ordering
+            }
+        }
+
+        teamProfileEventsDelegate?.teamProfileReordered(self, profile: profile)
+    }
+    
+    //MARK: - Authenticated User
+    func manualPresenceChange(_ event: Event) {
+        guard let presence = event.presence, let user = authenticatedUser else {
+            return
+        }
+        
+        authenticatedUser?.presence = presence
+        slackEventsDelegate?.manualPresenceChanged(self, user: user, presence: presence)
+    }
+    
+}
@@ -1,5 +1,5 @@
 //
-// ClientExtensions.swift
+// Client+Utilities.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -21,20 +21,29 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-import Foundation
+public enum ClientError: ErrorProtocol {
+    case channelDoesNotExist
+    case userDoesNotExist
+}

-extension Client {
+public extension Client {
    
    //MARK: - User & Channel
-    public func getChannelIDByName(name: String) -> String? {
-        return channels.filter{$0.1.name == stripString(name)}.first?.0
+    public func getChannelIDByName(_ name: String) throws -> String {
+        guard let id = channels.filter({$0.1.name == stripString(name)}).first?.0 else {
+            throw ClientError.channelDoesNotExist
+        }
+        return id
    }
-    
-    public func getUserIDByName(name: String) -> String? {
-        return users.filter{$0.1.name == stripString(name)}.first?.0
+
+    public func getUserIDByName(_ name: String) throws -> String {
+        guard let id = users.filter({$0.1.name == stripString(name)}).first?.0 else {
+            throw ClientError.userDoesNotExist
+        }
+        return id
    }
-    
-    public func getImIDForUserWithID(id: String, success: (imID: String?)->Void, failure: (error: SlackError)->Void) {
+
+    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 {
@@ -43,54 +52,13 @@ extension Client {
            webAPI.openIM(id, success: success, failure: failure)
        }
    }
-    
+
    //MARK: - Utilities
-    internal func stripString(string: String) -> String? {
+    internal func stripString(_ string: String) -> String {
        var strippedString = string
        if string[string.startIndex] == "@" || string[string.startIndex] == "#" {
-            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
+            strippedString = string.substring(from: string.characters.index(string.startIndex, offsetBy: 1))
        }
        return strippedString
    }
 }
-
-public enum AttachmentColor: String {
-    case Good = "good"
-    case Warning = "warning"
-    case Danger = "danger"
-}
-
-public extension NSDate {
-
-    func slackTimestamp() -> Double {
-        return NSNumber(double: timeIntervalSince1970).doubleValue
-    }
-    
-}
-
-internal extension String {
-    
-    func slackFormatEscaping() -> String {
-        var escapedString = stringByReplacingOccurrencesOfString("&", withString: "&amp;")
-        escapedString = stringByReplacingOccurrencesOfString("<", withString: "&lt;")
-        escapedString = stringByReplacingOccurrencesOfString(">", withString: "&gt;")
-        return escapedString
-    }
-
-}
-
-internal extension Array {
-
-    func objectArrayFromDictionaryArray<T>(intializer:([String: AnyObject])->T?) -> [T] {
-        var returnValue = [T]()
-        for object in self {
-            if let dictionary = object as? [String: AnyObject] {
-                if let value = intializer(dictionary) {
-                    returnValue.append(value)
-                }
-            }
-        }
-        return returnValue
-    }
-    
-}
@@ -24,10 +24,9 @@
 import Foundation
 import Starscream

-public class Client: WebSocketDelegate {
+public final class Client: WebSocketDelegate {
    
    internal(set) public var connected = false
-    internal(set) public var authenticated = false
    internal(set) public var authenticatedUser: User?
    internal(set) public var team: Team?
    
@@ -38,62 +37,55 @@ public class Client: WebSocketDelegate {
    internal(set) public var files = [String: File]()
    internal(set) public var sentMessages = [String: Message]()
    
-    //MARK: - Delegates
-    public var slackEventsDelegate: SlackEventsDelegate?
-    public var messageEventsDelegate: MessageEventsDelegate?
-    public var doNotDisturbEventsDelegate: DoNotDisturbEventsDelegate?
-    public var channelEventsDelegate: ChannelEventsDelegate?
-    public var groupEventsDelegate: GroupEventsDelegate?
-    public var fileEventsDelegate: FileEventsDelegate?
-    public var pinEventsDelegate: PinEventsDelegate?
-    public var starEventsDelegate: StarEventsDelegate?
-    public var reactionEventsDelegate: ReactionEventsDelegate?
-    public var teamEventsDelegate: TeamEventsDelegate?
-    public var subteamEventsDelegate: SubteamEventsDelegate?
-    public var teamProfileEventsDelegate: TeamProfileEventsDelegate?
+    public var token = "xoxp-SLACK_AUTH_TOKEN"
    
-    public var token = "SLACK_AUTH_TOKEN"
-    
-    public func setAuthToken(token: String) {
-        self.token = token
-    }
-    
-    public var webAPI: SlackWebAPI {
-        return SlackWebAPI(client: self)
+    public var webAPI: WebAPI {
+        return WebAPI(token: token)
    }

    internal var webSocket: WebSocket?
-    internal let api = NetworkInterface()
-    private var dispatcher: EventDispatcher?
-    
-    private let pingPongQueue = dispatch_queue_create("com.launchsoft.SlackKit", DISPATCH_QUEUE_SERIAL)
+    private let pingPongQueue = DispatchQueue(label: "com.launchsoft.SlackKit", attributes: DispatchQueueAttributes.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) {
+    internal var options: ClientOptions?
+        
+    //MARK: - Delegates
+    public weak var connectionEventsDelegate: ConnectionEventsDelegate?
+    public weak var slackEventsDelegate: SlackEventsDelegate?
+    public weak var messageEventsDelegate: MessageEventsDelegate?
+    public weak var doNotDisturbEventsDelegate: DoNotDisturbEventsDelegate?
+    public weak var channelEventsDelegate: ChannelEventsDelegate?
+    public weak var groupEventsDelegate: GroupEventsDelegate?
+    public weak var fileEventsDelegate: FileEventsDelegate?
+    public weak var pinEventsDelegate: PinEventsDelegate?
+    public weak var starEventsDelegate: StarEventsDelegate?
+    public weak var reactionEventsDelegate: ReactionEventsDelegate?
+    public weak var teamEventsDelegate: TeamEventsDelegate?
+    public weak var subteamEventsDelegate: SubteamEventsDelegate?
+    public weak var teamProfileEventsDelegate: TeamProfileEventsDelegate?
+
+    // If you already have an API token
+    internal init(apiToken: String) {
        self.token = apiToken
    }
    
-    public func connect(simpleLatest simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: NSTimeInterval? = nil, timeout: NSTimeInterval? = nil, reconnect: Bool? = nil) {
-        self.pingInterval = pingInterval
-        self.timeout = timeout
-        self.reconnect = reconnect
-        dispatcher = EventDispatcher(client: self)
-        webAPI.rtmStart(simpleLatest, noUnreads: noUnreads, mpimAware: mpimAware, success: {
+    public func setAuthToken(_ token: String) {
+        self.token = token
+    }
+    
+    public func connect(options: ClientOptions = ClientOptions()) {
+        self.options = options
+        webAPI.rtmStart(options.simpleLatest, noUnreads: options.noUnreads, mpimAware: options.mpimAware, 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()
+            guard let socketURL = response["url"] as? String, let url = URL(string: socketURL) else {
+                return
            }
+            self.initialSetup(response)
+            self.webSocket = WebSocket(url: url)
+            self.webSocket?.delegate = self
+            self.webSocket?.connect()
            }, failure: {(error) -> Void in
-                self.slackEventsDelegate?.clientConnectionFailed(error)
+                self.connectionEventsDelegate?.clientConnectionFailed(self, error: error)
            })
    }
    
@@ -102,77 +94,69 @@ public class Client: WebSocketDelegate {
    }
    
    //MARK: - RTM Message send
-    public func sendMessage(message: String, channelID: String) {
-        if (connected) {
-            if let data = formatMessageToSlackJsonString(msg: message, channel: channelID) {
-                if let string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
-                    webSocket?.writeString(string)
-                }
-            }
+    public func sendMessage(_ message: String, channelID: String) {
+        guard connected else { return }
+
+        if let data = try? formatMessageToSlackJsonString(msg: message, channel: channelID), let string = String(data: data, encoding: String.Encoding.utf8) {
+            webSocket?.write(string: string)
        }
    }
    
-    private func formatMessageToSlackJsonString(message: (msg: String, channel: String)) -> NSData? {
+    private func formatMessageToSlackJsonString(_ message: (msg: String, channel: String)) throws -> Data {
        let json: [String: AnyObject] = [
-            "id": NSDate().slackTimestamp(),
+            "id": Date().slackTimestamp(),
            "type": "message",
            "channel": message.channel,
            "text": message.msg.slackFormatEscaping()
        ]
        addSentMessage(json)
-        do {
-            let data = try NSJSONSerialization.dataWithJSONObject(json, options: NSJSONWritingOptions.PrettyPrinted)
-            return data
-        }
-        catch _ {
-            return nil
-        }
+        return try JSONSerialization.data(withJSONObject: json, options: [])
    }
    
-    private func addSentMessage(dictionary: [String: AnyObject]) {
+    private func addSentMessage(_ dictionary: [String: AnyObject]) {
        var message = dictionary
-        let ts = message["id"] as? NSNumber
-        message.removeValueForKey("id")
-        message["ts"] = ts?.stringValue
+        guard let id = message["id"] as? NSNumber else {
+            return
+        }
+        let ts = String(id)
+        message.removeValue(forKey: "id")
+        message["ts"] = ts
        message["user"] = self.authenticatedUser?.id
-        sentMessages[ts!.stringValue] = Message(message: message)
+        sentMessages[ts] = Message(message: message)
    }
    
    //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 {
+    private func pingRTMServerAtInterval(_ interval: TimeInterval) {
+        let delay = DispatchTime.now() + Double(Int64(interval * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+        pingPongQueue.after(when: delay, execute: {
+            guard self.connected && self.timeoutCheck() else {
                self.disconnect()
+                return
            }
+            self.sendRTMPing()
+            self.pingRTMServerAtInterval(interval)
        })
    }
    
    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 _ {
-                
-            }
+        guard connected else {
+            return
+        }
+        let json: [String: AnyObject] = [
+            "id": Date().slackTimestamp(),
+            "type": "ping",
+        ]
+        guard let data = try? JSONSerialization.data(withJSONObject: json, options: []) else {
+            return
+        }
+        if let string = String(data: data, encoding: String.Encoding.utf8) {
+            ping = json["id"] as? Double
+            webSocket?.write(string: string)
        }
    }
    
    private func timeoutCheck() -> Bool {
-        if let pong = pong, ping = ping, timeout = timeout {
+        if let pong = pong, let ping = ping, let timeout = options?.timeout {
            if pong - ping < timeout {
                return true
            } else {
@@ -185,7 +169,7 @@ public class Client: WebSocketDelegate {
    }
    
    //MARK: - Client setup
-    private func initialSetup(json: [String: AnyObject]) {
+    private 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])
@@ -198,30 +182,33 @@ public class Client: WebSocketDelegate {
        enumerateSubteams(json["subteams"] as? [String: AnyObject])
    }
    
-    private func addUser(aUser: [String: AnyObject]) {
-        if let user = User(user: aUser), id = user.id {
+    private func addUser(_ aUser: [String: AnyObject]) {
+        let user = User(user: aUser)
+        if let id = user.id {
            users[id] = user
        }
    }
    
-    private func addChannel(aChannel: [String: AnyObject]) {
-        if let channel = Channel(channel: aChannel), id = channel.id {
+    private func addChannel(_ aChannel: [String: AnyObject]) {
+        let channel = Channel(channel: aChannel)
+        if let id = channel.id {
            channels[id] = channel
        }
    }
    
-    private func addBot(aBot: [String: AnyObject]) {
-        if let bot = Bot(bot: aBot), id = bot.id {
+    private func addBot(_ aBot: [String: AnyObject]) {
+        let bot = Bot(bot: aBot)
+        if let id = bot.id {
            bots[id] = bot
        }
    }
    
-    private func enumerateSubteams(subteams: [String: AnyObject]?) {
+    private func enumerateSubteams(_ subteams: [String: AnyObject]?) {
        if let subteams = subteams {
            if let all = subteams["all"] as? [[String: AnyObject]] {
                for item in all {
                    let u = UserGroup(userGroup: item)
-                    self.userGroups[u!.id!] = u
+                    self.userGroups[u.id!] = u
                }
            }
            if let auth = subteams["self"] as? [String] {
@@ -234,7 +221,7 @@ public class Client: WebSocketDelegate {
    }
    
    // MARK: - Utilities
-    private func enumerateObjects(array: [AnyObject]?, initalizer: ([String: AnyObject])-> Void) {
+    private func enumerateObjects(_ array: [AnyObject]?, initalizer: ([String: AnyObject])-> Void) {
        if let array = array {
            for object in array {
                if let dictionary = object as? [String: AnyObject] {
@@ -246,37 +233,31 @@ public class Client: WebSocketDelegate {
    
    // MARK: - WebSocketDelegate
    public func websocketDidConnect(socket: WebSocket) {
-        if let pingInterval = pingInterval {
+        if let pingInterval = options?.pingInterval {
            pingRTMServerAtInterval(pingInterval)
        }
    }
    
-    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
+    public func websocketDidDisconnect(_ socket: WebSocket, error: NSError?) {
        connected = false
-        authenticated = false
        webSocket = nil
-        dispatcher = nil
        authenticatedUser = nil
-        slackEventsDelegate?.clientDisconnected()
-        if reconnect == true {
-            connect(pingInterval: pingInterval, timeout: timeout, reconnect: reconnect)
+        connectionEventsDelegate?.clientDisconnected(self)
+        if let options = options, options.reconnect == true {
+            connect(options: options)
        }
    }
    
-    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
-        guard let data = text.dataUsingEncoding(NSUTF8StringEncoding) else {
+    public func websocketDidReceiveMessage(_ socket: WebSocket, text: String) {
+        guard let data = text.data(using: String.Encoding.utf8) else {
            return
        }
-        do {
-            if let json = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as? [String: AnyObject] {
-                dispatcher?.dispatch(json)
-            }
-        }
-        catch _ {
-            
+
+        if let json = (try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.allowFragments)) as? [String: AnyObject] {
+            dispatch(json)
        }
    }
-    
-    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {}
+
+    public func websocketDidReceiveData(_ socket: WebSocket, data: Data) {}
    
 }
@@ -0,0 +1,44 @@
+//
+// ClientOptions.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 ClientOptions {
+    
+    let simpleLatest: Bool?
+    let noUnreads: Bool?
+    let mpimAware: Bool?
+    let pingInterval: TimeInterval?
+    let timeout: TimeInterval?
+    let reconnect: Bool?
+    
+    public init(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: TimeInterval? = nil, timeout: TimeInterval? = nil, reconnect: Bool? = nil) {
+        self.simpleLatest = simpleLatest
+        self.noUnreads = noUnreads
+        self.mpimAware = mpimAware
+        self.pingInterval = pingInterval
+        self.timeout = timeout
+        self.reconnect = reconnect
+    }
+    
+}
@@ -0,0 +1,52 @@
+//
+// Comment.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.
+
+public struct Comment {
+    public let id: String?
+    public let user: String?
+    internal(set) public var created: Int?
+    internal(set) public var comment: String?
+    internal(set) public var starred: Bool?
+    internal(set) public var stars: Int?
+    internal(set) public var reactions = [Reaction]()
+    
+    internal init(comment:[String: AnyObject]?) {
+        id = comment?["id"] as? String
+        created = comment?["created"] as? Int
+        user = comment?["user"] as? String
+        starred = comment?["is_starred"] as? Bool
+        stars = comment?["num_stars"] as? Int
+        self.comment = comment?["comment"] as? String
+    }
+    
+    internal init(id: String?) {
+        self.id = id
+        self.user = nil
+    }
+}
+
+extension Comment: Equatable {}
+
+public func ==(lhs: Comment, rhs: Comment) -> Bool {
+    return lhs.id == rhs.id
+}
@@ -0,0 +1,50 @@
+//
+// CustomProfile.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.
+
+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 {
+                var cpf: CustomProfileField?
+                if let fieldDictionary = field as? [String: AnyObject] {
+                    cpf = CustomProfileField(field: fieldDictionary)
+                } else {
+                    cpf = CustomProfileField(id: field as? String)
+                }
+                if let id = cpf?.id { fields[id] = cpf }
+            }
+        }
+    }
+    
+    internal init(customFields: [String: AnyObject]?) {
+        if let customFields = customFields {
+            for key in customFields.keys {
+                let cpf = CustomProfileField(field: customFields[key] as? [String: AnyObject])
+                self.fields[key] = cpf
+            }
+        }
+    }
+    
+}
@@ -0,0 +1,65 @@
+//
+// CustomProfileField.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.
+
+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
+    }
+}
@@ -0,0 +1,39 @@
+//
+// DoNotDisturbStatus.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.
+
+public struct DoNotDisturbStatus {
+    internal(set) public var enabled: Bool?
+    internal(set) public var nextDoNotDisturbStart: Int?
+    internal(set) public var nextDoNotDisturbEnd: Int?
+    internal(set) public var snoozeEnabled: Bool?
+    internal(set) public var snoozeEndtime: Int?
+    
+    internal init(status: [String: AnyObject]?) {
+        enabled = status?["dnd_enabled"] as? Bool
+        nextDoNotDisturbStart = status?["next_dnd_start_ts"] as? Int
+        nextDoNotDisturbEnd = status?["next_dnd_end_ts"] as? Int
+        snoozeEnabled = status?["snooze_enabled"] as? Bool
+        snoozeEndtime = status?["snooze_endtime"] as? Int
+    }
+    
+}
@@ -1,5 +1,5 @@
 //
-// SlackKit.h
+// Edited.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -21,10 +21,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-#import <Foundation/Foundation.h>
-
-//! Project version number for SlackKit.
-FOUNDATION_EXPORT double SlackKitVersionNumber;
-
-//! Project version string for SlackKit.
-FOUNDATION_EXPORT const unsigned char SlackKitVersionString[];
+public struct Edited {
+    public let user: String?
+    public let ts: String?
+    
+    internal init(edited:[String: AnyObject]?) {
+        user = edited?["user"] as? String
+        ts = edited?["ts"] as? String
+    }
+}
@@ -1,5 +1,5 @@
 //
-// Message.swift
+// Event.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -161,11 +161,7 @@ internal struct Event {
    var profile: CustomProfile?
    
    init(event:[String: AnyObject]) {
-        if let eventType = event["type"] as? String {
-            type = EventType(rawValue:eventType)
-        } else {
-            type = EventType(rawValue: "ok")
-        }
+        type = EventType(rawValue: event["type"] as? String ?? "ok")
        ts = event["ts"] as? String
        subtype = event["subtype"] as? String
        channelID = event["channel_id"] as? String
@@ -197,31 +193,27 @@ internal struct Event {
        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) {
+        file = File(id: event["file"] as? String)
+
+        // Comment, Channel, and User can come across as Strings or Dictionaries
+        if let commentDictionary = event["comment"] as? [String: AnyObject] {
+            comment = Comment(comment: commentDictionary)
+        } else {
            comment = Comment(id: event["comment"] as? String)
-        } else {
-            comment = Comment(comment: event["comment"] as? [String: AnyObject])
        }
-        
-        if (User(user: event["user"] as? [String: AnyObject])?.id == nil) {
+
+        if let userDictionary = event["user"] as? [String: AnyObject] {
+            user = User(user: userDictionary)
+        } else {
            user = User(id: event["user"] as? String)
-        } else {
-            user = User(user: event["user"] as? [String: AnyObject])
        }
-        
-        if (File(file: event["file"] as? [String: AnyObject])?.id == nil) {
-            file = File(id: event["file"] as? String)
+
+        if let channelDictionary =  event["channel"] as? [String: AnyObject] {
+            channel = Channel(channel: channelDictionary)
        } else {
-            file = File(file: event["file"] as? [String: AnyObject])
-        }
-        
-        if (Channel(channel: event["channel"] as? [String: AnyObject])?.id == nil) {
            channel = Channel(id: event["channel"] as? String)
-        } else {
-            channel = Channel(channel: event["channel"] as? [String: AnyObject])
        }
+
    }
    
 }
@@ -21,88 +21,89 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-import Foundation
-
-public protocol SlackEventsDelegate {
-    func clientConnectionFailed(error: SlackError)
-    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)
+public protocol ConnectionEventsDelegate: class {
+    func clientConnected(_ client: Client)
+    func clientDisconnected(_ client: Client)
+    func clientConnectionFailed(_ client: Client, error: SlackError)
 }

-public protocol MessageEventsDelegate {
-    func messageSent(message: Message)
-    func messageReceived(message: Message)
-    func messageChanged(message: Message)
-    func messageDeleted(message: Message?)
+public protocol MessageEventsDelegate: class {
+    func messageSent(_ client: Client, message: Message)
+    func messageReceived(_ client: Client, message: Message)
+    func messageChanged(_ client: Client, message: Message)
+    func messageDeleted(_ client: Client, message: Message?)
 }

-public protocol ChannelEventsDelegate {
-    func userTyping(channel: Channel?, user: User?)
-    func channelMarked(channel: Channel, timestamp: String?)
-    func channelCreated(channel: Channel)
-    func channelDeleted(channel: Channel)
-    func channelRenamed(channel: Channel)
-    func channelArchived(channel: Channel)
-    func channelHistoryChanged(channel: Channel)
-    func channelJoined(channel: Channel)
-    func channelLeft(channel: Channel)
+public protocol ChannelEventsDelegate: class {
+    func userTyping(_ client: Client, channel: Channel, user: User)
+    func channelMarked(_ client: Client, channel: Channel, timestamp: String)
+    func channelCreated(_ client: Client, channel: Channel)
+    func channelDeleted(_ client: Client, channel: Channel)
+    func channelRenamed(_ client: Client, channel: Channel)
+    func channelArchived(_ client: Client, channel: Channel)
+    func channelHistoryChanged(_ client: Client, channel: Channel)
+    func channelJoined(_ client: Client, channel: Channel)
+    func channelLeft(_ client: Client, channel: Channel)
 }

-public protocol DoNotDisturbEventsDelegate {
-    func doNotDisturbUpdated(dndStatus: DoNotDisturbStatus)
-    func doNotDisturbUserUpdated(dndStatus: DoNotDisturbStatus, user: User?)
+public protocol DoNotDisturbEventsDelegate: class {
+    func doNotDisturbUpdated(_ client: Client, dndStatus: DoNotDisturbStatus)
+    func doNotDisturbUserUpdated(_ client: Client, dndStatus: DoNotDisturbStatus, user: User)
 }

-public protocol GroupEventsDelegate {
-    func groupOpened(group: Channel)
+public protocol GroupEventsDelegate: class {
+    func groupOpened(_ client: Client, group: Channel)
 }

-public protocol FileEventsDelegate {
-    func fileProcessed(file: File)
-    func fileMadePrivate(file: File)
-    func fileDeleted(file: File)
-    func fileCommentAdded(file: File, comment: Comment)
-    func fileCommentEdited(file: File, comment: Comment)
-    func fileCommentDeleted(file: File, comment: Comment)
+public protocol FileEventsDelegate: class {
+    func fileProcessed(_ client: Client, file: File)
+    func fileMadePrivate(_ client: Client, file: File)
+    func fileDeleted(_ client: Client, file: File)
+    func fileCommentAdded(_ client: Client, file: File, comment: Comment)
+    func fileCommentEdited(_ client: Client, file: File, comment: Comment)
+    func fileCommentDeleted(_ client: Client, file: File, comment: Comment)
 }

-public protocol PinEventsDelegate {
-    func itemPinned(item: Item?, channel: Channel?)
-    func itemUnpinned(item: Item?, channel: Channel?)
+public protocol PinEventsDelegate: class {
+    func itemPinned(_ client: Client, item: Item, channel: Channel?)
+    func itemUnpinned(_ client: Client, item: Item, channel: Channel?)
 }

-public protocol StarEventsDelegate {
-    func itemStarred(item: Item, star: Bool)
+public protocol StarEventsDelegate: class {
+    func itemStarred(_ client: Client, item: Item, star: Bool)
 }

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

-public protocol TeamEventsDelegate {
-    func teamJoined(user: User)
-    func teamPlanChanged(plan: String)
-    func teamPreferencesChanged(preference: String, value: AnyObject)
-    func teamNameChanged(name: String)
-    func teamDomainChanged(domain: String)
-    func teamEmailDomainChanged(domain: String)
-    func teamEmojiChanged()
+public protocol SlackEventsDelegate: class {
+    func preferenceChanged(_ client: Client, preference: String, value: AnyObject?)
+    func userChanged(_ client: Client, user: User)
+    func presenceChanged(_ client: Client, user: User, presence: String)
+    func manualPresenceChanged(_ client: Client, user: User, presence: String)
+    func botEvent(_ client: Client, bot: Bot)
 }

-public protocol SubteamEventsDelegate {
-    func subteamEvent(userGroup: UserGroup)
-    func subteamSelfAdded(subteamID: String)
-    func subteamSelfRemoved(subteamID: String)
+public protocol TeamEventsDelegate: class {
+    func teamJoined(_ client: Client, user: User)
+    func teamPlanChanged(_ client: Client, plan: String)
+    func teamPreferencesChanged(_ client: Client, preference: String, value: AnyObject?)
+    func teamNameChanged(_ client: Client, name: String)
+    func teamDomainChanged(_ client: Client, domain: String)
+    func teamEmailDomainChanged(_ client: Client, domain: String)
+    func teamEmojiChanged(_ client: Client)
 }

-public protocol TeamProfileEventsDelegate {
-    func teamProfileChanged(profile: CustomProfile?)
-    func teamProfileDeleted(profile: CustomProfile?)
-    func teamProfileReordered(profile: CustomProfile?)
+public protocol SubteamEventsDelegate: class {
+    func subteamEvent(_ client: Client, userGroup: UserGroup)
+    func subteamSelfAdded(_ client: Client, subteamID: String)
+    func subteamSelfRemoved(_ client: Client, subteamID: String)
+}
+
+public protocol TeamProfileEventsDelegate: class {
+    func teamProfileChanged(_ client: Client, profile: CustomProfile)
+    func teamProfileDeleted(_ client: Client, profile: CustomProfile)
+    func teamProfileReordered(_ client: Client, profile: CustomProfile)
 }
@@ -1,180 +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 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)
-        }
-    }
-    
-}
@@ -1,649 +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 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)
-        }
-    }
-    
-}
@@ -0,0 +1,61 @@
+//
+// Extensions.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 extension Date {
+
+    func slackTimestamp() -> Double {
+        return NSNumber(value: timeIntervalSince1970).doubleValue
+    }
+    
+}
+
+internal extension String {
+    
+    func slackFormatEscaping() -> String {
+        var escapedString = replacingOccurrences(of: "&", with: "&amp;")
+        escapedString = replacingOccurrences(of: "<", with: "&lt;")
+        escapedString = replacingOccurrences(of: ">", with: "&gt;")
+        return escapedString
+    }
+
+}
+
+internal extension Dictionary where Key: StringLiteralConvertible, Value: AnyObject {
+
+    var requestStringFromParameters: String {
+        var requestString = ""
+        for key in self.keys {
+            if let value = self[key] as? String, let encodedValue = value.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlHostAllowed) {
+                requestString += "&\(key)=\(encodedValue)"
+            } else if let value = self[key] as? Int {
+                requestString += "&\(key)=\(value)"
+            }
+        }
+        
+        return requestString
+    }
+
+}
+
@@ -44,6 +44,22 @@ public struct File {
    public let thumb360gif: String?
    public let thumb360w: String?
    public let thumb360h: String?
+    public let thumb480: String?
+    public let thumb480gif: String?
+    public let thumb480w: String?
+    public let thumb480h: String?
+    public let thumb720: String?
+    public let thumb720gif: String?
+    public let thumb720w: String?
+    public let thumb720h: String?
+    public let thumb960: String?
+    public let thumb960gif: String?
+    public let thumb960w: String?
+    public let thumb960h: String?
+    public let thumb1024: String?
+    public let thumb1024gif: String?
+    public let thumb1024w: String?
+    public let thumb1024h: String?
    public let permalink: String?
    public let editLink: String?
    public let preview: String?
@@ -60,9 +76,9 @@ public struct File {
    internal(set) public var isStarred: Bool?
    internal(set) public var pinnedTo: [String]?
    internal(set) public var comments = [String: Comment]()
-    internal(set) public var reactions = [String: Reaction]()
+    internal(set) public var reactions = [Reaction]()
    
-    public init?(file:[String: AnyObject]?) {
+    public init(file:[String: AnyObject]?) {
        id = file?["id"] as? String
        created = file?["created"] as? Int
        name = file?["name"] as? String
@@ -84,6 +100,22 @@ public struct File {
        thumb360gif = file?["thumb_360_gif"] as? String
        thumb360w = file?["thumb_360_w"] as? String
        thumb360h = file?["thumb_360_h"] as? String
+        thumb480 = file?["thumb_480"] as? String
+        thumb480gif = file?["thumb_480_gif"] as? String
+        thumb480w = file?["thumb_480_w"] as? String
+        thumb480h = file?["thumb_480_h"] as? String
+        thumb720 = file?["thumb_720"] as? String
+        thumb720gif = file?["thumb_720_gif"] as? String
+        thumb720w = file?["thumb_720_w"] as? String
+        thumb720h = file?["thumb_720_h"] as? String
+        thumb960 = file?["thumb_960"] as? String
+        thumb960gif = file?["thumb_960_gif"] as? String
+        thumb960w = file?["thumb_960_w"] as? String
+        thumb960h = file?["thumb_960_h"] as? String
+        thumb1024 = file?["thumb_1024"] as? String
+        thumb1024gif = file?["thumb_1024_gif"] as? String
+        thumb1024w = file?["thumb_1024_w"] as? String
+        thumb1024h = file?["thumb_1024_h"] as? String
        permalink = file?["permalink"] as? String
        editLink = file?["edit_link"] as? String
        preview = file?["preview"] as? String
@@ -99,13 +131,10 @@ public struct File {
        stars = file?["num_stars"] as? Int
        isStarred = file?["is_starred"] as? Bool
        pinnedTo = file?["pinned_to"] as? [String]
-        if let reactions = file?["reactions"] as? [[String: AnyObject]] {
-            self.reactions = Reaction.reactionsFromArray(reactions)
-        }
-        
+        reactions = Reaction.reactionsFromArray(file?["reactions"] as? [[String: AnyObject]])        
    }
    
-    internal init?(id:String?) {
+    internal init(id:String?) {
        self.id = id
        created = nil
        name = nil
@@ -126,6 +155,22 @@ public struct File {
        thumb360gif = nil
        thumb360w = nil
        thumb360h = nil
+        thumb480 = nil
+        thumb480gif = nil
+        thumb480w = nil
+        thumb480h = nil
+        thumb720 = nil
+        thumb720gif = nil
+        thumb720w = nil
+        thumb720h = nil
+        thumb960 = nil
+        thumb960gif = nil
+        thumb960w = nil
+        thumb960h = nil
+        thumb1024 = nil
+        thumb1024gif = nil
+        thumb1024w = nil
+        thumb1024h = nil
        permalink = nil
        editLink = nil
        preview = nil
@@ -0,0 +1,43 @@
+//
+// History.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 History {
+    
+    internal(set) public var latest: Date?
+    internal(set) public var messages = [Message]()
+    public let hasMore: Bool?
+    
+    internal init(history: [String: AnyObject]?) {
+        if let latestStr = history?["latest"] as? String, let latestDouble = Double(latestStr) {
+            latest = Date(timeIntervalSince1970: TimeInterval(latestDouble))
+        }
+        if let msgs = history?["messages"] as? [[String: AnyObject]] {
+            for message in msgs {
+                messages.append(Message(message: message))
+            }
+        }
+        hasMore = history?["has_more"] as? Bool
+    }
+}
@@ -0,0 +1,72 @@
+//
+// IncomingWebhook.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 IncomingWebhook {
+    
+    public let url: String?
+    public let channel: String?
+    public let configurationURL: String?
+    public let username: String?
+    public let iconEmoji: String?
+    public let iconURL: String?
+    
+    internal init(webhook: [String: AnyObject]?) {
+        url = webhook?["url"] as? String
+        channel = webhook?["channel"] as? String
+        configurationURL = webhook?["configuration_url"] as? String
+        username = webhook?["username"] as? String
+        iconEmoji = webhook?["icon_emoji"] as? String
+        iconURL = webhook?["icon_url"] as? String
+    }
+    
+    public init(url: String, channel: String? = nil, username: String? = nil, iconEmoji: String? = nil, iconURL: String? = nil) {
+        self.url = url
+        self.channel = channel
+        self.username = username
+        self.iconEmoji = iconEmoji
+        self.iconURL = iconURL
+        self.configurationURL = nil
+    }
+    
+    public func postMessage(_ response: Response, success: ((Bool)->Void)? = nil, failure: ((SlackError)->Void)? = nil) {
+        if let url = self.url, let data = try? JSONSerialization.data(withJSONObject: jsonBody(response.json()), options: []) {
+            NetworkInterface().customRequest(url, data: data, success: { _ in
+                success?(true)
+            }, errorClosure: {(error) in
+                failure?(error)
+            })
+        }
+    }
+    
+    private func jsonBody(_ response: [String: AnyObject]) -> [String: AnyObject] {
+        var json = response
+        json["channel"] = channel
+        json["username"] = username
+        json["icon_emoji"] = iconEmoji
+        json["icon_url"] = iconURL
+        return json
+    }
+    
+}
@@ -0,0 +1,61 @@
+//
+// Item.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.
+
+public struct Item {
+    public let type: String?
+    public let ts: String?
+    public let channel: String?
+    public let message: Message?
+    public let file: File?
+    public let comment: Comment?
+    public let fileCommentID: String?
+    
+    internal init(item:[String: AnyObject]?) {
+        type = item?["type"] as? String
+        ts = item?["ts"] as? String
+        channel = item?["channel"] as? String
+        
+        message = Message(message: item?["message"] as? [String: AnyObject])
+        
+        // Comment and File can come across as Strings or Dictionaries
+        if let commentDictionary = item?["comment"] as? [String: AnyObject] {
+            comment = Comment(comment: commentDictionary)
+        } else {
+            comment = Comment(id: item?["comment"] as? String)
+        }
+        
+        if let fileDictionary = item?["file"] as? [String: AnyObject] {
+            file = File(file: fileDictionary)
+        } else {
+            file = File(id: item?["file"] as? String)
+        }
+        
+        fileCommentID = item?["file_comment"] as? String
+    }
+}
+
+extension Item: Equatable {}
+
+public func ==(lhs: Item, rhs: Item) -> Bool {
+    return lhs.type == rhs.type && lhs.channel == rhs.channel && lhs.file == rhs.file && lhs.comment == rhs.comment && lhs.message == rhs.message
+}
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-public class Message {
+public final class Message {
    
    public let type = "message"
    public let subtype: String?
@@ -45,10 +45,13 @@ public class Message {
    internal(set) var pinnedTo: [String]?
    public let comment: Comment?
    public let file: File?
-    internal(set) public var reactions = [String: Reaction]()
+    internal(set) public var reactions = [Reaction]()
    internal(set) public var attachments: [Attachment]?
+    internal(set) public var responseType: ResponseType?
+    internal(set) public var replaceOriginal: Bool?
+    internal(set) public var deleteOriginal: Bool?
    
-    public init?(message: [String: AnyObject]?) {
+    public init(message: [String: AnyObject]?) {
        subtype = message?["subtype"] as? String
        ts = message?["ts"] as? String
        user = message?["user"] as? String
@@ -70,13 +73,14 @@ 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])
-        reactions = messageReactions(message?["reactions"] as? [[String: AnyObject]])
-        attachments = (message?["attachments"] as? [[String: AnyObject]])?.objectArrayFromDictionaryArray({(attachment) -> Attachment? in
-            return Attachment(attachment: attachment)
-        })
+        reactions = Reaction.reactionsFromArray(message?["reactions"] as? [[String: AnyObject]])
+        attachments = (message?["attachments"] as? [[String: AnyObject]])?.map{Attachment(attachment: $0)}
+        responseType = ResponseType(rawValue: message?["response_type"] as? String ?? "")
+        replaceOriginal = message?["replace_original"] as? Bool
+        deleteOriginal = message?["delete_original"] as? Bool
    }
    
-    internal init?(ts:String?) {
+    internal init(ts:String?) {
        self.ts = ts
        subtype = nil
        user = nil
@@ -90,18 +94,7 @@ public class Message {
        comment = nil
        file = nil
    }
-    
-    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
-    }
+
 }

 extension Message: Equatable {}
@@ -0,0 +1,52 @@
+//
+// MessageActionRequest.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 MessageActionRequest: Request {
+    
+    let action: Action?
+    let callbackID: String?
+    let team: Team?
+    let channel: Channel?
+    let user: User?
+    let actionTS: String?
+    let messageTS: String?
+    let attachmentID: String?
+    let token: String?
+    let originalMessage: Message?
+    let responseURL: String
+    
+    init(response: [String: AnyObject]?) {
+        action = (response?["actions"] as? [[String:AnyObject]])?.map({Action(action: $0)}).first
+        callbackID = response?["callback_id"] as? String
+        team = Team(team: response?["team"] as? [String: AnyObject])
+        channel = Channel(channel: response?["channel"] as? [String: AnyObject])
+        user = User(user: response?["channel"] as? [String: AnyObject])
+        actionTS = response?["action_ts"] as? String
+        messageTS = response?["message_ts"] as? String
+        attachmentID = response?["attachment_id"] as? String
+        token = response?["token"] as? String
+        originalMessage = Message(message: response?["original_message"] as? [String: AnyObject])
+        responseURL = response?["response_url"] as? String ?? ""
+    }
+    
+}
@@ -1,6 +1,5 @@
 //
-// AppDelegate.swift
-// OSX-Sample
+// MessageActionResponder.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -22,23 +21,20 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-import Cocoa
-import SlackKit
-
-@NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate {
-
-    @IBOutlet weak var window: NSWindow!
-
-    let leaderboard = Leaderboard(token: "SLACK_AUTH_TOKEN")
+public struct MessageActionResponder {
    
-    func applicationDidFinishLaunching(aNotification: NSNotification) {
-        leaderboard.client.connect()
+    public var responses:[(Action, Response)]
+    
+    public init(responses:[(Action, Response)]) {
+        self.responses = responses
    }
    
-    func applicationWillTerminate(aNotification: NSNotification) {
-        // Insert code here to tear down your application
+    internal func responseForRequest(_ request:MessageActionRequest) -> Reply? {
+        if let response = responses.filter({$0.0.name == request.action?.name}).first?.1 {
+            return Reply.json(response: response)
+        } else {
+            return nil
+        }
    }
    
 }
-
@@ -0,0 +1,46 @@
+//
+// MessageActionServer.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.
+
+public class MessageActionServer: Server {
+    
+    internal let responder: MessageActionResponder
+    
+    required public init(token: String, route: String, responder: MessageActionResponder) {
+        self.responder = responder
+        super.init(token: token)
+        addRoute(route)
+    }
+    
+    internal func addRoute(_ route: String) {
+        http.POST["/\(route)"] = { request in
+            let payload = request.parseUrlencodedForm()
+            let actionRequest = MessageActionRequest(response: self.jsonFromRequest(payload[0].1))
+            if let reply = self.responder.responseForRequest(actionRequest), actionRequest.token == self.token {
+                return self.request(actionRequest, reply: reply)
+            } else {
+                return .badRequest(.text("Bad request."))
+            }
+        }
+    }
+    
+}
@@ -27,47 +27,61 @@ 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)
+    internal func request(_ endpoint: Endpoint, token: String? = nil, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(endpoint.rawValue)?"
+        if let token = token {
+            requestString += "token=\(token)"
        }
-        let request = NSURLRequest(URL: NSURL(string: requestString)!)
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
+        if let params = parameters {
+            requestString += params.requestStringFromParameters
+        }
+        guard let url =  URL(string: requestString) else {
+            errorClosure(SlackError.ClientNetworkError)
+            return
+        }
+        let request = URLRequest(url:url)
+        URLSession.shared.dataTask(with: request) {
            (data, response, internalError) -> Void in
-            guard let data = data else {
-                errorClosure(SlackError.ClientNetworkError)
-                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)
-                }
-            }
+            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
+                successClosure(json)
+            }, errorClosure: {(error) in
+                errorClosure(error)
+            })
        }.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)
+    internal func customRequest(_ url: String, data: Data, success: (Bool)->Void, errorClosure: (SlackError)->Void) {
+        guard let url =  URL(string: url.removePercentEncoding()) else {
+            errorClosure(SlackError.ClientNetworkError)
+            return
        }
+        var request = URLRequest(url:url)
+        request.httpMethod = "POST"
+        let contentType = "application/json"
+        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        request.httpBody = data
        
-        let request = NSMutableURLRequest(URL: NSURL(string: requestString)!)
-        request.HTTPMethod = "POST"
+        URLSession.shared.dataTask(with: request) {
+            (data, response, internalError) -> Void in
+            if internalError == nil {
+                success(true)
+            } else {
+                errorClosure(SlackError.ClientNetworkError)
+            }
+            }.resume()
+    }
+    
+    internal func uploadRequest(_ token: String, data: Data, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(Endpoint.FilesUpload.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + params.requestStringFromParameters
+        }
+        guard let url =  URL(string: requestString) else {
+            errorClosure(SlackError.ClientNetworkError)
+            return
+        }
+        var request = URLRequest(url:url)
+        request.httpMethod = "POST"
        let boundaryConstant = randomBoundary()
        let contentType = "multipart/form-data; boundary=" + boundaryConstant
        let boundaryStart = "--\(boundaryConstant)\r\n"
@@ -75,58 +89,65 @@ internal struct NetworkInterface {
        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)!)
+        var requestBodyData: Data = Data()
+        requestBodyData.append(boundaryStart.data(using: String.Encoding.utf8)!)
+        requestBodyData.append(contentDispositionString.data(using: String.Encoding.utf8)!)
+        requestBodyData.append(contentTypeString.data(using: String.Encoding.utf8)!)
+        requestBodyData.append(data)
+        requestBodyData.append("\r\n".data(using: String.Encoding.utf8)!)
+        requestBodyData.append(boundaryEnd.data(using: String.Encoding.utf8)!)
        
        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.HTTPBody = requestBodyData
+        request.httpBody = requestBodyData as Data

-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
+        URLSession.shared.dataTask(with: request) {
            (data, response, internalError) -> Void in
-            guard let data = data else {
+            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
+                successClosure(json)
+            }, errorClosure: {(error) in
+                errorClosure(error)
+            })
+        }.resume()
+    }
+    
+    private func handleResponse(_ data: Data?, response:URLResponse?, internalError:NSError?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        guard let data = data, let response = response as? HTTPURLResponse else {
+            errorClosure(SlackError.ClientNetworkError)
+            return
+        }
+        do {
+            guard let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: AnyObject] else {
+                errorClosure(SlackError.ClientJSONError)
                return
            }
-            do {
-                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
-                if (result["ok"] as! Bool == true) {
-                    successClosure(result)
+            
+            switch response.statusCode {
+            case 200:
+                if (json["ok"] as! Bool == true) {
+                    successClosure(json)
                } else {
-                    if let errorString = result["error"] as? String {
-                        throw ErrorDispatcher.dispatch(errorString)
+                    if let errorString = json["error"] as? String {
+                        throw SlackError(rawValue: errorString) ?? .UnknownError
                    } else {
                        throw SlackError.UnknownError
                    }
                }
-            } catch let error {
-                if let slackError = error as? SlackError {
-                    errorClosure(slackError)
-                } else {
-                    errorClosure(SlackError.UnknownError)
-                }
+            case 429:
+                throw SlackError.TooManyRequests
+            default:
+                throw SlackError.ClientNetworkError
            }
-            }.resume()
+        } catch let error {
+            if let slackError = error as? SlackError {
+                errorClosure(slackError)
+            } else {
+                errorClosure(SlackError.UnknownError)
+            }
+        }
    }
    
    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,44 @@
+//
+// OAuthResponse.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 OAuthResponse {
+
+    let accessToken: String?
+    let scope: [Scope]?
+    let userID: String?
+    let teamName: String?
+    let teamID: String?
+    let incomingWebhook: IncomingWebhook?
+    let bot: Bot?
+    
+    init(response: [String: AnyObject]?) {
+        accessToken = response?["access_token"] as? String
+        scope = (response?["scope"] as? String)?.components(separatedBy: ",").flatMap{Scope(rawValue:$0)}
+        userID = response?["user_id"] as? String
+        teamName = response?["team_name"] as? String
+        teamID = response?["team_id"] as? String
+        incomingWebhook = IncomingWebhook(webhook: response?["incoming_webhook"] as? [String: AnyObject])
+        bot = Bot(botUser: response?["bot"] as? [String: AnyObject])
+    }
+    
+}
@@ -0,0 +1,95 @@
+//
+// OAuthServer.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
+import Swifter
+
+internal protocol OAuthDelegate {
+    func userAuthed(_ response: OAuthResponse)
+}
+
+public struct OAuthServer {
+    
+    private let oauthURL = "https://slack.com/oauth/authorize"
+
+    private let http = HttpServer()
+    private let clientID: String
+    private let clientSecret: String
+    private let state: String?
+    private let redirectURI: String?
+    private var delegate: OAuthDelegate?
+    
+    internal init(clientID: String, clientSecret: String, state: String? = nil, redirectURI: String? = nil, port:in_port_t = 8080, forceIPV4: Bool = false, delegate: OAuthDelegate? = nil) throws {
+        self.clientID = clientID
+        self.clientSecret = clientSecret
+        self.state = state ?? "state"
+        self.redirectURI = redirectURI
+        self.delegate = delegate
+        oauthRoute()
+        start(port, forceIPV4: forceIPV4)
+    }
+    
+    public func start(_ port: in_port_t = 8080, forceIPV4: Bool = false) {
+        do {
+            try http.start(port, forceIPv4: forceIPV4)
+        } catch let error as NSError {
+            print("Server failed to start with error: \(error)")
+        }
+    }
+    
+    public func stop() {
+        http.stop()
+    }
+    
+    private func oauthRoute() {
+        http["/oauth"] = { request in
+            guard let response = AuthorizeResponse(queryParameters: request.queryParams), response.state == self.state else {
+                return .badRequest(.text("Bad request."))
+            }
+            WebAPI.oauthAccess(self.clientID, clientSecret: self.clientSecret, code: response.code, redirectURI: self.redirectURI, success: {(response) in
+                self.delegate?.userAuthed(OAuthResponse(response: response))
+            }, failure: {(error) in
+                print("Authorization failed")
+            })
+            if let redirect = self.redirectURI {
+                return .movedPermanently(redirect)
+            }
+            return .ok(.text("Authentication successful."))
+        }
+    }
+    
+    private func oauthURLRequest(_ authorize: AuthorizeRequest) -> URLRequest? {
+        var requestString = "\(oauthURL)?client_id=\(authorize.clientID)"
+        requestString += authorize.parameters.requestStringFromParameters
+        guard let url = URL(string: requestString) else {
+            return nil
+        }
+        return URLRequest(url:url)
+    }
+    
+    public func authorizeRequest(_ scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil) -> URLRequest? {
+        let request = AuthorizeRequest(clientID: clientID, scope: scope, redirectURI: redirectURI, state: state, team: team)
+        return oauthURLRequest(request)
+    }
+    
+}
@@ -0,0 +1,57 @@
+//
+// Reaction.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.
+
+public struct Reaction {
+    public let name: String?
+    internal(set) public var user: String?
+    
+    internal init(reaction:[String: AnyObject]?) {
+        name = reaction?["name"] as? String
+    }
+    
+    internal init(name: String, user: String) {
+        self.name = name
+        self.user = user
+    }
+    
+    static func reactionsFromArray(_ array: [[String: AnyObject]]?) -> [Reaction] {
+        var reactions = [Reaction]()
+        if let array = array {
+            for reaction in array {
+                if let users = reaction["users"] as? [String], let name = reaction["name"] as? String {
+                    for user in users {
+                        reactions.append(Reaction(name: name, user: user))
+                    }
+                }
+            }
+        }
+        return reactions
+    }
+    
+}
+
+extension Reaction: Equatable {}
+
+public func ==(lhs: Reaction, rhs: Reaction) -> Bool {
+    return lhs.name == rhs.name
+}
@@ -0,0 +1,44 @@
+//
+// Response.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.
+
+public struct Response {
+    
+    let text: String
+    let responseType: ResponseType?
+    let attachments: [Attachment]?
+    
+    public init(text: String, responseType: ResponseType? = nil, attachments: [Attachment]? = nil) {
+        self.responseType = responseType
+        self.text = text
+        self.attachments = attachments
+    }
+    
+    internal func json() -> [String: AnyObject] {
+        var json = [String : AnyObject]()
+        json["text"] = text
+        json["response_type"] = responseType?.rawValue
+        json["attachments"] = attachments?.map({$0.dictionary()})
+        return json
+    }
+    
+}
@@ -0,0 +1,71 @@
+//
+// Scope.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.
+
+public enum Scope: String {
+    
+    case ChannelsHistory = "channels:history"
+    case ChannelsRead = "channels:read"
+    case ChannelsWrite = "channels:write"
+    case ChatWriteBot = "chat:write:bot"
+    case ChatWriteUser = "chat:write:user"
+    case DNDRead = "dnd:read"
+    case DNDWrite = "dnd:write"
+    case EmojiRead = "emoji:read"
+    case FilesRead = "files:read"
+    case FilesWriteUser = "files:write:user"
+    case GroupsHistory = "groups:history"
+    case GroupsRead = "groups:read"
+    case GroupsWrite = "groups:write"
+    case IdentityBasic = "identity.basic"
+    case IMHistory = "im:history"
+    case IMRead = "im:read"
+    case IMWrite = "im:write"
+    case MPIMHistory = "mpim:history"
+    case MPIMRead = "mpim:read"
+    case MPIMWrite = "mpim:write"
+    case PinsRead = "pins:read"
+    case PinsWrite = "pins:write"
+    case ReactionsRead = "reactions:read"
+    case ReactionsWrite = "reactions:write"
+    case RemindersRead = "reminders:read"
+    case RemindersWrite = "reminders:write"
+    case SearchRead = "search:read"
+    case StarsRead = "stars:read"
+    case StarsWrite = "stars:write"
+    case TeamRead = "team:read"
+    case UserGroupsRead = "usergroups:read"
+    case UserGroupsWrite = "usergroups:write"
+    case UserProfilesRead = "user.profiles:read"
+    case UserProfilesWrite = "user.profiles:write"
+    case UsersRead = "users:read"
+    case UsersWrite = "users:write"
+    case IncomingWebhook = "incoming-webhook"
+    case Commands = "commands"
+    case Bot = "bot"
+    case Identify = "identify"
+    case Client = "client"
+    case Admin = "admin"
+    //Deprecated
+    case Read = "read"
+    case Post = "post"
+}
@@ -0,0 +1,91 @@
+//
+// Server.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
+import Swifter
+
+internal enum Reply {
+    case json(response: Response)
+    case text(body: String)
+    case badRequest
+}
+
+internal protocol Request {
+    var responseURL: String { get }
+}
+
+public class Server {
+    
+    internal let http = HttpServer()
+    internal let token: String
+    
+    internal init(token: String) {
+        self.token = token
+    }
+    
+    public func start(_ port: in_port_t = 8080, forceIPV4: Bool = false) {
+        do {
+            try http.start(port, forceIPv4: forceIPV4)
+        } catch let error as NSError {
+            print("Server failed to start with error: \(error)")
+        }
+    }
+    
+    public func stop() {
+        http.stop()
+    }
+    
+    internal func request(_ request:Request, reply: Reply) -> HttpResponse {
+        switch reply {
+        case .text(let body):
+            return .ok(.text(body))
+        case .json(let response):
+            return .ok(.json(response.json()))
+        case .badRequest:
+            return .badRequest(.text("Bad request."))
+        }
+    }
+    
+    internal func dictionaryFromRequest(_ body: [UInt8]) -> [String: AnyObject]? {
+        let string = String(data: Data(bytes: UnsafePointer<UInt8>(body), count: body.count), encoding: String.Encoding.utf8)
+        if let body = string?.components(separatedBy: "&") {
+            var dict: [String: AnyObject] = [:]
+            for argument in body {
+                let kv = argument.components(separatedBy: "=")
+                if let key = kv.first, let value = kv.last {
+                    dict[key] = value
+                }
+            }
+            return dict
+        }
+        return nil
+    }
+    
+    internal func jsonFromRequest(_ string: String) -> [String: AnyObject]? {
+        guard let data = string.data(using: String.Encoding.utf8) else {
+            return nil
+        }
+        return (try? JSONSerialization.jsonObject(with: data, options: [])) as? [String: AnyObject] ?? nil
+    }
+    
+}
@@ -0,0 +1,120 @@
+//
+// SlackError.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.
+
+public enum SlackError: String, ErrorProtocol {
+    case AccountInactive = "account_inactive"
+    case AlreadyArchived = "already_archived"
+    case AlreadyInChannel = "already_in_channel"
+    case AlreadyPinned = "already_pinned"
+    case AlreadyReacted = "already_reacted"
+    case AlreadyStarred = "already_starred"
+    case BadClientSecret = "bad_client_secret"
+    case BadRedirectURI = "bad_redirect_uri"
+    case BadTimeStamp = "bad_timestamp"
+    case CantArchiveGeneral = "cant_archive_general"
+    case CantDelete = "cant_delete"
+    case CantDeleteFile = "cant_delete_file"
+    case CantDeleteMessage = "cant_delete_message"
+    case CantInvite = "cant_invite"
+    case CantInviteSelf = "cant_invite_self"
+    case CantKickFromGeneral = "cant_kick_from_general"
+    case CantKickFromLastChannel = "cant_kick_from_last_channel"
+    case CantKickSelf = "cant_kick_self"
+    case CantLeaveGeneral = "cant_leave_general"
+    case CantLeaveLastChannel = "cant_leave_last_channel"
+    case CantUpdateMessage = "cant_update_message"
+    case ChannelNotFound = "channel_not_found"
+    case ComplianceExportsPreventDeletion = "compliance_exports_prevent_deletion"
+    case EditWindowClosed = "edit_window_closed"
+    case FileCommentNotFound = "file_comment_not_found"
+    case FileDeleted = "file_deleted"
+    case FileNotFound = "file_not_found"
+    case FileNotShared = "file_not_shared"
+    case GroupContainsOthers = "group_contains_others"
+    case InvalidArgName = "invalid_arg_name"
+    case InvalidArrayArg = "invalid_array_arg"
+    case InvalidAuth = "invalid_auth"
+    case InvalidChannel = "invalid_channel"
+    case InvalidCharSet = "invalid_charset"
+    case InvalidClientID = "invalid_client_id"
+    case InvalidCode = "invalid_code"
+    case InvalidFormData = "invalid_form_data"
+    case InvalidName = "invalid_name"
+    case InvalidPostType = "invalid_post_type"
+    case InvalidPresence = "invalid_presence"
+    case InvalidTS = "invalid_timestamp"
+    case InvalidTSLatest = "invalid_ts_latest"
+    case InvalidTSOldest = "invalid_ts_oldest"
+    case IsArchived = "is_archived"
+    case LastMember = "last_member"
+    case LastRAChannel = "last_ra_channel"
+    case MessageNotFound = "message_not_found"
+    case MessageTooLong = "msg_too_long"
+    case MigrationInProgress = "migration_in_progress"
+    case MissingDuration = "missing_duration"
+    case MissingPostType = "missing_post_type"
+    case NameTaken = "name_taken"
+    case NoChannel = "no_channel"
+    case NoComment = "no_comment"
+    case NoItemSpecified = "no_item_specified"
+    case NoReaction = "no_reaction"
+    case NoText = "no_text"
+    case NotArchived = "not_archived"
+    case NotAuthed = "not_authed"
+    case NotEnoughUsers = "not_enough_users"
+    case NotInChannel = "not_in_channel"
+    case NotInGroup = "not_in_group"
+    case NotPinned = "not_pinned"
+    case NotStarred = "not_starred"
+    case OverPaginationLimit = "over_pagination_limit"
+    case PaidOnly = "paid_only"
+    case PermissionDenied = "perimssion_denied"
+    case PostingToGeneralChannelDenied = "posting_to_general_channel_denied"
+    case RateLimited = "rate_limited"
+    case RequestTimeout = "request_timeout"
+    case RestrictedAction = "restricted_action"
+    case SnoozeEndFailed = "snooze_end_failed"
+    case SnoozeFailed = "snooze_failed"
+    case SnoozeNotActive = "snooze_not_active"
+    case TooLong = "too_long"
+    case TooManyEmoji = "too_many_emoji"
+    case TooManyReactions = "too_many_reactions"
+    case TooManyUsers = "too_many_users"
+    case UnknownError
+    case UnknownType = "unknown_type"
+    case UserDisabled = "user_disabled"
+    case UserDoesNotOwnChannel = "user_does_not_own_channel"
+    case UserIsBot = "user_is_bot"
+    case UserIsRestricted = "user_is_restricted"
+    case UserIsUltraRestricted = "user_is_ultra_restricted"
+    case UserListNotSupplied = "user_list_not_supplied"
+    case UserNotFound = "user_not_found"
+    case UserNotVisible = "user_not_visible"
+    // Client
+    case ClientNetworkError
+    case ClientJSONError
+    case ClientOAuthError
+    // HTTP
+    case TooManyRequests
+    case UnknownHTTPError
+}
@@ -0,0 +1,65 @@
+//
+// SlackKit.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 final class SlackKit: OAuthDelegate {
+    
+    internal(set) public var oauth: OAuthServer?
+    internal(set) public var clients: [String: Client] = [:]
+    private let clientOptions: ClientOptions
+    // Initalization block
+    public var onClientInitalization: ((Client) -> Void)?
+    
+    // If you already have an API token
+    public init(withAPIToken token: String, clientOptions: ClientOptions = ClientOptions()) {
+        self.clientOptions = clientOptions
+        let client = Client(apiToken: token)
+        self.onClientInitalization?(client)
+        clients[token] = client
+        client.connect(options: self.clientOptions)
+    }
+    
+    // If you're going to be receiving and/or initiating OAuth requests, provide a client ID and secret
+    public init(clientID: String, clientSecret: String, state: String? = nil, redirectURI: String? = nil, port:in_port_t = 8080, forceIPV4: Bool = false, clientOptions: ClientOptions = ClientOptions()) {
+        self.clientOptions = clientOptions
+        oauth = try? OAuthServer(clientID: clientID, clientSecret: clientSecret, state: state, redirectURI: redirectURI, port: port, forceIPV4: forceIPV4, delegate: self)
+    }
+    
+    internal func userAuthed(_ response: OAuthResponse) {
+        // User auth
+        if let token = response.accessToken {
+            let client = Client(apiToken: token)
+            self.onClientInitalization?(client)
+            clients[token] = client
+        }
+        // Bot User
+        if let token = response.bot?.botToken {
+            let client = Client(apiToken: token)
+            self.onClientInitalization?(client)
+            clients[token] = client
+            client.connect(options: self.clientOptions)
+        }
+    }
+    
+}
@@ -1,292 +0,0 @@
-//
-// 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
-    // Client
-    case ClientNetworkError
-}
-
-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
-        }
-    }
-}
@@ -23,7 +23,7 @@

 public struct Team {
    
-    public let id: String
+    public let id: String?
    internal(set) public var name: String?
    internal(set) public var domain: String?
    internal(set) public var emailDomain: String?
@@ -33,8 +33,8 @@ public struct Team {
    internal(set) public var plan: String?
    internal(set) public var icon: TeamIcon?
    
-    internal init?(team: [String: AnyObject]?) {
-        id = team?["id"] as! String
+    internal init(team: [String: AnyObject]?) {
+        id = team?["id"] as? String
        name = team?["name"] as? String
        domain = team?["domain"] as? String
        emailDomain = team?["email_domain"] as? String
@@ -45,26 +45,3 @@ public struct Team {
        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
-    }
-}
-
@@ -0,0 +1,44 @@
+//
+// TeamIcon.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.
+
+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
+    }
+}
@@ -0,0 +1,34 @@
+//
+// Topic.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.
+
+public struct Topic {
+    public let value: String?
+    public let creator: String?
+    public let lastSet: Int?
+    
+    internal init(topic: [String: AnyObject]?) {
+        value = topic?["value"] as? String
+        creator = topic?["creator"] as? String
+        lastSet = topic?["last_set"] as? Int
+    }
+}
@@ -1,273 +0,0 @@
-//
-// Types.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
-
-// MARK: - Edited
-public struct Edited {
-    public let user: String?
-    public let ts: String?
-    
-    internal init?(edited:[String: AnyObject]?) {
-        user = edited?["user"] as? String
-        ts = edited?["ts"] as? String
-    }
-}
-
-// 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?
-    internal(set) public var users = [String: String]()
-    
-    internal init?(reaction:[String: AnyObject]?) {
-        name = reaction?["name"] as? String
-    }
-    
-    internal init?(name: String?, user: String) {
-        self.name = name
-        users[user] = user
-    }
-    
-    internal init?(name: String?, users: [String: String]) {
-        self.name = name
-        self.users = users
-    }
-    
-    static func reactionsFromArray(array: [[String: AnyObject]]) -> [String: Reaction] {
-        var reactions = [String: Reaction]()
-        var userDictionary = [String: String]()
-        for reaction in array {
-            if let users = reaction["users"] as? [String] {
-                for user in users {
-                    userDictionary[user] = user
-                }
-            }
-            if let name = reaction["name"] as? String {
-                reactions[name] = Reaction(name: name, users: userDictionary)
-            }
-        }
-        return reactions
-    }
-    
-}
-
-extension Reaction: Equatable {}
-
-public func ==(lhs: Reaction, rhs: Reaction) -> Bool {
-    return lhs.name == rhs.name
-}
-
-// MARK: - Comment
-public struct Comment {
-    public let id: String?
-    public let user: String?
-    internal(set) public var created: Int?
-    internal(set) public var comment: String?
-    internal(set) public var starred: Bool?
-    internal(set) public var stars: Int?
-    internal(set) public var reactions = [String: Reaction]()
-    
-    internal init?(comment:[String: AnyObject]?) {
-        id = comment?["id"] as? String
-        created = comment?["created"] as? Int
-        user = comment?["user"] as? String
-        starred = comment?["is_starred"] as? Bool
-        stars = comment?["num_stars"] as? Int
-        self.comment = comment?["comment"] as? String
-    }
-    
-    internal init?(id: String?) {
-        self.id = id
-        self.user = nil
-    }
-}
-
-extension Comment: Equatable {}
-
-public func ==(lhs: Comment, rhs: Comment) -> Bool {
-    return lhs.id == rhs.id
-}
-
-// MARK: - Item
-public struct Item {
-    public let type: String?
-    public let ts: String?
-    public let channel: String?
-    public let message: Message?
-    public let file: File?
-    public let comment: Comment?
-    public let fileCommentID: String?
-    
-    internal init?(item:[String: AnyObject]?) {
-        type = item?["type"] as? String
-        ts = item?["ts"] as? String
-        channel = item?["channel"] as? String
-        
-        message = Message(message: item?["message"] as? [String: AnyObject])
-        
-        // Comment and File can come across as Strings or Dictionaries
-        if (Comment(comment: item?["comment"] as? [String: AnyObject])?.id == nil) {
-            comment = Comment(id: item?["comment"] as? String)
-        } else {
-            comment = Comment(comment: item?["comment"] as? [String: AnyObject])
-        }
-        if (File(file: item?["file"] as? [String: AnyObject])?.id == nil) {
-            file = File(id: item?["file"] as? String)
-        } else {
-            file = File(file: item?["file"] as? [String: AnyObject])
-        }
-        
-        fileCommentID = item?["file_comment"] as? String
-    }
-}
-
-extension Item: Equatable {}
-
-public func ==(lhs: Item, rhs: Item) -> Bool {
-    return lhs.type == rhs.type && lhs.channel == rhs.channel && lhs.file == rhs.file && lhs.comment == rhs.comment && lhs.message == rhs.message
-}
-
-// MARK: - Topic
-public struct Topic {
-    public let value: String?
-    public let creator: String?
-    public let lastSet: Int?
-    
-    internal init?(topic: [String: AnyObject]?) {
-        value = topic?["value"] as? String
-        creator = topic?["creator"] as? String
-        lastSet = topic?["last_set"] as? Int
-    }
-}
-
-// MARK: - Do Not Disturb Status
-public struct DoNotDisturbStatus {
-    internal(set) public var enabled: Bool?
-    internal(set) public var nextDoNotDisturbStart: Int?
-    internal(set) public var nextDoNotDisturbEnd: Int?
-    internal(set) public var snoozeEnabled: Bool?
-    internal(set) public var snoozeEndtime: Int?
-    
-    internal init?(status: [String: AnyObject]?) {
-        enabled = status?["dnd_enabled"] as? Bool
-        nextDoNotDisturbStart = status?["next_dnd_start_ts"] as? Int
-        nextDoNotDisturbEnd = status?["next_dnd_end_ts"] as? Int
-        snoozeEnabled = status?["snooze_enabled"] as? Bool
-        snoozeEndtime = status?["snooze_endtime"] as? Int
-    }
-    
-}
-
-// 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
-    }
-}
@@ -37,7 +37,7 @@ public struct User {
        internal(set) public var image192: String?
        internal(set) public var customProfile: CustomProfile?
        
-        internal init?(profile: [String: AnyObject]?) {
+        internal init(profile: [String: AnyObject]?) {
            firstName = profile?["first_name"] as? String
            lastName = profile?["last_name"] as? String
            realName = profile?["real_name"] as? String
@@ -77,7 +77,7 @@ public struct User {
    // Client properties
    internal(set) public var userGroups: [String: String]?
    
-    internal init?(user: [String: AnyObject]?) {
+    internal init(user: [String: AnyObject]?) {
        id = user?["id"] as? String
        name = user?["name"] as? String
        deleted = user?["deleted"] as? Bool
@@ -99,7 +99,7 @@ public struct User {
        preferences = user?["prefs"] as? [String: AnyObject]
    }
    
-    internal init?(id: String?) {
+    internal init(id: String?) {
        self.id = id
        self.isBot = nil
    }
@@ -21,11 +21,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.

-
 public struct UserGroup {
    
    public let id: String?
-    
    internal(set) public var teamID: String?
    public let isUserGroup: Bool?
    internal(set) public var name: String?
@@ -43,7 +41,7 @@ public struct UserGroup {
    internal(set) public var users: [String]?
    internal(set) public var userCount: Int?
    
-    internal init?(userGroup: [String: AnyObject]?) {
+    internal init(userGroup: [String: AnyObject]?) {
        id = userGroup?["id"] as? String
        teamID = userGroup?["team_id"] as? String
        isUserGroup = userGroup?["is_usergroup"] as? Bool
@@ -1,5 +1,5 @@
 //
-// SlackWebAPI.swift
+// WebAPI.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -23,8 +23,9 @@

 import Foundation

-internal enum SlackAPIEndpoint: String {
+internal enum Endpoint: String {
    case APITest = "api.test"
+    case AuthRevoke = "auth.revoke"
    case AuthTest = "auth.test"
    case ChannelsHistory = "channels.history"
    case ChannelsInfo = "channels.info"
@@ -62,6 +63,7 @@ internal enum SlackAPIEndpoint: String {
    case MPIMList = "mpim.list"
    case MPIMMark = "mpim.mark"
    case MPIMOpen = "mpim.open"
+    case OAuthAccess = "oauth.access"
    case PinsAdd = "pins.add"
    case PinsRemove = "pins.remove"
    case ReactionsAdd = "reactions.add"
@@ -79,7 +81,7 @@ internal enum SlackAPIEndpoint: String {
    case UsersSetPresence = "users.setPresence"
 }

-public class SlackWebAPI {
+public final class WebAPI {
    
    public typealias FailureClosure = (error: SlackError)->Void
    
@@ -104,16 +106,18 @@ public class SlackWebAPI {
        case IM = "im"
    }
    
-    private let client: Client
-    
-    required public init(client: Client) {
-        self.client = client
+    private let networkInterface: NetworkInterface
+    private let token: String
+
+    public init(token: String) {
+        self.networkInterface = NetworkInterface()
+        self.token = token
    }
    
    //MARK: - RTM
-    public func rtmStart(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, success: ((response: [String: AnyObject])->Void)?, failure: FailureClosure?) {
+    public func rtmStart(_ simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, success: ((response: [String: AnyObject])->Void)?, failure: FailureClosure?) {
        let parameters: [String: AnyObject?] = ["simple_latest": simpleLatest, "no_unreads": noUnreads, "mpim_aware": mpimAware]
-        client.api.request(.RTMStart, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+        networkInterface.request(.RTMStart, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
                (response) -> Void in
                success?(response: response)
            }) {(error) -> Void in
@@ -121,9 +125,9 @@ public class SlackWebAPI {
            }
    }
    
-    //MARK: - Auth Test
-    public func authenticationTest(success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
-        client.api.request(.AuthTest, token: client.token, parameters: nil, successClosure: {
+    //MARK: - Auth
+    public func authenticationTest(_ success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
+        networkInterface.request(.AuthTest, token: token, parameters: nil, successClosure: {
            (response) -> Void in
                success?(authenticated: true)
            }) {(error) -> Void in
@@ -131,8 +135,28 @@ public class SlackWebAPI {
        }
    }
    
+    public static func oauthAccess(_ clientID: String, clientSecret: String, code: String, redirectURI: String? = nil, success: ((response: [String: AnyObject])->Void)?, failure: ((SlackError)->Void)?) {
+        let parameters: [String: AnyObject?] = ["client_id": clientID, "client_secret": clientSecret, "code": code, "redirect_uri": redirectURI]
+        NetworkInterface().request(.OAuthAccess, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+            success?(response:response)
+        }) {(error) -> Void in
+            failure?(error)
+        }
+    }
+    
+    public static func oauthRevoke(_ token: String, test: Bool? = nil, success: ((revoked:Bool)->Void)?, failure: ((SlackError)->Void)?) {
+        let parameters: [String: AnyObject?] = ["token": token, "test": test]
+        NetworkInterface().request(.AuthRevoke, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+            success?(revoked:true)
+        }) {(error) -> Void in
+            failure?(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?) {
+    public func channelHistory(_ id: String, latest: String = "\(Date().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)
@@ -141,7 +165,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func channelInfo(id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -150,7 +174,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func channelsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -159,7 +183,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func markChannel(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+    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)
@@ -168,7 +192,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func setChannelPurpose(channel: String, purpose: String, success: ((purposeSet: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -177,7 +201,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func setChannelTopic(channel: String, topic: String, success: ((topicSet: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -187,18 +211,18 @@ public class SlackWebAPI {
    }
    
    //MARK: - Messaging
-    public func deleteMessage(channel: String, ts: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
+    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
+        networkInterface.request(.ChatDelete, token: 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? = nil, parse: ParseMode? = nil, linkNames: Bool? = nil, attachments: [Attachment?]? = nil, unfurlLinks: Bool? = nil, unfurlMedia: Bool? = nil, iconURL: String? = nil, iconEmoji: String? = nil, success: (((ts: String?, channel: String?))->Void)?, failure: FailureClosure?) {
+    public func sendMessage(_ channel: String, text: String, username: String? = nil, asUser: Bool? = nil, parse: ParseMode? = nil, linkNames: Bool? = nil, attachments: [Attachment?]? = nil, unfurlLinks: Bool? = nil, unfurlMedia: Bool? = nil, 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: {
+        networkInterface.request(.ChatPostMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?((ts: response["ts"] as? String, response["channel"] as? String))
            }) {(error) -> Void in
@@ -206,9 +230,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func updateMessage(channel: String, ts: String, message: String, attachments: [Attachment?]? = nil, parse:ParseMode = .None, linkNames: Bool = false, success: ((updated: Bool)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.ChatUpdate, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(updated: true)
            }) {(error) -> Void in
@@ -217,9 +241,9 @@ public class SlackWebAPI {
    }
    
    //MARK: - Do Not Disturb
-    public func dndInfo(user: String? = nil, success: ((status: DoNotDisturbStatus?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.DNDInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(status: DoNotDisturbStatus(status: response))
            }) {(error) -> Void in
@@ -227,19 +251,23 @@ public class SlackWebAPI {
        }
    }
    
-    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: {
+    public func dndTeamInfo(_ users: [String]? = nil, success: ((statuses: [String: DoNotDisturbStatus])->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject?] = ["users":users?.joined(separator: ",")]
+        networkInterface.request(.DNDTeamInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
-                success?(statuses: self.enumerateDNDStauses(response["users"] as? [String: AnyObject]))
+                guard let usersDictionary = response["users"] as? [String: AnyObject] else {
+                    success?(statuses: [:])
+                    return
+                }
+                success?(statuses: self.enumerateDNDStatuses(usersDictionary))
            }) {(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: {
+    public func emojiList(_ success: ((emojiList: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        networkInterface.request(.EmojiList, token: token, parameters: nil, successClosure: {
            (response) -> Void in
                success?(emojiList: response["emoji"] as? [String: AnyObject])
            }) { (error) -> Void in
@@ -248,9 +276,9 @@ public class SlackWebAPI {
    }
    
    //MARK: - Files
-    public func deleteFile(fileID: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.FilesDelete, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(deleted: true)
            }) {(error) -> Void in
@@ -258,26 +286,26 @@ public class SlackWebAPI {
        }
    }
    
-    public func fileInfo(fileID: String, commentCount: Int = 100, totalPages: Int = 1, success: ((file: File?)->Void)?, failure: FailureClosure?) {
+    public func fileInfo(_ fileID: String, commentCount: Int = 100, totalPages: Int = 1, success: ((file: File)->Void)?, failure: FailureClosure?) {
        let parameters: [String: AnyObject] = ["file":fileID, "count": commentCount, "totalPages":totalPages]
-        client.api.request(.FilesInfo, token: client.token, parameters: parameters, successClosure: {
+        networkInterface.request(.FilesInfo, token: token, parameters: parameters, successClosure: {
            (response) in
                var file = File(file: response["file"] as? [String: AnyObject])
-                (response["comments"] as? [[String: AnyObject]])?.objectArrayFromDictionaryArray({(comment) -> Comment? in
-                    if let comment = Comment(comment: comment), id = comment.id {
-                        file?.comments[id] = comment
+                (response["comments"] as? [[String: AnyObject]])?.forEach { comment in
+                    let comment = Comment(comment: comment)
+                    if let id = comment.id {
+                        file.comments[id] = comment
                    }
-                    return nil
-                })
+                }
                success?(file: file)
            }) {(error) 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: {
+    public func uploadFile(_ file: Data, 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?.joined(separator: ",")]
+        networkInterface.uploadRequest(token, data: file, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(file: File(file: response["file"] as? [String: AnyObject]))
            }) {(error) -> Void in
@@ -286,9 +314,9 @@ public class SlackWebAPI {
    }
    
    //MARK: - File Comments
-    public func addFileComment(fileID: String, comment: String, success: ((comment: Comment?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.FilesCommentsAdd, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
            }) {(error) -> Void in
@@ -296,9 +324,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func editFileComment(fileID: String, commentID: String, comment: String, success: ((comment: Comment?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.FilesCommentsEdit, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
            success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
            }) {(error) -> Void in
@@ -306,9 +334,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func deleteFileComment(fileID: String, commentID: String, success: ((deleted: Bool?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.FilesCommentsDelete, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(deleted: true)
            }) {(error) -> Void in
@@ -317,7 +345,7 @@ public class SlackWebAPI {
    }
    
    //MARK: - Groups
-    public func closeGroup(groupID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+    public func closeGroup(_ groupID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
        close(.GroupsClose, channelID: groupID, success: {
            (closed) -> Void in
                success?(closed:closed)
@@ -326,7 +354,7 @@ public class SlackWebAPI {
        }
    }
    
-    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?) {
+    public func groupHistory(_ id: String, latest: String = "\(Date().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)
@@ -335,7 +363,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func groupInfo(id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -344,7 +372,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func groupsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -353,7 +381,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func markGroup(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+    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)
@@ -362,9 +390,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func openGroup(channel: String, success: ((opened: Bool)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.GroupsOpen, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(opened: true)
            }) {(error) -> Void in
@@ -372,7 +400,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func setGroupPurpose(channel: String, purpose: String, success: ((purposeSet: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -381,7 +409,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func setGroupTopic(channel: String, topic: String, success: ((topicSet: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -391,7 +419,7 @@ public class SlackWebAPI {
    }
    
    //MARK: - IM
-    public func closeIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+    public func closeIM(_ channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
        close(.IMClose, channelID: channel, success: {
            (closed) -> Void in
                success?(closed: closed)
@@ -400,7 +428,7 @@ public class SlackWebAPI {
        }
    }
    
-    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?) {
+    public func imHistory(_ id: String, latest: String = "\(Date().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)
@@ -409,7 +437,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func imsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -418,7 +446,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func markIM(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+    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)
@@ -427,9 +455,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func openIM(userID: String, success: ((imID: String?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.IMOpen, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                let group = response["channel"] as? [String: AnyObject]
                success?(imID: group?["id"] as? String)
@@ -439,7 +467,7 @@ public class SlackWebAPI {
    }
    
    //MARK: - MPIM
-    public func closeMPIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+    public func closeMPIM(_ channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
        close(.MPIMClose, channelID: channel, success: {
            (closed) -> Void in
                success?(closed: closed)
@@ -448,7 +476,7 @@ public class SlackWebAPI {
        }
    }
    
-    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?) {
+    public func mpimHistory(_ id: String, latest: String = "\(Date().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)
@@ -457,7 +485,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func mpimsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    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)
@@ -466,7 +494,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func markMPIM(channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+    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)
@@ -475,9 +503,9 @@ public class SlackWebAPI {
        }
    }
    
-    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: {
+    public func openMPIM(_ userIDs: [String], success: ((mpimID: String?)->Void)?, failure: FailureClosure?) {
+        let parameters = ["users":userIDs.joined(separator: ",")]
+        networkInterface.request(.MPIMOpen, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                let group = response["group"] as? [String: AnyObject]
                success?(mpimID: group?["id"] as? String)
@@ -487,7 +515,7 @@ public class SlackWebAPI {
    }
    
    //MARK: - Pins
-    public func pinItem(channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((pinned: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -496,7 +524,7 @@ public class SlackWebAPI {
        }
    }
    
-    public func unpinItem(channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((unpinned: Bool)->Void)?, failure: FailureClosure?) {
+    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)
@@ -505,9 +533,9 @@ public class SlackWebAPI {
        }
    }
    
-    private func pin(endpoint: SlackAPIEndpoint, channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
+    private func pin(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(ok: true)
            }){(error) -> Void in
@@ -517,7 +545,7 @@ public class SlackWebAPI {
    
    //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?) {
+    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)
@@ -527,7 +555,7 @@ public class SlackWebAPI {
    }
    
    // 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?) {
+    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)
@@ -536,9 +564,9 @@ public class SlackWebAPI {
        }
    }
    
-    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?) {
+    private func react(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(ok: true)
            }) {(error) -> Void in
@@ -548,7 +576,7 @@ public class SlackWebAPI {
    
    //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?) {
+    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)
@@ -558,7 +586,7 @@ public class SlackWebAPI {
    }
    
    // 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?) {
+    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)
@@ -567,9 +595,9 @@ public class SlackWebAPI {
        }
    }
    
-    private func star(endpoint: SlackAPIEndpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
+    private func star(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
            (response) -> Void in
                success?(ok: true)
            }) {(error) -> Void in
@@ -579,8 +607,8 @@ public class SlackWebAPI {

    
    //MARK: - Team
-    public func teamInfo(success: ((info: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
-        client.api.request(.TeamInfo, token: client.token, parameters: nil, successClosure: {
+    public func teamInfo(_ success: ((info: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        networkInterface.request(.TeamInfo, token: token, parameters: nil, successClosure: {
            (response) -> Void in
                success?(info: response["team"] as? [String: AnyObject])
            }) {(error) -> Void in
@@ -589,9 +617,9 @@ public class SlackWebAPI {
    }
    
    //MARK: - Users
-    public func userPresence(user: String, success: ((presence: String?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.UsersGetPresence, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(presence: response["presence"] as? String)
            }){(error) -> Void in
@@ -599,9 +627,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func userInfo(id: String, success: ((user: User?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.UsersInfo, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(user: User(user: response["user"] as? [String: AnyObject]))
            }) {(error) -> Void in
@@ -609,9 +637,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func usersList(includePresence: Bool = false, success: ((userList: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.UsersList, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(userList: response["members"] as? [[String: AnyObject]])
            }){(error) -> Void in
@@ -619,8 +647,8 @@ public class SlackWebAPI {
        }
    }
    
-    public func setUserActive(success: ((success: Bool)->Void)?, failure: FailureClosure?) {
-        client.api.request(.UsersSetActive, token: client.token, parameters: nil, successClosure: {
+    public func setUserActive(_ success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        networkInterface.request(.UsersSetActive, token: token, parameters: nil, successClosure: {
            (response) -> Void in
                success?(success: true)
            }) {(error) -> Void in
@@ -628,9 +656,9 @@ public class SlackWebAPI {
        }
    }
    
-    public func setUserPresence(presence: Presence, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+    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: {
+        networkInterface.request(.UsersSetPresence, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(success:true)
            }) {(error) -> Void in
@@ -639,9 +667,9 @@ public class SlackWebAPI {
    }
    
    //MARK: - Channel Utilities
-    private func close(endpoint: SlackAPIEndpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+    private func close(_ endpoint: Endpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
        let parameters: [String: AnyObject] = ["channel":channelID]
-        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(closed: true)
            }) {(error) -> Void in
@@ -649,9 +677,9 @@ public class SlackWebAPI {
        }
    }
    
-    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?) {
+    private func history(_ endpoint: Endpoint, id: String, latest: String = "\(Date().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: {
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(history: History(history: response))
            }) {(error) -> Void in
@@ -659,9 +687,9 @@ public class SlackWebAPI {
        }
    }
    
-    private func info(endpoint: SlackAPIEndpoint, type: ChannelType, id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+    private func info(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(channel: Channel(channel: response[type.rawValue] as? [String: AnyObject]))
            }) {(error) -> Void in
@@ -669,9 +697,9 @@ public class SlackWebAPI {
        }
    }
    
-    private func list(endpoint: SlackAPIEndpoint, type: ChannelType, excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+    private func list(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(channels: response[type.rawValue+"s"] as? [[String: AnyObject]])
            }) {(error) -> Void in
@@ -679,9 +707,9 @@ public class SlackWebAPI {
        }
    }
    
-    private func mark(endpoint: SlackAPIEndpoint, channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+    private func mark(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
            (response) -> Void in
                success?(ts: timestamp)
            }) {(error) -> Void in
@@ -689,29 +717,18 @@ public class SlackWebAPI {
        }
    }
    
-    private func setInfo(endpoint: SlackAPIEndpoint, type: InfoType, channel: String, text: String, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+    private func setInfo(_ endpoint: Endpoint, 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: {
+        networkInterface.request(endpoint, token: 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? {
+    private func encodeAttachments(_ attachments: [Attachment?]?) -> String? {
        if let attachments = attachments {
            var attachmentArray: [[String: AnyObject]] = []
            for attachment in attachments {
@@ -720,9 +737,8 @@ public class SlackWebAPI {
                }
            }
            do {
-                let data = try NSJSONSerialization.dataWithJSONObject(attachmentArray, options: NSJSONWritingOptions.PrettyPrinted)
-                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-                return string
+                let data = try JSONSerialization.data(withJSONObject: attachmentArray, options: [])
+                return String(data: data, encoding: String.Encoding.utf8)
            } catch _ {
                
            }
@@ -730,14 +746,23 @@ public class SlackWebAPI {
        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])
+    //MARK: - Filter Nil Parameters
+    internal static func filterNilParameters(_ parameters: [String: AnyObject?]) -> [String: AnyObject] {
+        var finalParameters = [String: AnyObject]()
+        for (key, value) in parameters {
+            if let unwrapped = value {
+                finalParameters[key] = unwrapped
            }
        }
+        return finalParameters
+    }
+    
+    //MARK: - Enumerate Do Not Disturb Status
+    private func enumerateDNDStatuses(_ statuses: [String: AnyObject]) -> [String: DoNotDisturbStatus] {
+        var retVal = [String: DoNotDisturbStatus]()
+        for key in statuses.keys {
+            retVal[key] = DoNotDisturbStatus(status: statuses[key] as? [String: AnyObject])
+        }
        return retVal
    }
    
@@ -0,0 +1,50 @@
+//
+// WebhookRequest.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 WebhookRequest: Request {
+    
+    let token: String?
+    let teamID: String
+    let teamDomain: String
+    let channelID: String
+    let channelName: String
+    let userID: String
+    let userName: String
+    let command: String
+    let text: String
+    let responseURL: String
+    
+    init(request: [String: AnyObject]?) {
+        token = request?["token"] as? String
+        teamID = request?["team_id"] as? String ?? ""
+        teamDomain = request?["team_domain"] as? String ?? ""
+        channelID = request?["channel_id"] as? String ?? ""
+        channelName = request?["channel_name"] as? String ?? ""
+        userID = request?["user_id"] as? String ?? ""
+        userName = request?["user_name"] as? String ?? ""
+        command = request?["command"] as? String ?? ""
+        text = request?["text"] as? String ?? ""
+        responseURL = request?["response_url"] as? String ?? ""
+    }
+    
+}
@@ -0,0 +1,50 @@
+//
+// WebhookServer.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.
+
+public class WebhookServer: Server {
+    
+    public init(token: String, route: String, response: Response) {
+        super.init(token: token)
+        addRoute(route, response: response)
+    }
+    
+    public func addRoute(_ route: String, response: Response) {
+        http["/\(route)"] = { request in
+            let webhookRequest = WebhookRequest(request: self.dictionaryFromRequest(request.body))
+            if webhookRequest.token == self.token {
+                return self.request(webhookRequest, reply: self.replyForResponse(response))
+            } else {
+                return .badRequest(.text("Bad request."))
+            }
+        }
+    }
+    
+    private func replyForResponse(_ response: Response) -> Reply {
+        if response.attachments == nil && response.responseType == nil {
+            return Reply.text(body: response.text)
+        } else {
+            return Reply.json(response: response)
+        }
+    }
+
+}
@@ -6,8 +6,6 @@
 	<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>
@@ -15,20 +13,16 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Launch Software LLC. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
+	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
+	<string></string>
 </dict>
 </plist>
@@ -0,0 +1,28 @@
+<?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>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>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
Author	SHA1	Message	Date
Peter Zignego	2e71ac6876	Bug fix	2016-07-23 11:12:14 -04:00
Peter Zignego	c428cac537	Update readme	2016-07-20 21:44:30 -04:00
Peter Zignego	18c6516df9	Remove Cocoapods	2016-07-20 21:32:57 -04:00
Peter Zignego	fe450a7db2	Set swift version	2016-07-20 21:32:41 -04:00
Peter Zignego	bb57f59553	Swift 3 support	2016-07-20 18:31:03 -04:00
Peter Zignego	e5a4a67bdb	Fix imports for SPM	2016-07-18 00:07:03 -04:00
Peter Zignego	1e304f1f6d	Update podfile.lock	2016-07-17 23:29:06 -04:00
Peter Zignego	81ebf86abd	Update podfile and podspec	2016-07-17 23:04:03 -04:00
Peter Zignego	afa16e98b3	Update podspec	2016-07-17 22:50:13 -04:00
Peter Zignego	6596bb2861	SlackKit 2.0.0	2016-07-17 22:20:15 -04:00
Peter Zignego	fd12ab0600	Readme updates	2016-07-17 21:49:27 -04:00
Peter Zignego	31508e44dc	Merge branch 'feature/message-buttons' # Conflicts: # README.md # SlackKit.xcodeproj/project.pbxproj # SlackKit/Sources/MessageActionResponder.swift # SlackKit/Supporting Files/Info-iOS.plist # SlackKit/Supporting Files/Info-tvOS.plist # SlackKit/Supporting Files/Info.plist	2016-07-17 21:39:14 -04:00
Peter Zignego	b980f371f6	SlackKit 2.0.0	2016-07-17 21:30:56 -04:00
Peter Zignego	9526d739e1	Oauth	2016-07-07 20:22:44 -04:00
Peter Zignego	c3af5c33be	Increment version	2016-07-04 14:35:51 -04:00
Peter Zignego	c6258c57a0	Merge pull request #43 from pvzig/spm-fix SPM fix	2016-07-04 14:32:31 -04:00
Peter Zignego	45e075aca2	Update readme	2016-07-04 14:30:52 -04:00
Peter Zignego	5ebe40a389	Remove example	2016-07-04 13:15:32 -04:00
Peter Zignego	0a5a8f83f7	Remove example target	2016-07-04 13:14:03 -04:00
Peter Zignego	8f4a287ad0	Fix Package.swift	2016-07-04 13:13:28 -04:00
Peter Zignego	deadc8855a	Webhook and server	2016-07-04 12:38:06 -04:00
Peter Zignego	98155f00b7	Remove bundled sample	2016-07-02 16:42:36 -04:00
Peter Zignego	a55d3be65b	Message buttons	2016-06-26 14:39:12 -04:00
Peter Zignego	3b8f1834f0	Code improvements	2016-06-25 18:52:53 -04:00
Peter Zignego	34972eb8af	Types get their own .swift files	2016-06-25 18:51:48 -04:00
Peter Zignego	f21179f567	Model type organization	2016-06-23 00:13:52 -04:00
Peter Zignego	e1bf5a160f	Merge pull request #41 from hamin/make-some-channel-setters-public Make the following Chanel setters public 'unreadCountDisplay', 'unrea…	2016-06-19 22:00:07 -04:00
Haris Amin	c66a5fe0db	Make the following Chanel setters public 'unreadCountDisplay', 'unread', and 'lastRead'	2016-06-19 17:48:31 -04:00
Peter Zignego	f03908bcc7	Merge pull request #38 from natestedman/master Remove curly quotes from Carthage instructions	2016-06-04 11:13:55 -04:00
Nate Stedman	591b0d9d55	Remove curly quotes from Carthage instructions.	2016-06-04 08:55:23 -04:00
Peter Zignego	6e83fb93d8	Merge pull request #36 from pvzig/feature/additional-footer-fields 1.1.1	2016-06-01 17:22:02 -04:00
Peter Zignego	c1d202f433	Increment version	2016-06-01 17:21:23 -04:00
Peter Zignego	c7db8ac578	Add new Attachment footer fields https://api.slack.com/docs/attachments	2016-06-01 17:17:27 -04:00
Peter Zignego	d2e430e5bf	Merge pull request #35 from pvzig/feature/model-object-improvements 1.1.0	2016-05-22 22:33:12 -04:00
Peter Zignego	ebe169bf2a	Update podspec	2016-05-22 22:30:29 -04:00
Peter Zignego	ca36653dc4	Update readme	2016-05-22 22:30:21 -04:00
Peter Zignego	94895edfac	Bump version	2016-05-22 22:27:34 -04:00
Peter Zignego	3ea13ac6c4	Multiple target naming clean up	2016-05-22 22:27:25 -04:00
Peter Zignego	e94adfc019	Make timestamp non-optional	2016-05-22 21:59:51 -04:00
Peter Zignego	1291323c5a	Remove unused variable	2016-05-22 21:30:41 -04:00
Peter Zignego	4ceb452e6b	File reordering	2016-05-22 21:30:27 -04:00
Peter Zignego	457504e786	Code quality	2016-05-22 18:38:00 -04:00
Peter Zignego	6d9a939575	Files only come as an ID via RTM (API change) https://medium.com/slack-developer-blog/changes-to-file-events-in-the-real-time-messaging-api-5fa75c8c4d99#.1f3k421tz	2016-05-22 18:12:46 -04:00
Peter Zignego	efc3847a20	Merge remote-tracking branch 'michallaskowski/remove-unneded-optionals' into feature/model-object-improvements # Conflicts: # SlackKit/Sources/Message.swift # SlackKit/Sources/SlackWebAPI.swift	2016-05-21 15:28:28 -04:00
Peter Zignego	3ed139b503	Merge pull request #33 from hamin/fix-message-reactions-parsing Fixes parsing of Reaction from Message response. It now properly adds…	2016-05-21 12:26:51 -04:00
Peter Zignego	a4d9083f72	Merge pull request #34 from muratayusuke/feature/handle_http_error Hanlde HTTP error	2016-05-21 12:25:18 -04:00
muratayusuke	67b2fa95b3	Hanlde HTTP error	2016-05-21 15:06:57 +09:00
Haris Amin	e031f85447	Fixes parsing of Reaction from Message response. It now properly adds users to a parsed Reaction	2016-05-21 01:16:34 -04:00
Peter Zignego	0b1dc6068e	Merge remote-tracking branch 'michallaskowski/slack-web-api-without-client'	2016-05-17 20:21:20 -04:00
Peter Zignego	b027b5b779	Readme styling	2016-05-15 21:16:09 -04:00
Peter Zignego	e507c85ca2	Update readme with note about slow carthage build times	2016-05-15 21:14:43 -04:00
michallaskowski	145dfccfae	Remove unneeded Array extension	2016-05-15 23:16:55 +02:00
michallaskowski	b4ca2bcc07	Delete optionals from EventDelegate where possible, fix reactionRemoved	2016-05-15 23:16:55 +02:00
michallaskowski	85b2d920ad	Gardening Client.swift	2016-05-15 23:16:55 +02:00
michallaskowski	6415a113ed	Remove failable initializers	2016-05-15 23:16:55 +02:00
Peter Zignego	3a2324b279	Fix readme	2016-05-15 16:29:40 -04:00
Peter Zignego	d647a6b0c9	Update podspec	2016-05-15 16:27:47 -04:00
Peter Zignego	4230d7841c	Merge pull request #32 from pvzig/feature/carthage-support Feature/carthage support	2016-05-15 16:22:18 -04:00
Peter Zignego	8995a54d15	Fix project file and schemes after merge	2016-05-15 16:16:26 -04:00
Peter Zignego	ba43a123ea	Merge branch 'master' into feature/carthage-support # Conflicts: # SlackKit.podspec # SlackKit.xcodeproj/project.pbxproj # SlackKit.xcodeproj/xcshareddata/xcschemes/SlackKit.xcscheme	2016-05-15 15:57:27 -04:00
Peter Zignego	d00419dc18	Framework build details	2016-05-15 15:41:42 -04:00
Peter Zignego	15f3a30ba9	Framework build details	2016-05-15 15:39:47 -04:00
Peter Zignego	befa53e3a9	Update ignore	2016-05-15 15:28:43 -04:00
Peter Zignego	35dfa840e8	Revert "Use submodule to handle core dependency" This reverts commit `edf56e1678`.	2016-05-15 15:25:36 -04:00
Peter Zignego	edf56e1678	Use submodule to handle core dependency	2016-05-15 15:21:47 -04:00
Peter Zignego	3eab323564	Ignore Cartfile.resolved	2016-05-15 15:04:34 -04:00
Peter Zignego	0b2ee1d10e	Clean up project file	2016-05-15 14:51:15 -04:00
michallaskowski	5444948940	Do not hold Client instance in SlackWebAPI	2016-05-15 20:40:05 +02:00
Peter Zignego	13335b5de1	Add additional shared schemes	2016-05-15 14:09:21 -04:00
Peter Zignego	c8d8e18db6	Move AttachmentColor enum	2016-05-14 20:11:14 -04:00
Peter Zignego	c11321c116	File name comment fixes	2016-05-14 20:08:54 -04:00
Michal Laskowski	0041a118a7	Fix circular dependencies (#30 ) * Remove EventDispatcher, EventHandler classes; extend Client * Make delegates weak * Remove unneded 'if let delegate = ' * Move files around	2016-05-14 19:51:08 -04:00
Michal Laskowski	6cb5280cf5	Add tvOS target to podspec	2016-05-11 10:12:15 -05:00
Peter Zignego	9cad043957	Add shared scheme	2016-05-06 15:02:39 -04:00
Peter Zignego	fa15ed8751	Merge pull request #28 from hamin/add-larger-thumbs-to-file Adding support for larger size File thumbs	2016-05-04 12:02:42 -04:00
Haris Amin	0c9c146d58	Adding support for larger size File thumbs	2016-05-04 01:58:43 -04:00
Peter Zignego	109a20fac2	Readme update	2016-04-27 23:18:19 -04:00
Peter Zignego	a6cf1e3cb6	Revert "Delete and add Cartfile.resolved to ignore" This reverts commit `d3c16bed5f`.	2016-04-27 23:17:41 -04:00
Peter Zignego	d3c16bed5f	Delete and add Cartfile.resolved to ignore	2016-04-27 23:07:55 -04:00
Peter Zignego	797d95ab75	Update readme	2016-04-27 22:54:30 -04:00
Nate Stedman	efb7bc9458	Use Carthage for resolving dependencies.	2016-04-27 22:34:28 -04:00