diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 9a390c31f..46dcef91b 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1 +1,1740 @@
-"use strict";
\ No newline at end of file
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var EventEmitter = require("events");
+var request = require("superagent");
+var WebSocket = require("ws");
+var ConnectionState = require("./ConnectionState.js");
+
+var Constants = require("../Constants.js"),
+    Endpoints = Constants.Endpoints,
+    PacketType = Constants.PacketType;
+
+var Cache = require("../Util/Cache.js");
+var Resolver = require("./Resolver/Resolver.js");
+
+var User = require("../Structures/User.js"),
+    Channel = require("../Structures/Channel.js"),
+    TextChannel = require("../Structures/TextChannel.js"),
+    VoiceChannel = require("../Structures/VoiceChannel.js"),
+    PMChannel = require("../Structures/PMChannel.js"),
+    Server = require("../Structures/Server.js"),
+    Message = require("../Structures/Message.js"),
+    Role = require("../Structures/Role.js"),
+    Invite = require("../Structures/Invite.js"),
+    VoiceConnection = require("../Voice/VoiceConnection.js");
+
+var zlib;
+
+var InternalClient = (function () {
+	function InternalClient(discordClient) {
+		_classCallCheck(this, InternalClient);
+
+		this.client = discordClient;
+		this.state = ConnectionState.IDLE;
+		this.websocket = null;
+
+		if (this.client.options.compress) {
+			zlib = require("zlib");
+		}
+
+		// creates 4 caches with discriminators based on ID
+		this.users = new Cache();
+		this.channels = new Cache();
+		this.servers = new Cache();
+		this.private_channels = new Cache();
+		this.typingIntervals = [];
+		this.voiceConnection = null;
+		this.resolver = new Resolver(this);
+		this.readyTime = null;
+
+		this.messageAwaits = {};
+	}
+
+	_createClass(InternalClient, [{
+		key: "leaveVoiceChannel",
+
+		//def leaveVoiceChannel
+		value: function leaveVoiceChannel() {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				if (self.voiceConnection) {
+					self.voiceConnection.destroy();
+					self.voiceConnection = null;
+					resolve();
+				} else {
+					resolve();
+				}
+			});
+		}
+
+		//def awaitResponse
+
+	}, {
+		key: "awaitResponse",
+		value: function awaitResponse(msg) {
+			var _this = this;
+
+			return new Promise(function (resolve, reject) {
+
+				msg = _this.resolver.resolveMessage(msg);
+
+				if (!msg) {
+					reject(new Error("message undefined"));
+					return;
+				}
+
+				var awaitID = msg.channel.id + msg.author.id;
+
+				if (!_this.messageAwaits[awaitID]) {
+					_this.messageAwaits[awaitID] = [];
+				}
+
+				_this.messageAwaits[awaitID].push(resolve);
+			});
+		}
+
+		//def joinVoiceChannel
+
+	}, {
+		key: "joinVoiceChannel",
+		value: function joinVoiceChannel(chann) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				var channel = self.resolver.resolveVoiceChannel(chann);
+
+				if (channel) {
+					var next = function next() {
+						var session,
+						    token,
+						    server = channel.server,
+						    endpoint;
+
+						var check = function check(m) {
+							var data = JSON.parse(m);
+							if (data.t === "VOICE_STATE_UPDATE") {
+								session = data.d.session_id;
+							} else if (data.t === "VOICE_SERVER_UPDATE") {
+								token = data.d.token;
+								endpoint = data.d.endpoint;
+								var chan = self.voiceConnection = new VoiceConnection(channel, self.client, session, token, server, endpoint);
+
+								chan.on("ready", function () {
+									return resolve(chan);
+								});
+								chan.on("error", reject);
+
+								self.client.emit("debug", "removed temporary voice websocket listeners");
+								self.websocket.removeListener("message", check);
+							}
+						};
+
+						self.websocket.on("message", check);
+						self.sendWS({
+							op: 4,
+							d: {
+								"guild_id": server.id,
+								"channel_id": channel.id,
+								"self_mute": false,
+								"self_deaf": false
+							}
+						});
+					};
+
+					self.leaveVoiceChannel().then(next);
+				} else {
+					reject(new Error("voice channel does not exist"));
+				}
+			});
+		}
+
+		// def createServer
+
+	}, {
+		key: "createServer",
+		value: function createServer(name) {
+			var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				name = self.resolver.resolveString(name);
+
+				request.post(Endpoints.SERVERS).set("authorization", self.token).send({ name: name, region: region }).end(function (err, res) {
+					if (err) {
+						reject(new Error(err));
+					} else {
+						// valid server, wait until it is cached
+						var inter = setInterval(function () {
+							if (self.servers.get("id", res.body.id)) {
+								clearInterval(inter);
+								resolve(self.servers.get("id", res.body.id));
+							}
+						}, 20);
+					}
+				});
+			});
+		}
+
+		//def joinServer
+
+	}, {
+		key: "joinServer",
+		value: function joinServer(invite) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				invite = self.resolver.resolveInviteID(invite);
+				if (invite) {
+					request.post(Endpoints.INVITE(invite)).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							// valid server, wait until it is received via ws and cached
+							var inter = setInterval(function () {
+								if (self.servers.get("id", res.body.guild.id)) {
+									clearInterval(inter);
+									resolve(self.servers.get("id", res.body.guild.id));
+								}
+							}, 20);
+						}
+					});
+				} else {
+					reject(new Error("Not a valid invite"));
+				}
+			});
+		}
+
+		//def leaveServer
+
+	}, {
+		key: "leaveServer",
+		value: function leaveServer(srv) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				var server = self.resolver.resolveServer(srv);
+				if (server) {
+
+					request.del(Endpoints.SERVER(server.id)).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(new Error(err));
+						} else {
+							// remove channels of server then the server
+							var _iteratorNormalCompletion = true;
+							var _didIteratorError = false;
+							var _iteratorError = undefined;
+
+							try {
+								for (var _iterator = server.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+									var chan = _step.value;
+
+									self.channels.remove(chan);
+								}
+								// remove server
+							} catch (err) {
+								_didIteratorError = true;
+								_iteratorError = err;
+							} finally {
+								try {
+									if (!_iteratorNormalCompletion && _iterator.return) {
+										_iterator.return();
+									}
+								} finally {
+									if (_didIteratorError) {
+										throw _iteratorError;
+									}
+								}
+							}
+
+							self.servers.remove(server);
+							resolve();
+						}
+					});
+				} else {
+					reject(new Error("server did not resolve"));
+				}
+			});
+		}
+
+		// def login
+
+	}, {
+		key: "login",
+		value: function login(email, password) {
+			var self = this;
+			var client = self.client;
+			return new Promise(function (resolve, reject) {
+				if (self.state === ConnectionState.DISCONNECTED || self.state === ConnectionState.IDLE) {
+
+					self.state = ConnectionState.LOGGING_IN;
+
+					request.post(Endpoints.LOGIN).send({ email: email, password: password }).end(function (err, res) {
+
+						if (err) {
+							self.state = ConnectionState.DISCONNECTED;
+							self.websocket = null;
+							client.emit("disconnected");
+							reject(new Error(err));
+						} else {
+							var token = res.body.token;
+							self.state = ConnectionState.LOGGED_IN;
+							self.token = token;
+							self.email = email;
+							self.password = password;
+
+							self.getGateway().then(function (url) {
+
+								self.createWS(url);
+								resolve(token);
+							}).catch(function (e) {
+								self.state = ConnectionState.DISCONNECTED;
+								client.emit("disconnected");
+								reject(new Error(err));
+							});
+						}
+					});
+				} else {
+					reject(new Error("already logging in/logged in/ready!"));
+				}
+			});
+		}
+
+		// def logout
+
+	}, {
+		key: "logout",
+		value: function logout() {
+			var _this2 = this;
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				if (self.state === ConnectionState.DISCONNECTED || self.state === ConnectionState.IDLE) {
+					reject(new Error("Client is not logged in!"));
+					return;
+				}
+
+				request.post(Endpoints.LOGOUT).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(new Error(err));
+					} else {
+						if (_this2.websocket) {
+							_this2.websocket.close();
+							_this2.websocket = null;
+						}
+						self.token = null;
+						self.email = null;
+						self.password = null;
+						self.state = ConnectionState.DISCONNECTED;
+						resolve();
+					}
+				});
+			});
+		}
+
+		// def startPM
+
+	}, {
+		key: "startPM",
+		value: function startPM(resUser) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				var user = self.resolver.resolveUser(resUser);
+
+				if (user) {
+
+					// start the PM
+					request.post("" + Endpoints.USER_CHANNELS(user.id)).set("authorization", self.token).send({
+						recipient_id: user.id
+					}).end(function (err, res) {
+						if (err) {
+							reject(new Error(err));
+						} else {
+							resolve(self.private_channels.add(new PMChannel(res.body, self.client)));
+						}
+					});
+				} else {
+					reject(new Error("Unable to resolve resUser to a User"));
+				}
+			});
+		}
+
+		// def getGateway
+
+	}, {
+		key: "getGateway",
+		value: function getGateway() {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				request.get(Endpoints.GATEWAY).set("authorization", self.token).end(function (err, res) {
+					if (err) reject(err);else resolve(res.body.url);
+				});
+			});
+		}
+
+		// def sendMessage
+
+	}, {
+		key: "sendMessage",
+		value: function sendMessage(where, _content) {
+			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(where).then(next).catch(function (e) {
+					return reject(new Error("Error resolving destination - " + e));
+				});
+
+				function next(destination) {
+					//var destination;
+					var content = self.resolver.resolveString(_content);
+					var mentions = self.resolver.resolveMentions(content);
+
+					request.post(Endpoints.CHANNEL_MESSAGES(destination.id)).set("authorization", self.token).send({
+						content: content,
+						mentions: mentions,
+						tts: options.tts
+					}).end(function (err, res) {
+						if (err) {
+							reject(new Error(err));
+						} else {
+
+							resolve(destination.messages.add(new Message(res.body, destination, self.client)));
+						}
+					});
+				}
+			});
+		}
+		// def deleteMessage
+
+	}, {
+		key: "deleteMessage",
+		value: function deleteMessage(_message) {
+			var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				var message = self.resolver.resolveMessage(_message);
+
+				if (message) {
+					var _deleteMsg = function _deleteMsg() {
+						request.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).end(function (err, res) {
+							if (err) {
+								reject(new Error(err));
+							} else {
+								message.channel.messages.remove(message);
+								resolve();
+							}
+						});
+					};
+
+					if (options.wait) {
+						setTimeout(_deleteMsg, options.wait);
+					} else {
+						_deleteMsg();
+					}
+				} else {
+					reject(new Error("Supplied message did not resolve to a message!"));
+				}
+			});
+		}
+
+		// def updateMessage
+
+	}, {
+		key: "updateMessage",
+		value: function updateMessage(msg, _content) {
+			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				var message = self.resolver.resolveMessage(msg);
+
+				if (message) {
+
+					var content = self.resolver.resolveString(_content);
+					var mentions = self.resolver.resolveMentions(content);
+
+					request.patch(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).send({
+						content: content,
+						tts: options.tts,
+						mentions: mentions
+					}).end(function (err, res) {
+						if (err) {
+							reject(new Error(err));
+						} else {
+							resolve(message.channel.messages.update(message, new Message(res.body, message.channel, self.client)));
+						}
+					});
+				} else {
+					reject(new Error("Supplied message did not resolve to a message!"));
+				}
+			});
+		}
+
+		// def sendFile
+
+	}, {
+		key: "sendFile",
+		value: function sendFile(where, _file) {
+			var name = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				self.resolver.resolveChannel(where).then(next).catch(function (e) {
+					return reject(new Error("couldn't resolve to channel - " + e));
+				});
+
+				function next(channel) {
+
+					var file = self.resolver.resolveFile(_file);
+
+					request.post(Endpoints.CHANNEL_MESSAGES(channel.id)).set("authorization", self.token).attach("file", file, name).end(function (err, res) {
+
+						if (err) {
+							reject(new Error(err));
+						} else {
+							resolve(channel.messages.add(new Message(res.body, channel, self.client)));
+						}
+					});
+				}
+			});
+		}
+
+		// def getChannelLogs
+
+	}, {
+		key: "getChannelLogs",
+		value: function getChannelLogs(_channel) {
+			var limit = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
+			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(_channel).then(next).catch(function (e) {
+					return reject(new Error("couldn't resolve to channel - " + e));
+				});
+
+				function next(channel) {
+
+					if (options.before) options.before = self.resolver.resolveMessage(options.before);
+					if (options.after) options.after = self.resolver.resolveMessage(options.after);
+
+					var params = [];
+					if (options.before) params.push("before=" + options.before.id);
+					if (options.after) params.push("after=" + options.after.id);
+
+					var joinedParams = params.join();
+					if (joinedParams !== "") joinedParams = "&" + params.join();
+
+					request.get(Endpoints.CHANNEL_MESSAGES(channel.id) + "?limit=" + limit + joinedParams).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(new Error(err));
+						} else {
+							var logs = [];
+							res.body.forEach(function (msg) {
+								logs.push(channel.messages.add(new Message(msg, channel, self.client)));
+							});
+							resolve(logs);
+						}
+					});
+				}
+			});
+		}
+
+		// def getBans
+
+	}, {
+		key: "getBans",
+		value: function getBans(server) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				server = self.resolver.resolveServer(server);
+
+				request.get("" + Endpoints.SERVER_BANS(server.id)).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(new Error(err));
+					} else {
+						var bans = [];
+						res.body.forEach(function (ban) {
+							bans.push(self.users.add(new User(ban.user, self.client)));
+						});
+						resolve(bans);
+					}
+				});
+			});
+		}
+
+		// def createChannel
+
+	}, {
+		key: "createChannel",
+		value: function createChannel(server, name) {
+			var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				server = self.resolver.resolveServer(server);
+
+				request.post(Endpoints.SERVER_CHANNELS(server.id)).set("authorization", self.token).send({
+					name: name, type: type
+				}).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						var channel;
+						if (res.body.type === "text") {
+							channel = new TextChannel(res.body, self.client, server);
+						} else {
+							channel = new VoiceChannel(res.body, self.client, server);
+						}
+						resolve(server.channels.add(self.channels.add(channel)));
+					}
+				});
+			});
+		}
+
+		// def deleteChannel
+
+	}, {
+		key: "deleteChannel",
+		value: function deleteChannel(_channel) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(_channel).then(next).catch(reject);
+
+				function next(channel) {
+					request.del(Endpoints.CHANNEL(channel.id)).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							channel.server.channels.remove(channel);
+							self.channels.remove(channel);
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		// def banMember
+
+	}, {
+		key: "banMember",
+		value: function banMember(user, server) {
+			var length = arguments.length <= 2 || arguments[2] === undefined ? 1 : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				user = self.resolver.resolveUser(user);
+				server = self.resolver.resolveServer(server);
+
+				request.put(Endpoints.SERVER_BANS(server.id) + "/" + user.id + "?delete-message-days=" + length).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			});
+		}
+
+		// def unbanMember
+
+	}, {
+		key: "unbanMember",
+		value: function unbanMember(user, server) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				server = self.resolver.resolveServer(server);
+				user = self.resolver.resolveUser(user);
+
+				request.del(Endpoints.SERVER_BANS(server.id) + "/" + user.id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			});
+		}
+
+		// def kickMember
+
+	}, {
+		key: "kickMember",
+		value: function kickMember(user, server) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				user = self.resolver.resolveUser(user);
+				server = self.resolver.resolveServer(server);
+
+				request.del(Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			});
+		}
+
+		// def createRole
+
+	}, {
+		key: "createRole",
+		value: function createRole(server, data) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				server = self.resolver.resolveServer(server);
+
+				request.post(Endpoints.SERVER_ROLES(server.id)).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+
+						var role = server.roles.add(new Role(res.body, server, self.client));
+
+						if (data) {
+
+							self.updateRole(role, data).then(resolve).catch(reject);
+						} else {
+							resolve(role);
+						}
+					}
+				});
+			});
+		}
+		// def updateRole
+
+	}, {
+		key: "updateRole",
+		value: function updateRole(role, data) {
+			var self = this;
+			data = data || {};
+			data.permissions = data.permissions || [];
+			return new Promise(function (resolve, reject) {
+
+				var server = self.resolver.resolveServer(role.server);
+
+				var permissions = 0;
+				var _iteratorNormalCompletion2 = true;
+				var _didIteratorError2 = false;
+				var _iteratorError2 = undefined;
+
+				try {
+					for (var _iterator2 = data.permissions[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+						var perm = _step2.value;
+
+						if (perm instanceof String || typeof perm === "string") {
+							permissions |= Constants.Permissions[perm] || 0;
+						} else {
+							permissions |= perm;
+						}
+					}
+				} catch (err) {
+					_didIteratorError2 = true;
+					_iteratorError2 = err;
+				} finally {
+					try {
+						if (!_iteratorNormalCompletion2 && _iterator2.return) {
+							_iterator2.return();
+						}
+					} finally {
+						if (_didIteratorError2) {
+							throw _iteratorError2;
+						}
+					}
+				}
+
+				data.color = data.color || 0;
+
+				request.patch(Endpoints.SERVER_ROLES(server.id) + "/" + role.id).set("authorization", self.token).send({
+					color: data.color || role.color,
+					hoist: data.hoist || role.hoist,
+					name: data.name || role.name,
+					permissions: permissions
+				}).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						var nrole = new Role(res.body, server, self.client);
+						resolve(server.roles.update(role, nrole));
+					}
+				});
+			});
+		}
+
+		// def deleteRole
+
+	}, {
+		key: "deleteRole",
+		value: function deleteRole(role) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				request.del(Endpoints.SERVER_ROLES(role.server.id) + "/" + role.id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+						// the ws cache will handle it
+						// role.server.roles.remove(role);
+					}
+				});
+			});
+		}
+
+		//def addMemberToRole
+
+	}, {
+		key: "addMemberToRole",
+		value: function addMemberToRole(member, role) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				member = self.resolver.resolveUser(member);
+
+				if (!member || !role) {
+					reject(new Error("member/role not in server"));
+					return;
+				}
+
+				if (role.server.memberMap[member.id]) {
+
+					var roleIDS = role.server.memberMap[member.id].roles.map(function (r) {
+						return r.id;
+					}).concat(role.id);
+
+					request.patch(Endpoints.SERVER_MEMBERS(role.server.id) + "/" + member.id).set("authorization", self.token).send({
+						roles: roleIDS
+					}).end(function (err) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				} else {
+					reject(new Error("member not in server"));
+				}
+			});
+		}
+
+		//def removeMemberFromRole
+
+	}, {
+		key: "removeMemberFromRole",
+		value: function removeMemberFromRole(member, role) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				member = self.resolver.resolveUser(member);
+
+				if (!member || !role) {
+					reject(new Error("member/role not in server"));
+					return;
+				}
+
+				if (role.server.memberMap[member.id]) {
+
+					var roleIDS = role.server.memberMap[member.id].roles.map(function (r) {
+						return r.id;
+					});
+
+					for (var item in roleIDS) {
+						if (roleIDS[item] === role.id) {
+							roleIDS.splice(item, 1);
+						}
+					}
+
+					request.patch(Endpoints.SERVER_MEMBERS(role.server.id) + "/" + member.id).set("authorization", self.token).send({
+						roles: roleIDS
+					}).end(function (err) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				} else {
+					reject(new Error("member not in server"));
+				}
+			});
+		}
+
+		// def createInvite
+
+	}, {
+		key: "createInvite",
+		value: function createInvite(chanServ, options) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				if (chanServ instanceof Channel) {
+					// do something
+				} else if (chanServ instanceof Server) {
+						// do something
+					} else {
+							chanServ = self.resolver.resolveServer(chanServ) || self.resolver.resolveChannel(chanServ);
+						}
+
+				if (!chanServ) {
+					reject(new Error("couldn't resolve where"));
+					return;
+				}
+
+				if (!options) {
+					options = { validate: null };
+				} else {
+					options.max_age = options.maxAge || 0;
+					options.max_uses = options.maxUses || 0;
+					options.temporary = options.temporary || false;
+					options.xkcdpass = options.xkcd || false;
+				}
+
+				var epoint;
+				if (chanServ instanceof Channel) {
+					epoint = Endpoints.CHANNEL_INVITES(chanServ.id);
+				} else {
+					epoint = Endpoints.SERVER_INVITES(chanServ.id);
+				}
+
+				request.post(epoint).set("authorization", self.token).send(options).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve(new Invite(res.body, self.channels.get("id", res.body.channel.id), self.client));
+					}
+				});
+			});
+		}
+
+		//def deleteInvite
+
+	}, {
+		key: "deleteInvite",
+		value: function deleteInvite(invite) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				invite = self.resolver.resolveInviteID(invite);
+				if (invite) {
+					request.del(Endpoints.INVITE(invite)).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				} else {
+					reject(new Error("Not a valid invite"));
+				}
+			});
+		}
+
+		//def overwritePermissions
+
+	}, {
+		key: "overwritePermissions",
+		value: function overwritePermissions(channel, role, updated) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				channel = self.resolver.resolveChannel(channel).catch(reject).then(next);
+				function next(channel) {
+
+					var user;
+					if (role instanceof User) {
+						user = role;
+					}
+
+					var data = {};
+					data.allow = 0;
+					data.deny = 0;
+
+					updated.allow = updated.allow || [];
+					updated.deny = updated.deny || [];
+
+					if (role instanceof Role) {
+						data.id = role.id;
+						data.type = "role";
+					} else if (user) {
+						data.id = user.id;
+						data.type = "member";
+					} else {
+						reject(new Error("role incorrect"));
+						return;
+					}
+
+					for (var perm in updated) {
+						if (updated[perm]) {
+							if (perm instanceof String || typeof perm === "string") {
+								data.allow |= Constants.Permissions[perm] || 0;
+							} else {
+								data.allow |= perm;
+							}
+						} else {
+							if (perm instanceof String || typeof perm === "string") {
+								data.deny |= Constants.Permissions[perm] || 0;
+							} else {
+								data.deny |= perm;
+							}
+						}
+					}
+
+					request.put(Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id).set("authorization", self.token).send(data).end(function (err) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		//def setStatus
+
+	}, {
+		key: "setStatus",
+		value: function setStatus(idleStatus, gameID) {
+			var self = this;
+
+			self.idleStatus = idleStatus || self.idleStatus || null;
+			if (idleStatus) {
+				if (idleStatus == "online" || idleStatus == "here" || idleStatus == "available") {
+					self.idleStatus = null;
+				}
+			}
+			self.gameID = self.resolver.resolveGameID(gameID) || self.gameID || null;
+
+			return new Promise(function (resolve, reject) {
+
+				var packet = {
+					op: 3,
+					d: {
+						idle_since: self.idleStatus,
+						game_id: self.gameID
+					}
+				};
+
+				if (self.idleStatus == "idle" || self.idleStatus == "away") {
+					packet.d.idle_since = Date.now();
+				}
+
+				self.sendWS(packet);
+
+				resolve();
+			});
+		}
+
+		//def sendTyping
+
+	}, {
+		key: "sendTyping",
+		value: function sendTyping(channel) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(channel).then(next).catch(reject);
+
+				function next(channel) {
+
+					request.post(Endpoints.CHANNEL(channel.id) + "/typing").set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		//def startTyping
+
+	}, {
+		key: "startTyping",
+		value: function startTyping(channel) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(channel).then(next).catch(reject);
+
+				function next(channel) {
+
+					if (self.typingIntervals[channel.id]) {
+						// typing interval already exists, leave it alone
+						reject(new Error("Already typing in that channel"));
+						return;
+					}
+
+					self.sendTyping(channel);
+
+					self.typingIntervals[channel.id] = setInterval(function () {
+						return self.sendTyping(channel);
+					}, 4000);
+				}
+			});
+		}
+
+		//def stopTyping
+
+	}, {
+		key: "stopTyping",
+		value: function stopTyping(channel) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(channel).then(next).catch(reject);
+
+				function next(channel) {
+
+					if (!self.typingIntervals[channel.id]) {
+						// typing interval doesn't exist
+						reject(new Error("Not typing in that channel"));
+						return;
+					}
+
+					clearInterval(self.typingIntervals[channel.id]);
+					self.typingIntervals[channel.id] = false;
+				}
+			});
+		}
+
+		//def updateDetails
+
+	}, {
+		key: "updateDetails",
+		value: function updateDetails(data) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				request.patch(Endpoints.ME).set("authorization", self.token).send({
+					avatar: self.resolver.resolveToBase64(data.avatar) || self.user.avatar,
+					email: data.email || self.email,
+					new_password: data.newPassword || null,
+					password: data.password || self.password,
+					username: data.username || self.user.username
+				}).end(function (err) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			});
+		}
+
+		//def setAvatar
+
+	}, {
+		key: "setAvatar",
+		value: function setAvatar(avatar) {
+			return this.updateDetails({ avatar: avatar });
+		}
+
+		//def setUsername
+
+	}, {
+		key: "setUsername",
+		value: function setUsername(username) {
+			return this.updateDetails({ username: username });
+		}
+
+		//def setTopic
+
+	}, {
+		key: "setTopic",
+		value: function setTopic(chann) {
+			var topic = arguments.length <= 1 || arguments[1] === undefined ? "" : arguments[1];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(chann).then(next).catch(reject);
+
+				function next(channel) {
+
+					request.patch(Endpoints.CHANNEL(channel.id)).set("authorization", self.token).send({
+						name: channel.name,
+						position: channel.position,
+						topic: topic
+					}).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							channel.topic = res.body.topic;
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		//def setChannelName
+
+	}, {
+		key: "setChannelName",
+		value: function setChannelName(chann) {
+			var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(chann).then(next).catch(reject);
+
+				function next(channel) {
+
+					request.patch(Endpoints.CHANNEL(channel.id)).set("authorization", self.token).send({
+						name: name,
+						position: channel.position,
+						topic: channel.topic
+					}).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							channel.name = res.body.name;
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		//def setChannelNameAndTopic
+
+	}, {
+		key: "setChannelNameAndTopic",
+		value: function setChannelNameAndTopic(chann) {
+			var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1];
+			var topic = arguments.length <= 2 || arguments[2] === undefined ? "" : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				self.resolver.resolveChannel(chann).then(next).catch(reject);
+
+				function next(channel) {
+
+					request.patch(Endpoints.CHANNEL(channel.id)).set("authorization", self.token).send({
+						name: name,
+						position: channel.position,
+						topic: topic
+					}).end(function (err, res) {
+						if (err) {
+							reject(err);
+						} else {
+							channel.name = res.body.name;
+							channel.topic = res.body.topic;
+							resolve();
+						}
+					});
+				}
+			});
+		}
+
+		//def updateChannel
+
+	}, {
+		key: "updateChannel",
+		value: function updateChannel(chann, data) {
+			return this.setChannelNameAndTopic(chann, data.name, data.topic);
+		}
+
+		//def ack
+
+	}, {
+		key: "ack",
+		value: function ack(msg) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				msg = self.resolver.resolveMessage(msg);
+
+				if (msg) {
+
+					request.post(Endpoints.CHANNEL_MESSAGE(msg.channel.id, msg.id) + "/ack").set("authorization", self.token).end(function (err) {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+				} else {
+					reject(new Error("Message does not exist"));
+				}
+			});
+		}
+	}, {
+		key: "sendWS",
+		value: function sendWS(object) {
+			if (this.websocket) this.websocket.send(JSON.stringify(object));
+		}
+	}, {
+		key: "createWS",
+		value: function createWS(url) {
+			var self = this;
+			var client = self.client;
+
+			if (this.websocket) return false;
+
+			this.websocket = new WebSocket(url);
+
+			this.websocket.onopen = function () {
+
+				self.sendWS({
+					op: 2,
+					d: {
+						token: self.token,
+						v: 3,
+						compress: self.client.options.compress,
+						properties: {
+							"$os": "discord.js",
+							"$browser": "discord.js",
+							"$device": "discord.js",
+							"$referrer": "discord.js",
+							"$referring_domain": "discord.js"
+						}
+					}
+				});
+			};
+
+			this.websocket.onclose = function () {
+				self.websocket = null;
+				self.state = ConnectionState.DISCONNECTED;
+				client.emit("disconnected");
+			};
+
+			this.websocket.onerror = function (e) {
+				client.emit("error", e);
+			};
+
+			this.websocket.onmessage = function (e) {
+
+				if (e.type === "Binary") {
+					if (!zlib) zlib = require("zlib");
+					e.data = zlib.inflateSync(e.data).toString();
+				}
+
+				var packet, data;
+				try {
+					packet = JSON.parse(e.data);
+					data = packet.d;
+				} catch (e) {
+					client.emit("error", e);
+					return;
+				}
+
+				client.emit("raw", packet);
+
+				switch (packet.t) {
+
+					case PacketType.READY:
+						var startTime = Date.now();
+						self.user = self.users.add(new User(data.user, client));
+						data.guilds.forEach(function (server) {
+							self.servers.add(new Server(server, client));
+						});
+						data.private_channels.forEach(function (pm) {
+							self.private_channels.add(new PMChannel(pm, client));
+						});
+						self.state = ConnectionState.READY;
+
+						setInterval(function () {
+							return self.sendWS({ op: 1, d: Date.now() });
+						}, data.heartbeat_interval);
+
+						client.emit("ready");
+						client.emit("debug", "ready packet took " + (Date.now() - startTime) + "ms to process");
+						client.emit("debug", "ready with " + self.servers.length + " servers, " + self.channels.length + " channels and " + self.users.length + " users cached.");
+
+						self.readyTime = Date.now();
+						break;
+
+					case PacketType.MESSAGE_CREATE:
+						// format: https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format
+						var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
+						if (channel) {
+							var msg = channel.messages.add(new Message(data, channel, client));
+
+							if (self.messageAwaits[channel.id + msg.author.id]) {
+								self.messageAwaits[channel.id + msg.author.id].map(function (fn) {
+									return fn(msg);
+								});
+								self.messageAwaits[channel.id + msg.author.id] = null;
+								client.emit("message", msg, true); //2nd param is isAwaitedMessage
+							} else {
+									client.emit("message", msg);
+								}
+							self.ack(msg);
+						} else {
+							client.emit("warn", "message created but channel is not cached");
+						}
+						break;
+					case PacketType.MESSAGE_DELETE:
+						// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete
+						var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
+						if (channel) {
+							// potentially blank
+							var msg = channel.messages.get("id", data.id);
+							client.emit("messageDeleted", msg);
+							if (msg) {
+								channel.messages.remove(msg);
+							}
+						} else {
+							client.emit("warn", "message was deleted but channel is not cached");
+						}
+						break;
+					case PacketType.MESSAGE_UPDATE:
+						// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format
+						var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
+						if (channel) {
+							// potentially blank
+							var msg = channel.messages.get("id", data.id);
+
+							if (msg) {
+								// old message exists
+								data.nonce = data.nonce || msg.nonce;
+								data.attachments = data.attachments || msg.attachments;
+								data.tts = data.tts || msg.tts;
+								data.embeds = data.embeds || msg.embeds;
+								data.timestamp = data.timestamp || msg.timestamp;
+								data.mention_everyone = data.mention_everyone || msg.everyoneMentioned;
+								data.content = data.content || msg.content;
+								data.mentions = data.mentions || msg.mentions;
+								data.author = data.author || msg.author;
+								var nmsg = channel.messages.update(msg, new Message(data, channel, client));
+								client.emit("messageUpdated", nmsg, msg);
+							}
+						} else {
+							client.emit("warn", "message was updated but channel is not cached");
+						}
+						break;
+					case PacketType.SERVER_CREATE:
+						var server = self.servers.get("id", data.id);
+						if (!server) {
+							self.servers.add(new Server(data, client));
+							client.emit("serverCreated", server);
+						}
+						break;
+					case PacketType.SERVER_DELETE:
+						var server = self.servers.get("id", data.id);
+						if (server) {
+							var _iteratorNormalCompletion3 = true;
+							var _didIteratorError3 = false;
+							var _iteratorError3 = undefined;
+
+							try {
+
+								for (var _iterator3 = server.channels[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+									var channel = _step3.value;
+
+									self.channels.remove(channel);
+								}
+							} catch (err) {
+								_didIteratorError3 = true;
+								_iteratorError3 = err;
+							} finally {
+								try {
+									if (!_iteratorNormalCompletion3 && _iterator3.return) {
+										_iterator3.return();
+									}
+								} finally {
+									if (_didIteratorError3) {
+										throw _iteratorError3;
+									}
+								}
+							}
+
+							self.servers.remove(server);
+							client.emit("serverDeleted", server);
+						} else {
+							client.emit("warn", "server was deleted but it was not in the cache");
+						}
+						break;
+					case PacketType.SERVER_UPDATE:
+						var server = self.servers.get("id", data.id);
+						if (server) {
+							// server exists
+							data.members = data.members || [];
+							data.channels = data.channels || [];
+							var newserver = new Server(data, self);
+							newserver.members = server.members;
+							newserver.memberMap = server.memberMap;
+							newserver.channels = server.channels;
+							if (newserver.equalsStrict(server)) {
+								// already the same don't do anything
+								client.emit("debug", "received server update but server already updated");
+							} else {
+								self.servers.update(server, newserver);
+								client.emit("serverUpdated", server, newserver);
+							}
+						} else if (!server) {
+							client.emit("warn", "server was updated but it was not in the cache");
+							self.servers.add(new Server(data, self));
+							client.emit("serverCreated", server);
+						}
+						break;
+					case PacketType.CHANNEL_CREATE:
+
+						var channel = self.channels.get("id", data.id);
+
+						if (!channel) {
+
+							var server = self.servers.get("id", data.guild_id);
+							if (server) {
+								if (data.is_private) {
+									client.emit("channelCreated", self.private_channels.add(new PMChannel(data, client)));
+								} else {
+									var chan = null;
+									if (data.type === "text") {
+										chan = self.channels.add(new TextChannel(data, client, server));
+									} else {
+										chan = self.channels.add(new VoiceChannel(data, client, server));
+									}
+									client.emit("channelCreated", server.channels.add(chan));
+								}
+							} else {
+								client.emit("warn", "channel created but server does not exist");
+							}
+						} else {
+							client.emit("warn", "channel created but already in cache");
+						}
+
+						break;
+					case PacketType.CHANNEL_DELETE:
+						var channel = self.channels.get("id", data.id);
+						if (channel) {
+
+							if (channel.server) // accounts for PMs
+								channel.server.channels.remove(channel);
+
+							self.channels.remove(channel);
+							client.emit("channelDeleted", channel);
+						} else {
+							client.emit("warn", "channel deleted but already out of cache?");
+						}
+						break;
+					case PacketType.CHANNEL_UPDATE:
+						var channel = self.channels.get("id", data.id) || self.private_channels.get("id", data.id);
+						if (channel) {
+
+							if (channel instanceof PMChannel) {
+								//PM CHANNEL
+								client.emit("channelUpdated", channel, self.private_channels.update(channel, new PMChannel(data, client)));
+							} else {
+								if (channel.server) {
+									if (channel.type === "text") {
+										//TEXT CHANNEL
+										var chan = new TextChannel(data, client, channel.server);
+										chan.messages = channel.messages;
+										channel.server.channels.update(channel, chan);
+										self.channels.update(channel, chan);
+										client.emit("channelUpdated", channel, chan);
+									} else {
+										//VOICE CHANNEL
+										var chan = new VoiceChannel(data, client, channel.server);
+										channel.server.channels.update(channel, chan);
+										self.channels.update(channel, chan);
+										client.emit("channelUpdated", channel, chan);
+									}
+								} else {
+									client.emit("warn", "channel updated but server non-existant");
+								}
+							}
+						} else {
+							client.emit("warn", "channel updated but not in cache");
+						}
+						break;
+					case PacketType.SERVER_ROLE_CREATE:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+							client.emit("serverRoleCreated", server.roles.add(new Role(data.role, server, client)), server);
+						} else {
+							client.emit("warn", "server role made but server not in cache");
+						}
+						break;
+					case PacketType.SERVER_ROLE_DELETE:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+							var role = server.roles.get("id", data.role_id);
+							if (role) {
+								server.roles.remove(role);
+								client.emit("serverRoleDeleted", role);
+							} else {
+								client.emit("warn", "server role deleted but role not in cache");
+							}
+						} else {
+							client.emit("warn", "server role deleted but server not in cache");
+						}
+						break;
+					case PacketType.SERVER_ROLE_UPDATE:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+							var role = server.roles.get("id", data.role.id);
+							if (role) {
+								var newRole = new Role(data.role, server, client);
+								server.roles.update(role, newRole);
+								client.emit("serverRoleUpdated", role, newRole);
+							} else {
+								client.emit("warn", "server role updated but role not in cache");
+							}
+						} else {
+							client.emit("warn", "server role updated but server not in cache");
+						}
+						break;
+					case PacketType.SERVER_MEMBER_ADD:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+
+							server.memberMap[data.user.id] = {
+								roles: data.roles.map(function (pid) {
+									return server.roles.get("id", pid);
+								}),
+								mute: false,
+								deaf: false,
+								joinedAt: Date.parse(data.joined_at)
+							};
+
+							client.emit("serverNewMember", server, server.members.add(self.users.add(new User(data.user, client))));
+						} else {
+							client.emit("warn", "server member added but server doesn't exist in cache");
+						}
+						break;
+					case PacketType.SERVER_MEMBER_REMOVE:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+							var user = self.users.get("id", data.user.id);
+							if (user) {
+								server.memberMap[data.user.id] = null;
+								server.members.remove(user);
+								client.emit("serverMemberRemoved", server, user);
+							} else {
+								client.emit("warn", "server member removed but user doesn't exist in cache");
+							}
+						} else {
+							client.emit("warn", "server member removed but server doesn't exist in cache");
+						}
+						break;
+					case PacketType.SERVER_MEMBER_UPDATE:
+						var server = self.servers.get("id", data.guild_id);
+						if (server) {
+							var user = self.users.get("id", data.user.id);
+							if (user) {
+								server.memberMap[data.user.id].roles = data.roles.map(function (pid) {
+									return server.roles.get("id", pid);
+								});
+								server.memberMap[data.user.id].mute = data.mute;
+								server.memberMap[data.user.id].deaf = data.deaf;
+								client.emit("serverMemberUpdated", server, user);
+							} else {
+								client.emit("warn", "server member removed but user doesn't exist in cache");
+							}
+						} else {
+							client.emit("warn", "server member updated but server doesn't exist in cache");
+						}
+						break;
+					case PacketType.PRESENCE_UPDATE:
+
+						var user = self.users.get("id", data.user.id);
+
+						if (user) {
+
+							data.user.username = data.user.username || user.username;
+							data.user.id = data.user.id || user.id;
+							data.user.avatar = data.user.avatar || user.avatar;
+							data.user.discriminator = data.user.discriminator || user.discriminator;
+
+							var presenceUser = new User(data.user, client);
+
+							if (presenceUser.equalsStrict(user)) {
+								// a real presence update
+								client.emit("presence", user, data.status, data.game_id);
+								user.status = data.status;
+								user.gameID = data.game_id;
+							} else {
+								// a name change or avatar change
+								client.emit("userUpdate", user, presenceUser);
+								self.users.update(user, presenceUser);
+							}
+						} else {
+							client.emit("warn", "presence update but user not in cache");
+						}
+
+						break;
+					case PacketType.TYPING:
+
+						var user = self.users.get("id", data.user_id);
+						var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
+
+						if (user && channel) {
+							if (user.typing.since) {
+								user.typing.since = Date.now();
+								user.typing.channel = channel;
+							} else {
+								user.typing.since = Date.now();
+								user.typing.channel = channel;
+								client.emit("userTypingStart", user, channel);
+							}
+							setTimeout(function () {
+								if (Date.now() - user.typing.since > 5500) {
+									// they haven't typed since
+									user.typing.since = null;
+									user.typing.channel = null;
+									client.emit("userTypingStop", user, channel);
+								}
+							}, 6000);
+						} else {
+							client.emit("warn", "user typing but user or channel not existant in cache");
+						}
+						break;
+					case PacketType.SERVER_BAN_ADD:
+						var user = self.users.get("id", data.user.id);
+						var server = self.servers.get("id", data.guild_id);
+
+						if (user && server) {
+							client.emit("userBanned", user, server);
+						} else {
+							client.emit("warn", "user banned but user/server not in cache.");
+						}
+						break;
+					case PacketType.SERVER_BAN_REMOVE:
+						var user = self.users.get("id", data.user.id);
+						var server = self.servers.get("id", data.guild_id);
+
+						if (user && server) {
+							client.emit("userUnbanned", user, server);
+						} else {
+							client.emit("warn", "user unbanned but user/server not in cache.");
+						}
+						break;
+				}
+			};
+		}
+	}, {
+		key: "uptime",
+		get: function get() {
+			return this.readyTime ? Date.now() - this.readyTime : null;
+		}
+	}]);
+
+	return InternalClient;
+})();
+
+module.exports = InternalClient;
\ No newline at end of file