diff --git a/episode-18-code/commands/uptime.js b/episode-18-code/commands/uptime.js
new file mode 100644
index 0000000..fa3d265
--- /dev/null
+++ b/episode-18-code/commands/uptime.js
@@ -0,0 +1,22 @@
+const Discord = require('discord.js');
+const botconfig = require('../botconfig.json');
+
+module.exports.run = async (bot, message, args) => {
+  let totalSeconds = (bot.uptime / 1000);
+  let hours = Math.floor(totalSeconds / 3600);
+  totalSeconds %= 3600;
+  let minutes = Math.floor(totalSeconds / 60);
+  let seconds = Math.round(totalSeconds % 60);
+
+  let uptime = `${hours} hours, ${minutes} minutes and ${seconds} seconds`;
+
+  let uptimeEmbed = new Discord.RichEmbed()
+  .setAuthor(message.author.tag)
+  .setDescription(`My uptime is ${uptime}.`)
+  .setColor(botconfig.green);
+  
+  message.channel.send(uptimeEmbed);
+}
+module.exports.help = {
+  name: "uptime"
+}