diff --git a/app/dragon-bot.py b/app/dragon-bot.py
index 57aa3772..da68e14a 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -10,6 +10,7 @@ import define_word
 import help_methods
 import discord
 import docker
+import wallpaper
 from pybooru import Danbooru
 
 # Client object
@@ -191,17 +192,10 @@ async def on_message(message):
         # await client.send_message(message.channel, 'Deleted {} message(s)'.format(len(deleted)))
 
     if message.content.startswith('!wallpaper'):
-        url = 'https://source.unsplash.com/3840x2160/'
-        if len(message.content.split()) > 1:
-            keyword = message.content.split()[1]
-            url = "?".join((url, keyword))
-
-            if 'waifu' in keyword:
-                url = 'https://media0.giphy.com/media/C79RKZ7nOcK8U/giphy.gif'
-
-        results = requests.get(url).url
-        await client.send_message(message.channel, results)
-
+        await client.send_message(
+            message.channel,
+            wallpaper.get_wall(message.content)
+    )
 
     ###################################
     ###### +-------------------+ ######
diff --git a/app/help_methods.py b/app/help_methods.py
index 75a809c6..ce4ee995 100644
--- a/app/help_methods.py
+++ b/app/help_methods.py
@@ -45,7 +45,7 @@ def get_help_message(method):
         'wallpaper': [
             'Returns the URL for a 4k wallpaper. You can enter',
             'a search term as well, for example, !wallpaper, or',
-            ', !wallpaper flowers'
+            ', !wallpaper flowers. Supports multiple tags.'
             ]
     }
 
diff --git a/app/wallpaper.py b/app/wallpaper.py
new file mode 100644
index 00000000..a16b3d04
--- /dev/null
+++ b/app/wallpaper.py
@@ -0,0 +1,26 @@
+import requests
+def get_wall(message):
+    unsplash_url = "https://source.unsplash.com/3840x2160/?"
+
+    if len(message.split()) > 2:
+        search_terms = message.split()[1:]
+
+        # Turn search_terms into strings separated by commas
+        joined_terms = ','.join(search_terms)
+
+        # Add those comma separated strings onto the end of the URL variable
+        url = unsplash_url + joined_terms
+
+    elif len(message.split()) > 1:
+        term = message.split()[1]
+        url = unsplash_url + term
+
+    else:
+        url = unsplash_url
+
+    response = requests.get(url).url
+
+    if 'photo-1446704477871-62a4972035cd' in response:
+        return "Could not find an image for those tags."
+    else:
+        return response