diff --git a/RetroUFO.py b/RetroUFO.py
index 4ffc2a3..d45368f 100644
--- a/RetroUFO.py
+++ b/RetroUFO.py
@@ -4,34 +4,69 @@ Grabs the latest version of every libretro core from the build bot.
 """
 
 __author__ = "Melon Bread"
-__version__ = "0.1.0"
+__version__ = "0.8.0"
 __license__ = "MIT"
 
 import argparse
 import os
+import platform
+import sys
 import zipfile
+from pathlib import Path
 from shutil import rmtree
 from urllib.request import urlretrieve
 
 URL = 'https://buildbot.libretro.com/nightly'
 
-PLATFORM = 'linux'
-
-ARCHITECTURE = 'x86_64'
-
-CORE_LOCATION = '~/.config/retroarch/cores/'
+# These are the default core locations with normal RetroArch installs based off of 'retroarch.default.cfg`
+CORE_LOCATION = {
+    'linux': '{}/.config/retroarch/cores/'.format(Path.home()),
+    'windows': '{}/AppData/Roaming/RetroArch/cores'.format(Path.home())
+}
 
 
-def main(args):
+def main(_args):
     """ Where the magic happens """
 
-    download_cores()
-    extract_cores()
+    # If a platform and/or architecture is not supplied it is grabbed automatically
+    platform = _args.platform if _args.platform else get_platform()  # TODO: rename this var to prevent conflict
+    architecture = _args.architecture if _args.architecture else get_architecture()
+    location = _args.location if _args.location else CORE_LOCATION[platform]
+
+    download_cores(platform, architecture)
+    extract_cores(location)
+
     if not args.keep:
         clean_up()
 
 
-def download_cores():
+def get_platform():
+    """ Gets the Platform and Architecture if not supplied """
+
+    if platform.system() == 'Linux':
+        return 'linux'
+
+    elif platform.system() == 'Windows' or 'MSYS_NT' in platform.system():  # Checks for MSYS environment as well
+        return 'windows'
+    else:
+        print('ERROR: Platform not found or supported')
+        sys.exit(0)
+
+
+def get_architecture():
+    """ Gets the Platform and Architecture if not supplied """
+
+    if '64' in platform.architecture()[0]:
+        return 'x86_64'
+
+    elif '32' in platform.architecture()[0]:
+        return 'x86'
+    else:
+        print('ERROR: Architecture not found or supported')
+        sys.exit(0)
+
+
+def download_cores(_platform, _architecture):
     """ Downloads every core to the working directory """
 
     cores = []
@@ -41,7 +76,7 @@ def download_cores():
         os.makedirs("cores")
 
     # Downloads a list of all the cores available
-    urlretrieve('{}/{}/{}/latest/.index-extended'.format(URL, PLATFORM, ARCHITECTURE),
+    urlretrieve('{}/{}/{}/latest/.index-extended'.format(URL, _platform, _architecture),
                 'cores/index')
     print('Obtained core index!')
 
@@ -56,7 +91,7 @@ def download_cores():
 
     # Downloads each core from the list
     for core in cores:
-        urlretrieve('{}/{}/{}/latest/{}'.format(URL, PLATFORM, ARCHITECTURE, core),
+        urlretrieve('{}/{}/{}/latest/{}'.format(URL, _platform, _architecture, core),
                     'cores/{}'.format(core))
         print('Downloaded {} ...'.format(core))
 
@@ -64,30 +99,37 @@ def download_cores():
     os.remove('cores/index')
 
 
-def extract_cores():
+def extract_cores(_location):
     """ Extracts each downloaded core to the RA core directory """
-    print('Extracting all cores to: {}'.format(CORE_LOCATION))
+    print('Extracting all cores to: {}'.format(_location))
 
     for file in os.listdir('cores'):
         archive = zipfile.ZipFile('cores/{}'.format(file))
-        archive.extractall(CORE_LOCATION)
+        archive.extractall(_location)
         print('Extracted {} ...'.format(file))
-    pass
 
 
 def clean_up():
     """ Removes all the downloaded files """
-    rmtree('cores/')
-    pass
+    if os.listdir('cores'):
+        rmtree('cores/')
 
 
 if __name__ == "__main__":
     """ This is executed when run from the command line """
     parser = argparse.ArgumentParser()
 
+    parser.add_argument('-p', '--platform', metavar='STRING', required=False,
+                        help='Platform you desire to download for')
+
+    parser.add_argument('-a', '--architecture', metavar='STRING', required=False,
+                        help='Architecture for tha platform you desire to download for')
+
+    parser.add_argument('-l', '--location', metavar='STRING', required=False,
+                        help='Location you wish the cores to extract to')
+
     parser.add_argument('-k', '--keep', action='store_true',
                         help='Keeps downloaded core archives')
 
     args = parser.parse_args()
     main(args)
-    pass