diff --git a/spectrum/src/frontends/slack/SlackRTM.h b/spectrum/src/frontends/slack/SlackRTM.h
index 26b6c4bf839e9c93768ebfce26cf214527beea50..6e1b6d340b5eff65a5924af758709a9c7f74b1f2 100644
--- a/spectrum/src/frontends/slack/SlackRTM.h
+++ b/spectrum/src/frontends/slack/SlackRTM.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "SlackAPI.h"
+
 #include "transport/StorageBackend.h"
 #include "rapidjson/document.h"
 
@@ -31,6 +33,7 @@
 #include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/HostAddress.h>
 #include <Swiften/Base/SafeByteArray.h>
+#include "Swiften/Network/Timer.h"
 #include "Swiften/Version.h"
 
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
@@ -50,6 +53,8 @@ namespace Transport {
 class Component;
 class StorageBackend;
 class HTTPRequest;
+class WebSocketClient;
+class SlackAPI;
 
 class SlackRTM {
 	public:
@@ -57,21 +62,40 @@ class SlackRTM {
 
 		virtual ~SlackRTM();
 
+		void sendPing();
+
+		void sendMessage(const std::string &channel, const std::string &message);
+
+		boost::signal<void ()> onRTMStarted;
+
+		std::map<std::string, SlackUserInfo> &getUsers() {
+			return m_users;
+		}
+
+		SlackAPI *getAPI() {
+			return m_api;
+		}
+
+		boost::signal<void (const std::string &channel, const std::string &user, const std::string &text)> onMessageReceived;
+
 	private:
-		void handleDNSResult(const std::vector<Swift::HostAddress>&, boost::optional<Swift::DomainNameResolveError>);
-		void handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data);
-		void handleConnected(bool error);
+		void handlePayloadReceived(const std::string &payload);
 		void handleRTMStart(HTTPRequest *req, bool ok, rapidjson::Document &resp, const std::string &data);
 
+	private:
+		std::map<std::string, SlackChannelInfo> m_channels;
+		std::map<std::string, SlackImInfo> m_ims;
+		std::map<std::string, SlackUserInfo> m_users;
+
 	private:
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		UserInfo m_uinfo;
-		boost::shared_ptr<Swift::DomainNameAddressQuery> m_dnsQuery;
-		boost::shared_ptr<Swift::Connection> m_conn;
-		Swift::TLSConnectionFactory *m_tlsConnectionFactory;
-		std::string m_host;
-		std::string m_path;
+		WebSocketClient *m_client;
+		std::string m_token;
+		unsigned long m_counter;
+		Swift::Timer::ref m_pingTimer;
+		SlackAPI *m_api;
 };
 
 }