diff --git a/giphy.coffee b/giphy.coffee
new file mode 100644
index 0000000..25d6beb
--- /dev/null
+++ b/giphy.coffee
@@ -0,0 +1,27 @@
+# Commands:
+#   giphy <term> - Returns a randomly selected gif from a search of the giphy api for <term>
+    
+giphy =
+  api_key: process.env.HUBOT_GIPHY_API_KEY
+  api_url: 'http://api.giphy.com/v1'
+    
+  
+  search: (msg, q, callback) ->
+    endpoint = '/gifs/search'
+    url = "#{giphy.api_url}#{endpoint}"
+    msg.http(url)
+      .query
+        api_key: giphy.api_key
+        q: q
+      .get() (err, res, body) ->
+        res = JSON.parse(body)
+        data = res?.data || []
+        if data.length
+          img_obj = msg.random data
+          msg.send(img_obj.images.original.url)
+        else
+          msg.send "No results found for #{q}"
+          
+module.exports = (robot) ->
+  robot.hear /^giphy (.*)$/i, (msg) ->
+   giphy.search msg, msg.match[1]