diff --git a/commands/misc/timer.js b/commands/misc/timer.js
index 5e450d0..bfa406e 100644
--- a/commands/misc/timer.js
+++ b/commands/misc/timer.js
@@ -1,4 +1,4 @@
-const parseTime = require('../../util/parseTime');
+const parseTime = require('../../util/timer/parseTime');
 module.exports = {
 	name: "timer",
 	description: "Set a timer for a time in minutes.",
@@ -6,16 +6,20 @@ module.exports = {
 	,"`<prefix>timer <time_in_minutes> <message_to_send>`"
 	,"`<prefix>timer <time>(m|h|s) <message_to_send>`"
 	,"Bot will mention you after the time has passed, with the custom message."],
-	execute({message, args}) {
-		if(args.length < 2)
-			return message.channel.send("Please specify a time in minutes, and a message to send after the timer has finished");
-		let time = parseTime(args[0]);
-		if(isNaN(time))
-			return message.channel.send("Specify a time in number of minutes");
-		let sendText = args.slice(1).join(" ");
-		setTimeout(function(){
-			message.channel.send(`<@${message.author.id}>, ${sendText}`);
-		}, time);
-		message.channel.send(`I will remind you <t:${Math.floor(new Date() / 1000) + (time / 1000) - 4}:R>`);
+	execute({client, message, args}) {
+		if(args.length < 2 || isNaN(time))
+			return message.channel.send("Please specify a time, and a message to send after the timer has finished");
+		let currentUnixTime = Math.floor(new Date() / 1000);
+		let timeInSeconds = parseTime(args[0]);
+		let customMessage = args.slice(1).join(" ");
+		let reminderTime = currentUnixTime + timeInSeconds
+		const newTimer = {
+			"user": `${message.author.id}`,
+			"reminderDate": reminderTime,
+			"channel": `${message.channel.id}`,
+			"customMessage": `${customMessage}`
+		}
+		client.timers.push(newTimer);
+		message.channel.send(`I will remind you <t:${reminderTime}:R>`);
 	}
 };
\ No newline at end of file
diff --git a/server.js b/server.js
index 30fc028..db3c020 100644
--- a/server.js
+++ b/server.js
@@ -20,6 +20,7 @@ client.settings = new Discord.Collection();
 client.commands = new Discord.Collection();
 client.serverPrefixes = new Discord.Collection();
 client.netmodules = new Discord.Collection();
+client.timers = require('./data/timers.json')
 
 client.settings.set("presenceType", presenceType);
 client.settings.set("presenceText", presenceText);
diff --git a/server/message.js b/server/message.js
index 394f601..0740a41 100644
--- a/server/message.js
+++ b/server/message.js
@@ -3,8 +3,9 @@ const customReplaceWithVariables = require('../util/custom_commands/customReplac
 
 module.exports = function(client, owners, message, globalPrefix){
 	let prefix = globalPrefix;
-	if (client.serverPrefixes.get(message.guild.id)) {
-		prefix = client.serverPrefixes.get(message.guild.id)
+	let serverPrefix = client.serverPrefixes.get(message.guild.id);
+	if (serverPrefix) {
+		prefix = serverPrefix;
 	}
 	
 	let args = message.content.slice(prefix.length).split(" ")
diff --git a/server/ready.js b/server/ready.js
index ddd789b..549ce32 100644
--- a/server/ready.js
+++ b/server/ready.js
@@ -1,4 +1,5 @@
 const loadServerPrefixes = require('../util/loadServerPrefixes');
+const checkTimer = require('../util/timer/checkTimer');
 const updatePresence = require('../util/updatePresence');
 
 module.exports = function(client, enableLoginMessage, loginChannel, loginMessage) {
@@ -12,4 +13,5 @@ module.exports = function(client, enableLoginMessage, loginChannel, loginMessage
 			console.log("Failed trying to send a message on login.\n")
 		}
 	loadServerPrefixes(client)
+	checkTimer(client);
 }
diff --git a/util/timer/checkTimer.js b/util/timer/checkTimer.js
new file mode 100644
index 0000000..13f71a1
--- /dev/null
+++ b/util/timer/checkTimer.js
@@ -0,0 +1,11 @@
+const checkTimer = require('./checkTimer')
+const sendTimerReminder = require('./sendTimerReminder')
+module.exports = function (client) {
+	client.timers.forEach(timer => {
+		if(parseInt(timer.reminderDate) >= Math.floor(new Date() / 1000)){
+			sendTimerReminder(client, timer);
+			client.timers.pop(timer);
+		}
+	});
+	setTimeout(checkTimer, 1000, client);
+}
diff --git a/util/timer/parseTime.js b/util/timer/parseTime.js
new file mode 100644
index 0000000..0984b30
--- /dev/null
+++ b/util/timer/parseTime.js
@@ -0,0 +1,19 @@
+module.exports = function(time){
+	let timeInSeconds = parseInt(time.slice(0, time.length - 1))
+	let letter = time.slice(time.length - 1)
+	if(!isNaN(letter)) return parseInt(time) * 60;
+	switch (letter.toUpperCase()) {
+		case "H":
+			timeInSeconds = timeInSeconds * 3600;	// 3 600 000
+			break;
+		case "M":
+			timeInSeconds = timeInSeconds * 60;		// 60 000
+			break;
+		case "S":
+			timeInSeconds = timeInSeconds;			// 1 000
+			break;
+		default:
+			timeInSeconds = -1;
+	}
+	return timeInSeconds;
+}
diff --git a/util/timer/sendTimerReminder.js b/util/timer/sendTimerReminder.js
new file mode 100644
index 0000000..717c0d4
--- /dev/null
+++ b/util/timer/sendTimerReminder.js
@@ -0,0 +1,3 @@
+module.exports = function (client, timer) {
+	client.channels.cache.get(timer.channel).send(`<@${timer.user}>, ${timer.customMessage}`);
+}
\ No newline at end of file