       .catch (e)=>
         msg.reply 'Something went wrong.'
 
-    @registerCommand 'setwaifu', {
-      aliases: ['setHusbando'],
-      includeCommandNameInArgs: true
+    @registerCommand 'safebooru', {
       allowDM: true
-    }, (msg, args, d)=>
-      waifu = (args[1].match(/\w+/) or [''])[0]
-      return msg.reply "Usage: ```#{@prefix}#{args[0]} <danbooru_tag>```" if not waifu
+      aliases: ['safe']
+    }, (msg, tags, d)=>
+      qs = {
+        random: true
+        limit: 1
+        tags
+      }
+      safebooru.get '/posts.json', { json: true, qs }
+      .then (r)=>
+        url = "https://safebooru.donmai.us#{r[0].file_url}"
+        msg.channel.uploadFile request(url), @getFileName(url)
+      .catch (e)=>
+        msg.reply 'Something went wrong.'
+
+    @registerCommand 'setwaifu', { allowDM: true }, (msg, args, d)=>
+      waifu = (args.match(/\w+/) or [''])[0]
+      return msg.reply "Usage: ```#{@prefix}setWaifu <safebooru_tag>```" if not waifu
       # Do a dummy search
       qs = {
         limit: 1
-        tags: 'rating:safe ' + waifu
+        tags: '1girl ' + waifu
       }
-      danbooru.get '/posts.json', { json: true, qs }
+      safebooru.get '/posts.json', { json: true, qs }
       .then (r)=>
-        return Promise.reject { msg: 'Invalid danbooru tag.' } if not r.length
+        return Promise.reject { msg: 'Invalid safebooru tag.' } if not r.length
         Waifu.filter({ user: msg.author.id }).run()
       .then (results)=>
         return results[0] if results[0]?

        qs = {
          limit: 1
          random: true
          tags: 'rating:safe ' + results[0].waifu
        }
        danbooru.get '/posts.json', { json: true, qs }
      .then (r)=>
        url = "https://danbooru.donmai.us#{r[0].file_url}"
        msg.channel.uploadFile request(url), @getFileName(url)
      .catch (e)=>
        return msg.reply e.msg if e.msg

        msg.reply 'Something went wrong.'

    @registerCommand 'waifu', {
      aliases: ['w'],
      allowDM: true
    }, (msg)=>
      Waifu.filter({ user: msg.author.id }).run()
