diff --git a/api/views.py b/api/views.py
index ca58883..fae35c7 100755
--- a/api/views.py
+++ b/api/views.py
@@ -217,7 +217,7 @@ class PartialMixUploadView(views.APIView):
                 (
                     tasks.create_waveform_task.s(input_file, uid) |
                     tasks.upload_to_cdn_task.subtask(('mp3', uid, 'mixes'), immutable=True) |
-                    tasks.upload_to_cdn_task.subtask(('png', uid, 'waveforms'), immutable=True) |
+                    tasks.upload_to_cdn_task.subtask    (('png', uid, 'waveforms'), immutable=True) |
                     tasks.notify_subscriber.subtask((session_id, uid), immutable=True)
                 ).delay()
                 logger.debug("Waveform task started")
diff --git a/dss/celeryconf.py b/dss/celeryconf.py
index 8499c10..5a1a57a 100644
--- a/dss/celeryconf.py
+++ b/dss/celeryconf.py
@@ -1,5 +1,3 @@
-
-
 import os
 import logging
 
diff --git a/dss/settings.py b/dss/settings.py
index 305ee76..837b219 100755
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -4,6 +4,7 @@ import mimetypes
 from datetime import timedelta
 from django.core.urlresolvers import reverse_lazy
 from django.conf import global_settings
+from dss import storagesettings
 
 from utils import here
 
@@ -211,3 +212,32 @@ JWT_AUTH = {
     'JWT_ALLOW_REFRESH': True,
     'JWT_REFRESH_EXPIRATION_DELTA': timedelta(days=30),
 }
+
+""" static settings """
+CDN_URL = storagesettings.AZURE_ITEM_BASE_URL
+MIXIMAGE_URL = '{0}miximages/'.format(CDN_URL)
+WAVEFORM_URL = '{0}waveforms/'.format(CDN_URL)
+STREAM_URL = '{0}mixes/'.format(CDN_URL)
+AUDIO_URL = '{0}mixes/'.format(CDN_URL)
+
+MEDIA_URL = 'http://home.bitchmints.com/DSSMedia/'  # '{0}media/'.format(CDN_URL)
+
+NOTIFICATIONS_FROM_ADDRESS = "admin@deepsouthsounds.com"
+
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_CREDENTIALS = True
+CORS_ALLOW_HEADERS = (
+    'x-requested-with',
+    'content-type',
+    'cache-control',
+    'accept',
+    'origin',
+    'authorization',
+
+    'upload-hash',
+    'session-id',
+    'auth-backend',
+    'x-csrftoken'
+)
+
+""" End static settings """
\ No newline at end of file
diff --git a/spa/models/mix.py b/spa/models/mix.py
index 743dc3c..679f747 100755
--- a/spa/models/mix.py
+++ b/spa/models/mix.py
@@ -103,7 +103,7 @@ class Mix(BaseModel):
 
         self.clean_image('mix_image', Mix)
         # Check for the unlikely event that the waveform has been generated
-        if cdn.file_exists('{0}{1}.png'.format(localsettings.WAVEFORM_URL, self.uid)):
+        if cdn.file_exists('{0}{1}.png'.format(settings.WAVEFORM_URL, self.uid)):
             self.waveform_generated = True
             try:
                 self.duration = mp3_length(self.get_absolute_path())
@@ -153,12 +153,12 @@ class Mix(BaseModel):
 
     def get_waveform_url(self, waveform_type=""):
         # TODO: Design better flow for this sort of thing
-        if not self.waveform_generated and cdn.file_exists('{0}{1}.png'.format(localsettings.WAVEFORM_URL, self.uid)):
+        if not self.waveform_generated and cdn.file_exists('{0}{1}.png'.format(settings.WAVEFORM_URL, self.uid)):
             self.waveform_generated = True
             self.save()
 
         if self.waveform_generated:
-            waveform_root = localsettings.WAVEFORM_URL \
+            waveform_root = settings.WAVEFORM_URL \
                 if hasattr(localsettings,
                            'WAVEFORM_URL') else "%swaveforms" % settings.MEDIA_URL