diff --git a/Shared/factions.js b/Shared/factions.js
index 8b74575..6e65dda 100644
--- a/Shared/factions.js
+++ b/Shared/factions.js
@@ -36,20 +36,20 @@ exports.GetFactionName = function(factionRole) {
 
 //GetFactionChannel
 //user - discord.js user
-exports.GetFactionChannel = function(user) {
+exports.GetFactionChannel = function(factionRole) {
 	//factionRole must be a faction role
 	if (!exports.CheckFaction(factionRole)) {
 		throw "factionRole is not a faction!";
 	}
 
-	if (user.roles.has(process.env.GROUP_A_ROLE)) {
-		return process.env.GROUP_A_BOT_ID;
+	if (factionRole === process.env.GROUP_A_ROLE) {
+		return process.env.GROUP_A_CHANNEL_ID;
 	}
-	if (user.roles.has(process.env.GROUP_B_ROLE)) {
-		return process.env.GROUP_B_BOT_ID;
+	if (factionRole === process.env.GROUP_B_ROLE) {
+		return process.env.GROUP_B_CHANNEL_ID;
 	}
-	if (user.roles.has(process.env.GROUP_C_ROLE)) {
-		return process.env.GROUP_C_BOT_ID;
+	if (factionRole === process.env.GROUP_C_ROLE) {
+		return process.env.GROUP_C_CHANNEL_ID;
 	}
 }
 
@@ -66,13 +66,13 @@ exports.ChangeFaction = async function(client, factionRole, channel, member) {
 
 	//handle channel strings
 	if (typeof(channel) === "string") {
-		channel = client.channels.find(item => item.name === channel);
+		channel = client.channels.find(item => item.name === channel || item.id === channel);
 	}
 
 	//handle member strings
 	if (typeof(member) === "string") {
 		//get the member
-		let user = client.users.find(item => item.username === member);
+		let user = client.users.find(item => item.username === member || item.id === member);
 		let guild = client.guilds.get(process.env.SANCTUM_ID);
 		member = guild.members.get(user.id);
 	}
diff --git a/Shared/messaging.js b/Shared/messaging.js
index 5631efb..903cb48 100644
--- a/Shared/messaging.js
+++ b/Shared/messaging.js
@@ -17,7 +17,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
 
 	//handle user strings
 	if (typeof(user) === "string") {
-		user = client.users.find(item => item.username === user);
+		user = client.users.find(item => item.username === user || item.id === user);
 		if (!user) {
 			throw "Can't find that user";
 		}
@@ -25,7 +25,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
 
 	//handle channel strings
 	if (typeof(channel) === "string") {
-		channel = client.channels.find(item => item.name === channel);
+		channel = client.channels.find(item => item.name === channel || item.id === channel);
 		if (!channel) {
 			throw "Can't find that channel";
 		}
@@ -55,7 +55,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
 exports.SendPrivateMessage = function(client, user, message) {
 	//handle user strings
 	if (typeof(user) === "string") {
-		user = client.users.find(item => item.username === user);
+		user = client.users.find(item => item.username === user || item.id === user);
 	}
 
 	user.send(message);
diff --git a/Shared/progression.js b/Shared/progression.js
index 7295300..4f67ca5 100644
--- a/Shared/progression.js
+++ b/Shared/progression.js
@@ -9,7 +9,7 @@ const dataRequest = require('../modules/dataRequest');
 exports.AddXP = function(client, user, amount) {
 	//handle user strings
 	if (typeof(user) === "string") {
-		user = client.users.find(item => item.username === user);
+		user = client.users.find(item => item.username === user || item.id === user);
 	}
 
 	dataRequest.sendServerData("addXP", amount, user.id);
@@ -22,7 +22,7 @@ exports.LevelUp = function(client, member) { //NOTE: why is this called separate
 	//handle member strings
 	if (typeof(member) === "string") {
 		//get the member
-		let user = client.users.find(item => item.username === member);
+		let user = client.users.find(item => item.username === member || item.id === member);
 		let guild = client.guilds.get(process.env.SANCTUM_ID);
 		member = guild.members.get(user.id);
 	}
@@ -59,7 +59,7 @@ exports.RankUp = async function(client, member, level) {
 	//handle member strings
 	if (typeof(member) === "string") {
 		//get the member
-		let user = client.users.find(item => item.username === member);
+		let user = client.users.find(item => item.username === member || item.id === member);
 		member = guild.members.get(user.id);
 	}
 
diff --git a/Shared/utility.js b/Shared/utility.js
index edcf8e0..310df81 100644
--- a/Shared/utility.js
+++ b/Shared/utility.js
@@ -78,7 +78,7 @@ exports.FormatMSS = function(s){
 exports.IsAdmin = function(client, user) {
 	//handle user strings
 	if (typeof(user) === "string") {
-		user = client.users.find(item => item.username === user);
+		user = client.users.find(item => item.username === user || item.id === user);
 	}
 
 	let guild = client.guilds.get(process.env.SANCTUM_ID);
@@ -107,14 +107,14 @@ exports.CheckValidDisplay = function(client, member, channel, checkRole) { //See
 	//handle member strings
 	if (typeof(member) === "string") {
 		//get the member
-		let user = client.users.find(item => item.username === member);
+		let user = client.users.find(item => item.username === member || item.id === member);
 		let guild = client.guilds.get(process.env.SANCTUM_ID);
 		member = guild.members.get(user.id);
 	}
 
 	//handle channel strings
 	if (typeof(channel) === "string") {
-		channel = client.channels.find(item => item.name === channel);
+		channel = client.channels.find(item => item.name === channel || item.id === channel);
 	}
 
 	switch(client.user.username) {