diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
index e471ab39..34c12cfd 100644
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -11,72 +11,135 @@
 # (at your option) any later version.
 
 # Variables
+
 webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
 webInterfaceDir="/var/www/html/admin"
 piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
 piholeFilesDir="/etc/.pihole"
 
-    if [ ! -d "/etc/.pihole" ]; then #This is unlikely
-        echo "::: Critical Error: Pi-Hole repo missing from system!"
-        echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
-        exit 1;
-    fi
-    if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
-        echo "::: Critical Error: Pi-Hole repo missing from system!"
-        echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
-        exit 1;
-    fi
-
-    echo "::: Checking for updates..."
-    piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
-    piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-
-    webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
-    webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-
-    echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
-    echo "::: Web Admin version is $webVersion (Latest version is $webVersionLatest)"
+spinner()
+{
+	local pid=$1
+    local delay=0.50
+    local spinstr='/-\|'
+    while [ "$(ps a | awk '{print $1}' | grep "$pid")" ]; do
+		local temp=${spinstr#?}
+        printf " [%c]  " "$spinstr"
+        local spinstr=${temp}${spinstr%"$temp"}
+        sleep ${delay}
+        printf "\b\b\b\b\b\b"
+    done
+    printf "    \b\b\b\b"
+}
+
+getGitFiles() {
+	# Setup git repos for directory and repository passed
+	# as arguments 1 and 2
+	echo ":::"
+	echo "::: Checking for existing repository..."
+	if is_repo "${1}"; then
+	  update_repo "${1}"
+	else
+	  make_repo "${1}" "${2}"
+  fi
+}
+
+is_repo() {
+  # Use git to check if directory is currently under VCS
+	echo -n ":::    Checking $1 is a repo..."
+	cd "${1}" &> /dev/null || return 1
+	git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1
+}
+
+make_repo() {
+    # Remove the non-repod interface and clone the interface
+    echo -n ":::    Cloning $2 into $1..."
+    rm -rf "${1}"
+    git clone -q --depth 1 "${2}" "${1}" > /dev/null & spinner $!
+    echo " done!"
+}
+
+update_repo() {
+    # Pull the latest commits
+    echo -n ":::     Updating repo in $1..."
+    cd "${1}" || exit 1
+    git stash -q > /dev/null & spinner $!
+    git pull -q > /dev/null & spinner $!
+    echo " done!"
+}
+
+if [ ! -d "/etc/.pihole" ]; then #This is unlikely
+    echo "::: Critical Error: Pi-Hole repo missing from system!"
+    echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
+    exit 1;
+fi
+if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
+    echo "::: Critical Error: Pi-Hole repo missing from system!"
+    echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
+    exit 1;
+fi
+
+echo "::: Checking for updates..."
+piholeVersion=$(pihole -v -p -c)
+piholeVersionLatest=$(pihole -v -p -l)
+
+webVersion=$(pihole -v -a -c)
+webVersionLatest=$(pihole -v -a -l)
+
+echo ":::"
+echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
+echo "::: Web Admin version is $webVersion (Latest version is $webVersionLatest)"
+echo ":::"
+
+# Logic
+# If latest versions are blank - we've probably hit Github rate limit (stop running `pihole -up so often!):
+#            Update anyway
+# If Core up to date AND web up to date:
+#            Do nothing
+# If Core up to date AND web NOT up to date:
+#            Pull web repo
+# If Core NOT up to date AND web up to date:
+#            pull pihole repo, run install --unattended -- reconfigure
+# if Core NOT up to date AND web NOT up to date:
+#            pull pihole repo run install --unattended
+
+
+
+if [[ ${piholeVersion} == ${piholeVersionLatest} && ${webVersion} == ${webVersionLatest} ]]; then
+    echo "::: Everything is up to date!"
+    echo ""
+    exit 0
+
+elif [[ ${piholeVersion} == ${piholeVersionLatest} && ${webVersion} != ${webVersionLatest} ]]; then
+    echo "::: Pi-hole Web Admin files out of date"
+    getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
     echo ":::"
+    webVersion=$(pihole -v -a -c)
+    echo "::: Web Admin version is now at ${webVersion}"
+    echo "::: If you had made any changes in '/var/www/html/admin', they have been stashed using 'git stash'"
+    echo ""
 
-    if [[ ${piholeVersion} == ${piholeVersionLatest} ]] ; then
-        echo "::: Pi-hole Base files are already up to date! Version: ${piholeVersionLatest}"
-        echo "::: No need to update!"
-        echo ":::"
-
-        if [[ ${webVersion} == ${webVersionLatest} ]] ; then
-            echo "::: Web Admin files are already up to date!  Version: ${webVersionLatest}"
-            echo "::: No need to update!"
-            echo ":::"
-        else
-            echo "::: An Update is available for the Web Admin!"
-            echo ":::"
-            echo "::: Fetching latest changes from GitHub..."
-            # Update Git files for Core
-            getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
-            echo ":::"
-            echo "::: Pi-hole Web Admin has been updated to ${webVersionLatest}"
-            echo "::: See https://changes.pi-hole.net for details"
-        fi
-    else
-        echo -n "::: An update is available for "
-        if [[ ${webVersion} == ${webVersionLatest} ]] ; then
-            echo " Pi-Hole!"
-        else
-            echo " Pi-Hole base files and the Web Admin. Both will be updated!"
-        fi
-
-        echo "::: Fetching latest changes from GitHub..."
-        # Update Git files for Core
-        getGitFiles ${piholeFilesDir} ${piholeGitUrl}
-        /etc/.pihole/automated\ install/basic-install.sh --unattended
-
-        echo ":::"
-        echo "::: Pi-hole has been updated to version ${piholeVersionLatest}"
-        if [[ ${webVersion} != ${webVersionLatest} ]] ; then
-            echo "::: Web Admin has been updated to version ${webVersionLatest}"
-        fi
-        echo ":::"
-        echo "::: See https://changes.pi-hole.net for details"
-    fi
-
-    exit 0
\ No newline at end of file
+elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} == ${webVersionLatest} ]]; then
+    echo "::: Pi-hole core files out of date"
+    getGitFiles ${piholeFilesDir} ${piholeGitUrl}
+    /etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended
+    echo ":::"
+    piholeVersion=$(pihole -v -p -c)
+    echo "::: Pi-hole version is now at ${piholeVersion}"
+    echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+    echo ""
+
+elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} != ${webVersionLatest} ]]; then
+    echo "::: Updating Everything"
+    getGitFiles ${piholeFilesDir} ${piholeGitUrl}
+    /etc/.pihole/automated\ install/basic-install.sh --unattended
+    webVersion=$(pihole -v -a -c)
+    piholeVersion=$(pihole -v -p -c)
+    echo ":::"
+    echo "::: Pi-hole version is now at ${piholeVersion}"
+    echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+    echo ":::"
+    echo "::: Pi-hole version is now at ${piholeVersion}"
+    echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+    echo ""
+fi
\ No newline at end of file