diff --git a/Dockerfile-test-env b/Dockerfile-test-env
index 0f629ee9..fe563b6a 100644
--- a/Dockerfile-test-env
+++ b/Dockerfile-test-env
@@ -2,7 +2,7 @@ FROM python:3.6.2-alpine3.6
 LABEL name="Dragon Bot Test environment"
 RUN apk update && apk add --no-cache vim docker
 
-RUN pip install requests discord.py docker pylint wolframalpha
+RUN pip install requests discord.py docker pylint wolframalpha pyowm
 ADD app /app
 
 RUN printf "\n\nTesting your python code for errors\n\n" && \
diff --git a/app/weather.py b/app/weather.py
index 3a5eddc6..9dc50f07 100644
--- a/app/weather.py
+++ b/app/weather.py
@@ -1,24 +1,28 @@
 import requests
 from pyowm import OWM
 
-def get_weather(zip_code):
+def get_weather(location):
     """
-    get_weather(zip_code)
+    get_weather(location)
 
     Returns the weather forecast for the selected zip code. Uses PythonOWM to
     make life super easy.
+
+    TODO: Replace basic code block with nice looking, bold text w/ emojis
     """
     owm = OWM('593e0e182f9278a10443da354c4014db')
-    fc = owm.three_hours_forecast(zip_code)
+    fc = owm.three_hours_forecast(location)
     f = fc.get_forecast()
 
     reg = f.get(0)
     indicator = int(reg.get_reference_time(timeformat='iso')[11:13]) // 3
 
-    ret = ''
+    ret = '```'
 
-    ret = ret + ('Status: ' + reg.get_detailed_status() + ' '
-        'Current Temperature: ' + str(reg.get_temperature('fahrenheit').get('temp')) + '\n')
+    ret = ret + ('\nStatus: ' + reg.get_detailed_status() + '   ' +
+        'Current Temperature: ' +
+        str(reg.get_temperature('fahrenheit').get('temp')) +
+        'F\n\nFive day forecast:\n')
 
     for i in range((4 - indicator) % 8, len(f), 8):
         high, low = 0, 100000
@@ -37,11 +41,8 @@ def get_weather(zip_code):
             if low > l:
                 low = l
 
-        ret = ret + ('Status: ' + f.get(i).get_detailed_status() + ' '
-            'High: ' + str(high) + ' '
-            'Low: ' + str(low) + ' '
-            'Date: ' +
-            str(f.get(i).get_reference_time(timeformat='iso'))[:10] + '\n')
+        ret = ret + '{:<30}'.format('Status: ' + f.get(i).get_detailed_status())
+        ret = ret + '{:<18}'.format('High: ' + str(high) + 'F ')
+        ret = ret + 'Low: ' + str(low) + 'F\n'
 
-    # print(ret)
-    return ret
+    return ret + '```'