diff --git a/Import_Databases_Linux.sh b/Import_Databases_Linux.sh
new file mode 100755
index 0000000..4ae583c
--- /dev/null
+++ b/Import_Databases_Linux.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo make import
+sudo make import-wiki
diff --git a/Import_Databases_Windows.cmd b/Import_Databases_Windows.cmd
new file mode 100644
index 0000000..8f76843
--- /dev/null
+++ b/Import_Databases_Windows.cmd
@@ -0,0 +1,6 @@
+
@echo off
+echo:
+Windows\make import-windows
+Windows\make import-windows-wiki
+echo:
+pause
diff --git a/Setup_Linux.sh b/Setup_Linux.sh
index c4703f6..9cb38a1 100755
--- a/Setup_Linux.sh
+++ b/Setup_Linux.sh
@@ -161,17 +161,17 @@ if [ "$choice" == "1" ]; then
     sudo make clone-game
     echo ""
     echo ""
-    echo "Importing the databases."
-    echo ""
-    sudo make import
-    echo ""
-    echo ""
     echo "Creating the client cache in your home folder."
     echo ""
     mkdir ~/OpenRSC
     unzip -o Game/client/cache.zip -d ~/OpenRSC
     echo ""
     echo ""
+    echo "Importing the databases."
+    echo ""
+    sudo make import
+    echo ""
+    echo ""
     echo "Open RSC setup complete!"
     echo ""
     exit
@@ -210,17 +210,17 @@ elif [ "$choice" == "2" ]; then
     sudo make clone-website
     echo ""
     echo ""
-    echo "Importing the databases."
-    echo ""
-    sudo make import
-    echo ""
-    echo ""
     echo "Creating the client cache in your home folder."
     echo ""
     mkdir ~/OpenRSC
     unzip -o Game/client/cache.zip -d ~/OpenRSC
     echo ""
     echo ""
+    echo "Importing the databases in 15 seconds."
+    echo ""
+    sudo make import
+    echo ""
+    echo ""
     echo "Open RSC setup complete!"
     echo ""
     exit
@@ -268,6 +268,12 @@ elif [ "$choice" == "3" ]; then
     unzip -o Website/Wiki/openrsc_wiki.sql.zip -d Website/Wiki
     echo ""
     echo ""
+    echo "Creating the client cache in your home folder."
+    echo ""
+    mkdir ~/OpenRSC
+    unzip -o Game/client/cache.zip -d ~/OpenRSC
+    echo ""
+    echo ""
     echo "Importing the game, forum, and wiki databases."
     echo ""
     sudo make import
@@ -275,12 +281,6 @@ elif [ "$choice" == "3" ]; then
     sudo make import-wiki
     echo ""
     echo ""
-    echo "Creating the client cache in your home folder."
-    echo ""
-    mkdir ~/OpenRSC
-    unzip -o Game/client/cache.zip -d ~/OpenRSC
-    echo ""
-    echo ""
     echo "Open RSC setup complete!"
     echo ""
     exit