diff --git a/.babelrc b/.babelrc
index e56b692aa..9e26dfeeb 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,6 +1 @@
-{
-	"presets": [
-        "es2015",
-		"es2015-loose"
-    ]
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/lib/Client/Client.js b/lib/Client/Client.js
index 8ccbf3f19..3d407da7f 100644
--- a/lib/Client/Client.js
+++ b/lib/Client/Client.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var InternalClient = require("./InternalClient.js");
@@ -22,965 +20,875 @@ var Client = (function (_EventEmitter) {
 	function Client(options) {
 		_classCallCheck(this, Client);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Client).call(this));
-
-		_this.options = options || {};
-		_this.internal = new InternalClient(_this);
-		return _this;
+		_EventEmitter.call(this);
+		this.options = options || {};
+		this.internal = new InternalClient(this);
 	}
 
-	_createClass(Client, [{
-		key: "login",
+	// def login
 
-		// def login
-		value: function login(email, password) {
-			var cb = arguments.length <= 2 || arguments[2] === undefined ? function (err, token) {} : arguments[2];
+	Client.prototype.login = function login(email, password) {
+		var cb = arguments.length <= 2 || arguments[2] === undefined ? function (err, token) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.login(email, password).then(function (token) {
-					cb(null, token);
-					resolve(token);
-				}).catch(function (e) {
-					cb(e);
-					reject(e);
-				});
+			self.internal.login(email, password).then(function (token) {
+				cb(null, token);
+				resolve(token);
+			})["catch"](function (e) {
+				cb(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def logout
+	// def logout
 
-	}, {
-		key: "logout",
-		value: function logout() {
-			var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
+	Client.prototype.logout = function logout() {
+		var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.logout().then(function () {
-					cb();
-					resolve();
-				}).catch(function (e) {
-					cb(e);
-					reject(e);
-				});
+			self.internal.logout().then(function () {
+				cb();
+				resolve();
+			})["catch"](function (e) {
+				cb(e);
+				reject(e);
 			});
-		}
-		// def sendMessage
+		});
+	};
 
-	}, {
-		key: "sendMessage",
-		value: function sendMessage(where, content) {
-			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
+	// def sendMessage
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	Client.prototype.sendMessage = function sendMessage(where, content) {
+		var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
 
-				if (typeof options === "function") {
-					// options is the callback
-					callback = options;
-				}
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.sendMessage(where, content, options).then(function (m) {
+			if (typeof options === "function") {
+				// options is the callback
+				callback = options;
+			}
+
+			self.internal.sendMessage(where, content, options).then(function (m) {
+				callback(null, m);
+				resolve(m);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
+			});
+		});
+	};
+
+	// def sendTTSMessage
+
+	Client.prototype.sendTTSMessage = function sendTTSMessage(where, content) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e, m) {} : arguments[2];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.sendMessage(where, content, { tts: true }).then(function (m) {
+				callback(null, m);
+				resolve(m);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
+			});
+		});
+	};
+
+	// def reply
+
+	Client.prototype.reply = function reply(where, content) {
+		var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			if (typeof options === "function") {
+				// options is the callback
+				callback = options;
+			}
+
+			var msg = self.internal.resolver.resolveMessage(where);
+			if (msg) {
+				content = msg.author + ", " + content;
+				self.internal.sendMessage(msg, content, options).then(function (m) {
 					callback(null, m);
 					resolve(m);
-				}).catch(function (e) {
+				})["catch"](function (e) {
 					callback(e);
 					reject(e);
 				});
+			} else {
+				var err = new Error("Destination not resolvable to a message!");
+				callback(err);
+				reject(err);
+			}
+		});
+	};
+
+	// def replyTTS
+
+	Client.prototype.replyTTS = function replyTTS(where, content) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function () {} : arguments[2];
+
+		return new Promise(function (resolve, reject) {
+			self.reply(where, content, { tts: true }).then(function (m) {
+				callback(null, m);
+				resolve(m);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def sendTTSMessage
+	// def deleteMessage
 
-	}, {
-		key: "sendTTSMessage",
-		value: function sendTTSMessage(where, content) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e, m) {} : arguments[2];
+	Client.prototype.deleteMessage = function deleteMessage(msg) {
+		var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.sendMessage(where, content, { tts: true }).then(function (m) {
-					callback(null, m);
-					resolve(m);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof options === "function") {
+				// options is the callback
+				callback = options;
+			}
+
+			self.internal.deleteMessage(msg, options).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
-		// def reply
+		});
+	};
 
-	}, {
-		key: "reply",
-		value: function reply(where, content) {
-			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
+	//def updateMessage
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	Client.prototype.updateMessage = function updateMessage(msg, content) {
+		var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
 
-				if (typeof options === "function") {
-					// options is the callback
-					callback = options;
-				}
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof options === "function") {
+				// options is the callback
+				callback = options;
+			}
 
-				var msg = self.internal.resolver.resolveMessage(where);
-				if (msg) {
-					content = msg.author + ", " + content;
-					self.internal.sendMessage(msg, content, options).then(function (m) {
-						callback(null, m);
-						resolve(m);
-					}).catch(function (e) {
-						callback(e);
-						reject(e);
-					});
-				} else {
-					var err = new Error("Destination not resolvable to a message!");
-					callback(err);
-					reject(err);
-				}
+			self.internal.updateMessage(msg, content, options).then(function (msg) {
+				callback(null, msg);
+				resolve(msg);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def replyTTS
+	// def getChannelLogs
 
-	}, {
-		key: "replyTTS",
-		value: function replyTTS(where, content) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function () {} : arguments[2];
+	Client.prototype.getChannelLogs = function getChannelLogs(where) {
+		var limit = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
+		var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, logs) {} : arguments[3];
 
-			return new Promise(function (resolve, reject) {
-				self.reply(where, content, { tts: true }).then(function (m) {
-					callback(null, m);
-					resolve(m);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof options === "function") {
+				// options is the callback
+				callback = options;
+			}
+			self.internal.getChannelLogs(where, limit, options).then(function (logs) {
+				callback(null, logs);
+				resolve(logs);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
-		// def deleteMessage
+		});
+	};
 
-	}, {
-		key: "deleteMessage",
-		value: function deleteMessage(msg) {
-			var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e) {} : arguments[2];
+	// def getBans
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof options === "function") {
-					// options is the callback
-					callback = options;
-				}
+	Client.prototype.getBans = function getBans(where) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, bans) {} : arguments[1];
 
-				self.internal.deleteMessage(msg, options).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.getBans(where).then(function (bans) {
+				callback(null, bans);
+				resolve(bans);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
-		//def updateMessage
+		});
+	};
 
-	}, {
-		key: "updateMessage",
-		value: function updateMessage(msg, content) {
-			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+	// def sendFile
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof options === "function") {
-					// options is the callback
-					callback = options;
-				}
+	Client.prototype.sendFile = function sendFile(where, attachment) {
+		var name = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, m) {} : arguments[3];
 
-				self.internal.updateMessage(msg, content, options).then(function (msg) {
-					callback(null, msg);
-					resolve(msg);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.sendFile(where, attachment, name).then(function (m) {
+				callback(null, m);
+				resolve(m);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def getChannelLogs
+	// def joinServer
 
-	}, {
-		key: "getChannelLogs",
-		value: function getChannelLogs(where) {
-			var limit = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
-			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, logs) {} : arguments[3];
+	Client.prototype.joinServer = function joinServer(invite) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, srv) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof options === "function") {
-					// options is the callback
-					callback = options;
-				}
-				self.internal.getChannelLogs(where, limit, options).then(function (logs) {
-					callback(null, logs);
-					resolve(logs);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.joinServer(invite).then(function (srv) {
+				callback(null, srv);
+				resolve(srv);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def getBans
+	// def createServer
 
-	}, {
-		key: "getBans",
-		value: function getBans(where) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, bans) {} : arguments[1];
+	Client.prototype.createServer = function createServer(name) {
+		var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, srv) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.getBans(where).then(function (bans) {
-					callback(null, bans);
-					resolve(bans);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.createServer(name, region).then(function (srv) {
+				callback(null, srv);
+				resolve(srv);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def sendFile
+	// def leaveServer
 
-	}, {
-		key: "sendFile",
-		value: function sendFile(where, attachment) {
-			var name = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, m) {} : arguments[3];
+	Client.prototype.leaveServer = function leaveServer(server) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.sendFile(where, attachment, name).then(function (m) {
-					callback(null, m);
-					resolve(m);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.leaveServer(server).then(function () {
+				callback();resolve();
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		// def joinServer
+	// def createChannel
 
-	}, {
-		key: "joinServer",
-		value: function joinServer(invite) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, srv) {} : arguments[1];
+	Client.prototype.createChannel = function createChannel(server, name) {
+		var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, channel) {} : arguments[3];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.joinServer(invite).then(function (srv) {
-					callback(null, srv);
-					resolve(srv);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof type === "function") {
+				// options is the callback
+				callback = type;
+			}
+			self.internal.createChannel(server, name, type).then(function (channel) {
+				callback(channel);resolve(channel);
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		// def createServer
+	// def deleteChannel
 
-	}, {
-		key: "createServer",
-		value: function createServer(name) {
-			var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, srv) {} : arguments[2];
+	Client.prototype.deleteChannel = function deleteChannel(channel) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.createServer(name, region).then(function (srv) {
-					callback(null, srv);
-					resolve(srv);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.deleteChannel(channel).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		// def leaveServer
+	//def banMember
 
-	}, {
-		key: "leaveServer",
-		value: function leaveServer(server) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.banMember = function banMember(user, server) {
+		var length = arguments.length <= 2 || arguments[2] === undefined ? 1 : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.leaveServer(server).then(function () {
-					callback();resolve();
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof length === "function") {
+				// length is the callback
+				callback = length;
+			}
+			self.internal.banMember(user, server, length).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		// def createChannel
+	//def unbanMember
 
-	}, {
-		key: "createChannel",
-		value: function createChannel(server, name) {
-			var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, channel) {} : arguments[3];
+	Client.prototype.unbanMember = function unbanMember(user, server) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof type === "function") {
-					// options is the callback
-					callback = type;
-				}
-				self.internal.createChannel(server, name, type).then(function (channel) {
-					callback(channel);resolve(channel);
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.unbanMember(user, server).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		// def deleteChannel
+	//def kickMember
 
-	}, {
-		key: "deleteChannel",
-		value: function deleteChannel(channel) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.kickMember = function kickMember(user, server) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.deleteChannel(channel).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.kickMember(user, server).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);reject(e);
 			});
-		}
+		});
+	};
 
-		//def banMember
+	//def createRole
 
-	}, {
-		key: "banMember",
-		value: function banMember(user, server) {
-			var length = arguments.length <= 2 || arguments[2] === undefined ? 1 : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
+	Client.prototype.createRole = function createRole(server) {
+		var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof length === "function") {
-					// length is the callback
-					callback = length;
-				}
-				self.internal.banMember(user, server, length).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof data === "function") {
+				// data is the callback
+				callback = data;
+			}
+			self.internal.createRole(server, data).then(function (role) {
+				callback(null, role);
+				resolve(role);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def unbanMember
+	//def updateRole
 
-	}, {
-		key: "unbanMember",
-		value: function unbanMember(user, server) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.updateRole = function updateRole(role) {
+		var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.unbanMember(user, server).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof data === "function") {
+				// data is the callback
+				callback = data;
+			}
+			self.internal.updateRole(role, data).then(function (role) {
+				callback(null, role);
+				resolve(role);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def kickMember
+	//def deleteRole
 
-	}, {
-		key: "kickMember",
-		value: function kickMember(user, server) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.deleteRole = function deleteRole(role) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.kickMember(user, server).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.deleteRole(role).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def createRole
+	//def addMemberToRole
 
-	}, {
-		key: "createRole",
-		value: function createRole(server) {
-			var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
+	Client.prototype.addMemberToRole = function addMemberToRole(member, role) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof data === "function") {
-					// data is the callback
-					callback = data;
-				}
-				self.internal.createRole(server, data).then(function (role) {
-					callback(null, role);
-					resolve(role);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.addMemberToRole(member, role).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def updateRole
+	// def addUserToRole
 
-	}, {
-		key: "updateRole",
-		value: function updateRole(role) {
-			var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
+	Client.prototype.addUserToRole = function addUserToRole(member, role) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof data === "function") {
-					// data is the callback
-					callback = data;
-				}
-				self.internal.updateRole(role, data).then(function (role) {
-					callback(null, role);
-					resolve(role);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		return this.addMemberToRole(member, role, callback);
+	};
+
+	// def removeMemberFromRole
+
+	Client.prototype.removeMemberFromRole = function removeMemberFromRole(member, role) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.removeMemberFromRole(member, role).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def deleteRole
+	// def removeUserFromRole
 
-	}, {
-		key: "deleteRole",
-		value: function deleteRole(role) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.removeUserFromRole = function removeUserFromRole(member, role) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		return this.removeUserFromRole(member, role, callback);
+	};
 
-				self.internal.deleteRole(role).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+	// def createInvite
+
+	Client.prototype.createInvite = function createInvite(chanServ, options) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, invite) {} : arguments[2];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof options === "function") {
+				// length is the callback
+				callback = options;
+			}
+
+			self.internal.createInvite(chanServ, options).then(function (invite) {
+				callback(null, invite);
+				resolve(invite);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def addMemberToRole
+	// def deleteInvite
 
-	}, {
-		key: "addMemberToRole",
-		value: function addMemberToRole(member, role) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.deleteInvite = function deleteInvite(invite) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.addMemberToRole(member, role).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.deleteInvite(invite).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def addUserToRole
+	// def overwritePermissions
 
-	}, {
-		key: "addUserToRole",
-		value: function addUserToRole(member, role) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.overwritePermissions = function overwritePermissions(channel, role) {
+		var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
 
-			return this.addMemberToRole(member, role, callback);
-		}
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-		// def removeMemberFromRole
-
-	}, {
-		key: "removeMemberFromRole",
-		value: function removeMemberFromRole(member, role) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
-
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.removeMemberFromRole(member, role).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.overwritePermissions(channel, role, options).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def removeUserFromRole
+	//def setStatus
 
-	}, {
-		key: "removeUserFromRole",
-		value: function removeUserFromRole(member, role) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.setStatus = function setStatus(idleStatus, gameID) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			return this.removeUserFromRole(member, role, callback);
-		}
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof gameID === "function") {
+				// gameID is the callback
+				callback = gameID;
+			} else if (typeof idleStatus === "function") {
+				// idleStatus is the callback
+				callback = idleStatus;
+			}
 
-		// def createInvite
-
-	}, {
-		key: "createInvite",
-		value: function createInvite(chanServ, options) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, invite) {} : arguments[2];
-
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof options === "function") {
-					// length is the callback
-					callback = options;
-				}
-
-				self.internal.createInvite(chanServ, options).then(function (invite) {
-					callback(null, invite);
-					resolve(invite);
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.setStatus(idleStatus, gameID).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def deleteInvite
+	//def sendTyping
 
-	}, {
-		key: "deleteInvite",
-		value: function deleteInvite(invite) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.sendTyping = function sendTyping(channel) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.deleteInvite(invite).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.sendTyping(channel).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def overwritePermissions
+	// def setTopic
 
-	}, {
-		key: "overwritePermissions",
-		value: function overwritePermissions(channel, role) {
-			var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
+	Client.prototype.setTopic = function setTopic(channel, topic) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.overwritePermissions(channel, role, options).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.setTopic(channel, topic).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def setStatus
+	//def setChannelName
 
-	}, {
-		key: "setStatus",
-		value: function setStatus(idleStatus, gameID) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.setChannelName = function setChannelName(channel, name) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				if (typeof gameID === "function") {
-					// gameID is the callback
-					callback = gameID;
-				} else if (typeof idleStatus === "function") {
-					// idleStatus is the callback
-					callback = idleStatus;
-				}
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.setStatus(idleStatus, gameID).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.setChannelName(channel, name).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def sendTyping
+	//def setChannelNameAndTopic
 
-	}, {
-		key: "sendTyping",
-		value: function sendTyping(channel) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.setChannelNameAndTopic = function setChannelNameAndTopic(channel, name, topic) {
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.sendTyping(channel).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.setChannelNameAndTopic(channel, name, topic).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		// def setTopic
+	//def updateChannel
 
-	}, {
-		key: "setTopic",
-		value: function setTopic(channel, topic) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.updateChannel = function updateChannel(channel, data) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.setTopic(channel, topic).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.updateChannel(channel, data).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def setChannelName
+	//def startTyping
 
-	}, {
-		key: "setChannelName",
-		value: function setChannelName(channel, name) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.startTyping = function startTyping(channel) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.setChannelName(channel, name).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.startTyping(channel).then(function () {
+				callback(null);
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def setChannelNameAndTopic
+	//def stopTyping
 
-	}, {
-		key: "setChannelNameAndTopic",
-		value: function setChannelNameAndTopic(channel, name, topic) {
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
+	Client.prototype.stopTyping = function stopTyping(channel) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.internal.setChannelNameAndTopic(channel, name, topic).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+			self.internal.stopTyping(channel).then(function () {
+				callback(null);
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
 			});
-		}
+		});
+	};
 
-		//def updateChannel
+	//def updateDetails
 
-	}, {
-		key: "updateChannel",
-		value: function updateChannel(channel, data) {
-			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
+	Client.prototype.updateDetails = function updateDetails(details) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.updateChannel(channel, data).then(function () {
-					callback();
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.updateDetails(details).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (err) {
+				callback(err);
+				reject(err);
 			});
-		}
+		});
+	};
 
-		//def startTyping
+	//def setUsername
 
-	}, {
-		key: "startTyping",
-		value: function startTyping(channel) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.setUsername = function setUsername(name) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.startTyping(channel).then(function () {
-					callback(null);
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.setUsername(name).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (err) {
+				callback(err);
+				reject(err);
 			});
-		}
+		});
+	};
 
-		//def stopTyping
+	//def setAvatar
 
-	}, {
-		key: "stopTyping",
-		value: function stopTyping(channel) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.setAvatar = function setAvatar(avatar) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-
-				self.internal.stopTyping(channel).then(function () {
-					callback(null);
-					resolve();
-				}).catch(function (e) {
-					callback(e);
-					reject(e);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.setAvatar(avatar).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (err) {
+				callback(err);
+				reject(err);
 			});
-		}
+		});
+	};
 
-		//def updateDetails
+	//def joinVoiceChannel
 
-	}, {
-		key: "updateDetails",
-		value: function updateDetails(details) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.joinVoiceChannel = function joinVoiceChannel(channel) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.updateDetails(details).then(function () {
-					callback();
-					resolve();
-				}).catch(function (err) {
-					callback(err);
-					reject(err);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			self.internal.joinVoiceChannel(channel).then(function (chan) {
+				callback(null, chan);
+				resolve(chan);
+			})["catch"](function (err) {
+				callback(err);
+				reject(err);
 			});
-		}
+		});
+	};
 
-		//def setUsername
+	// def leaveVoiceChannel
 
-	}, {
-		key: "setUsername",
-		value: function setUsername(name) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.leaveVoiceChannel = function leaveVoiceChannel() {
+		var callback = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.setUsername(name).then(function () {
-					callback();
-					resolve();
-				}).catch(function (err) {
-					callback(err);
-					reject(err);
-				});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.leaveVoiceChannel().then(function () {
+				callback();
+				resolve();
+			})["catch"](function (err) {
+				callback(err);
+				reject(err);
 			});
-		}
+		});
+	};
 
-		//def setAvatar
+	// def awaitResponse
 
-	}, {
-		key: "setAvatar",
-		value: function setAvatar(avatar) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+	Client.prototype.awaitResponse = function awaitResponse(msg) {
+		var toSend = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.setAvatar(avatar).then(function () {
-					callback();
-					resolve();
-				}).catch(function (err) {
-					callback(err);
-					reject(err);
-				});
-			});
-		}
+		var _this = this;
 
-		//def joinVoiceChannel
+		var options = arguments.length <= 2 || arguments[2] === undefined ? null : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, newMsg) {} : arguments[3];
 
-	}, {
-		key: "joinVoiceChannel",
-		value: function joinVoiceChannel(channel) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+		var self = this;
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
+		return new Promise(function (resolve, reject) {
 
-				self.internal.joinVoiceChannel(channel).then(function (chan) {
-					callback(null, chan);
-					resolve(chan);
-				}).catch(function (err) {
-					callback(err);
-					reject(err);
-				});
-			});
-		}
+			function error(e) {
+				callback(e);
+				reject(e);
+			}
 
-		// def leaveVoiceChannel
-
-	}, {
-		key: "leaveVoiceChannel",
-		value: function leaveVoiceChannel() {
-			var callback = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
-
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				self.internal.leaveVoiceChannel().then(function () {
-					callback();
-					resolve();
-				}).catch(function (err) {
-					callback(err);
-					reject(err);
-				});
-			});
-		}
-
-		// def awaitResponse
-
-	}, {
-		key: "awaitResponse",
-		value: function awaitResponse(msg) {
-			var toSend = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
-
-			var _this2 = this;
-
-			var options = arguments.length <= 2 || arguments[2] === undefined ? null : arguments[2];
-			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, newMsg) {} : arguments[3];
-
-			var self = this;
-
-			return new Promise(function (resolve, reject) {
-
-				function error(e) {
-					callback(e);
-					reject(e);
-				}
-
-				if (toSend) {
-					if (typeof toSend === "function") {
-						// (msg, callback)
-						callback = toSend;
-						final();
-					} else {
-						// (msg, toSend, ...)
-						if (options) {
-							if (typeof options === "function") {
-								//(msg, toSend, callback)
-								callback = options;
-								_this2.sendMessage(msg, toSend).then(final).catch(error);
-							} else {
-								//(msg, toSend, options, callback)
-								_this2.sendMessage(msg, toSend, options).then(final).catch(error);
-							}
-						} else {
-							// (msg, toSend) promise
-							_this2.sendMessage(msg, toSend).then(final).catch(error);
-						}
-					}
-				} else {
-					// (msg) promise
+			if (toSend) {
+				if (typeof toSend === "function") {
+					// (msg, callback)
+					callback = toSend;
 					final();
+				} else {
+					// (msg, toSend, ...)
+					if (options) {
+						if (typeof options === "function") {
+							//(msg, toSend, callback)
+							callback = options;
+							_this.sendMessage(msg, toSend).then(final)["catch"](error);
+						} else {
+							//(msg, toSend, options, callback)
+							_this.sendMessage(msg, toSend, options).then(final)["catch"](error);
+						}
+					} else {
+						// (msg, toSend) promise
+						_this.sendMessage(msg, toSend).then(final)["catch"](error);
+					}
 				}
+			} else {
+				// (msg) promise
+				final();
+			}
 
-				function final() {
-					self.internal.awaitResponse(msg).then(function (newMsg) {
-						resolve(newMsg);
-						callback(null, newMsg);
-					}).catch(error);
-				}
-			});
-		}
-	}, {
-		key: "setStatusIdle",
-		value: function setStatusIdle() {
-			this.setStatus("idle");
-		}
-	}, {
-		key: "setStatusOnline",
-		value: function setStatusOnline() {
-			var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
+			function final() {
+				self.internal.awaitResponse(msg).then(function (newMsg) {
+					resolve(newMsg);
+					callback(null, newMsg);
+				})["catch"](error);
+			}
+		});
+	};
 
-			this.setStatus("online");
-		}
-	}, {
-		key: "setStatusActive",
-		value: function setStatusActive() {
-			this.setStatusOnline();
-		}
-	}, {
-		key: "setStatusHere",
-		value: function setStatusHere() {
-			this.setStatusOnline();
-		}
-	}, {
-		key: "setStatusAvailable",
-		value: function setStatusAvailable() {
-			this.setStatusOnline();
-		}
-	}, {
-		key: "setStatusAway",
-		value: function setStatusAway() {
-			this.setStatusIdle();
-		}
-	}, {
-		key: "setPlayingGame",
-		value: function setPlayingGame(game) {
-			this.setStatus(null, game);
-		}
-	}, {
+	Client.prototype.setStatusIdle = function setStatusIdle() {
+		this.setStatus("idle");
+	};
+
+	Client.prototype.setStatusOnline = function setStatusOnline() {
+		var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
+
+		this.setStatus("online");
+	};
+
+	Client.prototype.setStatusActive = function setStatusActive() {
+		this.setStatusOnline();
+	};
+
+	Client.prototype.setStatusHere = function setStatusHere() {
+		this.setStatusOnline();
+	};
+
+	Client.prototype.setStatusAvailable = function setStatusAvailable() {
+		this.setStatusOnline();
+	};
+
+	Client.prototype.setStatusAway = function setStatusAway() {
+		this.setStatusIdle();
+	};
+
+	Client.prototype.setPlayingGame = function setPlayingGame(game) {
+		this.setStatus(null, game);
+	};
+
+	_createClass(Client, [{
 		key: "users",
 		get: function get() {
 			return this.internal.users;
diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 46dcef91b..e3673eb14 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -54,1083 +54,711 @@ var InternalClient = (function () {
 		this.messageAwaits = {};
 	}
 
-	_createClass(InternalClient, [{
-		key: "leaveVoiceChannel",
+	//def 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();
-				}
-			});
-		}
+	InternalClient.prototype.leaveVoiceChannel = 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
+	//def awaitResponse
 
-	}, {
-		key: "awaitResponse",
-		value: function awaitResponse(msg) {
-			var _this = this;
+	InternalClient.prototype.awaitResponse = function awaitResponse(msg) {
+		var _this = this;
 
-			return new Promise(function (resolve, reject) {
+		return new Promise(function (resolve, reject) {
 
-				msg = _this.resolver.resolveMessage(msg);
+			msg = _this.resolver.resolveMessage(msg);
 
-				if (!msg) {
-					reject(new Error("message undefined"));
-					return;
-				}
+			if (!msg) {
+				reject(new Error("message undefined"));
+				return;
+			}
 
-				var awaitID = msg.channel.id + msg.author.id;
+			var awaitID = msg.channel.id + msg.author.id;
 
-				if (!_this.messageAwaits[awaitID]) {
-					_this.messageAwaits[awaitID] = [];
-				}
+			if (!_this.messageAwaits[awaitID]) {
+				_this.messageAwaits[awaitID] = [];
+			}
 
-				_this.messageAwaits[awaitID].push(resolve);
-			});
-		}
+			_this.messageAwaits[awaitID].push(resolve);
+		});
+	};
 
-		//def joinVoiceChannel
+	//def joinVoiceChannel
 
-	}, {
-		key: "joinVoiceChannel",
-		value: function joinVoiceChannel(chann) {
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	InternalClient.prototype.joinVoiceChannel = function joinVoiceChannel(chann) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				var channel = self.resolver.resolveVoiceChannel(chann);
+			var channel = self.resolver.resolveVoiceChannel(chann);
 
-				if (channel) {
-					var next = function next() {
-						var session,
-						    token,
-						    server = channel.server,
-						    endpoint;
+			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);
+					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);
+							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.client.emit("debug", "removed temporary voice websocket listeners");
+							self.websocket.removeListener("message", check);
+						}
 					};
 
-					self.leaveVoiceChannel().then(next);
+					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
+
+	InternalClient.prototype.createServer = 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 {
-					reject(new Error("voice channel does not exist"));
+					// 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 createServer
+	//def joinServer
 
-	}, {
-		key: "createServer",
-		value: function createServer(name) {
-			var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
+	InternalClient.prototype.joinServer = function joinServer(invite) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-			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) {
+			invite = self.resolver.resolveInviteID(invite);
+			if (invite) {
+				request.post(Endpoints.INVITE(invite)).set("authorization", self.token).end(function (err, res) {
 					if (err) {
-						reject(new Error(err));
+						reject(err);
 					} else {
-						// valid server, wait until it is cached
+						// valid server, wait until it is received via ws and cached
 						var inter = setInterval(function () {
-							if (self.servers.get("id", res.body.id)) {
+							if (self.servers.get("id", res.body.guild.id)) {
 								clearInterval(inter);
-								resolve(self.servers.get("id", res.body.id));
+								resolve(self.servers.get("id", res.body.guild.id));
 							}
 						}, 20);
 					}
 				});
-			});
-		}
+			} else {
+				reject(new Error("Not a valid invite"));
+			}
+		});
+	};
 
-		//def joinServer
+	//def leaveServer
 
-	}, {
-		key: "joinServer",
-		value: function joinServer(invite) {
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	InternalClient.prototype.leaveServer = function leaveServer(srv) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			var server = self.resolver.resolveServer(srv);
+			if (server) {
 
-				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"));
-				}
-			});
-		}
+				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
+						for (var _iterator = server.channels, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+							var _ref;
 
-		//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;
-									}
-								}
+							if (_isArray) {
+								if (_i >= _iterator.length) break;
+								_ref = _iterator[_i++];
+							} else {
+								_i = _iterator.next();
+								if (_i.done) break;
+								_ref = _i.value;
 							}
 
