diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 95c321163..7606560da 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -19,7 +19,7 @@
 			"isBuildCommand": true,
 			"isWatching": true,
 			"args": [
-				"src", "--out-dir", "lib", "-w"
+				"src", "--out-dir", "lib", "-w", "--loose=all"
 			]
 		}
 	]
diff --git a/lib/ChannelPermissions.js b/lib/ChannelPermissions.js
index e5fe374b5..5193b5938 100644
--- a/lib/ChannelPermissions.js
+++ b/lib/ChannelPermissions.js
@@ -1,2 +1,180 @@
-"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 ChannelPermissions=(function(){function ChannelPermissions(data,channel){_classCallCheck(this,ChannelPermissions);var self=this;function getBit(x){return (self.packed >>> x & 1) === 1;}this.type = data.type; //either member or role
-this.id = data.id;if(this.type === "member"){this.packed = channel.server.getMember("id",data.id).evalPerms.packed;}else {this.packed = channel.server.getRole(data.id).packed;}this.packed = this.packed & ~data.deny;this.packed = this.packed | data.allow;this.deny = data.deny;this.allow = data.allow;}ChannelPermissions.prototype.getBit = function getBit(x){return (this.packed >>> x & 1) === 1;};ChannelPermissions.prototype.setBit = function setBit(){};_createClass(ChannelPermissions,[{key:"createInstantInvite",get:function get(){return this.getBit(0);},set:function set(val){this.setBit(0,val);}},{key:"manageRoles",get:function get(){return this.getBit(3);},set:function set(val){this.setBit(3,val);}},{key:"manageChannels",get:function get(){return this.getBit(4);},set:function set(val){this.setBit(4,val);}},{key:"readMessages",get:function get(){return this.getBit(10);},set:function set(val){this.setBit(10,val);}},{key:"sendMessages",get:function get(){return this.getBit(11);},set:function set(val){this.setBit(11,val);}},{key:"sendTTSMessages",get:function get(){return this.getBit(12);},set:function set(val){this.setBit(12,val);}},{key:"manageMessages",get:function get(){return this.getBit(13);},set:function set(val){this.setBit(13,val);}},{key:"embedLinks",get:function get(){return this.getBit(14);},set:function set(val){this.setBit(14,val);}},{key:"attachFiles",get:function get(){return this.getBit(15);},set:function set(val){this.setBit(15,val);}},{key:"readMessageHistory",get:function get(){return this.getBit(16);},set:function set(val){this.setBit(16,val);}},{key:"mentionEveryone",get:function get(){return this.getBit(17);},set:function set(val){this.setBit(17,val);}},{key:"voiceConnect",get:function get(){return this.getBit(20);},set:function set(val){this.setBit(20,val);}},{key:"voiceSpeak",get:function get(){return this.getBit(21);},set:function set(val){this.setBit(21,val);}},{key:"voiceMuteMembers",get:function get(){return this.getBit(22);},set:function set(val){this.setBit(22,val);}},{key:"voiceDeafenMembers",get:function get(){return this.getBit(23);},set:function set(val){this.setBit(23,val);}},{key:"voiceMoveMembers",get:function get(){return this.getBit(24);},set:function set(val){this.setBit(24,val);}},{key:"voiceUseVoiceActivation",get:function get(){return this.getBit(25);},set:function set(val){this.setBit(25,val);}}]);return ChannelPermissions;})();module.exports = ChannelPermissions;
+"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 ChannelPermissions = (function () {
+	function ChannelPermissions(data, channel) {
+		_classCallCheck(this, ChannelPermissions);
+
+		var self = this;
+
+		function getBit(x) {
+			return (self.packed >>> x & 1) === 1;
+		}
+
+		this.type = data.type; //either member or role
+		this.id = data.id;
+
+		if (this.type === "member") {
+			this.packed = channel.server.getMember("id", data.id).evalPerms.packed;
+		} else {
+			this.packed = channel.server.getRole(data.id).packed;
+		}
+
+		this.packed = this.packed & ~data.deny;
+		this.packed = this.packed | data.allow;
+
+		this.deny = data.deny;
+		this.allow = data.allow;
+	}
+
+	ChannelPermissions.prototype.getBit = function getBit(x) {
+		return (this.packed >>> x & 1) === 1;
+	};
+
+	ChannelPermissions.prototype.setBit = function setBit() {};
+
+	_createClass(ChannelPermissions, [{
+		key: "createInstantInvite",
+		get: function get() {
+			return this.getBit(0);
+		},
+		set: function set(val) {
+			this.setBit(0, val);
+		}
+	}, {
+		key: "manageRoles",
+		get: function get() {
+			return this.getBit(3);
+		},
+		set: function set(val) {
+			this.setBit(3, val);
+		}
+	}, {
+		key: "manageChannels",
+		get: function get() {
+			return this.getBit(4);
+		},
+		set: function set(val) {
+			this.setBit(4, val);
+		}
+	}, {
+		key: "readMessages",
+		get: function get() {
+			return this.getBit(10);
+		},
+		set: function set(val) {
+			this.setBit(10, val);
+		}
+	}, {
+		key: "sendMessages",
+		get: function get() {
+			return this.getBit(11);
+		},
+		set: function set(val) {
+			this.setBit(11, val);
+		}
+	}, {
+		key: "sendTTSMessages",
+		get: function get() {
+			return this.getBit(12);
+		},
+		set: function set(val) {
+			this.setBit(12, val);
+		}
+	}, {
+		key: "manageMessages",
+		get: function get() {
+			return this.getBit(13);
+		},
+		set: function set(val) {
+			this.setBit(13, val);
+		}
+	}, {
+		key: "embedLinks",
+		get: function get() {
+			return this.getBit(14);
+		},
+		set: function set(val) {
+			this.setBit(14, val);
+		}
+	}, {
+		key: "attachFiles",
+		get: function get() {
+			return this.getBit(15);
+		},
+		set: function set(val) {
+			this.setBit(15, val);
+		}
+	}, {
+		key: "readMessageHistory",
+		get: function get() {
+			return this.getBit(16);
+		},
+		set: function set(val) {
+			this.setBit(16, val);
+		}
+	}, {
+		key: "mentionEveryone",
+		get: function get() {
+			return this.getBit(17);
+		},
+		set: function set(val) {
+			this.setBit(17, val);
+		}
+	}, {
+		key: "voiceConnect",
+		get: function get() {
+			return this.getBit(20);
+		},
+		set: function set(val) {
+			this.setBit(20, val);
+		}
+	}, {
+		key: "voiceSpeak",
+		get: function get() {
+			return this.getBit(21);
+		},
+		set: function set(val) {
+			this.setBit(21, val);
+		}
+	}, {
+		key: "voiceMuteMembers",
+		get: function get() {
+			return this.getBit(22);
+		},
+		set: function set(val) {
+			this.setBit(22, val);
+		}
+	}, {
+		key: "voiceDeafenMembers",
+		get: function get() {
+			return this.getBit(23);
+		},
+		set: function set(val) {
+			this.setBit(23, val);
+		}
+	}, {
+		key: "voiceMoveMembers",
+		get: function get() {
+			return this.getBit(24);
+		},
+		set: function set(val) {
+			this.setBit(24, val);
+		}
+	}, {
+		key: "voiceUseVoiceActivation",
+		get: function get() {
+			return this.getBit(25);
+		},
+		set: function set(val) {
+			this.setBit(25, val);
+		}
+	}]);
+
+	return ChannelPermissions;
+})();
+
+module.exports = ChannelPermissions;
\ No newline at end of file
diff --git a/lib/Client.js b/lib/Client.js
index 335061bd6..fc69385e9 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -1,75 +1,1681 @@
 //discord.js modules
