diff --git a/deletefb/tools/chrome_driver.py b/deletefb/tools/chrome_driver.py
index c59361e..07346e8 100644
--- a/deletefb/tools/chrome_driver.py
+++ b/deletefb/tools/chrome_driver.py
@@ -2,6 +2,8 @@ from ..exceptions import UnknownOSException
 from .common import NO_CHROME_DRIVER
 from clint.textui import puts, colored
 from selenium import webdriver
+from shutil import which
+from subprocess import check_output
 from urllib.request import urlretrieve
 
 import os, sys, stat, platform
@@ -9,12 +11,6 @@ import progressbar
 import re
 import zipfile
 
-chrome_drivers = {
-    "Windows" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_win32.zip",
-    "Darwin" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_mac64.zip",
-    "Linux" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip"
-}
-
 def extract_zip(filename):
     """
     Uses zipfile package to extract a single zipfile
@@ -45,7 +41,36 @@ def setup_selenium(driver_path, options):
     # Configures selenium to use a custom path
     return webdriver.Chrome(executable_path=driver_path, options=options)
 
-def get_webdriver():
+# TODO Merge these two into one
+def get_chrome_version(chrome_binary_path=None):
+    driver_locations = [which(loc) for loc in ["google-chrome", "google-chrome-stable", "chromium", "chrome.exe"]]
+
+    for location in driver_locations:
+        if location:
+            version = check_output([location, "--version"]).strip()
+            # TODO need to reliably parse this output somehow
+
+def construct_driver_url(chrome_binary_path=None):
+    """
+    Construct a URL to download the Chrome Driver
+    """
+
+    platform_string = platform.system()
+    chrome_drivers = {
+        "Windows" : "https://chromedriver.storage.googleapis.com/{0}/chromedriver_win32.zip",
+        "Darwin" : "https://chromedriver.storage.googleapis.com/{0}/chromedriver_mac64.zip",
+        "Linux" : "https://chromedriver.storage.googleapis.com/{0}/chromedriver_linux64.zip"
+    }
+
+    # First, construct a LATEST_RELEASE URL using Chrome's major version number.
+    # For example, with Chrome version 73.0.3683.86, use URL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_73".
+    # Try to download a small file from this URL. If it successful, the file contains the ChromeDriver version to use.
+    # If the above step failed, reduce the Chrome major version by 1 and try again.
+    # For example, with Chrome version 75.0.3745.4, use URL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_74"
+    #  to download a small file, which contains the ChromeDriver version to use.
+    # You can also use ChromeDriver Canary build.
+
+def get_webdriver(chrome_binary_path):
     """
      Ensure a webdriver is available
      If Not, Download it.
@@ -65,7 +90,8 @@ def get_webdriver():
     else:
         # Download it according to the current machine
 
-        chrome_webdriver = chrome_drivers.get(platform.system(), False)
+        chrome_webdriver = construct_driver_url(chrome_binary_path)
+
         if not chrome_webdriver:
             raise UnknownOSException("Unknown Operating system platform")
 
@@ -91,8 +117,8 @@ def get_webdriver():
         file_name = chrome_webdriver.split('/')[-1]
         response = urlretrieve(chrome_webdriver, file_name, show_progress)
 
-        if int(response[1].get('Content-Length')) == total_size:
-            puts(colored.green(f"DONE!"))
+        if int(response[1].get("Content-Length")) == total_size:
+            puts(colored.green("Completed downloading the Chrome Driver."))
 
             return "{0}/{1}".format(os.getcwd(), extract_zip(file_name))
 
diff --git a/deletefb/tools/login.py b/deletefb/tools/login.py
index daae1d5..17866cf 100644
--- a/deletefb/tools/login.py
+++ b/deletefb/tools/login.py
@@ -40,7 +40,7 @@ def login(user_email_address,
         chrome_options.add_argument('--no-sandbox')
         chrome_options.add_argument('log-level=2')
 
-    driver_path = get_webdriver()
+    driver_path = get_webdriver(chrome_binary_path)
     driver = setup_selenium(driver_path, chrome_options)
     driver.implicitly_wait(10)