-							self.servers.remove(server);
-							resolve();
+							var chan = _ref;
+
+							self.channels.remove(chan);
 						}
-					});
-				} else {
-					reject(new Error("server did not resolve"));
-				}
-			});
-		}
+						// remove server
+						self.servers.remove(server);
+						resolve();
+					}
+				});
+			} else {
+				reject(new Error("server did not resolve"));
+			}
+		});
+	};
 
-		// def login
+	// 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) {
+	InternalClient.prototype.login = 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;
+				self.state = ConnectionState.LOGGING_IN;
 
-					request.post(Endpoints.LOGIN).send({ email: email, password: password }).end(function (err, res) {
+				request.post(Endpoints.LOGIN).send({ email: email, password: password }).end(function (err, res) {
 
-						if (err) {
+					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;
-							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;
-				}
+			} else {
+				reject(new Error("already logging in/logged in/ready!"));
 			}
-			self.gameID = self.resolver.resolveGameID(gameID) || self.gameID || null;
+		});
+	};
 
-			return new Promise(function (resolve, reject) {
+	// def logout
 
-				var packet = {
-					op: 3,
-					d: {
-						idle_since: self.idleStatus,
-						game_id: self.gameID
+	InternalClient.prototype.logout = 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
+
+	InternalClient.prototype.startPM = 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
+
+	InternalClient.prototype.getGateway = 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
+
+	InternalClient.prototype.sendMessage = 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
+
+	InternalClient.prototype.deleteMessage = 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 (self.idleStatus == "idle" || self.idleStatus == "away") {
-					packet.d.idle_since = Date.now();
+				if (options.wait) {
+					setTimeout(deleteMsg, options.wait);
+				} else {
+					deleteMsg();
 				}
+			} else {
+				reject(new Error("Supplied message did not resolve to a message!"));
+			}
+		});
+	};
 
-				self.sendWS(packet);
+	// def updateMessage
 
-				resolve();
+	InternalClient.prototype.updateMessage = 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
+
+	InternalClient.prototype.sendFile = 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));
 			});
