diff --git a/app/data/__init__.py b/app/data/__init__.py
index 60a75dac..e5804fae 100644
--- a/app/data/__init__.py
+++ b/app/data/__init__.py
@@ -2,20 +2,16 @@
 from ..services.location.csbs import CSBSLocationService
 from ..services.location.jhu import JhuLocationService
 from ..services.location.nyt import NYTLocationService
+from ..services.location import LocationService
 
 # Mapping of services to data-sources.
-DATA_SOURCES = {
-    "jhu": JhuLocationService(),
-    "csbs": CSBSLocationService(),
-    "nyt": NYTLocationService(),
-}
+class DATA_SOURCES:
+    DATA_SOURCES = {}
 
+    def data(self)
+    self.DATA_SOURCES['jhu'] = JhuLocationService()
+    self.DATA_SOURCES['csbs'] = CSBSLocationService()
+    self.DATA_SOURCES['nyt'] = NYTLocationService()
 
-def data_source(source):
-    """
-    Retrieves the provided data-source service.
-
-    :returns: The service.
-    :rtype: LocationService
-    """
-    return DATA_SOURCES.get(source.lower())
+    def data_source(self, source : str)-> LocationService:
+         return self.DATA_SOURCES.get(source.lower())