diff --git a/slash-commands/savegif.js b/slash-commands/savegif.js
index c80fae3..27f4778 100644
--- a/slash-commands/savegif.js
+++ b/slash-commands/savegif.js
@@ -14,48 +14,80 @@ const strings = require('../strings.json');
 module.exports = {
 	data: new SlashCommandBuilder()
 		.setName('savegif')
-		.setDescription('Search Tenor for a GIF to save')
-		.addStringOption(option =>
-			option.setName('query')
-				.setDescription('Search Query')
+		.setDescription('Save a GIF to Nodbot\'s database.')
+		.addSubcommand(subcommand =>
+			subcommand
+			.setName('searchgif')
+			.setDescription('Search Tenor for a GIF.')
+			.addStringOption(option =>
+				option.setName('query')
+					.setDescription('Search Query')
+					.setRequired(true))
+			.addStringOption(option =>
+				option.setName('name')
+					.setDescription('What to save the gif as')
+					.setRequired(true))
+		)
+		.addSubcommand(subcommand =>
+			subcommand
+			.setName('enterurl')
+			.setDescription('Specify a URL to save.')
+			.addStringOption(option =>
+				option
+				.setName('url')
+				.setDescription('URL Link to the GIF')
 				.setRequired(true))
-		.addStringOption(option =>
-			option.setName('name')
-				.setDescription('What to save the gif as')
-				.setRequired(true)),
+			.addStringOption(option =>
+				option.setName('name')
+					.setDescription('What to save the gif as')
+					.setRequired(true))
+		),
 	async execute(interaction) {
-		// Previous GIF button
-		const prevButton = new MessageButton().setCustomId('prevGif').setLabel('Previous GIF').setStyle('SECONDARY').setDisabled(true);
-		// Confirm GIF Button
-		const confirmButton = new MessageButton().setCustomId('confirmGif').setLabel('Confirm').setStyle('PRIMARY');
-		// Next GIF Button
-		const nextButton = new MessageButton().setCustomId('nextGif').setLabel('Next GIF').setStyle('SECONDARY');
-		// Cancel Button
-		const cancelButton = new MessageButton().setCustomId('cancelGif').setLabel('Cancel').setStyle('DANGER');
-		// Put all the above into an ActionRow to be sent as a component of the reply
-		const actionRow = new MessageActionRow().addComponents(prevButton, confirmButton, nextButton, cancelButton);
+		if (interaction.options.getSubcommand() == 'searchgif') {
+			// Previous GIF button
+			const prevButton = new MessageButton().setCustomId('prevGif').setLabel('Previous GIF').setStyle('SECONDARY').setDisabled(true);
+			// Confirm GIF Button
+			const confirmButton = new MessageButton().setCustomId('confirmGif').setLabel('Confirm').setStyle('PRIMARY');
+			// Next GIF Button
+			const nextButton = new MessageButton().setCustomId('nextGif').setLabel('Next GIF').setStyle('SECONDARY');
+			// Cancel Button
+			const cancelButton = new MessageButton().setCustomId('cancelGif').setLabel('Cancel').setStyle('DANGER');
+			// Put all the above into an ActionRow to be sent as a component of the reply
+			const actionRow = new MessageActionRow().addComponents(prevButton, confirmButton, nextButton, cancelButton);
 
-		// Get the query
-		const query = interaction.options.getString('query');
-		strings.temp.gifName = interaction.options.getString('name').toLowerCase();
+			// Get the query
+			const query = interaction.options.getString('query');
+			strings.temp.gifName = interaction.options.getString('name').toLowerCase();
 
-		// Search Tenor for the GIF
-		tenor.Search.Query(query, '10').then(res => {
-			strings.temp.gifs = [];
-			strings.temp.gifIndex = 0;
-			strings.temp.gifLimit = res.length - 1;
-			strings.temp.gifUserId = interaction.user.id;
+			// Search Tenor for the GIF
+			tenor.Search.Query(query, '10').then(res => {
+				strings.temp.gifs = [];
+				strings.temp.gifIndex = 0;
+				strings.temp.gifLimit = res.length - 1;
+				strings.temp.gifUserId = interaction.user.id;
 
-			if (res[0] == undefined) {
-				interaction.reply('Sorry I was unable to find a GIF of ' + query);
-				return;
-			}
-			for (const row of res) {
-				strings.temp.gifs.push({
-					embed_url: row.media[0].gif.url,
-				});
-			}
-			interaction.reply({ content: strings.temp.gifs[0].embed_url, components: [actionRow], ephemeral: true });
-		});
+				if (res[0] == undefined) {
+					interaction.reply('Sorry I was unable to find a GIF of ' + query);
+					return;
+				}
+				for (const row of res) {
+					strings.temp.gifs.push({
+						embed_url: row.media[0].gif.url,
+					});
+				}
+				interaction.reply({ content: strings.temp.gifs[0].embed_url, components: [actionRow], ephemeral: true });
+			});
+		}
+
+		if (interaction.options.getSubcommand() == 'enterurl') {
+			const gifData = {
+				name: interaction.options.getString('name'),
+				embed_url: interaction.options.getString('url'),
+			};
+			fn.upload.gif(gifData, interaction.client);
+			interaction.reply({ content: `I've saved the GIF as ${gifData.name}.gif`, ephemeral: true });
+			fn.download.gifs(interaction.client);
+		}
+		
 	},
 };
\ No newline at end of file