-"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 Endpoints=require("./Endpoints.js");var User=require("./user.js");var Server=require("./server.js");var Channel=require("./channel.js");var Message=require("./message.js");var Invite=require("./invite.js");var PMChannel=require("./PMChannel.js");var gameMap=require("../ref/gameMap.json"); //node modules
-var request=require("superagent");var WebSocket=require("ws");var fs=require("fs");var defaultOptions={queue:false};var Client=(function(){function Client(){var options=arguments.length <= 0 || arguments[0] === undefined?defaultOptions:arguments[0];var token=arguments.length <= 1 || arguments[1] === undefined?undefined:arguments[1];_classCallCheck(this,Client); /*
-			When created, if a token is specified the Client will
-			try connecting with it. If the token is incorrect, no
-			further efforts will be made to connect.
-		*/this.options = options;this.options.queue = this.options.queue;this.token = token;this.state = 0;this.websocket = null;this.events = {};this.user = null;this.alreadySentData = false;this.serverCreateListener = {};this.typingIntervals = {};this.email = "abc";this.password = "abc"; /*
-			State values:
-			0 - idle
-			1 - logging in
-			2 - logged in
-			3 - ready
-			4 - disconnected
-		*/this.userCache = [];this.channelCache = [];this.serverCache = [];this.pmChannelCache = [];this.readyTime = null;this.checkingQueue = {};this.userTypingListener = {};this.queue = {};this.__idleTime = null;this.__gameId = null;}Client.prototype.sendPacket = function sendPacket(JSONObject){if(this.websocket.readyState === 1){this.websocket.send(JSON.stringify(JSONObject));}}; //def debug
-Client.prototype.debug = function debug(message){this.trigger("debug",message);};Client.prototype.on = function on(event,fn){this.events[event] = fn;};Client.prototype.off = function off(event){this.events[event] = null;};Client.prototype.keepAlive = function keepAlive(){this.debug("keep alive triggered");this.sendPacket({op:1,d:Date.now()});}; //def trigger
-Client.prototype.trigger = function trigger(event){var args=[];for(var arg in arguments) {args.push(arguments[arg]);}var evt=this.events[event];if(evt){evt.apply(this,args.slice(1));}}; //def login
-Client.prototype.login = function login(){var email=arguments.length <= 0 || arguments[0] === undefined?"foo@bar.com":arguments[0];var password=arguments.length <= 1 || arguments[1] === undefined?"pass1234":arguments[1];var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,token){}:arguments[2];var self=this;return new Promise(function(resolve,reject){if(self.state === 0 || self.state === 4){self.state = 1; //set the state to logging in
-self.email = email;self.password = password;request.post(Endpoints.LOGIN).send({email:email,password:password}).end(function(err,res){if(err){self.state = 4; //set state to disconnected
-self.trigger("disconnected");if(self.websocket){self.websocket.close();}callback(err);reject(err);}else {self.state = 2; //set state to logged in (not yet ready)
-self.token = res.body.token; //set our token
-self.getGateway().then(function(url){self.createws(url);callback(null,self.token);resolve(self.token);})["catch"](function(err){callback(err);reject(err);});}});}else {reject(new Error("Client already logging in or ready"));}});};Client.prototype.logout = function logout(){var callback=arguments.length <= 0 || arguments[0] === undefined?function(err){}:arguments[0];var self=this;return new Promise(function(resolve,reject){request.post(Endpoints.LOGOUT).set("authorization",self.token).end(function(err,res){if(err){callback(err);reject(err);}else {self.websocket.close();self.state = 4;callback();resolve();}});});};Client.prototype.createServer = function createServer(name,region){var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,server){}:arguments[2];var self=this;return new Promise(function(resolve,reject){request.post(Endpoints.SERVERS).set("authorization",self.token).send({name:name,region:region}).end(function(err,res){if(err){callback(err);reject(err);}else { // potentially redundant in future
-// creating here does NOT give us the channels of the server
-// so we must wait for the guild_create event.
-self.serverCreateListener[res.body.id] = [resolve,callback]; /*var srv = self.addServer(res.body);
-						callback(null, srv);
-						resolve(srv);*/}});});};Client.prototype.createChannel = function createChannel(server,channelName,channelType){var callback=arguments.length <= 3 || arguments[3] === undefined?function(err,chann){}:arguments[3];var self=this;return new Promise(function(resolve,reject){request.post(Endpoints.SERVERS + "/" + self.resolveServerID(server) + "/channels").set("authorization",self.token).send({name:channelName,type:channelType}).end(function(err,res){if(err){callback(err);reject(err);}else {var server=self.getServer("id",res.body.guild_id);var chann=self.addChannel(res.body,res.body.guild_id);server.addChannel(chann);callback(null,chann);resolve(chann);}});});};Client.prototype.leaveServer = function leaveServer(server){var callback=arguments.length <= 1 || arguments[1] === undefined?function(err,server){}:arguments[1];var self=this;return new Promise(function(resolve,reject){request.del(Endpoints.SERVERS + "/" + self.resolveServerID(server)).set("authorization",self.token).end(function(err,res){if(err){callback(err);reject(err);}else {self.serverCache.splice(self.serverCache.indexOf(server),1);callback(null);resolve();}});});};Client.prototype.createInvite = function createInvite(serverOrChannel,options){var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,invite){}:arguments[2];var self=this;return new Promise(function(resolve,reject){var destination;if(serverOrChannel instanceof Server){destination = serverOrChannel.id;}else if(serverOrChannel instanceof Channel){destination = serverOrChannel.id;}else {destination = serverOrChannel;}options = options || {};options.max_age = options.maxAge || 0;options.max_uses = options.maxUses || 0;options.temporary = options.temporary || false;options.xkcdpass = options.xkcd || false;request.post(Endpoints.CHANNELS + "/" + destination + "/invites").set("authorization",self.token).send(options).end(function(err,res){if(err){callback(err);reject(err);}else {var inv=new Invite(res.body,self);callback(null,inv);resolve(inv);}});});};Client.prototype.startPM = function startPM(user){var self=this;return new Promise(function(resolve,reject){var userId=user;if(user instanceof User){userId = user.id;}request.post(Endpoints.USERS + "/" + self.user.id + "/channels").set("authorization",self.token).send({recipient_id:userId}).end(function(err,res){if(err){reject(err);}else {resolve(self.addPMChannel(res.body));}});});};Client.prototype.reply = function reply(destination,message,tts){var callback=arguments.length <= 3 || arguments[3] === undefined?function(err,msg){}:arguments[3];var self=this;return new Promise(function(response,reject){if(typeof tts === "function"){ // tts is a function, which means the developer wants this to be the callback
-callback = tts;tts = false;}var user=destination.sender;self.sendMessage(destination,message,tts,callback,user + ", ").then(response)["catch"](reject);});};Client.prototype.deleteMessage = function deleteMessage(message,timeout){var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,msg){}:arguments[2];var self=this;return new Promise(function(resolve,reject){if(timeout){setTimeout(remove,timeout);}else {remove();}function remove(){request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization",self.token).end(function(err,res){if(err){bad();}else {good();}});}function good(){callback();resolve();}function bad(err){callback(err);reject(err);}});};Client.prototype.updateMessage = function updateMessage(message,content){var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,msg){}:arguments[2];var self=this;var prom=new Promise(function(resolve,reject){content = content instanceof Array?content.join("\n"):content;if(self.options.queue){if(!self.queue[message.channel.id]){self.queue[message.channel.id] = [];}self.queue[message.channel.id].push({action:"updateMessage",message:message,content:content,then:good,error:bad});self.checkQueue(message.channel.id);}else {self._updateMessage(message,content).then(good)["catch"](bad);}function good(msg){prom.message = msg;callback(null,msg);resolve(msg);}function bad(error){prom.error = error;callback(error);reject(error);}});return prom;};Client.prototype.setUsername = function setUsername(newName){var callback=arguments.length <= 1 || arguments[1] === undefined?function(err){}:arguments[1];var self=this;return new Promise(function(resolve,reject){request.patch(Endpoints.API + "/users/@me").set("authorization",self.token).send({avatar:self.user.avatar,email:self.email,new_password:null,password:self.password,username:newName}).end(function(err){callback(err);if(err)reject(err);else resolve();});});};Client.prototype.getChannelLogs = function getChannelLogs(channel){var amount=arguments.length <= 1 || arguments[1] === undefined?500:arguments[1];var callback=arguments.length <= 2 || arguments[2] === undefined?function(err,logs){}:arguments[2];var self=this;return new Promise(function(resolve,reject){var channelID=channel;if(channel instanceof Channel){channelID = channel.id;}request.get(Endpoints.CHANNELS + "/" + channelID + "/messages?limit=" + amount).set("authorization",self.token).end(function(err,res){if(err){callback(err);reject(err);}else {var logs=[];var channel=self.getChannel("id",channelID);for(var _iterator=res.body,_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 message=_ref;var mentions=[];for(var _iterator2=message.mentions,_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 mention=_ref2;mentions.push(self.addUser(mention));}var author=self.addUser(message.author);logs.push(new Message(message,channel,mentions,author));}callback(null,logs);resolve(logs);}});});};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){var channelID=channel;if(channel instanceof Channel){channelID = channel.id;}request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization",self.token).end(function(err){if(err){callback(err);reject(err);}else {callback(null);resolve();}});});};Client.prototype.joinServer = function joinServer(invite){var callback=arguments.length <= 1 || arguments[1] === undefined?function(err,server){}:arguments[1];var self=this;return new Promise(function(resolve,reject){var id=invite instanceof Invite?invite.code:invite;request.post(Endpoints.API + "/invite/" + id).set("authorization",self.token).end(function(err,res){if(err){callback(err);reject(err);}else {if(self.getServer("id",res.body.guild.id)){resolve(self.getServer("id",res.body.guild.id));}else {self.serverCreateListener[res.body.guild.id] = [resolve,callback];}}});});};Client.prototype.sendFile = function sendFile(destination,file){var fileName=arguments.length <= 2 || arguments[2] === undefined?"image.png":arguments[2];var callback=arguments.length <= 3 || arguments[3] === undefined?function(err,msg){}:arguments[3];var self=this;var prom=new Promise(function(resolve,reject){var fstream;if(typeof file === "string" || file instanceof String){fstream = fs.createReadStream(file);fileName = file;}else {fstream = file;}self.resolveDestination(destination).then(send)["catch"](bad);function send(destination){if(self.options.queue){ //queue send file too
-if(!self.queue[destination]){self.queue[destination] = [];}self.queue[destination].push({action:"sendFile",attachment:fstream,attachmentName:fileName,then:good,error:bad});self.checkQueue(destination);}else { //not queue
-self._sendFile(destination,fstream,fileName).then(good)["catch"](bad);}}function good(msg){prom.message = msg;callback(null,msg);resolve(msg);}function bad(err){prom.error = err;callback(err);reject(err);}});return prom;};Client.prototype.sendMessage = function sendMessage(destination,message,tts){var callback=arguments.length <= 3 || arguments[3] === undefined?function(err,msg){}:arguments[3];var premessage=arguments.length <= 4 || arguments[4] === undefined?"":arguments[4];var self=this;var prom=new Promise(function(resolve,reject){if(typeof tts === "function"){ // tts is a function, which means the developer wants this to be the callback
-callback = tts;tts = false;}message = premessage + resolveMessage(message);var mentions=resolveMentions();self.resolveDestination(destination).then(send)["catch"](error);function error(err){callback(err);reject(err);}function send(destination){if(self.options.queue){ //we're QUEUEING messages, so sending them sequentially based on servers.
-if(!self.queue[destination]){self.queue[destination] = [];}self.queue[destination].push({action:"sendMessage",content:message,mentions:mentions,tts:!!tts, //incase it's not a boolean
-then:mgood,error:mbad});self.checkQueue(destination);}else {self._sendMessage(destination,message,tts,mentions).then(mgood)["catch"](mbad);}}function mgood(msg){prom.message = msg;callback(null,msg);resolve(msg);}function mbad(error){prom.error = error;callback(error);reject(error);}function resolveMessage(){var msg=message;if(message instanceof Array){msg = message.join("\n");}return msg;}function resolveMentions(){var _mentions=[];for(var _iterator3=message.match(/<@[^>]*>/g) || [],_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 mention=_ref3;_mentions.push(mention.substring(2,mention.length - 1));}return _mentions;}});return prom;}; //def createws
-Client.prototype.createws = function createws(url){if(this.websocket)return false;var self=this; //good to go
-this.websocket = new WebSocket(url); //open
-this.websocket.onopen = function(){self.trySendConnData(); //try connecting
-}; //close
-this.websocket.onclose = function(){self.trigger("disconnected");}; //message
-this.websocket.onmessage = function(e){var dat=false,data={};try{dat = JSON.parse(e.data);data = dat.d;}catch(err) {self.trigger("error",err,e);return;}self.trigger("raw",dat); //valid message
-switch(dat.t){case "READY":self.debug("received ready packet");self.user = self.addUser(data.user);for(var _iterator4=data.guilds,_isArray4=Array.isArray(_iterator4),_i4=0,_iterator4=_isArray4?_iterator4:_iterator4[Symbol.iterator]();;) {var _ref4;if(_isArray4){if(_i4 >= _iterator4.length)break;_ref4 = _iterator4[_i4++];}else {_i4 = _iterator4.next();if(_i4.done)break;_ref4 = _i4.value;}var _server=_ref4;var server=self.addServer(_server);}for(var _iterator5=data.private_channels,_isArray5=Array.isArray(_iterator5),_i5=0,_iterator5=_isArray5?_iterator5:_iterator5[Symbol.iterator]();;) {var _ref5;if(_isArray5){if(_i5 >= _iterator5.length)break;_ref5 = _iterator5[_i5++];}else {_i5 = _iterator5.next();if(_i5.done)break;_ref5 = _i5.value;}var _pmc=_ref5;var pmc=self.addPMChannel(_pmc);}self.trigger("ready");self.readyTime = Date.now();self.debug("cached " + self.serverCache.length + " servers, " + self.channelCache.length + " channels, " + self.pmChannelCache.length + " PMs and " + self.userCache.length + " users.");self.state = 3;setInterval(function(){self.keepAlive.apply(self);},data.heartbeat_interval);break;case "MESSAGE_CREATE":self.debug("received message");var mentions=[];data.mentions = data.mentions || []; //for some reason this was not defined at some point?
-for(var _iterator6=data.mentions,_isArray6=Array.isArray(_iterator6),_i6=0,_iterator6=_isArray6?_iterator6:_iterator6[Symbol.iterator]();;) {var _ref6;if(_isArray6){if(_i6 >= _iterator6.length)break;_ref6 = _iterator6[_i6++];}else {_i6 = _iterator6.next();if(_i6.done)break;_ref6 = _i6.value;}var mention=_ref6;mentions.push(self.addUser(mention));}var channel=self.getChannel("id",data.channel_id);if(channel){var msg=channel.addMessage(new Message(data,channel,mentions,self.addUser(data.author)));self.trigger("message",msg);}break;case "MESSAGE_DELETE":self.debug("message deleted");var channel=self.getChannel("id",data.channel_id);var message=channel.getMessage("id",data.id);if(message){self.trigger("messageDelete",channel,message);channel.messages.splice(channel.messages.indexOf(message),1);}else { //don't have the cache of that message ;(
-self.trigger("messageDelete",channel);}break;case "MESSAGE_UPDATE":self.debug("message updated");var channel=self.getChannel("id",data.channel_id);var formerMessage=channel.getMessage("id",data.id);if(formerMessage){ //new message might be partial, so we need to fill it with whatever the old message was.
-var info={};for(var key in formerMessage) {info[key] = formerMessage[key];}for(var key in data) {info[key] = data[key];}var mentions=[];for(var _iterator7=info.mentions,_isArray7=Array.isArray(_iterator7),_i7=0,_iterator7=_isArray7?_iterator7:_iterator7[Symbol.iterator]();;) {var _ref7;if(_isArray7){if(_i7 >= _iterator7.length)break;_ref7 = _iterator7[_i7++];}else {_i7 = _iterator7.next();if(_i7.done)break;_ref7 = _i7.value;}var mention=_ref7;mentions.push(self.addUser(mention));}var newMessage=new Message(info,channel,mentions,formerMessage.author);self.trigger("messageUpdate",newMessage,formerMessage);channel.messages[channel.messages.indexOf(formerMessage)] = newMessage;} // message isn't in cache, and if it's a partial it could cause
-// all hell to break loose... best to just act as if nothing happened
-break;case "GUILD_DELETE":var server=self.getServer("id",data.id);if(server){self.serverCache.splice(self.serverCache.indexOf(server),1);self.trigger("serverDelete",server);}break;case "CHANNEL_DELETE":var channel=self.getChannel("id",data.id);if(channel){var server=channel.server;if(server){server.channels.splice(server.channels.indexOf(channel),1);}self.trigger("channelDelete",channel);self.serverCache.splice(self.serverCache.indexOf(channel),1);}break;case "GUILD_CREATE":var server=self.getServer("id",data.id);if(!server){ //if server doesn't already exist because duh
-server = self.addServer(data);} /*else if(server.channels.length === 0){
-						
-						var srv = new Server(data, self);
-						for(channel of data.channels){
-							srv.channels.push(new Channel(channel, data.id));
+"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 Endpoints = require("./Endpoints.js");
+var User = require("./user.js");
+var Server = require("./server.js");
+var Channel = require("./channel.js");
+var Message = require("./message.js");
+var Invite = require("./invite.js");
+var PMChannel = require("./PMChannel.js");
+
+var gameMap = require("../ref/gameMap.json");
+
+//node modules
+var request = require("superagent");
+var WebSocket = require("ws");
+var fs = require("fs");
+
+var defaultOptions = {
+	queue: false
+};
+
+var Client = (function () {
+	function Client() {
+		var options = arguments.length <= 0 || arguments[0] === undefined ? defaultOptions : arguments[0];
+		var token = arguments.length <= 1 || arguments[1] === undefined ? undefined : arguments[1];
+
+		_classCallCheck(this, Client);
+
+		/*
+  	When created, if a token is specified the Client will
+  	try connecting with it. If the token is incorrect, no
+  	further efforts will be made to connect.
+  */
+		this.options = options;
+		this.options.queue = this.options.queue;
+		this.token = token;
+		this.state = 0;
+		this.websocket = null;
+		this.events = {};
+		this.user = null;
+		this.alreadySentData = false;
+		this.serverCreateListener = {};
+		this.typingIntervals = {};
+		this.email = "abc";
+		this.password = "abc";
+
+		/*
+  	State values:
+  	0 - idle
+  	1 - logging in
+  	2 - logged in
+  	3 - ready
+  	4 - disconnected
+  */
+
+		this.userCache = [];
+		this.channelCache = [];
+		this.serverCache = [];
+		this.pmChannelCache = [];
+		this.readyTime = null;
+		this.checkingQueue = {};
+		this.userTypingListener = {};
+		this.queue = {};
+
+		this.__idleTime = null;
+		this.__gameId = null;
+	}
+
+	Client.prototype.sendPacket = function sendPacket(JSONObject) {
+		if (this.websocket.readyState === 1) {
+			this.websocket.send(JSON.stringify(JSONObject));
+		}
+	};
+
+	//def debug
+
+	Client.prototype.debug = function debug(message) {
+		this.trigger("debug", message);
+	};
+
+	Client.prototype.on = function on(event, fn) {
+		this.events[event] = fn;
+	};
+
+	Client.prototype.off = function off(event) {
+		this.events[event] = null;
+	};
+
+	Client.prototype.keepAlive = function keepAlive() {
+		this.debug("keep alive triggered");
+		this.sendPacket({
+			op: 1,
+			d: Date.now()
+		});
+	};
+
+	//def trigger
+
+	Client.prototype.trigger = function trigger(event) {
+		var args = [];
+		for (var arg in arguments) {
+			args.push(arguments[arg]);
+		}
+		var evt = this.events[event];
+		if (evt) {
+			evt.apply(this, args.slice(1));
+		}
+	};
+
+	//def login
+
+	Client.prototype.login = function login() {
+		var email = arguments.length <= 0 || arguments[0] === undefined ? "foo@bar.com" : arguments[0];
+		var password = arguments.length <= 1 || arguments[1] === undefined ? "pass1234" : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, token) {} : arguments[2];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			if (self.state === 0 || self.state === 4) {
+
+				self.state = 1; //set the state to logging in
+
+				self.email = email;
+				self.password = password;
+
+				request.post(Endpoints.LOGIN).send({
+					email: email,
+					password: password
+				}).end(function (err, res) {
+
+					if (err) {
+						self.state = 4; //set state to disconnected
+						self.trigger("disconnected");
+						if (self.websocket) {
+							self.websocket.close();
 						}
-						self.serverCache[self.serverCache.indexOf(server)] = srv;
-						
-					}*/if(self.serverCreateListener[data.id]){var cbs=self.serverCreateListener[data.id];cbs[0](server); //promise then callback
-cbs[1](null,server); //legacy callback
-self.serverCreateListener[data.id] = null;}self.trigger("serverCreate",server);break;case "CHANNEL_CREATE":var channel=self.getChannel("id",data.id);if(!channel){var chann;if(data.is_private){chann = self.addPMChannel(data);}else {chann = self.addChannel(data,data.guild_id);}var srv=self.getServer("id",data.guild_id);if(srv){srv.addChannel(chann);}self.trigger("channelCreate",chann);}break;case "GUILD_MEMBER_ADD":var server=self.getServer("id",data.guild_id);if(server){var user=self.addUser(data.user); //if for whatever reason it doesn't exist..
-self.trigger("serverNewMember",server.addMember(user,data.roles),server);}break;case "GUILD_MEMBER_REMOVE":var server=self.getServer("id",data.guild_id);if(server){var user=self.addUser(data.user); //if for whatever reason it doesn't exist..
-server.removeMember("id",user.id);self.trigger("serverRemoveMember",user,server);}break;case "USER_UPDATE":if(self.user && data.id === self.user.id){var newUser=new User(data); //not actually adding to the cache
-self.trigger("userUpdate",newUser,self.user);if(~self.userCache.indexOf(self.user)){self.userCache[self.userCache.indexOf(self.user)] = newUser;}self.user = newUser;}break;case "PRESENCE_UPDATE":var userInCache=self.getUser("id",data.user.id);if(userInCache){ //user exists
-data.user.username = data.user.username || userInCache.username;data.user.id = data.user.id || userInCache.id;data.user.discriminator = data.user.discriminator || userInCache.discriminator;data.user.avatar = data.user.avatar || userInCache.avatar;var presenceUser=new User(data.user);if(presenceUser.equalsStrict(userInCache)){ //they're exactly the same, an actual presence update
-self.trigger("presence",{user:userInCache,oldStatus:userInCache.status,status:data.status,server:self.getServer("id",data.guild_id),gameId:data.game_id});userInCache.status = data.status;userInCache.gameId = data.game_id;}else { //one of their details changed.
-self.userCache[self.userCache.indexOf(userInCache)] = presenceUser;self.trigger("userUpdate",userInCache,presenceUser);}}break;case "CHANNEL_UPDATE":var channelInCache=self.getChannel("id",data.id),serverInCache=self.getServer("id",data.guild_id);if(channelInCache && serverInCache){var newChann=new Channel(data,serverInCache);newChann.messages = channelInCache.messages;self.trigger("channelUpdate",channelInCache,newChann);self.channelCache[self.channelCache.indexOf(channelInCache)] = newChann;}break;case "TYPING_START":var userInCache=self.getUser("id",data.user_id);var channelInCache=self.getChannel("id",data.channel_id);if(!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1){self.trigger("startTyping",userInCache,channelInCache);}self.userTypingListener[data.user_id] = Date.now();setTimeout(function(){if(self.userTypingListener[data.user_id] === -1){return;}if(Date.now() - self.userTypingListener[data.user_id] > 6000){ // stopped typing
-self.trigger("stopTyping",userInCache,channelInCache);self.userTypingListener[data.user_id] = -1;}},6000);break;case "GUILD_ROLE_DELETE":var server=self.getServer("id",data.guild_id);var role=server.getRole(data.role_id);self.trigger("serverRoleDelete",server,role);server.removeRole(role.id);break;case "GUILD_ROLE_UPDATE":var server=self.getServer("id",data.guild_id);var role=server.getRole(data.role.id);var newRole=server.updateRole(data.role);self.trigger("serverRoleUpdate",server,role,newRole);break;default:self.debug("received unknown packet");self.trigger("unknown",dat);break;}};}; //def addUser
-Client.prototype.addUser = function addUser(data){if(!this.getUser("id",data.id)){this.userCache.push(new User(data));}return this.getUser("id",data.id);}; //def addChannel
-Client.prototype.addChannel = function addChannel(data,serverId){if(!this.getChannel("id",data.id)){this.channelCache.push(new Channel(data,this.getServer("id",serverId)));}return this.getChannel("id",data.id);};Client.prototype.addPMChannel = function addPMChannel(data){if(!this.getPMChannel("id",data.id)){this.pmChannelCache.push(new PMChannel(data,this));}return this.getPMChannel("id",data.id);};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){self.resolveDestination(channel).then(next)["catch"](error);function error(e){callback(e);reject(e);}function next(destination){var asChan=self.getChannel("id",destination);request.patch(Endpoints.CHANNELS + "/" + destination).set("authorization",self.token).send({name:asChan.name,position:0,topic:topic}).end(function(err,res){if(err){error(err);}else {asChan.topic = res.body.topic;resolve();callback();}});}});}; //def addServer
-Client.prototype.addServer = function addServer(data){var self=this;var server=this.getServer("id",data.id);if(data.unavailable){self.trigger("unavailable",data);self.debug("Server ID " + data.id + " has been marked unavailable by Discord. It was not cached.");return;}if(!server){server = new Server(data,this);this.serverCache.push(server);if(data.channels){for(var _iterator8=data.channels,_isArray8=Array.isArray(_iterator8),_i8=0,_iterator8=_isArray8?_iterator8:_iterator8[Symbol.iterator]();;) {var _ref8;if(_isArray8){if(_i8 >= _iterator8.length)break;_ref8 = _iterator8[_i8++];}else {_i8 = _iterator8.next();if(_i8.done)break;_ref8 = _i8.value;}var channel=_ref8;server.channels.push(this.addChannel(channel,server.id));}}}for(var _iterator9=data.presences,_isArray9=Array.isArray(_iterator9),_i9=0,_iterator9=_isArray9?_iterator9:_iterator9[Symbol.iterator]();;) {var _ref9;if(_isArray9){if(_i9 >= _iterator9.length)break;_ref9 = _iterator9[_i9++];}else {_i9 = _iterator9.next();if(_i9.done)break;_ref9 = _i9.value;}var presence=_ref9;var user=self.getUser("id",presence.user.id);user.status = presence.status;user.gameId = presence.game_id;}return server;}; //def getUser
-Client.prototype.getUser = function getUser(key,value){for(var _iterator10=this.userCache,_isArray10=Array.isArray(_iterator10),_i10=0,_iterator10=_isArray10?_iterator10:_iterator10[Symbol.iterator]();;) {var _ref10;if(_isArray10){if(_i10 >= _iterator10.length)break;_ref10 = _iterator10[_i10++];}else {_i10 = _iterator10.next();if(_i10.done)break;_ref10 = _i10.value;}var user=_ref10;if(user[key] === value){return user;}}return null;}; //def getChannel
-Client.prototype.getChannel = function getChannel(key,value){for(var _iterator11=this.channelCache,_isArray11=Array.isArray(_iterator11),_i11=0,_iterator11=_isArray11?_iterator11:_iterator11[Symbol.iterator]();;) {var _ref11;if(_isArray11){if(_i11 >= _iterator11.length)break;_ref11 = _iterator11[_i11++];}else {_i11 = _iterator11.next();if(_i11.done)break;_ref11 = _i11.value;}var channel=_ref11;if(channel[key] === value){return channel;}}return this.getPMChannel(key,value); //might be a PM
-};Client.prototype.getPMChannel = function getPMChannel(key,value){for(var _iterator12=this.pmChannelCache,_isArray12=Array.isArray(_iterator12),_i12=0,_iterator12=_isArray12?_iterator12:_iterator12[Symbol.iterator]();;) {var _ref12;if(_isArray12){if(_i12 >= _iterator12.length)break;_ref12 = _iterator12[_i12++];}else {_i12 = _iterator12.next();if(_i12.done)break;_ref12 = _i12.value;}var channel=_ref12;if(channel[key] === value){return channel;}}return null;}; //def getServer
-Client.prototype.getServer = function getServer(key,value){for(var _iterator13=this.serverCache,_isArray13=Array.isArray(_iterator13),_i13=0,_iterator13=_isArray13?_iterator13:_iterator13[Symbol.iterator]();;) {var _ref13;if(_isArray13){if(_i13 >= _iterator13.length)break;_ref13 = _iterator13[_i13++];}else {_i13 = _iterator13.next();if(_i13.done)break;_ref13 = _i13.value;}var server=_ref13;if(server[key] === value){return server;}}return null;}; //def trySendConnData
-Client.prototype.trySendConnData = function trySendConnData(){if(this.token && !this.alreadySentData){this.alreadySentData = true;var data={op:2,d:{token:this.token,v:3,properties:{"$os":"discord.js","$browser":"discord.js","$device":"discord.js","$referrer":"","$referring_domain":""}}};this.websocket.send(JSON.stringify(data));}};Client.prototype.resolveServerID = function resolveServerID(resource){if(resource instanceof Server){return resource.id;}else if(!isNaN(resource) && resource.length && resource.length === 17){return resource;}};Client.prototype.resolveDestination = function resolveDestination(destination){var channId=false;var self=this;return new Promise(function(resolve,reject){if(destination instanceof Server){channId = destination.id; //general is the same as server id
-}else if(destination instanceof Channel){channId = destination.id;}else if(destination instanceof Message){channId = destination.channel.id;}else if(destination instanceof PMChannel){channId = destination.id;}else if(destination instanceof User){ //check if we have a PM
-for(var _iterator14=self.pmChannelCache,_isArray14=Array.isArray(_iterator14),_i14=0,_iterator14=_isArray14?_iterator14:_iterator14[Symbol.iterator]();;) {var _ref14;if(_isArray14){if(_i14 >= _iterator14.length)break;_ref14 = _iterator14[_i14++];}else {_i14 = _iterator14.next();if(_i14.done)break;_ref14 = _i14.value;}var pmc=_ref14;if(pmc.user && pmc.user.equals(destination)){resolve(pmc.id);return;}} //we don't, at this point we're late
-self.startPM(destination).then(function(pmc){resolve(pmc.id);})["catch"](reject);}else {channId = destination;}if(channId)resolve(channId);else reject();});};Client.prototype._sendMessage = function _sendMessage(destination,content,tts,mentions){var self=this;return new Promise(function(resolve,reject){request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization",self.token).send({content:content,mentions:mentions,tts:tts}).end(function(err,res){if(err){reject(err);}else {var data=res.body;var mentions=[];data.mentions = data.mentions || []; //for some reason this was not defined at some point?
-for(var _iterator15=data.mentions,_isArray15=Array.isArray(_iterator15),_i15=0,_iterator15=_isArray15?_iterator15:_iterator15[Symbol.iterator]();;) {var _ref15;if(_isArray15){if(_i15 >= _iterator15.length)break;_ref15 = _iterator15[_i15++];}else {_i15 = _iterator15.next();if(_i15.done)break;_ref15 = _i15.value;}var mention=_ref15;mentions.push(self.addUser(mention));}var channel=self.getChannel("id",data.channel_id);if(channel){var msg=channel.addMessage(new Message(data,channel,mentions,self.addUser(data.author)));resolve(msg);}}});});};Client.prototype._sendFile = function _sendFile(destination,attachment){var attachmentName=arguments.length <= 2 || arguments[2] === undefined?"DEFAULT BECAUSE YOU DIDN'T SPECIFY WHY.png":arguments[2];var self=this;return new Promise(function(resolve,reject){request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization",self.token).attach("file",attachment,attachmentName).end(function(err,res){if(err){reject(err);}else {var chann=self.getChannel("id",destination);if(chann){var msg=chann.addMessage(new Message(res.body,chann,[],self.user));resolve(msg);}}});});};Client.prototype._updateMessage = function _updateMessage(message,content){var self=this;return new Promise(function(resolve,reject){request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization",self.token).send({content:content,mentions:[]}).end(function(err,res){if(err){reject(err);}else {var msg=new Message(res.body,message.channel,message.mentions,message.sender);resolve(msg);message.channel.messages[message.channel.messages.indexOf(message)] = msg;}});});};Client.prototype.getGateway = function getGateway(){var self=this;return new Promise(function(resolve,reject){request.get(Endpoints.API + "/gateway").set("authorization",self.token).end(function(err,res){if(err){reject(err);}else {resolve(res.body.url);}});});};Client.prototype.setStatusIdle = function setStatusIdle(){this.setStatus("idle");};Client.prototype.setStatusOnline = function setStatusOnline(){this.setStatus("online");};Client.prototype.setStatusActive = function setStatusActive(){this.setStatusOnline();};Client.prototype.setStatusHere = function setStatusHere(){this.setStatusOnline();};Client.prototype.setStatusAway = function setStatusAway(){this.setStatusIdle();};Client.prototype.startTyping = function startTyping(chann,stopTypeTime){var self=this;this.resolveDestination(chann).then(next);function next(channel){if(self.typingIntervals[channel]){return;}var fn=function fn(){request.post(Endpoints.CHANNELS + "/" + channel + "/typing").set("authorization",self.token).end();};fn();var interval=setInterval(fn,3000);self.typingIntervals[channel] = interval;if(stopTypeTime){setTimeout(function(){self.stopTyping(channel);},stopTypeTime);}}};Client.prototype.stopTyping = function stopTyping(chann){var self=this;this.resolveDestination(chann).then(next);function next(channel){if(!self.typingIntervals[channel]){return;}clearInterval(self.typingIntervals[channel]);delete self.typingIntervals[channel];}};Client.prototype.setStatus = function setStatus(stat){var idleTime=stat === "online"?null:Date.now();this.__idleTime = idleTime;this.websocket.send(JSON.stringify({op:3,d:{idle_since:this.__idleTime,game_id:this.__gameId}}));};Client.prototype.setPlayingGame = function setPlayingGame(id){if(id instanceof String || typeof id === "string"){ // working on names
-var gid=id.trim().toUpperCase();id = null;for(var _iterator16=gameMap,_isArray16=Array.isArray(_iterator16),_i16=0,_iterator16=_isArray16?_iterator16:_iterator16[Symbol.iterator]();;) {var _ref16;if(_isArray16){if(_i16 >= _iterator16.length)break;_ref16 = _iterator16[_i16++];}else {_i16 = _iterator16.next();if(_i16.done)break;_ref16 = _i16.value;}var game=_ref16;if(game.name.trim().toUpperCase() === gid){id = game.id;break;}}}this.__gameId = id;this.websocket.send(JSON.stringify({op:3,d:{idle_since:this.__idleTime,game_id:this.__gameId}}));};Client.prototype.playGame = function playGame(id){this.setPlayingGame(id);};Client.prototype.playingGame = function playingGame(id){this.setPlayingGame(id);};_createClass(Client,[{key:"uptime",get:function get(){return this.readyTime?Date.now() - this.readyTime:null;}},{key:"ready",get:function get(){return this.state === 3;}},{key:"servers",get:function get(){return this.serverCache;}},{key:"channels",get:function get(){return this.channelCache;}},{key:"users",get:function get(){return this.userCache;}},{key:"PMChannels",get:function get(){return this.pmChannelCache;}},{key:"messages",get:function get(){var msgs=[];for(var _iterator17=this.channelCache,_isArray17=Array.isArray(_iterator17),_i17=0,_iterator17=_isArray17?_iterator17:_iterator17[Symbol.iterator]();;) {var _ref17;if(_isArray17){if(_i17 >= _iterator17.length)break;_ref17 = _iterator17[_i17++];}else {_i17 = _iterator17.next();if(_i17.done)break;_ref17 = _i17.value;}var channel=_ref17;msgs = msgs.concat(channel.messages);}return msgs;}}]);return Client;})();module.exports = Client;
+						callback(err);
+						reject(err);
+					} else {
+						self.state = 2; //set state to logged in (not yet ready)
+						self.token = res.body.token; //set our token
+
+						self.getGateway().then(function (url) {
+							self.createws(url);
+							callback(null, self.token);
+							resolve(self.token);
+						})["catch"](function (err) {
+							callback(err);
+							reject(err);
+						});
+					}
+				});
+			} else {
+				reject(new Error("Client already logging in or ready"));
+			}
+		});
+	};
+
+	Client.prototype.logout = function logout() {
+		var callback = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			request.post(Endpoints.LOGOUT).set("authorization", self.token).end(function (err, res) {
+
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					self.websocket.close();
+					self.state = 4;
+					callback();
+					resolve();
+				}
+			});
+		});
+	};
+
+	Client.prototype.createServer = function createServer(name, region) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, server) {} : arguments[2];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			request.post(Endpoints.SERVERS).set("authorization", self.token).send({
+				name: name,
+				region: region
+			}).end(function (err, res) {
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					// potentially redundant in future
+					// creating here does NOT give us the channels of the server
+					// so we must wait for the guild_create event.
+					self.serverCreateListener[res.body.id] = [resolve, callback];
+					/*var srv = self.addServer(res.body);
+     callback(null, srv);
+     resolve(srv);*/
+				}
+			});
+		});
+	};
+
+	Client.prototype.createChannel = function createChannel(server, channelName, channelType) {
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, chann) {} : arguments[3];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			request.post(Endpoints.SERVERS + "/" + self.resolveServerID(server) + "/channels").set("authorization", self.token).send({
+				name: channelName,
+				type: channelType
+			}).end(function (err, res) {
+
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					var server = self.getServer("id", res.body.guild_id);
+					var chann = self.addChannel(res.body, res.body.guild_id);
+					server.addChannel(chann);
+					callback(null, chann);
+					resolve(chann);
+				}
+			});
+		});
+	};
+
+	Client.prototype.leaveServer = function leaveServer(server) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, server) {} : arguments[1];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			request.del(Endpoints.SERVERS + "/" + self.resolveServerID(server)).set("authorization", self.token).end(function (err, res) {
+
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					self.serverCache.splice(self.serverCache.indexOf(server), 1);
+					callback(null);
+					resolve();
+				}
+			});
+		});
+	};
+
+	Client.prototype.createInvite = function createInvite(serverOrChannel, options) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, invite) {} : arguments[2];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			var destination;
+
+			if (serverOrChannel instanceof Server) {
+				destination = serverOrChannel.id;
+			} else if (serverOrChannel instanceof Channel) {
+				destination = serverOrChannel.id;
+			} else {
+				destination = serverOrChannel;
+			}
+
+			options = options || {};
+			options.max_age = options.maxAge || 0;
+			options.max_uses = options.maxUses || 0;
+			options.temporary = options.temporary || false;
+			options.xkcdpass = options.xkcd || false;
+
+			request.post(Endpoints.CHANNELS + "/" + destination + "/invites").set("authorization", self.token).send(options).end(function (err, res) {
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					var inv = new Invite(res.body, self);
+					callback(null, inv);
+					resolve(inv);
+				}
+			});
+		});
+	};
+
+	Client.prototype.startPM = function startPM(user) {
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			var userId = user;
+			if (user instanceof User) {
+				userId = user.id;
+			}
+			request.post(Endpoints.USERS + "/" + self.user.id + "/channels").set("authorization", self.token).send({
+				recipient_id: userId
+			}).end(function (err, res) {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(self.addPMChannel(res.body));
+				}
+			});
+		});
+	};
+
+	Client.prototype.reply = function reply(destination, message, tts) {
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+
+		var self = this;
+
+		return new Promise(function (response, reject) {
+
+			if (typeof tts === "function") {
+				// tts is a function, which means the developer wants this to be the callback
+				callback = tts;
+				tts = false;
+			}
+
+			var user = destination.sender;
+			self.sendMessage(destination, message, tts, callback, user + ", ").then(response)["catch"](reject);
+		});
+	};
+
+	Client.prototype.deleteMessage = function deleteMessage(message, timeout) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			if (timeout) {
+				setTimeout(remove, timeout);
+			} else {
+				remove();
+			}
+
+			function remove() {
+				request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						bad();
+					} else {
+						good();
+					}
+				});
+			}
+
+			function good() {
+				callback();
+				resolve();
+			}
+
+			function bad(err) {
+				callback(err);
+				reject(err);
+			}
+		});
+	};
+
+	Client.prototype.updateMessage = function updateMessage(message, content) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2];
+
+		var self = this;
+
+		var prom = new Promise(function (resolve, reject) {
+
+			content = content instanceof Array ? content.join("\n") : content;
+
+			if (self.options.queue) {
+				if (!self.queue[message.channel.id]) {
+					self.queue[message.channel.id] = [];
+				}
+				self.queue[message.channel.id].push({
+					action: "updateMessage",
+					message: message,
+					content: content,
+					then: good,
+					error: bad
+				});
+
+				self.checkQueue(message.channel.id);
+			} else {
+				self._updateMessage(message, content).then(good)["catch"](bad);
+			}
+
+			function good(msg) {
+				prom.message = msg;
+				callback(null, msg);
+				resolve(msg);
+			}
+
+			function bad(error) {
+				prom.error = error;
+				callback(error);
+				reject(error);
+			}
+		});
+
+		return prom;
+	};
+
+	Client.prototype.setUsername = function setUsername(newName) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			request.patch(Endpoints.API + "/users/@me").set("authorization", self.token).send({
+				avatar: self.user.avatar,
+				email: self.email,
+				new_password: null,
+				password: self.password,
+				username: newName
+			}).end(function (err) {
+				callback(err);
+				if (err) reject(err);else resolve();
+			});
+		});
+	};
+
+	Client.prototype.getChannelLogs = function getChannelLogs(channel) {
+		var amount = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, logs) {} : arguments[2];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			var channelID = channel;
+			if (channel instanceof Channel) {
+				channelID = channel.id;
+			}
+
+			request.get(Endpoints.CHANNELS + "/" + channelID + "/messages?limit=" + amount).set("authorization", self.token).end(function (err, res) {
+
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					var logs = [];
+
+					var channel = self.getChannel("id", channelID);
+
+					for (var _iterator = res.body, _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 message = _ref;
+
+						var mentions = [];
+						for (var _iterator2 = message.mentions, _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 mention = _ref2;
+
+							mentions.push(self.addUser(mention));
+						}
+
+						var author = self.addUser(message.author);
+
+						logs.push(new Message(message, channel, mentions, author));
+					}
+					callback(null, logs);
+					resolve(logs);
+				}
+			});
+		});
+	};
+
+	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) {
+
+			var channelID = channel;
+			if (channel instanceof Channel) {
+				channelID = channel.id;
+			}
+
+			request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization", self.token).end(function (err) {
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					callback(null);
+					resolve();
+				}
+			});
+		});
+	};
+
+	Client.prototype.joinServer = function joinServer(invite) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, server) {} : arguments[1];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+
+			var id = invite instanceof Invite ? invite.code : invite;
+
+			request.post(Endpoints.API + "/invite/" + id).set("authorization", self.token).end(function (err, res) {
+				if (err) {
+					callback(err);
+					reject(err);
+				} else {
+					if (self.getServer("id", res.body.guild.id)) {
+						resolve(self.getServer("id", res.body.guild.id));
+					} else {
+						self.serverCreateListener[res.body.guild.id] = [resolve, callback];
+					}
+				}
+			});
+		});
+	};
+
+	Client.prototype.sendFile = function sendFile(destination, file) {
+		var fileName = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+
+		var self = this;
+
+		var prom = new Promise(function (resolve, reject) {
+
+			var fstream;
+
+			if (typeof file === "string" || file instanceof String) {
+				fstream = fs.createReadStream(file);
+				fileName = file;
+			} else {
+				fstream = file;
+			}
+
+			self.resolveDestination(destination).then(send)["catch"](bad);
+
+			function send(destination) {
+				if (self.options.queue) {
+					//queue send file too
+					if (!self.queue[destination]) {
+						self.queue[destination] = [];
+					}
+
+					self.queue[destination].push({
+						action: "sendFile",
+						attachment: fstream,
+						attachmentName: fileName,
+						then: good,
+						error: bad
+					});
+
+					self.checkQueue(destination);
+				} else {
+					//not queue
+					self._sendFile(destination, fstream, fileName).then(good)["catch"](bad);
+				}
+			}
+
+			function good(msg) {
+				prom.message = msg;
+				callback(null, msg);
+				resolve(msg);
+			}
+
+			function bad(err) {
+				prom.error = err;
+				callback(err);
+				reject(err);
+			}
+		});
+
+		return prom;
+	};
+
+	Client.prototype.sendMessage = function sendMessage(destination, message, tts) {
+		var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+		var premessage = arguments.length <= 4 || arguments[4] === undefined ? "" : arguments[4];
+
+		var self = this;
+
+		var prom = new Promise(function (resolve, reject) {
+
+			if (typeof tts === "function") {
+				// tts is a function, which means the developer wants this to be the callback
+				callback = tts;
+				tts = false;
+			}
+
+			message = premessage + resolveMessage(message);
+			var mentions = resolveMentions();
+			self.resolveDestination(destination).then(send)["catch"](error);
+
+			function error(err) {
+				callback(err);
+				reject(err);
+			}
+
+			function send(destination) {
+				if (self.options.queue) {
+					//we're QUEUEING messages, so sending them sequentially based on servers.
+					if (!self.queue[destination]) {
+						self.queue[destination] = [];
+					}
+
+					self.queue[destination].push({
+						action: "sendMessage",
+						content: message,
+						mentions: mentions,
+						tts: !!tts, //incase it's not a boolean
+						then: mgood,
+						error: mbad
+					});
+
+					self.checkQueue(destination);
+				} else {
+					self._sendMessage(destination, message, tts, mentions).then(mgood)["catch"](mbad);
+				}
+			}
+
+			function mgood(msg) {
+				prom.message = msg;
+				callback(null, msg);
+				resolve(msg);
+			}
+
+			function mbad(error) {
+				prom.error = error;
+				callback(error);
+				reject(error);
+			}
+
+			function resolveMessage() {
+				var msg = message;
+				if (message instanceof Array) {
+					msg = message.join("\n");
+				}
+				return msg;
+			}
+
+			function resolveMentions() {
+				var _mentions = [];
+				for (var _iterator3 = message.match(/<@[^>]*>/g) || [], _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 mention = _ref3;
+
+					_mentions.push(mention.substring(2, mention.length - 1));
+				}
+				return _mentions;
+			}
+		});
+
+		return prom;
+	};
+
+	//def createws
+
+	Client.prototype.createws = function createws(url) {
+		if (this.websocket) return false;
+
+		var self = this;
+
+		//good to go
+		this.websocket = new WebSocket(url);
+
+		//open
+		this.websocket.onopen = function () {
+			self.trySendConnData(); //try connecting
+		};
+
+		//close
+		this.websocket.onclose = function () {
+			self.trigger("disconnected");
+		};
+
+		//message
+		this.websocket.onmessage = function (e) {
+
+			var dat = false,
+			    data = {};
+
+			try {
+				dat = JSON.parse(e.data);
+				data = dat.d;
+			} catch (err) {
+				self.trigger("error", err, e);
+				return;
+			}
+
+			self.trigger("raw", dat);
+
+			//valid message
+			switch (dat.t) {
+
+				case "READY":
+					self.debug("received ready packet");
+
+					self.user = self.addUser(data.user);
+
+					for (var _iterator4 = data.guilds, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+						var _ref4;
+
+						if (_isArray4) {
+							if (_i4 >= _iterator4.length) break;
+							_ref4 = _iterator4[_i4++];
+						} else {
+							_i4 = _iterator4.next();
+							if (_i4.done) break;
+							_ref4 = _i4.value;
+						}
+
+						var _server = _ref4;
+
+						var server = self.addServer(_server);
+					}
+
+					for (var _iterator5 = data.private_channels, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+						var _ref5;
+
+						if (_isArray5) {
+							if (_i5 >= _iterator5.length) break;
+							_ref5 = _iterator5[_i5++];
+						} else {
+							_i5 = _iterator5.next();
+							if (_i5.done) break;
+							_ref5 = _i5.value;
+						}
+
+						var _pmc = _ref5;
+
+						var pmc = self.addPMChannel(_pmc);
+					}
+
+					self.trigger("ready");
+					self.readyTime = Date.now();
+					self.debug("cached " + self.serverCache.length + " servers, " + self.channelCache.length + " channels, " + self.pmChannelCache.length + " PMs and " + self.userCache.length + " users.");
+					self.state = 3;
+					setInterval(function () {
+						self.keepAlive.apply(self);
+					}, data.heartbeat_interval);
+
+					break;
+				case "MESSAGE_CREATE":
+					self.debug("received message");
+
+					var mentions = [];
+					data.mentions = data.mentions || []; //for some reason this was not defined at some point?
+					for (var _iterator6 = data.mentions, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+						var _ref6;
+
+						if (_isArray6) {
+							if (_i6 >= _iterator6.length) break;
+							_ref6 = _iterator6[_i6++];
+						} else {
+							_i6 = _iterator6.next();
+							if (_i6.done) break;
+							_ref6 = _i6.value;
+						}
+
+						var mention = _ref6;
+
+						mentions.push(self.addUser(mention));
+					}
+
+					var channel = self.getChannel("id", data.channel_id);
+					if (channel) {
+						var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
+						self.trigger("message", msg);
+					}
+
+					break;
+				case "MESSAGE_DELETE":
+					self.debug("message deleted");
+
+					var channel = self.getChannel("id", data.channel_id);
+					var message = channel.getMessage("id", data.id);
+					if (message) {
+						self.trigger("messageDelete", channel, message);
+						channel.messages.splice(channel.messages.indexOf(message), 1);
+					} else {
+						//don't have the cache of that message ;(
+						self.trigger("messageDelete", channel);
+					}
+					break;
+				case "MESSAGE_UPDATE":
+					self.debug("message updated");
+
+					var channel = self.getChannel("id", data.channel_id);
+					var formerMessage = channel.getMessage("id", data.id);
+
+					if (formerMessage) {
+
+						//new message might be partial, so we need to fill it with whatever the old message was.
+						var info = {};
+
+						for (var key in formerMessage) {
+							info[key] = formerMessage[key];
+						}
+
+						for (var key in data) {
+							info[key] = data[key];
+						}
+
+						var mentions = [];
+						for (var _iterator7 = info.mentions, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+							var _ref7;
+
+							if (_isArray7) {
+								if (_i7 >= _iterator7.length) break;
+								_ref7 = _iterator7[_i7++];
+							} else {
+								_i7 = _iterator7.next();
+								if (_i7.done) break;
+								_ref7 = _i7.value;
+							}
+
+							var mention = _ref7;
+
+							mentions.push(self.addUser(mention));
+						}
+
+						var newMessage = new Message(info, channel, mentions, formerMessage.author);
+
+						self.trigger("messageUpdate", newMessage, formerMessage);
+
+						channel.messages[channel.messages.indexOf(formerMessage)] = newMessage;
+					}
+
+					// message isn't in cache, and if it's a partial it could cause
+					// all hell to break loose... best to just act as if nothing happened
+
+					break;
+
+				case "GUILD_DELETE":
+
+					var server = self.getServer("id", data.id);
+
+					if (server) {
+						self.serverCache.splice(self.serverCache.indexOf(server), 1);
+						self.trigger("serverDelete", server);
+					}
+
+					break;
+
+				case "CHANNEL_DELETE":
+
+					var channel = self.getChannel("id", data.id);
+
+					if (channel) {
+
+						var server = channel.server;
+
+						if (server) {
+
+							server.channels.splice(server.channels.indexOf(channel), 1);
+						}
+
+						self.trigger("channelDelete", channel);
+
+						self.serverCache.splice(self.serverCache.indexOf(channel), 1);
+					}
+
+					break;
+
+				case "GUILD_CREATE":
+
+					var server = self.getServer("id", data.id);
+
+					if (!server) {
+						//if server doesn't already exist because duh
+						server = self.addServer(data);
+					} /*else if(server.channels.length === 0){
+       
+       var srv = new Server(data, self);
+       for(channel of data.channels){
+       	srv.channels.push(new Channel(channel, data.id));
+       }
+       self.serverCache[self.serverCache.indexOf(server)] = srv;
+       
+       }*/
+
+					if (self.serverCreateListener[data.id]) {
+						var cbs = self.serverCreateListener[data.id];
+						cbs[0](server); //promise then callback
+						cbs[1](null, server); //legacy callback
+						self.serverCreateListener[data.id] = null;
+					}
+
+					self.trigger("serverCreate", server);
+
+					break;
+
+				case "CHANNEL_CREATE":
+
+					var channel = self.getChannel("id", data.id);
+
+					if (!channel) {
+
+						var chann;
+						if (data.is_private) {
+							chann = self.addPMChannel(data);
+						} else {
+							chann = self.addChannel(data, data.guild_id);
+						}
+						var srv = self.getServer("id", data.guild_id);
+						if (srv) {
+							srv.addChannel(chann);
+						}
+						self.trigger("channelCreate", chann);
+					}
+
+					break;
+
+				case "GUILD_MEMBER_ADD":
+
+					var server = self.getServer("id", data.guild_id);
+
+					if (server) {
+
+						var user = self.addUser(data.user); //if for whatever reason it doesn't exist..
+
+						self.trigger("serverNewMember", server.addMember(user, data.roles), server);
+					}
+
+					break;
+
+				case "GUILD_MEMBER_REMOVE":
+
+					var server = self.getServer("id", data.guild_id);
+
+					if (server) {
+
+						var user = self.addUser(data.user); //if for whatever reason it doesn't exist..
+
+						server.removeMember("id", user.id);
+
+						self.trigger("serverRemoveMember", user, server);
+					}
+
+					break;
+
+				case "USER_UPDATE":
+
+					if (self.user && data.id === self.user.id) {
+
+						var newUser = new User(data); //not actually adding to the cache
+
+						self.trigger("userUpdate", newUser, self.user);
+
+						if (~self.userCache.indexOf(self.user)) {
+							self.userCache[self.userCache.indexOf(self.user)] = newUser;
+						}
+
+						self.user = newUser;
+					}
+
+					break;
+
+				case "PRESENCE_UPDATE":
+
+					var userInCache = self.getUser("id", data.user.id);
+
+					if (userInCache) {
+						//user exists
+
+						data.user.username = data.user.username || userInCache.username;
+						data.user.id = data.user.id || userInCache.id;
+						data.user.discriminator = data.user.discriminator || userInCache.discriminator;
+						data.user.avatar = data.user.avatar || userInCache.avatar;
+
+						var presenceUser = new User(data.user);
+						if (presenceUser.equalsStrict(userInCache)) {
+							//they're exactly the same, an actual presence update
+							self.trigger("presence", {
+								user: userInCache,
+								oldStatus: userInCache.status,
+								status: data.status,
+								server: self.getServer("id", data.guild_id),
+								gameId: data.game_id
+							});
+							userInCache.status = data.status;
+							userInCache.gameId = data.game_id;
+						} else {
+							//one of their details changed.
+							self.userCache[self.userCache.indexOf(userInCache)] = presenceUser;
+							self.trigger("userUpdate", userInCache, presenceUser);
+						}
+					}
+
+					break;
+
+				case "CHANNEL_UPDATE":
+
+					var channelInCache = self.getChannel("id", data.id),
+					    serverInCache = self.getServer("id", data.guild_id);
+
+					if (channelInCache && serverInCache) {
+
+						var newChann = new Channel(data, serverInCache);
+						newChann.messages = channelInCache.messages;
+
+						self.trigger("channelUpdate", channelInCache, newChann);
+
+						self.channelCache[self.channelCache.indexOf(channelInCache)] = newChann;
+					}
+
+					break;
+
+				case "TYPING_START":
+
+					var userInCache = self.getUser("id", data.user_id);
+					var channelInCache = self.getChannel("id", data.channel_id);
+
+					if (!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1) {
+						self.trigger("startTyping", userInCache, channelInCache);
+					}
+
+					self.userTypingListener[data.user_id] = Date.now();
+
+					setTimeout(function () {
+						if (self.userTypingListener[data.user_id] === -1) {
+							return;
+						}
+						if (Date.now() - self.userTypingListener[data.user_id] > 6000) {
+							// stopped typing
+							self.trigger("stopTyping", userInCache, channelInCache);
+							self.userTypingListener[data.user_id] = -1;
+						}
+					}, 6000);
+
+					break;
+
+				case "GUILD_ROLE_DELETE":
+
+					var server = self.getServer("id", data.guild_id);
+					var role = server.getRole(data.role_id);
+
+					self.trigger("serverRoleDelete", server, role);
+
+					server.removeRole(role.id);
+
+					break;
+
+				case "GUILD_ROLE_UPDATE":
+
+					var server = self.getServer("id", data.guild_id);
+					var role = server.getRole(data.role.id);
+					var newRole = server.updateRole(data.role);
+
+					self.trigger("serverRoleUpdate", server, role, newRole);
+
+					break;
+
+				default:
+					self.debug("received unknown packet");
+					self.trigger("unknown", dat);
+					break;
+
+			}
+		};
+	};
+
+	//def addUser
+
+	Client.prototype.addUser = function addUser(data) {
+		if (!this.getUser("id", data.id)) {
+			this.userCache.push(new User(data));
+		}
+		return this.getUser("id", data.id);
+	};
+
+	//def addChannel
+
+	Client.prototype.addChannel = function addChannel(data, serverId) {
+		if (!this.getChannel("id", data.id)) {
+			this.channelCache.push(new Channel(data, this.getServer("id", serverId)));
+		}
+		return this.getChannel("id", data.id);
+	};
+
+	Client.prototype.addPMChannel = function addPMChannel(data) {
+		if (!this.getPMChannel("id", data.id)) {
+			this.pmChannelCache.push(new PMChannel(data, this));
+		}
+		return this.getPMChannel("id", data.id);
+	};
+
+	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) {
+
+			self.resolveDestination(channel).then(next)["catch"](error);
+
+			function error(e) {
+				callback(e);
+				reject(e);
+			}
+
+			function next(destination) {
+
+				var asChan = self.getChannel("id", destination);
+
+				request.patch(Endpoints.CHANNELS + "/" + destination).set("authorization", self.token).send({
+					name: asChan.name,
+					position: 0,
+					topic: topic
+				}).end(function (err, res) {
+					if (err) {
+						error(err);
+					} else {
+						asChan.topic = res.body.topic;
+						resolve();
+						callback();
+					}
+				});
+			}
+		});
+	};
+
+	//def addServer
+
+	Client.prototype.addServer = function addServer(data) {
+
+		var self = this;
+		var server = this.getServer("id", data.id);
+
+		if (data.unavailable) {
+			self.trigger("unavailable", data);
+			self.debug("Server ID " + data.id + " has been marked unavailable by Discord. It was not cached.");
+			return;
+		}
+
+		if (!server) {
+			server = new Server(data, this);
+			this.serverCache.push(server);
+			if (data.channels) {
+				for (var _iterator8 = data.channels, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+					var _ref8;
+
+					if (_isArray8) {
+						if (_i8 >= _iterator8.length) break;
+						_ref8 = _iterator8[_i8++];
+					} else {
+						_i8 = _iterator8.next();
+						if (_i8.done) break;
+						_ref8 = _i8.value;
+					}
+
+					var channel = _ref8;
+
+					server.channels.push(this.addChannel(channel, server.id));
+				}
+			}
+		}
+
+		for (var _iterator9 = data.presences, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+			var _ref9;
+
+			if (_isArray9) {
+				if (_i9 >= _iterator9.length) break;
+				_ref9 = _iterator9[_i9++];
+			} else {
+				_i9 = _iterator9.next();
+				if (_i9.done) break;
+				_ref9 = _i9.value;
+			}
+
+			var presence = _ref9;
+
+			var user = self.getUser("id", presence.user.id);
+			user.status = presence.status;
+			user.gameId = presence.game_id;
+		}
+
+		return server;
+	};
+
+	//def getUser
+
+	Client.prototype.getUser = function getUser(key, value) {
+		for (var _iterator10 = this.userCache, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+			var _ref10;
+
+			if (_isArray10) {
+				if (_i10 >= _iterator10.length) break;
+				_ref10 = _iterator10[_i10++];
+			} else {
+				_i10 = _iterator10.next();
+				if (_i10.done) break;
+				_ref10 = _i10.value;
+			}
+
+			var user = _ref10;
+
+			if (user[key] === value) {
+				return user;
+			}
+		}
+		return null;
+	};
+
+	//def getChannel
+
+	Client.prototype.getChannel = function getChannel(key, value) {
+		for (var _iterator11 = this.channelCache, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+			var _ref11;
+
+			if (_isArray11) {
+				if (_i11 >= _iterator11.length) break;
+				_ref11 = _iterator11[_i11++];
+			} else {
+				_i11 = _iterator11.next();
+				if (_i11.done) break;
+				_ref11 = _i11.value;
+			}
+
+			var channel = _ref11;
+
+			if (channel[key] === value) {
+				return channel;
+			}
+		}
+		return this.getPMChannel(key, value); //might be a PM
+	};
+
+	Client.prototype.getPMChannel = function getPMChannel(key, value) {
+		for (var _iterator12 = this.pmChannelCache, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+			var _ref12;
+
+			if (_isArray12) {
+				if (_i12 >= _iterator12.length) break;
+				_ref12 = _iterator12[_i12++];
+			} else {
+				_i12 = _iterator12.next();
+				if (_i12.done) break;
+				_ref12 = _i12.value;
+			}
+
+			var channel = _ref12;
+
+			if (channel[key] === value) {
+				return channel;
+			}
+		}
+		return null;
+	};
+
+	//def getServer
+
+	Client.prototype.getServer = function getServer(key, value) {
+		for (var _iterator13 = this.serverCache, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+			var _ref13;
+
+			if (_isArray13) {
+				if (_i13 >= _iterator13.length) break;
+				_ref13 = _iterator13[_i13++];
+			} else {
+				_i13 = _iterator13.next();
+				if (_i13.done) break;
+				_ref13 = _i13.value;
+			}
+
+			var server = _ref13;
+
+			if (server[key] === value) {
+				return server;
+			}
+		}
+		return null;
+	};
+
+	//def trySendConnData
+
+	Client.prototype.trySendConnData = function trySendConnData() {
+
+		if (this.token && !this.alreadySentData) {
+
+			this.alreadySentData = true;
+
+			var data = {
+				op: 2,
+				d: {
+					token: this.token,
+					v: 3,
+					properties: {
+						"$os": "discord.js",
+						"$browser": "discord.js",
+						"$device": "discord.js",
+						"$referrer": "",
+						"$referring_domain": ""
+					}
+				}
+			};
+			this.websocket.send(JSON.stringify(data));
+		}
+	};
+
+	Client.prototype.resolveServerID = function resolveServerID(resource) {
+
+		if (resource instanceof Server) {
+			return resource.id;
+		} else if (!isNaN(resource) && resource.length && resource.length === 17) {
+			return resource;
+		}
+	};
+
+	Client.prototype.resolveDestination = function resolveDestination(destination) {
+		var channId = false;
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			if (destination instanceof Server) {
+				channId = destination.id; //general is the same as server id
+			} else if (destination instanceof Channel) {
+					channId = destination.id;
+				} else if (destination instanceof Message) {
+					channId = destination.channel.id;
+				} else if (destination instanceof PMChannel) {
+					channId = destination.id;
+				} else if (destination instanceof User) {
+
+					//check if we have a PM
+					for (var _iterator14 = self.pmChannelCache, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+						var _ref14;
+
+						if (_isArray14) {
+							if (_i14 >= _iterator14.length) break;
+							_ref14 = _iterator14[_i14++];
+						} else {
+							_i14 = _iterator14.next();
+							if (_i14.done) break;
+							_ref14 = _i14.value;
+						}
+
+						var pmc = _ref14;
+
+						if (pmc.user && pmc.user.equals(destination)) {
+							resolve(pmc.id);
+							return;
+						}
+					}
+
+					//we don't, at this point we're late
+					self.startPM(destination).then(function (pmc) {
+						resolve(pmc.id);
+					})["catch"](reject);
+				} else {
+					channId = destination;
+				}
+			if (channId) resolve(channId);else reject();
+		});
+	};
+
+	Client.prototype._sendMessage = function _sendMessage(destination, content, tts, mentions) {
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization", self.token).send({
+				content: content,
+				mentions: mentions,
+				tts: tts
+			}).end(function (err, res) {
+
+				if (err) {
+					reject(err);
+				} else {
+					var data = res.body;
+
+					var mentions = [];
+
+					data.mentions = data.mentions || []; //for some reason this was not defined at some point?
+
+					for (var _iterator15 = data.mentions, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+						var _ref15;
+
+						if (_isArray15) {
+							if (_i15 >= _iterator15.length) break;
+							_ref15 = _iterator15[_i15++];
+						} else {
+							_i15 = _iterator15.next();
+							if (_i15.done) break;
+							_ref15 = _i15.value;
+						}
+
+						var mention = _ref15;
+
+						mentions.push(self.addUser(mention));
+					}
+
+					var channel = self.getChannel("id", data.channel_id);
+					if (channel) {
+						var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
+						resolve(msg);
+					}
+				}
+			});
+		});
+	};
+
+	Client.prototype._sendFile = function _sendFile(destination, attachment) {
+		var attachmentName = arguments.length <= 2 || arguments[2] === undefined ? "DEFAULT BECAUSE YOU DIDN'T SPECIFY WHY.png" : arguments[2];
+
+		var self = this;
+
+		return new Promise(function (resolve, reject) {
+			request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization", self.token).attach("file", attachment, attachmentName).end(function (err, res) {
+
+				if (err) {
+					reject(err);
+				} else {
+
+					var chann = self.getChannel("id", destination);
+					if (chann) {
+						var msg = chann.addMessage(new Message(res.body, chann, [], self.user));
+						resolve(msg);
+					}
+				}
+			});
+		});
+	};
+
+	Client.prototype._updateMessage = function _updateMessage(message, content) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).send({
+				content: content,
+				mentions: []
+			}).end(function (err, res) {
+				if (err) {
+					reject(err);
+				} else {
+					var msg = new Message(res.body, message.channel, message.mentions, message.sender);
+					resolve(msg);
+					message.channel.messages[message.channel.messages.indexOf(message)] = msg;
+				}
+			});
+		});
+	};
+
+	Client.prototype.getGateway = function getGateway() {
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			request.get(Endpoints.API + "/gateway").set("authorization", self.token).end(function (err, res) {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(res.body.url);
+				}
+			});
+		});
+	};
+
+	Client.prototype.setStatusIdle = function setStatusIdle() {
+		this.setStatus("idle");
+	};
+
+	Client.prototype.setStatusOnline = function setStatusOnline() {
+		this.setStatus("online");
+	};
+
+	Client.prototype.setStatusActive = function setStatusActive() {
+		this.setStatusOnline();
+	};
+
+	Client.prototype.setStatusHere = function setStatusHere() {
+		this.setStatusOnline();
+	};
+
+	Client.prototype.setStatusAway = function setStatusAway() {
+		this.setStatusIdle();
+	};
+
+	Client.prototype.startTyping = function startTyping(chann, stopTypeTime) {
+		var self = this;
+
+		this.resolveDestination(chann).then(next);
+
+		function next(channel) {
+			if (self.typingIntervals[channel]) {
+				return;
+			}
+
+			var fn = function fn() {
+				request.post(Endpoints.CHANNELS + "/" + channel + "/typing").set("authorization", self.token).end();
+			};
+
+			fn();
+
+			var interval = setInterval(fn, 3000);
+
+			self.typingIntervals[channel] = interval;
+
+			if (stopTypeTime) {
+				setTimeout(function () {
+					self.stopTyping(channel);
+				}, stopTypeTime);
+			}
+		}
+	};
+
+	Client.prototype.stopTyping = function stopTyping(chann) {
+		var self = this;
+
+		this.resolveDestination(chann).then(next);
+
+		function next(channel) {
+			if (!self.typingIntervals[channel]) {
+				return;
+			}
+
+			clearInterval(self.typingIntervals[channel]);
+
+			delete self.typingIntervals[channel];
+		}
+	};
+
+	Client.prototype.setStatus = function setStatus(stat) {
+
+		var idleTime = stat === "online" ? null : Date.now();
+
+		this.__idleTime = idleTime;
+
+		this.websocket.send(JSON.stringify({
+			op: 3,
+			d: {
+				idle_since: this.__idleTime,
+				game_id: this.__gameId
+			}
+		}));
+	};
+
+	Client.prototype.setPlayingGame = function setPlayingGame(id) {
+
+		if (id instanceof String || typeof id === "string") {
+
+			// working on names
+			var gid = id.trim().toUpperCase();
+
+			id = null;
+
+			for (var _iterator16 = gameMap, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+				var _ref16;
+
+				if (_isArray16) {
+					if (_i16 >= _iterator16.length) break;
+					_ref16 = _iterator16[_i16++];
+				} else {
+					_i16 = _iterator16.next();
+					if (_i16.done) break;
+					_ref16 = _i16.value;
+				}
+
+				var game = _ref16;
+
+				if (game.name.trim().toUpperCase() === gid) {
+
+					id = game.id;
+					break;
+				}
+			}
+		}
+
+		this.__gameId = id;
+
+		this.websocket.send(JSON.stringify({
+			op: 3,
+			d: {
+				idle_since: this.__idleTime,
+				game_id: this.__gameId
+			}
+		}));
+	};
+
+	Client.prototype.playGame = function playGame(id) {
+		this.setPlayingGame(id);
+	};
+
+	Client.prototype.playingGame = function playingGame(id) {
+
+		this.setPlayingGame(id);
+	};
+
+	_createClass(Client, [{
+		key: "uptime",
+		get: function get() {
+
+			return this.readyTime ? Date.now() - this.readyTime : null;
+		}
+	}, {
+		key: "ready",
+		get: function get() {
+			return this.state === 3;
+		}
+	}, {
+		key: "servers",
+		get: function get() {
+			return this.serverCache;
+		}
+	}, {
+		key: "channels",
+		get: function get() {
+			return this.channelCache;
+		}
+	}, {
+		key: "users",
+		get: function get() {
+			return this.userCache;
+		}
+	}, {
+		key: "PMChannels",
+		get: function get() {
+			return this.pmChannelCache;
+		}
+	}, {
+		key: "messages",
+		get: function get() {
+
+			var msgs = [];
+			for (var _iterator17 = this.channelCache, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : _iterator17[Symbol.iterator]();;) {
+				var _ref17;
+
+				if (_isArray17) {
+					if (_i17 >= _iterator17.length) break;
+					_ref17 = _iterator17[_i17++];
+				} else {
+					_i17 = _iterator17.next();
+					if (_i17.done) break;
+					_ref17 = _i17.value;
+				}
+
+				var channel = _ref17;
+
+				msgs = msgs.concat(channel.messages);
+			}
+			return msgs;
+		}
+	}]);
+
+	return Client;
+})();
+
+module.exports = Client;
\ No newline at end of file
diff --git a/lib/Endpoints.js b/lib/Endpoints.js
index 60cd7925c..271b465eb 100644
--- a/lib/Endpoints.js
+++ b/lib/Endpoints.js
@@ -1 +1,13 @@
-"use strict";exports.BASE_DOMAIN = "discordapp.com";exports.BASE = "https://" + exports.BASE_DOMAIN;exports.WEBSOCKET_HUB = "wss://" + exports.BASE_DOMAIN + "/hub";exports.API = exports.BASE + "/api";exports.AUTH = exports.API + "/auth";exports.LOGIN = exports.AUTH + "/login";exports.LOGOUT = exports.AUTH + "/logout";exports.USERS = exports.API + "/users";exports.SERVERS = exports.API + "/guilds";exports.CHANNELS = exports.API + "/channels";
+"use strict";
+
+exports.BASE_DOMAIN = "discordapp.com";
+exports.BASE = "https://" + exports.BASE_DOMAIN;
+exports.WEBSOCKET_HUB = "wss://" + exports.BASE_DOMAIN + "/hub";
+
+exports.API = exports.BASE + "/api";
+exports.AUTH = exports.API + "/auth";
+exports.LOGIN = exports.AUTH + "/login";
+exports.LOGOUT = exports.AUTH + "/logout";
+exports.USERS = exports.API + "/users";
+exports.SERVERS = exports.API + "/guilds";
+exports.CHANNELS = exports.API + "/channels";
\ No newline at end of file
diff --git a/lib/EvaluatedPermissions.js b/lib/EvaluatedPermissions.js
index 947063410..c4720c46b 100644
--- a/lib/EvaluatedPermissions.js
+++ b/lib/EvaluatedPermissions.js
@@ -1 +1,187 @@
-"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 EvaluatedPermissions=(function(){function EvaluatedPermissions(data){_classCallCheck(this,EvaluatedPermissions);var self=this;function getBit(x){if((self.packed >>> 3 & 1) === 1){return true;}return (self.packed >>> x & 1) === 1;}this.packed = data;}EvaluatedPermissions.prototype.getBit = function getBit(x){return (this.packed >>> x & 1) === 1;};EvaluatedPermissions.prototype.setBit = function setBit(){};_createClass(EvaluatedPermissions,[{key:"createInstantInvite",get:function get(){return this.getBit(0);},set:function set(val){this.setBit(0,val);}},{key:"manageRoles",get:function get(){return this.getBit(3);},set:function set(val){this.setBit(3,val);}},{key:"manageChannels",get:function get(){return this.getBit(4);},set:function set(val){this.setBit(4,val);}},{key:"readMessages",get:function get(){return this.getBit(10);},set:function set(val){this.setBit(10,val);}},{key:"sendMessages",get:function get(){return this.getBit(11);},set:function set(val){this.setBit(11,val);}},{key:"sendTTSMessages",get:function get(){return this.getBit(12);},set:function set(val){this.setBit(12,val);}},{key:"manageMessages",get:function get(){return this.getBit(13);},set:function set(val){this.setBit(13,val);}},{key:"embedLinks",get:function get(){return this.getBit(14);},set:function set(val){this.setBit(14,val);}},{key:"attachFiles",get:function get(){return this.getBit(15);},set:function set(val){this.setBit(15,val);}},{key:"readMessageHistory",get:function get(){return this.getBit(16);},set:function set(val){this.setBit(16,val);}},{key:"mentionEveryone",get:function get(){return this.getBit(17);},set:function set(val){this.setBit(17,val);}},{key:"voiceConnect",get:function get(){return this.getBit(20);},set:function set(val){this.setBit(20,val);}},{key:"voiceSpeak",get:function get(){return this.getBit(21);},set:function set(val){this.setBit(21,val);}},{key:"voiceMuteMembers",get:function get(){return this.getBit(22);},set:function set(val){this.setBit(22,val);}},{key:"voiceDeafenMembers",get:function get(){return this.getBit(23);},set:function set(val){this.setBit(23,val);}},{key:"voiceMoveMembers",get:function get(){return this.getBit(24);},set:function set(val){this.setBit(24,val);}},{key:"voiceUseVoiceActivation",get:function get(){return this.getBit(25);},set:function set(val){this.setBit(25,val);}}]);return EvaluatedPermissions;})();module.exports = EvaluatedPermissions;
+"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 EvaluatedPermissions = (function () {
+	function EvaluatedPermissions(data) {
+		_classCallCheck(this, EvaluatedPermissions);
+
+		var self = this;
+
+		this.packed = data;
+
+		if (this.getBit(3)) this.packed = 4294967295;
+	}
+
+	EvaluatedPermissions.prototype.serialise = function serialise() {
+		return {
+			createInstantInvite: this.createInstantInvite,
+			manageRoles: this.manageRoles,
+			manageChannels: this.manageChannels,
+			readMessages: this.readMessages,
+			sendMessages: this.sendMessage,
+			sendTTSMessages: this.sendTTSMessages,
+			manageMessages: this.manageMessages,
+			embedLinks: this.embedLinks,
+			attachFiles: this.attachFiles,
+			readMessageHistory: this.readMessageHistory,
+			mentionEveryone: this.mentionEveryone,
+			voiceConnect: this.voiceConnect,
+			voiceSpeak: this.voiceSpeak,
+			voiceMuteMembers: this.voiceMuteMembers,
+			voiceDeafenMembers: this.voiceDeafenMembers,
+			voiceMoveMember: this.voiceMoveMembers,
+			voiceUseVoiceActivation: this.voiceUseVoiceActivation
+		};
+	};
+
+	EvaluatedPermissions.prototype.getBit = function getBit(x) {
+		return (this.packed >>> x & 1) === 1;
+	};
+
+	EvaluatedPermissions.prototype.setBit = function setBit() {};
+
+	_createClass(EvaluatedPermissions, [{
+		key: "createInstantInvite",
+		get: function get() {
+			return this.getBit(0);
+		},
+		set: function set(val) {
+			this.setBit(0, val);
+		}
+	}, {
+		key: "manageRoles",
+		get: function get() {
+			return this.getBit(3);
+		},
+		set: function set(val) {
+			this.setBit(3, val);
+		}
+	}, {
+		key: "manageChannels",
+		get: function get() {
+			return this.getBit(4);
+		},
+		set: function set(val) {
+			this.setBit(4, val);
+		}
+	}, {
+		key: "readMessages",
+		get: function get() {
+			return this.getBit(10);
+		},
+		set: function set(val) {
+			this.setBit(10, val);
+		}
+	}, {
+		key: "sendMessages",
+		get: function get() {
+			return this.getBit(11);
+		},
+		set: function set(val) {
+			this.setBit(11, val);
+		}
+	}, {
+		key: "sendTTSMessages",
+		get: function get() {
+			return this.getBit(12);
+		},
+		set: function set(val) {
+			this.setBit(12, val);
+		}
+	}, {
+		key: "manageMessages",
+		get: function get() {
+			return this.getBit(13);
+		},
+		set: function set(val) {
+			this.setBit(13, val);
+		}
+	}, {
+		key: "embedLinks",
+		get: function get() {
+			return this.getBit(14);
+		},
+		set: function set(val) {
+			this.setBit(14, val);
+		}
+	}, {
+		key: "attachFiles",
+		get: function get() {
+			return this.getBit(15);
+		},
+		set: function set(val) {
+			this.setBit(15, val);
+		}
+	}, {
+		key: "readMessageHistory",
+		get: function get() {
+			return this.getBit(16);
+		},
+		set: function set(val) {
+			this.setBit(16, val);
+		}
+	}, {
+		key: "mentionEveryone",
+		get: function get() {
+			return this.getBit(17);
+		},
+		set: function set(val) {
+			this.setBit(17, val);
+		}
+	}, {
+		key: "voiceConnect",
+		get: function get() {
+			return this.getBit(20);
+		},
+		set: function set(val) {
+			this.setBit(20, val);
+		}
+	}, {
+		key: "voiceSpeak",
+		get: function get() {
+			return this.getBit(21);
+		},
+		set: function set(val) {
+			this.setBit(21, val);
+		}
+	}, {
+		key: "voiceMuteMembers",
+		get: function get() {
+			return this.getBit(22);
+		},
+		set: function set(val) {
+			this.setBit(22, val);
+		}
+	}, {
+		key: "voiceDeafenMembers",
+		get: function get() {
+			return this.getBit(23);
+		},
+		set: function set(val) {
+			this.setBit(23, val);
+		}
+	}, {
+		key: "voiceMoveMembers",
+		get: function get() {
+			return this.getBit(24);
+		},
+		set: function set(val) {
+			this.setBit(24, val);
+		}
+	}, {
+		key: "voiceUseVoiceActivation",
+		get: function get() {
+			return this.getBit(25);
+		},
+		set: function set(val) {
+			this.setBit(25, val);
+		}
+	}]);
+
+	return EvaluatedPermissions;
+})();
+
+module.exports = EvaluatedPermissions;
\ No newline at end of file
diff --git a/lib/Member.js b/lib/Member.js
index 36b583a87..e7b1df1bd 100644
--- a/lib/Member.js
+++ b/lib/Member.js
@@ -1,4 +1,174 @@
-"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 _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 User=require("./user.js");var ServerPermissions=require("./ServerPermissions.js");var EvaluatedPermissions=require("./EvaluatedPermissions.js");var Member=(function(_User){_inherits(Member,_User);function Member(user,server,roles){_classCallCheck(this,Member);_User.call(this,user); // should work, we are basically creating a Member that has the same properties as user and a few more
-this.server = server;this.rawRoles = roles;}Member.prototype.permissionsIn = function permissionsIn(channel){if(channel.server.ownerID === this.id){return new EvaluatedPermissions(4294967295); //all perms
-}var affectingOverwrites=[];var affectingMemberOverwrites=[];for(var _iterator=channel.roles,_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 overwrite=_ref;if(overwrite.id === this.id && overwrite.type === "member"){affectingMemberOverwrites.push(overwrite);}else if(this.rawRoles.indexOf(overwrite.id) !== -1){affectingOverwrites.push(overwrite);}}for(var _iterator2=affectingOverwrites,_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;console.log("hey",perm.attachFiles);}if(affectingOverwrites.length === 0 && affectingMemberOverwrites.length === 0){return new EvaluatedPermissions(this.evalPerms.packed);}var finalPacked=affectingOverwrites.length !== 0?affectingOverwrites[0].packed:affectingMemberOverwrites[0].packed;for(var _iterator3=affectingOverwrites,_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 overwrite=_ref3;finalPacked = finalPacked & ~overwrite.deny;finalPacked = finalPacked | overwrite.allow;}for(var _iterator4=affectingMemberOverwrites,_isArray4=Array.isArray(_iterator4),_i4=0,_iterator4=_isArray4?_iterator4:_iterator4[Symbol.iterator]();;) {var _ref4;if(_isArray4){if(_i4 >= _iterator4.length)break;_ref4 = _iterator4[_i4++];}else {_i4 = _iterator4.next();if(_i4.done)break;_ref4 = _i4.value;}var overwrite=_ref4;finalPacked = finalPacked & ~overwrite.deny;finalPacked = finalPacked | overwrite.allow;}return new EvaluatedPermissions(finalPacked);};_createClass(Member,[{key:"roles",get:function get(){var ufRoles=[this.server.getRole(this.server.id)];for(var _iterator5=this.rawRoles,_isArray5=Array.isArray(_iterator5),_i5=0,_iterator5=_isArray5?_iterator5:_iterator5[Symbol.iterator]();;) {var _ref5;if(_isArray5){if(_i5 >= _iterator5.length)break;_ref5 = _iterator5[_i5++];}else {_i5 = _iterator5.next();if(_i5.done)break;_ref5 = _i5.value;}var rawRole=_ref5;ufRoles.push(this.server.getRole(rawRole));}return ufRoles;}},{key:"evalPerms",get:function get(){var basePerms=this.roles, //cache roles as it can be slightly expensive
-basePerm=basePerms[0].packed;for(var _iterator6=basePerms,_isArray6=Array.isArray(_iterator6),_i6=0,_iterator6=_isArray6?_iterator6:_iterator6[Symbol.iterator]();;) {var _ref6;if(_isArray6){if(_i6 >= _iterator6.length)break;_ref6 = _iterator6[_i6++];}else {_i6 = _iterator6.next();if(_i6.done)break;_ref6 = _i6.value;}var perm=_ref6;basePerm = basePerm | perm.packed;}return new ServerPermissions({permissions:basePerm});}}]);return Member;})(User);module.exports = Member;
+"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 _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 User = require("./user.js");
+var ServerPermissions = require("./ServerPermissions.js");
+var EvaluatedPermissions = require("./EvaluatedPermissions.js");
+
+var Member = (function (_User) {
+	_inherits(Member, _User);
+
+	function Member(user, server, roles) {
+		_classCallCheck(this, Member);
+
+		_User.call(this, user); // should work, we are basically creating a Member that has the same properties as user and a few more
+		this.server = server;
+		this.rawRoles = roles;
+	}
+
+	Member.prototype.permissionsIn = function permissionsIn(channel) {
+
+		if (channel.server.ownerID === this.id) {
+			return new EvaluatedPermissions(4294967295); //all perms
+		}
+
+		var affectingOverwrites = [];
+		var affectingMemberOverwrites = [];
+
+		for (var _iterator = channel.roles, _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 overwrite = _ref;
+
+			if (overwrite.id === this.id && overwrite.type === "member") {
+				affectingMemberOverwrites.push(overwrite);
+			} else if (this.rawRoles.indexOf(overwrite.id) !== -1) {
+				affectingOverwrites.push(overwrite);
+			}
+		}
+
+		for (var _iterator2 = affectingOverwrites, _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;
+
+			console.log("hey", perm.attachFiles);
+		}
+
+		if (affectingOverwrites.length === 0 && affectingMemberOverwrites.length === 0) {
+			return new EvaluatedPermissions(this.evalPerms.packed);
+		}
+
+		var finalPacked = affectingOverwrites.length !== 0 ? affectingOverwrites[0].packed : affectingMemberOverwrites[0].packed;
+
+		for (var _iterator3 = affectingOverwrites, _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 overwrite = _ref3;
+
+			finalPacked = finalPacked & ~overwrite.deny;
+			finalPacked = finalPacked | overwrite.allow;
+		}
+
+		for (var _iterator4 = affectingMemberOverwrites, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+			var _ref4;
+
+			if (_isArray4) {
+				if (_i4 >= _iterator4.length) break;
+				_ref4 = _iterator4[_i4++];
+			} else {
+				_i4 = _iterator4.next();
+				if (_i4.done) break;
+				_ref4 = _i4.value;
+			}
+
+			var overwrite = _ref4;
+
+			finalPacked = finalPacked & ~overwrite.deny;
+			finalPacked = finalPacked | overwrite.allow;
+		}
+
+		return new EvaluatedPermissions(finalPacked);
+	};
+
+	_createClass(Member, [{
+		key: "roles",
+		get: function get() {
+
+			var ufRoles = [this.server.getRole(this.server.id)];
+
+			for (var _iterator5 = this.rawRoles, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+				var _ref5;
+
+				if (_isArray5) {
+					if (_i5 >= _iterator5.length) break;
+					_ref5 = _iterator5[_i5++];
+				} else {
+					_i5 = _iterator5.next();
+					if (_i5.done) break;
+					_ref5 = _i5.value;
+				}
+
+				var rawRole = _ref5;
+
+				ufRoles.push(this.server.getRole(rawRole));
+			}
+
+			return ufRoles;
+		}
+	}, {
+		key: "evalPerms",
+		get: function get() {
+			var basePerms = this.roles,
+			    //cache roles as it can be slightly expensive
+			basePerm = basePerms[0].packed;
+
+			for (var _iterator6 = basePerms, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+				var _ref6;
+
+				if (_isArray6) {
+					if (_i6 >= _iterator6.length) break;
+					_ref6 = _iterator6[_i6++];
+				} else {
+					_i6 = _iterator6.next();
+					if (_i6.done) break;
+					_ref6 = _i6.value;
+				}
+
+				var perm = _ref6;
+
+				basePerm = basePerm | perm.packed;
+			}
+
+			return new ServerPermissions({
+				permissions: basePerm
+			});
+		}
+	}]);
+
+	return Member;
+})(User);
+
+module.exports = Member;
\ No newline at end of file
diff --git a/lib/PMChannel.js b/lib/PMChannel.js
index 8d90dade1..06d1c120b 100644
--- a/lib/PMChannel.js
+++ b/lib/PMChannel.js
@@ -1 +1,61 @@
-"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 PMChannel=(function(){function PMChannel(data,client){_classCallCheck(this,PMChannel);this.user = client.getUser("id",data.recipient.id);this.id = data.id;this.messages = [];this.client = client;}PMChannel.prototype.addMessage = function addMessage(data){if(!this.getMessage("id",data.id)){this.messages.push(data);}return this.getMessage("id",data.id);};PMChannel.prototype.getMessage = function getMessage(key,value){if(this.messages.length > 1000){this.messages.splice(0,1);}for(var _iterator=this.messages,_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 message=_ref;if(message[key] === value){return message;}}return null;};_createClass(PMChannel,[{key:"isPrivate",get:function get(){return true;}}]);return PMChannel;})();module.exports = PMChannel;
+"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 PMChannel = (function () {
+	function PMChannel(data, client) {
+		_classCallCheck(this, PMChannel);
+
+		this.user = client.getUser("id", data.recipient.id);
+		this.id = data.id;
+		this.messages = [];
+		this.client = client;
+	}
+
+	PMChannel.prototype.addMessage = function addMessage(data) {
+		if (!this.getMessage("id", data.id)) {
+			this.messages.push(data);
+		}
+		return this.getMessage("id", data.id);
+	};
+
+	PMChannel.prototype.getMessage = function getMessage(key, value) {
+
+		if (this.messages.length > 1000) {
+			this.messages.splice(0, 1);
+		}
+
+		for (var _iterator = this.messages, _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 message = _ref;
+
+			if (message[key] === value) {
+				return message;
+			}
+		}
+		return null;
+	};
+
+	_createClass(PMChannel, [{
+		key: "isPrivate",
+		get: function get() {
+			return true;
+		}
+	}]);
+
+	return PMChannel;
+})();
+
+module.exports = PMChannel;
\ No newline at end of file
diff --git a/lib/ServerPermissions.js b/lib/ServerPermissions.js
index 73148ca06..6384f759b 100644
--- a/lib/ServerPermissions.js
+++ b/lib/ServerPermissions.js
@@ -19,22 +19,19 @@ var ServerPermissions = (function () {
 		this.id = data.id;
 	}
 
+	ServerPermissions.prototype.getBit = function getBit(x) {
+		return (this.packed >>> x & 1) === 1;
+	};
+
+	ServerPermissions.prototype.setBit = function setBit() {
+		//dummy function for now
+	};
+
+	ServerPermissions.prototype.toString = function toString() {
+		return this.name;
+	};
+
 	_createClass(ServerPermissions, [{
-		key: "getBit",
-		value: function getBit(x) {
-			return (this.packed >>> x & 1) === 1;
-		}
-	}, {
-		key: "setBit",
-		value: function setBit() {
-			//dummy function for now
-		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.name;
-		}
-	}, {
 		key: "createInstantInvite",
 		get: function get() {
 			return this.getBit(0);
diff --git a/lib/channel.js b/lib/channel.js
index 04c363943..7b8b1c027 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -1,2 +1,130 @@
-"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 ChannelPermissions=require("./ChannelPermissions.js");var Channel=(function(){function Channel(data,server){_classCallCheck(this,Channel);this.server = server;this.name = data.name;this.type = data.type;this.topic = data.topic;this.id = data.id;this.messages = [];this.roles = [];if(data.permission_overwrites)for(var _iterator=data.permission_overwrites,_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 role=_ref;this.roles.push(new ChannelPermissions(role,this));} //this.isPrivate = isPrivate; //not sure about the implementation of this...
-}Channel.prototype.permissionsOf = function permissionsOf(member){var mem=this.server.getMember("id",member.id);if(mem){return mem.permissionsIn(this);}else {return null;}};Channel.prototype.equals = function equals(object){return object && object.id === this.id;};Channel.prototype.addMessage = function addMessage(data){if(this.messages.length > 1000){this.messages.splice(0,1);}if(!this.getMessage("id",data.id)){this.messages.push(data);}return this.getMessage("id",data.id);};Channel.prototype.getMessage = function getMessage(key,value){for(var _iterator2=this.messages,_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 message=_ref2;if(message[key] === value){return message;}}return null;};Channel.prototype.toString = function toString(){return "<#" + this.id + ">";};_createClass(Channel,[{key:"permissionOverwrites",get:function get(){return this.roles;}},{key:"permissions",get:function get(){return this.roles;}},{key:"client",get:function get(){return this.server.client;}},{key:"isPrivate",get:function get(){return false;}},{key:"users",get:function get(){return this.server.members;}},{key:"members",get:function get(){return this.server.members;}}]);return Channel;})();module.exports = Channel;
+"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 ChannelPermissions = require("./ChannelPermissions.js");
+
+var Channel = (function () {
+    function Channel(data, server) {
+        _classCallCheck(this, Channel);
+
+        this.server = server;
+        this.name = data.name;
+        this.type = data.type;
+        this.topic = data.topic;
+        this.id = data.id;
+        this.messages = [];
+        this.roles = [];
+
+        if (data.permission_overwrites) for (var _iterator = data.permission_overwrites, _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 role = _ref;
+
+                this.roles.push(new ChannelPermissions(role, this));
+            }
+
+        //this.isPrivate = isPrivate; //not sure about the implementation of this...
+    }
+
+    Channel.prototype.permissionsOf = function permissionsOf(member) {
+
+        var mem = this.server.getMember("id", member.id);
+
+        if (mem) {
+            return mem.permissionsIn(this);
+        } else {
+            return null;
+        }
+    };
+
+    Channel.prototype.equals = function equals(object) {
+        return object && object.id === this.id;
+    };
+
+    Channel.prototype.addMessage = function addMessage(data) {
+
+        if (this.messages.length > 1000) {
+            this.messages.splice(0, 1);
+        }
+
+        if (!this.getMessage("id", data.id)) {
+            this.messages.push(data);
+        }
+
+        return this.getMessage("id", data.id);
+    };
+
+    Channel.prototype.getMessage = function getMessage(key, value) {
+        for (var _iterator2 = this.messages, _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 message = _ref2;
+
+            if (message[key] === value) {
+                return message;
+            }
+        }
+        return null;
+    };
+
+    Channel.prototype.toString = function toString() {
+        return "<#" + this.id + ">";
+    };
+
+    _createClass(Channel, [{
+        key: "permissionOverwrites",
+        get: function get() {
+            return this.roles;
+        }
+    }, {
+        key: "permissions",
+        get: function get() {
+            return this.roles;
+        }
+    }, {
+        key: "client",
+        get: function get() {
+            return this.server.client;
+        }
+    }, {
+        key: "isPrivate",
+        get: function get() {
+            return false;
+        }
+    }, {
+        key: "users",
+        get: function get() {
+            return this.server.members;
+        }
+    }, {
+        key: "members",
+        get: function get() {
+            return this.server.members;
+        }
+    }]);
+
+    return Channel;
+})();
+
+module.exports = Channel;
\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index 9eabba0ae..6a2f82f05 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1 +1,12 @@
-"use strict";var request=require("superagent");var Endpoints=require("./Endpoints.js");var Client=require("./Client.js");var Discord={Endpoints:Endpoints,Client:Client};module.exports = Discord;
+"use strict";
+
+var request = require("superagent");
+var Endpoints = require("./Endpoints.js");
+var Client = require("./Client.js");
+
+var Discord = {
+	Endpoints: Endpoints,
+	Client: Client
+};
+
+module.exports = Discord;
\ No newline at end of file
diff --git a/lib/internal.js b/lib/internal.js
index b91c38597..3acf5940b 100644
--- a/lib/internal.js
+++ b/lib/internal.js
@@ -1 +1,203 @@
-"use strict";var request=require("superagent");var Endpoints=require("./endpoints.js");var Internal={};Internal.XHR = {};Internal.WebSocket = {};Internal.WebSocket.properties = {"$os":"discord.js","$browser":"discord.js","$device":"discord.js","$referrer":"","$referring_domain":""};Internal.XHR.login = function(email,password,callback){request.post(Endpoints.LOGIN).send({email:email,password:password}).end(function(err,res){if(err){callback(err);}else {callback(null,res.body.token);}});};Internal.XHR.logout = function(token,callback){request.post(Endpoints.LOGOUT).end(function(err,res){err?callback(err):callback(null);});};Internal.XHR.createServer = function(token,name,region,callback){request.post(Endpoints.SERVERS).set("authorization",token).send({name:name,region:region}).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.leaveServer = function(token,serverId,callback){request.del(Endpoints.SERVERS + "/" + serverId).set("authorization",token).end(function(err,res){err?callback(err):callback(null);});};Internal.XHR.createInvite = function(token,channelId,options,callback){request.post(Endpoints.CHANNELS + "/" + channelId + "/invites").set("authorization",token).send(options).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.startPM = function(token,selfID,userID,callback){request.post(Endpoints.USERS + "/" + selfID + "/channels").set("authorization",token).send({recipient_id:userID}).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.sendMessage = function(token,channelID,messageParameters,callback){request.post(Endpoints.CHANNELS + "/" + channelID + "/messages").set("authorization",token).send(messageParameters).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.sendFile = function(token,channelID,file,fileName,callback){request.post(Endpoints.CHANNELS + "/" + channelID + "/messages").set("authorization",token).attach("file",file,fileName).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.deleteMessage = function(token,channelID,messageID,callback){request.del(Endpoints.CHANNELS + "/" + channelID + "/messages/" + messageID).set("authorization",token).end(function(err){err?callback(err):callback(null);});};Internal.XHR.updateMessage = function(token,channelID,messageID,messageParameters,callback){request.patch(Endpoints.CHANNELS + "/" + channelID + "/messages/" + messageID).set("authorization",token).send(messageParameters).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.getChannelLogs = function(token,channelID,amount,callback){request.get(Endpoints.CHANNELS + "/" + channelID + "/messages?limit=" + amount).set("authorization",token).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.createChannel = function(token,serverID,name,type,callback){request.post(Endpoints.SERVERS + "/" + serverID + "/channels").set("authorization",token).send({name:name,type:type}).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.deleteChannel = function(token,channelID,callback){request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization",token).end(function(err){err?callback(err):callback(null);});};Internal.XHR.deleteServer = function(token,serverID,callback){request.del(Endpoints.SERVERS + "/" + serverID).set("authorization",token).end(function(err){err?callback(err):callback(null);});};Internal.XHR.getChannels = function(token,serverID,callback){request.get(Endpoints.SERVERS + "/" + serverID + "/channels").set("authorization",token).end(function(err){err?callback(err):callback(null);});};Internal.XHR.getServer = function(token,serverID,callback){request.get(Endpoints.SERVERS + "/" + serverID).set("authorization",token).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.acceptInvite = function(token,inviteID,callback){request.post(Endpoints.API + "/invite/" + inviteID).set("authorization",token).end(function(err,res){if(err){callback(err);}else {callback(null,res.body);}});};Internal.XHR.setUsername = function(token,avatar,email,newPassword,password,username,callback){request.patch(Endpoints.API + "/users/@me").set("authorization",token).send({avatar:avatar,email:email,new_password:newPassword,password:password,username:username}).end(function(err){callback(err);});};exports.Internal = Internal;
+"use strict";
+
+var request = require("superagent");
+var Endpoints = require("./endpoints.js");
+
+var Internal = {};
+
+Internal.XHR = {};
+Internal.WebSocket = {};
+
+Internal.WebSocket.properties = {
+	"$os": "discord.js",
+	"$browser": "discord.js",
+	"$device": "discord.js",
+	"$referrer": "",
+	"$referring_domain": ""
+};
+
+Internal.XHR.login = function (email, password, callback) {
+
+	request.post(Endpoints.LOGIN).send({
+		email: email,
+		password: password
+	}).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body.token);
+		}
+	});
+};
+
+Internal.XHR.logout = function (token, callback) {
+
+	request.post(Endpoints.LOGOUT).end(function (err, res) {
+
+		err ? callback(err) : callback(null);
+	});
+};
+
+Internal.XHR.createServer = function (token, name, region, callback) {
+
+	request.post(Endpoints.SERVERS).set("authorization", token).send({
+		name: name,
+		region: region
+	}).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.leaveServer = function (token, serverId, callback) {
+
+	request.del(Endpoints.SERVERS + "/" + serverId).set("authorization", token).end(function (err, res) {
+
+		err ? callback(err) : callback(null);
+	});
+};
+
+Internal.XHR.createInvite = function (token, channelId, options, callback) {
+	request.post(Endpoints.CHANNELS + "/" + channelId + "/invites").set("authorization", token).send(options).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.startPM = function (token, selfID, userID, callback) {
+
+	request.post(Endpoints.USERS + "/" + selfID + "/channels").set("authorization", token).send({
+		recipient_id: userID
+	}).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.sendMessage = function (token, channelID, messageParameters, callback) {
+	request.post(Endpoints.CHANNELS + "/" + channelID + "/messages").set("authorization", token).send(messageParameters).end(function (err, res) {
+
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.sendFile = function (token, channelID, file, fileName, callback) {
+	request.post(Endpoints.CHANNELS + "/" + channelID + "/messages").set("authorization", token).attach("file", file, fileName).end(function (err, res) {
+
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.deleteMessage = function (token, channelID, messageID, callback) {
+	request.del(Endpoints.CHANNELS + "/" + channelID + "/messages/" + messageID).set("authorization", token).end(function (err) {
+		err ? callback(err) : callback(null);
+	});
+};
+
+Internal.XHR.updateMessage = function (token, channelID, messageID, messageParameters, callback) {
+
+	request.patch(Endpoints.CHANNELS + "/" + channelID + "/messages/" + messageID).set("authorization", token).send(messageParameters).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.getChannelLogs = function (token, channelID, amount, callback) {
+	request.get(Endpoints.CHANNELS + "/" + channelID + "/messages?limit=" + amount).set("authorization", token).end(function (err, res) {
+
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.createChannel = function (token, serverID, name, type, callback) {
+	request.post(Endpoints.SERVERS + "/" + serverID + "/channels").set("authorization", token).send({
+		name: name,
+		type: type
+	}).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.deleteChannel = function (token, channelID, callback) {
+
+	request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization", token).end(function (err) {
+		err ? callback(err) : callback(null);
+	});
+};
+Internal.XHR.deleteServer = function (token, serverID, callback) {
+	request.del(Endpoints.SERVERS + "/" + serverID).set("authorization", token).end(function (err) {
+		err ? callback(err) : callback(null);
+	});
+};
+
+Internal.XHR.getChannels = function (token, serverID, callback) {
+	request.get(Endpoints.SERVERS + "/" + serverID + "/channels").set("authorization", token).end(function (err) {
+		err ? callback(err) : callback(null);
+	});
+};
+
+Internal.XHR.getServer = function (token, serverID, callback) {
+
+	request.get(Endpoints.SERVERS + "/" + serverID).set("authorization", token).end(function (err, res) {
+
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.acceptInvite = function (token, inviteID, callback) {
+
+	request.post(Endpoints.API + "/invite/" + inviteID).set("authorization", token).end(function (err, res) {
+		if (err) {
+			callback(err);
+		} else {
+			callback(null, res.body);
+		}
+	});
+};
+
+Internal.XHR.setUsername = function (token, avatar, email, newPassword, password, username, callback) {
+
+	request.patch(Endpoints.API + "/users/@me").set("authorization", token).send({
+		avatar: avatar,
+		email: email,
+		new_password: newPassword,
+		password: password,
+		username: username
+	}).end(function (err) {
+		callback(err);
+	});
+};
+
+exports.Internal = Internal;
\ No newline at end of file
diff --git a/lib/invite.js b/lib/invite.js
index 5ff2ddf15..5f51dc1a9 100644
--- a/lib/invite.js
+++ b/lib/invite.js
@@ -1 +1,35 @@
-"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 Invite=(function(){function Invite(data,client){_classCallCheck(this,Invite);this.max_age = data.max_age;this.code = data.code;this.server = client.getServer("id",data.guild.id);this.revoked = data.revoked;this.created_at = Date.parse(data.created_at);this.temporary = data.temporary;this.uses = data.uses;this.max_uses = data.uses;this.inviter = client.addUser(data.inviter);this.xkcd = data.xkcdpass;this.channel = client.getChannel("id",data.channel.id);}_createClass(Invite,[{key:"URL",get:function get(){var code=this.xkcd?this.xkcdpass:this.code;return "https://discord.gg/" + code;}}]);return Invite;})();module.exports = Invite;
+"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 Invite = (function () {
+    function Invite(data, client) {
+        _classCallCheck(this, Invite);
+
+        this.max_age = data.max_age;
+        this.code = data.code;
+        this.server = client.getServer("id", data.guild.id);
+        this.revoked = data.revoked;
+        this.created_at = Date.parse(data.created_at);
+        this.temporary = data.temporary;
+        this.uses = data.uses;
+        this.max_uses = data.uses;
+        this.inviter = client.addUser(data.inviter);
+        this.xkcd = data.xkcdpass;
+        this.channel = client.getChannel("id", data.channel.id);
+    }
+
+    _createClass(Invite, [{
+        key: "URL",
+        get: function get() {
+            var code = this.xkcd ? this.xkcdpass : this.code;
+            return "https://discord.gg/" + code;
+        }
+    }]);
+
+    return Invite;
+})();
+
+module.exports = Invite;
\ No newline at end of file
diff --git a/lib/message.js b/lib/message.js
index 26d9e4f69..72c1eb7f2 100644
--- a/lib/message.js
+++ b/lib/message.js
@@ -1,3 +1,75 @@
-"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 PMChannel=require("./PMChannel.js");var Message=(function(){function Message(data,channel,mentions,author){_classCallCheck(this,Message);this.tts = data.tts;this.timestamp = Date.parse(data.timestamp);this.nonce = data.nonce;this.mentions = mentions;this.everyoneMentioned = data.mention_everyone;this.id = data.id;this.embeds = data.embeds;this.editedTimestamp = data.edited_timestamp;this.content = data.content.trim();this.channel = channel;if(this.isPrivate){this.author = this.channel.client.getUser("id",author.id);}else {this.author = this.channel.server.getMember("id",author.id) || this.channel.client.getUser("id",author.id);}this.attachments = data.attachments;} /*exports.Message.prototype.isPM = function() {
-	return ( this.channel instanceof PMChannel );
-}*/Message.prototype.isMentioned = function isMentioned(user){var id=user.id?user.id:user;for(var _iterator=this.mentions,_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 mention=_ref;if(mention.id === id){return true;}}return false;};_createClass(Message,[{key:"sender",get:function get(){return this.author;}},{key:"isPrivate",get:function get(){return this.channel.isPrivate;}}]);return Message;})();module.exports = Message;
+"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 PMChannel = require("./PMChannel.js");
+
+var Message = (function () {
+	function Message(data, channel, mentions, author) {
+		_classCallCheck(this, Message);
+
+		this.tts = data.tts;
+		this.timestamp = Date.parse(data.timestamp);
+		this.nonce = data.nonce;
+		this.mentions = mentions;
+		this.everyoneMentioned = data.mention_everyone;
+		this.id = data.id;
+		this.embeds = data.embeds;
+		this.editedTimestamp = data.edited_timestamp;
+		this.content = data.content.trim();
+		this.channel = channel;
+
+		if (this.isPrivate) {
+			this.author = this.channel.client.getUser("id", author.id);
+		} else {
+			this.author = this.channel.server.getMember("id", author.id) || this.channel.client.getUser("id", author.id);
+		}
+
+		this.attachments = data.attachments;
+	}
+
+	/*exports.Message.prototype.isPM = function() {
+ 	return ( this.channel instanceof PMChannel );
+ }*/
+
+	Message.prototype.isMentioned = function isMentioned(user) {
+		var id = user.id ? user.id : user;
+		for (var _iterator = this.mentions, _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 mention = _ref;
+
+			if (mention.id === id) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	_createClass(Message, [{
+		key: "sender",
+		get: function get() {
+			return this.author;
+		}
+	}, {
+		key: "isPrivate",
+		get: function get() {
+			return this.channel.isPrivate;
+		}
+	}]);
+
+	return Message;
+})();
+
+module.exports = Message;
\ No newline at end of file
diff --git a/lib/server.js b/lib/server.js
index 871e30928..46676d5eb 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -24,29 +24,21 @@ var Server = (function () {
 
 		this.roles = [];
 
-		var _iteratorNormalCompletion = true;
-		var _didIteratorError = false;
-		var _iteratorError = undefined;
+		for (var _iterator = data.roles, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+			var _ref;
 
-		try {
-			for (var _iterator = data.roles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-				var permissionGroup = _step.value;
+			if (_isArray) {
+				if (_i >= _iterator.length) break;
+				_ref = _iterator[_i++];
+			} else {
+				_i = _iterator.next();
+				if (_i.done) break;
+				_ref = _i.value;
+			}
 
-				this.roles.push(new ServerPermissions(permissionGroup));
-			}
-		} catch (err) {
-			_didIteratorError = true;
-			_iteratorError = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion && _iterator["return"]) {
-					_iterator["return"]();
-				}
-			} finally {
-				if (_didIteratorError) {
-					throw _iteratorError;
-				}
-			}
+			var permissionGroup = _ref;
+
+			this.roles.push(new ServerPermissions(permissionGroup));
 		}
 
 		if (!data.members) {
@@ -54,251 +46,192 @@ var Server = (function () {
 			return;
 		}
 
-		var _iteratorNormalCompletion2 = true;
-		var _didIteratorError2 = false;
-		var _iteratorError2 = undefined;
+		for (var _iterator2 = data.members, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+			var _ref2;
 
-		try {
-			for (var _iterator2 = data.members[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-				var member = _step2.value;
+			if (_isArray2) {
+				if (_i2 >= _iterator2.length) break;
+				_ref2 = _iterator2[_i2++];
+			} else {
+				_i2 = _iterator2.next();
+				if (_i2.done) break;
+				_ref2 = _i2.value;
+			}
 
-				// first we cache the user in our Discord Client,
-				// then we add it to our list. This way when we
-				// get a user from this server's member list,
-				// it will be identical (unless an async change occurred)
-				// to the client's cache.
-				if (member.user) this.addMember(client.addUser(member.user), member.roles);
-			}
-		} catch (err) {
-			_didIteratorError2 = true;
-			_iteratorError2 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion2 && _iterator2["return"]) {
-					_iterator2["return"]();
-				}
-			} finally {
-				if (_didIteratorError2) {
-					throw _iteratorError2;
-				}
-			}
+			var member = _ref2;
+
+			// first we cache the user in our Discord Client,
+			// then we add it to our list. This way when we
+			// get a user from this server's member list,
+			// it will be identical (unless an async change occurred)
+			// to the client's cache.
+			if (member.user) this.addMember(client.addUser(member.user), member.roles);
 		}
 	}
 
-	_createClass(Server, [{
-		key: "getRole",
+	// get/set
 
-		// get/set
+	Server.prototype.getRole = function getRole(id) {
+		for (var _iterator3 = this.roles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+			var _ref3;
 
-		value: function getRole(id) {
-			var _iteratorNormalCompletion3 = true;
-			var _didIteratorError3 = false;
-			var _iteratorError3 = undefined;
-
-			try {
-				for (var _iterator3 = this.roles[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-					var role = _step3.value;
-
-					if (role.id === id) {
-						return role;
-					}
-				}
-			} catch (err) {
-				_didIteratorError3 = true;
-				_iteratorError3 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
-						_iterator3["return"]();
-					}
-				} finally {
-					if (_didIteratorError3) {
-						throw _iteratorError3;
-					}
-				}
-			}
-
-			return null;
-		}
-	}, {
-		key: "updateRole",
-		value: function updateRole(data) {
-
-			var oldRole = this.getRole(data.id);
-
-			if (oldRole) {
-
-				var index = this.roles.indexOf(oldRole);
-				this.roles[index] = new ServerPermissions(data);
-
-				return this.roles[index];
+			if (_isArray3) {
+				if (_i3 >= _iterator3.length) break;
+				_ref3 = _iterator3[_i3++];
 			} else {
-				return false;
+				_i3 = _iterator3.next();
+				if (_i3.done) break;
+				_ref3 = _i3.value;
+			}
+
+			var role = _ref3;
+
+			if (role.id === id) {
+				return role;
 			}
 		}
-	}, {
-		key: "removeRole",
-		value: function removeRole(id) {
-			for (var roleId in this.roles) {
-				if (this.roles[roleId].id === id) {
-					this.roles.splice(roleId, 1);
-				}
-			}
 
-			var _iteratorNormalCompletion4 = true;
-			var _didIteratorError4 = false;
-			var _iteratorError4 = undefined;
+		return null;
+	};
 
-			try {
-				for (var _iterator4 = this.members[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-					var member = _step4.value;
+	Server.prototype.updateRole = function updateRole(data) {
 
-					for (var roleId in member.rawRoles) {
-						if (member.rawRoles[roleId] === id) {
-							member.rawRoles.splice(roleId, 1);
-						}
-					}
-				}
-			} catch (err) {
-				_didIteratorError4 = true;
-				_iteratorError4 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
-						_iterator4["return"]();
-					}
-				} finally {
-					if (_didIteratorError4) {
-						throw _iteratorError4;
-					}
-				}
-			}
-		}
-	}, {
-		key: "getChannel",
-		value: function getChannel(key, value) {
-			var _iteratorNormalCompletion5 = true;
-			var _didIteratorError5 = false;
-			var _iteratorError5 = undefined;
+		var oldRole = this.getRole(data.id);
 
-			try {
-				for (var _iterator5 = this.channels[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-					var channel = _step5.value;
+		if (oldRole) {
 
-					if (channel[key] === value) {
-						return channel;
-					}
-				}
-			} catch (err) {
-				_didIteratorError5 = true;
-				_iteratorError5 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion5 && _iterator5["return"]) {
-						_iterator5["return"]();
-					}
-				} finally {
-					if (_didIteratorError5) {
-						throw _iteratorError5;
-					}
-				}
-			}
-
-			return null;
-		}
-	}, {
-		key: "getMember",
-		value: function getMember(key, value) {
-			var _iteratorNormalCompletion6 = true;
-			var _didIteratorError6 = false;
-			var _iteratorError6 = undefined;
-
-			try {
-				for (var _iterator6 = this.members[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-					var member = _step6.value;
-
-					if (member[key] === value) {
-						return member;
-					}
-				}
-			} catch (err) {
-				_didIteratorError6 = true;
-				_iteratorError6 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion6 && _iterator6["return"]) {
-						_iterator6["return"]();
-					}
-				} finally {
-					if (_didIteratorError6) {
-						throw _iteratorError6;
-					}
-				}
-			}
-
-			return null;
-		}
-	}, {
-		key: "removeMember",
-		value: function removeMember(key, value) {
-			var _iteratorNormalCompletion7 = true;
-			var _didIteratorError7 = false;
-			var _iteratorError7 = undefined;
-
-			try {
-				for (var _iterator7 = this.members[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-					var member = _step7.value;
-
-					if (member[key] === value) {
-						this.members.splice(key, 1);
-						return member;
-					}
-				}
-			} catch (err) {
-				_didIteratorError7 = true;
-				_iteratorError7 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
-						_iterator7["return"]();
-					}
-				} finally {
-					if (_didIteratorError7) {
-						throw _iteratorError7;
-					}
-				}
-			}
+			var index = this.roles.indexOf(oldRole);
+			this.roles[index] = new ServerPermissions(data);
 
+			return this.roles[index];
+		} else {
 			return false;
 		}
-	}, {
-		key: "addChannel",
-		value: function addChannel(chann) {
-			if (!this.getChannel("id", chann.id)) {
-				this.channels.push(chann);
+	};
+
+	Server.prototype.removeRole = function removeRole(id) {
+		for (var roleId in this.roles) {
+			if (this.roles[roleId].id === id) {
+				this.roles.splice(roleId, 1);
 			}
-			return chann;
 		}
-	}, {
-		key: "addMember",
-		value: function addMember(user, roles) {
-			if (!this.getMember("id", user.id)) {
-				var mem = new Member(user, this, roles);
-				this.members.push(mem);
+
+		for (var _iterator4 = this.members, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+			var _ref4;
+
+			if (_isArray4) {
+				if (_i4 >= _iterator4.length) break;
+				_ref4 = _iterator4[_i4++];
+			} else {
+				_i4 = _iterator4.next();
+				if (_i4.done) break;
+				_ref4 = _i4.value;
+			}
+
+			var member = _ref4;
+
+			for (var roleId in member.rawRoles) {
+				if (member.rawRoles[roleId] === id) {
+					member.rawRoles.splice(roleId, 1);
+				}
 			}
-			return mem;
 		}
-	}, {
-		key: "toString",
-		value: function toString() {
-			return this.name;
+	};
+
+	Server.prototype.getChannel = function getChannel(key, value) {
+		for (var _iterator5 = this.channels, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+			var _ref5;
+
+			if (_isArray5) {
+				if (_i5 >= _iterator5.length) break;
+				_ref5 = _iterator5[_i5++];
+			} else {
+				_i5 = _iterator5.next();
+				if (_i5.done) break;
+				_ref5 = _i5.value;
+			}
+
+			var channel = _ref5;
+
+			if (channel[key] === value) {
+				return channel;
+			}
 		}
-	}, {
-		key: "equals",
-		value: function equals(object) {
-			return object.id === this.id;
+
+		return null;
+	};
+
+	Server.prototype.getMember = function getMember(key, value) {
+		for (var _iterator6 = this.members, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+			var _ref6;
+
+			if (_isArray6) {
+				if (_i6 >= _iterator6.length) break;
+				_ref6 = _iterator6[_i6++];
+			} else {
+				_i6 = _iterator6.next();
+				if (_i6.done) break;
+				_ref6 = _i6.value;
+			}
+
+			var member = _ref6;
+
+			if (member[key] === value) {
+				return member;
+			}
 		}
-	}, {
+
+		return null;
+	};
+
+	Server.prototype.removeMember = function removeMember(key, value) {
+		for (var _iterator7 = this.members, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+			var _ref7;
+
+			if (_isArray7) {
+				if (_i7 >= _iterator7.length) break;
+				_ref7 = _iterator7[_i7++];
+			} else {
+				_i7 = _iterator7.next();
+				if (_i7.done) break;
+				_ref7 = _i7.value;
+			}
+
+			var member = _ref7;
+
+			if (member[key] === value) {
+				this.members.splice(key, 1);
+				return member;
+			}
+		}
+
+		return false;
+	};
+
+	Server.prototype.addChannel = function addChannel(chann) {
+		if (!this.getChannel("id", chann.id)) {
+			this.channels.push(chann);
+		}
+		return chann;
+	};
+
+	Server.prototype.addMember = function addMember(user, roles) {
+		if (!this.getMember("id", user.id)) {
+			var mem = new Member(user, this, roles);
+			this.members.push(mem);
+		}
+		return mem;
+	};
+
+	Server.prototype.toString = function toString() {
+		return this.name;
+	};
+
+	Server.prototype.equals = function equals(object) {
+		return object.id === this.id;
+	};
+
+	_createClass(Server, [{
 		key: "permissionGroups",
 		get: function get() {
 			return this.roles;
diff --git a/src/EvaluatedPermissions.js b/src/EvaluatedPermissions.js
index 5fef65fe9..b7ccd1dde 100644
--- a/src/EvaluatedPermissions.js
+++ b/src/EvaluatedPermissions.js
@@ -2,15 +2,33 @@ class EvaluatedPermissions {
 	constructor(data) {
 
 		var self = this;
-
-		function getBit(x) {
-			if (((self.packed >>> 3) & 1) === 1) {
-				return true;
-			}
-			return ((self.packed >>> x) & 1) === 1;
-		}
-
+		
 		this.packed = data;
+		
+		if(this.getBit(3))
+			this.packed = 4294967295;
+	}
+
+	serialise() {
+		return {
+			createInstantInvite : this.createInstantInvite,
+			manageRoles : this.manageRoles,
+			manageChannels : this.manageChannels,
+			readMessages : this.readMessages,
+			sendMessages : this.sendMessage,
+			sendTTSMessages : this.sendTTSMessages,
+			manageMessages : this.manageMessages,
+			embedLinks : this.embedLinks,
+			attachFiles : this.attachFiles,
+			readMessageHistory : this.readMessageHistory,
+			mentionEveryone : this.mentionEveryone,
+			voiceConnect : this.voiceConnect,
+			voiceSpeak : this.voiceSpeak,
+			voiceMuteMembers : this.voiceMuteMembers,
+			voiceDeafenMembers : this.voiceDeafenMembers,
+			voiceMoveMember : this.voiceMoveMembers,
+			voiceUseVoiceActivation : this.voiceUseVoiceActivation
+		}
 	}
 
 	get createInstantInvite() { return this.getBit(0); }
diff --git a/test/bot.1.js b/test/bot.1.js
index 97ca23558..308b1202a 100644
--- a/test/bot.1.js
+++ b/test/bot.1.js
@@ -24,7 +24,12 @@ mybot.on("message", function (message) {
 	
 	console.log( mybot.getUser("username", "meew0") );
 	
-	mybot.reply(message, JSON.stringify(message.mentions, null, 4));
+	var perms = JSON.stringify(message.channel.permissionsOf(user).serialise(), null, 4);
+	perms = JSON.parse(perms);
+	
+	mybot.sendMessage(message,
+		JSON.stringify(perms, null, 4).replace(new RegExp("true", "g"), "**true**")
+	);
 	
 });