-		}
 
-		//def sendTyping
+			function next(channel) {
 
-	}, {
-		key: "sendTyping",
-		value: function sendTyping(channel) {
-			var self = this;
-			return new Promise(function (resolve, reject) {
+				var file = self.resolver.resolveFile(_file);
 
-				self.resolver.resolveChannel(channel).then(next).catch(reject);
+				request.post(Endpoints.CHANNEL_MESSAGES(channel.id)).set("authorization", self.token).attach("file", file, name).end(function (err, res) {
 
-				function next(channel) {
+					if (err) {
+						reject(new Error(err));
+					} else {
+						resolve(channel.messages.add(new Message(res.body, channel, self.client)));
+					}
+				});
+			}
+		});
+	};
 
-					request.post(Endpoints.CHANNEL(channel.id) + "/typing").set("authorization", self.token).end(function (err, res) {
-						if (err) {
-							reject(err);
-						} else {
-							resolve();
-						}
+	// def getChannelLogs
+
+	InternalClient.prototype.getChannelLogs = 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
+
+	InternalClient.prototype.getBans = 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 startTyping
+	// def createChannel
 
-	}, {
-		key: "startTyping",
-		value: function startTyping(channel) {
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	InternalClient.prototype.createChannel = function createChannel(server, name) {
+		var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
 
-				self.resolver.resolveChannel(channel).then(next).catch(reject);
+		var self = this;
 
-				function next(channel) {
+		return new Promise(function (resolve, reject) {
 
-					if (self.typingIntervals[channel.id]) {
-						// typing interval already exists, leave it alone
-						reject(new Error("Already typing in that channel"));
-						return;
+			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);
 					}
-
-					self.sendTyping(channel);
-
-					self.typingIntervals[channel.id] = setInterval(function () {
-						return self.sendTyping(channel);
-					}, 4000);
+					resolve(server.channels.add(self.channels.add(channel)));
 				}
 			});
-		}
+		});
+	};
 
-		//def stopTyping
+	// def deleteChannel
 
-	}, {
-		key: "stopTyping",
-		value: function stopTyping(channel) {
-			var self = this;
-			return new Promise(function (resolve, reject) {
+	InternalClient.prototype.deleteChannel = function deleteChannel(_channel) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-				self.resolver.resolveChannel(channel).then(next).catch(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;
+			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();
 					}
+				});
+			}
+		});
+	};
 
-					clearInterval(self.typingIntervals[channel.id]);
-					self.typingIntervals[channel.id] = false;
+	// def banMember
+
+	InternalClient.prototype.banMember = 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 updateDetails
+	// def unbanMember
 
-	}, {
-		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
+	InternalClient.prototype.unbanMember = 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
+
+	InternalClient.prototype.kickMember = 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
+
+	InternalClient.prototype.createRole = 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
+
+	InternalClient.prototype.updateRole = 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;
+			for (var _iterator2 = data.permissions, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+				var _ref2;
+
+				if (_isArray2) {
+					if (_i2 >= _iterator2.length) break;
+					_ref2 = _iterator2[_i2++];
+				} else {
+					_i2 = _iterator2.next();
+					if (_i2.done) break;
+					_ref2 = _i2.value;
+				}
+
+				var perm = _ref2;
+
+				if (perm instanceof String || typeof perm === "string") {
+					permissions |= Constants.Permissions[perm] || 0;
+				} else {
+					permissions |= perm;
+				}
+			}
+
+			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
+
+	InternalClient.prototype.deleteRole = 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
+
+	InternalClient.prototype.addMemberToRole = 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);
@@ -1138,596 +766,862 @@ var InternalClient = (function () {
 						resolve();
 					}
 				});
-			});
-		}
+			} else {
+				reject(new Error("member not in server"));
+			}
+		});
+	};
 
-		//def setAvatar
+	//def removeMemberFromRole
 
-	}, {
-		key: "setAvatar",
-		value: function setAvatar(avatar) {
-			return this.updateDetails({ avatar: avatar });
-		}
+	InternalClient.prototype.removeMemberFromRole = function removeMemberFromRole(member, role) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-		//def setUsername
+			member = self.resolver.resolveUser(member);
 
-	}, {
-		key: "setUsername",
-		value: function setUsername(username) {
-			return this.updateDetails({ username: username });
-		}
+			if (!member || !role) {
+				reject(new Error("member/role not in server"));
+				return;
+			}
 
-		//def setTopic
+			if (role.server.memberMap[member.id]) {
 
-	}, {
-		key: "setTopic",
-		value: function setTopic(chann) {
-			var topic = arguments.length <= 1 || arguments[1] === undefined ? "" : arguments[1];
+				var roleIDS = role.server.memberMap[member.id].roles.map(function (r) {
+					return r.id;
+				});
 
-			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();
-						}
-					});
+				for (var item in roleIDS) {
+					if (roleIDS[item] === role.id) {
+						roleIDS.splice(item, 1);
+					}
 				}
-			});
-		}
 
-		//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"
-						}
+				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"));
+			}
+		});
+	};
 
-			this.websocket.onclose = function () {
-				self.websocket = null;
-				self.state = ConnectionState.DISCONNECTED;
-				client.emit("disconnected");
-			};
+	// def createInvite
 
-			this.websocket.onerror = function (e) {
-				client.emit("error", e);
-			};
+	InternalClient.prototype.createInvite = function createInvite(chanServ, options) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
 
