diff --git a/tabpy/tabpy_server/app/app.py b/tabpy/tabpy_server/app/app.py
index 4ab95161..902ee1ac 100644
--- a/tabpy/tabpy_server/app/app.py
+++ b/tabpy/tabpy_server/app/app.py
@@ -15,6 +15,7 @@
 from tabpy.tabpy_server.psws.callbacks import init_model_evaluator, init_ps_server
 from tabpy.tabpy_server.psws.python_service import PythonService, PythonServiceHandler
 from tabpy.tabpy_server.handlers import (
+    BaseStaticHandler,
     EndpointHandler,
     EndpointsHandler,
     EvaluationPlaneHandler,
@@ -166,7 +167,8 @@ def try_exit(self):
                 ),
                 (
                     self.subdirectory + r"/(.*)",
-                    tornado.web.StaticFileHandler,
+                    #tornado.web.StaticFileHandler,
+                    BaseStaticHandler,
                     dict(
                         path=self.settings[SettingsParameters.StaticPath],
                         default_filename="index.html",
diff --git a/tabpy/tabpy_server/handlers/__init__.py b/tabpy/tabpy_server/handlers/__init__.py
index 89ae704c..1090ffd0 100644
--- a/tabpy/tabpy_server/handlers/__init__.py
+++ b/tabpy/tabpy_server/handlers/__init__.py
@@ -2,6 +2,7 @@
 from tabpy.tabpy_server.handlers.management_handler import ManagementHandler
 
 from tabpy.tabpy_server.handlers.endpoint_handler import EndpointHandler
+from tabpy.tabpy_server.handlers.static_handler import BaseStaticHandler
 from tabpy.tabpy_server.handlers.endpoints_handler import EndpointsHandler
 from tabpy.tabpy_server.handlers.evaluation_plane_handler import EvaluationPlaneDisabledHandler
 from tabpy.tabpy_server.handlers.evaluation_plane_handler import EvaluationPlaneHandler
diff --git a/tabpy/tabpy_server/handlers/base_handler.py b/tabpy/tabpy_server/handlers/base_handler.py
index 3d522b03..c6abd7c3 100644
--- a/tabpy/tabpy_server/handlers/base_handler.py
+++ b/tabpy/tabpy_server/handlers/base_handler.py
@@ -120,6 +120,7 @@ def initialize(self, app):
         self.tabpy_state = app.tabpy_state
         # set content type to application/json
         self.set_header("Content-Type", "application/json")
+        self.set_header("TestHeader", "ThisIsATest")
         self.protocol = self.settings[SettingsParameters.TransferProtocol]
         self.port = self.settings[SettingsParameters.Port]
         self.python_service = app.python_service
diff --git a/tabpy/tabpy_server/handlers/static_handler.py b/tabpy/tabpy_server/handlers/static_handler.py
new file mode 100644
index 00000000..f4b9e07e
--- /dev/null
+++ b/tabpy/tabpy_server/handlers/static_handler.py
@@ -0,0 +1,16 @@
+import base64
+import binascii
+import concurrent
+import json
+import logging
+import tornado.web
+import uuid
+
+
+
+
+class BaseStaticHandler(tornado.web.StaticFileHandler):
+    def set_extra_headers(self, path):
+        # set content type to application/json
+        self.set_header("TestHeader", "ThisIsATest")
+        #self._headers["testheader"] = "test"