diff --git a/.gitignore b/.gitignore
index 1fe03b2..3b237f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ config.py
 config.json
 *.pyc
 *.swp
-.log
\ No newline at end of file
+.log*
+.lock
diff --git a/config_page.py b/config_page.py
index 42e4d4b..eaf6b39 100644
--- a/config_page.py
+++ b/config_page.py
@@ -39,6 +39,17 @@ def upload(self):
             json.dump(input_json, f, indent=2, separators=(',', ': '))
         self.index()
 
+    @cherrypy.expose
+    def start(self):
+        with open(".lock", 'w') as f:
+            f.write("1")
+        self.index()
+
+    @cherrypy.expose
+    def stop(self):
+        with open(".lock", 'w') as f:
+            f.write("0")
+        self.index()
 
     @cherrypy.expose
     def log(self):
diff --git a/html/config.html b/html/config.html
index 0aa3d0a..2517d27 100644
--- a/html/config.html
+++ b/html/config.html
@@ -2,6 +2,25 @@
   <head>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
     <script src="serialize_script.js"></script>
+    <script>
+      // Run the start or stop method from config_webpage.py depending on slider position.
+      function startstop() {
+        var xhr = new XMLHttpRequest();
+        if (document.getElementById('start').checked == false) {
+          xhr.open('GET', 'stop', true);
+          xhr.onload = function () {
+            console.log(xhr.responseURL);
+          };
+          xhr.send(null);
+        } else {
+          xhr.open('GET', 'start', true);
+          xhr.onload = function () {
+            console.log(xhr.responseURL);
+          };
+          xhr.send(null);
+        }
+      }
+    </script>
     <script>
       function config_save() {
         json_obj = $('#config_data').serializeJSON({checkboxUncheckedValue: "false", parseBooleans: true});
@@ -96,6 +115,14 @@
       <div id="lcloud"><img src="chancetstorms.png" height="256" width="256"></div>
       <div id="rcloud"><img src="chancetstorms.png" height="256" width="256"></div>
       <div class="page_title">PiWeatherRock Configuration Page</div>
+        <div id="start_toggle">
+          <div class="left">Stop</div>
+          <label class="switch">
+            <input type="checkbox" id="start" onclick="startstop()">
+              <span class="slider round"></span>
+          </label>
+          <div class="right">Start</div>
+        </div>
       <div name="version" id="version"></div>
       <!-- Rounded switch -->
       <div id="toggle">
diff --git a/scripts/upgrade.py b/scripts/upgrade.py
index c376da5..99233a2 100644
--- a/scripts/upgrade.py
+++ b/scripts/upgrade.py
@@ -56,6 +56,9 @@
     if key not in old_config.keys():
         old_config[key] = new_config[key]
 
+# Update version
+old_config["version"] = new_config["version"]
+
 with open("config.json", "w") as f:
     json.dump(old_config, f)
 
diff --git a/weather.py b/weather.py
index 0125972..9d84d23 100644
--- a/weather.py
+++ b/weather.py
@@ -25,15 +25,22 @@
 import pygame
 import requests
 
-with open("config.json", "r") as f:
-    CONFIG = json.load(f)
-
 # globals
 UNICODE_DEGREE = u'\xb0'
 
-MODE = 'd'  # Default to weather mode. Showing daily weather first.
-D_COUNT = 1
-H_COUNT = 0
+
+def lock_check():
+    if os.path.exists(".lock"):
+        with open(".lock", "r") as f:
+            val = f.read()
+        if val.strip() == "1":
+            return True
+        else:
+            return False
+    else:
+        with open(".lock", "w") as f:
+            f.write("0")
+        return False
 
 
 def exit_gracefully(signum, frame):
@@ -110,11 +117,11 @@ def get_abbreviation(phrase):
     return abbreviation
 
 
-def get_windspeed_abbreviation(unit=CONFIG["units"]):
+def get_windspeed_abbreviation(unit):
     return get_abbreviation(units_decoder(unit)['windSpeed'])
 
 
-def get_temperature_letter(unit=CONFIG["units"]):
+def get_temperature_letter(unit):
     return units_decoder(unit)['temperature'].split(' ')[-1][0].upper()
 
 
@@ -190,9 +197,12 @@ class MyDisplay:
 
     ####################################################################
     def __init__(self):
-        # Initialize logger
+        #  Initialize logger
         self.log = get_logger()
-        "Ininitializes a new pygame screen using the framebuffer"
+        #  Load config variables
+        with open("config.json", "r") as f:
+            self.config = json.load(f)
+        "Initializes a new pygame screen using the framebuffer"
         if platform.system() == 'Darwin':
             pygame.display.init()
             driver = pygame.display.get_driver()
@@ -215,7 +225,7 @@ def __init__(self):
                 try:
                     pygame.display.init()
                 except pygame.error:
-                    self.log.debug("Driver: {driver} failed.")
+                    self.log.exception(f"Driver: {driver} failed.")
                     continue
                 found = True
                 break
@@ -235,7 +245,7 @@ def __init__(self):
         pygame.mouse.set_visible(0)
         pygame.display.update()
 
-        if CONFIG["fullscreen"]:
+        if self.config["fullscreen"]:
             self.xmax = pygame.display.Info().current_w - 35
             self.ymax = pygame.display.Info().current_h - 5
             if self.xmax <= 1024:
@@ -258,15 +268,15 @@ def __del__(self):
         "Destructor to make sure pygame shuts down, etc."
 
     def get_forecast(self):
-        if (time.time() - self.last_update_check) > CONFIG["update_freq"]:
+        if (time.time() - self.last_update_check) > self.config["update_freq"]:
             self.last_update_check = time.time()
             try:
-                self.weather = forecast(CONFIG["ds_api_key"],
-                                        CONFIG["lat"],
-                                        CONFIG["lon"],
+                self.weather = forecast(self.config["ds_api_key"],
+                                        self.config["lat"],
+                                        self.config["lon"],
                                         exclude='minutely',
-                                        units=CONFIG["units"],
-                                        lang=CONFIG["lang"])
+                                        units=self.config["units"],
+                                        lang=self.config["lang"])
 
                 sunset_today = datetime.datetime.fromtimestamp(
                     self.weather.daily[0].sunsetTime)
@@ -352,7 +362,7 @@ def display_conditions_line(self, label, cond, is_temp, multiplier=None):
             self.screen.blit(degree_txt, (
                 self.xmax * second_column_x_start_position + txt_x * 1.01,
                 self.ymax * (y_start + degree_symbol_y_offset)))
-            degree_letter = conditions_font.render(get_temperature_letter(),
+            degree_letter = conditions_font.render(get_temperature_letter(self.config["units"]),
                                                    True, text_color)
             degree_letter_x = degree_letter.get_size()[0]
             self.screen.blit(degree_letter, (
@@ -386,12 +396,12 @@ def display_subwindow(self, data, day, c_times):
                 UNICODE_DEGREE +
                 ' / ' +
                 str(int(round(data.temperatureHigh))) +
-                UNICODE_DEGREE + get_temperature_letter(),
+                UNICODE_DEGREE + get_temperature_letter(self.config["units"]),
                 True, text_color)
         else:
             txt = forecast_font.render(
                 str(int(round(data.temperature))) +
-                UNICODE_DEGREE + get_temperature_letter(),
+                UNICODE_DEGREE + get_temperature_letter(self.config["units"]),
                 True, text_color)
         (txt_x, txt_y) = txt.get_size()
         self.screen.blit(txt, (self.xmax *
@@ -413,7 +423,7 @@ def display_subwindow(self, data, day, c_times):
         if icon_size_y < 90:
             icon_y_offset = (90 - icon_size_y) / 2
         else:
-            icon_y_offset = CONFIG["icon_offset"]
+            icon_y_offset = self.config["icon_offset"]
 
         self.screen.blit(icon, (self.xmax *
                                 (subwindow_centers * c_times) -
@@ -474,7 +484,7 @@ def disp_weather(self):
             wind_direction = ''
         wind_txt = wind_direction + str(
             int(round(self.weather.windSpeed))) + \
-            ' ' + get_windspeed_abbreviation()
+            ' ' + get_windspeed_abbreviation(self.config["units"])
         self.display_conditions_line(
             'Wind:', wind_txt, False, 1)
 
@@ -531,7 +541,7 @@ def disp_hourly(self):
             wind_direction = ''
         wind_txt = wind_direction + str(
             int(round(self.weather.windSpeed))) + \
-            ' ' + get_windspeed_abbreviation()
+            ' ' + get_windspeed_abbreviation(self.config["units"])
         self.display_conditions_line(
             'Wind:', wind_txt, False, 1)
 
@@ -590,7 +600,7 @@ def disp_current_temp(self, font_name, text_color):
             font_name, int(self.ymax * (0.5 - 0.15) * 0.3), bold=1)
         degree_txt = degree_font.render(UNICODE_DEGREE, True, text_color)
         (rendered_am_pm_x, rendered_am_pm_y) = degree_txt.get_size()
-        degree_letter = outside_temp_font.render(get_temperature_letter(),
+        degree_letter = outside_temp_font.render(get_temperature_letter(self.config["units"]),
                                                  True, text_color)
         (degree_letter_x, degree_letter_y) = degree_letter.get_size()
         # Position text
@@ -804,148 +814,165 @@ def daylight(weather):
             delta_seconds_til_dark)
 
 
-# Create an instance of the lcd display class.
-MY_DISP = MyDisplay()
-
-RUNNING = True             # Stay running while True
-SECONDS = 0                # Seconds Placeholder to pace display.
-# Display timeout to automatically switch back to weather display.
-NON_WEATHER_TIMEOUT = 0
-# Switch to info periodically to prevent screen burn.
-PERIODIC_INFO_ACTIVATION = 0
-
-# Loads data from darksky.net into class variables.
-if not MY_DISP.get_forecast():
-    MY_DISP.log.exception("Error: no data from darksky.net.")
-    RUNNING = False
-
+while True:
+    RUNNING = lock_check()
+    if RUNNING:
+        SECONDS = 0  # Seconds Placeholder to pace display.
+        MY_DISP = MyDisplay()  # Create an instance of the lcd display class.
+        MY_DISP.log.info("Received signal to begin running.")
+        MODE = 'd'  # Default to weather mode. Showing daily weather first.
+        D_COUNT = 1
+        H_COUNT = 0
+        NON_WEATHER_TIMEOUT = 0  # Seconds showing info screen
+        PERIODIC_INFO_ACTIVATION = 0  # Seconds showing non-info screen
+    else:
+        pygame.quit()
+        continue
+
+    # Loads data from darksky.net into class variables.
+    if not MY_DISP.get_forecast():
+        MY_DISP.log.exception("Error: no data from darksky.net.")
+        MY_DISP.log.info("Stopping PiWeatherRock.")
+        with open(".lock", "w") as f:
+            f.write("0")
+        RUNNING = False
+    else:
+        MY_DISP.log.info("Successfully retrieved initial weather data.")
 
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-while RUNNING:
-    # Look for and process keyboard events to change modes.
-    for event in pygame.event.get():
-        if event.type == pygame.KEYDOWN:
-            # On 'q' or keypad enter key, quit the program.
-            if ((event.key == pygame.K_KP_ENTER) or (event.key == pygame.K_q)):
-                RUNNING = False
-
-            # On 'd' key, set mode to 'weather'.
-            elif event.key == pygame.K_d:
+    while RUNNING:
+        with open(".lock", "r") as f:
+            val = f.read()
+        if val.strip() == "0":
+            MY_DISP.log.info(
+                "Lock file has instructed the application to wait and listen.")
+            RUNNING = False
+            break
+        # Look for and process keyboard events to change modes.
+        for event in pygame.event.get():
+            if event.type == pygame.KEYDOWN:
+                # On 'q' or keypad enter key, quit the program.
+                if ((event.key == pygame.K_KP_ENTER) or (event.key == pygame.K_q)):
+                    with open(".lock", "w") as f:
+                        f.write("0")
+                    RUNNING = False
+
+                # On 'd' key, set mode to 'weather'.
+                elif event.key == pygame.K_d:
+                    MODE = 'd'
+                    D_COUNT = 1
+                    H_COUNT = 0
+                    NON_WEATHER_TIMEOUT = 0
+                    PERIODIC_INFO_ACTIVATION = 0
+
+                # On 's' key, save a screen shot.
+                elif event.key == pygame.K_s:
+                    MY_DISP.screen_cap()
+
+                # On 'i' key, set mode to 'info'.
+                elif event.key == pygame.K_i:
+                    MODE = 'i'
+                    D_COUNT = 0
+                    H_COUNT = 0
+                    NON_WEATHER_TIMEOUT = 0
+                    PERIODIC_INFO_ACTIVATION = 0
+
+                # on 'h' key, set mode to 'hourly'
+                elif event.key == pygame.K_h:
+                    MODE = 'h'
+                    D_COUNT = 0
+                    H_COUNT = 1
+                    NON_WEATHER_TIMEOUT = 0
+                    PERIODIC_INFO_ACTIVATION = 0
+
+        # Automatically switch back to weather display after a couple minutes.
+        if MODE not in ('d', 'h'):
+            PERIODIC_INFO_ACTIVATION = 0
+            NON_WEATHER_TIMEOUT += 1
+            D_COUNT = 0
+            H_COUNT = 0
+            # Default in config.py.sample: pause for 5 minutes on info screen.
+            if NON_WEATHER_TIMEOUT > (MY_DISP.config["info_pause"] * 10):
                 MODE = 'd'
                 D_COUNT = 1
-                H_COUNT = 0
-                NON_WEATHER_TIMEOUT = 0
-                PERIODIC_INFO_ACTIVATION = 0
-
-            # On 's' key, save a screen shot.
-            elif event.key == pygame.K_s:
-                MY_DISP.screen_cap()
-
-            # On 'i' key, set mode to 'info'.
-            elif event.key == pygame.K_i:
+                MY_DISP.log.info("Switching to weather mode")
+        else:
+            NON_WEATHER_TIMEOUT = 0
+            PERIODIC_INFO_ACTIVATION += 1
+            # Default is to flip between 2 weather screens
+            # for 15 minutes before showing info screen.
+            if PERIODIC_INFO_ACTIVATION > (MY_DISP.config["info_delay"] * 10):
                 MODE = 'i'
-                D_COUNT = 0
-                H_COUNT = 0
-                NON_WEATHER_TIMEOUT = 0
-                PERIODIC_INFO_ACTIVATION = 0
-
-            # on 'h' key, set mode to 'hourly'
-            elif event.key == pygame.K_h:
-                MODE = 'h'
-                D_COUNT = 0
-                H_COUNT = 1
-                NON_WEATHER_TIMEOUT = 0
-                PERIODIC_INFO_ACTIVATION = 0
-
-    # Automatically switch back to weather display after a couple minutes.
-    if MODE not in ('d', 'h'):
-        PERIODIC_INFO_ACTIVATION = 0
-        NON_WEATHER_TIMEOUT += 1
-        D_COUNT = 0
-        H_COUNT = 0
-        # Default in config.py.sample: pause for 5 minutes on info screen.
-        if NON_WEATHER_TIMEOUT > (CONFIG["info_pause"] * 10):
-            MODE = 'd'
-            D_COUNT = 1
-            MY_DISP.log.info("Switching to weather mode")
-    else:
-        NON_WEATHER_TIMEOUT = 0
-        PERIODIC_INFO_ACTIVATION += 1
-        # Default is to flip between 2 weather screens
-        # for 15 minutes before showing info screen.
-        if PERIODIC_INFO_ACTIVATION > (CONFIG["info_delay"] * 10):
-            MODE = 'i'
-            MY_DISP.log.info("Switching to info mode")
-        elif (PERIODIC_INFO_ACTIVATION % (
-                ((CONFIG["plugins"]["daily"]["pause"] * D_COUNT)
-                 + (CONFIG["plugins"]["hourly"]["pause"] * H_COUNT))
-                * 10)) == 0:
-            if MODE == 'd':
-                MY_DISP.log.info("Switching to HOURLY")
-                MODE = 'h'
-                H_COUNT += 1
-            else:
-                MY_DISP.log.info("Switching to DAILY")
-                MODE = 'd'
-                D_COUNT += 1
-
-    # Daily Weather Display Mode
-    if MODE == 'd':
-        # Update / Refresh the display after each second.
-        if SECONDS != time.localtime().tm_sec:
-            SECONDS = time.localtime().tm_sec
-            MY_DISP.disp_weather()
-        # Once the screen is updated, we have a full second to get the weather.
-        # Once per minute, update the weather from the net.
-        if SECONDS == 0:
-            try:
-                MY_DISP.get_forecast()
-            except ValueError:  # includes simplejson.decoder.JSONDecodeError
-                MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
-            except BaseException:
-                MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
-    # Hourly Weather Display Mode
-    elif MODE == 'h':
-        # Update / Refresh the display after each second.
-        if SECONDS != time.localtime().tm_sec:
-            SECONDS = time.localtime().tm_sec
-            MY_DISP.disp_hourly()
-        # Once the screen is updated, we have a full second to get the weather.
-        # Once per minute, update the weather from the net.
-        if SECONDS == 0:
-            try:
-                MY_DISP.get_forecast()
-            except ValueError:  # includes simplejson.decoder.JSONDecodeError
-                MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
-            except BaseException:
-                MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
-    # Info Screen Display Mode
-    elif MODE == 'i':
-        # Pace the screen updates to once per second.
-        if SECONDS != time.localtime().tm_sec:
-            SECONDS = time.localtime().tm_sec
-
-            (inDaylight, dayHrs, dayMins, seconds_til_daylight,
-             delta_seconds_til_dark) = daylight(MY_DISP.weather)
-
-            # Extra info display.
-            MY_DISP.disp_info(inDaylight, dayHrs, dayMins,
-                              seconds_til_daylight,
-                              delta_seconds_til_dark)
-        # Refresh the weather data once per minute.
-        if int(SECONDS) == 0:
-            try:
-                MY_DISP.get_forecast()
-            except ValueError:  # includes simplejson.decoder.JSONDecodeError
-                MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
-            except BaseException:
-                MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
-
-    (inDaylight, dayHrs, dayMins, seconds_til_daylight,
-     delta_seconds_til_dark) = daylight(MY_DISP.weather)
+                MY_DISP.log.info("Switching to info mode")
+            elif (PERIODIC_INFO_ACTIVATION % (
+                    ((MY_DISP.config["plugins"]["daily"]["pause"] * D_COUNT)
+                     + (MY_DISP.config["plugins"]["hourly"]["pause"] * H_COUNT))
+                    * 10)) == 0:
+                if MODE == 'd':
+                    MY_DISP.log.info("Switching to HOURLY")
+                    MODE = 'h'
+                    H_COUNT += 1
+                else:
+                    MY_DISP.log.info("Switching to DAILY")
+                    MODE = 'd'
+                    D_COUNT += 1
+
+        # Daily Weather Display Mode
+        if MODE == 'd':
+            # Update / Refresh the display after each second.
+            if SECONDS != time.localtime().tm_sec:
+                SECONDS = time.localtime().tm_sec
+                MY_DISP.disp_weather()
+            # Once the screen is updated, we have a full second to get the weather.
+            # Once per minute, update the weather from the net.
+            if SECONDS == 0:
+                try:
+                    MY_DISP.get_forecast()
+                except ValueError:  # includes simplejson.decoder.JSONDecodeError
+                    MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
+                except BaseException:
+                    MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
+        # Hourly Weather Display Mode
+        elif MODE == 'h':
+            # Update / Refresh the display after each second.
+            if SECONDS != time.localtime().tm_sec:
+                SECONDS = time.localtime().tm_sec
+                MY_DISP.disp_hourly()
+            # Once the screen is updated, we have a full second to get the weather.
+            # Once per minute, update the weather from the net.
+            if SECONDS == 0:
+                try:
+                    MY_DISP.get_forecast()
+                except ValueError:  # includes simplejson.decoder.JSONDecodeError
+                    MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
+                except BaseException:
+                    MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
+        # Info Screen Display Mode
+        elif MODE == 'i':
+            # Pace the screen updates to once per second.
+            if SECONDS != time.localtime().tm_sec:
+                SECONDS = time.localtime().tm_sec
+
+                (inDaylight, dayHrs, dayMins, seconds_til_daylight,
+                 delta_seconds_til_dark) = daylight(MY_DISP.weather)
+
+                # Extra info display.
+                MY_DISP.disp_info(inDaylight, dayHrs, dayMins,
+                                  seconds_til_daylight,
+                                  delta_seconds_til_dark)
+            # Refresh the weather data once per minute.
+            if int(SECONDS) == 0:
+                try:
+                    MY_DISP.get_forecast()
+                except ValueError:  # includes simplejson.decoder.JSONDecodeError
+                    MY_DISP.log.exception(f"Decoding JSON has failed: {sys.exc_info()[0]}")
+                except BaseException:
+                    MY_DISP.log.exception(f"Unexpected error: {sys.exc_info()[0]}")
 
-    # Loop timer.
-    pygame.time.wait(100)
+        (inDaylight, dayHrs, dayMins, seconds_til_daylight,
+         delta_seconds_til_dark) = daylight(MY_DISP.weather)
 
+        # Loop timer.
+        pygame.time.wait(100)
 
 pygame.quit()