-			this.websocket.onmessage = function (e) {
+			if (chanServ instanceof Channel) {
+				// do something
+			} else if (chanServ instanceof Server) {
+					// do something
+				} else {
+						chanServ = self.resolver.resolveServer(chanServ) || self.resolver.resolveChannel(chanServ);
+					}
 
-				if (e.type === "Binary") {
-					if (!zlib) zlib = require("zlib");
-					e.data = zlib.inflateSync(e.data).toString();
+			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
+
+	InternalClient.prototype.deleteInvite = 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
+
+	InternalClient.prototype.overwritePermissions = 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 packet, data;
-				try {
-					packet = JSON.parse(e.data);
-					data = packet.d;
-				} catch (e) {
-					client.emit("error", e);
+				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;
 				}
 
-				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);
+				for (var perm in updated) {
+					if (updated[perm]) {
+						if (perm instanceof String || typeof perm === "string") {
+							data.allow |= Constants.Permissions[perm] || 0;
 						} else {
-							client.emit("warn", "message created but channel is not cached");
+							data.allow |= perm;
 						}
-						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 {
+						if (perm instanceof String || typeof perm === "string") {
+							data.deny |= Constants.Permissions[perm] || 0;
 						} else {
-							client.emit("warn", "message was deleted but channel is not cached");
+							data.deny |= perm;
 						}
-						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;
+				request.put(Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id).set("authorization", self.token).send(data).end(function (err) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			}
+		});
+	};
 
-							try {
+	//def setStatus
 
-								for (var _iterator3 = server.channels[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-									var channel = _step3.value;
+	InternalClient.prototype.setStatus = function setStatus(idleStatus, gameID) {
+		var self = this;
 
-									self.channels.remove(channel);
-								}
-							} catch (err) {
-								_didIteratorError3 = true;
-								_iteratorError3 = err;
-							} finally {
-								try {
-									if (!_iteratorNormalCompletion3 && _iterator3.return) {
-										_iterator3.return();
-									}
-								} finally {
-									if (_didIteratorError3) {
-										throw _iteratorError3;
-									}
-								}
-							}
+		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;
 
-							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:
+		return new Promise(function (resolve, reject) {
 
-						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;
+			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
+
+	InternalClient.prototype.sendTyping = 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
+
+	InternalClient.prototype.startTyping = 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
+
+	InternalClient.prototype.stopTyping = 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
+
+	InternalClient.prototype.updateDetails = 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
+
+	InternalClient.prototype.setAvatar = function setAvatar(avatar) {
+		return this.updateDetails({ avatar: avatar });
+	};
+
+	//def setUsername
+
+	InternalClient.prototype.setUsername = function setUsername(username) {
+		return this.updateDetails({ username: username });
+	};
+
+	//def setTopic
+
+	InternalClient.prototype.setTopic = 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
+
+	InternalClient.prototype.setChannelName = 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
+
+	InternalClient.prototype.setChannelNameAndTopic = 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
+
+	InternalClient.prototype.updateChannel = function updateChannel(chann, data) {
+		return this.setChannelNameAndTopic(chann, data.name, data.topic);
+	};
+
+	//def ack
+
+	InternalClient.prototype.ack = 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"));
+			}
+		});
+	};
+
+	InternalClient.prototype.sendWS = function sendWS(object) {
+		if (this.websocket) this.websocket.send(JSON.stringify(object));
+	};
+
+	InternalClient.prototype.createWS = 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) {
+
+						for (var _iterator3 = server.channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+							var _ref3;
+
+							if (_isArray3) {
+								if (_i3 >= _iterator3.length) break;
+								_ref3 = _iterator3[_i3++];
+							} else {
+								_i3 = _iterator3.next();
+								if (_i3.done) break;
+								_ref3 = _i3.value;
+							}
+
+							var channel = _ref3;
+
+							self.channels.remove(channel);
+						}
+
+						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;
+			}
+		};
+	};
+
+	_createClass(InternalClient, [{
 		key: "uptime",
 		get: function get() {
 			return this.readyTime ? Date.now() - this.readyTime : null;
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index ab40e4336..ed23d92f7 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -1,10 +1,6 @@
-"use strict"
+"use strict";
 /* global Buffer */
 
-;
-
-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 fs = require("fs");
@@ -27,254 +23,215 @@ var Resolver = (function () {
 		this.internal = internal;
 	}
 
-	_createClass(Resolver, [{
-		key: "resolveGameID",
-		value: function resolveGameID(resource) {
-			if (!isNaN(resource) && parseInt(resource) % 1 === 0) {
-				return resource;
-			} else if (typeof resource == "string" || resource instanceof String) {
-				var _iteratorNormalCompletion = true;
-				var _didIteratorError = false;
-				var _iteratorError = undefined;
-
-				try {
-
-					for (var _iterator = Games[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-						var game = _step.value;
-
-						if (game.name.toUpperCase() === resource.toUpperCase()) {
-							return game.id;
-						}
-					}
-				} catch (err) {
-					_didIteratorError = true;
-					_iteratorError = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion && _iterator.return) {
-							_iterator.return();
-						}
-					} finally {
-						if (_didIteratorError) {
-							throw _iteratorError;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-	}, {
-		key: "resolveToBase64",
-		value: function resolveToBase64(resource) {
-			if (resource instanceof Buffer) {
-				resource = resource.toString("base64");
-				resource = "data:image/jpg;base64," + resource;
-			}
+	Resolver.prototype.resolveGameID = function resolveGameID(resource) {
+		if (!isNaN(resource) && parseInt(resource) % 1 === 0) {
 			return resource;
-		}
-	}, {
-		key: "resolveInviteID",
-		value: function resolveInviteID(resource) {
-			if (resource instanceof Invite) {
-				return resource.id;
-			} else if (typeof resource == "string" || resource instanceof String) {
+		} else if (typeof resource == "string" || resource instanceof String) {
 
-				if (resource.indexOf("http") === 0) {
-					var split = resource.split("/");
-					return split.pop();
+			for (var _iterator = Games, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+				var _ref;
+
+				if (_isArray) {
+					if (_i >= _iterator.length) break;
+					_ref = _iterator[_i++];
 				} else {
-					return resource;
+					_i = _iterator.next();
+					if (_i.done) break;
+					_ref = _i.value;
+				}
+
+				var game = _ref;
+
+				if (game.name.toUpperCase() === resource.toUpperCase()) {
+					return game.id;
 				}
 			}
-			return null;
 		}
-	}, {
-		key: "resolveServer",
-		value: function resolveServer(resource) {
-			if (resource instanceof Server) {
-				return resource;
-			} else if (resource instanceof ServerChannel) {
-				return resource.server;
-			} else if (resource instanceof String || typeof resource === "string") {
-				return this.internal.servers.get("id", resource);
-			} else if (resource instanceof Message) {
-				if (resource.channel instanceof TextChannel) {
-					return resource.server;
-				}
-			}
-			return null;
+
+		return null;
+	};
+
+	Resolver.prototype.resolveToBase64 = function resolveToBase64(resource) {
+		if (resource instanceof Buffer) {
+			resource = resource.toString("base64");
+			resource = "data:image/jpg;base64," + resource;
 		}
-	}, {
-		key: "resolveFile",
-		value: function resolveFile(resource) {
-			if (typeof resource === "string" || resource instanceof String) {
-				return fs.createReadStream(resource);
+		return resource;
+	};
+
+	Resolver.prototype.resolveInviteID = function resolveInviteID(resource) {
+		if (resource instanceof Invite) {
+			return resource.id;
+		} else if (typeof resource == "string" || resource instanceof String) {
+
+			if (resource.indexOf("http") === 0) {
+				var split = resource.split("/");
+				return split.pop();
 			} else {
 				return resource;
 			}
 		}
-	}, {
-		key: "resolveMentions",
-		value: function resolveMentions(resource) {
-			// resource is a string
-			var _mentions = [];
-			var _iteratorNormalCompletion2 = true;
-			var _didIteratorError2 = false;
-			var _iteratorError2 = undefined;
+		return null;
+	};
 
-			try {
-				for (var _iterator2 = (resource.match(/<@[^>]*>/g) || [])[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-					var mention = _step2.value;
+	Resolver.prototype.resolveServer = function resolveServer(resource) {
+		if (resource instanceof Server) {
+			return resource;
+		} else if (resource instanceof ServerChannel) {
+			return resource.server;
+		} else if (resource instanceof String || typeof resource === "string") {
+			return this.internal.servers.get("id", resource);
+		} else if (resource instanceof Message) {
+			if (resource.channel instanceof TextChannel) {
+				return resource.server;
+			}
+		}
+		return null;
+	};
 
-					_mentions.push(mention.substring(2, mention.length - 1));
-				}
-			} catch (err) {
-				_didIteratorError2 = true;
-				_iteratorError2 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion2 && _iterator2.return) {
-						_iterator2.return();
-					}
-				} finally {
-					if (_didIteratorError2) {
-						throw _iteratorError2;
-					}
-				}
+	Resolver.prototype.resolveFile = function resolveFile(resource) {
+		if (typeof resource === "string" || resource instanceof String) {
+			return fs.createReadStream(resource);
+		} else {
+			return resource;
+		}
+	};
+
+	Resolver.prototype.resolveMentions = function resolveMentions(resource) {
+		// resource is a string
+		var _mentions = [];
+		for (var _iterator2 = resource.match(/<@[^>]*>/g) || [], _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+			var _ref2;
+
+			if (_isArray2) {
+				if (_i2 >= _iterator2.length) break;
+				_ref2 = _iterator2[_i2++];
+			} else {
+				_i2 = _iterator2.next();
+				if (_i2.done) break;
+				_ref2 = _i2.value;
 			}
 
-			return _mentions;
+			var mention = _ref2;
+
+			_mentions.push(mention.substring(2, mention.length - 1));
 		}
-	}, {
-		key: "resolveString",
-		value: function resolveString(resource) {
+		return _mentions;
+	};
 
-			// accepts Array, Channel, Server, User, Message, String and anything
-			// toString()-able
+	Resolver.prototype.resolveString = function resolveString(resource) {
 
-			var final = resource;
-			if (resource instanceof Array) {
-				final = resource.join("\n");
+		// accepts Array, Channel, Server, User, Message, String and anything
+		// toString()-able
+
+		var final = resource;
+		if (resource instanceof Array) {
+			final = resource.join("\n");
+		}
+
+		return final.toString();
+	};
+
+	Resolver.prototype.resolveUser = function resolveUser(resource) {
+		/*
+  	accepts a Message, Channel, Server, String ID, User, PMChannel
+  */
+		var found = null;
+		if (resource instanceof User) {
+			found = resource;
+		} else if (resource instanceof Message) {
+			found = resource.author;
+		} else if (resource instanceof TextChannel) {
+			var lmsg = resource.lastMessage;
+			if (lmsg) {
+				found = lmsg.author;
 			}
-
-			return final.toString();
+		} else if (resource instanceof Server) {
+			found = resource.owner;
+		} else if (resource instanceof PMChannel) {
+			found = resource.recipient;
+		} else if (resource instanceof String || typeof resource === "string") {
+			found = this.client.internal.users.get("id", resource);
 		}
-	}, {
-		key: "resolveUser",
-		value: function resolveUser(resource) {
-			/*
-   	accepts a Message, Channel, Server, String ID, User, PMChannel
+
+		return found;
+	};
+
+	Resolver.prototype.resolveMessage = function resolveMessage(resource) {
+		// accepts a Message, PMChannel & TextChannel
+		var found = null;
+
+		if (resource instanceof TextChannel || resource instanceof PMChannel) {
+			found = resource.lastMessage;
+		} else if (resource instanceof Message) {
+			found = resource;
+		}
+
+		return found;
+	};
+
+	Resolver.prototype.resolveVoiceChannel = function resolveVoiceChannel(resource) {
+		// resolveChannel will also work but this is more apt
+		if (resource instanceof VoiceChannel) {
+			return resource;
+		}
+		return null;
+	};
+
+	Resolver.prototype.resolveChannel = function resolveChannel(resource) {
+		/*
+  	accepts a Message, Channel, Server, String ID, User
    */
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
 			var found = null;
-			if (resource instanceof User) {
+			if (resource instanceof Message) {
+				found = resource.channel;
+			} else if (resource instanceof Channel) {
 				found = resource;
-			} else if (resource instanceof Message) {
-				found = resource.author;
-			} else if (resource instanceof TextChannel) {
-				var lmsg = resource.lastMessage;
-				if (lmsg) {
-					found = lmsg.author;
-				}
 			} else if (resource instanceof Server) {
-				found = resource.owner;
-			} else if (resource instanceof PMChannel) {
-				found = resource.recipient;
+				found = resource.channels.get("id", resource.id);
 			} else if (resource instanceof String || typeof resource === "string") {
-				found = this.client.internal.users.get("id", resource);
-			}
+				found = self.internal.channels.get("id", resource);
+			} else if (resource instanceof User) {
+				// see if a PM exists
+				var chatFound = false;
+				for (var _iterator3 = self.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+					var _ref3;
 
-			return found;
-		}
-	}, {
-		key: "resolveMessage",
-		value: function resolveMessage(resource) {
-			// accepts a Message, PMChannel & TextChannel
-			var found = null;
-
-			if (resource instanceof TextChannel || resource instanceof PMChannel) {
-				found = resource.lastMessage;
-			} else if (resource instanceof Message) {
-				found = resource;
-			}
-
-			return found;
-		}
-	}, {
-		key: "resolveVoiceChannel",
-		value: function resolveVoiceChannel(resource) {
-			// resolveChannel will also work but this is more apt
-			if (resource instanceof VoiceChannel) {
-				return resource;
-			}
-			return null;
-		}
-	}, {
-		key: "resolveChannel",
-		value: function resolveChannel(resource) {
-			/*
-   	accepts a Message, Channel, Server, String ID, User
-    */
-			var self = this;
-
-			return new Promise(function (resolve, reject) {
-				var found = null;
-				if (resource instanceof Message) {
-					found = resource.channel;
-				} else if (resource instanceof Channel) {
-					found = resource;
-				} else if (resource instanceof Server) {
-					found = resource.channels.get("id", resource.id);
-				} else if (resource instanceof String || typeof resource === "string") {
-					found = self.internal.channels.get("id", resource);
-				} else if (resource instanceof User) {
-					// see if a PM exists
-					var chatFound = false;
-					var _iteratorNormalCompletion3 = true;
-					var _didIteratorError3 = false;
-					var _iteratorError3 = undefined;
-
-					try {
-						for (var _iterator3 = self.internal.private_channels[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-							var pmchat = _step3.value;
-
-							if (pmchat.recipient.equals(resource)) {
-								chatFound = pmchat;
-								break;
-							}
-						}
-					} catch (err) {
-						_didIteratorError3 = true;
-						_iteratorError3 = err;
-					} finally {
-						try {
-							if (!_iteratorNormalCompletion3 && _iterator3.return) {
-								_iterator3.return();
-							}
-						} finally {
-							if (_didIteratorError3) {
-								throw _iteratorError3;
-							}
-						}
+					if (_isArray3) {
+						if (_i3 >= _iterator3.length) break;
+						_ref3 = _iterator3[_i3++];
+					} else {
+						_i3 = _iterator3.next();
+						if (_i3.done) break;
+						_ref3 = _i3.value;
 					}
 
-					if (chatFound) {
-						// a PM already exists!
-						found = chatFound;
-					} else {
-						// PM does not exist :\
-						self.internal.startPM(resource).then(function (pmchannel) {
-							return resolve(pmchannel);
-						}).catch(function (e) {
-							return reject(e);
-						});
-						return;
+					var pmchat = _ref3;
+
+					if (pmchat.recipient.equals(resource)) {
+						chatFound = pmchat;
+						break;
 					}
 				}
-				if (found) resolve(found);else reject(new Error("Didn't found anything"));
-			});
-		}
-	}]);
+				if (chatFound) {
+					// a PM already exists!
+					found = chatFound;
+				} else {
+					// PM does not exist :\
+					self.internal.startPM(resource).then(function (pmchannel) {
+						return resolve(pmchannel);
+					})["catch"](function (e) {
+						return reject(e);
+					});
+					return;
+				}
+			}
+			if (found) resolve(found);else reject(new Error("Didn't found anything"));
+		});
+	};
 
 	return Resolver;
 })();
diff --git a/lib/Structures/Channel.js b/lib/Structures/Channel.js
index ebcbf2e7d..93d222f13 100644
--- a/lib/Structures/Channel.js
+++ b/lib/Structures/Channel.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Equality = require("../Util/Equality.js");
@@ -19,19 +17,16 @@ var Channel = (function (_Equality) {
 	function Channel(data, client) {
 		_classCallCheck(this, Channel);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Channel).call(this));
-
-		_this.id = data.id;
-		_this.client = client;
-		return _this;
+		_Equality.call(this);
+		this.id = data.id;
+		this.client = client;
 	}
 
+	Channel.prototype["delete"] = function _delete() {
+		return this.client.deleteChannel.apply(this.client, reg(this, arguments));
+	};
+
 	_createClass(Channel, [{
-		key: "delete",
-		value: function _delete() {
-			return this.client.deleteChannel.apply(this.client, reg(this, arguments));
-		}
-	}, {
 		key: "isPrivate",
 		get: function get() {
 			return !!this.server;
diff --git a/lib/Structures/ChannelPermissions.js b/lib/Structures/ChannelPermissions.js
index cbd4d00d2..fe7a039fd 100644
--- a/lib/Structures/ChannelPermissions.js
+++ b/lib/Structures/ChannelPermissions.js
@@ -1,7 +1,5 @@
 "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 Permissions = require("../Constants.js").Permissions;
@@ -13,68 +11,63 @@ var ChannelPermissions = (function () {
 		this.permissions = permissions;
 	}
 
-	_createClass(ChannelPermissions, [{
-		key: "serialise",
-		value: function serialise(explicit) {
-			var _this = this;
+	ChannelPermissions.prototype.serialise = function serialise(explicit) {
+		var _this = this;
 
-			var hp = function hp(perm) {
-				return _this.hasPermission(perm, explicit);
-			};
+		var hp = function hp(perm) {
+			return _this.hasPermission(perm, explicit);
+		};
 
-			return {
-				// general
-				createInstantInvite: hp(Permissions.createInstantInvite),
-				kickMembers: hp(Permissions.kickMembers),
-				banMembers: hp(Permissions.banMembers),
-				managePermissions: hp(Permissions.managePermissions),
-				manageChannel: hp(Permissions.manageChannel),
-				manageServer: hp(Permissions.manageServer),
-				// text
-				readMessages: hp(Permissions.readMessages),
-				sendMessages: hp(Permissions.sendMessages),
-				sendTTSMessages: hp(Permissions.sendTTSMessages),
-				manageMessages: hp(Permissions.manageMessages),
-				embedLinks: hp(Permissions.embedLinks),
-				attachFiles: hp(Permissions.attachFiles),
-				readMessageHistory: hp(Permissions.readMessageHistory),
-				mentionEveryone: hp(Permissions.mentionEveryone),
-				// voice
-				voiceConnect: hp(Permissions.voiceConnect),
-				voiceSpeak: hp(Permissions.voiceSpeak),
-				voiceMuteMembers: hp(Permissions.voiceMuteMembers),
-				voiceDeafenMembers: hp(Permissions.voiceDeafenMembers),
-				voiceMoveMembers: hp(Permissions.voiceMoveMembers),
-				voiceUseVAD: hp(Permissions.voiceUseVAD)
-			};
-		}
-	}, {
-		key: "serialize",
-		value: function serialize() {
-			// ;n;
-			return this.serialise();
-		}
-	}, {
-		key: "hasPermission",
-		value: function hasPermission(perm) {
-			var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
+		return {
+			// general
+			createInstantInvite: hp(Permissions.createInstantInvite),
+			kickMembers: hp(Permissions.kickMembers),
+			banMembers: hp(Permissions.banMembers),
+			managePermissions: hp(Permissions.managePermissions),
+			manageChannel: hp(Permissions.manageChannel),
+			manageServer: hp(Permissions.manageServer),
+			// text
+			readMessages: hp(Permissions.readMessages),
+			sendMessages: hp(Permissions.sendMessages),
+			sendTTSMessages: hp(Permissions.sendTTSMessages),
+			manageMessages: hp(Permissions.manageMessages),
+			embedLinks: hp(Permissions.embedLinks),
+			attachFiles: hp(Permissions.attachFiles),
+			readMessageHistory: hp(Permissions.readMessageHistory),
+			mentionEveryone: hp(Permissions.mentionEveryone),
+			// voice
+			voiceConnect: hp(Permissions.voiceConnect),
+			voiceSpeak: hp(Permissions.voiceSpeak),
+			voiceMuteMembers: hp(Permissions.voiceMuteMembers),
+			voiceDeafenMembers: hp(Permissions.voiceDeafenMembers),
+			voiceMoveMembers: hp(Permissions.voiceMoveMembers),
+			voiceUseVAD: hp(Permissions.voiceUseVAD)
+		};
+	};
 
-			if (perm instanceof String || typeof perm === "string") {
-				perm = Permissions[perm];
-			}
-			if (!perm) {
-				return false;
-			}
-			if (!explicit) {
-				// implicit permissions allowed
-				if (!!(this.permissions & Permissions.manageRoles)) {
-					// manageRoles allowed, they have all permissions
-					return true;
-				}
-			}
-			return !!(this.permissions & perm);
+	ChannelPermissions.prototype.serialize = function serialize() {
+		// ;n;
+		return this.serialise();
+	};
+
+	ChannelPermissions.prototype.hasPermission = function hasPermission(perm) {
+		var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
+
+		if (perm instanceof String || typeof perm === "string") {
+			perm = Permissions[perm];
 		}
-	}]);
+		if (!perm) {
+			return false;
+		}
+		if (!explicit) {
+			// implicit permissions allowed
+			if (!!(this.permissions & Permissions.manageRoles)) {
+				// manageRoles allowed, they have all permissions
+				return true;
+			}
+		}
+		return !!(this.permissions & perm);
+	};
 
 	return ChannelPermissions;
 })();
diff --git a/lib/Structures/Invite.js b/lib/Structures/Invite.js
index a9602112f..04a125d23 100644
--- a/lib/Structures/Invite.js
+++ b/lib/Structures/Invite.js
@@ -1,7 +1,5 @@
 "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 Server = require("./Server.js");
@@ -24,12 +22,9 @@ var Invite = (function () {
         this.xkcd = data.xkcdpass;
     }
 
-    _createClass(Invite, [{
-        key: "toString",
-        value: function toString() {
-            return "https://discord.gg/" + this.code;
-        }
-    }]);
+    Invite.prototype.toString = function toString() {
+        return "https://discord.gg/" + this.code;
+    };
 
     return Invite;
 })();
diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js
index 1f158c029..d61295506 100644
--- a/lib/Structures/Message.js
+++ b/lib/Structures/Message.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Cache = require("../Util/Cache.js");
@@ -17,26 +15,27 @@ var Message = (function (_Equality) {
 	_inherits(Message, _Equality);
 
 	function Message(data, channel, client) {
+		var _this = this;
+
 		_classCallCheck(this, Message);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Message).call(this));
+		_Equality.call(this);
+		this.channel = channel;
+		this.client = client;
+		this.nonce = data.nonce;
+		this.attachments = data.attachments;
+		this.tts = data.tts;
+		this.embeds = data.embeds;
+		this.timestamp = Date.parse(data.timestamp);
+		this.everyoneMentioned = data.mention_everyone;
+		this.id = data.id;
 
-		_this.channel = channel;
-		_this.client = client;
-		_this.nonce = data.nonce;
-		_this.attachments = data.attachments;
-		_this.tts = data.tts;
-		_this.embeds = data.embeds;
-		_this.timestamp = Date.parse(data.timestamp);
-		_this.everyoneMentioned = data.mention_everyone;
-		_this.id = data.id;
+		if (data.edited_timestamp) this.editedTimestamp = Date.parse(data.edited_timestamp);
 
-		if (data.edited_timestamp) _this.editedTimestamp = Date.parse(data.edited_timestamp);
+		if (data.author instanceof User) this.author = data.author;else this.author = client.internal.users.add(new User(data.author, client));
 
-		if (data.author instanceof User) _this.author = data.author;else _this.author = client.internal.users.add(new User(data.author, client));
-
-		_this.content = data.content;
-		_this.mentions = new Cache();
+		this.content = data.content;
+		this.mentions = new Cache();
 
 		data.mentions.forEach(function (mention) {
 			// this is .add and not .get because it allows the bot to cache
@@ -44,45 +43,38 @@ var Message = (function (_Equality) {
 			// not previously cached.
 			if (mention instanceof User) _this.mentions.push(mention);else _this.mentions.add(client.internal.users.add(new User(mention, client)));
 		});
-		return _this;
 	}
 
+	Message.prototype.isMentioned = function isMentioned(user) {
+		user = this.client.internal.resolver.resolveUser(user);
+		if (user) {
+			return this.mentions.has("id", user.id);
+		} else {
+			return false;
+		}
+	};
+
+	Message.prototype.toString = function toString() {
+		return this.content;
+	};
+
+	Message.prototype["delete"] = function _delete() {
+		return this.client.deleteMessage.apply(this.client, reg(this, arguments));
+	};
+
+	Message.prototype.update = function update() {
+		return this.client.updateMessage.apply(this.client, reg(this, arguments));
+	};
+
+	Message.prototype.reply = function reply() {
+		return this.client.reply.apply(this.client, reg(this, arguments));
+	};
+
+	Message.prototype.replyTTS = function replyTTS() {
+		return this.client.replyTTS.apply(this.client, reg(this, arguments));
+	};
+
 	_createClass(Message, [{
-		key: "isMentioned",
-		value: function isMentioned(user) {
-			user = this.client.internal.resolver.resolveUser(user);
-			if (user) {
-				return this.mentions.has("id", user.id);
-			} else {
-				return false;
-			}
-		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.content;
-		}
-	}, {
-		key: "delete",
-		value: function _delete() {
-			return this.client.deleteMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "update",
-		value: function update() {
-			return this.client.updateMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "reply",
-		value: function reply() {
-			return this.client.reply.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "replyTTS",
-		value: function replyTTS() {
-			return this.client.replyTTS.apply(this.client, reg(this, arguments));
-		}
-	}, {
 		key: "sender",
 		get: function get() {
 			return this.author;
diff --git a/lib/Structures/PMChannel.js b/lib/Structures/PMChannel.js
index bd94242da..3f0404241 100644
--- a/lib/Structures/PMChannel.js
+++ b/lib/Structures/PMChannel.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Channel = require("./Channel.js");
@@ -20,33 +18,29 @@ var PMChannel = (function (_Channel) {
 	function PMChannel(data, client) {
 		_classCallCheck(this, PMChannel);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(PMChannel).call(this, data, client));
+		_Channel.call(this, data, client);
 
-		_this.type = data.type || "text";
-		_this.lastMessageId = data.last_message_id;
-		_this.messages = new Cache("id", 1000);
-		_this.recipient = _this.client.internal.users.add(new User(data.recipient, _this.client));
-		return _this;
+		this.type = data.type || "text";
+		this.lastMessageId = data.last_message_id;
+		this.messages = new Cache("id", 1000);
+		this.recipient = this.client.internal.users.add(new User(data.recipient, this.client));
 	}
 
 	/* warning! may return null */
 
+	PMChannel.prototype.toString = function toString() {
+		return this.recipient.toString();
+	};
+
+	PMChannel.prototype.sendMessage = function sendMessage() {
+		return this.client.sendMessage.apply(this.client, reg(this, arguments));
+	};
+
+	PMChannel.prototype.sendTTSMessage = function sendTTSMessage() {
+		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
+	};
+
 	_createClass(PMChannel, [{
-		key: "toString",
-		value: function toString() {
-			return this.recipient.toString();
-		}
-	}, {
-		key: "sendMessage",
-		value: function sendMessage() {
-			return this.client.sendMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "sendTTSMessage",
-		value: function sendTTSMessage() {
-			return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
 		key: "lastMessage",
 		get: function get() {
 			return this.messages.get("id", this.lastMessageID);
diff --git a/lib/Structures/PermissionOverwrite.js b/lib/Structures/PermissionOverwrite.js
index 86f45918a..f20d61b7a 100644
--- a/lib/Structures/PermissionOverwrite.js
+++ b/lib/Structures/PermissionOverwrite.js
@@ -18,35 +18,33 @@ var PermissionOverwrite = (function () {
 
 	// returns an array of allowed permissions
 
+	PermissionOverwrite.prototype.setAllowed = function setAllowed(allowedArray) {
+		var _this = this;
+
+		allowedArray.forEach(function (permission) {
+			if (permission instanceof String || typeof permission === "string") {
+				permission = Permissions[permission];
+			}
+			if (permission) {
+				_this.allow |= 1 << permission;
+			}
+		});
+	};
+
+	PermissionOverwrite.prototype.setDenied = function setDenied(deniedArray) {
+		var _this2 = this;
+
+		deniedArray.forEach(function (permission) {
+			if (permission instanceof String || typeof permission === "string") {
+				permission = Permissions[permission];
+			}
+			if (permission) {
+				_this2.deny |= 1 << permission;
+			}
+		});
+	};
+
 	_createClass(PermissionOverwrite, [{
-		key: "setAllowed",
-		value: function setAllowed(allowedArray) {
-			var _this = this;
-
-			allowedArray.forEach(function (permission) {
-				if (permission instanceof String || typeof permission === "string") {
-					permission = Permissions[permission];
-				}
-				if (permission) {
-					_this.allow |= 1 << permission;
-				}
-			});
-		}
-	}, {
-		key: "setDenied",
-		value: function setDenied(deniedArray) {
-			var _this2 = this;
-
-			deniedArray.forEach(function (permission) {
-				if (permission instanceof String || typeof permission === "string") {
-					permission = Permissions[permission];
-				}
-				if (permission) {
-					_this2.deny |= 1 << permission;
-				}
-			});
-		}
-	}, {
 		key: "allowed",
 		get: function get() {
 			var allowed = [];
@@ -64,7 +62,6 @@ var PermissionOverwrite = (function () {
 		}
 
 		// returns an array of denied permissions
-
 	}, {
 		key: "denied",
 		get: function get() {
diff --git a/lib/Structures/Role.js b/lib/Structures/Role.js
index 567fa42ff..048c183cb 100644
--- a/lib/Structures/Role.js
+++ b/lib/Structures/Role.js
@@ -1,7 +1,5 @@
 "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 Permissions = require("../Constants.js").Permissions;
@@ -37,111 +35,103 @@ var Role = (function () {
 		this.client = client;
 	}
 
-	_createClass(Role, [{
-		key: "serialise",
-		value: function serialise(explicit) {
-			var _this = this;
+	Role.prototype.serialise = function serialise(explicit) {
+		var _this = this;
 
-			var hp = function hp(perm) {
-				return _this.hasPermission(perm, explicit);
-			};
+		var hp = function hp(perm) {
+			return _this.hasPermission(perm, explicit);
+		};
 
-			return {
-				// general
-				createInstantInvite: hp(Permissions.createInstantInvite),
-				kickMembers: hp(Permissions.kickMembers),
-				banMembers: hp(Permissions.banMembers),
-				manageRoles: hp(Permissions.manageRoles),
-				manageChannels: hp(Permissions.manageChannels),
-				manageServer: hp(Permissions.manageServer),
-				// text
-				readMessages: hp(Permissions.readMessages),
-				sendMessages: hp(Permissions.sendMessages),
-				sendTTSMessages: hp(Permissions.sendTTSMessages),
-				manageMessages: hp(Permissions.manageMessages),
-				embedLinks: hp(Permissions.embedLinks),
-				attachFiles: hp(Permissions.attachFiles),
-				readMessageHistory: hp(Permissions.readMessageHistory),
-				mentionEveryone: hp(Permissions.mentionEveryone),
-				// voice
-				voiceConnect: hp(Permissions.voiceConnect),
-				voiceSpeak: hp(Permissions.voiceSpeak),
-				voiceMuteMembers: hp(Permissions.voiceMuteMembers),
-				voiceDeafenMembers: hp(Permissions.voiceDeafenMembers),
-				voiceMoveMembers: hp(Permissions.voiceMoveMembers),
-				voiceUseVAD: hp(Permissions.voiceUseVAD)
-			};
+		return {
+			// general
+			createInstantInvite: hp(Permissions.createInstantInvite),
+			kickMembers: hp(Permissions.kickMembers),
+			banMembers: hp(Permissions.banMembers),
+			manageRoles: hp(Permissions.manageRoles),
+			manageChannels: hp(Permissions.manageChannels),
+			manageServer: hp(Permissions.manageServer),
+			// text
+			readMessages: hp(Permissions.readMessages),
+			sendMessages: hp(Permissions.sendMessages),
+			sendTTSMessages: hp(Permissions.sendTTSMessages),
+			manageMessages: hp(Permissions.manageMessages),
+			embedLinks: hp(Permissions.embedLinks),
+			attachFiles: hp(Permissions.attachFiles),
+			readMessageHistory: hp(Permissions.readMessageHistory),
+			mentionEveryone: hp(Permissions.mentionEveryone),
+			// voice
+			voiceConnect: hp(Permissions.voiceConnect),
+			voiceSpeak: hp(Permissions.voiceSpeak),
+			voiceMuteMembers: hp(Permissions.voiceMuteMembers),
+			voiceDeafenMembers: hp(Permissions.voiceDeafenMembers),
+			voiceMoveMembers: hp(Permissions.voiceMoveMembers),
+			voiceUseVAD: hp(Permissions.voiceUseVAD)
+		};
+	};
+
+	Role.prototype.serialize = function serialize() {
+		// ;n;
+		return this.serialise();
+	};
+
+	Role.prototype.hasPermission = function hasPermission(perm) {
+		var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
+
+		if (perm instanceof String || typeof perm === "string") {
+			perm = Permissions[perm];
 		}
-	}, {
-		key: "serialize",
-		value: function serialize() {
-			// ;n;
-			return this.serialise();
+		if (!perm) {
+			return false;
 		}
-	}, {
-		key: "hasPermission",
-		value: function hasPermission(perm) {
-			var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
-
-			if (perm instanceof String || typeof perm === "string") {
-				perm = Permissions[perm];
+		if (!explicit) {
+			// implicit permissions allowed
+			if (!!(this.permissions & Permissions.manageRoles)) {
+				// manageRoles allowed, they have all permissions
+				return true;
 			}
-			if (!perm) {
-				return false;
-			}
-			if (!explicit) {
-				// implicit permissions allowed
-				if (!!(this.permissions & Permissions.manageRoles)) {
-					// manageRoles allowed, they have all permissions
-					return true;
-				}
-			}
-			// e.g.
-			// !!(36953089 & Permissions.manageRoles) = not allowed to manage roles
-			// !!(36953089 & (1 << 21)) = voice speak allowed
-
-			return !!(this.permissions & perm);
 		}
-	}, {
-		key: "setPermission",
-		value: function setPermission(permission, value) {
+		// e.g.
+		// !!(36953089 & Permissions.manageRoles) = not allowed to manage roles
+		// !!(36953089 & (1 << 21)) = voice speak allowed
+
+		return !!(this.permissions & perm);
+	};
+
+	Role.prototype.setPermission = function setPermission(permission, value) {
+		if (permission instanceof String || typeof permission === "string") {
+			permission = Permissions[permission];
+		}
+		if (permission) {
+			// valid permission
+			if (value) {
+				this.permissions |= permission;
+			} else {
+				this.permissions &= ~permission;
+			}
+		}
+	};
+
+	Role.prototype.setPermissions = function setPermissions(obj) {
+		var _this2 = this;
+
+		obj.forEach(function (value, permission) {
 			if (permission instanceof String || typeof permission === "string") {
 				permission = Permissions[permission];
 			}
 			if (permission) {
 				// valid permission
-				if (value) {
-					this.permissions |= permission;
-				} else {
-					this.permissions &= ~permission;
-				}
+				_this2.setPermission(permission, value);
 			}
-		}
-	}, {
-		key: "setPermissions",
-		value: function setPermissions(obj) {
-			var _this2 = this;
+		});
+	};
 
-			obj.forEach(function (value, permission) {
-				if (permission instanceof String || typeof permission === "string") {
-					permission = Permissions[permission];
-				}
-				if (permission) {
-					// valid permission
-					_this2.setPermission(permission, value);
-				}
-			});
+	Role.prototype.colorAsHex = function colorAsHex() {
+		var val = this.color.toString();
+		while (val.length < 6) {
+			val = "0" + val;
 		}
-	}, {
-		key: "colorAsHex",
-		value: function colorAsHex() {
-			var val = this.color.toString();
-			while (val.length < 6) {
-				val = "0" + val;
-			}
-			return "#" + val;
-		}
-	}]);
+		return "#" + val;
+	};
 
 	return Role;
 })();
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index 8613a67ee..99ee3971a 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Equality = require("../Util/Equality.js");
@@ -22,26 +20,28 @@ var Server = (function (_Equality) {
 	_inherits(Server, _Equality);
 
 	function Server(data, client) {
+		var _this = this;
+
 		_classCallCheck(this, Server);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Server).call(this));
+		_Equality.call(this);
 
-		var self = _this;
-		_this.client = client;
+		var self = this;
+		this.client = client;
 
-		_this.region = data.region;
-		_this.ownerID = data.owner_id;
-		_this.name = data.name;
-		_this.id = data.id;
-		_this.members = new Cache();
-		_this.channels = new Cache();
-		_this.roles = new Cache();
-		_this.icon = data.icon;
-		_this.afkTimeout = data.afkTimeout;
-		_this.afkChannelID = data.afk_channel_id;
-		_this.memberMap = {};
+		this.region = data.region;
+		this.ownerID = data.owner_id;
+		this.name = data.name;
+		this.id = data.id;
+		this.members = new Cache();
+		this.channels = new Cache();
+		this.roles = new Cache();
+		this.icon = data.icon;
+		this.afkTimeout = data.afkTimeout;
+		this.afkChannelID = data.afk_channel_id;
+		this.memberMap = {};
 
-		var self = _this;
+		var self = this;
 
 		data.roles.forEach(function (dataRole) {
 			_this.roles.add(new Role(dataRole, _this, client));
@@ -71,94 +71,73 @@ var Server = (function (_Equality) {
 		});
 
 		if (data.presences) {
-			var _iteratorNormalCompletion = true;
-			var _didIteratorError = false;
-			var _iteratorError = undefined;
+			for (var _iterator = data.presences, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+				var _ref;
 
-			try {
-				for (var _iterator = data.presences[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var presence = _step.value;
-
-					var user = client.internal.users.get("id", presence.user.id);
-					if (user) {
-						user.status = presence.status;
-						user.gameID = presence.game_id;
-					}
+				if (_isArray) {
+					if (_i >= _iterator.length) break;
+					_ref = _iterator[_i++];
+				} else {
+					_i = _iterator.next();
+					if (_i.done) break;
+					_ref = _i.value;
 				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return) {
-						_iterator.return();
-					}
-				} finally {
-					if (_didIteratorError) {
-						throw _iteratorError;
-					}
+
+				var presence = _ref;
+
+				var user = client.internal.users.get("id", presence.user.id);
+				if (user) {
+					user.status = presence.status;
+					user.gameID = presence.game_id;
 				}
 			}
 		}
-		return _this;
 	}
 
-	_createClass(Server, [{
-		key: "rolesOfUser",
-		value: function rolesOfUser(user) {
-			user = this.client.internal.resolver.resolveUser(user);
-			if (user) {
-				return this.memberMap[user.id] ? this.memberMap[user.id].roles : [];
-			} else {
-				return null;
-			}
+	Server.prototype.rolesOfUser = function rolesOfUser(user) {
+		user = this.client.internal.resolver.resolveUser(user);
+		if (user) {
+			return this.memberMap[user.id] ? this.memberMap[user.id].roles : [];
+		} else {
+			return null;
 		}
-	}, {
-		key: "rolesOf",
-		value: function rolesOf(user) {
-			return this.rolesOfUser(user);
-		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.name;
-		}
-	}, {
-		key: "equalsStrict",
-		value: function equalsStrict(obj) {
-			if (obj instanceof Server) {
-				var _iteratorNormalCompletion2 = true;
-				var _didIteratorError2 = false;
-				var _iteratorError2 = undefined;
+	};
 
-				try {
-					for (var _iterator2 = strictKeys[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var key = _step2.value;
+	Server.prototype.rolesOf = function rolesOf(user) {
+		return this.rolesOfUser(user);
+	};
 
-						if (obj[key] !== this[key]) {
-							return false;
-						}
-					}
-				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return) {
-							_iterator2.return();
-						}
-					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
-						}
-					}
+	Server.prototype.toString = function toString() {
+		return this.name;
+	};
+
+	Server.prototype.equalsStrict = function equalsStrict(obj) {
+		if (obj instanceof Server) {
+			for (var _iterator2 = strictKeys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+				var _ref2;
+
+				if (_isArray2) {
+					if (_i2 >= _iterator2.length) break;
+					_ref2 = _iterator2[_i2++];
+				} else {
+					_i2 = _iterator2.next();
+					if (_i2.done) break;
+					_ref2 = _i2.value;
+				}
+
+				var key = _ref2;
+
+				if (obj[key] !== this[key]) {
+					return false;
 				}
-			} else {
-				return false;
 			}
-			return true;
+		} else {
+			return false;
 		}
-	}, {
+		return true;
+	};
+
+	_createClass(Server, [{
 		key: "iconURL",
 		get: function get() {
 			if (!this.icon) {
diff --git a/lib/Structures/ServerChannel.js b/lib/Structures/ServerChannel.js
index baf69892b..0349d33f9 100644
--- a/lib/Structures/ServerChannel.js
+++ b/lib/Structures/ServerChannel.js
@@ -1,11 +1,7 @@
 "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"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Channel = require("./Channel.js");
@@ -18,125 +14,102 @@ var ServerChannel = (function (_Channel) {
 	_inherits(ServerChannel, _Channel);
 
 	function ServerChannel(data, client, server) {
+		var _this = this;
+
 		_classCallCheck(this, ServerChannel);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(ServerChannel).call(this, data, client));
-
-		_this.name = data.name;
-		_this.type = data.type;
-		_this.position = data.position;
-		_this.permissionOverwrites = new Cache();
-		_this.server = server;
+		_Channel.call(this, data, client);
+		this.name = data.name;
+		this.type = data.type;
+		this.position = data.position;
+		this.permissionOverwrites = new Cache();
+		this.server = server;
 		data.permission_overwrites.forEach(function (permission) {
 			_this.permissionOverwrites.add(new PermissionOverwrite(permission));
 		});
-		return _this;
 	}
 
-	_createClass(ServerChannel, [{
-		key: "permissionsOf",
-		value: function permissionsOf(user) {
-			user = this.client.internal.resolver.resolveUser(user);
-			if (user) {
-				if (this.server.owner.equals(user)) {
-					return new ChannelPermissions(4294967295);
-				}
-				var everyoneRole = this.server.roles.get("name", "@everyone");
-
-				var userRoles = [everyoneRole].concat(this.server.rolesOf(user) || []);
-				var userRolesID = userRoles.map(function (v) {
-					return v.id;
-				});
-				var roleOverwrites = [],
-				    memberOverwrites = [];
-
-				this.permissionOverwrites.forEach(function (overwrite) {
-					if (overwrite.type === "member" && overwrite.id === user.id) {
-						memberOverwrites.push(overwrite);
-					} else if (overwrite.type === "role" && overwrite.id in userRolesID) {
-						roleOverwrites.push(overwrite);
-					}
-				});
-
-				var permissions = 0;
-
-				var _iteratorNormalCompletion = true;
-				var _didIteratorError = false;
-				var _iteratorError = undefined;
-
-				try {
-					for (var _iterator = userRoles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-						var serverRole = _step.value;
-
-						permissions |= serverRole.permissions;
-					}
-				} catch (err) {
-					_didIteratorError = true;
-					_iteratorError = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion && _iterator.return) {
-							_iterator.return();
-						}
-					} finally {
-						if (_didIteratorError) {
-							throw _iteratorError;
-						}
-					}
-				}
-
-				var _iteratorNormalCompletion2 = true;
-				var _didIteratorError2 = false;
-				var _iteratorError2 = undefined;
-
-				try {
-					for (var _iterator2 = roleOverwrites.concat(memberOverwrites)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var overwrite = _step2.value;
-
-						permissions = permissions & ~overwrite.deny;
-						permissions = permissions | overwrite.allow;
-					}
-				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return) {
-							_iterator2.return();
-						}
-					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
-						}
-					}
-				}
-
-				return new ChannelPermissions(permissions);
-			} else {
-				return null;
+	ServerChannel.prototype.permissionsOf = function permissionsOf(user) {
+		user = this.client.internal.resolver.resolveUser(user);
+		if (user) {
+			if (this.server.owner.equals(user)) {
+				return new ChannelPermissions(4294967295);
 			}
+			var everyoneRole = this.server.roles.get("name", "@everyone");
+
+			var userRoles = [everyoneRole].concat(this.server.rolesOf(user) || []);
+			var userRolesID = userRoles.map(function (v) {
+				return v.id;
+			});
+			var roleOverwrites = [],
+			    memberOverwrites = [];
+
+			this.permissionOverwrites.forEach(function (overwrite) {
+				if (overwrite.type === "member" && overwrite.id === user.id) {
+					memberOverwrites.push(overwrite);
+				} else if (overwrite.type === "role" && overwrite.id in userRolesID) {
+					roleOverwrites.push(overwrite);
+				}
+			});
+
+			var permissions = 0;
+
+			for (var _iterator = userRoles, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+				var _ref;
+
+				if (_isArray) {
+					if (_i >= _iterator.length) break;
+					_ref = _iterator[_i++];
+				} else {
+					_i = _iterator.next();
+					if (_i.done) break;
+					_ref = _i.value;
+				}
+
+				var serverRole = _ref;
+
+				permissions |= serverRole.permissions;
+			}
+
+			for (var _iterator2 = roleOverwrites.concat(memberOverwrites), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+				var _ref2;
+
+				if (_isArray2) {
+					if (_i2 >= _iterator2.length) break;
+					_ref2 = _iterator2[_i2++];
+				} else {
+					_i2 = _iterator2.next();
+					if (_i2.done) break;
+					_ref2 = _i2.value;
+				}
+
+				var overwrite = _ref2;
+
+				permissions = permissions & ~overwrite.deny;
+				permissions = permissions | overwrite.allow;
+			}
+
+			return new ChannelPermissions(permissions);
+		} else {
+			return null;
 		}
-	}, {
-		key: "permsOf",
-		value: function permsOf(user) {
-			return this.permissionsOf(user);
-		}
-	}, {
-		key: "mention",
-		value: function mention() {
-			return "<#" + this.id + ">";
-		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.mention();
-		}
-	}, {
-		key: "setName",
-		value: function setName() {
-			return this.client.setChannelName.apply(this.client, reg(this, arguments));
-		}
-	}]);
+	};
+
+	ServerChannel.prototype.permsOf = function permsOf(user) {
+		return this.permissionsOf(user);
+	};
+
+	ServerChannel.prototype.mention = function mention() {
+		return "<#" + this.id + ">";
+	};
+
+	ServerChannel.prototype.toString = function toString() {
+		return this.mention();
+	};
+
+	ServerChannel.prototype.setName = function setName() {
+		return this.client.setChannelName.apply(this.client, reg(this, arguments));
+	};
 
 	return ServerChannel;
 })(Channel);
diff --git a/lib/Structures/TextChannel.js b/lib/Structures/TextChannel.js
index e90eecc4c..181d20354 100644
--- a/lib/Structures/TextChannel.js
+++ b/lib/Structures/TextChannel.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var ServerChannel = require("./ServerChannel.js");
@@ -18,42 +16,36 @@ var TextChannel = (function (_ServerChannel) {
 	function TextChannel(data, client, server) {
 		_classCallCheck(this, TextChannel);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(TextChannel).call(this, data, client, server));
+		_ServerChannel.call(this, data, client, server);
 
-		_this.topic = data.topic;
-		_this.lastMessageID = data.last_message_id;
-		_this.messages = new Cache("id", client.options.maximumMessages);
-		return _this;
+		this.topic = data.topic;
+		this.lastMessageID = data.last_message_id;
+		this.messages = new Cache("id", client.options.maximumMessages);
 	}
 
 	/* warning! may return null */
 
+	TextChannel.prototype.setTopic = function setTopic() {
+		return this.client.setTopic.apply(this.client, reg(this, arguments));
+	};
+
+	TextChannel.prototype.setNameAndTopic = function setNameAndTopic() {
+		return this.client.setChannelNameAndTopic.apply(this.client, reg(this, arguments));
+	};
+
+	TextChannel.prototype.update = function update() {
+		return this.client.updateChannel.apply(this.client, reg(this, arguments));
+	};
+
+	TextChannel.prototype.sendMessage = function sendMessage() {
+		return this.client.sendMessage.apply(this.client, reg(this, arguments));
+	};
+
+	TextChannel.prototype.sendTTSMessage = function sendTTSMessage() {
+		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
+	};
+
 	_createClass(TextChannel, [{
-		key: "setTopic",
-		value: function setTopic() {
-			return this.client.setTopic.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "setNameAndTopic",
-		value: function setNameAndTopic() {
-			return this.client.setChannelNameAndTopic.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "update",
-		value: function update() {
-			return this.client.updateChannel.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "sendMessage",
-		value: function sendMessage() {
-			return this.client.sendMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
-		key: "sendTTSMessage",
-		value: function sendTTSMessage() {
-			return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
-		}
-	}, {
 		key: "lastMessage",
 		get: function get() {
 			return this.messages.get("id", this.lastMessageID);
diff --git a/lib/Structures/User.js b/lib/Structures/User.js
index cd9fe5b47..3815089ee 100644
--- a/lib/Structures/User.js
+++ b/lib/Structures/User.js
@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Equality = require("../Util/Equality.js");
@@ -17,38 +15,33 @@ var User = (function (_Equality) {
 	function User(data, client) {
 		_classCallCheck(this, User);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(User).call(this));
-
-		_this.client = client;
-		_this.username = data.username;
-		_this.discriminator = data.discriminator;
-		_this.id = data.id;
-		_this.avatar = data.avatar;
-		_this.status = data.status || "offline";
-		_this.gameID = data.game_id || null;
-		_this.typing = {
+		_Equality.call(this);
+		this.client = client;
+		this.username = data.username;
+		this.discriminator = data.discriminator;
+		this.id = data.id;
+		this.avatar = data.avatar;
+		this.status = data.status || "offline";
+		this.gameID = data.game_id || null;
+		this.typing = {
 			since: null,
 			channel: null
 		};
-		return _this;
 	}
 
+	User.prototype.mention = function mention() {
+		return "<@" + this.id + ">";
+	};
+
+	User.prototype.toString = function toString() {
+		return this.mention();
+	};
+
+	User.prototype.equalsStrict = function equalsStrict(obj) {
+		if (obj instanceof User) return this.id === obj.id && this.username === obj.username && this.discriminator === obj.discriminator && this.avatar === obj.avatar && this.status === obj.status && this.gameID === obj.gameID;else return false;
+	};
+
 	_createClass(User, [{
-		key: "mention",
-		value: function mention() {
-			return "<@" + this.id + ">";
-		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.mention();
-		}
-	}, {
-		key: "equalsStrict",
-		value: function equalsStrict(obj) {
-			if (obj instanceof User) return this.id === obj.id && this.username === obj.username && this.discriminator === obj.discriminator && this.avatar === obj.avatar && this.status === obj.status && this.gameID === obj.gameID;else return false;
-		}
-	}, {
 		key: "avatarURL",
 		get: function get() {
 			if (!this.avatar) {
diff --git a/lib/Structures/VoiceChannel.js b/lib/Structures/VoiceChannel.js
index 92eed4f7c..333786b58 100644
--- a/lib/Structures/VoiceChannel.js
+++ b/lib/Structures/VoiceChannel.js
@@ -2,8 +2,6 @@
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var ServerChannel = require("./ServerChannel.js");
@@ -14,7 +12,7 @@ var VoiceChannel = (function (_ServerChannel) {
 	function VoiceChannel(data, client, server) {
 		_classCallCheck(this, VoiceChannel);
 
-		return _possibleConstructorReturn(this, Object.getPrototypeOf(VoiceChannel).call(this, data, client, server));
+		_ServerChannel.call(this, data, client, server);
 	}
 
 	return VoiceChannel;
diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index b3d3547ad..a5d978624 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -1,11 +1,7 @@
 "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"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var Cache = (function (_Array) {
@@ -14,115 +10,95 @@ var Cache = (function (_Array) {
 	function Cache(discrim, limit) {
 		_classCallCheck(this, Cache);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Cache).call(this));
-
-		_this.discrim = discrim || "id";
-		return _this;
+		_Array.call(this);
+		this.discrim = discrim || "id";
 	}
 
-	_createClass(Cache, [{
-		key: "get",
-		value: function get(key, value) {
-			var found = null;
-			this.forEach(function (val, index, array) {
-				if (val.hasOwnProperty(key) && val[key] == value) {
-					found = val;
-					return;
-				}
-			});
-			return found;
-		}
-	}, {
-		key: "has",
-		value: function has(key, value) {
-			return !!this.get(key, value);
-		}
-	}, {
-		key: "getAll",
-		value: function getAll(key, value) {
-			var found = new Cache(this.discrim);
-			this.forEach(function (val, index, array) {
-				if (val.hasOwnProperty(key) && val[key] == value) {
-					found.push(val);
-					return;
-				}
-			});
-			return found;
-		}
-	}, {
-		key: "add",
-		value: function add(data) {
-			var exit = false;
-			var _iteratorNormalCompletion = true;
-			var _didIteratorError = false;
-			var _iteratorError = undefined;
+	Cache.prototype.get = function get(key, value) {
+		var found = null;
+		this.forEach(function (val, index, array) {
+			if (val.hasOwnProperty(key) && val[key] == value) {
+				found = val;
+				return;
+			}
+		});
+		return found;
+	};
 
-			try {
-				for (var _iterator = this[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var item = _step.value;
+	Cache.prototype.has = function has(key, value) {
+		return !!this.get(key, value);
+	};
 
-					if (item[this.discrim] === data[this.discrim]) {
-						exit = item;
-						break;
-					}
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return) {
-						_iterator.return();
-					}
-				} finally {
-					if (_didIteratorError) {
-						throw _iteratorError;
-					}
-				}
+	Cache.prototype.getAll = function getAll(key, value) {
+		var found = new Cache(this.discrim);
+		this.forEach(function (val, index, array) {
+			if (val.hasOwnProperty(key) && val[key] == value) {
+				found.push(val);
+				return;
+			}
+		});
+		return found;
+	};
+
+	Cache.prototype.add = function add(data) {
+		var exit = false;
+		for (var _iterator = this, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+			var _ref;
+
+			if (_isArray) {
+				if (_i >= _iterator.length) break;
+				_ref = _iterator[_i++];
+			} else {
+				_i = _iterator.next();
+				if (_i.done) break;
+				_ref = _i.value;
 			}
 
-			if (exit) {
-				return exit;
-			} else {
-				if (this.limit && this.length >= this.limit) {
-					this.splice(0, 1);
-				}
-				this.push(data);
-				return data;
+			var item = _ref;
+
+			if (item[this.discrim] === data[this.discrim]) {
+				exit = item;
+				break;
 			}
 		}
-	}, {
-		key: "update",
-		value: function update(old, data) {
-			var item = this.get(this.discrim, old[this.discrim]);
-			if (item) {
-				var index = this.indexOf(item);
-				this[index] = data;
-				return this[index];
-			} else {
-				return false;
+		if (exit) {
+			return exit;
+		} else {
+			if (this.limit && this.length >= this.limit) {
+				this.splice(0, 1);
 			}
+			this.push(data);
+			return data;
 		}
-	}, {
-		key: "random",
-		value: function random() {
-			return this[Math.floor(Math.random() * this.length)];
-		}
-	}, {
-		key: "remove",
-		value: function remove(data) {
-			var index = this.indexOf(data);
-			if (~index) {
-				this.splice(index, 1);
-			} else {
-				var item = this.get(this.discrim, data[this.discrim]);
-				if (item) {
-					this.splice(this.indexOf(item), 1);
-				}
-			}
+	};
+
+	Cache.prototype.update = function update(old, data) {
+		var item = this.get(this.discrim, old[this.discrim]);
+		if (item) {
+			var index = this.indexOf(item);
+			this[index] = data;
+			return this[index];
+		} else {
 			return false;
 		}
-	}]);
+	};
+
+	Cache.prototype.random = function random() {
+		return this[Math.floor(Math.random() * this.length)];
+	};
+
+	Cache.prototype.remove = function remove(data) {
+		var index = this.indexOf(data);
+		if (~index) {
+			this.splice(index, 1);
+		} else {
+			var item = this.get(this.discrim, data[this.discrim]);
+			if (item) {
+				this.splice(this.indexOf(item), 1);
+			}
+		}
+		return false;
+	};
 
 	return Cache;
 })(Array);
diff --git a/lib/Util/Equality.js b/lib/Util/Equality.js
index 145d3dbe7..3288d530a 100644
--- a/lib/Util/Equality.js
+++ b/lib/Util/Equality.js
@@ -1,9 +1,3 @@
-"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"); } }
-
 /*
 	The Equality Class is just used to show
 	that a Class has an ID that can be used to
@@ -15,27 +9,30 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 	Instead, use objectThatExtendsEquality.equals()
 */
+"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 Equality = (function () {
 	function Equality() {
 		_classCallCheck(this, Equality);
 	}
 
+	Equality.prototype.equals = function equals(object) {
+		if (object && object[this.eqDiscriminator] == this[this.eqDiscriminator]) {
+			return true;
+		}
+		return false;
+	};
+
+	Equality.prototype.equalsStrict = function equalsStrict(object) {
+		// override per class type
+		return;
+	};
+
 	_createClass(Equality, [{
-		key: "equals",
-		value: function equals(object) {
-			if (object && object[this.eqDiscriminator] == this[this.eqDiscriminator]) {
-				return true;
-			}
-			return false;
-		}
-	}, {
-		key: "equalsStrict",
-		value: function equalsStrict(object) {
-			// override per class type
-			return;
-		}
-	}, {
 		key: "eqDiscriminator",
 		get: function get() {
 			return "id";
diff --git a/lib/Voice/AudioEncoder.js b/lib/Voice/AudioEncoder.js
index 976ae2e37..517a7cf68 100644
--- a/lib/Voice/AudioEncoder.js
+++ b/lib/Voice/AudioEncoder.js
@@ -1,7 +1,5 @@
 "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 cpoc = require("child_process");
@@ -24,120 +22,106 @@ var AudioEncoder = (function () {
 		this.choice = false;
 	}
 
-	_createClass(AudioEncoder, [{
-		key: "opusBuffer",
-		value: function opusBuffer(buffer) {
+	AudioEncoder.prototype.opusBuffer = function opusBuffer(buffer) {
 
-			return this.opus.encode(buffer, 1920);
-		}
-	}, {
-		key: "getCommand",
-		value: function getCommand(force) {
+		return this.opus.encode(buffer, 1920);
+	};
 
-			if (this.choice && force) return choice;
+	AudioEncoder.prototype.getCommand = function getCommand(force) {
 
-			var choices = ["avconv", "ffmpeg"];
+		if (this.choice && force) return choice;
 
-			var _iteratorNormalCompletion = true;
-			var _didIteratorError = false;
-			var _iteratorError = undefined;
+		var choices = ["avconv", "ffmpeg"];
 
-			try {
-				for (var _iterator = choices[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var choice = _step.value;
+		for (var _iterator = choices, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+			var _ref;
 
-					var p = cpoc.spawnSync(choice);
-					if (!p.error) {
-						this.choice = choice;
-						return choice;
-					}
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return) {
-						_iterator.return();
-					}
-				} finally {
-					if (_didIteratorError) {
-						throw _iteratorError;
-					}
-				}
+			if (_isArray) {
+				if (_i >= _iterator.length) break;
+				_ref = _iterator[_i++];
+			} else {
+				_i = _iterator.next();
+				if (_i.done) break;
+				_ref = _i.value;
 			}
 
-			return "help";
+			var choice = _ref;
+
+			var p = cpoc.spawnSync(choice);
+			if (!p.error) {
+				this.choice = choice;
+				return choice;
+			}
 		}
-	}, {
-		key: "encodeStream",
-		value: function encodeStream(stream) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
-				"-af", "volume=1", "pipe:1", "-i", "-"]);
+		return "help";
+	};
 
-				stream.pipe(enc.stdin);
+	AudioEncoder.prototype.encodeStream = function encodeStream(stream) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
 
-				enc.stdout.once("readable", function () {
-					callback(null, {
-						proc: enc,
-						stream: enc.stdout,
-						instream: stream
-					});
-					resolve({
-						proc: enc,
-						stream: enc.stdout,
-						instream: stream
-					});
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
+			"-af", "volume=1", "pipe:1", "-i", "-"]);
+
+			stream.pipe(enc.stdin);
+
+			enc.stdout.once("readable", function () {
+				callback(null, {
+					proc: enc,
+					stream: enc.stdout,
+					instream: stream
 				});
-
-				enc.stdout.on("end", function () {
-					callback("end");
-					reject("end");
-				});
-
-				enc.stdout.on("close", function () {
-					callback("close");
-					reject("close");
+				resolve({
+					proc: enc,
+					stream: enc.stdout,
+					instream: stream
 				});
 			});
-		}
-	}, {
-		key: "encodeFile",
-		value: function encodeFile(file) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
-				"-af", "volume=1", "pipe:1", "-i", file]);
+			enc.stdout.on("end", function () {
+				callback("end");
+				reject("end");
+			});
 
-				enc.stdout.once("readable", function () {
-					callback(null, {
-						proc: enc,
-						stream: enc.stdout
-					});
-					resolve({
-						proc: enc,
-						stream: enc.stdout
-					});
+			enc.stdout.on("close", function () {
+				callback("close");
+				reject("close");
+			});
+		});
+	};
+
+	AudioEncoder.prototype.encodeFile = function encodeFile(file) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
+			"-af", "volume=1", "pipe:1", "-i", file]);
+
+			enc.stdout.once("readable", function () {
+				callback(null, {
+					proc: enc,
+					stream: enc.stdout
 				});
-
-				enc.stdout.on("end", function () {
-					callback("end");
-					reject("end");
-				});
-
-				enc.stdout.on("close", function () {
-					callback("close");
-					reject("close");
+				resolve({
+					proc: enc,
+					stream: enc.stdout
 				});
 			});
-		}
-	}]);
+
+			enc.stdout.on("end", function () {
+				callback("end");
+				reject("end");
+			});
+
+			enc.stdout.on("close", function () {
+				callback("close");
+				reject("close");
+			});
+		});
+	};
 
 	return AudioEncoder;
 })();
diff --git a/lib/Voice/StreamIntent.js b/lib/Voice/StreamIntent.js
index f77ecb54f..97953194c 100644
--- a/lib/Voice/StreamIntent.js
+++ b/lib/Voice/StreamIntent.js
@@ -1,11 +1,8 @@
-"use strict"
+"use strict";
 // represents an intent of streaming music
-;
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var EventEmitter = require("events");
@@ -16,7 +13,7 @@ var StreamIntent = (function (_EventEmitter) {
 	function StreamIntent() {
 		_classCallCheck(this, StreamIntent);
 
-		return _possibleConstructorReturn(this, Object.getPrototypeOf(StreamIntent).call(this));
+		_EventEmitter.call(this);
 	}
 
 	return StreamIntent;
diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js
index 14faa5c0b..9af846704 100644
--- a/lib/Voice/VoiceConnection.js
+++ b/lib/Voice/VoiceConnection.js
@@ -1,4 +1,4 @@
-"use strict"
+"use strict";
 /*
 	Major credit to izy521 who is the creator of
 	https://github.com/izy521/discord.io,
@@ -7,14 +7,8 @@
 	been possible!
 */
 
-;
-
-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"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var WebSocket = require("ws");
@@ -32,320 +26,306 @@ var VoiceConnection = (function (_EventEmitter) {
 	function VoiceConnection(channel, client, session, token, server, endpoint) {
 		_classCallCheck(this, VoiceConnection);
 
-		var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(VoiceConnection).call(this));
-
-		_this.id = channel.id;
-		_this.voiceChannel = channel;
-		_this.client = client;
-		_this.session = session;
-		_this.token = token;
-		_this.server = server;
-		_this.endpoint = endpoint.replace(":80", "");
-		_this.vWS = null; // vWS means voice websocket
-		_this.ready = false;
-		_this.vWSData = {};
-		_this.encoder = new AudioEncoder();
-		_this.udp = null;
-		_this.playingIntent = null;
-		_this.playing = false;
-		_this.streamTime = 0;
-		_this.streamProc = null;
-		_this.KAI = null;
-		_this.init();
-		return _this;
+		_EventEmitter.call(this);
+		this.id = channel.id;
+		this.voiceChannel = channel;
+		this.client = client;
+		this.session = session;
+		this.token = token;
+		this.server = server;
+		this.endpoint = endpoint.replace(":80", "");
+		this.vWS = null; // vWS means voice websocket
+		this.ready = false;
+		this.vWSData = {};
+		this.encoder = new AudioEncoder();
+		this.udp = null;
+		this.playingIntent = null;
+		this.playing = false;
+		this.streamTime = 0;
+		this.streamProc = null;
+		this.KAI = null;
+		this.init();
 	}
 
-	_createClass(VoiceConnection, [{
-		key: "destroy",
-		value: function destroy() {
-			this.stopPlaying();
-			if (this.KAI) clearInterval(this.KAI);
-			this.vWS.close();
-			this.udp.close();
-			this.client.internal.sendWS({
-				op: 4,
-				d: {
-					guild_id: null,
-					channel_id: null,
-					self_mute: true,
-					self_deaf: false
-				}
-			});
-		}
-	}, {
-		key: "stopPlaying",
-		value: function stopPlaying() {
-			this.playing = false;
-			this.playingIntent = null;
-			if (this.instream) {
-				this.instream.end();
-				this.instream.destroy();
+	VoiceConnection.prototype.destroy = function destroy() {
+		this.stopPlaying();
+		if (this.KAI) clearInterval(this.KAI);
+		this.vWS.close();
+		this.udp.close();
+		this.client.internal.sendWS({
+			op: 4,
+			d: {
+				guild_id: null,
+				channel_id: null,
+				self_mute: true,
+				self_deaf: false
 			}
+		});
+	};
+
+	VoiceConnection.prototype.stopPlaying = function stopPlaying() {
+		this.playing = false;
+		this.playingIntent = null;
+		if (this.instream) {
+			this.instream.end();
+			this.instream.destroy();
 		}
-	}, {
-		key: "playStream",
-		value: function playStream(stream) {
+	};
 
-			var self = this;
+	VoiceConnection.prototype.playStream = function playStream(stream) {
 
-			var startTime = Date.now();
-			var sequence = 0;
-			var time = 0;
-			var count = 0;
+		var self = this;
 
-			var length = 20;
+		var startTime = Date.now();
+		var sequence = 0;
+		var time = 0;
+		var count = 0;
 
-			if (self.playingIntent) {
-				self.stopPlaying();
+		var length = 20;
+
+		if (self.playingIntent) {
+			self.stopPlaying();
+		}
+		self.playing = true;
+		var retStream = new StreamIntent();
+		var onWarning = false;
+		self.playingIntent = retStream;
+
+		function send() {
+
+			if (!self.playingIntent || !self.playing) {
+				self.setSpeaking(false);
+				retStream.emit("end");
+				self;
+				return;
 			}
-			self.playing = true;
-			var retStream = new StreamIntent();
-			var onWarning = false;
-			self.playingIntent = retStream;
-
-			function send() {
-
-				if (!self.playingIntent || !self.playing) {
-					self.setSpeaking(false);
-					retStream.emit("end");
-					self;
+			try {
+				var buffer = stream.read(1920);
+				if (!buffer) {
+					setTimeout(send, length * 10); // give chance for some data in 200ms to appear
 					return;
 				}
-				try {
-					var buffer = stream.read(1920);
-					if (!buffer) {
+
+				if (buffer.length !== 1920) {
+					if (onWarning) {
+						retStream.emit("end");
+						stream.destroy();
+						self.setSpeaking(false);
+						return;
+					} else {
+						onWarning = true;
 						setTimeout(send, length * 10); // give chance for some data in 200ms to appear
 						return;
 					}
-
-					if (buffer.length !== 1920) {
-						if (onWarning) {
-							retStream.emit("end");
-							stream.destroy();
-							self.setSpeaking(false);
-							return;
-						} else {
-							onWarning = true;
-							setTimeout(send, length * 10); // give chance for some data in 200ms to appear
-							return;
-						}
-					}
-
-					count++;
-					sequence + 10 < 65535 ? sequence += 1 : sequence = 0;
-					time + 9600 < 4294967295 ? time += 960 : time = 0;
-
-					self.sendBuffer(buffer, sequence, time, function (e) {});
-
-					var nextTime = startTime + count * length;
-
-					self.streamTime = count * length;
-
-					setTimeout(send, length + (nextTime - Date.now()));
-
-					if (!self.playing) self.setSpeaking(true);
-
-					retStream.emit("time", self.streamTime);
-				} catch (e) {
-					retStream.emit("error", e);
 				}
-			}
-			self.setSpeaking(true);
-			send();
 
-			return retStream;
-		}
-	}, {
-		key: "setSpeaking",
-		value: function setSpeaking(value) {
-			this.playing = value;
-			if (this.vWS.readyState === WebSocket.OPEN) this.vWS.send(JSON.stringify({
-				op: 5,
-				d: {
-					speaking: value,
-					delay: 0
-				}
-			}));
-		}
-	}, {
-		key: "sendPacket",
-		value: function sendPacket(packet) {
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+				count++;
+				sequence + 10 < 65535 ? sequence += 1 : sequence = 0;
+				time + 9600 < 4294967295 ? time += 960 : time = 0;
 
-			var self = this;
-			self.playing = true;
-			try {
-				if (self.vWS.readyState === WebSocket.OPEN) self.udp.send(packet, 0, packet.length, self.vWSData.port, self.endpoint, callback);
+				self.sendBuffer(buffer, sequence, time, function (e) {});
+
+				var nextTime = startTime + count * length;
+
+				self.streamTime = count * length;
+
+				setTimeout(send, length + (nextTime - Date.now()));
+
+				if (!self.playing) self.setSpeaking(true);
+
+				retStream.emit("time", self.streamTime);
 			} catch (e) {
+				retStream.emit("error", e);
+			}
+		}
+		self.setSpeaking(true);
+		send();
+
+		return retStream;
+	};
+
+	VoiceConnection.prototype.setSpeaking = function setSpeaking(value) {
+		this.playing = value;
+		if (this.vWS.readyState === WebSocket.OPEN) this.vWS.send(JSON.stringify({
+			op: 5,
+			d: {
+				speaking: value,
+				delay: 0
+			}
+		}));
+	};
+
+	VoiceConnection.prototype.sendPacket = function sendPacket(packet) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+
+		var self = this;
+		self.playing = true;
+		try {
+			if (self.vWS.readyState === WebSocket.OPEN) self.udp.send(packet, 0, packet.length, self.vWSData.port, self.endpoint, callback);
+		} catch (e) {
+			self.playing = false;
+			callback(e);
+			return false;
+		}
+	};
+
+	VoiceConnection.prototype.sendBuffer = function sendBuffer(rawbuffer, sequence, timestamp, callback) {
+		var self = this;
+		self.playing = true;
+		try {
+			if (!self.encoder.opus) {
 				self.playing = false;
+				self.emit("error", "No Opus!");
+				self.client.emit("debug", "Tried to use node-opus, but opus not available - install it!");
+				return;
+			}
+			var buffer = self.encoder.opusBuffer(rawbuffer);
+			var packet = new VoicePacket(buffer, sequence, timestamp, self.vWSData.ssrc);
+			return self.sendPacket(packet, callback);
+		} catch (e) {
+			self.playing = false;
+			self.emit("error", e);
+			return false;
+		}
+	};
+
+	VoiceConnection.prototype.test = function test() {
+		this.playFile("C:/users/amish/desktop/audio.mp3").then(function (stream) {
+			stream.on("time", function (time) {
+				console.log("Time", time);
+			});
+		});
+	};
+
+	VoiceConnection.prototype.playFile = function playFile(stream) {
+		var _this = this;
+
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			_this.encoder.encodeFile(stream)["catch"](error).then(function (data) {
+				self.streamProc = data.proc;
+				var intent = self.playStream(data.stream);
+				resolve(intent);
+				callback(null, intent);
+			});
+			function error() {
+				var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
+
+				reject(e);
 				callback(e);
-				return false;
 			}
-		}
-	}, {
-		key: "sendBuffer",
-		value: function sendBuffer(rawbuffer, sequence, timestamp, callback) {
-			var self = this;
-			self.playing = true;
-			try {
-				if (!self.encoder.opus) {
-					self.playing = false;
-					self.emit("error", "No Opus!");
-					self.client.emit("debug", "Tried to use node-opus, but opus not available - install it!");
-					return;
-				}
-				var buffer = self.encoder.opusBuffer(rawbuffer);
-				var packet = new VoicePacket(buffer, sequence, timestamp, self.vWSData.ssrc);
-				return self.sendPacket(packet, callback);
-			} catch (e) {
-				self.playing = false;
-				self.emit("error", e);
-				return false;
+		});
+	};
+
+	VoiceConnection.prototype.playRawStream = function playRawStream(stream) {
+		var _this2 = this;
+
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			_this2.encoder.encodeStream(stream)["catch"](error).then(function (data) {
+				self.streamProc = data.proc;
+				self.instream = data.instream;
+				var intent = self.playStream(data.stream);
+				resolve(intent);
+				callback(null, intent);
+			});
+			function error() {
+				var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
+
+				reject(e);
+				callback(e);
 			}
-		}
-	}, {
-		key: "test",
-		value: function test() {
-			this.playFile("C:/users/amish/desktop/audio.mp3").then(function (stream) {
-				stream.on("time", function (time) {
-					console.log("Time", time);
-				});
-			});
-		}
-	}, {
-		key: "playFile",
-		value: function playFile(stream) {
-			var _this2 = this;
+		});
+	};
 
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
+	VoiceConnection.prototype.init = function init() {
+		var _this3 = this;
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				_this2.encoder.encodeFile(stream).catch(error).then(function (data) {
-					self.streamProc = data.proc;
-					var intent = self.playStream(data.stream);
-					resolve(intent);
-					callback(null, intent);
-				});
-				function error() {
-					var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
+		var self = this;
+		dns.lookup(this.endpoint, function (err, address, family) {
+			self.endpoint = address;
+			var vWS = self.vWS = new WebSocket("wss://" + _this3.endpoint, null, { rejectUnauthorized: false });
+			var udpClient = self.udp = udp.createSocket("udp4");
 
-					reject(e);
-					callback(e);
-				}
-			});
-		}
-	}, {
-		key: "playRawStream",
-		value: function playRawStream(stream) {
-			var _this3 = this;
+			var firstPacket = true;
 
-			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
+			var discordIP = "",
+			    discordPort = "";
 
-			var self = this;
-			return new Promise(function (resolve, reject) {
-				_this3.encoder.encodeStream(stream).catch(error).then(function (data) {
-					self.streamProc = data.proc;
-					self.instream = data.instream;
-					var intent = self.playStream(data.stream);
-					resolve(intent);
-					callback(null, intent);
-				});
-				function error() {
-					var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
+			udpClient.bind({ exclusive: true });
+			udpClient.on('message', function (msg, rinfo) {
+				var buffArr = JSON.parse(JSON.stringify(msg)).data;
+				if (firstPacket === true) {
+					for (var i = 4; i < buffArr.indexOf(0, i); i++) {
+						discordIP += String.fromCharCode(buffArr[i]);
+					}
+					discordPort = msg.readUIntLE(msg.length - 2, 2).toString(10);
 
-					reject(e);
-					callback(e);
-				}
-			});
-		}
-	}, {
-		key: "init",
-		value: function init() {
-			var _this4 = this;
-
-			var self = this;
-			dns.lookup(this.endpoint, function (err, address, family) {
-				self.endpoint = address;
-				var vWS = self.vWS = new WebSocket("wss://" + _this4.endpoint, null, { rejectUnauthorized: false });
-				var udpClient = self.udp = udp.createSocket("udp4");
-
-				var firstPacket = true;
-
-				var discordIP = "",
-				    discordPort = "";
-
-				udpClient.bind({ exclusive: true });
-				udpClient.on('message', function (msg, rinfo) {
-					var buffArr = JSON.parse(JSON.stringify(msg)).data;
-					if (firstPacket === true) {
-						for (var i = 4; i < buffArr.indexOf(0, i); i++) {
-							discordIP += String.fromCharCode(buffArr[i]);
-						}
-						discordPort = msg.readUIntLE(msg.length - 2, 2).toString(10);
-
-						var wsDiscPayload = {
-							"op": 1,
-							"d": {
-								"protocol": "udp",
-								"data": {
-									"address": discordIP,
-									"port": Number(discordPort),
-									"mode": self.vWSData.modes[0] //Plain
-								}
+					var wsDiscPayload = {
+						"op": 1,
+						"d": {
+							"protocol": "udp",
+							"data": {
+								"address": discordIP,
+								"port": Number(discordPort),
+								"mode": self.vWSData.modes[0] //Plain
 							}
-						};
-						vWS.send(JSON.stringify(wsDiscPayload));
-						firstPacket = false;
-					}
-				});
-
-				vWS.on("open", function () {
-					vWS.send(JSON.stringify({
-						op: 0,
-						d: {
-							server_id: self.server.id,
-							user_id: self.client.internal.user.id,
-							session_id: self.session,
-							token: self.token
 						}
-					}));
-				});
-
-				var KAI;
-
-				vWS.on("message", function (msg) {
-					var data = JSON.parse(msg);
-					switch (data.op) {
-						case 2:
-							self.vWSData = data.d;
-
-							KAI = setInterval(function () {
-								if (vWS && vWS.readyState === WebSocket.OPEN) vWS.send(JSON.stringify({
-									op: 3,
-									d: null
-								}));
-							}, data.d.heartbeat_interval);
-							self.KAI = KAI;
-
-							var udpPacket = new Buffer(70);
-							udpPacket.writeUIntBE(data.d.ssrc, 0, 4);
-							udpClient.send(udpPacket, 0, udpPacket.length, data.d.port, self.endpoint, function (err) {
-								if (err) self.emit("error", err);
-							});
-							break;
-						case 4:
-
-							self.ready = true;
-							self.mode = data.d.mode;
-							self.emit("ready", self);
-
-							break;
-					}
-				});
+					};
+					vWS.send(JSON.stringify(wsDiscPayload));
+					firstPacket = false;
+				}
 			});
-		}
-	}]);
+
+			vWS.on("open", function () {
+				vWS.send(JSON.stringify({
+					op: 0,
+					d: {
+						server_id: self.server.id,
+						user_id: self.client.internal.user.id,
+						session_id: self.session,
+						token: self.token
+					}
+				}));
+			});
+
+			var KAI;
+
+			vWS.on("message", function (msg) {
+				var data = JSON.parse(msg);
+				switch (data.op) {
+					case 2:
+						self.vWSData = data.d;
+
+						KAI = setInterval(function () {
+							if (vWS && vWS.readyState === WebSocket.OPEN) vWS.send(JSON.stringify({
+								op: 3,
+								d: null
+							}));
+						}, data.d.heartbeat_interval);
+						self.KAI = KAI;
+
+						var udpPacket = new Buffer(70);
+						udpPacket.writeUIntBE(data.d.ssrc, 0, 4);
+						udpClient.send(udpPacket, 0, udpPacket.length, data.d.port, self.endpoint, function (err) {
+							if (err) self.emit("error", err);
+						});
+						break;
+					case 4:
+
+						self.ready = true;
+						self.mode = data.d.mode;
+						self.emit("ready", self);
+
+						break;
+				}
+			});
+		});
+	};
 
 	return VoiceConnection;
 })(EventEmitter);
diff --git a/package.json b/package.json
index 59dc9c508..5e0f353f8 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-es2015-loose": "^6.1.2",
     "grunt": "~0.4.5",
-    "grunt-babel": "^5.0.1",
+    "grunt-babel": "<6.0.0",
     "grunt-browserify": "^4.0.0",
     "grunt-contrib-uglify": "^0.9.2",
     "load-grunt-tasks": "^3.2.0"